Cherrypicks 5 (#399)

* Give moldy food the "Trash" tag (#29380)

Make moldy food items have the "Trash" tag, so they can be collected.

* Add "Structure" tag to switches, buttons, and levers (#29378)
shit
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>

* Revamped Meteor Swarm (#28974)

* meteor code and balanced values

* Meteor Swarms

* Update meteors.yml

* Update meteors.yml

* HOO! (fix overkill bug and buff space dust)

* undo BloodstreamComponent.cs changes

* DamageDistribution -> DamageTypes

* part 2.

* meteor fixes

* improve meteor spawning (#29057)

* Decrease meteor frequency (#29194)

* Make Projectiles Only Hit a Variety of Station Objects Unless Clicked on (#28571)

* Revert "Make Projectiles Only Hit a Variety of Station Objects Unless Clicked on (#28571)"

This reverts commit 4f934f02f17ce55cabc03b965eb1df7738d63148.

* Makes machine parts stackable, removes unused field in stack prototypes (#28434)

* Makes machine parts stacks, removes unused field in stack prototypes

* forgor

* Fix tests

* Fixes lathe construction. Yes. This sucks but there's no better way that doesnt involve refactoring machine parts completely

* detail

* a

* Add pressure and temperature warning text to firelocks (#28341)

* fix firelocks

* missing nukies can be filled in by ghost roles (#28316)

* Revert "missing nukies can be filled in by ghost roles (#28316)"

This reverts commit 99f13e1e45bc778a4941316fde5d89d7b91337ce.

* welding gas mask (#27108)

* welding gas mask

* eek

* Canes + Cane Blade for Syndicate Librarians (#25873)

* Cane + Cane Blade

* Add - type: ContainerContainer

* Add another - type: ContainerContainer

* Fix and add proper ContainerContainer component

* Add UserInterface component

* Remove Space

* Stat Changes

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Fix stupid NPC. (#26868)

* init commit

* Review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* fixes

---------

Co-authored-by: VeritableCalamity <34698192+Veritable-Calamity@users.noreply.github.com>
Co-authored-by: eoineoineoin <github@eoinrul.es>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Ps3Moira <113228053+ps3moira@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>

Resources/Audio/Items/attributions.yml

@@ -117,3 +117,10 @@
   license: "CC0-1.0"
   copyright: "Original sound by stomachache on freesound.org, processed by vanilla"
   source: "https://freesound.org/s/262213/"
+
+- files:
+  - "sheath.ogg"
+  - "unsheath.ogg"
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from tgstation."
+  source: "https://github.com/tgstation/tgstation/blob/a7f525bce9a359ab5282fc754078cd4b5678a006/sound/items"

Resources/Locale/en-US/atmos/firelock-component.ftl

@@ -1,2 +1,4 @@
 firelock-component-is-holding-pressure-message = A gush of air blows in your face... Maybe you should reconsider.
-firelock-component-is-holding-fire-message = A gush of warm air blows in your face... Maybe you should reconsider.
+firelock-component-is-holding-fire-message = A gush of warm air blows in your face... Maybe you should reconsider.
+firelock-component-examine-pressure-warning = The [color=red]extreme pressure[/color] differential warning is active.
+firelock-component-examine-temperature-warning = The [color=red]extreme temperature[/color] warning is active.

Resources/Locale/en-US/station-events/events/meteor-swarm.ftl

@@ -1,2 +1,5 @@
-station-event-meteor-swarm-start-announcement = Meteors are on a collision course with the station. Brace for impact.
+station-event-meteor-swarm-start-announcement = Meteors have been detected on collision course with the station.
 station-event-meteor-swarm-end-announcement = The meteor swarm has passed. Please return to your stations.
+
+station-event-space-dust-start-announcement = The station is passing through a debris cloud, expect minor damage to external fittings and fixtures.
+station-event-meteor-urist-start-announcement = The station is colliding with an unidentified swarm of debris. Please stay calm and do not listen to them.

Resources/Locale/en-US/store/uplink-catalog.ftl

@@ -293,6 +293,9 @@ uplink-disposable-turret-desc = Looks and functions like a normal electrical too
 uplink-cluster-banana-peel-name = Cluster Banana
 uplink-cluster-banana-peel-desc = Splits into 6 explosive banana peels after being thrown, the peels detonate automatically after 20 seconds if nobody slips on them.
 
+uplink-cane-blade-name = Cane Blade
+uplink-cane-blade-desc = A cane that has a hidden blade that can be unsheathed.
+
 # Armor
 uplink-chameleon-name = Chameleon Kit
 uplink-chameleon-desc = A backpack full of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more!

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

@@ -4,6 +4,7 @@
     BooksBag: 2
     BriefcaseBrown: 2
     HandLabeler: 2
+    Cane: 3
     ClothingEyesGlasses: 2
     ClothingEyesGlassesJamjar: 2
     ClothingNeckScarfStripedGreen: 2

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -1715,3 +1715,22 @@
     - ResearchDirector
     - Chef
     - ResearchAssistant
+
+- type: listing
+  id: UplinkCaneBlade
+  name: uplink-cane-blade-name
+  description: uplink-cane-blade-desc
+  icon: { sprite:  Objects/Weapons/Melee/cane.rsi, state: cane}
+  productEntity: CaneSheathFilled
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkJob
+  conditions:
+  - !type:BuyerJobCondition
+    whitelist:
+    - Librarian
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle

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

@@ -7,7 +7,7 @@
   components:
     - type: Tag
       tags: # ignore "WhitelistChameleon" tag
-        - HidesNose
+      - HidesNose
     - type: Sprite
       sprite: Clothing/Mask/gas.rsi
     - type: Clothing
@@ -19,8 +19,8 @@
     - type: IdentityBlocker # need that for default ClothingMaskGas
     - type: UserInterface
       interfaces:
-        - key: enum.ChameleonUiKey.Key
-          type: ChameleonBoundUserInterface
+      - key: enum.ChameleonUiKey.Key
+        type: ChameleonBoundUserInterface
 
 - type: entity
   parent: ClothingMaskGasChameleon
@@ -28,3 +28,29 @@
   suffix: Voice Mask, Chameleon
   components:
     - type: VoiceMasker
+
+- type: entity
+  parent: ClothingMaskBase
+  id: ClothingMaskWeldingGas
+  name: welding gas mask
+  description: A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/welding-gas.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Mask/welding-gas.rsi
+  - type: BreathMask
+  - type: IngestionBlocker
+  - type: IdentityBlocker
+  - type: FlashImmunity
+  - type: EyeProtection
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 200
+      Glass: 100
+  - type: StaticPrice
+    price: 100
+  - type: Tag
+    tags:
+    - WhitelistChameleon

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml

@@ -742,6 +742,9 @@
   - type: Sprite
     layers:
     - state: moldy-slice
+  - type: Tag
+    tags:
+    - Trash
   - type: SolutionContainerManager
     solutions:
       food:

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml

@@ -521,6 +521,9 @@
   - type: Sprite
     layers:
     - state: moldy-slice
+  - type: Tag
+    tags:
+    - Trash
   - type: SolutionContainerManager
     solutions:
       food:

Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml

@@ -9,6 +9,8 @@
       sprite: Objects/Misc/stock_parts.rsi
     - type: Item
       size: Tiny
+    - type: Stack
+      count: 1
 
 - type: entity
   id: CapacitorStockPart
@@ -25,6 +27,8 @@
     - type: Tag
       tags:
         - CapacitorStockPart
+    - type: Stack
+      stackType: Capacitor
 
 - type: entity
   id: MicroManipulatorStockPart
@@ -38,6 +42,8 @@
     - type: MachinePart
       part: Manipulator
       rating: 1
+    - type: Stack
+      stackType: MicroManipulator
 
 - type: entity
   id: MatterBinStockPart
@@ -51,3 +57,5 @@
     - type: MachinePart
       part: MatterBin
       rating: 1
+    - type: Stack
+      stackType: MatterBin

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

@@ -7,7 +7,6 @@
     state: extraction_pack
   spawn: Fulton1
   maxCount: 10
-  itemSize: 2
 
 # Entities
 - type: entity

Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml

@@ -420,7 +420,7 @@
     whitelist:
       tags:
         - CartridgeRocket
-    proto: MeteorLarge
+    proto: MeteorMedium
   - type: GiftIgnore
 
 - type: entity

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

@@ -1,40 +1,206 @@
 - type: entity
-  id: MeteorLarge
+  id: BaseMeteor
   name: meteor
-  noSpawn: true
+  description: You prefer them when they're burning up in the atmosphere.
+  abstract: true
   components:
   - type: Sprite
     noRot: false
-    sprite: Objects/Weapons/Guns/Projectiles/meteor.rsi
-    scale: 4,4
-    layers:
-    - state: large
-      shader: unshaded
-  - type: ExplodeOnTrigger
-  - type: DeleteOnTrigger
-  - type: TriggerOnCollide
-    fixtureID: projectile
+    sprite: Objects/Misc/meteor.rsi
   - type: Projectile
     damage: {}
     deleteOnCollide: false
-  - type: Explosive
-    explosionType: Default
-    totalIntensity: 600.0
-    intensitySlope: 30
-    maxIntensity: 45
+  - type: Meteor
+    damageTypes:
+      types:
+        Blunt: 1
+  - type: TimedDespawn
+    lifetime: 120
+  - type: Clickable
   - type: Physics
     bodyType: Dynamic
+    bodyStatus: InAir
+    angularDamping: 0
+    linearDamping: 0
   - type: Fixtures
     fixtures:
       projectile:
         shape:
           !type:PhysShapeCircle
-          radius: 0.8
+          radius: 0.4
         density: 100
-        hard: true
-        # Didn't use MapGridComponent for now as the bounds are stuffed.
+        hard: false
         layer:
         - LargeMobLayer
         mask:
         - Impassable
         - BulletImpassable
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Explosive
+    explosionType: Default
+    intensitySlope: 4
+    maxIntensity: 100
+
+- type: entity
+  parent: BaseMeteor
+  id: MeteorSpaceDust
+  name: space dust
+  description: Makes a station sneeze.
+  components:
+  - type: Sprite
+    state: space_dust
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.45
+        density: 100
+        hard: false
+        layer:
+        - LargeMobLayer
+        mask:
+        - Impassable
+        - BulletImpassable
+  - type: Explosive
+    totalIntensity: 25
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:ExplodeBehavior
+
+- type: entity
+  parent: BaseMeteor
+  id: MeteorSmall
+  suffix: Small
+  components:
+  - type: Sprite
+    state: small
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.25
+        density: 100
+        hard: false
+        layer:
+        - LargeMobLayer
+        mask:
+        - Impassable
+        - BulletImpassable
+  - type: Explosive
+    totalIntensity: 100
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1250
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:ExplodeBehavior
+
+- type: entity
+  parent: BaseMeteor
+  id: MeteorMedium
+  suffix: Medium
+  components:
+  - type: Sprite
+    state: medium
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.3
+        density: 100
+        hard: false
+        layer:
+        - LargeMobLayer
+        mask:
+        - Impassable
+        - BulletImpassable
+  - type: Explosive
+    totalIntensity: 200
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1750
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:ExplodeBehavior
+
+- type: entity
+  parent: BaseMeteor
+  id: MeteorLarge
+  suffix: Large
+  components:
+  - type: Sprite
+    state: big
+  - type: Explosive
+    totalIntensity: 300
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 2500
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:ExplodeBehavior
+
+- type: entity
+  parent: BaseMeteor
+  id: MeteorUrist
+  name: Urist McMeteor
+  description: As a successful member of society with a stable unflinching psyche and limitless drive, natural affinity for finance and domination, you have been selected, no, you have been effortlessly guided by divine (biological) trauma towards this moment. The gates of destiny fling open, and once again you're left standing on pulsating nothingness. A strobing headache of the soul.
+  suffix: Meteor
+  components:
+  - type: Sprite
+    state: human_pixel
+  - type: SolutionContainerManager
+    solutions:
+      blood:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Blood
+          Quantity: 1000
+  - type: Explosive
+    totalIntensity: 25
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 3000
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MaleScreams
+          params:
+            volume: 10
+      - !type:SpillBehavior
+        solution: blood
+      - !type:ExplodeBehavior

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

@@ -0,0 +1,97 @@
+- type: entity
+  parent: BaseItem
+  id: Cane
+  name: cane
+  description: A wooden cane.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/cane.rsi
+    state: cane
+  - type: Item
+    size: Normal
+    sprite: Objects/Weapons/Melee/cane.rsi
+  - type: Appearance
+  - type: MeleeWeapon
+    wideAnimationRotation: 45
+    damage:
+      types:
+        Blunt: 5
+  - type: StaminaDamageOnHit
+    damage: 5
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 3
+  - type: UseDelay
+    delay: 1
+
+- type: entity
+  name: cane blade
+  parent: BaseItem
+  id: CaneBlade
+  description: A sharp blade with a cane shaped hilt.
+  components:
+  - type: Sharp
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/cane_blade.rsi
+    state: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: 65
+    attackRate: 1.5
+    damage:
+      types:
+        Slash: 14
+    soundHit:
+        path: /Audio/Weapons/bladeslice.ogg
+  - type: Item
+    size: Normal
+    sprite: Objects/Weapons/Melee/cane_blade.rsi
+  - type: Tag
+    tags:
+      - CaneBlade
+  - type: DisarmMalus
+
+- type: entity
+  parent: Cane
+  id: CaneSheath
+  suffix: Empty
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/cane.rsi
+    state: cane-empty
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+  - type: UserInterface
+    interfaces:
+    - key: enum.StorageUiKey.Key
+      type: StorageBoundUserInterface
+  - type: ItemSlots
+    slots:
+      item:
+        name: CaneBlade
+        insertVerbText: sheath-insert-verb
+        ejectVerbText: sheath-eject-verb
+        whitelist:
+          tags:
+          - CaneBlade
+        insertSound: /Audio/Items/sheath.ogg
+        ejectSound: /Audio/Items/unsheath.ogg
+  - type: ItemMapper
+    mapLayers:
+      cane:
+        whitelist:
+          tags:
+          - CaneBlade
+
+- type: entity
+  id: CaneSheathFilled
+  parent: CaneSheath
+  suffix: Filled
+  components:
+  - type: ContainerFill
+    containers:
+      item:
+      - CaneBlade

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

@@ -317,6 +317,7 @@
       - PowerCellMicroreactor
       - PowerCellHigh
       - WeaponPistolCHIMP
+      - ClothingMaskWeldingGas
       - WeaponGauntletGorilla
       - SynthesizerInstrument
       - ClothingShoesBootsMagSci

Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml

@@ -32,7 +32,9 @@
                 collection: MetalBreak
     - type: UseDelay
       delay: 0.2 # prevent light-toggling auto-clickers.
-# WD edit start
+    - type: Tag
+      tags:
+      - Structure
 
 - type: entity
   id: SignalSwitch

Resources/Prototypes/GameRules/events.yml

@@ -158,25 +158,6 @@
     duration: 240
   - type: KudzuGrowthRule
 
-- type: entity
-  id: MeteorSwarm
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
-    earliestStart: 30
-    weight: 7.5
-    minimumPlayers: 10 #Enough to hopefully have at least one engineering guy
-    startAnnouncement: station-event-meteor-swarm-start-announcement
-    endAnnouncement: station-event-meteor-swarm-end-announcement
-    startAudio:
-      path: /Audio/Announcements/meteors.ogg
-      params:
-        volume: -4
-    duration: null #ending is handled by MeteorSwarmRule
-    startDelay: 30
-  - type: MeteorSwarmRule
-
 - type: entity
   id: MouseMigration
   parent: BaseGameRule

Resources/Prototypes/GameRules/meteorswarms.yml

@@ -0,0 +1,111 @@
+- type: entity
+  parent: BaseGameRule
+  id: GameRuleMeteorScheduler
+  noSpawn: true
+  components:
+  - type: GameRule
+    minPlayers: 25
+  - type: MeteorScheduler
+
+- type: weightedRandomEntity
+  id: DefaultConfig
+  weights:
+    GameRuleSpaceDustMinor: 44
+    GameRuleSpaceDustMajor: 22
+    GameRuleMeteorSwarmSmall: 18
+    GameRuleMeteorSwarmMedium: 10
+    GameRuleMeteorSwarmLarge: 5
+    GameRuleUristSwarm: 0.05
+
+- type: entity
+  parent: BaseGameRule
+  id: GameRuleMeteorSwarm
+  noSpawn: true
+  components:
+  - type: GameRule
+  - type: MeteorSwarm
+
+- type: entity
+  parent: GameRuleMeteorSwarm
+  id: GameRuleSpaceDustMinor
+  noSpawn: true
+  components:
+  - type: MeteorSwarm
+    announcement: null
+    announcementSound: null
+    nonDirectional: true
+    meteors:
+      MeteorSpaceDust: 1
+    waves:
+      min: 2
+      max: 3
+    meteorsPerWave:
+      min: 3
+      max: 5
+
+- type: entity
+  parent: GameRuleMeteorSwarm
+  id: GameRuleSpaceDustMajor
+  noSpawn: true
+  components:
+  - type: MeteorSwarm
+    announcement: station-event-space-dust-start-announcement
+    announcementSound: /Audio/Announcements/attention.ogg
+    nonDirectional: true
+    meteors:
+      MeteorSpaceDust: 1
+    waves:
+      min: 2
+      max: 3
+    meteorsPerWave:
+      min: 8
+      max: 12
+
+- type: entity
+  parent: GameRuleMeteorSwarm
+  id: GameRuleMeteorSwarmSmall
+  noSpawn: true
+  components:
+  - type: MeteorSwarm
+    meteors:
+      MeteorSmall: 7
+      MeteorMedium: 3
+
+- type: entity
+  parent: GameRuleMeteorSwarm
+  id: GameRuleMeteorSwarmMedium
+  noSpawn: true
+  components:
+  - type: MeteorSwarm
+    meteors:
+      MeteorSmall: 3
+      MeteorMedium: 6
+      MeteorLarge: 1
+
+- type: entity
+  parent: GameRuleMeteorSwarm
+  id: GameRuleMeteorSwarmLarge
+  noSpawn: true
+  components:
+  - type: MeteorSwarm
+    meteors:
+      MeteorSmall: 2
+      MeteorMedium: 4
+      MeteorLarge: 4
+
+- type: entity
+  parent: GameRuleMeteorSwarm
+  id: GameRuleUristSwarm
+  noSpawn: true
+  components:
+  - type: MeteorSwarm
+    announcement: station-event-meteor-urist-start-announcement
+    announcementSound: /Audio/Announcements/attention.ogg
+    meteors:
+      MeteorUrist: 1
+    waves:
+      min: 3
+      max: 3
+    meteorsPerWave:
+      min: 10
+      max: 10

Resources/Prototypes/NPCs/Combat/melee.yml

@@ -17,6 +17,29 @@
         - !type:HTNCompoundTask
           task: PickupMeleeCompound
 
+    - preconditions:
+      - !type:BuckledPrecondition
+        isBuckled: true
+      tasks:
+      - !type:HTNPrimitiveTask
+        shutdownState: TaskFinished
+        operator: !type:UnbuckleOperator
+
+    - preconditions:
+      - !type:InContainerPrecondition
+        isInContainer: true
+      tasks:
+      - !type:HTNCompoundTask
+        task: EscapeCompound
+
+    - preconditions:
+      - !type:PulledPrecondition
+        isPulled: true
+      tasks:
+      - !type:HTNPrimitiveTask
+        shutdownState: TaskFinished
+        operator: !type:UnPullOperator
+
     # Melee combat (unarmed or otherwise)
     - tasks:
         - !type:HTNPrimitiveTask
@@ -101,6 +124,21 @@
               proto: NearbyMeleeTargets
               key: Target
 
+- type: htnCompound
+  id: EscapeCompound
+  branches:
+  - tasks:
+    - !type:HTNPrimitiveTask
+      shutdownState: TaskFinished
+      operator: !type:ContainerOperator
+        targetKey: Target
+    - !type:HTNPrimitiveTask
+      operator: !type:EscapeOperator
+        targetKey: Target
+      preconditions:
+      - !type:InContainerPrecondition
+        isInContainer: true
+
 - type: htnCompound
   id: MeleeAttackOrderedTargetCompound
   branches:

Resources/Prototypes/Recipes/Lathes/devices.yml

@@ -76,7 +76,7 @@
     Steel: 100
     Plastic: 200
     Glass: 100
-    
+
 - type: latheRecipe
   id: SignallerAdvanced
   result: RemoteSignallerAdvanced
@@ -175,6 +175,14 @@
     Plasma: 1500
     Uranium: 150
 
+- type: latheRecipe
+  id: ClothingMaskWeldingGas
+  result: ClothingMaskWeldingGas
+  completetime: 3
+  materials:
+    Steel: 600
+    Glass: 200
+
 - type: latheRecipe
   id: WeaponForceGun
   result: WeaponForceGun

Resources/Prototypes/Research/industrial.yml

@@ -14,6 +14,7 @@
   - BorgModuleMining
   - OreProcessorIndustrialMachineCircuitboard
   - OreBagOfHolding
+  - ClothingMaskWeldingGas
 
 - type: technology
   id: AdvancedPowercells

Resources/Prototypes/Stacks/Materials/Sheets/glass.yml

@@ -4,7 +4,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: glass }
   spawn: SheetGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: ReinforcedGlass
@@ -12,7 +11,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rglass }
   spawn: SheetRGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: PlasmaGlass
@@ -20,7 +18,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: pglass }
   spawn: SheetPGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: ReinforcedPlasmaGlass
@@ -28,7 +25,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rpglass }
   spawn: SheetRPGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: UraniumGlass
@@ -36,7 +32,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: uglass }
   spawn: SheetUGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: ReinforcedUraniumGlass
@@ -44,7 +39,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: ruglass }
   spawn: SheetRUGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: ClockworkGlass
@@ -52,4 +46,3 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: cglass }
   spawn: SheetClockworkGlass1
   maxCount: 30
-  itemSize: 1

Resources/Prototypes/Stacks/Materials/Sheets/metal.yml

@@ -4,7 +4,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: steel }
   spawn: SheetSteel1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Plasteel
@@ -12,7 +11,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: plasteel }
   spawn: SheetPlasteel1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Brass
@@ -20,4 +18,3 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: brass }
   spawn: SheetBrass1
   maxCount: 30
-  itemSize: 1

Resources/Prototypes/Stacks/Materials/Sheets/other.yml

@@ -4,7 +4,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: paper }
   spawn: SheetPaper1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Plasma
@@ -12,7 +11,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plasma }
   spawn: SheetPlasma1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Plastic
@@ -20,7 +18,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plastic }
   spawn: SheetPlastic1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Uranium
@@ -28,4 +25,3 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: uranium }
   spawn: SheetUranium1
   maxCount: 30
-  itemSize: 1

Resources/Prototypes/Stacks/Materials/crystals.yml

@@ -3,4 +3,3 @@
   name: telecrystal
   icon: Objects/Specific/Syndicate/telecrystal.rsi
   spawn: Telecrystal1
-  itemSize: 1

Resources/Prototypes/Stacks/Materials/ingots.yml

@@ -4,7 +4,6 @@
   icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: gold }
   spawn: IngotGold1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Silver
@@ -12,4 +11,3 @@
   icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: silver }
   spawn: IngotSilver1
   maxCount: 30
-  itemSize: 1

Resources/Prototypes/Stacks/Materials/materials.yml

@@ -1,66 +1,65 @@
 - type: stack
   id: Biomass
-  name: биомасса
+  name: biomass
   icon: { sprite: /Textures/Objects/Misc/monkeycube.rsi, state: cube }
   spawn: MaterialBiomass1
   maxCount: 100
-  itemSize: 1
 
 - type: stack
   id: WoodPlank
-  name: древесина
+  name: wood plank
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: wood }
   spawn: MaterialWoodPlank1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Cardboard
-  name: картонная коробка
+  name: cardboard
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard }
   spawn: MaterialCardboard1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Cloth
-  name: ткань
+  name: cloth
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cloth }
   spawn: MaterialCloth1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Durathread
-  name: дюраткань
+  name: durathread
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread }
   spawn: MaterialDurathread1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Diamond
-  name: алмаз
+  name: diamond
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: diamond }
   spawn: MaterialDiamond1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: Cotton
-  name: хлопок
+  name: cotton
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cotton }
   spawn: MaterialCotton1
   maxCount: 30
-  itemSize: 1
+
+- type: stack
+  id: Pyrotton
+  name: pyrotton
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: pyrotton }
+  spawn: MaterialPyrotton1
+  maxCount: 30
 
 - type: stack
   id: Bananium
-  name: бананиум
+  name: bananium
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bananium }
   spawn: MaterialBananium1
   maxCount: 10
-  itemSize: 2
 
 - type: stack
   id: MeatSheets
@@ -68,7 +67,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/meaterial.rsi, state: meat }
   spawn: MaterialSheetMeat1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: WebSilk
@@ -76,7 +74,6 @@
   icon: { sprite: /Textures/Objects/Materials/silk.rsi, state: icon }
   spawn: MaterialWebSilk1
   maxCount: 50
-  itemSize: 1
 
 - type: stack
   id: Bones
@@ -84,7 +81,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bones}
   spawn: MaterialBones1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: RunicMetalSheets
@@ -92,12 +88,10 @@
   icon: { sprite: /Textures/White/Cult/Entities/runic_metal.rsi, state: runic}
   spawn: CultRunicMetal1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Gunpowder
-  name: порох
+  name: gunpowder
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: MaterialGunpowder
   maxCount: 60
-  itemSize: 1

Resources/Prototypes/Stacks/Materials/ore.yml

@@ -4,7 +4,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: gold }
   spawn: GoldOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: SteelOre
@@ -12,7 +11,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: iron }
   spawn: SteelOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: PlasmaOre
@@ -20,7 +18,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: plasma }
   spawn: PlasmaOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: SilverOre
@@ -28,7 +25,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: silver }
   spawn: SilverOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: SpaceQuartz
@@ -36,7 +32,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: spacequartz }
   spawn: SpaceQuartz1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: UraniumOre
@@ -44,7 +39,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: uranium }
   spawn: UraniumOre1
   maxCount: 30
-  itemSize: 2
 
 
 - type: stack
@@ -53,7 +47,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: bananium }
   spawn: BananiumOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: Coal
@@ -61,7 +54,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: coal }
   spawn: Coal1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: SaltOre
@@ -69,4 +61,3 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: salt }
   spawn: Salt1
   maxCount: 30
-  itemSize: 2

Resources/Prototypes/Stacks/Materials/parts.yml

@@ -4,4 +4,3 @@
   icon: { sprite: /Textures/Objects/Materials/parts.rsi, state: rods }
   spawn: PartRodMetal1
   maxCount: 30
-  itemSize: 1

Resources/Prototypes/Stacks/consumable_stacks.yml

@@ -5,7 +5,6 @@
   name: pancake
   spawn: FoodBakedPancake
   maxCount: 3
-  itemSize: 1
 
 # Food Containers
 
@@ -15,54 +14,60 @@
   icon: { sprite: Objects/Consumable/Food/Baked/pizza.rsi, state: box }
   spawn: FoodBoxPizza
   maxCount: 30
-  itemSize: 10
 
 # Smokeables
 
 - type: stack
   id: PaperRolling
-  name: самокрутка
+  name: rolling paper
   icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigpaper }
   spawn: PaperRolling
   maxCount: 5
-  itemSize: 1
 
 - type: stack
   id: CigaretteFilter
-  name: фильтр
+  name: cigarette filter
   icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigfilter }
   spawn: CigaretteFilter
   maxCount: 5
-  itemSize: 2
 
 - type: stack
   id: GroundTobacco
-  name: измельчённый табак
+  name: ground tobacco
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: GroundTobacco
   maxCount: 5
-  itemSize: 1
 
 - type: stack
   id: GroundCannabis
-  name: измельчённый каннабис
+  name: ground cannabis
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: GroundCannabis
   maxCount:
-  itemSize: 1
+
+- type: stack
+  id: GroundCannabisRainbow
+  name: ground rainbow cannabis
+  icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: powderpile_rainbow }
+  spawn: GroundCannabisRainbow
+  maxCount:
 
 - type: stack
   id: LeavesTobaccoDried
-  name: высушеные листья табака
+  name: dried tobacco leaves
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/tobacco.rsi, state: dried }
   spawn: LeavesTobaccoDried
   maxCount: 5
-  itemSize: 5
 
 - type: stack
   id: LeavesCannabisDried
-  name: высушеные листья каннабиса
+  name: dried cannabis leaves
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/tobacco.rsi, state: dried }
   spawn: LeavesCannabisDried
   maxCount: 5
-  itemSize: 5
+
+- type: stack
+  id: LeavesCannabisRainbowDried
+  name: dried rainbow cannabis leaves
+  icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: dried }
+  spawn: LeavesCannabisRainbowDried

Resources/Prototypes/Stacks/engineering_stacks.yml

@@ -4,11 +4,9 @@
   name: inflatable wall
   spawn: InflatableWallStack1
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: InflatableDoor
   name: inflatable door
   spawn: InflatableDoorStack1
   maxCount: 4
-  itemSize: 1

Resources/Prototypes/Stacks/floor_tile_stacks.yml

@@ -3,469 +3,402 @@
   name: steel tile
   spawn: FloorTileItemSteel
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMetalDiamond
   name: steel tile
   spawn: FloorTileItemMetalDiamond
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWood
   name: wood floor
   spawn: FloorTileItemWood
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWhite
   name: white tile
   spawn: FloorTileItemWhite
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileDark
   name: dark tile
   spawn: FloorTileItemDark
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileTechmaint
   name: techmaint floor
   spawn: FloorTileItemTechmaint
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileFreezer
   name: freezer tile
   spawn: FloorTileItemFreezer
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileShowroom
   name: showroom tile
   spawn: FloorTileItemShowroom
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGCircuit
   name: green-circuit floor
   spawn: FloorTileItemGCircuit
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGold
   name: gold floor
   spawn: FloorTileItemGold
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileReinforced
   name: reinforced tile
   spawn: FloorTileItemReinforced
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMono
   name: mono tile
   spawn: FloorTileItemMono
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileBrassFilled
   name: filled brass plate
   spawn: FloorTileItemBrassFilled
   maxCount: 30
-  itemSize: 5
-  
+
 - type: stack
   id: FloorTileBrassReebe
   name: smooth brass plate
   spawn: FloorTileItemBrassReebe
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileLino
   name: linoleum floor
   spawn: FloorTileItemLino
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileHydro
   name: hydro tile
   spawn: FloorTileItemHydro
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileLime
   name: lime tile
   spawn: FloorTileItemLime
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileDirty
   name: dirty tile
   spawn: FloorTileItemDirty
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleWhite
   name: white shuttle tile
   spawn: FloorTileItemShuttleWhite
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleBlue
   name: blue shuttle tile
   spawn: FloorTileItemShuttleBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleOrange
   name: orange shuttle tile
   spawn: FloorTileItemShuttleOrange
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttlePurple
   name: purple shuttle tile
   spawn: FloorTileItemShuttlePurple
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleRed
   name: red shuttle tile
   spawn: FloorTileItemShuttleRed
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleGrey
   name: grey shuttle tile
   spawn: FloorTileItemShuttleGrey
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleBlack
   name: black shuttle tile
   spawn: FloorTileItemShuttleBlack
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackEighties
   name: eighties floor tile
   spawn: FloorTileItemEighties
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackArcadeBlue
   name: blue arcade tile
   spawn: FloorTileItemArcadeBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackArcadeBlue2
   name: blue arcade tile
   spawn: FloorTileItemArcadeBlue2
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackArcadeRed
   name: red arcade tile
   spawn: FloorTileItemArcadeRed
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetRed
   name: red carpet tile
   spawn: FloorCarpetItemRed
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetBlack
   name: block carpet tile
   spawn: FloorCarpetItemBlack
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetBlue
   name: blue carpet tile
   spawn: FloorCarpetItemBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetGreen
   name: green carpet tile
   spawn: FloorCarpetItemGreen
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetOrange
   name: orange carpet tile
   spawn: FloorCarpetItemOrange
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetSkyBlue
   name: skyblue carpet tile
   spawn: FloorCarpetItemSkyBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetPurple
   name: purple carpet tile
   spawn: FloorCarpetItemPurple
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetPink
   name: pink carpet tile
   spawn: FloorCarpetItemPink
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetCyan
   name: cyan carpet tile
   spawn: FloorCarpetItemCyan
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetWhite
   name: white carpet tile
   spawn: FloorCarpetItemWhite
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackCarpetClown
   name: clown carpet tile
   spawn: FloorTileItemCarpetClown
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackCarpetOffice
   name: office carpet tile
   spawn: FloorTileItemCarpetOffice
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackBoxing
   name: boxing ring tile
   spawn: FloorTileItemBoxing
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackGym
   name: gym floor tile
   spawn: FloorTileItemGym
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileElevatorShaft
   name: elevator shaft tile
   spawn: FloorTileItemElevatorShaft
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileRockVault
   name: rock vault tile
   spawn: FloorTileItemRockVault
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileBlue
   name: blue floor tile
   spawn: FloorTileItemBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMining
   name: mining floor tile
   spawn: FloorTileItemMining
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMiningDark
   name: dark mining floor tile
   spawn: FloorTileItemMiningDark
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMiningLight
   name: light mining floor tile
   spawn: FloorTileItemMiningLight
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileBar
   name: item bar floor tile
   spawn: FloorTileItemBar
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileClown
   name: clown floor tile
   spawn: FloorTileItemClown
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMime
   name: mime floor tile
   spawn: FloorTileItemMime
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileKitchen
   name: kitchen floor tile
   spawn: FloorTileItemKitchen
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileLaundry
   name: laundry floor tile
   spawn: FloorTileItemLaundry
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileConcrete
   name: concrete tile
   spawn: FloorTileItemGrayConcrete
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGrayConcrete
   name: gray concrete tile
   spawn: FloorTileItemLaundry
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileOldConcrete
   name: old concrete tile
   spawn: FloorTileItemOldConcrete
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileSilver
   name: silver floor tile
   spawn: FloorTileItemSilver
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileBCircuit
   name: bcircuit floor tile
   spawn: FloorTileItemBCircuit
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGrass
   name: grass floor tile
   spawn: FloorTileItemGrass
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGrassJungle
   name: grass jungle floor tile
   spawn: FloorTileItemGrassJungle
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileSnow
   name: snow floor tile
   spawn: FloorTileItemSnow
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWoodPattern
   name: wood pattern floor
   spawn: FloorTileItemWoodPattern
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileFlesh
   name: flesh floor
   spawn: FloorTileItemFlesh
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileSteelMaint
   name: steel maint floor
   spawn: FloorTileItemSteelMaint
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGratingMaint
   name: grating maint floor
   spawn: FloorTileItemGratingMaint
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWeb
   name: web tile
   spawn: FloorTileItemWeb
   maxCount: 30
-  itemSize: 5
 
 # Faux science tiles
 - type: stack
@@ -473,38 +406,33 @@
   name: astro-grass floor
   spawn: FloorTileItemAstroGrass
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMowedAstroGrass
   name: mowed astro-grass floor
   spawn: FloorTileItemMowedAstroGrass
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileJungleAstroGrass
   name: jungle astro-grass floor
   spawn: FloorTileItemJungleAstroGrass
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileAstroIce
   name: astro-ice floor
   spawn: FloorTileItemAstroIce
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileAstroSnow
   name: astro-snow floor
   spawn: FloorTileItemAstroSnow
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWoodLarge
   name: large wood floor
   spawn: FloorTileItemWoodLarge
-  maxCount: 30
+  maxCount: 30

Resources/Prototypes/Stacks/medical_stacks.yml

@@ -4,7 +4,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: ointment }
   spawn: Ointment
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: AloeCream
@@ -12,7 +11,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Hydroponics/aloe.rsi", state: cream }
   spawn: AloeCream
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: Gauze
@@ -20,7 +18,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: gauze }
   spawn: Gauze
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: Brutepack
@@ -28,7 +25,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: gauze }
   spawn: Brutepack
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: Bloodpack
@@ -36,7 +32,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: bloodpack }
   spawn: Bloodpack
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: MedicatedSuture
@@ -44,7 +39,6 @@
   icon: {sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: medicated-suture }
   spawn: MedicatedSuture
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: RegenerativeMesh
@@ -52,6 +46,4 @@
   icon: {sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: regenerative-mesh}
   spawn: RegenerativeMesh
   maxCount: 10
-  itemSize: 1
-
 

Resources/Prototypes/Stacks/power_stacks.yml

@@ -4,7 +4,6 @@
   icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coil-30 }
   spawn: CableApcStack1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: CableMV
@@ -12,7 +11,6 @@
   icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilmv-30 }
   spawn: CableMVStack1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: CableHV
@@ -20,4 +18,3 @@
   icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilhv-30 }
   spawn: CableHVStack1
   maxCount: 30
-  itemSize: 1

Resources/Prototypes/Stacks/science_stacks.yml

@@ -3,4 +3,21 @@
   name: artifact fragment
   spawn: ArtifactFragment1
   maxCount: 30
-  itemSize: 5
+
+- type: stack
+  id: Capacitor
+  name: capacitor
+  spawn: CapacitorStockPart
+  maxCount: 10
+
+- type: stack
+  id: MicroManipulator
+  name: micro manipulator
+  spawn: MicroManipulatorStockPart
+  maxCount: 10
+
+- type: stack
+  id: MatterBin
+  name: matter bin
+  spawn: MatterBinStockPart
+  maxCount: 10

Resources/Prototypes/game_presets.yml

@@ -35,6 +35,7 @@
   description: extended-description
   rules:
   - BasicStationEventScheduler
+  - GameRuleMeteorScheduler
   - BasicRoundstartVariation
 
 - type: gamePreset
@@ -68,6 +69,7 @@
   description: secret-description
   rules:
     - BasicStationEventScheduler
+    - GameRuleMeteorScheduler
 
 - type: gamePreset
   id: SecretGreenshift #For Admin Use: Runs Greenshift but shows "Secret" in lobby.
@@ -99,6 +101,7 @@
     - Traitor
     - SubGamemodesRule
     - BasicStationEventScheduler
+    - GameRuleMeteorScheduler
     - BasicRoundstartVariation
 
 - type: gamePreset
@@ -125,6 +128,7 @@
     - Nukeops
     - SubGamemodesRule
     - BasicStationEventScheduler
+    - GameRuleMeteorScheduler
     - BasicRoundstartVariation
 
 - type: gamePreset
@@ -140,6 +144,7 @@
     - Revolutionary
     - SubGamemodesRule
     - BasicStationEventScheduler
+    - GameRuleMeteorScheduler
     - BasicRoundstartVariation
 
 - type: gamePreset
@@ -156,6 +161,7 @@
   rules:
   - Zombie
   - BasicStationEventScheduler
+  - GameRuleMeteorScheduler
   - BasicRoundstartVariation
 
 - type: gamePreset

Resources/Prototypes/tags.yml

@@ -258,6 +258,9 @@
 - type: Tag
   id: CableCoil
 
+- type: Tag
+  id: CaneBlade
+
 - type: Tag
   id: CannonBall
 
@@ -1319,3 +1322,5 @@
 
 - type: Tag
   id: WriteIgnoreStamps
+
+# ALPHABETICAL

Resources/Textures/Clothing/Mask/welding-gas.rsi/meta.json

@@ -0,0 +1,49 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6f5ca45e3ac06b30fb1957042214a888d8c01722. Inhands, worn sprites, and vox sprites created by EmoGarbage404 (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-up"
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "up-equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-vox",
+      "directions": 4
+    },
+    {
+      "name": "up-equipped-MASK-vox",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "up-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "up-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Misc/meteor.rsi/meta.json

@@ -0,0 +1,271 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31dd6749bfe32810c46e7913efc99a187479cd51/icons/obj/meteor.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "small",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "small_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "small_flash",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "small_flash_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "space_dust"
+    },
+    {
+      "name": "medium",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "medium_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "medium_piercing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "medium_piercing_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "medium_radioactive",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "medium_radioactive_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "big",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "big_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "big_cluster",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "big_cluster_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "human",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "human_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "firework_pixel"
+    },
+    {
+      "name": "firework"
+    }
+  ]
+}

Resources/Textures/Objects/Weapons/Melee/cane.rsi/meta.json

@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by ps3moira#9488 on discord", 
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "cane-empty"
+    },
+    {
+      "name": "cane"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Weapons/Melee/cane_blade.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by ps3moira#9488 on discord", 
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}