diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 46a431ddff..18758eacad 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -2,7 +2,7 @@ # NOTE: Half of the kind of armor you're probably thinking of is in vests.yml. These should probably be merged some day. - type: entity - parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing] + parent: ClothingOuterBaseMedium id: ClothingOuterArmorBasic name: armor vest description: A standard Type I armored vest that provides decent protection against most types of damage. @@ -35,7 +35,7 @@ sprite: Clothing/OuterClothing/Armor/security_slim.rsi - type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + parent: ClothingOuterBaseLarge 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. @@ -119,7 +119,7 @@ - type: GroupExamine - type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + parent: ClothingOuterBaseLarge id: ClothingOuterArmorHeavy name: heavy armor suit description: A heavily armored suit that protects against excessive damage. @@ -189,7 +189,7 @@ sprite: Clothing/OuterClothing/Armor/magusred.rsi - type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + parent: ClothingOuterBaseLarge 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." diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index c18e5d6ab6..0642a4d086 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, AllowSuitStorageClothing] #floof id: ClothingOuterBase components: - type: Clothing @@ -199,4 +199,4 @@ id: ClothingOuterBaseMedium components: - type: Item - size: Huge \ No newline at end of file + size: Huge diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index 9359bb0ce3..c70db0dd11 100644 --- 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, AllowSuitStorageClothing] + parent: ClothingOuterStorageBase id: ClothingOuterVestWeb name: web vest description: A synthetic armor vest. This one has added webbing and ballistic plates. @@ -119,4 +119,4 @@ - type: Sprite sprite: Clothing/OuterClothing/Vests/vest_orion.rsi - type: Clothing - sprite: Clothing/OuterClothing/Vests/vest_orion.rsi \ No newline at end of file + sprite: Clothing/OuterClothing/Vests/vest_orion.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/wintercoats.yml index 2a14fb89aa..c52337979b 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/wintercoats.yml @@ -120,7 +120,7 @@ sprite: Floof/Clothing/OuterClothing/WinterCoats/longcoatSec.rsi - type: Armor #A stylish but solid middle-ground between the Durathread Vest and Plate Carrier, but not as good as the Armored Trenchcoat or Armored Longcoat. modifiers: - coefficients: + coefficients: Blunt: 0.75 Slash: 0.70 Piercing: 0.75 @@ -144,7 +144,7 @@ sprite: Floof/Clothing/OuterClothing/WinterCoats/longcoatWarden.rsi - type: Armor #overall better than the Secoff Armored Longcoat, Warden Longcoat defense stats have parity to Warden's Armored Jacket, being slightly better than the Armored Jacket but maintaining the slowdown. modifiers: - coefficients: + coefficients: Blunt: 0.70 Slash: 0.65 Piercing: 0.70 @@ -168,7 +168,7 @@ sprite: Floof/Clothing/OuterClothing/WinterCoats/longcoatBrigmedic.rsi - type: Armor #Trades physical resistances for heat/caust/explosive compared to secoff armored longcoat, and is only 5% slow. modifiers: - coefficients: + coefficients: Blunt: 0.85 Slash: 0.85 Piercing: 0.85 @@ -192,7 +192,7 @@ sprite: Floof/Clothing/OuterClothing/WinterCoats/longcoatHoS.rsi - type: Armor #Effectively a heavier Armored Trenchcoat, trading speed for slightly better Slash and Explosion resistance. modifiers: - coefficients: + coefficients: Blunt: 0.7 Slash: 0.6 Piercing: 0.7 diff --git a/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml index 37b30e7570..54b7c2e03d 100644 --- a/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml @@ -277,7 +277,7 @@ volume: 1 - type: entity - parent: PlushieCentCom + parent: BaseHypnoTempPlush id: Plushiegirlfailure name: girl failure plushie description: Smells like body odor and cheese! @@ -285,3 +285,23 @@ - type: Sprite sprite: Floof/Objects/Fun/floof_plush.rsi state: girlfailure + - type: SolutionContainerManager + solutions: + absorbed: + maxVol: 30 + reagents: + - ReagentId: RootBeerFloat + Quantity: 30 + - type: EmitSoundOnLand + sound: + path: /Audio/Voice/Human/cry_female_3.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Animals/mouse_squeak.ogg + params: + volume: 1 + - type: EmitSoundOnUse + sound: + path: /Audio/Animals/mouse_squeak.ogg + params: + volume: 1