Merge branch 'master' into DeltaV-Station_Delta-v_1016_2024-04-07

Resources/Changelog/Changelog.yml

@@ -4038,3 +4038,11 @@ Entries:
       message: Species in the character editor have a shortcut to their guidebook entry
   id: 6105
   time: '2024-03-23T02:09:54.0000000+00:00'
+- author: LovelyLophi
+  changes:
+    - type: Tweak
+      message: >-
+        Sectech now says "Crack communist skulls!" instead of "Crack syndicate
+        skulls!"
+  id: 6106
+  time: '2024-04-17T04:07:41.0000000+00:00'

Resources/Locale/en-US/advertisements/vending/sectech.ftl

@@ -1,4 +1,4 @@
-advertisement-sectech-1 = Crack syndicate skulls!
+advertisement-sectech-1 = Crack communist skulls!
 advertisement-sectech-2 = Beat some heads in!
 advertisement-sectech-3 = Don't forget - harm is good!
 advertisement-sectech-4 = Your weapons are right here.

Resources/Prototypes/Entities/Markers/Spawners/Random/fancytables.yml

@@ -0,0 +1,22 @@
+- type: entity
+  name: random fancy table spawner
+  id: FancyTableSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Furniture/Tables/Fancy/blue.rsi
+          state: full
+    - type: RandomSpawner
+      prototypes:
+        - TableFancyBlue
+        - TableFancyCyan
+        - TableFancyBlack
+        - TableFancyRed
+        - TableFancyPurple
+        - TableFancyPink
+        - TableFancyGreen
+        - TableFancyOrange
+        - TableFancyWhite
+      offset: 0.0