Skip to content

Commit

Permalink
Sec Boots (#1049)
Browse files Browse the repository at this point in the history
  • Loading branch information
KaiserMaus authored Jan 8, 2025
1 parent 2114514 commit 0586eb1
Show file tree
Hide file tree
Showing 19 changed files with 80 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ ent-ClothingShoesBootsMagCombat = combat magboots
.desc = Combat magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
ent-ClothingShoesBootsMagPirate = pirate magboots
.desc = Repainted combat magnets to match the colors of pirates.
ent-ClothingShoesBootsMagSec = security magboots
.desc =Security magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ ent-ClothingShoesBootsMagCombat = боевые магнитные ботинки
.desc = Боевые магнитные ботинки, часто используемые во время выхода в открытый космос, чтобы гарантировать, что пользователь остается безопасно прикрепленным к станции.
ent-ClothingShoesBootsMagPirate = магнитные ботинки пирата
.desc = Боевые магнитки перекрашенные в пирацкие цвета
ent-ClothingShoesBootsMagSec = магнитные ботинки СБ
.desc = Стандартные магнитки перекрашенные в цвет СБ
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@
children:
- id: ClothingMaskGasSwat
- id: ClothingOuterHardsuitSecurityRed
- id: ClothingShoesBootsMagSec # Sunrise-edit
- id: JetpackSecurityFilled
- id: OxygenTankFilled

Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@
- id: OxygenTankFilled
- id: ClothingOuterHardsuitSecurity
- id: ClothingMaskBreath
- id: ClothingShoesBootsMagSec # Sunrise-edit
prob: 0.75
- type: AccessReader
access: [["Security"]]

Expand Down Expand Up @@ -208,6 +210,7 @@
- id: OxygenTankFilled
- id: ClothingOuterHardsuitWarden
- id: ClothingMaskBreath
- id: ClothingShoesBootsMagSec # Sunrise-edit
- type: AccessReader
access: [["Armory"]]

Expand Down
5 changes: 1 addition & 4 deletions Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,7 @@
sprite: Clothing/Shoes/Specific/swat.rsi
# Sunrise-Start
- type: ClothingSlowOnDamageModifier
modifier: 0.5
- type: ClothingSpeedModifier
walkModifier: 0.90
sprintModifier: 0.90
modifier: 0.45
# Sunrise-End

- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
equipment:
jumpsuit: ClothingUniformJumpsuitERTLeader
back: ClothingBackpackERTLeader
shoes: ClothingShoesSwat # Sunrise-edit
shoes: ClothingShoesBootsMagSec # Sunrise-edit
head: ClothingHeadEVAHelmetERTLeader # Sunrise-edit
eyes: ClothingEyesGlassesSecurity
gloves: ClothingHandsGlovesCombat
Expand Down Expand Up @@ -118,7 +118,7 @@
equipment:
jumpsuit: ClothingUniformJumpsuitERTChaplain
back: ClothingBackpackERTChaplain
shoes: ClothingShoesSwat # Sunrise-edit
shoes: ClothingShoesBootsMagSec # Sunrise-edit
head: ClothingHeadEVAHelmetERTChaplain # Sunrise-edit
eyes: ClothingEyesHudMedSec # Sunrise-edit
neck: ClothingNeckStoleChaplain
Expand Down Expand Up @@ -264,7 +264,7 @@
equipment:
jumpsuit: ClothingUniformJumpsuitERTSecurity
back: ClothingBackpackERTSecurity
shoes: ClothingShoesSwat # Sunrise-edit
shoes: ClothingShoesBootsMagSec # Sunrise-edit
head: ClothingHeadEVAHelmetERTSecurity # Sunrise-edit
eyes: ClothingEyesGlassesSecurity
gloves: ClothingHandsGlovesCombat
Expand Down Expand Up @@ -354,7 +354,7 @@
equipment:
jumpsuit: ClothingUniformJumpsuitERTMedic
back: ClothingBackpackERTMedical
shoes: ClothingShoesSwat # Sunrise-edit
shoes: ClothingShoesBootsMagSec # Sunrise-edit
head: ClothingHeadEVAHelmetERTMedic # Sunrise-edit
eyes: ClothingEyesHudMedSec # Sunrise-edit
gloves: ClothingHandsGlovesCombat # Sunrise-edit
Expand All @@ -369,6 +369,7 @@
- Hypospray
#- MedkitAdvancedFilled # Sunrise-edit
- CrowbarRed
- LauncherSyringePistol
- OmnizineChemistryBottle
- EpinephrineChemistryBottle
- EpinephrineChemistryBottle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@
- id: OxygenTankFilled
- id: ClothingOuterHardsuitBlueshield
- id: ClothingMaskGas
- id: ClothingShoesBootsMagSec
- type: AccessReader
access: [["BlueShield"]]
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,19 @@
state: icon
- type: Clothing
sprite: _Sunrise/Clothing/Shoes/magboots-pirate.rsi
- type: Magboots
- type: Magboots

- type: entity
parent: [ClothingShoesBootsMag, BaseSecurityContraband]
id: ClothingShoesBootsMagSec
name: Security magboots
description: Security magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
components:
- type: Sprite
sprite: _Sunrise/Clothing/Shoes/magboots-sec.rsi
state: icon
- type: Clothing
sprite: _Sunrise/Clothing/Shoes/magboots-sec.rsi
- type: Magboots
- type: ClothingSlowOnDamageModifier
modifier: 0.75
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Edit by Conflee of Syndicate Magboots, make by tgstation https://github.com/tgstation/tgstation/commit/debf90acfcafa4fb8d6723a37e0b8ac556c0702b. equipped-FEET-vox & on-equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi, and equipped-FEET-vox state modified to fix inconsistencies",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "equipped-FEET",
"directions": 4
},
{
"name": "on-equipped-FEET",
"directions": 4
},
{
"name": "equipped-FEET-vox",
"directions": 4
},
{
"name": "on-equipped-FEET-vox",
"directions": 4
},
{
"name": "icon"
},
{
"name": "icon-on"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
},
{
"name": "on-inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0586eb1

Please sign in to comment.