Merge remote-tracking branch 'upstream/stable' into ed-15-10-2024-upstream

# Conflicts: # Content.Server/Station/Systems/StationSpawningSystem.cs
2024-10-15 15:25:44 +03:00
parent d259191d3d 519a6b2474
commit dc47bb2283
146 changed files with 11990 additions and 20002 deletions
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -312,3 +312,14 @@
      - WhitelistChameleon
  - type: StaticPrice
    price: 1
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHairflower
+  name: hairflower
+  description: A beautiful hairflower that can be inserted between locks of hair.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/hairflower.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/hairflower.rsi
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -47,8 +47,6 @@
      collection: FootstepDuck
      params:
        variation: 0.07
-  - type: WaddleWhenWorn
-    tumbleIntensity: 10 # smaller than clown shoes
  - type: Construction
    graph: ClothingShoeSlippersDuck
    node: shoes
--- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -15,7 +15,6 @@
  parent: [ClothingShoesBaseButcherable, ClothingSlotBase]
  id: ClothingShoesClownBase
  components:
-  - type: WaddleWhenWorn
  - type: ItemSlots
    slots:
      item:
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -96,7 +96,7 @@
 - type: entity
  id: ActionAGhostShowSolar
  name: Solar Control Interface
-  description: View a solar control interface.
+  description: View a Solar Control Interface.
  components:
  - type: InstantAction
    icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -108,7 +108,7 @@
 - type: entity
  id: ActionAGhostShowCommunications
  name: Communications Interface
-  description: View a communications interface.
+  description: View a Communications Interface.
  components:
  - type: InstantAction
    icon: { sprite: Interface/Actions/actions_ai.rsi, state: comms_console }
@@ -120,7 +120,7 @@
 - type: entity
  id: ActionAGhostShowRadar
  name: Mass Scanner Interface
-  description: View a mass scanner interface.
+  description: View a Mass Scanner Interface.
  components:
  - type: InstantAction
    icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner }
@@ -132,7 +132,7 @@
 - type: entity
  id: ActionAGhostShowCargo
  name: Cargo Ordering Interface
-  description: View a cargo ordering interface.
+  description: View a Cargo Ordering Interface.
  components:
  - type: InstantAction
    icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -144,7 +144,7 @@
 - type: entity
  id: ActionAGhostShowCrewMonitoring
  name: Crew Monitoring Interface
-  description: View a crew monitoring interface.
+  description: View a Crew Monitoring Interface.
  components:
  - type: InstantAction
    icon: { sprite: Interface/Actions/actions_ai.rsi, state: crew_monitor }
@@ -156,7 +156,7 @@
 - type: entity
  id: ActionAGhostShowStationRecords
  name: Station Records Interface
-  description: View a station records Interface.
+  description: View a Station Records Interface.
  components:
  - type: InstantAction
    icon: { sprite: Interface/Actions/actions_ai.rsi, state: station_records }
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -150,7 +150,9 @@
    tags:
    - CannotSuicide
    - DoorBumpOpener
-
+  - type: Puller
+    needsHands: false
+    
 - type: entity
  parent: BaseMobDragon
  id: MobDragon
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -23,7 +23,7 @@
        - ReagentId: Vitamin
          Quantity: 5
  - type: Food #All pies here made with a pie tin; unless you're some kind of savage, you're probably not destroying this when you eat or slice the pie!
-    trash: 
+    trash:
    - FoodPlateTin
  - type: SliceableFood
    count: 4
@@ -317,6 +317,43 @@
    - Slice
 # Tastes like pie, meat.

+- type: entity
+  name: pumpkin pie
+  parent: FoodPieBase
+  id: FoodPiePumpkin
+  description: Someone should turn this into a latte!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - pumpkin
+  - type: Sprite
+    layers:
+    - state: tin
+    - state: pumpkin
+  - type: SliceableFood
+    slice: FoodPiePumpkinSlice
+  - type: Tag
+    tags:
+    - Pie
+
+- type: entity
+  name: slice of pumpkin pie
+  parent: FoodPieSliceBase
+  id: FoodPiePumpkinSlice
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - pumpkin
+  - type: Sprite
+    layers:
+    - state: pumpkin-slice
+  - type: Tag
+    tags:
+    - Pie
+    - Slice
+
 - type: entity
  name: xeno pie
  parent: FoodPieBase
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -69,6 +69,10 @@
          Searching: { state: pai-searching-overlay }
          On: { state: pai-on-overlay }
  - type: StationMap
+  - type: ChangeVoiceInContainer
+    whitelist:
+      components:
+        - SecretStash

 - type: entity
  parent: [ PersonalAI, BaseSyndicateContraband]
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -52,6 +52,24 @@
        reagents:
        - ReagentId: Fiber
          Quantity: 10
+  - type: ContainerContainer
+    containers:
+      stash: !type:ContainerSlot {}
+  - type: Speech
+    speechVerb: Default # for pais (In the secret stash)
+  - type: SecretStash
+    secretStashName: secret-stash-plushie
+    blacklist:
+      components:
+      - SecretStash # Prevents being able to insert plushies inside each other (infinite plush)!
+      - NukeDisk # Could confuse the nukies if they don't know that plushies have a stash.
+      tags:
+      - QuantumSpinInverter # It will cause issues with the grinder...
+      - FakeNukeDisk # So you can't tell if the nuke disk is real or fake depending on if it can be inserted or not.
+  - type: ToolOpenable
+    openToolQualityNeeded: Slicing
+    closeToolQualityNeeded: Slicing # Should probably be stitching or something if that gets added
+    name: secret-stash-plushie

 - type: entity
  parent: BasePlushie
@@ -323,6 +341,8 @@
    equippedPrefix: lizard
    slots:
    - HEAD
+  - type: Speech
+    speechVerb: Reptilian # for pais (In the secret stash)

 - type: entity
  parent: PlushieLizard
--- a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml
@@ -35,3 +35,6 @@
    state: icon
  - type: StaticPrice
    price: 1 # it's worth even less than normal items. Perfection.
+  - type: Tag
+    tags:
+    - FakeNukeDisk
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -97,7 +97,7 @@
  name: pocket fire extinguisher
  parent: FireExtinguisher
  id: FireExtinguisherMini
-  description: A light and compact fibreglass-framed model fire extinguisher. It holds less water then its bigger brother.
+  description: A light and compact fibreglass-framed model fire extinguisher. It holds less water than its bigger brother.
  components:
  - type: Sprite
    sprite: Objects/Misc/fire_extinguisher_mini.rsi
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -443,7 +443,7 @@
    - state: default
    - state: idvisitor
  - type: IdCard
-    jobTitle: Visitor
+    jobTitle: job-title-visitor
    jobIcon: JobIconVisitor
  - type: PresetIdCard
    job: Visitor
@@ -741,7 +741,7 @@
    - state: default
    - state: idcluwne
  - type: IdCard
-    jobTitle: Cluwne
+    jobTitle: job-title-cluwne
  - type: Unremoveable

 - type: entity
@@ -801,7 +801,7 @@
  - type: Item
    heldPrefix: green
  - type: IdCard
-    jobTitle: Universal
+    jobTitle: job-title-universal
    jobIcon: JobIconAdmin
  - type: Access
    groups:
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -129,6 +129,7 @@
  - type: Tag
    tags:
    - LightBulb
+    - Trash

 - type: entity
  parent: BaseLightbulb
@@ -147,6 +148,7 @@
  - type: Tag
    tags:
    - LightBulb
+    - Trash

 - type: entity
  parent: LightBulb
@@ -160,9 +162,6 @@
    lightEnergy: 0.3 # old incandescents just arent as bright
    lightRadius: 6
    lightSoftness: 1.1
-  - type: Tag
-    tags:
-    - LightBulb

 - type: entity
  suffix: Broken
@@ -190,6 +189,7 @@
  - type: Tag
    tags:
    - LightBulb
+    - Trash

 - type: entity
  parent: BaseLightTube
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
@@ -54,10 +54,10 @@
    beepSound: /Audio/Machines/Nuke/general_beep.ogg
    startOnStick: true
    canToggleStartOnStick: true
-  - type: TriggerOnSignal
+  - type: TimerStartOnSignal
  - type: DeviceLinkSink
    ports:
-      - Trigger
+      - Timer
  - type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating.
    explosionType: DemolitionCharge
    totalIntensity: 60
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -647,7 +647,7 @@
  - type: Clothing
    sprite: Objects/Weapons/Guns/Revolvers/chimp.rsi
  - type: Gun
-    projectileSpeed: 4
+    projectileSpeed: 10
    fireRate: 1.5
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -106,6 +106,22 @@
  components:
  - type: Sprite
    sprite: Objects/Weapons/Grenades/syndgrenade.rsi
+  - type: ExplosionResistance
+    damageCoefficient: 0.1
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:TimerStartBehavior
+    - trigger:
+        !type:DamageTrigger
+        damage: 45
+      behaviors:
+      - !type:TriggerBehavior
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
  - type: OnUseTimerTrigger
    delay: 5
  - type: ExplodeOnTrigger
--- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
@@ -49,7 +49,7 @@
        spawn:
          MaterialCloth1:
            min: 1
-            max: 2
+            max: 1
  - type: WallMount
    arc: 360

--- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -25,6 +25,8 @@
    offset: "0.0,0.3"
    sprite: Structures/Furniture/potted_plants.rsi
    noRot: true
+  - type: Speech
+    speechVerb: Plant # for pais (In the secret stash)
  - type: SecretStash
    tryInsertItemSound: /Audio/Effects/plant_rustle.ogg
    tryRemoveItemSound: /Audio/Effects/plant_rustle.ogg
--- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
@@ -184,7 +184,7 @@
    guides:
    - APE
  - type: Gun
-    projectileSpeed: 4
+    projectileSpeed: 10
    fireRate: 10 #just has to be fast enough to keep up with upgrades
    showExamineText: false
    selectedMode: SemiAuto