Merge branch 'master' into two-shlepa-iteration

SerbiaStrong-220 · Sep 17, 2024 · 90307a5 · 90307a5
2 parents caa496b + 16a7553
commit 90307a5
Show file tree

Hide file tree

Showing 16 changed files with 389 additions and 23 deletions.
diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml
@@ -6010,3 +6010,35 @@
   id: 501
   time: '2024-09-16T11:20:53.0000000+00:00'
   url: https://github.com/SerbiaStrong-220/space-station-14/pull/1842
+- author: Svarshik
+  changes:
+  - message: "\u041A\u0438\u043D\u0436\u0430\u043B-\u043A\u0440\u0443\u0448\u0438\u0442\
+      \u0435\u043B\u044C \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u0435\
+      \u0442 \u043D\u0430\u0440\u0435\u0437\u0430\u0442\u044C \u0435\u0434\u0443 \u043D\
+      \u0430 \u043A\u0443\u0441\u043E\u0447\u043A\u0438"
+    type: Fix
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0432\u0435\u0441\
+      \u0435\u043B\u044C\u0435!"
+    type: Add
+  - message: "\u0423\u0431\u0440\u0430\u043D\u043E \u0432\u0435\u0441\u0435\u043B\u044C\
+      \u0435!"
+    type: Remove
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u043E \u0432\u0435\u0441\u0435\
+      \u043B\u044C\u0435!"
+    type: Tweak
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u0432\u0435\
+      \u0441\u0435\u043B\u044C\u0435!"
+    type: Fix
+  id: 502
+  time: '2024-09-16T19:21:18.0000000+00:00'
+  url: https://github.com/SerbiaStrong-220/space-station-14/pull/1871
+- author: ReeZii
+  changes:
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043D\u0435\
+      \u043F\u043E\u044F\u0432\u043B\u0435\u043D\u0438\u0435 \u043A\u043E\u043C\u043F\
+      \u043B\u0435\u043A\u0441\u0430 \u0438 \u0440\u0443\u0434\u044B \u043D\u0430\
+      \ \u043B\u0430\u0432\u0435"
+    type: Fix
+  id: 503
+  time: '2024-09-16T19:28:21.0000000+00:00'
+  url: https://github.com/SerbiaStrong-220/space-station-14/pull/1878
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -181,6 +181,11 @@
   - type: Tag
     tags:
     - Knife
+#SS220-knife-cutter-fix-begin
+  - type: Utensil
+    types:
+      - Knife
+#SS220-knife-cutter-fix-end
 
 # Like a crusher... but better
 - type: entity

diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml
@@ -114,6 +114,10 @@
 - type: dungeonConfig
   id: LavaBrig
   data:
+    #ss220 lava exp fix start
+    tiles:
+      FallbackTile: FloorSteel
+    #ss220 lava exp fix end
     colors:
       Decals: "#DE3A3A96"
     entities:

diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml
@@ -127,6 +127,7 @@
 
 - type: material
   id: Diamond
+  stackEntity: MaterialDiamond1 #SS220 stack fix
   name: materials-diamond
   unit: materials-unit-piece
   icon: { sprite: Objects/Materials/materials.rsi, state: diamond }

diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -166,6 +166,7 @@
 - type: latheRecipe
   parent: BaseGoldCircuitboardRecipe
   id: ChemMasterMachineCircuitboard
+  result: ChemMasterMachineCircuitboard #ss220 board fix
 
 - type: latheRecipe
   parent: BaseGoldCircuitboardRecipe
@@ -426,6 +427,7 @@
 - type: latheRecipe
   parent: BaseCircuitboardRecipe
   id: MicrowaveMachineCircuitboard
+  result: MicrowaveMachineCircuitboard #ss220 board fix
 
 - type: latheRecipe
   parent: BaseCircuitboardRecipe
@@ -535,6 +537,7 @@
 - type: latheRecipe
   parent: BaseGoldCircuitboardRecipe
   id: MiniGravityGeneratorCircuitboard
+  result: MiniGravityGeneratorCircuitboard #ss220 board fix
 
 - type: latheRecipe
   parent: BaseCircuitboardRecipe

diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/SS220/Entities/Clothing/Neck/cloaks.yml
@@ -52,24 +52,4 @@
     slot: head
   - type: ContainerContainer
     containers:
-      toggleable-clothing: !type:ContainerSlot {}
-
-# SPONSOR
-
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckCloakFloppa
-  name: шкура Шлёпы
-  description: Это - не то, что вы думаете
-  suffix: Sponsor # А точно ли он спонсор?
-  components:
-  - type: Sprite
-    sprite: SS220/Clothing/Neck/Cloaks/FloppaCloak.rsi
-  - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHatFloppa
-    requiredSlot:
-    - neck
-    slot: head
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
+      toggleable-clothing: !type:ContainerSlot {}
diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Sponsor/clothing.yml b/Resources/Prototypes/SS220/Entities/Clothing/Sponsor/clothing.yml
@@ -659,3 +659,31 @@
     sprite: SS220/Clothing/Sponsor/Cloak/administrator.rsi
   - type: Clothing
     sprite: SS220/Clothing/Sponsor/Cloak/administrator.rsi
+
+- type: entity
+  parent: ClothingSponsorNeckBase
+  id: ClothingSponsorNeckHeadDevelopment
+  name: плащ ведающего созидания
+  description: Особый плащ, принадлежащий сущности, которой предписывают власть над самим мирозданием.
+  suffix: Sponsor # Награда ведущих разработчиков
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Sponsor/neck/vedicloak.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakFloppa
+  name: шкура Шлёпы
+  description: Это - не то, что вы думаете
+  suffix: Sponsor # А точно ли он спонсор?
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Neck/Cloaks/FloppaCloak.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatFloppa
+    requiredSlot:
+    - neck
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -37,7 +37,7 @@
       collection: WeakHit
     forceSound: true
   - type: StunOnCollide
-    stunAmount: 4 #weaponBalance
+    stunAmount: 2 #weaponBalance #ss220 fix 4 -> 2
     knockdownAmount: 2 #weaponBalance
 
 - type: entity

diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/crossbow.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/crossbow.yml
@@ -14,7 +14,7 @@
   - type: AmmoCounter
   - type: UseDelayOnShoot
   - type: UseDelay
-    delay: 4
+    delay: 6 #ss220 fix 4 -> 6
   - type: RechargeBasicEntityAmmo
     rechargeCooldown: 6 #NerfCrossbow
     rechargeSound:

diff --git a/Resources/Prototypes/SS220/Recipes/Construction/Graphs/storage/trashcan.yml b/Resources/Prototypes/SS220/Recipes/Construction/Graphs/storage/trashcan.yml
@@ -22,6 +22,7 @@
           - !type:SpawnPrototype
                 prototype: SheetSteel1
                 amount: 2
+          - !type:EmptyAllContainers #ss220 fix: #1880
           - !type:DeleteEntity {}
           steps:
             - tool: Welding

diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml
@@ -3,6 +3,7 @@
   name: species-name-dwarf
   roundStart: true
   prototype: MobDwarf
+  maxAge: 250 #ss220-maxage-tweak
   sprites: MobHumanSprites
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobDwarfDummy

diff --git a/Resources/Textures/SS220/Clothing/Sponsor/neck/vedicloak.rsi/equipped-NECK.png b/Resources/Textures/SS220/Clothing/Sponsor/neck/vedicloak.rsi/equipped-NECK.png
diff --git a/Resources/Textures/SS220/Clothing/Sponsor/neck/vedicloak.rsi/icon.png b/Resources/Textures/SS220/Clothing/Sponsor/neck/vedicloak.rsi/icon.png
diff --git a/Resources/Textures/SS220/Clothing/Sponsor/neck/vedicloak.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Sponsor/neck/vedicloak.rsi/inhand-left.png
diff --git a/Resources/Textures/SS220/Clothing/Sponsor/neck/vedicloak.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Sponsor/neck/vedicloak.rsi/inhand-right.png