Merge branch 'master' into Sort-departments

Simple-Station · Mar 15, 2024 · de5b4fc · de5b4fc
2 parents 1b13541 + 9053d1d
commit de5b4fc
Show file tree

Hide file tree

Showing 13 changed files with 146 additions and 1 deletion.
diff --git a/.github/labeler.yml b/.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"
diff --git a/Content.Server/Speech/EntitySystems/VocalSystem.cs b/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);
     }
 

diff --git a/Resources/Changelog/SimpleStation14Changelog.yml b/Resources/Changelog/SimpleStation14Changelog.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'
diff --git a/Resources/ConfigPresets/SimpleStation14/Parkstation.toml b/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 = "SimpleStation14/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"
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/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

diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/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

diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/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

diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/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:

diff --git a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml b/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

diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/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

diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/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

diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/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:

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Materials/materials.yml
@@ -9,6 +9,7 @@
     layers:
       - state: bluespace_3
         map: ["base"]
+    scale: 1, 1 # Parkstation-SmallerMaterials - Bluespace looks fine normally
   - type: Appearance
   - type: Material
   - type: PhysicalComposition
@@ -51,6 +52,7 @@
   - type: Sprite
     sprite: Nyanotrasen/Objects/Materials/mothroach.rsi
     state: mothroachhide
+    scale: 0.65, 0.65 # Parkstation-SmallerMaterials
   - type: Tag
     tags:
       - MothroachHide