Merge pull request #22 from Full-M/fullbr

Фикс формы комиссара + отключение рас
LemonKaiser · Feb 4, 2025 · 891cc22 · 891cc22
2 parents ba0081e + df5476a
commit 891cc22
Show file tree

Hide file tree

Showing 21 changed files with 28 additions and 35 deletions.
diff --git a/Resources/Prototypes/DeltaV/Species/chitinid.yml b/Resources/Prototypes/DeltaV/Species/chitinid.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Chitinid
   name: species-name-chitinid
-  roundStart: true
+  roundStart: false
   prototype: MobChitinid
   sprites: MobChitinidSprites
   defaultSkinTone: "#ffda93"

diff --git a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Vulpkanin
   name: species-name-vulpkanin
-  roundStart: true
+  roundStart: false
   prototype: MobVulpkanin
   sprites: MobVulpkaninSprites
   defaultSkinTone: "#985629"

diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Oni
   name: species-name-oni
-  roundStart: true
+  roundStart: false
   prototype: MobOni
   dollPrototype: MobOniDummy
   markingLimits: MobOniMarkingLimits

diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Felinid
   name: species-name-felinid
-  roundStart: true
+  roundStart: false
   prototype: MobFelinid
   sprites: MobHumanSprites
   defaultSkinTone: "#c0967f"

diff --git a/Resources/Prototypes/Species/arachne.yml b/Resources/Prototypes/Species/arachne.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Arachne
   name: species-name-arachne
-  roundStart: true # I'll kill these issues somehow.
+  roundStart: false # I'll kill these issues somehow.
   prototype: MobArachne
   sprites: MobArachneSprites
   defaultSkinTone: "#c0967f"

diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Arachnid
   name: species-name-arachnid
-  roundStart: true
+  roundStart: false
   prototype: MobArachnid
   sprites: MobArachnidSprites
   defaultSkinTone: "#385878"

diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Diona
   name: species-name-diona
-  roundStart: true
+  roundStart: false
   prototype: MobDiona
   sprites: MobDionaSprites
   defaultSkinTone: "#cdb369"

diff --git a/Resources/Prototypes/Species/harpy.yml b/Resources/Prototypes/Species/harpy.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Harpy
   name: species-name-harpy
-  roundStart: true
+  roundStart: false
   prototype: MobHarpy
   sprites: MobHarpySprites
   defaultSkinTone: "#c0967f"

diff --git a/Resources/Prototypes/Species/ipc.yml b/Resources/Prototypes/Species/ipc.yml
@@ -1,7 +1,7 @@
 - type: species
   id: IPC
   name: species-name-ipc
-  roundStart: true
+  roundStart: false
   prototype: MobIPC
   sprites: MobIPCSprites
   defaultSkinTone: "#aaa9ad"

diff --git a/Resources/Prototypes/Species/moth.yml b/Resources/Prototypes/Species/moth.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Moth
   name: species-name-moth
-  roundStart: true
+  roundStart: false
   prototype: MobMoth
   sprites: MobMothSprites
   defaultSkinTone: "#ffda93"

diff --git a/Resources/Prototypes/Species/plasmaman.yml b/Resources/Prototypes/Species/plasmaman.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Plasmaman
   name: species-name-plasmaman
-  roundStart: true
+  roundStart: false
   prototype: MobPlasmaman
   sprites: MobPlasmamanSprites
   defaultSkinTone: "#a349a4"

diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Reptilian
   name: species-name-reptilian
-  roundStart: true
+  roundStart: false
   prototype: MobReptilian
   sprites: MobReptilianSprites
   defaultSkinTone: "#34a223"

diff --git a/Resources/Prototypes/Species/shadowkin.yml b/Resources/Prototypes/Species/shadowkin.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Shadowkin
   name: species-name-shadowkin
-  roundStart: true
+  roundStart: false
   prototype: MobShadowkin
   sprites: MobShadowkinSprites
   defaultSkinTone: "#FFFFFF"

diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml
@@ -1,7 +1,7 @@
 - type: species
   id: SlimePerson
   name: species-name-slime
-  roundStart: true
+  roundStart: false
   prototype: MobSlimePerson
   sprites: MobSlimeSprites
   defaultSkinTone: "#b8b8b8"

diff --git a/Resources/Prototypes/_EE/Species/tajaran.yml b/Resources/Prototypes/_EE/Species/tajaran.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Tajaran
   name: species-name-tajaran
-  roundStart: true
+  roundStart: false
   prototype: MobTajaran
   sprites: MobTajaranSprites
   markingLimits: MobTajaranMarkingLimits

diff --git a/Resources/Prototypes/_WH40K/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_WH40K/Entities/Clothing/Hands/gloves.yml
@@ -19,7 +19,7 @@
   suffix: WH40K
   components: 
   - type: Sprite
-    sprite: _WH40K\Clothing\Hands\Gloves\commissar.rsi
+    sprite: _WH40K/Clothing/Hands/Gloves/commissar.rsi
   - type: Clothing
-    sprite: _WH40K\Clothing\Hands\Gloves\commissar.rsi
+    sprite: _WH40K/Clothing/Hands/Gloves/commissar.rsi
   - type: Insulated
diff --git a/Resources/Prototypes/_WH40K/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_WH40K/Entities/Clothing/Head/hats.yml
@@ -6,6 +6,6 @@
   suffix: WH40K
   components:
   - type: Sprite
-    sprite: _WH40K\Clothing\Head\Hats\commissar.rsi
+    sprite: _WH40K/Clothing/Head/Hats/commissar.rsi
   - type: Clothing
-    sprite: _WH40K\Clothing\Head\Hats\commissar.rsi
+    sprite: _WH40K/Clothing/Head/Hats/commissar.rsi
diff --git a/Resources/Prototypes/_WH40K/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_WH40K/Entities/Clothing/OuterClothing/armor.yml
@@ -55,8 +55,8 @@
 - type: entity
   parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
   id: ClothingOuterArmorCommissar
-  name: куртка комиссара
-  description: Комиссарская куртка - вот он, символ НАСТОЯЩЕЙ власти на поле боя. 
+  name: шинель комиссара
+  description: Комиссарская шинель - вот он, символ НАСТОЯЩЕЙ власти на поле боя. 
   suffix: WH40K
   components:
   - type: Sprite

diff --git a/Resources/Prototypes/_WH40K/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/_WH40K/Entities/Clothing/Shoes/boots.yml
@@ -20,8 +20,8 @@
   suffix: WH40K
   components: 
   - type: Sprite
-    sprite: _WH40K\Clothing\Shoes\Boots\commissar.rsi
+    sprite: _WH40K/Clothing/Shoes/Boots/commissar.rsi
   - type: Clothing
-    sprite: _WH40K\Clothing\Shoes\Boots\commissar.rsi
+    sprite: _WH40K/Clothing/Shoes/Boots/commissar.rsi
   - type: ClothingSlowOnDamageModifier
     modifier: 0.4
diff --git a/Resources/Prototypes/_WH40K/Entities/Clothing/Uniform/jumpsuits.yml b/Resources/Prototypes/_WH40K/Entities/Clothing/Uniform/jumpsuits.yml
@@ -30,6 +30,6 @@
   suffix: WH40K
   components: 
   - type: Sprite
-    sprite: _WH40K\Clothing\Uniforms\Jumpsuit\commissar.rsi
+    sprite: _WH40K/Clothing/Uniforms/Jumpsuit/commissar.rsi
   - type: Clothing
-    sprite: _WH40K\Clothing\Uniforms\Jumpsuit\commissar.rsi
+    sprite: _WH40K/Clothing/Uniforms/Jumpsuit/commissar.rsi
diff --git a/Resources/Prototypes/_WH40K/Entities/Objects/Weapons/Melee/hammer.yml b/Resources/Prototypes/_WH40K/Entities/Objects/Weapons/Melee/hammer.yml
@@ -8,7 +8,6 @@
   - type: Tag
     tags:
     - FireAxe
-  - type: Sharp
   - type: Execution
     doAfterDuration: 4.0
   - type: Sprite
@@ -20,8 +19,7 @@
     attackRate: 1.3333
     damage:
       types:
-        Blunt: 5
-        Slash: 30
+        Blunt: 30
         Structural: 50
     heavyDamageBaseModifier: 1.0
     heavyStaminaCost: 10
@@ -35,8 +33,7 @@
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 2
-        Slash: 5
+        Blunt: 5
         Structural: 40
   - type: Item
     size: Ginormous
@@ -51,8 +48,4 @@
     stealGroup: FireAxe
   - type: IgniteOnMeleeHit
     fireStacks: -4
-  # Shitmed Change
-  - type: Scalpel
-    speed: 0.3
-  - type: BoneSaw
-    speed: 0.5
+  # Shitmed Change