Skip to content

Commit

Permalink
returning
Browse files Browse the repository at this point in the history
  • Loading branch information
lzk228 committed Sep 21, 2024
1 parent 5caaf82 commit 6d2c824
Show file tree
Hide file tree
Showing 17 changed files with 98 additions and 4 deletions.
4 changes: 4 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,8 @@
- id: ClothingOuterHardsuitWarden
- id: HoloprojectorSecurity
- id: BookSpaceLaw
- id: ClothingHeadHatCapWardenAlt # Corvax-SecFashion
- id: ClothingOuterCoatWardenAlt # Corvax-SecFashion
- id: ClothingBackpackElectropack
amount: 2
- id: RemoteSignaller
Expand All @@ -34,6 +36,7 @@
contents:
- id: FlashlightSeclite
- id: WeaponDisabler
- id: ClothingHeadHatCapWardenAlt # Corvax-SecFashion
- id: ClothingBeltSecurityFilled
- id: Flash
- id: ClothingEyesGlassesSecurity
Expand All @@ -42,6 +45,7 @@
- id: ClothingShoesBootsJack
- id: ClothingOuterCoatWarden
- id: ClothingOuterWinterWarden
- id: ClothingOuterCoatWardenAlt # Corvax-SecFashion
- id: RubberStampWarden
- id: DoorRemoteArmory
- id: HoloprojectorSecurity
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,17 @@
- type: Clothing
sprite: Corvax/Clothing/Head/Hats/hoshat.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCapWardenAlt
name: warden's police hat
description: It's a special blue hat issued to the Warden of a security force.
components:
- type: Sprite
sprite: Corvax/Clothing/Head/Hats/warden_alt.rsi
- type: Clothing
sprite: Corvax/Clothing/Head/Hats/warden_alt.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretSecurityMedic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,24 @@
Piercing: 0.6
Heat: 0.9

- type: entity
parent: ClothingOuterCoatWarden
id: ClothingOuterCoatWardenAlt
name: warden's jacket
description: A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets.
components:
- type: Sprite
sprite: Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi
- type: Clothing
sprite: Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.8
Slash: 0.8
Piercing: 0.4
Heat: 0.8

- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatSecurityOvercoat
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/Corvax/Recipes/Lathes/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@
Cloth: 100
Durathread: 50

- type: latheRecipe
id: ClothingHeadHatCapWardenAlt
result: ClothingHeadHatCapWardenAlt
completetime: 2
materials:
Cloth: 100
Durathread: 50

- type: latheRecipe
id: ClothingUniformJumpsuitCapTurtleneck
result: ClothingUniformJumpsuitCapTurtleneck
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1125,6 +1125,7 @@
# Corvax-Clothing-Start
- ClothingHeadHatCapHoS
- ClothingHeadHatBeretSecurityMedic
- ClothingHeadHatCapWardenAlt
- ClothingUniformJumpsuitCapTurtleneck
- ClothingUniformJumpskirtCapTurtleneck
- ClothingUniformJumpsuitHoSBlack
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4, rehued by lzk228(github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "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.
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,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4, digi made by kuro(388673708753027083), rehued by lzk228(github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-digi",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
4 changes: 0 additions & 4 deletions Resources/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,3 @@ OverlordCircuitBoard: null

# 2024-09-08
HatBase: null

# 2024-09-21 - Corvax
ClothingHeadHatCapWardenAlt: null
ClothingOuterCoatWardenAlt: null

0 comments on commit 6d2c824

Please sign in to comment.