Trim the PR A LOT

Simple-Station · Dec 11, 2024 · 0bfcc02 · 0bfcc02
1 parent bd796e8
commit 0bfcc02
Show file tree

Hide file tree

Showing 3,347 changed files with 157 additions and 29,789 deletions.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
@@ -338,28 +338,28 @@
     interactSuccessSound:
       path: /Audio/Animals/lizard_happy.ogg
 
-- type: entity
-  id: neutralXenoVents
-  parent: BaseGameRule
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: StationEvent
-    startAnnouncement: true
-    earliestStart: 20
-    reoccurrenceDelay: 12
-    minimumPlayers: 1
-    weight: 6 # Really weak compared to other critters
-    duration: 60
-  - type: VentCrittersRule
-    entries:
-    - id: MobXenoNeutralRouny
-      prob: 0.0075
-    - id: MobXenoNeutralDrone
-      prob: 0.0075
-    - id: MobXenoNeutralPraetorian
-      prob: 0.0075
-    - id: MobXenoNeutralRavager
-      prob: 0.0075
+#- type: entity
+#  id: neutralXenoVents
+#  parent: BaseGameRule
+#  categories: [ HideSpawnMenu ]
+#  components:
+#  - type: StationEvent
+#    startAnnouncement: true
+#    earliestStart: 20
+#    reoccurrenceDelay: 12
+#    minimumPlayers: 1
+#    weight: 6 # Really weak compared to other critters
+#    duration: 60
+#  - type: VentCrittersRule
+#    entries:
+#    - id: MobXenoNeutralRouny
+#      prob: 0.0075
+#    - id: MobXenoNeutralDrone
+#      prob: 0.0075
+#    - id: MobXenoNeutralPraetorian
+#      prob: 0.0075
+#    - id: MobXenoNeutralRavager
+#      prob: 0.0075
 
 - type: entity
   id: ArgocyteVents

diff --git a/Resources/Prototypes/Entities/Structures/Decoration/flags.yml b/Resources/Prototypes/Entities/Structures/Decoration/flags.yml
@@ -0,0 +1,84 @@
+# See Objects/Decoration/flags.yml for flag items. See wallmounts folder for wall flags.
+- type: entity
+  id: N14DecorationFlagBearerEmpty
+  name: flag bearer
+  description: A post for hanging flags.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Sprite
+    sprite: Structures/Decoration/flags.rsi
+    state: emptyflag
+    snapCardinals: true
+    netsync: false
+    noRot: true
+    drawdepth: Overdoors
+  - type: Damageable
+    damageModifierSet: Wood
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+  - type: InteractionOutline
+  - type: Clickable
+  - type: SpriteFade
+
+# Flammable flags
+- type: entity
+  parent: N14DecorationFlagBearerEmpty
+  id: N14DecorationFlagFlammable
+  noSpawn: true
+  components:
+  - type: Reactive
+    groups:
+      Flammable: [ Touch ]
+      Extinguish: [ Touch ]
+  - type: ExtinguishOnInteract
+    extinguishAttemptSound:
+      path: /Audio/Items/candle_blowing.ogg
+      params:
+        variation: 0.05
+        volume: 10
+  - type: UseDelay
+  - type: Flammable
+    fireSpread: true
+    canResistFire: false
+    alwaysCombustible: true
+    canExtinguish: true
+    firestacksOnIgnite: 3.0
+    firestackFade: -0.01
+    damage:
+      types:
+        Heat: 0.1
+  - type: Appearance
+  - type: FireVisuals
+    sprite: Mobs/Effects/onfire.rsi
+    normalState: Standing
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          N14DecorationFlagBearerEmpty:
+            min: 1
+            max: 1
diff --git a/...ties/Structures/Decoration/floordecor.yml → ...ties/Structures/Decoration/floordecor.yml b/...ties/Structures/Decoration/floordecor.yml → ...ties/Structures/Decoration/floordecor.yml
diff --git a/...ties/Structures/Decoration/junk_piles.yml → ...ties/Structures/Decoration/junk_piles.yml b/...ties/Structures/Decoration/junk_piles.yml → ...ties/Structures/Decoration/junk_piles.yml
diff --git a/.../Entities/Structures/Decoration/rails.yml → .../Entities/Structures/Decoration/rails.yml b/.../Entities/Structures/Decoration/rails.yml → .../Entities/Structures/Decoration/rails.yml
diff --git a/...ntities/Structures/Decoration/torches.yml → ...ntities/Structures/Decoration/torches.yml b/...ntities/Structures/Decoration/torches.yml → ...ntities/Structures/Decoration/torches.yml
diff --git a/...4/Entities/Structures/Storage/barrels.yml → ...s/Entities/Structures/Storage/barrels.yml b/...4/Entities/Structures/Storage/barrels.yml → ...s/Entities/Structures/Storage/barrels.yml
diff --git a/...4/Entities/Structures/Storage/closets.yml → ...s/Entities/Structures/Storage/closets.yml b/...4/Entities/Structures/Storage/closets.yml → ...s/Entities/Structures/Storage/closets.yml
diff --git a/...14/Entities/Structures/Storage/crates.yml → ...es/Entities/Structures/Storage/crates.yml b/...14/Entities/Structures/Storage/crates.yml → ...es/Entities/Structures/Storage/crates.yml
diff --git a/...Entities/Structures/Storage/furniture.yml → ...Entities/Structures/Storage/furniture.yml b/...Entities/Structures/Storage/furniture.yml → ...Entities/Structures/Storage/furniture.yml
diff --git a/...r14/Entities/Structures/Storage/tanks.yml → ...pes/Entities/Structures/Storage/tanks.yml b/...r14/Entities/Structures/Storage/tanks.yml → ...pes/Entities/Structures/Storage/tanks.yml
diff --git a/...Entities/Structures/Wallmount/adverts.yml → ...Entities/Structures/Wallmount/adverts.yml b/...Entities/Structures/Wallmount/adverts.yml → ...Entities/Structures/Wallmount/adverts.yml
diff --git a/...es/Structures/Wallmount/base_lighting.yml → ...es/Structures/Wallmount/base_lighting.yml b/...es/Structures/Wallmount/base_lighting.yml → ...es/Structures/Wallmount/base_lighting.yml
diff --git a/...s/Structures/Wallmount/chalkboardwall.yml → ...s/Structures/Wallmount/chalkboardwall.yml b/...s/Structures/Wallmount/chalkboardwall.yml → ...s/Structures/Wallmount/chalkboardwall.yml
diff --git a/...ctures/Wallmount/extinguisher_cabinet.yml → ...ctures/Wallmount/extinguisher_cabinet.yml b/...ctures/Wallmount/extinguisher_cabinet.yml → ...ctures/Wallmount/extinguisher_cabinet.yml
diff --git a/...Entities/Structures/Wallmount/hydrant.yml → ...Entities/Structures/Wallmount/hydrant.yml b/...Entities/Structures/Wallmount/hydrant.yml → ...Entities/Structures/Wallmount/hydrant.yml
diff --git a/...ctures/Wallmount/monitors_televisions.yml → ...ctures/Wallmount/monitors_televisions.yml b/...ctures/Wallmount/monitors_televisions.yml → ...ctures/Wallmount/monitors_televisions.yml
diff --git a/...ties/Structures/Wallmount/noticeboard.yml → ...ties/Structures/Wallmount/noticeboard.yml b/...ties/Structures/Wallmount/noticeboard.yml → ...ties/Structures/Wallmount/noticeboard.yml
diff --git a/...Entities/Structures/Wallmount/posters.yml → ...Entities/Structures/Wallmount/posters.yml b/...Entities/Structures/Wallmount/posters.yml → ...Entities/Structures/Wallmount/posters.yml
diff --git a/...4/Entities/Structures/Wallmount/signs.yml → ...s/Entities/Structures/Wallmount/signs.yml b/...4/Entities/Structures/Wallmount/signs.yml → ...s/Entities/Structures/Wallmount/signs.yml
diff --git a/...uctures/Wallmount/surveillance_camera.yml → ...uctures/Wallmount/surveillance_camera.yml b/...uctures/Wallmount/surveillance_camera.yml → ...uctures/Wallmount/surveillance_camera.yml
diff --git a/.../Structures/Wallmount/switch_autolink.yml → .../Structures/Wallmount/switch_autolink.yml b/.../Structures/Wallmount/switch_autolink.yml → .../Structures/Wallmount/switch_autolink.yml
diff --git a/...tities/Structures/Wallmount/walldecor.yml → ...tities/Structures/Wallmount/walldecor.yml b/...tities/Structures/Wallmount/walldecor.yml → ...tities/Structures/Wallmount/walldecor.yml
diff --git a/...ities/Structures/Wallmount/wallmounts.yml → ...ities/Structures/Wallmount/wallmounts.yml b/...ities/Structures/Wallmount/wallmounts.yml → ...ities/Structures/Wallmount/wallmounts.yml
diff --git a/...ies/Structures/Windows/slantedwindows.yml → ...ies/Structures/Windows/slantedwindows.yml b/...ies/Structures/Windows/slantedwindows.yml → ...ies/Structures/Windows/slantedwindows.yml
diff --git a/...tities/Structures/Windows/tallwindows.yml → ...tities/Structures/Windows/tallwindows.yml b/...tities/Structures/Windows/tallwindows.yml → ...tities/Structures/Windows/tallwindows.yml
diff --git a/...ities/Structures/Windows/windowcovers.yml → ...ities/Structures/Windows/windowcovers.yml b/...ities/Structures/Windows/windowcovers.yml → ...ities/Structures/Windows/windowcovers.yml
diff --git a/...4/Entities/Structures/Windows/windows.yml → ...s/Entities/Structures/Windows/windows.yml b/...4/Entities/Structures/Windows/windows.yml → ...s/Entities/Structures/Windows/windows.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Decoration/bonfire.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Decoration/flags.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Decoration/flags.yml