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

Round Start Security Magbots #345

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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 @@ -317,6 +317,7 @@
- id: ClothingLongcoatHoS # Floofstation
- id: ClothingMaskNeckGaiter
- id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit.
- id: ClothingShoesBootsSecurityMagboots # Floofstation
- id: ClothingBeltSecurityFilled
- id: ClothingHeadsetAltSecurity
- id: ClothingEyesGlassesSunglasses
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
- id: RubberStampWarden
- id: DoorRemoteArmory
- id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit.
- id: ClothingShoesBootsSecurityMagboots # Floofstation
- id: HoloprojectorSecurity
- id: ClothingEyesHudSecurity
- id: BoxPDAPrisoner # Delta-V
Expand Down Expand Up @@ -155,6 +156,7 @@
- id: TrackingImplanter
amount: 2
- id: ClothingOuterHardsuitCombatCorpsman
- id: ClothingShoesBootsSecurityMagboots #Floofstation
- id: ClothingUniformJumpsuitBrigmedic
- id: ClothingUniformJumpskirtBrigmedic
- id: ClothingLongcoatBrigmedic # Floofstation
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
contents:
- id: OxygenTankFilled
- id: ClothingOuterHardsuitCombatOfficer # DeltaV - ClothingOuterHardsuitSecurity replaced in favour of security combat hardsuit.
- id: ClothingShoesBootsSecurityMagboots # Floofstation
- id: ClothingMaskBreath
- type: AccessReader
access: [["Security"]]
Expand Down Expand Up @@ -199,6 +200,7 @@
- id: OxygenTankFilled
- id: JetpackSecurityFilled
- id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit.
- id: ClothingShoesBootsSecurityMagboots # Floofstation
- id: ClothingMaskGasSwat
- type: AccessReader
access: [["HeadOfSecurity"]]
Expand All @@ -213,6 +215,7 @@
contents:
- id: OxygenTankFilled
- id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit.
- id: ClothingShoesBootsSecurityMagboots # Floofstation
- id: ClothingMaskBreath
- type: AccessReader
access: [["Armory"]]
Expand Down Expand Up @@ -273,6 +276,7 @@
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitCombatCorpsman
- id: ClothingShoesBootsSecurityMagboots # Floofstation
- id: ClothingMaskBreath
- type: AccessReader
access: [ [ "Corpsman" ] ]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@
- MagazineBoxSpecialIncendiary
- MagazineBoxSpecialUranium
- MagazineBoxSpecialMindbreaker
- ClothingShoesBootsMagCom #Floof
- ClothingShoesBootsSecurityMagboots # Floofstation
- type: MaterialStorage
whitelist:
tags:
Expand Down

This file was deleted.

10 changes: 10 additions & 0 deletions Resources/Prototypes/Floof/Entities/Clothing/Shoes/magboots.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingShoesBootsMag
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: Floof/Clothing/Shoes/Boots/magboots-security.rsi
- type: Clothing
sprite: Floof/Clothing/Shoes/Boots/magboots-security.rsi
11 changes: 5 additions & 6 deletions Resources/Prototypes/Floof/Recipes/Lathes/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
Steel: 210

- type: latheRecipe
id: ClothingShoesBootsMagCom
result: ClothingShoesBootsMagCom
completetime: 10
parent: ClothingShoesBootsMagSci
id: ClothingShoesBootsSecurityMagboots
result: ClothingShoesBootsSecurityMagboots
materials:
Steel: 1000
Plastic: 500
Silver: 250
Steel: 1000
Plastic: 500
2 changes: 1 addition & 1 deletion Resources/Prototypes/Research/experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
cost: 7500
recipeUnlocks:
- ClothingShoesBootsMagSci
- ClothingShoesBootsMagCom #Floof
- ClothingShoesBootsSecurityMagboots #Floofstation

- type: technology
id: AnomalyCoreHarnessing
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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