Merge remote-tracking branch 'space-station-14/master' into 04-05-2024-upstream

# Conflicts: # Resources/Prototypes/Maps/Pools/default.yml # Resources/Prototypes/Maps/train.yml
2024-05-04 21:13:30 +03:00
parent 72b8fcf99c 540c45cbe9
commit 445f08ae07
144 changed files with 1514 additions and 307 deletions
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
@@ -32,6 +32,7 @@
      - DrinkBloodyMaryGlass
      - DrinkBooger
      - DrinkBraveBullGlass
+      - BudgetInsulsDrinkGlass
      - DrinkCarrotJuice
      - DrinkCoconutRum
      - DrinkChocolateGlass
@@ -57,6 +58,7 @@
      - DrinkIcedGreenTeaGlass
      - DrinkIcedBeerGlass
      - DrinkIceCreamGlass
+      - IrishBoolGlass
      - DrinkIrishCarBomb
      - DrinkIrishCoffeeGlass
      - DrinkLemonadeGlass
@@ -78,6 +80,7 @@
      - DrinkRewriter
      - DrinkRoyRogersGlass
      - DrinkRootBeerFloatGlass
+      - RubberneckGlass
      - DrinkRumGlass
      - DrinkSakeGlass
      - DrinkSbitenGlass
@@ -91,12 +94,15 @@
      - DrinkThreeMileIslandGlass
      - DrinkToxinsSpecialGlass
      - DrinkVodkaMartiniGlass
+      - DrinkVodkaRedBool
      - DrinkVodkaTonicGlass
      - DrinkWatermelonJuice
+      - DrinkWatermelonWakeup
      - DrinkWhiskeyColaGlass
      - DrinkWhiskeySodaGlass
      - DrinkWhiteRussianGlass
      - DrinkWineGlass
+      - XenoBasherGlass
      - DrinkShakeBlue
      - DrinkShakeWhite
      - DrinkTheMartinez
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml
@@ -1,27 +1,3 @@
- type: marking
-  id: VoxFacialHairColonel
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_facial_hair.rsi
-      state: vox_colonel_s
- type: marking
-  id: VoxFacialHairFu
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_facial_hair.rsi
-      state: vox_fu_s
- type: marking
-  id: VoxFacialHairNeck
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_facial_hair.rsi
-      state: vox_neck_s
 - type: marking
  id: VoxFacialHairBeard
  bodyPart: FacialHair
@@ -29,12 +5,40 @@
  speciesRestriction: [Vox]
  sprites:
    - sprite: Mobs/Customization/vox_facial_hair.rsi
-      state: vox_beard_s
+      state: beard_s
+
 - type: marking
-  id: VoxFacialHairRuffBeard
+  id: VoxFacialHairColonel
  bodyPart: FacialHair
  markingCategory: FacialHair
  speciesRestriction: [Vox]
  sprites:
    - sprite: Mobs/Customization/vox_facial_hair.rsi
-      state: vox_ruff_beard_s
+      state: colonel_s
+
+- type: marking
+  id: VoxFacialHairFu
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_facial_hair.rsi
+      state: fu_s
+
+- type: marking
+  id: VoxFacialHairMane
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_facial_hair.rsi
+      state: mane_s
+
+- type: marking
+  id: VoxFacialHairNeck
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_facial_hair.rsi
+      state: neck_s
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
@@ -1,19 +1,3 @@
- type: marking
-  id: VoxHairShortQuills
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_shortquills_s
- type: marking
-  id: VoxHairKingly
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_kingly_s
 - type: marking
  id: VoxHairAfro
  bodyPart: Hair
@@ -21,23 +5,53 @@
  speciesRestriction: [Vox]
  sprites:
    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_afro_s
+      state: afro_s
+
 - type: marking
-  id: VoxHairMohawk
+  id: VoxHairBraids
  bodyPart: Hair
  markingCategory: Hair
  speciesRestriction: [Vox]
  sprites:
    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_mohawk_s
+      state: braid_s
+
 - type: marking
-  id: VoxHairYasuhiro
+  id: VoxHairCrestedQuills
  bodyPart: Hair
  markingCategory: Hair
  speciesRestriction: [Vox]
  sprites:
    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_yasu_s
+      state: crestedquills_s
+
+- type: marking
+  id: VoxHairEmperorQuills
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: emperorquills_s
+
+- type: marking
+  id: VoxHairFlowing
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: flowing_s
+
+- type: marking
+  id: VoxHairHawk
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: hawk_s
+
 - type: marking
  id: VoxHairHorns
  bodyPart: Hair
@@ -45,47 +59,44 @@
  speciesRestriction: [Vox]
  sprites:
    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_horns_s
+      state: horns_s
+
 - type: marking
-  id: VoxHairNights
+  id: VoxHairKeelQuills
  bodyPart: Hair
  markingCategory: Hair
  speciesRestriction: [Vox]
  sprites:
    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_nights_s
+      state: keelquills_s
+
 - type: marking
-  id: VoxHairSurf
+  id: VoxHairKeetQuills
  bodyPart: Hair
  markingCategory: Hair
  speciesRestriction: [Vox]
  sprites:
    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_surf_s
+      state: keetquills_s
+
 - type: marking
-  id: VoxHairCropped
+  id: VoxHairKingly
  bodyPart: Hair
  markingCategory: Hair
  speciesRestriction: [Vox]
  sprites:
    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_cropped_s
+      state: kingly_s
+
 - type: marking
-  id: VoxHairRuffhawk
+  id: VoxHairLongBraid
  bodyPart: Hair
  markingCategory: Hair
  speciesRestriction: [Vox]
  sprites:
    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_ruff_hawk_s
- type: marking
-  id: VoxHairRows
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [Vox]
-  sprites:
-    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_rows_s
+      state: afro_s
+
 - type: marking
  id: VoxHairMange
  bodyPart: Hair
@@ -93,7 +104,26 @@
  speciesRestriction: [Vox]
  sprites:
    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_mange_s
+      state: mange_s
+      
+- type: marking
+  id: VoxHairMohawk
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: mohawk_s
+
+- type: marking
+  id: VoxHairNights
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: nights_s
+
 - type: marking
  id: VoxHairPony
  bodyPart: Hair
@@ -101,4 +131,67 @@
  speciesRestriction: [Vox]
  sprites:
    - sprite: Mobs/Customization/vox_hair.rsi
-      state: vox_pony_s
+      state: ponytail_s
+
+- type: marking
+  id: VoxHairRazorClipped
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: razor_clipped_s
+
+- type: marking
+  id: VoxHairRazor
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: razor_s
+
+- type: marking
+  id: VoxHairSortBraid
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: short_braid_s
+
+- type: marking
+  id: VoxHairShortQuills
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: shortquills_s
+
+- type: marking
+  id: VoxHairSurf
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: surf_s
+
+- type: marking
+  id: VoxHairTielQuills
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: tielquills_s
+
+- type: marking
+  id: VoxHairYasu
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: yasu_s
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
@@ -0,0 +1,55 @@
+- type: marking
+  id: TattooVoxHeartLeftArm
+  bodyPart: LArm
+  markingCategory: Arms
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: heart_l_arm
+
+- type: marking
+  id: TattooVoxHeartRightArm
+  bodyPart: RArm
+  markingCategory: Arms
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: heart_r_arm
+
+- type: marking
+  id: TattooVoxHiveChest
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: hive_s
+
+- type: marking
+  id: TattooVoxNightlingChest
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: nightling_s
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -147,6 +147,16 @@
  noSpawn: true
  components:
  # they portable...
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 3
+    baseSprintSpeed: 5 # +.5 from normal movement speed
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      80: Dead # weak af tho
+  - type: NpcFactionMember
+    factions:
+    - NanoTrasen
  - type: MultiHandedItem
  - type: Item
    size: Huge
--- a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
@@ -1,6 +1,7 @@
 - type: entity
  save: false
-  name: Urisst' Mzhand
+  name: Urist McScales
+  suffix: Urisst' Mzhand
  parent: BaseMobReptilian
  id: MobReptilian

--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -503,6 +503,22 @@
    sprite: Objects/Consumable/Drinks/bravebullglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: BudgetInsulsDrinkGlass
+  suffix: budget insuls
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: BudgetInsulsDrink
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/budgetinsulsdrink.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkCarrotJuice
@@ -535,6 +551,22 @@
    sprite: Objects/Consumable/Drinks/chocolateglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: RubberneckGlass
+  suffix: rubberneck
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Rubberneck
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/rubberneck.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkCoconutRum
@@ -1061,6 +1093,22 @@
    sprite: Objects/Consumable/Drinks/icecreamglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: IrishBoolGlass
+  suffix: irish bool
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: IrishBool
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/beerglass.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkIrishCarBomb
@@ -2054,6 +2102,22 @@
    sprite: Objects/Consumable/Drinks/martiniglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkVodkaRedBool
+  suffix: vodka red bool
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: VodkaRedBool
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkVodkaTonicGlass
@@ -2100,6 +2164,22 @@
        - ReagentId: JuiceWatermelon
          Quantity: 30

+- type: entity
+  parent: DrinkGlass
+  id: DrinkWatermelonWakeup
+  suffix: watermelon wakeup
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: WatermelonWakeup
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/champagneglass.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkWhiskeyColaGlass
@@ -2180,6 +2260,22 @@
    sprite: Objects/Consumable/Drinks/wineglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: XenoBasherGlass
+  suffix: xeno basher
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: XenoBasher
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/xenobasher.rsi
+    state: icon
+
 # TODO: MOVE

 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
@@ -106,5 +106,5 @@
  - type: Icon
    state: pinpointer-station
  - type: Pinpointer
-    component: BecomesStation
+    component: ResearchServer
    targetName: the station
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -165,7 +165,6 @@
    emagStaticRecipes:
      - BoxLethalshot
      - BoxShotgunFlare
-      - GrenadeBlast
      - MagazineBoxLightRifle
      - MagazineBoxMagnum
      - MagazineBoxPistol
@@ -187,6 +186,7 @@
      - BoxBeanbag
      - BoxShotgunIncendiary
      - BoxShotgunUranium
+      - GrenadeBlast
      - GrenadeEMP
      - GrenadeFlash
      - MagazineBoxLightRifleIncendiary
@@ -711,6 +711,7 @@
      - BoxShotgunUranium
      - ExplosivePayload
      - FlashPayload
+      - GrenadeBlast
      - GrenadeEMP
      - GrenadeFlash
      - HoloprojectorSecurity
@@ -731,6 +732,7 @@
      - MagazineRifleUranium
      - MagazineShotgunBeanbag
      - MagazineShotgunIncendiary
+      - PortableRecharger
      - PowerCageHigh
      - PowerCageMedium
      - PowerCageSmall
@@ -753,14 +755,6 @@
      - WeaponLaserCannon
      - WeaponLaserCarbine
      - WeaponXrayCannon
-      - PowerCageSmall
-      - PowerCageMedium
-      - PowerCageHigh
-      - ShuttleGunSvalinnMachineGunCircuitboard
-      - ShuttleGunPerforatorCircuitboard
-      - ShuttleGunFriendshipCircuitboard
-      - ShuttleGunDusterCircuitboard
-      - PortableRecharger
  - type: MaterialStorage
    whitelist:
      tags: