Skip to content

Commit

Permalink
Revert "Security Resprite (space-wizards#29082)"
Browse files Browse the repository at this point in the history
This reverts commit 4cf60f8.

# Conflicts:
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json
#	Resources/migration.yml
  • Loading branch information
lAstronautl committed Jul 4, 2024
1 parent bc212fe commit 31908e6
Show file tree
Hide file tree
Showing 116 changed files with 132 additions and 157 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
ClothingUniformJumpsuitDetective: 2
ClothingUniformJumpskirtDetective: 2
ClothingShoesColorBrown: 2
ClothingOuterCoatDetectiveLoadout: 1
ClothingOuterCoatDetectiveLoadoutGrey: 1
ClothingOuterCoatDetectiveLoadout: 2
ClothingHeadHatFedoraBrown: 2
ClothingUniformJumpsuitDetectiveGrey: 2
ClothingUniformJumpskirtDetectiveGrey: 2
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,8 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatHoshat
name: head of security cap
description: The robust standard-issue cap of the Head of Security. For showing the officers who's in charge.
name: head of security's hat
description: "There's a new sheriff in station."
components:
- type: Sprite
sprite: Clothing/Head/Hats/hoshat.rsi
Expand Down
36 changes: 20 additions & 16 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
sprite: Clothing/OuterClothing/Coats/bomber.rsi

- type: entity
parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, ClothingOuterArmorBasic]
parent: [ClothingOuterStorageBase, AllowSuitStorageClothing]
id: ClothingOuterCoatDetective
name: detective trenchcoat
description: An 18th-century multi-purpose trenchcoat. Someone who wears this means serious business.
description: A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Wearing it makes you feel for the plight of the Tibetans.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Coats/detective.rsi
Expand All @@ -23,20 +23,13 @@
contents:
- id: SmokingPipeFilledTobacco
- id: FlippoEngravedLighter
- 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: Armor #same as regular sec armor
modifiers:
coefficients:
Blunt: 0.70
Slash: 0.70
Piercing: 0.70
Heat: 0.80

- type: entity
parent: ClothingOuterCoatDetective
Expand Down Expand Up @@ -100,6 +93,17 @@
- 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
44 changes: 0 additions & 44 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -228,20 +228,6 @@
sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- state: overlay-inhand-left
sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
right:
- state: inhand-right
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- state: overlay-inhand-right
sprite: Clothing/Uniforms/Jumpsuit/hos.rsi

- type: entity
parent: ClothingUniformSkirtBase
Expand Down Expand Up @@ -446,21 +432,6 @@
sprite: Clothing/Uniforms/Jumpskirt/security.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/security.rsi
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- state: overlay-inhand-left
sprite: Clothing/Uniforms/Jumpsuit/security.rsi
right:
- state: inhand-right
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- state: overlay-inhand-right
sprite: Clothing/Uniforms/Jumpsuit/security.rsi


- type: entity
parent: ClothingUniformSkirtBase
Expand All @@ -472,21 +443,6 @@
sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- state: overlay-inhand-left
sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
right:
- state: inhand-right
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- state: overlay-inhand-right
sprite: Clothing/Uniforms/Jumpsuit/warden.rsi


- type: entity
parent: ClothingUniformSkirtBase
Expand Down
36 changes: 0 additions & 36 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -406,18 +406,6 @@
sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- state: overlay-inhand-left
right:
- state: inhand-right
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- state: overlay-inhand-right

- type: entity
parent: ClothingUniformBase
Expand Down Expand Up @@ -711,18 +699,6 @@
sprite: Clothing/Uniforms/Jumpsuit/security.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/security.rsi
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- state: overlay-inhand-left
right:
- state: inhand-right
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- state: overlay-inhand-right

- type: entity
parent: ClothingUniformBase
Expand Down Expand Up @@ -756,18 +732,6 @@
sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- state: overlay-inhand-left
right:
- state: inhand-right
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- state: overlay-inhand-right

- type: entity
parent: ClothingUniformBase
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.
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.
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 and modified by Flareguy for SS14. icon state made by Flareguy for Space Station 14",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-hamster",
"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.
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 and modified by Flareguy for space station 14. icon state made by Flareguy for Space Station 14",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
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/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.
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/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14",
"copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb. Vox state by Flareguy for SS14",
"size": {
"x": 32,
"y": 32
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 9 additions & 1 deletion Resources/Textures/Clothing/Head/Helmets/security.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/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for SS14",
"size": {
"x": 32,
"y": 32
Expand All @@ -18,6 +18,14 @@
"name": "equipped-HELMET-vox",
"directions": 4
},
{
"name": "light-equipped-HELMET",
"directions": 4
},
{
"name": "lighton-equipped-HELMET",
"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.
Binary file modified Resources/Textures/Clothing/Head/Helmets/swat.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/Helmets/swat.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.
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/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites & vox state by Flareguy",
"size": {
"x": 32,
"y": 32
Expand Down
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/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites by Flareguy, icon edited by Flareguy. Vox state taken from from Paradise at https://github.com/ParadiseSS13/Paradise/blob/b1658390731745adf5cc9fb039bb0f17ad3c11a7/icons/mob/clothing/species/vox/helmet.dmi ",
"size": {
"x": 32,
"y": 32
Expand Down
Diff not rendered.
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/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",
"license": "CC0-1.0",
"copyright": "Created by EmoGarbage404",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,10 +14,6 @@
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.

This file was deleted.

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 Paradise at commit bad1ec7aa2c86df5794dc6ba28be05ebd0228012",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , edited by Alekshhh. Vox state made by Flareguy for SS14",
"size": {
"x": 32,
"y": 32
Expand Down
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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
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 and modified by Flareguy. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and modified by Flareguy",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
"size": {
"x": 32,
"y": 32
Expand Down
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/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
Loading

0 comments on commit 31908e6

Please sign in to comment.