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

Add security magboots #2074

Merged
merged 6 commits into from
Nov 6, 2024
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
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 @@ -353,6 +353,7 @@
- id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit.
- id: JetpackSecurityFilled
- id: OxygenTankFilled
- id: ClothingShoesBootsSecurityMagboots # DeltaV - Added security magboots.

# No hardsuit locker
- type: entity
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
amount: 2
- id: RemoteSignaller
amount: 2
- id: ClothingShoesBootsSecurityMagboots # DeltaV - Added security magboots.
Radezolid marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
id: LockerWardenFilled
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 @@ -144,6 +144,8 @@
amount: 2 #DeltaV - Double the suits
- id: ClothingMaskBreath
amount: 2 #Delta-V Double the masks
- id: ClothingShoesBootsSecurityMagboots # DeltaV - Added security magboots.
amount: 2
- type: AccessReader
access: [["Security"]]

Expand Down Expand Up @@ -210,6 +212,7 @@
- id: OxygenTankFilled
- id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit.
- id: ClothingMaskBreath
- id: ClothingShoesBootsSecurityMagboots # DeltaV - Added security magboots.
- type: AccessReader
access: [["Armory"]]

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: [ClothingShoesBootsMagBase, BaseRestrictedContraband]
id: ClothingShoesBootsSecurityMagboots
name: security magboots
description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. These ones bear security markings.
components:
- type: Sprite
sprite: DeltaV/Clothing/Shoes/Boots/magboots-security.rsi
- type: Clothing
sprite: DeltaV/Clothing/Shoes/Boots/magboots-security.rsi
5 changes: 5 additions & 0 deletions Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,8 @@
Gold: 250
Silver: 100
Plasma: 500

- type: latheRecipe
parent: ClothingShoesBootsMagSci
id: ClothingShoesBootsSecurityMagboots
result: ClothingShoesBootsSecurityMagboots
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,7 @@
- MagazineBoxSpecialMindbreaker
- ClothingOuterHardsuitJuggernautReverseEngineered
- ClothingOuterHardsuitSyndieReverseEngineered
- ClothingShoesBootsSecurityMagboots
# End DeltaV additions
- type: MaterialStorage
whitelist:
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Research/experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
recipeUnlocks:
- ClothingShoesBootsMagSci
- ClothingShoesBootsMoon
- ClothingShoesBootsSecurityMagboots # DeltaV - Added security magboots.

- type: technology
id: AnomalyCoreHarnessing
Expand Down
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,41 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Engineering Magboots from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe , edited by ProphetCrow (Github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "equipped-FEET",
"directions": 4
},
{
"name": "on-equipped-FEET",
"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