Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream

# Conflicts: # Content.Shared/Lock/LockSystem.cs # Resources/Prototypes/Maps/oasis.yml
2024-05-13 18:32:59 +03:00
parent 50c4fd3a58 1f03111ff8
commit dda8ea2b09
624 changed files with 43352 additions and 25174 deletions
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -162,6 +162,9 @@
  - type: ShowHealthBars
    damageContainers:
    - Biological
+  - type: ShowHealthIcons
+    damageContainers: 
+    - Biological

 - type: entity
  parent: [ClothingEyesBase, ShowSecurityIcons]
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -163,6 +163,8 @@
    lowPressureMultiplier: 1000
  - type: TemperatureProtection
    coefficient: 0.1
+  - type: FireProtection
+    reduction: 0.2
  - type: Armor
    modifiers:
      coefficients:
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -417,6 +417,8 @@
    lowPressureMultiplier: 1000
  - type: TemperatureProtection
    coefficient: 0.005
+  - type: FireProtection
+    reduction: 0.2
  - type: Armor
    modifiers:
      coefficients:
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -390,7 +390,7 @@
    - Snout

 - type: entity
-  parent: ClothingHeadBase
+  parent: ClothingHeadHatWizardBase
  id: ClothingHeadHatRedwizard
  name: red wizard hat
  description: Strange-looking red hat-wear that most certainly belongs to a real magic user.
@@ -505,7 +505,7 @@


 - type: entity
-  parent: ClothingHeadBase
+  parent: ClothingHeadHatWizardBase
  id: ClothingHeadHatVioletwizard
  name: violet wizard hat
  description: "Strange-looking violet hat-wear that most certainly belongs to a real magic user."
@@ -534,6 +534,7 @@
  name: witch hat
  description: A witch hat.
  components:
+  - type: WizardClothes #Yes this will count
  - type: Sprite
    sprite: Clothing/Head/Hats/witch.rsi
  - type: Clothing
@@ -558,7 +559,14 @@
    sprite: Clothing/Head/Hats/wizard_fake.rsi

 - type: entity
+  abstract: true
  parent: ClothingHeadBase
+  id: ClothingHeadHatWizardBase
+  components:
+  - type: WizardClothes
+
+- type: entity
+  parent: ClothingHeadHatWizardBase
  id: ClothingHeadHatWizard
  name: wizard hat
  description: Strange-looking blue hat-wear that most certainly belongs to a powerful magic user.
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -224,6 +224,8 @@
  - type: IngestionBlocker
  - type: TemperatureProtection
    coefficient: 0.005
+  - type: FireProtection
+    reduction: 0.15 # not fully sealed so less protection
  - type: IdentityBlocker
  - type: Tag
    tags:
@@ -248,6 +250,8 @@
  - type: IngestionBlocker
  - type: TemperatureProtection
    coefficient: 0.005
+  - type: FireProtection
+    reduction: 0.2
  - type: PressureProtection
    highPressureMultiplier: 0.25
    lowPressureMultiplier: 1000
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -86,6 +86,17 @@
  - type: Clothing
    sprite: Clothing/Head/Misc/pwig.rsi

+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadMirror
+  name: head mirror
+  description: I doubt even the CMO knows how to use this thing.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/head_mirror.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/head_mirror.rsi
+
 - type: entity
  parent: ClothingHeadBase
  id: ClothingHeadHatRichard
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -3,7 +3,7 @@

 #Basic armor vest
 - type: entity
-  parent: ClothingOuterBaseMedium
+  parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing]
  id: ClothingOuterArmorBasic
  name: armor vest
  description: A standard Type I armored vest that provides decent protection against most types of damage.
@@ -36,7 +36,7 @@
    sprite: Clothing/OuterClothing/Armor/security_slim.rsi

 - type: entity
-  parent: ClothingOuterBaseLarge
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
  id: ClothingOuterArmorRiot
  name: riot suit
  description: A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Perfect for fighting delinquents around the station.
@@ -120,7 +120,7 @@
  - type: GroupExamine

 - type: entity
-  parent: ClothingOuterBaseLarge
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
  id: ClothingOuterArmorHeavy
  name: heavy armor suit
  description: A heavily armored suit that protects against excessive damage.
@@ -187,7 +187,7 @@
    sprite: Clothing/OuterClothing/Armor/magusred.rsi

 - type: entity
-  parent: ClothingOuterBaseLarge
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
  id: ClothingOuterArmorCaptainCarapace
  name: "captain's carapace"
  description: "An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest."
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -101,7 +101,7 @@

 - type: entity
  abstract: true
-  parent: [ClothingOuterBase, GeigerCounterClothing]
+  parent: [ClothingOuterBase, GeigerCounterClothing, AllowSuitStorageClothing]
  id: ClothingOuterHardsuitBase
  name: base hardsuit
  components:
@@ -109,7 +109,9 @@
    highPressureMultiplier: 0.3
    lowPressureMultiplier: 1000
  - type: TemperatureProtection
-    coefficient: 0.001 # yes it needs to be this low, fires are fucking deadly apparently!!!!
+    coefficient: 0.01
+  - type: FireProtection
+    reduction: 0.75 # almost perfectly sealed, atmos firesuit is better
  - type: ClothingSpeedModifier
    walkModifier: 0.4
    sprintModifier: 0.6
@@ -139,7 +141,7 @@

 - type: entity
  abstract: true
-  parent: ClothingOuterBase
+  parent: [ClothingOuterBase, AllowSuitStorageClothing]
  id: ClothingOuterEVASuitBase
  name: base EVA Suit
  components:
@@ -178,4 +180,4 @@
  id: ClothingOuterBaseMedium
  components:
  - type: Item
-    size: Huge
+    size: Huge
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -10,7 +10,7 @@
    sprite: Clothing/OuterClothing/Coats/bomber.rsi

 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageBase, AllowSuitStorageClothing]
  id: ClothingOuterCoatDetective
  name: detective trenchcoat
  description: A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Wearing it makes you feel for the plight of the Tibetans.
@@ -53,6 +53,7 @@

 - type: entity
  abstract: true
+  parent: AllowSuitStorageClothing
  id: ClothingOuterArmorHoS
  components:
  - type: Armor
@@ -68,6 +69,7 @@

 - type: entity
  abstract: true
+  parent: AllowSuitStorageClothing
  id: ClothingOuterArmorWarden
  components:
  - type: Armor
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -52,9 +52,8 @@
        Blunt: 0.9
        Slash: 0.9
        Piercing: 0.9
-        Heat: 0.2
+        Heat: 0.8
        Radiation: 0.5
-        Caustic: 0.5
  - type: ClothingSpeedModifier
    walkModifier: 0.7
    sprintModifier: 0.7
@@ -76,8 +75,6 @@
  - type: PressureProtection
    highPressureMultiplier: 0.04
    lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    coefficient: 0.01
  - type: ExplosionResistance
    damageCoefficient: 0.5
  - type: Armor
@@ -545,6 +542,8 @@
    coefficient: 0.001
  - type: ExplosionResistance
    damageCoefficient: 0.2
+  - type: FireProtection
+    reduction: 0.8 # perfect protection like atmos firesuit for pyro tf2 ops
  - type: Armor
    modifiers:
      coefficients:
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -166,9 +166,16 @@
  - type: Clothing
    sprite: Clothing/OuterClothing/Misc/santa.rsi

+- type: entity
+  abstract: true
+  parent: ClothingOuterBase
+  id: ClothingOuterWizardBase
+  components:
+  - type: WizardClothes
+
 # Is this wizard wearing a fanny pack???
 - type: entity
-  parent: ClothingOuterBase
+  parent: ClothingOuterWizardBase
  id: ClothingOuterWizardViolet
  name: violet wizard robes
  description: A bizarre gem-encrusted violet robe that radiates magical energies.
@@ -179,7 +186,7 @@
    sprite: Clothing/OuterClothing/Misc/violetwizard.rsi

 - type: entity
-  parent: ClothingOuterBase
+  parent: ClothingOuterWizardBase
  id: ClothingOuterWizard
  name: wizard robes
  description: A bizarre gem-encrusted blue robe that radiates magical energies.
@@ -190,7 +197,7 @@
    sprite: Clothing/OuterClothing/Misc/wizard.rsi

 - type: entity
-  parent: ClothingOuterBase
+  parent: ClothingOuterWizardBase
  id: ClothingOuterWizardRed
  name: red wizard robes
  description: Strange-looking, red, hat-wear that most certainly belongs to a real magic user.
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -41,7 +41,7 @@
    sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi

 - type: entity
-  parent: ClothingOuterBaseLarge
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
  id: ClothingOuterSuitFire
  name: fire suit
  description: A suit that helps protect against hazardous temperatures.
@@ -54,12 +54,14 @@
    highPressureMultiplier: 0.04
  - type: TemperatureProtection
    coefficient: 0.005
+  - type: FireProtection
+    reduction: 0.65 # doesnt have a full seal so not as good
  - type: Armor
    modifiers:
      coefficients:
        Slash: 0.9
-        Heat: 0.3
-        Cold: 0.2
+        Heat: 0.8
+        Cold: 0.8
  - type: ClothingSpeedModifier
    walkModifier: 0.8
    sprintModifier: 0.7
@@ -69,7 +71,7 @@
    slots: WITHOUT_POCKET

 - type: entity
-  parent: ClothingOuterBaseLarge
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
  id: ClothingOuterSuitAtmosFire
  name: atmos fire suit
  description: An expensive firesuit that protects against even the most deadly of station fires. Designed to protect even if the wearer is set aflame.
@@ -83,12 +85,14 @@
    lowPressureMultiplier: 1000
  - type: TemperatureProtection
    coefficient: 0.001
+  - type: FireProtection
+    reduction: 0.8 # atmos firesuit offers best protection, hardsuits are a little vulnerable
  - type: Armor
    modifiers:
      coefficients:
        Slash: 0.9
-        Heat: 0.3
-        Cold: 0.2
+        Heat: 0.8
+        Cold: 0.8
  - type: ClothingSpeedModifier
    walkModifier: 0.8
    sprintModifier: 0.8
@@ -98,7 +102,7 @@
    slots: WITHOUT_POCKET

 - type: entity
-  parent: [ClothingOuterBaseLarge, GeigerCounterClothing]
+  parent: [ClothingOuterBaseLarge, GeigerCounterClothing, AllowSuitStorageClothing]
  id: ClothingOuterSuitRad
  name: radiation suit
  description: "A suit that protects against radiation. The label reads, 'Made with lead. Please do not consume insulation.'"
@@ -123,7 +127,7 @@
    slots: WITHOUT_POCKET

 - type: entity
-  parent: ClothingOuterBaseLarge
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
  id: ClothingOuterSuitSpaceNinja
  name: space ninja suit
  description: This black technologically advanced, cybernetically-enhanced suit provides many abilities like invisibility or teleportation.
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
@@ -1,6 +1,6 @@
 #Web vest
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageBase, AllowSuitStorageClothing]
  id: ClothingOuterVestWeb
  name: web vest
  description: A synthetic armor vest. This one has added webbing and ballistic plates.
@@ -21,7 +21,7 @@

 #Mercenary web vest
 - type: entity
-  parent: ClothingOuterStorageBase #web vest so it should have some pockets for ammo
+  parent: ClothingOuterVestWeb #web vest so it should have some pockets for ammo
  id: ClothingOuterVestWebMerc
  name: merc web vest
  description: A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating.
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -119,6 +119,17 @@
  - type: Clothing
    sprite: Clothing/Uniforms/Jumpskirt/cmo.rsi

+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtCMOTurtle
+  name: chief medical officer's turtleneck jumpskirt
+  description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi
+
 - type: entity
  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtDetective
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -264,6 +264,17 @@
  - type: Clothing
    sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi

+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitCMOTurtle
+  name: chief medical officer's turtleneck jumpsuit
+  description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi
+
 - type: entity
  parent: ClothingUniformBase
  id: ClothingUniformJumpsuitDetective
--- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml
+++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
@@ -19,6 +19,12 @@
    - type: Geiger
      attachedToSuit: true

+- type: entity
+  abstract: true
+  id: AllowSuitStorageClothing
+  components:
+  - type: AllowSuitStorage
+
 # for clothing that has a single item slot to insert and alt click out.
 # inheritors add a whitelisted slot named item
 - type: entity
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -92,6 +92,8 @@
    name: ghost-role-information-loneop-name
    description: ghost-role-information-loneop-description
    rules: ghost-role-information-loneop-rules
+    raffle:
+      settings: default
  - type: GhostRoleAntagSpawner
  - type: Sprite
    sprite: Markers/jobs.rsi
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -838,3 +838,17 @@
  - type: ConditionalSpawner
    prototypes:
    - MobLuminousEntity
+
+- type: entity
+  name: clown spider spawner
+  id: SpawnClownSpider
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: clown
+      sprite: Mobs/Animals/clownspider.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobClownSpider
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -217,9 +217,26 @@
      - Cyborgs
  - type: StepTriggerImmune

+- type: entity
+  abstract: true
+  id: BaseBorgTransponder
+  components:
+  - type: BorgTransponder
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: CyborgControl
+    transmitFrequencyId: RoboticsConsole
+  # explosion does most of its damage in the center and less at the edges
+  - type: Explosive
+    explosionType: Minibomb
+    totalIntensity: 30
+    intensitySlope: 20
+    maxIntensity: 20
+    canCreateVacuum: false # its for killing the borg not the station
+
 - type: entity
  id: BaseBorgChassisNT
-  parent: BaseBorgChassis
+  parent: [BaseBorgChassis, BaseBorgTransponder]
  abstract: true
  components:
  - type: NpcFactionMember
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -20,6 +20,11 @@
      - BorgModuleGeneric
    hasMindState: robot_e
    noMindState: robot_e_r
+  - type: BorgTransponder
+    sprite:
+      sprite: Mobs/Silicon/chassis.rsi
+      state: robot
+    name: cyborg
  - type: Construction
    node: cyborg
  - type: Speech
@@ -57,6 +62,11 @@
      - BorgModuleCargo
    hasMindState: miner_e
    noMindState: miner_e_r
+  - type: BorgTransponder
+    sprite:
+      sprite: Mobs/Silicon/chassis.rsi
+      state: miner
+    name: salvage cyborg
  - type: Construction
    node: mining
  - type: IntrinsicRadioTransmitter
@@ -100,6 +110,11 @@
      - BorgModuleEngineering
    hasMindState: engineer_e
    noMindState: engineer_e_r
+  - type: BorgTransponder
+    sprite:
+      sprite: Mobs/Silicon/chassis.rsi
+      state: engineer
+    name: engineer cyborg
  - type: Construction
    node: engineer
  - type: IntrinsicRadioTransmitter
@@ -151,6 +166,11 @@
      - BorgModuleJanitor
    hasMindState: janitor_e
    noMindState: janitor_e_r
+  - type: BorgTransponder
+    sprite:
+      sprite: Mobs/Silicon/chassis.rsi
+      state: janitor
+    name: janitor cyborg
  - type: Construction
    node: janitor
  - type: IntrinsicRadioTransmitter
@@ -202,6 +222,11 @@
      - BorgModuleMedical
    hasMindState: medical_e
    noMindState: medical_e_r
+  - type: BorgTransponder
+    sprite:
+      sprite: Mobs/Silicon/chassis.rsi
+      state: medical
+    name: medical cyborg
  - type: Construction
    node: medical
  - type: IntrinsicRadioTransmitter
@@ -223,8 +248,6 @@
  - type: FootstepModifier
    footstepSoundCollection:
      collection: FootstepHoverBorg
-      params:
-        volume: -6

 - type: entity
  id: BorgChassisService
@@ -250,6 +273,11 @@
      - BorgModuleService
    hasMindState: service_e
    noMindState: service_e_r
+  - type: BorgTransponder
+    sprite:
+      sprite: Mobs/Silicon/chassis.rsi
+      state: service
+    name: service cyborg
  - type: Construction
    node: service
  - type: IntrinsicRadioTransmitter
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2202,6 +2202,7 @@
      0: Alive
      90: Dead
  - type: MeleeWeapon
+    altDisarm: false
    angle: 0
    animation: WeaponArcBite
    soundHit:
@@ -2327,6 +2328,7 @@
    - type: Spider
      webPrototype: SpiderWebClown
    - type: MeleeWeapon
+      altDisarm: false
      angle: 0
      animation: WeaponArcBite
      soundHit:
@@ -2343,6 +2345,18 @@
      bloodMaxVolume: 150
      bloodReagent: Laughter

+- type: entity
+  name: wizard spider
+  parent: MobGiantSpider
+  id: MobGiantSpiderWizard
+  description: This spider looks a little magical
+  suffix: Wizard
+  components:
+  - type: Accentless
+    removes:
+    - type: ReplacementAccent
+      accent: xeno  #let this wizard speak
+
 - type: entity
  name: possum
  parent: SimpleMobBase
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -339,8 +339,12 @@
    layers:
    - state: supplybot
  - type: GhostRole
+    makeSentient: true
    name: ghost-role-information-supplybot-name
    description: ghost-role-information-supplybot-description
+    raffle:
+      settings: default
+  - type: GhostTakeoverAvailable
  - type: Construction
    graph: SupplyBot
    node: bot
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -93,6 +93,7 @@
    prototype: Slimes
    requiredLegs: 1
  - type: MeleeWeapon
+    altDisarm: false
    soundHit:
        path: /Audio/Weapons/punch3.ogg
    angle: 0
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -70,6 +70,7 @@
  - type: CargoOrderConsole
  - type: CrewMonitoringConsole
  - type: GeneralStationRecordConsole
+    canDeleteEntries: true
  - type: DeviceNetwork
    deviceNetId: Wireless
    receiveFrequencyId: CrewMonitor
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -27,7 +27,7 @@
      name: ghost-role-information-Death-Squad-name
      description: ghost-role-information-Death-Squad-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ DeathSquadGear ]
@@ -65,7 +65,7 @@
      name: ghost-role-information-ert-leader-name
      description: ghost-role-information-ert-leader-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTLeaderGear ]
@@ -97,7 +97,7 @@
      name: ghost-role-information-ert-leader-name
      description: ghost-role-information-ert-leader-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTLeaderGearEVA ]
@@ -121,7 +121,7 @@
      name: ghost-role-information-ert-leader-name
      description: ghost-role-information-ert-leader-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTLeaderGearEVALecter ]
@@ -154,7 +154,7 @@
      name: ghost-role-information-ert-chaplain-name
      description: ghost-role-information-ert-chaplain-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: RandomMetadata
      nameSegments:
@@ -185,7 +185,7 @@
      name: ghost-role-information-ert-chaplain-name
      description: ghost-role-information-ert-chaplain-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTChaplainGearEVA ]
@@ -218,7 +218,7 @@
      name: ghost-role-information-ert-janitor-name
      description: ghost-role-information-ert-janitor-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: RandomMetadata
      nameSegments:
@@ -249,7 +249,7 @@
      name: ghost-role-information-ert-janitor-name
      description: ghost-role-information-ert-janitor-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTJanitorGearEVA ]
@@ -282,7 +282,7 @@
      name: ghost-role-information-ert-engineer-name
      description: ghost-role-information-ert-engineer-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: RandomMetadata
      nameSegments:
@@ -313,7 +313,7 @@
      name: ghost-role-information-ert-engineer-name
      description: ghost-role-information-ert-engineer-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTEngineerGearEVA ]
@@ -346,7 +346,7 @@
      name: ghost-role-information-ert-security-name
      description: ghost-role-information-ert-security-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: RandomMetadata
      nameSegments:
@@ -377,7 +377,7 @@
      name: ghost-role-information-ert-security-name
      description: ghost-role-information-ert-security-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTSecurityGearEVA ]
@@ -400,7 +400,7 @@
      name: ghost-role-information-ert-security-name
      description: ghost-role-information-ert-security-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTSecurityGearEVALecter ]
@@ -433,7 +433,7 @@
      name: ghost-role-information-ert-medical-name
      description: ghost-role-information-ert-medical-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: RandomMetadata
      nameSegments:
@@ -464,7 +464,7 @@
      name: ghost-role-information-ert-medical-name
      description: ghost-role-information-ert-medical-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: Loadout
      prototypes: [ ERTMedicalGearEVA ]
@@ -494,7 +494,7 @@
      name: ghost-role-information-cburn-agent-name
      description: ghost-role-information-cburn-agent-description
      raffle:
-        settings: default
+        settings: short
    - type: GhostTakeoverAvailable
    - type: RandomMetadata
      nameSegments:
@@ -589,3 +589,307 @@
        settings: default
    - type: GhostTakeoverAvailable
    - type: Cluwne
+
+## Lost Cargo technician
+
+- type: entity
+  name: lost cargo technician spawner
+  id: LostCargoTechnicianSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Tools/appraisal-tool.rsi
+          state: icon
+    - type: RandomSpawner
+      prototypes:
+      - RandomHumanoidLostCargoTechnician
+      chance: 1
+
+- type: entity
+  id: RandomHumanoidLostCargoTechnician
+  name: lost cargo technician ghost role
+  components:
+    - type: Sprite
+      sprite: Objects/Tools/appraisal-tool.rsi
+      state: icon
+    - type: RandomHumanoidSpawner
+      settings: LostCargoTechnician
+
+- type: randomHumanoidSettings
+  id: LostCargoTechnician
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-lost-cargo-technical-name
+      description: ghost-role-information-lost-cargo-technical-description
+      rules: ghost-role-information-lost-cargo-technical-rules
+      raffle:
+        settings: short
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      roleLoadout: [ JobCargoTechnician ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_first
+      - names_last
+
+# Clown troupe
+
+- type: entity
+  name: clown troupe spawner
+  id: ClownTroupeSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Fun/bikehorn.rsi
+          state: icon
+    - type: RandomSpawner
+      prototypes:
+      - RandomHumanoidClownTroupe
+      rarePrototypes:
+      - RandomHumanoidClownTroupeBanana
+      rareChance: 0.3
+
+- type: entity
+  id: RandomHumanoidClownTroupe
+  name: clown troupe ghost role
+  components:
+    - type: Sprite
+      sprite: Objects/Tools/appraisal-tool.rsi
+      state: icon
+    - type: RandomHumanoidSpawner
+      settings: ClownTroupe
+
+- type: entity
+  id: RandomHumanoidClownTroupeBanana
+  name: banana clown troupe
+  parent: RandomHumanoidClownTroupe
+  components:
+    - type: RandomHumanoidSpawner
+      settings: ClownTroupeBanana
+
+- type: randomHumanoidSettings
+  id: ClownTroupe
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-clown-troupe-name
+      description: ghost-role-information-clown-troupe-description
+      rules: ghost-role-information-clown-troupe-rules
+      raffle:
+        settings: short
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      roleLoadout: [ JobClown ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_clown
+
+- type: randomHumanoidSettings
+  id: ClownTroupeBanana
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-clown-troupe-name
+      description: ghost-role-information-clown-troupe-description
+      rules: ghost-role-information-clown-troupe-rules
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ BananaClown ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_clown
+
+# Traveling exotic chef
+
+- type: entity
+  name: traveling chef spawner
+  id: TravelingChefSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Weapons/Melee/kitchen_knife.rsi
+          state: icon
+    - type: RandomSpawner
+      prototypes:
+      - RandomHumanoidTravelingChef
+
+- type: entity
+  id: RandomHumanoidTravelingChef
+  name: traveling chef ghost role
+  components:
+    - type: Sprite
+      sprite: Objects/Tools/appraisal-tool.rsi
+      state: icon
+    - type: RandomHumanoidSpawner
+      settings: TravelingChef
+
+- type: randomHumanoidSettings
+  id: TravelingChef
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-traveling-chef-name
+      description: ghost-role-information-traveling-chef-description
+      rules: ghost-role-information-traveling-chef-rules
+      raffle:
+        settings: short
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      roleLoadout: [ JobChef ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_first
+      - names_last
+
+# Disaster victim
+
+- type: entity
+  name: disaster victim spawner
+  id: DisasterVictimSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: Clothing/OuterClothing/Hardsuits/basic.rsi
+        state: icon
+  - type: RandomSpawner
+    prototypes:
+    - RandomHumanoidDisasterVictimRD
+    - RandomHumanoidDisasterVictimCMO
+    - RandomHumanoidDisasterVictimCaptain
+    - MobSkeletonCloset
+
+- type: entity
+  id: RandomHumanoidDisasterVictimRD
+  name: disaster victim RD ghost role
+  components:
+    - type: Sprite
+      sprite: Clothing/OuterClothing/Hardsuits/basic.rsi
+      state: icon
+    - type: RandomHumanoidSpawner
+      settings: DisasterVictimResearchDirector
+
+- type: entity
+  id: RandomHumanoidDisasterVictimCMO
+  parent: RandomHumanoidDisasterVictimRD
+  name: disaster victim CMO ghost role
+  components:
+    - type: RandomHumanoidSpawner
+      settings: DisasterVictimCMO
+
+- type: entity
+  id: RandomHumanoidDisasterVictimCaptain
+  parent: RandomHumanoidDisasterVictimRD
+  name: disaster victim Captain ghost role
+  components:
+    - type: RandomHumanoidSpawner
+      settings: DisasterVictimCaptain
+
+- type: randomHumanoidSettings
+  id: DisasterVictimResearchDirector
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-disaster-victim-name
+      description: ghost-role-information-disaster-victim-description
+      rules: ghost-role-information-disaster-victim-rules
+      raffle:
+        settings: default
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      roleLoadout: [ JobResearchDirector ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_first
+      - names_last
+
+- type: randomHumanoidSettings
+  id: DisasterVictimCMO
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-disaster-victim-name
+      description: ghost-role-information-disaster-victim-description
+      rules: ghost-role-information-disaster-victim-rules
+      raffle:
+        settings: default
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      roleLoadout: [ JobChiefMedicalOfficer ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_first
+      - names_last
+
+- type: randomHumanoidSettings
+  id: DisasterVictimCaptain
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-disaster-victim-name
+      description: ghost-role-information-disaster-victim-description
+      rules: ghost-role-information-disaster-victim-rules
+      raffle:
+        settings: default
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      roleLoadout: [ JobCaptain ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_first
+      - names_last
+
+# Syndie Disaster Victim
+
+- type: entity
+  name: syndie disaster victim spawner
+  id: SyndieDisasterVictimSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: Structures/Decoration/banner.rsi
+        state: banner_syndicate
+  - type: RandomSpawner
+    prototypes:
+    - RandomHumanoidSyndieDisasterVictim
+
+- type: entity
+  id: RandomHumanoidSyndieDisasterVictim
+  name: syndie disaster victim ghost role
+  components:
+    - type: Sprite
+      sprite: Structures/Decoration/banner.rsi
+      state: banner_syndicate
+    - type: RandomHumanoidSpawner
+      settings: SyndieDisasterVictim
+
+- type: randomHumanoidSettings
+  id: SyndieDisasterVictim
+  randomizeName: false
+  components:
+    - type: NpcFactionMember
+      factions:
+      - Syndicate
+    - type: GhostRole
+      name: ghost-role-information-syndie-disaster-victim-name
+      description: ghost-role-information-syndie-disaster-victim-description
+      rules: ghost-role-information-syndie-disaster-victim-rules
+      raffle:
+        settings: short
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ SyndicateOperativeGearCivilian ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_first
+      - names_last
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -384,3 +384,14 @@
      state: cpu_engineering
    - type: ComputerBoard
      prototype: ComputerSensorMonitoring
+
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: RoboticsConsoleCircuitboard
+  name: robotics control console board
+  description: A computer printed circuit board for a robotics control console.
+  components:
+    - type: Sprite
+      state: cpu_science
+    - type: ComputerBoard
+      prototype: ComputerRoboticsControl
--- a/Resources/Prototypes/Entities/Objects/Magic/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml
@@ -9,7 +9,7 @@
      layers:
      - state: paper_blood
      - state: cover_strong
-        color: "#645a5a" 
+        color: "#645a5a"
      - state: decor_wingette_flat
        color: "#4d0303"
      - state: icon_pentagramm
@@ -19,13 +19,58 @@
      tags:
      - Spellbook

+# For the Wizard Antag
+# Do not add discounts or price inflation
+- type: entity
+  id: WizardsGrimoire
+  name: wizards grimoire
+  suffix: Wizard
+  parent: BaseItem
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper_blood
+      - state: cover_strong
+        color: "#645a5a"
+      - state: decor_wingette_flat
+        color: "#4d0303"
+      - state: icon_pentagramm
+        color: "#f7e19f"
+    - type: UserInterface
+      interfaces:
+        enum.StoreUiKey.Key:
+          type: StoreBoundUserInterface
+    - type: ActivatableUI
+      key: enum.StoreUiKey.Key
+    - type: Store
+      refundAllowed: true
+      ownerOnly: true # get your own tome!
+      preset: StorePresetSpellbook
+      balance:
+        WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
+
+# Not meant for wizard antag but meant for spawning, so people can't abuse refund if they were given a tome
+- type: entity
+  id: WizardsGrimoireNoRefund
+  name: wizards grimoire
+  suffix: Wizard, No Refund
+  parent: WizardsGrimoire
+  components:
+    - type: Store
+      refundAllowed: false
+      ownerOnly: true # get your own tome!
+      preset: StorePresetSpellbook
+      balance:
+        WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
+
 - type: entity
  id: SpawnSpellbook
  name: spawn spellbook
  parent: BaseSpellbook
  components:
    - type: Spellbook
-      spells:
+      spellActions:
        ActionSpawnMagicarpSpell: -1

 - type: entity
@@ -48,7 +93,7 @@
      - state: detail_rivets
        color: gold
    - type: Spellbook
-      spells:
+      spellActions:
        ActionForceWall: -1

 - type: entity
@@ -69,7 +114,7 @@
      - state: detail_rivets
        color: gold
    - type: Spellbook
-      spells:
+      spellActions:
        ActionBlink: -1

 - type: entity
@@ -92,7 +137,7 @@
        color: red
      - state: overlay_blood
    - type: Spellbook
-      spells:
+      spellActions:
        ActionSmite: -1

 - type: entity
@@ -114,7 +159,7 @@
      - state: detail_bookmark
        color: "#98c495"
    - type: Spellbook
-      spells:
+      spellActions:
        ActionKnock: -1

 - type: entity
@@ -138,7 +183,7 @@
      - state: icon_magic_fireball
        shader: unshaded
    - type: Spellbook
-      spells:
+      spellActions:
        ActionFireball: -1

 - type: entity
@@ -153,7 +198,7 @@
    layers:
    - state: spell_default
  - type: Spellbook
-    spells:
+    spellActions:
      ActionFlashRune: -1
      ActionExplosionRune: -1
      ActionIgniteRune: -1
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -5,6 +5,12 @@
  suffix: Empty
  description: A spray bottle with an unscrewable top.
  components:
+  - type: Drink
+    solution: spray
+    ignoreEmpty: true
+    useSound:
+      path: /Audio/Effects/spray3.ogg
+    transferAmount: 10
  - type: Tag
    tags:
    - Spray
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml
@@ -0,0 +1,12 @@
+# A basic inheritable template for a gun that is wieldable and has the standard inaccuracy.
+- type: entity
+  id: BaseGunWieldable
+  abstract: true
+  components:
+  - type: Wieldable
+  - type: GunWieldBonus
+    minAngle: -20
+    maxAngle: -30
+  - type: Gun
+    minAngle: 21
+    maxAngle: 32   
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -200,7 +200,7 @@

 - type: entity
  name: laser rifle
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
  id: WeaponLaserCarbine
  description: Favoured by Nanotrasen Security for being cheap and easy to use.
  components:
@@ -267,7 +267,7 @@

 - type: entity
  name: pulse carbine
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
  id: WeaponPulseCarbine
  description: A high tech energy carbine favoured by the NT-ERT operatives.
  components:
@@ -298,7 +298,7 @@

 - type: entity
  name: pulse rifle
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
  id: WeaponPulseRifle
  description: A weapon that is almost as infamous as its users.
  components:
@@ -325,7 +325,7 @@

 - type: entity
  name: laser cannon
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
  id: WeaponLaserCannon
  description: A heavy duty, high powered laser weapon.
  components:
@@ -380,7 +380,7 @@

 - type: entity
  name: x-ray cannon
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
  id: WeaponXrayCannon
  description: An experimental weapon that uses concentrated x-ray energy against its target.
  components:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -22,7 +22,7 @@

 - type: entity
  name: china lake
-  parent: BaseWeaponLauncher
+  parent: [BaseWeaponLauncher, BaseGunWieldable]
  id: WeaponLauncherChinaLake
  description: PLOOP
  components:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -1,6 +1,6 @@
 - type: entity
  name: BaseWeaponRifle
-  parent: BaseItem
+  parent: [BaseItem, BaseGunWieldable]
  id: BaseWeaponRifle
  description: A rooty tooty point and shooty.
  abstract: true
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -93,7 +93,13 @@
      map: ["enum.GunVisualLayers.Mag"]
  - type: Clothing
    sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
+  - type: Wieldable
+  - type: GunWieldBonus
+    minAngle: -19
+    maxAngle: -16
  - type: Gun
+    minAngle: 21
+    maxAngle: 32 
    shotsPerBurst: 5
    availableModes:
    - SemiAuto
@@ -124,7 +130,13 @@
          map: ["enum.GunVisualLayers.Mag"]
    - type: Clothing
      sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
+    - type: Wieldable
+    - type: GunWieldBonus
+      minAngle: -19
+      maxAngle: -16
    - type: Gun
+      minAngle: 21
+      maxAngle: 32
      fireRate: 6
      selectedMode: FullAuto
      soundGunshot:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -46,7 +46,7 @@
 - type: entity
  name: Bulldog
  # Don't parent to BaseWeaponShotgun because it differs significantly
-  parent: BaseItem
+  parent: [BaseItem, BaseGunWieldable]
  id: WeaponShotgunBulldog
  description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells.
  components:
@@ -66,6 +66,7 @@
    - Back
    - suitStorage
  - type: AmmoCounter
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
  - type: Gun
    fireRate: 2
    selectedMode: FullAuto
@@ -101,7 +102,7 @@

 - type: entity
  name: double-barreled shotgun
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
  id: WeaponShotgunDoubleBarreled
  description: An immortal classic. Uses .50 shotgun shells.
  components:
@@ -111,8 +112,8 @@
    size: Normal
    shape:
    - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: db
+    sprite: Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
  - type: Gun
    fireRate: 2
  - type: BallisticAmmoProvider
@@ -134,7 +135,7 @@

 - type: entity
  name: Enforcer
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
  id: WeaponShotgunEnforcer
  description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells.
  components:
@@ -143,9 +144,9 @@
  - type: Clothing
    sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
  - type: Item
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: enforcer
+    sprite: Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi
  - type: BallisticAmmoProvider
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed

 - type: entity
  parent: WeaponShotgunEnforcer
@@ -157,7 +158,7 @@

 - type: entity
  name: Kammerer
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
  id: WeaponShotgunKammerer
  description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells.
  components:
@@ -165,12 +166,12 @@
    size: Normal
    shape:
    - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: pump
+    sprite: Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi
  - type: Sprite
    sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
  - type: Clothing
    sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
  - type: BallisticAmmoProvider
    capacity: 4
  - type: Tag
@@ -189,8 +190,7 @@
    sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
  - type: Item
    size: Small
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: sawn
+    sprite: Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi
  - type: Gun
    fireRate: 4
  - type: BallisticAmmoProvider
@@ -240,7 +240,7 @@

 - type: entity
  name: blunderbuss
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
  id: WeaponShotgunBlunderbuss
  suffix: Pirate
  description: Deadly at close range.
@@ -251,6 +251,7 @@
    - 0,0,4,0
  - type: Sprite
    sprite: Objects/Weapons/Guns/Shotguns/blunderbuss.rsi
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
  - type: Gun
    fireRate: 2
  - type: BallisticAmmoProvider
@@ -260,7 +261,7 @@

 - type: entity
  name: improvised shotgun
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
  id: WeaponShotgunImprovised
  description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber.
  components:
@@ -272,8 +273,8 @@
    size: Normal
    shape:
    - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: improvised
+    sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
  - type: Gun
    fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.
  - type: BallisticAmmoProvider
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -40,7 +40,7 @@

 - type: entity
  name: Kardashev-Mosin
-  parent: BaseWeaponSniper
+  parent: [BaseWeaponSniper, BaseGunWieldable]
  id: WeaponSniperMosin
  description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo.
  components:
@@ -49,7 +49,7 @@

 - type: entity
  name: Hristov
-  parent: BaseWeaponSniper
+  parent: [BaseWeaponSniper, BaseGunWieldable]
  id: WeaponSniperHristov
  description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo.
  components:
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -126,4 +126,4 @@
  id: BaseStationAllEventsEligible
  abstract: true
  components:
-    - type: StationEventEligible # For when someone makes this more granular in the future.
+    - type: StationEventEligible # For when someone makes this more granular in the future.
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -1076,3 +1076,42 @@
    - type: WiredNetworkConnection
    - type: DeviceList
    - type: AtmosDevice
+
+- type: entity
+  parent: BaseComputer
+  id: ComputerRoboticsControl
+  name: robotics control console
+  description: Used to remotely monitor, disable and destroy the station's cyborgs.
+  components:
+  - type: Sprite
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: robot
+    - map: ["computerLayerKeys"]
+      state: rd_key
+  - type: RoboticsConsole
+  - type: ActiveRadio
+    channels:
+    - Science
+  - type: ActivatableUI
+    key: enum.RoboticsConsoleUiKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.RoboticsConsoleUiKey.Key:
+        type: RoboticsConsoleBoundUserInterface
+  - type: ApcPowerReceiver
+    powerLoad: 1000
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: RoboticsConsole
+    transmitFrequencyId: CyborgControl
+  - type: Computer
+    board: RoboticsConsoleCircuitboard
+  - type: AccessReader # only used for dangerous things
+    access: [["ResearchDirector"]]
+  - type: Lock
+    unlockOnClick: false
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -89,7 +89,7 @@
  id: Autolathe
  parent: BaseLatheLube
  name: autolathe
-  description: It produces items using metal and glass.
+  description: It produces basic items using metal and glass.
  components:
  - type: Sprite
    sprite: Structures/Machines/autolathe.rsi
@@ -200,6 +200,7 @@
    emagStaticRecipes:
      - BoxLethalshot
      - BoxShotgunFlare
+      - BoxShotgunSlug
      - MagazineBoxLightRifle
      - MagazineBoxMagnum
      - MagazineBoxPistol
@@ -210,43 +211,16 @@
      - MagazinePistolEmpty
      - MagazinePistolSubMachineGun
      - MagazinePistolSubMachineGunEmpty
+      - MagazinePistolSubMachineGunTopMounted
+      - MagazinePistolSubMachineGunTopMountedEmpty
      - MagazineRifle
      - MagazineRifleEmpty
      - MagazineShotgun
      - MagazineShotgunEmpty
-      - ShellTranquilizer
+      - MagazineShotgunSlug
+      - RiotShield
      - SpeedLoaderMagnum
      - SpeedLoaderMagnumEmpty
-    emagDynamicRecipes:
-      - BoxBeanbag
-      - BoxShotgunIncendiary
-      - BoxShotgunUranium
-      - GrenadeBlast
-      - GrenadeEMP
-      - GrenadeFlash
-      - MagazineBoxLightRifleIncendiary
-      - MagazineBoxLightRifleUranium
-      - MagazineBoxMagnumIncendiary
-      - MagazineBoxMagnumUranium
-      - MagazineBoxPistolIncendiary
-      - MagazineBoxPistolUranium
-      - MagazineBoxRifleIncendiary
-      - MagazineBoxRifleUranium
-      - MagazineGrenadeEmpty
-      - MagazineLightRifleIncendiary
-      - MagazineLightRifleUranium
-      - MagazinePistolIncendiary
-      - MagazinePistolUranium
-      - MagazineRifleIncendiary
-      - MagazineRifleUranium
-      - MagazineShotgunBeanbag
-      - MagazineShotgunIncendiary
-      - MagazineShotgunIncendiary
-      - PowerCageHigh
-      - PowerCageMedium
-      - PowerCageSmall
-      - SpeedLoaderMagnumIncendiary
-      - SpeedLoaderMagnumUranium

 - type: entity
  id: AutolatheHyperConvection
@@ -263,7 +237,7 @@
  id: Protolathe
  parent: BaseLatheLube
  name: protolathe
-  description: Converts raw materials into useful objects.
+  description: Converts raw materials into advanced items.
  components:
  - type: Sprite
    sprite: Structures/Machines/protolathe.rsi
@@ -357,10 +331,44 @@
      - DeviceQuantumSpinInverter
  - type: EmagLatheRecipes
    emagDynamicRecipes:
+      - BoxBeanbag
+      - BoxShotgunIncendiary
+      - BoxShotgunUranium
      - ExplosivePayload
-      - WeaponLaserCarbine
+      - GrenadeBlast
+      - GrenadeEMP
+      - GrenadeFlash
+      - HoloprojectorSecurity
+      - MagazineBoxLightRifleIncendiary
+      - MagazineBoxLightRifleUranium
+      - MagazineBoxMagnumIncendiary
+      - MagazineBoxMagnumUranium
+      - MagazineBoxPistolIncendiary
+      - MagazineBoxPistolUranium
+      - MagazineBoxRifleIncendiary
+      - MagazineBoxRifleUranium
+      - MagazineGrenadeEmpty
+      - MagazineLightRifleIncendiary
+      - MagazineLightRifleUranium
+      - MagazinePistolIncendiary
+      - MagazinePistolUranium
+      - MagazineRifleIncendiary
+      - MagazineRifleUranium
+      - MagazineShotgunBeanbag
+      - MagazineShotgunIncendiary
+      - MagazineShotgunIncendiary
+      - PortableRecharger
+      - PowerCageHigh
+      - PowerCageMedium
+      - PowerCageSmall
+      - ShellTranquilizer
+      - SpeedLoaderMagnumIncendiary
+      - SpeedLoaderMagnumUranium
+      - TelescopicShield
+      - Truncheon
      - WeaponAdvancedLaser
      - WeaponLaserCannon
+      - WeaponLaserCarbine
      - WeaponXrayCannon

 - type: entity
@@ -488,6 +496,12 @@
      - MassMediaCircuitboard
      - ReagentGrinderIndustrialMachineCircuitboard
      - JukeboxCircuitBoard
+  - type: EmagLatheRecipes
+    emagDynamicRecipes:
+      - ShuttleGunDusterCircuitboard
+      - ShuttleGunFriendshipCircuitboard
+      - ShuttleGunPerforatorCircuitboard
+      - ShuttleGunSvalinnMachineGunCircuitboard
  - type: MaterialStorage
    whitelist:
      tags:
@@ -956,6 +970,8 @@
      - ClothingHeadHatBeretCmo
      - ClothingUniformJumpsuitCMO
      - ClothingUniformJumpskirtCMO
+      - ClothingUniformJumpsuitCMOTurtle
+      - ClothingUniformJumpskirtCMOTurtle
      - ClothingUniformJumpsuitDetective
      - ClothingUniformJumpskirtDetective
      - ClothingUniformJumpsuitEngineering
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  abstract: true
  id: GasPipeBase
  parent: BaseItem
@@ -101,6 +101,20 @@
  - type: Construction
    graph: GasPipe
    node: straight
+  - type: Item
+    size: Normal
+    storedSprite:
+      sprite: Structures/Piping/Atmospherics/pipe.rsi
+      state: storageStraight
+    shape:
+    - 0,0,0,2
+  - type: MeleeWeapon
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 8
+    soundHit:
+      collection: MetalThud # this NEEDS to changed to the metal pipe falling sound effect on april first every year

 - type: entity
  parent: GasPipeBase
@@ -120,6 +134,27 @@
  - type: Construction
    graph: GasPipe
    node: bend
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,0
+    - 1,1,1,1
+    heldPrefix: Bend
+    storedSprite:
+      sprite: Structures/Piping/Atmospherics/pipe.rsi
+      state: storageBend
+  - type: MeleeWeapon
+    wideAnimationRotation: 180
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 6
+    soundHit:
+      collection: MetalThud
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 3 #This should be 6 but throwing damage is doubled at the moment for some reason so for now it's 3

 - type: entity
  parent: GasPipeBase
@@ -139,6 +174,23 @@
  - type: Construction
    graph: GasPipe
    node: tjunction
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,2,0
+    - 1,1,1,1
+    heldPrefix: TJunction
+    storedSprite:
+      sprite: Structures/Piping/Atmospherics/pipe.rsi
+      state: storageTJunction
+  - type: MeleeWeapon
+    wideAnimationRotation: 90
+    attackRate: 0.75
+    damage:
+      types:
+        Blunt: 10
+    soundHit:
+      collection: MetalThud

 - type: entity
  parent: GasPipeBase
@@ -160,6 +212,20 @@
  - type: Construction
    graph: GasPipe
    node: fourway
+  - type: Item
+    size: Normal
+    shape:
+    - 1,0,1,2
+    - 0,1,2,1
+    heldPrefix: Fourway
+  - type: MeleeWeapon
+    wideAnimationRotation: 90
+    attackRate: 0.75
+    damage:
+      types:
+        Blunt: 10
+    soundHit:
+      collection: MetalThud

 - type: entity
  id: GasPipeBroken
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -775,7 +775,6 @@
    - Desoxyephedrine
    - Ephedrine
    - THC
-    - THCOil
    - SpaceDrugs
    - Nocturine
    - MuteToxin
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -135,7 +135,7 @@
  - type: RCDDeconstructable
    cost: 6
    delay: 8
-    fx: EffectRCDDeconstruct8    
+    fx: EffectRCDDeconstruct8
  - type: Destructible
    thresholds:
    - trigger:
@@ -262,7 +262,7 @@
  - type: RCDDeconstructable
    cost: 6
    delay: 8
-    fx: EffectRCDDeconstruct8   
+    fx: EffectRCDDeconstruct8
  - type: Destructible
    thresholds:
    - trigger:
@@ -298,7 +298,7 @@
  - type: RCDDeconstructable
    cost: 6
    delay: 8
-    fx: EffectRCDDeconstruct8  
+    fx: EffectRCDDeconstruct8
  - type: Destructible
    thresholds:
    - trigger:
@@ -419,7 +419,7 @@
  - type: RCDDeconstructable
    cost: 6
    delay: 8
-    fx: EffectRCDDeconstruct8    
+    fx: EffectRCDDeconstruct8
  - type: Destructible
    thresholds:
    - trigger:
@@ -657,7 +657,7 @@
  - type: RCDDeconstructable
    cost: 6
    delay: 8
-    fx: EffectRCDDeconstruct8    
+    fx: EffectRCDDeconstruct8
  - type: Destructible
    thresholds:
    - trigger:
@@ -693,7 +693,7 @@
  - type: RCDDeconstructable
    cost: 6
    delay: 8
-    fx: EffectRCDDeconstruct8    
+    fx: EffectRCDDeconstruct8
  - type: Destructible
    thresholds:
    - trigger:
@@ -870,7 +870,7 @@
  - type: RCDDeconstructable
    cost: 6
    delay: 8
-    fx: EffectRCDDeconstruct8    
+    fx: EffectRCDDeconstruct8
  - type: Destructible
    thresholds:
    - trigger:
@@ -1210,7 +1210,7 @@
  name: force wall
  components:
    - type: TimedDespawn
-      lifetime: 20
+      lifetime: 12
    - type: Tag
      tags:
        - Wall
@@ -1250,7 +1250,7 @@
  - type: RCDDeconstructable
    cost: 6
    delay: 8
-    fx: EffectRCDDeconstruct8    
+    fx: EffectRCDDeconstruct8
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Tiles/shadow_basalt.yml
+++ b/Resources/Prototypes/Entities/Tiles/shadow_basalt.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: ShadowBasaltOne
  name: shadowstone
-  description: Cold rock
+  description: Glowing cracks in reality. It's probably fine.
  placement:
    mode: SnapgridCenter
  components: