Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename Everything SimpleStation to Parkstation #65

Merged
merged 4 commits into from
Mar 16, 2024
Merged

Rename Everything SimpleStation to Parkstation #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcaa44f
renamed everything simplestation to parkstation
DEATHB4DEFEAT Mar 16, 2024
9282200
Merge branch 'master' of https://github.com/Simple-Station/Parkstatio…
DEATHB4DEFEAT Mar 16, 2024
3dca633
fix new things
DEATHB4DEFEAT Mar 16, 2024
1e125f1
Merge branch 'master' of https://github.com/Simple-Station/Parkstatio…
DEATHB4DEFEAT Mar 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@


/Content.*/ @DEATHB4DEFEAT
/Content.*/SimpleStation14/ @Pspritechologist @DEATHB4DEFEAT
/Content.*/Parkstation/ @Pspritechologist @DEATHB4DEFEAT


/Resources/ @DEATHB4DEFEAT

/Resources/Audio/SimpleStation14 @Pspritechologist @DEATHB4DEFEAT
/Resources/Audio/Parkstation @Pspritechologist @DEATHB4DEFEAT

/Resources/Maps/ @Pspritechologist @DEATHB4DEFEAT

/Resources/Prototypes/Maps @Pspritechologist @DEATHB4DEFEAT
/Resources/Prototypes/SimpleStation14/ @Pspritechologist @DEATHB4DEFEAT
/Resources/Prototypes/Parkstation/ @Pspritechologist @DEATHB4DEFEAT

/Resources/Textures/SimpleStation14/ @Pspritechologist @DEATHB4DEFEAT
/Resources/Textures/Parkstation/ @Pspritechologist @DEATHB4DEFEAT

*.ftl @Pspritechologist @DEATHB4DEFEAT

Expand Down
4 changes: 2 additions & 2 deletions ...4/Overlays/Shaders/NearsightedOverlays.cs → ...n/Overlays/Shaders/NearsightedOverlays.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using Content.Shared.SimpleStation14.Traits.Components;
using Content.Shared.Parkstation.Traits.Components;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
using Robust.Client.Player;
using Robust.Shared.Enums;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;

namespace Content.Client.SimpleStation14.Overlays.Shaders;
namespace Content.Client.Parkstation.Overlays.Shaders;

public sealed class NearsightedOverlay : Overlay
{
Expand Down
8 changes: 4 additions & 4 deletions ...14/Overlays/Systems/NearsightedSystems.cs → ...on/Overlays/Systems/NearsightedSystems.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Content.Client.SimpleStation14.Overlays.Shaders;
using Content.Client.Parkstation.Overlays.Shaders;
using Content.Shared.Inventory.Events;
using Content.Shared.SimpleStation14.Traits;
using Content.Shared.SimpleStation14.Traits.Components;
using Content.Shared.Parkstation.Traits;
using Content.Shared.Parkstation.Traits.Components;
using Content.Shared.Tag;
using Robust.Client.Graphics;

namespace Content.Client.SimpleStation14.Overlays.Systems;
namespace Content.Client.Parkstation.Overlays.Systems;

public sealed class NearsightedSystem : EntitySystem
{
Expand Down
2 changes: 1 addition & 1 deletion .../Speech/Components/RandomBarkComponent.cs → .../Speech/Components/RandomBarkComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Content.Server.SimpleStation14.Speech.Components;
namespace Content.Server.Parkstation.Speech.Components;

/// <summary>
/// Sends a random message from a list with a provided min/max time.
Expand Down
4 changes: 2 additions & 2 deletions ...tion14/Speech/Systems/RandomBarkSystem.cs → ...tation/Speech/Systems/RandomBarkSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Content.Server.Chat.Systems;
using Content.Shared.Mind.Components;
using Robust.Shared.Random;
using Content.Server.SimpleStation14.Speech.Components;
using Content.Server.Parkstation.Speech.Components;

namespace Content.Server.SimpleStation14.Speech.Systems;
namespace Content.Server.Parkstation.Speech.Systems;

public sealed class RandomBarkSystem : EntitySystem
{
Expand Down
2 changes: 1 addition & 1 deletion ...onents/ClothingGrantComponentComponent.cs → ...onents/ClothingGrantComponentComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Robust.Shared.Prototypes;

namespace Content.Shared.SimpleStation14.Clothing
namespace Content.Shared.Parkstation.Clothing.Components
{
[RegisterComponent]
public sealed partial class ClothingGrantComponentComponent : Component
Expand Down
2 changes: 1 addition & 1 deletion ...g/Components/ClothingGrantTagComponent.cs → ...g/Components/ClothingGrantTagComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Content.Shared.SimpleStation14.Clothing;
namespace Content.Shared.Parkstation.Clothing.Components;

[RegisterComponent]
public sealed partial class ClothingGrantTagComponent : Component
Expand Down
5 changes: 3 additions & 2 deletions ...lothing/Systems/ClothingGrantingSystem.cs → ...lothing/Systems/ClothingGrantingSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Content.Shared.Clothing.Components;
using Content.Shared.Inventory.Events;
using Robust.Shared.Serialization.Manager;
using Content.Shared.Parkstation.Clothing.Components;
using Content.Shared.Tag;
using Robust.Shared.Serialization.Manager;

namespace Content.Shared.SimpleStation14.Clothing;
namespace Content.Shared.Parkstation.Clothing.Systems;

public sealed class ClothingGrantingSystem : EntitySystem
{
Expand Down
2 changes: 1 addition & 1 deletion ...tation14/Physics/FrictionRemoverSystem.cs → ...kstation/Physics/FrictionRemoverSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Systems;

namespace Content.Shared.SimpleStation14.Physics;
namespace Content.Shared.Parkstation.Physics;

public sealed class FrictionRemoverSystem : EntitySystem
{
Expand Down
2 changes: 1 addition & 1 deletion ...Traits/Components/NearsightedComponent.cs → ...Traits/Components/NearsightedComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Robust.Shared.GameStates;

namespace Content.Shared.SimpleStation14.Traits.Components;
namespace Content.Shared.Parkstation.Traits.Components;

/// <summary>
/// Owner entity cannot see well, without prescription glasses.
Expand Down
0 ...io/SimpleStation14/Music/attributions.yml → .../Audio/Parkstation/Music/attributions.yml
View file
Open in desktop
File renamed without changes.
0 .../Audio/SimpleStation14/Music/deadline.ogg → ...rces/Audio/Parkstation/Music/deadline.ogg
View file
Open in desktop
File renamed without changes.
0 ...es/Changelog/SimpleStation14Changelog.yml → Resources/Changelog/ParkstationChangelog.yml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Resources/ConfigPresets/SimpleStation14/Parkstation.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ enabled = true
pathfinding = true

[server]
rules_file = "SimpleStation14/ParkstationRules.txt"
rules_file = "Parkstation/ParkstationRules.txt"
id = "parkstation"

# [whitelist]
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/info/rules.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Rules

ui-rules-header = SimpleStation Official Server Rules
ui-rules-header-rp = SimpleStation Roleplay Official Server Rules
ui-rules-header = Parkstation Official Server Rules
ui-rules-header-rp = Parkstation Roleplay Official Server Rules
ui-rules-accept = I have read and agree to follow the rules
ui-rules-wait = The accept button will be enabled after {$time} seconds.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/parkstation/Prototypes/Changelog/changelog.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
changelog-tab-title-ParkstationChangelog = Parkstation
0 ...ypes/Entities/Mobs/Customization/ears.ftl → ...ypes/Entities/Mobs/Customization/ears.ftl
View file
Open in desktop
File renamed without changes.
0 ...ypes/Entities/Mobs/Customization/eyes.ftl → ...ypes/Entities/Mobs/Customization/eyes.ftl
View file
Open in desktop
File renamed without changes.
0 ...ntities/Mobs/Customization/human_hair.ftl → ...ntities/Mobs/Customization/human_hair.ftl
View file
Open in desktop
File renamed without changes.
0 ...ntities/Mobs/Customization/ipcAntenna.ftl → ...ntities/Mobs/Customization/ipcAntenna.ftl
View file
Open in desktop
File renamed without changes.
0 ...ntities/Mobs/Customization/ipcScreens.ftl → ...ntities/Mobs/Customization/ipcScreens.ftl
View file
Open in desktop
File renamed without changes.
0 ...Entities/Mobs/Customization/reptilian.ftl → ...Entities/Mobs/Customization/reptilian.ftl
View file
Open in desktop
File renamed without changes.
0 ...es/Entities/Mobs/Customization/snouts.ftl → ...es/Entities/Mobs/Customization/snouts.ftl
View file
Open in desktop
File renamed without changes.
0 ...pes/Entities/Mobs/Customization/tails.ftl → ...pes/Entities/Mobs/Customization/tails.ftl
View file
Open in desktop
File renamed without changes.
0 ...pes/Entities/Mobs/Customization/wings.ftl → ...pes/Entities/Mobs/Customization/wings.ftl
View file
Open in desktop
File renamed without changes.
0 ...plestation14/Prototypes/Reagents/food.ftl → .../parkstation/Prototypes/Reagents/food.ftl
View file
Open in desktop
File renamed without changes.
0 ...tion14/Prototypes/job/job-description.ftl → ...tation/Prototypes/job/job-description.ftl
View file
Open in desktop
File renamed without changes.
0 ...plestation14/Prototypes/job/job-names.ftl → .../parkstation/Prototypes/job/job-names.ftl
View file
Open in desktop
File renamed without changes.
0 ...tion14/Prototypes/job/job-supervisors.ftl → ...tation/Prototypes/job/job-supervisors.ftl
View file
Open in desktop
File renamed without changes.
0 ...S/simplestation14/Traits/disabilities.ftl → ...en-US/parkstation/Traits/disabilities.ftl
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion Resources/Locale/en-US/simplestation14/Prototypes/Changelog/changelog.ftl
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
EpinephrineChemistryBottle: 3
Syringe: 5
Portafib: 1 # DeltaV - Add Portafibs, see Prototypes/DeltaV/Entities/Objects/Devices/Medical/portafib.yml
ClothingEyesGlasses: 5 # SimpleStation14 NearsightedTrait
ClothingEyesGlasses: 5 # Parkstation NearsightedTrait
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
tags:
- HamsterWearable
- WhitelistChameleon
- GlassesNearsight # SimpleStation14 NearsightedTrait
- GlassesNearsight # Parkstation NearsightedTrait

- type: entity
parent: ClothingEyesBase
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
netsync: false
noRot: true
drawdepth: Ghosts
sprite: SimpleStation14/Mobs/Ghosts/ghost_admin.rsi
sprite: Parkstation/Mobs/Ghosts/ghost_admin.rsi
state: animated
color: "#888888"
layers:
Expand Down
0 ...otypes/SimpleStation14/Access/service.yml → ...Prototypes/Parkstation/Access/service.yml
View file
Open in desktop
File renamed without changes.
0 ...Station14/Catalog/Fills/Lockers/heads.yml → ...rkstation/Catalog/Fills/Lockers/heads.yml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...tion14/Entities/Clothing/Hands/gloves.yml → ...tation/Entities/Clothing/Hands/gloves.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
description: Plain black gloves with yellow fiber fingertips, for the distinguished roboticist.
components:
- type: Sprite
sprite: SimpleStation14/Clothing/Hands/Gloves/fingerless_insuls.rsi
sprite: Parkstation/Clothing/Hands/Gloves/fingerless_insuls.rsi
- type: Clothing
sprite: SimpleStation14/Clothing/Hands/Gloves/fingerless_insuls.rsi
sprite: Parkstation/Clothing/Hands/Gloves/fingerless_insuls.rsi
- type: GloveHeatResistance
heatResistance: 1400
- type: Insulated
Expand Down
2 changes: 1 addition & 1 deletion ...tities/Clothing/Head/hardsuit-helmets.yml → ...tities/Clothing/Head/hardsuit-helmets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
components:
- type: Sprite
netsync: false
sprite: SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi
sprite: Parkstation/Clothing/Head/Hardsuits/hopsuit.rsi
layers:
- state: icon
- state: light-overlay
Expand Down
4 changes: 2 additions & 2 deletions ...on14/Entities/Clothing/Head/hardsuits.yml → ...tion/Entities/Clothing/Head/hardsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
description: A stylish hardsuit for only the most esteemed crew members. Doesn't offer much damage protection.
components:
- type: Sprite
sprite: SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi
sprite: Parkstation/Clothing/OuterClothing/Hardsuits/hopsuit.rsi
- type: Clothing
sprite: SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi
sprite: Parkstation/Clothing/OuterClothing/Hardsuits/hopsuit.rsi
- type: PressureProtection
highPressureMultiplier: 0.02
lowPressureMultiplier: 4500
Expand Down
4 changes: 2 additions & 2 deletions ...Entities/Clothing/OuterClothing/coats.yml → ...Entities/Clothing/OuterClothing/coats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
description: A snazzy pinstripe jacket, fit for only the classiest of Heads.
components:
- type: Sprite
sprite: SimpleStation14/Clothing/OuterClothing/Coats/css_jacket.rsi
sprite: Parkstation/Clothing/OuterClothing/Coats/css_jacket.rsi
- type: Clothing
sprite: SimpleStation14/Clothing/OuterClothing/Coats/css_jacket.rsi
sprite: Parkstation/Clothing/OuterClothing/Coats/css_jacket.rsi
4 changes: 2 additions & 2 deletions ...Entities/Clothing/Uniforms/jumpskirts.yml → ...Entities/Clothing/Uniforms/jumpskirts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
description: A sharp, green waistcoat. Smart, but flashy.
components:
- type: Sprite
sprite: SimpleStation14/Clothing/Uniforms/Jumpskirt/css.rsi
sprite: Parkstation/Clothing/Uniforms/Jumpskirt/css.rsi
- type: Clothing
sprite: SimpleStation14/Clothing/Uniforms/Jumpskirt/css.rsi
sprite: Parkstation/Clothing/Uniforms/Jumpskirt/css.rsi
4 changes: 2 additions & 2 deletions .../Entities/Clothing/Uniforms/jumpsuits.yml → .../Entities/Clothing/Uniforms/jumpsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
description: A sharp, green waistcoat. Smart, but flashy.
components:
- type: Sprite
sprite: SimpleStation14/Clothing/Uniforms/Jumpsuit/css.rsi
sprite: Parkstation/Clothing/Uniforms/Jumpsuit/css.rsi
- type: Clothing
sprite: SimpleStation14/Clothing/Uniforms/Jumpsuit/css.rsi
sprite: Parkstation/Clothing/Uniforms/Jumpsuit/css.rsi
0 ...tion14/Entities/Markers/Spawners/jobs.yml → ...tation/Entities/Markers/Spawners/jobs.yml
View file
Open in desktop
File renamed without changes.
20 changes: 10 additions & 10 deletions ...4/Entities/Mobs/Customization/antenna.yml → ...n/Entities/Mobs/Customization/antenna.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: SimpleStation14/Mobs/Customization/ipc_antenna.rsi
- sprite: Parkstation/Mobs/Customization/ipc_antenna.rsi
state: ipc_antenna_tv

- type: marking
Expand All @@ -13,7 +13,7 @@
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: SimpleStation14/Mobs/Customization/ipc_antenna.rsi
- sprite: Parkstation/Mobs/Customization/ipc_antenna.rsi
state: ipc_antenna_tesla

# - type: marking
Expand All @@ -22,7 +22,7 @@
# bodyPart: Hair
# markingCategory: Hair
# sprites:
# - sprite: SimpleStation14/Mobs/Customization/ipc_antenna.rsi
# - sprite: Parkstation/Mobs/Customization/ipc_antenna.rsi
# state: ipc_antenna_lightb

# - type: marking
Expand All @@ -31,7 +31,7 @@
# bodyPart: Hair
# markingCategory: Hair
# sprites:
# - sprite: SimpleStation14/Mobs/Customization/ipc_antenna.rsi
# - sprite: Parkstation/Mobs/Customization/ipc_antenna.rsi
# state: ipc_antenna_light

- type: marking
Expand All @@ -40,7 +40,7 @@
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: SimpleStation14/Mobs/Customization/ipc_antenna.rsi
- sprite: Parkstation/Mobs/Customization/ipc_antenna.rsi
state: ipc_antenna_cyberhead

# - type: marking
Expand All @@ -49,7 +49,7 @@
# bodyPart: Hair
# markingCategory: Hair
# sprites:
# - sprite: SimpleStation14/Mobs/Customization/ipc_antenna.rsi
# - sprite: Parkstation/Mobs/Customization/ipc_antenna.rsi
# state: ipc_antenna_sidelights

- type: marking
Expand All @@ -58,7 +58,7 @@
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: SimpleStation14/Mobs/Customization/ipc_antenna.rsi
- sprite: Parkstation/Mobs/Customization/ipc_antenna.rsi
state: ipc_antenna_antlers

- type: marking
Expand All @@ -67,7 +67,7 @@
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: SimpleStation14/Mobs/Customization/ipc_antenna.rsi
- sprite: Parkstation/Mobs/Customization/ipc_antenna.rsi
state: ipc_antenna_droneeyes

- type: marking
Expand All @@ -76,7 +76,7 @@
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: SimpleStation14/Mobs/Customization/ipc_antenna.rsi
- sprite: Parkstation/Mobs/Customization/ipc_antenna.rsi
state: ipc_antenna_crowned

- type: marking
Expand All @@ -85,5 +85,5 @@
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: SimpleStation14/Mobs/Customization/ipc_antenna.rsi
- sprite: Parkstation/Mobs/Customization/ipc_antenna.rsi
state: ipc_antenna_towers
Loading
Loading