Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo

Resources/Prototypes/Actions/types.yml

@@ -401,6 +401,20 @@
     useDelay: 1
     itemIconStyle: BigAction
 
+- type: entity
+  parent: BaseAction
+  id: ActionGravityJump
+  name: Jump
+  description: Activating the advanced propulsion system, you propel yourself a short distance in the direction of your gaze.
+  components:
+  - type: Action
+    useDelay: 8
+    icon: 
+      sprite: Interface/Actions/jump.rsi
+      state: icon
+  - type: InstantAction
+    event: !type:GravityJumpEvent {}
+    
 - type: entity
   parent: BaseToggleAction
   id: ActionToggleRootable

Resources/Prototypes/Catalog/Fills/Crates/service.yml

@@ -2,7 +2,7 @@
   id: CrateServiceJanitorialSupplies
   parent: CratePlastic
   name: janitorial supplies crate
-  description: Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, broom, spray cleaner, rag, and trash bag.
+  description: Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, broom, spray cleaner, wire brush, rag, and trash bag.
   components:
   - type: StorageFill
     contents:
@@ -20,6 +20,8 @@
       - id: Plunger
         amount: 2
       - id: BoxCleanerGrenades
+      - id: WireBrush
+        amount: 2
 
 - type: entity
   id: CrateServiceCleanerGrenades

Resources/Prototypes/Catalog/Fills/Items/belt.yml

@@ -84,6 +84,7 @@
         amount: 2
       - id: FlashlightLantern
       - id: LightReplacer
+      - id: WireBrush
 
 - type: entity
   id: ClothingBeltMedicalFilled

Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml

@@ -50,7 +50,6 @@
   - type: StorageFill
     contents:
       - id: ClothingHeadHatHopcap
-      - id: ClothingHeadHatBeretHop
       - id: ClothingOuterWinterHoP
       - id: ClothingEyesGlasses
       - id: ClothingNeckCloakHop

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -43,7 +43,7 @@
     - id: ClothingHeadsetAltCommand
     - id: ClothingOuterArmorCaptainCarapace
     - id: CommsComputerCircuitboard
-    - id: DoorRemoteCommand
+    - id: DoorRemoteCustom
     - id: MedalCase
     - id: NukeDisk
     - id: PinpointerNuclear

Resources/Prototypes/Catalog/Fills/Lockers/service.yml

@@ -78,6 +78,8 @@
         amount: 2
       - id: Plunger
         amount: 2
+      - id: WireBrush
+        amount: 2
 
 - type: entity
   id: ClosetLegalFilled

Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml

@@ -8,6 +8,7 @@
     FoodSnackPopcorn: 3
     FoodSnackEnergy: 3
     CigPackMixed: 2
+    DiscountDanLighter: 1
   contrabandInventory:
     FoodSnackDanDanNoodles: 3
     FoodBakedBunHoney: 3

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -66,52 +66,6 @@
   categories:
   - UplinkWeaponry
 
-- type: listing
-  id: UplinkHyperEutacticBlade
-  name: uplink-hypereutactic-blade-name
-  description: uplink-hypereutactic-blade-desc
-  icon: { sprite: /Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi, state: icon }
-  discountCategory: veryRareDiscounts
-  discountDownTo:
-    Telecrystal: 15
-  productEntity: HyperEutacticBlade
-  cost:
-    Telecrystal: 18
-  categories:
-  - UplinkWeaponry
-  conditions:
-  - !type:BuyerWhitelistCondition
-    blacklist:
-      components:
-      - SurplusBundle
-  - !type:StoreWhitelistCondition
-    blacklist:
-      tags:
-      - NukeOpsUplink
-
-- type: listing
-  id: UplinkHyperEutaticBlade
-  name: uplink-hypereutatic-blade-name
-  description: uplink-hypereutatic-blade-desc
-  icon: { sprite: /Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi, state: icon }
-  discountCategory: veryRareDiscounts
-  discountDownTo:
-    Telecrystal: 13
-  productEntity: HyperEutaticBlade
-  cost:
-    Telecrystal: 16
-  categories:
-  - UplinkWeaponry
-  conditions:
-  - !type:BuyerWhitelistCondition
-    blacklist:
-      components:
-      - SurplusBundle
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - NukeOpsUplink
-
 - type: listing
   id: UplinkEnergyDagger
   name: uplink-edagger-name
@@ -2279,6 +2233,17 @@
     - Chef
     - Mime
 
+- type: listing
+  id: UplinkContrabandLighter
+  name: uplink-contraband-lighter-name
+  description: uplink-contraband-lighter-desc
+  icon: { sprite:  Objects/Tools/Lighters/syndielighter.rsi, state: icon}
+  productEntity: UplinkLighterBox
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkPointless
+
 - type: listing
   id: UplinkSmugglerSatchel
   name: uplink-smuggler-satchel-name

Resources/Prototypes/Datasets/Names/scurret.yml

@@ -2,10 +2,10 @@
   id: NamesFirstScurret
   values:
     prefix: names-scurret-first-dataset-
-    count: 36
+    count: 50
 
 - type: localizedDataset
   id: NamesLastScurret
   values:
     prefix: names-scurret-last-dataset-
-    count: 36
+    count: 50

Resources/Prototypes/Entities/Clothing/Back/specific.yml

@@ -98,3 +98,25 @@
   - type: Construction
     graph: ClothingBagPet
     node: bagPet
+
+- type: entity
+  parent: Clothing
+  id: ClothingBackpackHarmpack
+  name: H.A.R.M.P.A.C.K.
+  description: Now you can reload, punch, and eat a snack - simultaneously.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Specific/harmpack.rsi
+    state: icon
+  - type: Item
+    size: Ginormous
+  - type: Clothing
+    slots: BACK
+  - type: ExtraHandsEquipment
+    hands:
+      # middle hands to prevent overlapping inhand sprites
+      # This can be changed once we have per-hand displacement maps
+      extra_hand_1:
+        location: Middle
+      extra_hand_2:
+        location: Middle

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -229,6 +229,7 @@
         - WetFloorSign
         - HolosignProjector
         - Plunger
+        - WireBrush
       components:
         - LightReplacer
         - SmokeOnTrigger

Resources/Prototypes/Entities/Clothing/Head/specific.yml

@@ -38,7 +38,7 @@
   - type: Storage
     showVerb: false
     grid:
-    - 0,0,6,3
+    - 0,0,3,2
     maxItemSize: Small
     blacklist:
       tags:

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -579,6 +579,7 @@
     - Hardsuit
     - WhitelistChameleon
     - CorgiWearable
+    - ScurretWearable
   - type: StaticPrice
     price: 5000
 

Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml

@@ -62,6 +62,7 @@
   - type: Tag
     tags:
     - CorgiWearable
+    - ScurretWearable
     - MonkeyWearable
     - WhitelistChameleon
 

Resources/Prototypes/Entities/Clothing/Shoes/misc.yml

@@ -182,3 +182,30 @@
     price: 75
   - type: Tag
     tags: [ ]
+   
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesBootsJump
+  name: jump boots
+  description: High-tech boots that give you the incredible ability to JUMP! With these boots you can jump over lava, chasms and weird chemicals on the floor!
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/jumpboots.rsi
+    layers:
+    - state: icon
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/jumpboots.rsi
+  - type: JumpAbility
+    jumpDistance: 4
+    jumpSound: /Audio/Effects/stealthoff.ogg
+  - type: ActionGrant
+    actions:
+    - ActionGravityJump 
+  - type: ItemActionGrant
+    actions:
+    - ActionGravityJump
+    activeIfWorn: true
+  - type: StaticPrice
+    price: 220
+  - type: Tag
+    tags: []

Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml

@@ -172,6 +172,7 @@
     - id: ClothingHeadHatFancyCrown
     - id: GoldenBikeHorn
     - id: ClothingHeadHatCatEars
+    - id: GoldenPersonalAI
     - id: TreasureCoinDiamond
       amount: !type:RangeNumberSelector
         range: 2, 5

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

@@ -172,6 +172,8 @@
       - id: ClothingUniformJumpsuitFamilyGuy
       - id: WristwatchGold
       - id: RubberStampGreytide
+      - id: MysteryLighterBox
+      - id: GoldenPersonalAI
 
 - type: entity
   name: Maint Loot Spawner

Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml

@@ -0,0 +1,118 @@
+- type: marking
+  id: VoxScarEyeRight
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_eye_right
+
+- type: marking
+  id: VoxScarEyeLeft
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_eye_left
+
+- type: marking
+  id: VoxScarTopSurgeryShort
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_top_surgery_short
+
+- type: marking
+  id: VoxScarTopSurgeryLong
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_top_surgery_long
+
+- type: marking
+  id: VoxScarChest
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_chest
+
+- type: marking
+  id: VoxScarNeck
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_neck
+
+- type: marking
+  id: VoxScarChestBullets
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_chest_bullets
+
+- type: marking
+  id: VoxScarStomachBullets
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_stomach_bullets
+
+- type: marking
+  id: VoxScarFace1
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_face_1
+
+- type: marking
+  id: VoxScarFace2
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_face_2
+
+- type: marking
+  id: VoxScarEyeRightSmall
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_eye_right_small
+
+- type: marking
+  id: VoxScarEyeLeftSmall
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Vox]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/vox_scars.rsi
+    state: vox_scar_eye_left_small

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -1464,6 +1464,9 @@
         Piercing: 4
       groups:
         Burn: 3
+    catchingFailDamage:
+      types:
+        Blunt: 1
     clumsySound:
       path: /Audio/Animals/monkey_scream.ogg
 
@@ -1643,6 +1646,9 @@
         Piercing: 7
       groups:
         Burn: 3
+    catchingFailDamage:
+      types:
+        Blunt: 1
     clumsySound:
       path: /Audio/Voice/Reptilian/reptilian_scream.ogg
 

Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml

@@ -57,7 +57,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      250: Dead
+      150: Dead
   - type: MeleeWeapon
     soundHit:
       path: "/Audio/Weapons/smash.ogg"
@@ -378,7 +378,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      75: Dead
+      45: Dead
   - type: MeleeWeapon
     angle: 0
     animation: WeaponArcBite

Resources/Prototypes/Entities/Mobs/NPCs/carp.yml

@@ -156,6 +156,10 @@
   suffix: "Salvage Ruleset"
   components:
     - type: SalvageMobRestrictions
+    - type: MobThresholds
+      thresholds:
+        0: Alive
+        30: Dead
 
 - type: entity
   name: space carp
@@ -222,7 +226,7 @@
     - type: MobThresholds
       thresholds:
         0: Alive
-        150: Dead
+        82: Dead # Might seem random, but this brings up the hits to kill with a crusher mark to 3
     - type: Stamina
       critThreshold: 150
     - type: DamageStateVisuals

Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml

@@ -6,6 +6,8 @@
   name: revenant
   description: A spooky ghostie.
   components:
+  - type: Emag
+    emagType: All
   - type: Input
     context: "ghost"
   - type: Spectral

Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml

@@ -56,7 +56,7 @@
   - type: Speech
     speechVerb: Wawa
     speechSounds: Wawa
-    allowedEmotes: ['Thump'] # They're 80% tail
+    allowedEmotes: ["Thump"] # They're 80% tail
   - type: TypingIndicator
     proto: moth
   - type: InteractionPopup
@@ -104,12 +104,46 @@
           32:
             sprite: Mobs/Animals/scurret/displacement.rsi
             state: neck
+      ears:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: ears
+      eyes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: eyes
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: head
+      mask:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: mask
+      back:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: back
+  - type: Hands
+    leftHandDisplacement:
+      sizeMaps:
+        32:
+          sprite: Mobs/Animals/scurret/displacement.rsi
+          state: hand
+
   - type: InventorySlots
   - type: Food
   - type: Hunger
     baseDecayRate: 0.05 # They get a lil' hungy
   - type: BodyEmotes # Grants them clapping and so on.
-    soundsId: GeneralBodyEmotes
+    soundsId: Scurret
+  - type: Deathgasp
+    prototype: ScurretDeathgasp # You monster
   - type: Tag
     tags:
     - DoorBumpOpener
@@ -137,6 +171,14 @@
     available:
     - enum.DamageStateVisualLayers.Base:
         scurret: ScurretColors
+  # They are of a mysterious gender.
+  - type: Grammar
+    attributes:
+      gender: epicene
+      proper: true
+  # Strips the name identifier from them, so they're just "Confident Waters" rather than "Confident Waters (123)"
+  - type: NameIdentifier
+    group: null
 
 # Emotional Support Scurrets have a ghost role and equipment. At the moment, these are intended to be used for admemes, but
 # feel free to hook them into random content.
@@ -167,4 +209,4 @@
   name: Emotional Support Scurret
   id: MobEmotionalSupportScurret
   parent: [MobScurret, MobBaseEmotionalSupportScurret]
-  description: Commonly known as Wawa, from the wetlands of Planet Wawa, these critters make up the bulk of Arnolds's Pizza's "loyal workforce". This one is here as a temp.
+  description: Commonly known as Wawa, from the wetlands of Planet Wawa, these critters make up the bulk of Arnold's Pizza's "loyal workforce". This one is here as a temp.

Resources/Prototypes/Entities/Mobs/NPCs/space.yml

@@ -34,7 +34,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      100: Dead
+      80: Dead
   - type: Stamina
     critThreshold: 150
   - type: MovementAlwaysTouching
@@ -168,6 +168,10 @@
     spawned:
     - id: FoodMeat
       amount: 1
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      60: Dead
 
 - type: entity
   id: MobKangarooSpaceSalvage
@@ -194,7 +198,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      90: Dead
+      45: Dead
   - type: Stamina
     critThreshold: 150
   - type: DamageStateVisuals
@@ -295,7 +299,7 @@
     - type: MobThresholds
       thresholds:
         0: Alive
-        100: Dead
+        45: Dead
     - type: Stamina
       critThreshold: 150
     - type: DamageStateVisuals

Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml

@@ -41,7 +41,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      15: Dead
+      5: Dead
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -458,8 +458,8 @@
 # Mob mapped to Xeno Station that can not be ghostrole / pry
 
 - type: entity
-  name: lone praetorian
-  description: The last of its kind.
+  name: '"Dale"'
+  description: A praetorian left over from the station's initial security sweep. Has a pair of bloodied dog tags engraved with the name "Pvt. Dale" stuck in its maw.
   parent: SimpleSpaceMobBase
   id: MobXenoLonePraetorianNoGhost
   components:

Resources/Prototypes/Entities/Mobs/Player/clone.yml

@@ -16,8 +16,8 @@
   - NpcFactionMember
   # traits
   # - LegsParalyzed (you get healed)
+  - BlackAndWhiteOverlay
   - LightweightDrunk
-  - Monochromacy
   - Muted
   - Narcolepsy
   - Pacified

Resources/Prototypes/Entities/Mobs/Player/guardian.yml

@@ -239,6 +239,9 @@
           Piercing: 4
         groups:
           Burn: 3
+      catchingFailDamage:
+        types:
+          Blunt: 1
     - type: MeleeWeapon
       angle: 30
       animation: WeaponArcFist

Resources/Prototypes/Entities/Mobs/Player/silicon.yml

@@ -190,6 +190,7 @@
         acts: [ "Destruction" ]
   - type: ApcPowerReceiver
     powerLoad: 1000
+    needsPower: false
   - type: StationAiCore
   - type: StationAiVision
   - type: InteractionOutline
@@ -218,7 +219,6 @@
     listeningRange: 0
     speakerVolume: Speak
     unlistedNumber: true
-    requiresPower: false
   - type: Holopad
   - type: StationAiWhitelist
   - type: UserInterface

Resources/Prototypes/Entities/Mobs/Species/moth.yml

@@ -48,8 +48,8 @@
       Female: UnisexMoth
       Unsexed: UnisexMoth
   - type: MovementSpeedModifier
-    weightlessAcceleration: 1.5 # Move around more easily in space.
-    weightlessFriction: 1
+    baseWeightlessAcceleration: 1.5 # Move around more easily in space.
+    baseWeightlessFriction: 1
     baseWeightlessModifier: 1
   - type: Flammable
     damage:

Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml

@@ -277,7 +277,7 @@
       prob: 0.05
       orGroup: Pizza
     - id: KnifePlastic
-  
+
 - type: entity
   name: pizza box
   parent: FoodBoxPizzaFilled
@@ -372,6 +372,9 @@
     contents:
     - id: FoodDonkpocket
       amount: 6
+    - id: DonkcoLighter
+      amount: 1
+      prob: 0.10
 
 - type: entity
   parent: FoodBoxDonkpocket

Resources/Prototypes/Entities/Objects/Devices/door_remote.yml

@@ -29,6 +29,24 @@
   - type: Access
     groups:
     - Command
+  - type: DoorRemote
+
+- type: entity
+  parent: [DoorRemoteDefault, BaseCommandContraband]
+  id: DoorRemoteCustom
+  name: custom door remote
+  description: A gadget which can open and bolt doors remotely. This advanced variant does not have built-in access, instead inheriting the ID access of the user.
+  components:
+  - type: Sprite
+    layers:
+    - state: door_remotebase
+    - state: door_remotelightscolour
+      color: "#0077FF"
+    - state: door_remotescreencolour
+      color: "#0033EE"
+  - type: Access
+  - type: DoorRemote
+    includeUserAccess: true
 
 - type: entity
   parent: [DoorRemoteDefault, BaseCommandContraband]
@@ -155,6 +173,8 @@
       color: "#2eba22"
     - state: door_remotescreencolour
       color: "#22871a"
+  - type: DoorRemote
+    includeUserAccess: true
   - type: Access
     groups:
     - AllAccess

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -923,6 +923,7 @@
     id: CentcomIDCard
     penSlot:
       startingItem: PenCentcom
+      priority: -1
       whitelist:
         tags:
         - Write

Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml

@@ -456,6 +456,70 @@
   - type: NavMapBeacon
     defaultText: station-beacon-solars
 
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsN
+  suffix: Solars, North
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-N
+
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsNE
+  suffix: Solars, Northeast
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-NE
+
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsE
+  suffix: Solars, East
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-E
+
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsSE
+  suffix: Solars, Southeast
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-SE
+
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsS
+  suffix: Solars, South
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-S
+
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsSW
+  suffix: Solars, Southwest
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-SW
+
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsW
+  suffix: Solars, West
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-W
+
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconSolarsNW
+  suffix: Solars, Northwest
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-solars-NW
+
 - type: entity
   parent: DefaultStationBeaconEngineering
   id: DefaultStationBeaconGravGen
@@ -706,6 +770,70 @@
   - type: NavMapBeacon
     defaultText: station-beacon-escape-pod
 
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodN
+  suffix: Escape Pod, North
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-N
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodNE
+  suffix: Escape Pod, Northeast
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-NE
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodE
+  suffix: Escape Pod, East
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-E
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodSE
+  suffix: Escape Pod, Southeast
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-SE
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodS
+  suffix: Escape Pod, South
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-S
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodSW
+  suffix: Escape Pod, Southwest
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-SW
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodW
+  suffix: Escape Pod, West
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-W
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconEscapePodNW
+  suffix: Escape Pod, Northwest
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-escape-pod-NW
+
 - type: entity
   parent: DefaultStationBeacon
   id: DefaultStationBeaconVox

Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml

@@ -133,3 +133,62 @@
       - id: ToyFigurineHamlet
         prob: 0.20
         orGroup: SpacemenFig
+
+- type: entity
+  parent: BaseItem
+  id: MysteryLighterBox
+  name: Novelty lighter mystery box
+  suffix: Filled
+  description: A box of discontinued promotional lighters, many of which have since been declared "contraband".
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/figurines.rsi
+    layers:
+    - state: fig_box
+  - type: SpawnItemsOnUse
+    items:
+      - id: MysteryFigureBoxTrash
+      - id: CybersunFlippo
+        orGroup: Lighterbox
+        weight: 0.15
+      - id: InterdyneFlippo
+        orGroup: Lighterbox
+        weight: 0.15
+      - id: NanotrasenFlippo
+        orGroup: Lighterbox
+        weight: 0.25
+      - id: WaffleCoFlippo
+        orGroup: Lighterbox
+        weight: 0.35
+      - id: HonkCoFlippo
+        orGroup: Lighterbox
+      - id: GorlexMatchbox
+        orGroup: Lighterbox
+        weight: 0.15
+      - id: DonkcoLighter
+        orGroup: Lighterbox
+        weight: 0.25
+      - id: SyndicateFlippo
+        orGroup: Lighterbox
+        weight: 0.15
+
+- type: entity
+  parent: MysteryLighterBox
+  id: UplinkLighterBox
+  suffix: Uplink
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: MysteryFigureBoxTrash
+      - id: CybersunFlippo
+        orGroup: Lighterbox
+      - id: InterdyneFlippo
+        orGroup: Lighterbox
+      - id: WaffleCoFlippo
+        orGroup: Lighterbox
+      - id: GorlexMatchbox
+        orGroup: Lighterbox
+      - id: DonkcoLighter
+        orGroup: Lighterbox
+      - id: SyndicateFlippo
+        orGroup: Lighterbox

Resources/Prototypes/Entities/Objects/Fun/pai.yml

@@ -130,6 +130,23 @@
   - type: StaticPrice
     price: 500
 
+- type: entity
+  parent: PersonalAI
+  id: GoldenPersonalAI
+  name: golden personal ai device
+  description: Your electronic pal who's fun to be with! Special golden edition!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/pai.rsi
+    layers:
+    - state: golden-pai-base
+    - state: pai-off-overlay
+      shader: unshaded
+      map: ["screen"]
+  - type: Appearance
+  - type: StaticPrice
+    price: 5000
+
 - type: entity
   parent: PersonalAI
   id: PotatoAI

Resources/Prototypes/Entities/Objects/Fun/toys.yml

@@ -396,6 +396,20 @@
   - type: Sprite
     sprite: Objects/Fun/Balls/basketball.rsi
     state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.25
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.8 # bouncy
+        friction: 0.2
+  - type: Catchable
+    catchChance: 0.8
+    catchSuccessSound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
   - type: EmitSoundOnCollide
     sound:
       path: /Audio/Effects/Footsteps/bounce.ogg
@@ -414,6 +428,23 @@
   - type: Sprite
     sprite: Objects/Fun/Balls/football.rsi
     state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.25
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.5 # a little bouncy
+        friction: 0.2
+  - type: Catchable
+    catchChance: 0.8
+    catchSuccessSound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
   - type: Item
     size: Small
     sprite: Objects/Fun/Balls/football.rsi
@@ -427,6 +458,21 @@
   - type: Sprite
     sprite: Objects/Fun/Balls/beach_ball.rsi
     state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.3
+          position: "0,-0.2"
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.1 # not bouncy
+        friction: 0.2
+  - type: Catchable
+    catchChance: 0.8
+    catchSuccessSound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
   - type: EmitSoundOnCollide
     sound:
       path: /Audio/Effects/Footsteps/bounce.ogg

Resources/Prototypes/Entities/Objects/Magic/books.yml

@@ -69,7 +69,7 @@
   components:
     - type: Spellbook
       spellActions:
-        ActionSpawnMagicarpSpell: -1
+        ActionSpawnMagicarpSpell: null
 
 - type: entity
   id: ForceWallSpellbook
@@ -92,7 +92,7 @@
         color: gold
     - type: Spellbook
       spellActions:
-        ActionForceWall: -1
+        ActionForceWall: null
 
 - type: entity
   id: BlinkBook
@@ -113,7 +113,7 @@
         color: gold
     - type: Spellbook
       spellActions:
-        ActionBlink: -1
+        ActionBlink: null
 
 - type: entity
   id: SmiteBook
@@ -136,7 +136,7 @@
       - state: overlay_blood
     - type: Spellbook
       spellActions:
-        ActionSmiteNoReq: -1
+        ActionSmiteNoReq: null
 
 - type: entity
   id: KnockSpellbook
@@ -158,7 +158,7 @@
         color: "#98c495"
     - type: Spellbook
       spellActions:
-        ActionKnock: -1
+        ActionKnock: null
 
 - type: entity
   id: FireballSpellbook
@@ -182,7 +182,7 @@
         shader: unshaded
     - type: Spellbook
       spellActions:
-        ActionFireball: -1
+        ActionFireball: null
 
 - type: entity
   id: ScrollRunes
@@ -197,7 +197,7 @@
     - state: spell_default
   - type: Spellbook
     spellActions:
-      ActionFlashRune: -1
-      ActionExplosionRune: -1
-      ActionIgniteRune: -1
-      ActionStunRune: -1
+      ActionFlashRune: null
+      ActionExplosionRune: null
+      ActionIgniteRune: null
+      ActionStunRune: null

Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

@@ -352,3 +352,39 @@
     - type: Fiber
       fiberColor: fibers-white
     - type: DnaSubstanceTrace
+
+- type: entity
+  parent: BaseItem
+  id: WireBrush
+  name: wire brush
+  description: A bristly steel wire brush, perfect for scraping away even the toughest patches of rust.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Janitorial/wirebrush.rsi
+    state: icon
+  - type: Item
+    storedSprite:
+      sprite: Objects/Specific/Janitorial/wirebrush.rsi
+      state: storage
+    size: Small
+  - type: Tag
+    tags:
+    - WireBrush
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 50
+      Plastic: 50
+  - type: Tool
+    qualities:
+    - Brushing
+    useSound:
+      path: /Audio/Items/wirebrushing.ogg
+  - type: StaticPrice
+    price: 22
+  - type: MeleeWeapon
+    wideAnimationRotation: 45
+    damage:
+      types:
+        Piercing: 3
+    soundHit:
+      path: "/Audio/Weapons/bladeslice.ogg"

Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml

@@ -257,7 +257,7 @@
     damage:
       types:
         Bloodloss: -0.5 #lowers bloodloss damage
-    ModifyBloodLevel: 15 #restores about 5% blood per use on standard humanoids.
+    modifyBloodLevel: 15 #restores about 5% blood per use on standard humanoids.
     healingBeginSound:
       path: "/Audio/Items/Medical/brutepack_begin.ogg"
       params:

Resources/Prototypes/Entities/Objects/Tools/lighters.yml

@@ -20,7 +20,7 @@
     activatedSize: Small
   - type: ItemToggleHot
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: icon_map
     - state: cheap_icon_base
@@ -62,7 +62,7 @@
         shader: unshaded
   - type: Item
     size: Tiny
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
   - type: UseDelay
   - type: RefillableSolution
     solution: Welder
@@ -97,7 +97,7 @@
   description: "A dangerously inexpensive plastic lighter, don't burn your thumb!"
   components:
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: icon_map
     - state: cheap_icon_base
@@ -126,7 +126,7 @@
   description: "A rugged metal lighter, lasts quite a while."
   components:
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: zippo_icon_base
       map: ["base"]
@@ -159,7 +159,7 @@
   - type: ItemToggleHot
   - type: Item
     size: Tiny
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     heldPrefix: zippo
   - type: Appearance
   - type: GenericVisualizer
@@ -219,7 +219,7 @@
   description: "A rugged golden lighter, lasts quite a while. Engravings serve no tactical advantage whatsoever."
   components:
   - type: Sprite
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     layers:
     - state: zippo_engraved_icon_base
       map: ["base"]
@@ -235,3 +235,404 @@
       shader: unshaded
   - type: StealTarget
     stealGroup: FlippoEngravedLighter
+
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BaseBrandedLighter
+  components:
+  - type: ItemToggle
+    predictable: false
+    soundActivate:
+      path: /Audio/Items/Lighters/zippo_open.ogg
+      params:
+        volume: -5
+    soundDeactivate:
+      path: /Audio/Items/Lighters/zippo_close.ogg
+      params:
+        volume: -5
+  - type: ItemToggleMeleeWeapon
+    activatedDamage:
+        types:
+            Heat: 1
+  - type: ItemToggleSize
+    activatedSize: Small
+  - type: ItemToggleHot
+  - type: Item
+    size: Tiny
+  - type: Appearance
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 12
+        maxVol: 12
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "base" ]
+    - state: top
+      map: [ "top" ]
+      visible: false
+    - state: open
+      map: [ "open" ]
+      visible: false
+    - state: flame
+      map: [ "flame" ]
+      visible: false
+      shader: unshaded
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleableVisuals.Enabled:
+        flame:
+          True: { visible: true }
+          False: { visible: false }
+        open:
+          True: { visible: true }
+          False: { visible: false }
+        top:
+          True: { visible: true }
+          False: { visible: false }
+        base:
+          True: { visible: false }
+          False: { visible: true }
+  - type: ToggleableVisuals
+    spriteLayer: lighter_flame
+    inhandVisuals:
+      left:
+      - state: inhand-left-lit
+        shader: unshaded
+      right:
+      - state: inhand-right-lit
+        shader: unshaded
+  - type: ItemTogglePointLight
+  - type: UseDelay
+  - type: IgnitionSource
+    ignited: false
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: SyndicateFlippo
+  name: Blood-red flippo
+  description: "A 'Valid' choice in lighters. Contains no copper."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/syndielighter.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/syndielighter.rsi
+  - type: Welder
+    fuelConsumption: 0.005
+    fuelLitCost: 0.01
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: green
+
+- type: entity
+  parent: Lighter
+  id: DiscountDanLighter
+  name: Discount Dan's lighter
+  description: "The worst lighter ever produced, lighterburn is inevitable, do not refuel while lit."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/lighters.rsi
+    layers:
+    - state: icon_map
+    - state: discount_icon_base
+      map: [ "skin" ]
+    - state: basic_icon_top
+    - state: lighter_flame
+      visible: false
+      shader: unshaded
+      map: [ "flame" ]
+  - type: Welder # the single worst lighter invented by mankind
+    fuelConsumption: 0.2
+    fuelLitCost: 0.1
+    tankSafe: false
+  - type: Item
+    sprite: Objects/Tools/Lighters/lighters.rsi
+  - type: ToggleableVisuals
+    spriteLayer: lighter_flame
+    inhandVisuals:
+      left:
+      - state: inhand-left-flame
+        shader: unshaded
+      right:
+      - state: inhand-right-flame
+        shader: unshaded
+  - type: RandomSprite
+    available:
+      - skin:
+          discount_icon_base: ""
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 1.5
+    color: yellow
+  - type: ComponentToggler
+    components:
+    - type: DamageOnHolding
+      damage:
+        types:
+          Heat: 2
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 3
+        maxVol: 3
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: CybersunFlippo
+  name: CyberSun Flippo
+  description: "A Sleek black and magenta flippo lighter, bearing the logo and iconography of CyberSun Industries."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/cybersun.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/cybersun.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 0.01
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: magenta
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: InterdyneFlippo
+  name: Interdyne Flippo
+  description: "A deep blue flippo lighter, decorated with the logo of Interdyne Pharmaceuticals' 'Gene Clean' clinics. Become the master of your own cigarette."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/interdyne.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/interdyne.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 0.01
+    tankSafe: true
+  - type: ItemToggleMeleeWeapon
+    activatedDamage:
+        types:
+          Radiation: 1
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: cyan
+
+- type: entity
+  parent: [BaseBrandedLighter]
+  id: NanotrasenFlippo
+  name: Nanotrasen Flippo
+  description: "A navy blue luxury flippo, generally handed out to loyal heads of staff instead of a payraise. Fueled with liquid plasma"
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/nanotrasen.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/nanotrasen.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 1
+    fuelReagent: Plasma
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: blue
+  - type: RefillableSolution
+    solution: Welder
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 10
+        maxVol: 10
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseCentcommContraband]
+  id: CentCommFlippo
+  name: Gilded CentComm Flippo
+  description: "An Ornate, jade embossed and gilded flippo frame containing a bluespace powered jet. The latch is secured by a miniature access reader that only responds to CentComm officials. The nicest lighter known to man."
+  suffix: DO NOT MAP
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/centcomm.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/centcomm.rsi
+  - type: ItemToggleRequiresLock
+    requireLocked: false
+  - type: Welder #
+    fuelConsumption: 0.0
+    fuelLitCost: 10
+    fuelReagent: Plasma
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 4 #Excessively powerful
+    color: Gold
+  - type: RefillableSolution
+    solution: Welder
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 999
+        maxVol: 999
+  - type: Tool
+    useSound:
+      collection: Welder
+    qualities: Welding
+  - type: SolutionRegeneration
+    solution: Welder
+    generated:
+      reagents:
+      - ReagentId: Plasma
+        Quantity: 0.1
+  - type: Lock
+  - type: AccessReader
+    access: [["CentralCommand"]]
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseMajorContraband]
+  id: SpiderclanFlippo
+  name: Spider-Clan lighter
+  description: "A high tech jet lighter, engineered to function even in deep space. Runs on a tiny microfusion cell."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/spiderclan.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/spiderclan.rsi
+  - type: Welder #
+    fuelConsumption: 0
+    fuelLitCost: 0
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: green
+
+- type: entity
+  parent: [BaseBrandedLighter, BaseSyndicateContraband]
+  id: WaffleCoFlippo
+  name: Waffle Co. flippo
+  description: "A robust mass produced lighter. The Waffle Co. logo turns the spark wheel when pushed up, minimising risk of lighter burns for even the most inept user."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/waffleco.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/waffleco.rsi
+  - type: Welder #
+    fuelConsumption: 0.005
+    fuelLitCost: 0.05
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: brown
+
+- type: entity
+  parent: [BaseBrandedLighter]
+  id: HonkCoFlippo
+  name: Honk Co. flippo
+  description: "A slippery gag lighter produced by Honk Co. hidden inside of a real banana peel."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/honkco.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/honkco.rsi
+  - type: ComponentToggler
+    components:
+    - type: Slippery
+    - type: StepTrigger
+      intersectRatio: 0.2
+    - type: CollisionWake
+      enabled: false
+    - type: Physics
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures:
+        slips:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.4,-0.3,0.4,0.3"
+          layer:
+          - SlipLayer
+          hard: false
+        fix1:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.4,-0.3,0.4,0.3"
+          density: 10
+          mask:
+          - ItemMask
+  - type: Welder #
+    fuelConsumption: 0.1
+    fuelLitCost: 1
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: yellow
+
+- type: entity
+  parent: [BaseBrandedLighter]
+  id: DonkcoLighter
+  name: Donk Co. flippo
+  description: "The flippo of choice for the seasoned traitor. A Breaded novelty lighter made by Donk Co. Somehow edible while lit."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/donkco.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/donkco.rsi
+  - type: Welder #
+    fuelConsumption: 0.02
+    fuelLitCost: 0.1
+    tankSafe: true
+  - type: Tag
+    tags:
+    - DonkPocket
+    - Meat
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 12
+        maxVol: 12
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Omnizine
+          Quantity: 10
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - meaty
+      - cheap
+  - type: ComponentToggler
+    components:
+    - type: Food
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 2
+    color: orange

Resources/Prototypes/Entities/Objects/Tools/matches.yml

@@ -108,3 +108,43 @@
     tags:
     - Trash
   - type: SpaceGarbage
+
+- type: entity
+  parent: [Matchbox, BaseSyndicateContraband]
+  id: GorlexMatchbox
+  name: Gorlex match box
+  description: "A pneumatic match box styled after the Gorlex Marauders' equipment. Contains 24 matches."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/gorlex.rsi
+  - type: Item
+    sprite: Objects/Tools/Lighters/gorlex.rsi
+  - type: Storage
+    grid:
+    - 0,0,11,1
+  - type: StorageFill
+    contents:
+      - id: GorlexMatchstick
+        amount: 24
+  - type: Matchbox
+
+- type: entity
+  name: match stick
+  parent: [Matchstick, BaseSyndicateContraband]
+  id: GorlexMatchstick
+  description: A military grade match stick, used for lighting fine smokables and noncombatants alike.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Lighters/gorlexmatch.rsi
+    layers:
+      - state: match_unlit
+  - type: Item
+    sprite: Objects/Tools/Lighters/gorlexmatch.rsi
+    heldPrefix: unlit
+    size: Tiny
+  - type: PointLight
+    enabled: false
+    radius: 3
+    color: green
+  - type: Matchstick
+    duration: 30

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -496,7 +496,7 @@
     impactEffect: BulletImpactEffectKinetic
     damage:
       types:
-        Blunt: 25
+        Blunt: 15
         Structural: 30
   # Short lifespan
   - type: TimedDespawn
@@ -553,8 +553,8 @@
         - MobState
     damage:
       types:
-        Blunt: 20
-        Slash: 5
+        Blunt: 18
+        Slash: 4
   - type: Projectile
     impactEffect: BulletImpactEffectKinetic
     damage:
@@ -564,6 +564,21 @@
   - type: TimedDespawn
     lifetime: 0.4
 
+  # Deals less damage, glaive has better HP recovery
+- type: entity
+  id: BulletChargeGlaive
+  name: leech bolt
+  parent: BulletCharge
+  components:
+  - type: DamageMarkerOnCollide
+    whitelist:
+      components:
+        - MobState
+    damage:
+      types:
+        Blunt: 1
+        Slash: 5
+
 - type: entity
   parent: BaseBullet
   id: AnomalousParticleDelta

Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -54,7 +54,7 @@
   name: Hristov
   parent: [BaseWeaponSniper, BaseGunWieldable, BaseSyndicateContraband]
   id: WeaponSniperHristov
-  description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo.
+  description: For when you absolutely, positively need to make someone regret their life choices from a safe distance. Uses .60 anti-materiel ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi

Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml

@@ -296,12 +296,11 @@
             Slash: 12
             Heat: 12
             Structural: 15
-  # Disabled until the wield active sfx no longer stacks
-  #- type: ItemToggleActiveSound
-  #  activeSound:
-  #    path: /Audio/Weapons/ebladehum.ogg
-  #    params:
-  #      volume: 3
+  - type: ItemToggleActiveSound
+    activeSound:
+      path: /Audio/Weapons/ebladehum.ogg
+      params:
+        volume: 3
   - type: ComponentToggler
     components:
     - type: Sharp
@@ -387,17 +386,6 @@
     reflectProb: 1.0
     spread: 75
 
-# Nukie variant, reduced reflection rate.
-- type: entity
-  parent: HyperEutacticBlade
-  id: HyperEutaticBlade
-  name: hypereutatic-blade
-  description: Often mistaken for the Hypereutactic Blade. This mass produced, off-brand, knockoff gets the same job done but with less reflection.
-  components:
-  - type: Reflect
-    reflectProb: 0.75
-    spread: 75
-
 # Borgs
 - type: entity
   suffix: One-Handed, For Borgs

Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml

@@ -106,6 +106,7 @@
     enabled: false
     radius: 4
 
+# Very high burst damage if you land a mark, while also providing a small amount of healing.
 - type: entity
   parent: [BaseWeaponCrusher, BaseSecurityCargoContraband]
   id: WeaponCrusher
@@ -132,7 +133,7 @@
   - type: LeechOnMarker
     leech:
       groups:
-        Brute: -10
+        Brute: -6
   - type: Gun
     soundGunshot: /Audio/Weapons/plasma_cutter.ogg
     fireRate: 1
@@ -146,25 +147,26 @@
     capacity: 1
     count: 1
   - type: MeleeWeapon
-    attackRate: 1.5
+    attackRate: 1
     wideAnimationRotation: -135
     damage:
       types:
-        Blunt: 10
-        Slash: 5
+        Blunt: 6
+        Slash: 4
     soundHit:
       collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 2.5
-        Slash: 2.5
+        Blunt: 6
+        Slash: 2
         Structural: 30
   - type: GunRequiresWield
   - type: DisarmMalus
   - type: Prying
 
+# No mark ability in exchange for wideswing, autoattack, and being one-handed
 - type: entity
   parent: [ BaseKnife, BaseWeaponCrusher, BaseSecurityCargoContraband]
   id: WeaponCrusherDagger
@@ -194,12 +196,12 @@
   - type: ThrowingAngle
     angle: 225
 
-# Like a crusher... but better
+# Less mark damage in exchange for more healing. Also has a better ratio of blunt to slash damage, but less structural.
 - type: entity
   parent: [ WeaponCrusher, BaseSecurityCargoContraband]
   id: WeaponCrusherGlaive
   name: crusher glaive
-  description: An early design of the proto-kinetic accelerator, in glaive form.
+  description: An early design of the proto-kinetic accelerator, in glaive form. Provides better healing in exchange for less charged damage.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/crusher_glaive.rsi
@@ -215,11 +217,27 @@
     - suitStorage
   - type: UseDelay
     delay: 1.9
+  - type: BasicEntityAmmoProvider
+    proto: BulletChargeGlaive
+    capacity: 1
+    count: 1
   - type: LeechOnMarker
     leech:
       groups:
         Brute: -21
-  - type: MeleeWeapon
   - type: Tag
     tags:
       - Pickaxe
+  - type: MeleeWeapon
+    attackRate: 1
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 3
+        Slash: 7
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 2
+        Slash: 6
+        Structural: 20

Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml

@@ -643,6 +643,9 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepFloor
+  - type: Construction
+    graph: Table
+    node: TableXeno
 
 # Fancy tables
 

Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml

@@ -117,7 +117,7 @@
     - Cryogenics
 
 - type: entity
-  parent: BaseStructure
+  parent: BaseMachine
   id: CryoPodDestroyed
   name: destroyed cryo pod
   description: A cryo pod that has seen better days. It's entirely inoperable; not good for anything but scrap.
@@ -128,22 +128,17 @@
     noRot: true
     offset: 0, 0.5
     state: pod-cracked
-  - type: Transform
-    noRot: true
   - type: Fixtures
     fixtures:
       fix1:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.90"
+          bounds: "-0.5,-0.5,0.5,0.5"
         density: 200
         mask:
         - MachineMask
         layer:
         - MachineLayer
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml

@@ -18,8 +18,13 @@
     - state: icon
     - state: unlit
       shader: unshaded
-      map: ["enum.StasisBedVisualLayers.IsOn"]
-  - type: StasisBedVisuals
+      map: ["unlit"]
+  - type: GenericVisualizer
+    visuals:
+      enum.PowerDeviceVisuals.Powered:
+        unlit:
+          True: { visible: true }
+          False: { visible: false }
   - type: Appearance
   - type: ApcPowerReceiver
     powerLoad: 1000

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml

@@ -155,6 +155,62 @@
       guides:
       - Pumps
 
+- type: entity
+  parent: GasBinaryBase
+  id: GasPressureRegulator
+  name: inlet pressure regulator
+  description: A valve that releases gas when the inlet pressure exceeds a certain threshold.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Rotatable
+  - type: Transform
+    noRot: false
+  - type: SubFloorHide
+    visibleLayers:
+    - enum.SubfloorLayers.FirstLayer
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/pump.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe.rsi
+      state: pipeStraight
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+    - state: pumpPressureRegulator
+      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.PressureRegulatorVisuals.State:
+        enabled:
+          True: { state: pumpPressureRegulatorOn }
+          False: { state: pumpPressureRegulator }
+  - type: PipeColorVisuals
+  - type: GasPressureRegulator
+    enabled: false
+    threshold: 4500
+  - type: Construction
+    graph: GasBinary
+    node: pressureregulator
+  - type: ActivatableUI
+    key: enum.GasPressureRegulatorUiKey.Key
+    blockSpectators: true
+  - type: ActivatableUIRequiresAnchor
+  - type: UserInterface
+    interfaces:
+      enum.GasPressureRegulatorUiKey.Key:
+        type: GasPressureRegulatorBoundUserInterface
+  - type: AmbientSound
+    enabled: false
+    volume: -9
+    range: 5
+    sound:
+      path: /Audio/Ambience/Objects/gas_hiss.ogg
+  - type: AtmosMonitoringConsoleDevice
+    navMapBlip: GasFlowRegulator
+  - type: GuideHelp
+    guides:
+    - PressureRegulator
+
 - type: entity
   parent: GasBinaryBase
   id: GasPassiveGate

Resources/Prototypes/Guidebook/engineering.yml

@@ -120,6 +120,7 @@
   - SignalValve
   - PneumaticValve
   - PassiveGate
+  - PressureRegulator
 
 - type: guideEntry
   id: ManualValve
@@ -141,6 +142,11 @@
   name: guide-entry-passivegate
   text: "/ServerInfo/Guidebook/Engineering/PassiveGate.xml"
 
+- type: guideEntry
+  id: PressureRegulator
+  name: guide-entry-ressureregulator
+  text: "/ServerInfo/Guidebook/Engineering/PressureRegulator.xml"
+
 - type: guideEntry
   id: MixingAndFiltering
   name: guide-entry-mixingandfiltering

Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml

@@ -47,7 +47,6 @@
     stripTime: 6
     uiWindowPos: 2,1
     strippingWindowPos: 2,4
-    dependsOn: jumpsuit
     displayName: ID
   - name: suitstorage
     slotTexture: suit_storage
@@ -60,3 +59,13 @@
     dependsOnComponents:
     - type: AllowSuitStorage
     displayName: Suit Storage
+  - name: outerClothing
+    slotTexture: suit
+    slotFlags: OUTERCLOTHING
+    stripTime: 6
+    uiWindowPos: 0,3
+    strippingWindowPos: 1,3
+    displayName: Suit
+    whitelist:
+      tags:
+      - ScurretWearable

Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml

@@ -35,11 +35,6 @@
   equipment:
     head: ClothingHeadHatHopcap
 
-- type: loadout
-  id: HoPBeret
-  equipment:
-    head: ClothingHeadHatBeretHop
-
 # Neck
 - type: loadout
   id: HoPCloak

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -153,7 +153,6 @@
   minLimit: 0
   loadouts:
   - HoPHead
-  - HoPBeret
 
 - type: loadoutGroup
   id: HoPJumpsuit

Resources/Prototypes/Maps/exo.yml

@@ -2,8 +2,8 @@
   id: Exo
   mapName: 'Exo'
   mapPath: /Maps/exo.yml
-  minPlayers: 30
-  maxPlayers: 70
+  minPlayers: 40
+  maxPlayers: 80
   stations:
     Exo:
       stationProto: StandardNanotrasenStation
@@ -25,7 +25,7 @@
             Bartender: [ 2, 2 ]
             Botanist: [ 2, 2 ]
             Chef: [ 2, 2 ]
-            Janitor: [ 1, 2 ]
+            Janitor: [ 2, 2 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
@@ -54,7 +54,7 @@
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
-            CargoTechnician: [ 3, 3 ]
+            CargoTechnician: [ 4, 4 ]
             #civilian
             Passenger: [ -1, -1 ]
             Clown: [ 1, 1 ]

Resources/Prototypes/Objectives/stealTargetGroups.yml

@@ -169,7 +169,7 @@
   id: FlippoEngravedLighter
   name: steal-target-groups-flippo-engraved-lighter
   sprite:
-    sprite: Objects/Tools/lighters.rsi
+    sprite: Objects/Tools/Lighters/lighters.rsi
     state: zippo_engraved_icon_base
 
 - type: stealTargetGroup

Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml

@@ -404,3 +404,15 @@
           steps:
             - tool: Prying
               doAfter: 1
+
+    - node: TableXeno
+      entity: TableXeno
+      edges:
+      - to: TableFrame
+        completed:
+        - !type:SpawnPrototype
+          prototype: SheetSteel1
+          amount: 1
+        steps:
+        - tool: Anchoring
+          doAfter: 1

Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml

@@ -510,6 +510,10 @@
           steps:
             - tool: Welding
               doAfter: 5
+        - to: wall
+          steps:
+            - tool: Brushing
+              doAfter: 12
 
     - node: reinforcedWallRust
       entity: WallReinforcedRust
@@ -518,3 +522,7 @@
           steps:
             - tool: Welding
               doAfter: 5
+        - to: reinforcedWall
+          steps:
+            - tool: Brushing
+              doAfter: 12

Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml

@@ -22,6 +22,12 @@
         amount: 2
         doAfter: 1
 
+    - to: pressureregulator
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
     - to: valve
       steps:
       - material: Steel
@@ -106,6 +112,22 @@
       - tool: Welding
         doAfter: 1
 
+  - node: pressureregulator
+    entity: GasPressureRegulator
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
   - node: valve
     entity: GasValve
     edges:

Resources/Prototypes/Recipes/Construction/utilities.yml

@@ -572,6 +572,17 @@
   conditions:
     - !type:NoUnstackableInTile
 
+- type: construction
+  id: GasPressureRegulator
+  graph: GasBinary
+  startNode: start
+  targetNode: pressureregulator
+  category: construction-category-utilities
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:NoUnstackableInTile
+
 - type: construction
   id: GasValve
   graph: GasBinary

Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml

@@ -33,7 +33,6 @@
   - ClothingUniformJumpskirtCapFormalDress
   # HoP
   - ClothingHeadHatHopcap
-  - ClothingHeadHatBeretHop
   - ClothingUniformJumpsuitHoP
   - ClothingUniformJumpskirtHoP
   # Generic

Resources/Prototypes/Recipes/Lathes/Packs/science.yml

@@ -30,6 +30,7 @@
   - SignallerAdvanced
   - DeviceQuantumSpinInverter
   - DeviceDesynchronizer
+  - ClothingBackpackHarmpack
 
 - type: latheRecipePack
   id: ScienceClothing
@@ -37,6 +38,7 @@
   - ClothingShoesBootsMagSci
   - ClothingShoesBootsMoon
   - ClothingShoesBootsSpeed
+  - ClothingShoesBootsJump
   - ClothingBackpackHolding
   - ClothingBackpackSatchelHolding
   - ClothingBackpackDuffelHolding

Resources/Prototypes/Recipes/Lathes/Packs/security.yml

@@ -75,6 +75,7 @@
   - PowerCageMedium
   - PowerCageSmall
   - TelescopicShield
+  - ClothingBackpackHarmpack
 
 - type: latheRecipePack
   id: SecurityBoards

Resources/Prototypes/Recipes/Lathes/Packs/service.yml

@@ -25,6 +25,7 @@
   - MopItem
   - Holoprojector
   - WetFloorSign
+  - WireBrush
 
 - type: latheRecipePack
   id: ServiceBoardsStatic

Resources/Prototypes/Recipes/Lathes/janitorial.yml

@@ -104,3 +104,11 @@
   materials:
     Steel: 250
     Glass: 1000
+
+- type: latheRecipe
+  id: WireBrush
+  result: WireBrush
+  completetime: 2
+  materials:
+    Steel: 100
+    Plastic: 100

Resources/Prototypes/Recipes/Lathes/misc.yml

@@ -167,6 +167,16 @@
     Plastic: 1000
     Silver: 500
 
+- type: latheRecipe
+  id: ClothingShoesBootsJump
+  result: ClothingShoesBootsJump
+  completetime: 2
+  materials:
+    Steel: 1400
+    Plastic: 600
+    Silver: 200
+    Plasma: 200
+
 - type: latheRecipe
   id: ModularReceiver
   result: ModularReceiver
@@ -265,4 +275,5 @@
   result: Ashtray
   completetime: 1
   materials:
-    Steel: 30
+    Steel: 30
+    

Resources/Prototypes/Recipes/Lathes/security.yml

@@ -84,6 +84,18 @@
     Plasma: 500
     Glass: 500
 
+- type: latheRecipe
+  id: ClothingBackpackHarmpack
+  result: ClothingBackpackHarmpack
+  categories:
+  - Clothing
+  completetime: 15
+  materials:
+    Steel: 2000
+    Plastic: 1000
+    Plasma: 500
+    Gold: 500
+
 # Shields
 - type: latheRecipe
   parent: BaseShieldRecipe

Resources/Prototypes/Research/arsenal.yml

@@ -191,6 +191,18 @@
   technologyPrerequisites:
   - SalvageWeapons
 
+- type: technology
+  id: DualWieldingTechnology
+  name: research-technology-dual-wielding-technology
+  icon:
+    sprite: Clothing/Back/Specific/harmpack.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - ClothingBackpackHarmpack
+
 # Tier 3
 
 - type: technology

Resources/Prototypes/Research/industrial.yml

@@ -14,6 +14,7 @@
   - MineralScannerEmpty
   - OreProcessorIndustrialMachineCircuitboard
   - ClothingMaskWeldingGas
+  - ClothingShoesBootsJump
 
 - type: technology
   id: SpaceScanning

Resources/Prototypes/Roles/Jobs/Civilian/clown.yml

@@ -19,6 +19,9 @@
           Piercing: 4
         groups:
           Burn: 3
+      catchingFailDamage:
+        types:
+          Blunt: 1
     - type: SleepEmitSound
       snore: /Audio/Voice/Misc/silly_snore.ogg
       interval: 10

Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml

@@ -194,7 +194,7 @@
     neck: ClothingNeckCloakQm
     id: VisitorPDA
     back: ClothingBackpackCargo
-    ears: ClothingHeadsetRD
+    ears: ClothingHeadsetQM
     outerClothing: ClothingOuterWinterQM
     pocket1: WeaponDisabler
     pocket2: AppraisalTool
@@ -282,7 +282,7 @@
     outerClothing: ClothingOuterArmorBasicSlim
     pocket1: WeaponPistolMk58
     pocket2: MagazinePistol
-  inhand: 
+  inhand:
   - FlashlightSeclite
 
 - type: startingGear
@@ -859,7 +859,7 @@
     eyes: ClothingEyesHudMedical
     pocket1: RegenerativeMesh
     pocket2: PillCanisterBicaridine
-  inhand: 
+  inhand:
   - ScalpelAdvanced
   - MedicatedSuture
 

Resources/Prototypes/SoundCollections/scurret.yml

@@ -17,3 +17,18 @@
   id: WawaScream
   files:
   - /Audio/Animals/wawa_protest.ogg
+
+- type: soundCollection
+  id: WawaCry
+  files:
+  - /Audio/Animals/wawa_despair.ogg
+
+- type: soundCollection
+  id: WawaYawn
+  files:
+  - /Audio/Animals/wawa_yawn.ogg
+
+- type: soundCollection
+  id: WawaDeath
+  files:
+  - /Audio/Animals/wawa_the_end.ogg

Resources/Prototypes/Traits/disabilities.yml

@@ -45,9 +45,9 @@
       cloneable: true
 
 - type: trait
-  id: Monochromancy
-  name: trait-monochromancy-name
-  description: trait-monochromancy-desc
+  id: Monochromacy
+  name: trait-monochromacy-name
+  description: trait-monochromacy-desc
   category: Disabilities
   components:
   - type: BlackAndWhiteOverlay

Resources/Prototypes/Voice/speech_emote_sounds.yml

@@ -581,6 +581,20 @@
   params:
     variation: 0.125
   sounds:
+    Thump:
+      path: /Audio/Effects/soft_thump.ogg
+      params:
+        variation: 0.125
+    Clap:
+      collection: Claps
+    ClapSingle:
+      collection: ClapSingle
+    Snap:
+      collection: Snaps
+      params:
+        volume: -6
+    Salute:
+      collection: Salutes
     Laugh:
       collection: WawaLaugh
     Sneeze:
@@ -593,3 +607,19 @@
       collection: WawaSigh
     Scream:
       collection: WawaScream
+    Yawn:
+      collection: WawaYawn
+    Crying:
+      collection: WawaCry
+    Snore:
+      collection: Snores
+    Weh:
+      collection: Weh
+    Hew:
+      collection: Hew
+    Honk:
+      collection: BikeHorn
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: WawaDeath

Resources/Prototypes/Voice/speech_emotes.yml

@@ -331,6 +331,12 @@
   icon: Interface/Emotes/deathgasp.png
   chatMessages: ["chat-emote-msg-deathgasp-monkey"]
 
+- type: emote
+  id: ScurretDeathgasp
+  name: chat-emote-name-deathgasp
+  icon: Interface/Emotes/deathgasp.png
+  chatMessages: ["chat-emote-msg-deathgasp-scurret"]
+
 - type: emote
   id: Buzz
   name: chat-emote-name-buzz

Resources/Prototypes/tags.yml

@@ -225,7 +225,6 @@
 - type: Tag
   id: CanPilot
 
-
 - type: Tag
   id: CaptainSabre
 
@@ -1203,6 +1202,9 @@
 - type: Tag
   id: Screwdriver
 
+- type: Tag # Flags items that scurrets can wear in their back and outerwear slots.
+  id: ScurretWearable
+
 - type: Tag
   id: SecBeltEquip
 
@@ -1473,6 +1475,9 @@
 - type: Tag
   id: Wine
 
+- type: Tag
+  id: WireBrush
+
 - type: Tag
   id: Wirecutter
 
@@ -1514,5 +1519,4 @@
 
 - type: Tag
   id: XenoborgModuleStealth
-
 # ALPHABETICAL

Resources/Prototypes/tool_qualities.yml

@@ -67,3 +67,10 @@
   toolName: tool-quality-rolling-tool-name
   spawn: RollingPin
   icon: { sprite: Objects/Tools/rolling_pin.rsi, state: icon }
+
+- type: tool
+  id: Brushing
+  name: tool-quality-brushing-name
+  toolName: tool-quality-brushing-tool-name
+  spawn: WireBrush
+  icon: { sprite: Objects/Specific/Janitorial/wirebrush.rsi, state: icon }