Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds Backslots to Sec Armor and Whatever Else I Added It To #545

Merged
merged 6 commits into from
Feb 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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."
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: entity
abstract: true
parent: Clothing
parent: [Clothing, AllowSuitStorageClothing] #floof
id: ClothingOuterBase
components:
- type: Clothing
Expand Down Expand Up @@ -199,4 +199,4 @@
id: ClothingOuterBaseMedium
components:
- type: Item
size: Huge
size: Huge
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -119,4 +119,4 @@
- type: Sprite
sprite: Clothing/OuterClothing/Vests/vest_orion.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Vests/vest_orion.rsi
sprite: Clothing/OuterClothing/Vests/vest_orion.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
22 changes: 21 additions & 1 deletion Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,31 @@
volume: 1

- type: entity
parent: PlushieCentCom
parent: BaseHypnoTempPlush
id: Plushiegirlfailure
name: girl failure plushie
description: Smells like body odor and cheese!
components:
- 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
Loading