Merge remote-tracking branch 'upstream/master' into ed-04-06-2024-upstream

# Conflicts: # Resources/Prototypes/Accents/word_replacements.yml
2024-06-04 18:09:38 +03:00
parent 95b726c0ff d5019cee96
commit b891542ca9
418 changed files with 3648 additions and 3761 deletions
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -257,6 +257,16 @@
  - type: Sprite
    sprite: Clothing/Back/Backpacks/ertchaplain.rsi

+- type: entity
+  parent: ClothingBackpackERTSecurity
+  id: ClothingBackpackDeathSquad
+  name: death squad backpack
+  description: Holds the kit of CentComm's most feared agents.
+  components:
+    - type: Storage
+      grid:
+      - 0,0,7,6
+
 #Syndicate
 - type: entity
  parent: ClothingBackpack
--- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
@@ -21,7 +21,6 @@
  id: ActionToggleMask
  name: Toggle Mask
  description: Handy, but prevents insertion of pie into your pie hole.
-  noSpawn: true
  components:
  - type: InstantAction
    icon: { sprite: Clothing/Mask/gas.rsi, state: icon }
@@ -49,4 +48,4 @@
          Quantity: 10
  - type: Tag
    tags:
-      - ClothMade
+      - ClothMade
--- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
@@ -8,7 +8,7 @@
    sprite: Clothing/Neck/Cloaks/centcomcloakformal.rsi
  - type: StealTarget
    stealGroup: HeadCloak # leaving this here because I suppose it might be interesting?
-    
+
 - type: entity
  parent: ClothingNeckBase
  id: ClothingNeckCloakCap
@@ -118,7 +118,7 @@
 - type: entity
  parent: ClothingNeckBase
  id: ClothingNeckCloakAdmin
-  name: admin cloak
+  name: weh cloak
  description: Weh!
  components:
  - type: Sprite
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -70,7 +70,6 @@
 - type: entity
  id: ActionStethoscope
  name: Listen with stethoscope
-  noSpawn: true
  components:
  - type: EntityTargetAction
    icon:
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -132,7 +132,6 @@
  id: ActionBaseToggleMagboots
  name: Toggle Magboots
  description: Toggles the magboots on and off.
-  noSpawn: true
  components:
  - type: InstantAction
    itemIconStyle: NoItem
@@ -141,7 +140,6 @@
 - type: entity
  id: ActionToggleMagboots
  parent: ActionBaseToggleMagboots
-  noSpawn: true
  components:
  - type: InstantAction
    icon: { sprite: Clothing/Shoes/Boots/magboots.rsi, state: icon }
@@ -150,7 +148,6 @@
 - type: entity
  id: ActionToggleMagbootsAdvanced
  parent: ActionBaseToggleMagboots
-  noSpawn: true
  components:
  - type: InstantAction
    icon: { sprite: Clothing/Shoes/Boots/magboots-advanced.rsi, state: icon }
@@ -159,7 +156,6 @@
 - type: entity
  id: ActionToggleMagbootsSci
  parent: ActionBaseToggleMagboots
-  noSpawn: true
  components:
  - type: InstantAction
    icon: { sprite: Clothing/Shoes/Boots/magboots-science.rsi, state: icon }
@@ -168,7 +164,6 @@
 - type: entity
  id: ActionToggleMagbootsSyndie
  parent: ActionBaseToggleMagboots
-  noSpawn: true
  components:
  - type: InstantAction
    icon: { sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi, state: icon }
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -128,7 +128,6 @@
  id: ActionToggleSpeedBoots
  name: Toggle Speed Boots
  description: Toggles the speed boots on and off.
-  noSpawn: true
  components:
  - type: InstantAction
    itemIconStyle: NoItem
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2255,7 +2255,7 @@
    - DoorBumpOpener
    - FootstepSound
  - type: Tool # Open door from xeno.yml.
-    speed: 1.5
+    speedModifier: 1.5
    qualities:
      - Prying
    useSound:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
@@ -7,7 +7,7 @@
  - type: InputMover
  - type: MobMover
  - type: Loadout
-    prototypes: [PassengerGear]
+    prototypes: [LimitedPassengerGear]
  - type: NpcFactionMember
    factions:
    - NanoTrasen
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -301,7 +301,6 @@
  id: ActionRatKingRaiseArmy
  name: Raise Army
  description: Spend some hunger to summon an allied rat to help defend you.
-  noSpawn: true
  components:
  - type: InstantAction
    useDelay: 4
@@ -314,7 +313,6 @@
  id: ActionRatKingDomain
  name: Rat King's Domain
  description: Spend some hunger to release a cloud of ammonia into the air.
-  noSpawn: true
  components:
  - type: InstantAction
    useDelay: 6
@@ -327,7 +325,6 @@
  id: ActionRatKingOrderStay
  name: Stay
  description: Command your army to stand in place.
-  noSpawn: true
  components:
  - type: InstantAction
    useDelay: 1
@@ -346,7 +343,6 @@
  id: ActionRatKingOrderFollow
  name: Follow
  description: Command your army to follow you around.
-  noSpawn: true
  components:
  - type: InstantAction
    useDelay: 1
@@ -365,7 +361,6 @@
  id: ActionRatKingOrderCheeseEm
  name: Cheese 'Em
  description: Command your army to attack whoever you point at.
-  noSpawn: true
  components:
  - type: InstantAction
    useDelay: 1
@@ -384,7 +379,6 @@
  id: ActionRatKingOrderLoose
  name: Loose
  description: Command your army to act at their own will.
-  noSpawn: true
  components:
  - type: InstantAction
    useDelay: 1
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -287,6 +287,8 @@
    interactFailureString: petting-failure-medibot
    interactSuccessSound:
      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: Advertise
+    pack: MedibotAds

 - type: entity
  parent: MobSiliconBase
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -22,7 +22,7 @@
      NavSmash: !type:Bool
        true
  - type: Tool
-    speed: 1.5
+    speedModifier: 1.5
    qualities:
      - Prying
  - type: Prying
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -84,8 +84,7 @@
  - type: Stripping
  - type: SolutionScanner
  - type: IgnoreUIRange
-  - type: ShowRevIcons
-  - type: ShowZombieIcons
+  - type: ShowAntagIcons
  - type: Inventory
    templateId: aghost
  - type: InventorySlots
@@ -97,7 +96,6 @@
  id: ActionAGhostShowSolar
  name: Solar Control Interface
  description: View a solar control interface.
-  noSpawn: true
  components:
  - type: InstantAction
    icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -110,7 +108,6 @@
  id: ActionAGhostShowCommunications
  name: Communications Interface
  description: View a communications interface.
-  noSpawn: true
  components:
  - type: InstantAction
    icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -123,7 +120,6 @@
  id: ActionAGhostShowRadar
  name: Mass Scanner Interface
  description: View a mass scanner interface.
-  noSpawn: true
  components:
  - type: InstantAction
    icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -136,7 +132,6 @@
  id: ActionAGhostShowCargo
  name: Cargo Ordering Interface
  description: View a cargo ordering interface.
-  noSpawn: true
  components:
  - type: InstantAction
    icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -149,7 +144,6 @@
  id: ActionAGhostShowCrewMonitoring
  name: Crew Monitoring Interface
  description: View a crew monitoring interface.
-  noSpawn: true
  components:
  - type: InstantAction
    icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -162,7 +156,6 @@
  id: ActionAGhostShowStationRecords
  name: Station Records Interface
  description: View a station records Interface
-  noSpawn: true
  components:
  - type: InstantAction
    icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -203,7 +203,6 @@
  id: ActionSpawnRift
  name: Summon Carp Rift
  description: Summons a carp rift that will periodically spawns carps.
-  noSpawn: true
  components:
  - type: InstantAction
    icon:
@@ -217,7 +216,6 @@
  id: ActionDevour
  name: "[color=red]Devour[/color]"
  description: Attempt to break a structure with your jaws or swallow a creature.
-  noSpawn: true
  components:
  - type: EntityTargetAction
    icon: { sprite : Interface/Actions/devour.rsi, state: icon }
@@ -226,7 +224,6 @@
    priority: 1

 - type: entity
-  noSpawn: true
  id: ActionDragonsBreath
  name: "[color=orange]Dragon's Breath[/color]"
  description: Spew out flames at anyone foolish enough to attack you!
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -259,7 +259,6 @@
  id: ActionToggleGuardian
  name: Toggle Guardian
  description: Either manifests the guardian or recalls it back into your body
-  noSpawn: true
  components:
  - type: InstantAction
    icon: Interface/Actions/manifest.png
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -53,7 +53,6 @@
  id: ActionGhostBoo
  name: Boo!
  description: Scare your crew members because of boredom!
-  noSpawn: true
  components:
  - type: InstantAction
    icon: Interface/Actions/scream.png
@@ -65,7 +64,6 @@
  id: ActionToggleLighting
  name: Toggle All Lighting
  description: Toggle all light rendering to better observe dark areas.
-  noSpawn: true
  components:
  - type: InstantAction
    icon: Interface/VerbIcons/light.svg.192dpi.png
@@ -77,7 +75,6 @@
  id: ActionToggleFov
  name: Toggle FoV
  description: Toggles field-of-view in order to see what players see.
-  noSpawn: true
  components:
  - type: InstantAction
    icon: Interface/VerbIcons/vv.svg.192dpi.png
@@ -89,7 +86,6 @@
  id: ActionToggleGhosts
  name: Toggle Ghosts
  description: Toggle the visibility of other ghosts.
-  noSpawn: true
  components:
  - type: InstantAction
    icon: { sprite: Mobs/Ghosts/ghost_human.rsi, state: icon }
@@ -101,7 +97,6 @@
  id: ActionToggleGhostHearing
  name: Toggle Ghost Hearing
  description: Toggle between hearing all messages and hearing only radio & nearby messages.
-  noSpawn: true
  components:
  - type: InstantAction
    checkCanInteract: false
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -1,4 +1,4 @@
-# The progenitor. This should only container the most basic components possible.
+# The progenitor. This should only container the most basic components possible.
 # Only put things on here if every mob *must* have it. This includes ghosts.
 - type: entity
  save: false
@@ -43,6 +43,8 @@
  - type: MovementSpeedModifier
  - type: Polymorphable
  - type: StatusIcon
+  - type: RequireProjectileTarget
+    active: False

 # Used for mobs that have health and can take damage.
 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -80,7 +80,7 @@
  - type: Tool
    qualities:
    - Rolling
-    speed: 0.75 # not as good as a rolling pin but does the job
+    speedModifier: 0.75 # not as good as a rolling pin but does the job
  - type: PhysicalComposition
    materialComposition:
      Glass: 100
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -56,7 +56,7 @@
  - type: Tool
    qualities:
    - Rolling
-    speed: 0.25 # its small so takes longer to roll the entire dough flat
+    speedModifier: 0.25 # its small so takes longer to roll the entire dough flat
  - type: SpaceGarbage
  - type: TrashOnSolutionEmpty
    solution: drink
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
@@ -54,6 +54,23 @@
    prototype: MobMonkeySyndicateAgentNukeops
    selectablePrototypes: ["SyndicateMonkeyNukeops", "SyndicateKoboldNukeops"]

+- type: entity
+  parent: ReinforcementRadioSyndicate
+  id: ReinforcementRadioSyndicateSyndiCat
+  name: syndicat reinforcement radio
+  description: Calls in a faithfully trained cat with a microbomb to assist you.
+  components:
+  - type: GhostRole
+    name: ghost-role-information-SyndiCat-name
+    description: ghost-role-information-SyndiCat-description
+    rules: ghost-role-information-SyndiCat-rules
+    raffle:
+      settings: default
+  - type: GhostRoleMobSpawner
+    prototype: MobCatSyndy
+  - type: EmitSoundOnUse
+    sound: /Audio/Animals/cat_meow.ogg
+
 - type: entity
  parent: ReinforcementRadioSyndicate
  id: ReinforcementRadioSyndicateCyborgAssault # Reinforcement radio exclusive to nukeops uplink
--- a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
@@ -49,7 +49,6 @@

 # actions
 - type: entity
-  noSpawn: true
  id: ActionDisguiseNoRot
  name: Toggle Rotation
  description: Use this to prevent your disguise from rotating, making it easier to hide in some scenarios.
@@ -59,7 +58,6 @@
    event: !type:DisguiseToggleNoRotEvent

 - type: entity
-  noSpawn: true
  id: ActionDisguiseAnchor
  name: Toggle Anchored
  description: For many objects you will want to be anchored to not be completely obvious.
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -83,10 +83,6 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
-  - type: Appearance
-  - type: SolutionContainerVisuals
-    maxFillLevels: 1
-    fillBaseName: dart

 - type: entity
  parent: Dart
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -136,7 +136,6 @@
  id: ActionPAIPlayMidi
  name: Play MIDI
  description: Open your portable MIDI interface to soothe your owner.
-  noSpawn: true
  components:
  - type: InstantAction
    checkCanInteract: false
@@ -149,7 +148,6 @@
  id: ActionPAIOpenMap
  name: Open Map
  description: Open your map interface and guide your owner.
-  noSpawn: true
  components:
    - type: InstantAction
      checkCanInteract: false
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -85,7 +85,7 @@
  components:
  - type: Sprite
    color: "#bbeeff"
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
  - type: DamageUserOnTrigger
@@ -120,7 +120,7 @@
    damage:
      types:
        Slash: 4.5
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: PartRodMetal1
@@ -156,7 +156,7 @@
    damage:
      types:
        Slash: 5.5
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: SheetPlasma1
@@ -195,7 +195,7 @@
      types:
        Slash: 4.5
        Radiation: 2
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: SheetUranium1
@@ -230,7 +230,7 @@
  components:
  - type: Sprite
    color: "#e0aa36"
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: SheetBrass1
--- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -26,6 +26,6 @@
    materialComposition:
      Glass: 50
  - type: SpaceGarbage
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -46,7 +46,7 @@
  - type: Tool
    qualities:
    - Rolling
-    speed: 0.5 # its very big, akward to use
+    speedModifier: 0.5 # its very big, akward to use
  - type: Appearance
  - type: GenericVisualizer
    visuals:
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -66,7 +66,7 @@
    materialComposition:
      Glass: 25
  - type: SpaceGarbage
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1

@@ -273,7 +273,7 @@
  - type: Construction
    graph: CyanLight
    node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: ShardCrystalCyan
@@ -293,7 +293,7 @@
  - type: Construction
    graph: BlueLight
    node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: ShardCrystalBlue
@@ -313,7 +313,7 @@
  - type: Construction
    graph: PinkLight
    node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: ShardCrystalPink
@@ -333,7 +333,7 @@
  - type: Construction
    graph: OrangeLight
    node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: ShardCrystalOrange
@@ -353,7 +353,7 @@
  - type: Construction
    graph: RedLight
    node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: ShardCrystalRed
@@ -373,7 +373,7 @@
  - type: Construction
    graph: GreenLight
    node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: ShardCrystalGreen
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -80,7 +80,6 @@
  id: ActionBibleSummon
  name: Summon familiar
  description: Summon a familiar that will aid you and gain humanlike intelligence once inhabited by a soul.
-  noSpawn: true
  components:
  - type: InstantAction
    icon: { sprite: Clothing/Head/Hats/witch.rsi, state: icon }
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -178,7 +178,7 @@
  - type: Tool
    qualities:
      - Sawing
-    speed: 1.0
+    speedModifier: 1.0
 # No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.

 - type: entity
@@ -200,7 +200,7 @@
  - type: Tool
    qualities:
      - Sawing
-    speed: 0.5
+    speedModifier: 0.5

 - type: entity
  name: circular saw
@@ -222,7 +222,7 @@
  - type: Tool
    qualities:
      - Sawing
-    speed: 1.5
+    speedModifier: 1.5

 - type: entity
  name: advanced circular saw
@@ -245,4 +245,4 @@
  - type: Tool
    qualities:
      - Sawing
-    speed: 2.0
+    speedModifier: 2.0
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -32,7 +32,6 @@
  id: ActionBorgSwapModule
  name: Swap Module
  description: Select this module, enabling you to use the tools it provides.
-  noSpawn: true
  components:
  - type: InstantAction
    itemIconStyle: BigItem
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -233,6 +233,8 @@
    sprite: Objects/Specific/Chemistry/beaker_cryostasis.rsi
    layers:
      - state: beakernoreact
+  - type: SolutionContainerVisuals
+    maxFillLevels: 0
  - type: SolutionContainerManager
    solutions:
      beaker:
@@ -251,6 +253,8 @@
    sprite: Objects/Specific/Chemistry/beaker_bluespace.rsi
    layers:
      - state: beakerbluespace
+  - type: SolutionContainerVisuals
+    maxFillLevels: 0
  - type: SolutionContainerManager
    solutions:
      beaker:
--- a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
@@ -21,7 +21,7 @@
    - Cutting
    useSound:
      path: /Audio/Items/wirecutter.ogg
-    speed: 0.05
+    speedModifier: 0.05
  - type: Item
    sprite: Objects/Tools/Cowtools/haycutters.rsi

@@ -46,7 +46,7 @@
    - Screwing
    useSound:
      collection: Screwdriver
-    speed: 0.05
+    speedModifier: 0.05

 - type: entity
  name: wronch
@@ -69,7 +69,7 @@
    - Anchoring
    useSound:
      path: /Audio/Items/ratchet.ogg
-    speed: 0.05
+    speedModifier: 0.05

 - type: entity
  name: cowbar
@@ -93,7 +93,7 @@
    - Prying
    useSound:
      path: /Audio/Items/crowbar.ogg
-    speed: 0.05
+    speedModifier: 0.05
  - type: ToolTileCompatible
  - type: Prying

@@ -127,7 +127,7 @@
    size: Small
    sprite: Objects/Tools/Cowtools/cowelder.rsi
  - type: Tool
-    speed: 0.05
+    speedModifier: 0.05

 - type: entity
  name: milkalyzer
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -51,7 +51,7 @@
  - type: Tool
    qualities:
    - Rolling
-    speed: 0.6 # fairly unwieldly but nice round surface
+    speedModifier: 0.6 # fairly unwieldly but nice round surface

 - type: entity
  parent: GasTankRoundBase
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -21,7 +21,7 @@
  - type: Tool
    qualities:
      - Prying
-    speed: 1.5
+    speedModifier: 1.5
    useSound: /Audio/Items/jaws_pry.ogg
  - type: Prying
    pryPowered: true
@@ -69,7 +69,7 @@
  - type: Tool
    qualities:
      - Prying
-    speed: 3.0
+    speedModifier: 3.0
  - type: MultipleTool
    entries:
      - behavior: Prying
--- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
@@ -62,7 +62,6 @@
  id: ActionToggleJetpack
  name: Toggle jetpack
  description: Toggles the jetpack, giving you movement outside the station.
-  noSpawn: true
  components:
  - type: InstantAction
    icon:
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -304,7 +304,7 @@
  - type: Tool
    qualities:
      - Screwing
-    speed: 1.5
+    speedModifier: 1.5
    useSound: /Audio/Items/drill_use.ogg
  - type: MultipleTool
    statusShowBehavior: true
@@ -479,7 +479,7 @@
  - type: Tool
    qualities:
      - Screwing
-    speed: 1.2 # Kept for future adjustments. Currently 1.2x for balance
+    speedModifier: 1.2 # Kept for future adjustments. Currently 1.2x for balance
    useSound: /Audio/Items/drill_use.ogg
  - type: ToolTileCompatible
  - type: MultipleTool
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -139,7 +139,7 @@
          Quantity: 250
        maxVol: 250
  - type: Tool
-    speed: 1.3
+    speedModifier: 1.3

 - type: entity
  name: experimental welding tool
@@ -190,7 +190,7 @@
          Quantity: 50
        maxVol: 50
  - type: Tool
-    speed: 0.7
+    speedModifier: 0.7
  - type: PointLight
    enabled: false
    radius: 1.0
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -26,7 +26,7 @@
  - type: Tool
    qualities:
    - Rolling
-    speed: 0.75 # a bit unwieldly but does the job
+    speedModifier: 0.75 # a bit unwieldly but does the job
  - type: Clothing
    quickEquip: false
    slots:
--- a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
@@ -3,7 +3,7 @@
  noSpawn: true
  parent: BaseStructure
  name: bonfire
-  description: What can be better then late evening under the sky with guitar and friends.
+  description: What can be better than a late evening under the sky with guitar and friends?
  components:
  - type: Sprite
    noRot: true
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -73,15 +73,6 @@
    containers:
      board: [ DoorElectronicsHydroponics ]

- type: entity
-  parent: AirlockCommandLocked
-  id: AirlockServiceCaptainLocked
-  suffix: Captain, Locked
-  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsCaptain ]
-
 - type: entity
  parent: AirlockExternal
  id: AirlockExternalLocked
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -89,6 +89,7 @@
    node: crategenericsteel
    containers:
      - entity_storage
+  - type: RequireProjectileTarget

 - type: entity
  parent: CrateGeneric
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
@@ -25,8 +25,7 @@
  - type: ReagentTank
    tankType: Fuel
  - type: DamageOnToolInteract
-    tools:
-    - Welding
+    tools: Welding
    weldingDamage:
      types:
        Heat: 10
@@ -217,4 +216,3 @@
      fillBaseName: watertank-2-
    - type: ExaminableSolution
      solution: tank
-
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
@@ -82,8 +82,7 @@
  - type: ReagentTank
    tankType: Fuel
  - type: DamageOnToolInteract
-    tools:
-    - Welding
+    tools: Welding
    weldingDamage:
      types:
        Heat: 20
--- a/Resources/Prototypes/Entities/categories.yml
+++ b/Resources/Prototypes/Entities/categories.yml
@@ -2,3 +2,13 @@
  id: Actions
  name: entity-category-name-actions
  hideSpawnMenu: true
+
+- type: entityCategory
+  id: GameRules
+  name: entity-category-name-game-rules
+  hideSpawnMenu: true
+
+- type: entityCategory
+  id: Objectives
+  name: entity-category-name-objectives
+  hideSpawnMenu: true