Skip to content

Commit

Permalink
Get fedora new textures back, same with detective coats. Fix RSI test…
Browse files Browse the repository at this point in the history
… fail
  • Loading branch information
MilenVolf committed Jul 13, 2024
1 parent 31908e6 commit 2c5f631
Show file tree
Hide file tree
Showing 32 changed files with 69 additions and 36 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
ClothingUniformJumpsuitDetective: 2
ClothingUniformJumpskirtDetective: 2
ClothingShoesColorBrown: 2
ClothingOuterCoatDetectiveLoadout: 2
ClothingOuterCoatDetectiveLoadout: 1
ClothingOuterCoatDetectiveLoadoutGrey: 1
ClothingHeadHatFedoraBrown: 2
ClothingUniformJumpsuitDetectiveGrey: 2
ClothingUniformJumpskirtDetectiveGrey: 2
Expand Down
33 changes: 14 additions & 19 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
sprite: Clothing/OuterClothing/Coats/bomber.rsi

- type: entity
parent: [ClothingOuterStorageBase, AllowSuitStorageClothing]
parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, ClothingOuterArmorBasic]
id: ClothingOuterCoatDetective
name: detective trenchcoat
description: A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Wearing it makes you feel for the plight of the Tibetans.
Expand All @@ -23,13 +23,19 @@
contents:
- id: SmokingPipeFilledTobacco
- id: FlippoEngravedLighter
- type: Armor #same as regular sec armor
modifiers:
coefficients:
Blunt: 0.70
Slash: 0.70
Piercing: 0.70
Heat: 0.80
- type: ExplosionResistance
damageCoefficient: 1 #its a coat. it doesnt do shit

- type: entity
parent: [ClothingOuterCoatDetectiveLoadout]
id: ClothingOuterCoatDetectiveLoadoutGrey
name: noir trenchcoat
description: Ah, your trusty coat. There's a few tears here and there, giving it a more timely look. Or at least, that's what you told yourself when you found out gettin' it repaired would set you back 200 speos.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Coats/detective_grey.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Coats/detective_grey.rsi

- type: entity
parent: ClothingOuterCoatDetective
Expand Down Expand Up @@ -93,17 +99,6 @@
- type: Clothing
sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi

- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatInspector
name: inspector's coat
description: A strict inspector's coat for being intimidating during inspections.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Coats/insp_coat.rsi

- type: entity
parent: ClothingOuterStorageToggleableBase
id: ClothingOuterCoatJensen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,14 @@
sprite: Starshine/Clothing/OuterClothing/Coats/hos_honorary_trenchcoat.rsi
- type: Clothing
sprite: Starshine/Clothing/OuterClothing/Coats/hos_honorary_trenchcoat.rsi

- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatInspector
name: inspector's coat
description: A strict inspector's coat for being intimidating during inspections.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
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.
Binary file modified Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
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.
10 changes: 1 addition & 9 deletions Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy for SS14. icon state made by Flareguy for Space Station 14",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,18 +14,10 @@
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-hamster",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "equipped-HELMET-dog",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
Expand Down
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.
Binary file modified Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png
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
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy for space station 14. icon state made by Flareguy for Space Station 14",
"size": {
"x": 32,
"y": 32
Expand All @@ -18,10 +18,6 @@
"name": "inhand-left",
"directions": 4
},
{
"name": "equipped-HELMET-dog",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
"name": "equipped-HELMET-dog",
"directions": 4
},
{
"name": "equipped-HELMET-hamster",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
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
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Created by EmoGarbage404",
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy. Vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob//icons/mob/species/vox/suit.dmi and modified by Flareguy",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
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,30 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Modified from detective coat found in https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 by Flareguy. vox state modified from detective state found in vgstation13 at https://github.com/vgstation-coders/vgstation13/blob//icons/mob/species/vox/suit.dmi. icon state by Flareguy. ",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

0 comments on commit 2c5f631

Please sign in to comment.