Merge branch 'master' into droponslip

.github/CODEOWNERS

@@ -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
 

.github/labeler.yml

@@ -1,6 +1,15 @@
 "Changes: C#":
   - "**/*.cs"
 
+"Changes: Config":
+  - "**/*.toml"
+  - "**/*.config"
+  - "*.json"
+  - ".github/*.yml"
+  - ".github/*.json"
+  - ".vscode/*.json"
+  - ".editorconfig"
+
 "Changes: Documentation":
   - "**/*.xml"
   - "**/*.md"
@@ -22,3 +31,6 @@
 "Changes: YML":
   - any: ["**/*.yml"]
     all: ["!Resources/Maps/**/*.yml", "!Resources/Prototypes/Maps/**/*.yml"]
+
+"Changes: Workflow":
+  - ".github/workflows/*.yml"

Content.Client/SimpleStation14/Overlays/Shaders/NearsightedOverlays.cs → Content.Client/Parkstation/Overlays/Shaders/NearsightedOverlays.cs

@@ -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
 {

Content.Client/SimpleStation14/Overlays/Systems/NearsightedSystems.cs → Content.Client/Parkstation/Overlays/Systems/NearsightedSystems.cs

@@ -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
 {

Content.Server/SimpleStation14/Speech/Components/RandomBarkComponent.cs → Content.Server/Parkstation/Speech/Components/RandomBarkComponent.cs

@@ -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.

Content.Server/SimpleStation14/Speech/Systems/RandomBarkSystem.cs → Content.Server/Parkstation/Speech/Systems/RandomBarkSystem.cs

@@ -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
 {

Content.Server/Speech/EntitySystems/VocalSystem.cs

@@ -33,7 +33,7 @@ public override void Initialize()
     private void OnMapInit(EntityUid uid, VocalComponent component, MapInitEvent args)
     {
         // try to add scream action when vocal comp added
-        _actions.AddAction(uid, ref component.ScreamActionEntity, component.ScreamAction);
+        // _actions.AddAction(uid, ref component.ScreamActionEntity, component.ScreamAction); // Parkstation-RemoveScreamAction
         LoadSounds(uid, component);
     }
 

Content.Shared/SimpleStation14/Clothing/Components/ClothingGrantComponentComponent.cs → Content.Shared/Parkstation/Clothing/Components/ClothingGrantComponentComponent.cs

@@ -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

Content.Shared/SimpleStation14/Clothing/Components/ClothingGrantTagComponent.cs → Content.Shared/Parkstation/Clothing/Components/ClothingGrantTagComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Shared.SimpleStation14.Clothing;
+namespace Content.Shared.Parkstation.Clothing.Components;
 
 [RegisterComponent]
 public sealed partial class ClothingGrantTagComponent : Component

Content.Shared/SimpleStation14/Clothing/Systems/ClothingGrantingSystem.cs → Content.Shared/Parkstation/Clothing/Systems/ClothingGrantingSystem.cs

@@ -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
 {

Content.Shared/SimpleStation14/Physics/FrictionRemoverSystem.cs → Content.Shared/Parkstation/Physics/FrictionRemoverSystem.cs

@@ -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
 {

Content.Shared/SimpleStation14/Traits/Components/NearsightedComponent.cs → Content.Shared/Parkstation/Traits/Components/NearsightedComponent.cs

@@ -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.

Resources/Changelog/SimpleStation14Changelog.yml → Resources/Changelog/ParkstationChangelog.yml

@@ -83,3 +83,17 @@ Entries:
         or start moving instantly
   id: 11
   time: '2024-02-17T22:53:49.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Remove
+      message: >-
+        I have a mouth but must not scream (removed the scream action in favor
+        of emotes)
+  id: 12
+  time: '2024-03-10T08:11:11.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Tweak
+      message: Material sprites are no longer very large
+  id: 13
+  time: '2024-03-10T08:59:05.0000000+00:00'

Resources/ConfigPresets/SimpleStation14/Parkstation.toml

@@ -0,0 +1,107 @@
+[game]
+hostname = "[EN] 🌳 | Parkstation"
+desc = "An English MRP server focused on higher RP expectations and calmer rounds."
+maxplayers = 48
+soft_max_players = 32
+lobbyenabled = true
+lobbyduration = 180
+role_timers = true
+fallbackpreset = "extended"
+map_pool = "ParkMapPool"
+# loadouts_enabled = true
+# loadouts_points = 14
+
+[npc]
+enabled = true
+pathfinding = true
+
+[server]
+rules_file = "Parkstation/ParkstationRules.txt"
+id = "parkstation"
+
+# [whitelist]
+# enabled = true
+# min_players = 24
+
+# [queue]
+# enabled = true
+
+[rules]
+time = 120
+
+# [events]
+# ramping_average_end_time = 120.0
+# ramping_average_chaos = 7.0
+
+[traitor]
+min_players = 2
+players_per_traitor = 8
+starting_balance = 16
+
+[zombie]
+min_players = 10
+
+
+[mapping]
+autosave_interval = 180.0
+
+[atmos]
+space_wind = true
+space_wind_max_velocity = 22.0
+
+[shuttle]
+emergency_early_launch_allowed = true
+emergency_dock_time = 260.0
+emergency_transit_time_min = 120.0
+emergency_transit_time_max = 240.0
+recall_turning_point = 0.75
+auto_call_time = 150
+arrivals = false
+
+[biomass]
+easy_mode = false
+
+[explosion]
+tiles_per_tick = 128
+incremental_tile = false
+
+[ic]
+restricted_names = false
+flavor_text = true
+
+[ooc]
+enable_during_round = true
+
+[vote]
+map_enabled = true
+restart_enabled = true
+restart_required_ratio = 0.75
+restart_not_allowed_when_admin_online = true
+timermap = 45
+
+
+[hub]
+tags = "rp:med,region:am_n_e,lang:en,no_tag_infer"
+
+[log]
+path = "logs"
+format = "log_%(date)s-%(time)s.txt"
+level = 1
+enabled = true
+
+[net]
+tickrate = 30
+log_late_msg = false
+
+
+[infolinks]
+discord = "https://discord.gg/49KeKwXc8g"
+github = "https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw"
+patreon = "https://www.patreon.com/simple14"
+
+# [admin]
+# new_player_join_sound = true
+
+
+[build]
+fork_id = "Parkstation"

Resources/Locale/en-US/info/rules.ftl

@@ -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.

Resources/Locale/en-US/parkstation/Prototypes/Changelog/changelog.ftl

@@ -0,0 +1 @@
+changelog-tab-title-ParkstationChangelog = Parkstation

Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml

@@ -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

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -84,7 +84,7 @@
     tags:
     - HamsterWearable
     - WhitelistChameleon
-    - GlassesNearsight # SimpleStation14 NearsightedTrait
+    - GlassesNearsight # Parkstation NearsightedTrait
   - type: DropOnSlip
     chance: 30
 

Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml

@@ -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:

Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml

@@ -7,6 +7,7 @@
   components:
   - type: Sprite
     sprite: Objects/Materials/Sheets/glass.rsi
+    scale: 0.65, 0.65 # Parkstation-SmallerMaterials
   - type: Item
     sprite: Objects/Materials/Sheets/glass.rsi
     size: Normal

Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml

@@ -6,6 +6,7 @@
   components:
   - type: Sprite
     sprite: Objects/Materials/Sheets/metal.rsi
+    scale: 0.65, 0.65 # Parkstation-SmallerMaterials
   - type: Item
     sprite: Objects/Materials/Sheets/metal.rsi
     size: Normal

Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml

@@ -6,6 +6,7 @@
   components:
   - type: Sprite
     sprite: Objects/Materials/Sheets/other.rsi
+    scale: 0.65, 0.65 # Parkstation-SmallerMaterials
   - type: Item
     sprite: Objects/Materials/Sheets/other.rsi
     size: Normal

Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml

@@ -11,6 +11,7 @@
       - sprite: Objects/Materials/Shards/crystal.rsi
         state: shard1
         map: [ "enum.DamageStateVisualLayers.Base" ]
+    scale: 0.65, 0.65 # Parkstation-SmallerMaterials
   - type: RandomSprite
     available:
       - enum.DamageStateVisualLayers.Base:

Resources/Prototypes/Entities/Objects/Materials/ingots.yml

@@ -6,6 +6,7 @@
   components:
   - type: Sprite
     sprite: Objects/Materials/ingots.rsi
+    scale: 0.65, 0.65 # Parkstation-SmallerMaterials
   - type: Item
     sprite: Objects/Materials/ingots.rsi
     size: Normal

Resources/Prototypes/Entities/Objects/Materials/materials.yml

@@ -6,6 +6,7 @@
   components:
   - type: Sprite
     sprite: Objects/Materials/materials.rsi
+    scale: 0.65, 0.65 # Parkstation-SmallerMaterials
   - type: Item
     sprite: Objects/Materials/materials.rsi
     size: Normal
@@ -177,6 +178,7 @@
     layers:
     - state: durathread_3
       map: ["base"]
+    scale: 1, 1 # Parkstation-SmallerMaterials - Durathread looks fine normally
   - type: Appearance
   - type: Construction
     graph: Durathread
@@ -285,6 +287,7 @@
     sprite: /Textures/Objects/Misc/monkeycube.rsi
     state: cube
     color: "#8A9A5B"
+    scale: 1, 1 # Parkstation-SmallerMaterials - Biomass looks fine normally
   - type: GuideHelp
     guides:
     - Cloning

Resources/Prototypes/Entities/Objects/Materials/parts.yml

@@ -6,6 +6,7 @@
   - type: Sprite
     sprite: Objects/Materials/parts.rsi
     state: rods
+    scale: 0.65, 0.65 # Parkstation-SmallerMaterials
   - type: Item
     sprite: Objects/Materials/parts.rsi
   - type: Tag

Resources/Prototypes/Entities/Objects/Materials/shards.yml

@@ -10,6 +10,7 @@
       - sprite: Objects/Materials/Shards/shard.rsi
         state: shard1
         map: [ "enum.DamageStateVisualLayers.Base" ]
+    scale: 0.65, 0.65 # Parkstation-SmallerMaterials
   - type: RandomSprite
     available:
       - enum.DamageStateVisualLayers.Base: