fix-id dublicate-after-upstream

SerbiaStrong-220 · Sep 17, 2024 · caa496b · caa496b
1 parent 1222a96
commit caa496b
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 108 deletions.
diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml
@@ -474,17 +474,6 @@
 
 # OTHER
 
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatMoryak
-  name: moryak beret
-  description: Beret with a orange tampon.
-  components:
-  - type: Sprite
-    sprite: SS220/Clothing/Head/Hats/moryak.rsi
-  - type: Clothing
-    sprite: SS220/Clothing/Head/Hats/moryak.rsi
-
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatMagicianHat
@@ -549,45 +538,3 @@
     sprite: SS220/Clothing/Head/Hats/FloppaHat.rsi
   - type: Clothing
     sprite: SS220/Clothing/Head/Hats/FloppaHat.rsi
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadYsatyu
-  name: ysatyu cap
-  description: Moonshine craftsman's cap.
-  components:
-  - type: Sprite
-    sprite: SS220/Clothing/Head/Hats/ysatyu.rsi
-  - type: Clothing
-    sprite: SS220/Clothing/Head/Hats/ysatyu.rsi
-
-
-# SPONSOR (возможно, в душе не ебу)
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatDevilHorns
-  name: devil's horns
-  description: Now you look like hell.
-  suffix: DO NOT MAP
-  components:
-  - type: Tag
-    tags: [] # ignore "WhitelistChameleon" tag
-  - type: Sprite
-    sprite: SS220/Clothing/Head/Hats/devils_horns.rsi
-  - type: Clothing
-    sprite: SS220/Clothing/Head/Hats/devils_horns.rsi
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatDevilHornsAlt
-  name: devil's horns
-  description: Now you look like hell.
-  suffix: DO NOT MAP, without a tail
-  components:
-  - type: Tag
-    tags: [] # ignore "WhitelistChameleon" tag
-  - type: Sprite
-    sprite: SS220/Clothing/Head/Hats/devils_horns-alt.rsi
-  - type: Clothing
-    sprite: SS220/Clothing/Head/Hats/devils_horns-alt.rsi
diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/SS220/Entities/Clothing/Neck/scarfs.yml
@@ -22,17 +22,6 @@
     - type: Clothing
       sprite: SS220/Clothing/Neck/Scarfs/blackcentscarf.rsi
 
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckScarfYsatyu
-  name: ysatyu scarf
-  description: Long and narrow for convenient drinking of moonshine.
-  components:
-    - type: Sprite
-      sprite: SS220/Clothing/Neck/Scarfs/ysatyu.rsi
-    - type: Clothing
-      sprite: SS220/Clothing/Neck/Scarfs/ysatyu.rsi
-
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckScarfCentcomm

diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml
@@ -30,28 +30,6 @@
      item:
       - CombatKnife
 
-- type: entity
-  parent: ClothingShoesBase
-  id: ClothingShoesMoryak
-  name: moryak shoes
-  description: Tight sailor shoes, but at least they're waterproof.
-  components:
-  - type: Sprite
-    sprite: SS220/Clothing/Shoes/Specific/moryak.rsi
-  - type: Clothing
-    sprite: SS220/Clothing/Shoes/Specific/moryak.rsi
-
-- type: entity
-  parent: ClothingShoesBaseButcherable
-  id: ClothingShoesYsatyu
-  name: ysatyu boots
-  description: Will pave the way to the nearest moonshine deposits.
-  components:
-  - type: Sprite
-    sprite: SS220/Clothing/Shoes/Specific/ysatyu.rsi
-  - type: Clothing
-    sprite: SS220/Clothing/Shoes/Specific/ysatyu.rsi
-
 - type: entity
   parent: ClothingShoesBaseButcherable
   id: ClothingShoesBootsBard #SS220 bard loadout

diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml
@@ -447,25 +447,3 @@
     sprite: SS220/Clothing/Uniforms/bard.rsi
   - type: Clothing
     sprite: SS220/Clothing/Uniforms/bard.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitYsatyu
-  name: ysatyu suit
-  description: It smells like moonshine.
-  components:
-  - type: Sprite
-    sprite: SS220/Clothing/Uniforms/ysatyu.rsi
-  - type: Clothing
-    sprite: SS220/Clothing/Uniforms/ysatyu.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitMoryak
-  name: moryak suit
-  description: Sailor suit for mime.
-  components:
-  - type: Sprite
-    sprite: SS220/Clothing/Uniforms/moryak.rsi
-  - type: Clothing
-    sprite: SS220/Clothing/Uniforms/moryak.rsi