Skip to content
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
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
parent: ClothingNeckBase # Frontier: removed BaseCommandContraband
id: ClothingNeckCloakCap
name: captain's cloak
description: A pompous and comfy blue cloak with a nice gold trim, while not particularly valuable as your other possessions, it sure is fancy.
description: A pompous and comfy blue and purple cloak with dangling decor, while not particularly valuable as your other possessions, it sure is fancy. # Obelisk: Changed Description
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/cap.rsi
Expand All @@ -35,7 +35,7 @@
parent: ClothingNeckBase # Frontier: removed BaseCommandContraband
id: ClothingNeckCloakCe
name: chief engineer's cloak
description: A dark green cloak with light blue ornaments, given to those who proved themselves to master the precise art of engineering.
description: A black cloak with green and orange ornaments, given to those who proved themselves to master the precise art of engineering. # Obelisk: Changed Description
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/ce.rsi
Expand All @@ -46,7 +46,7 @@
parent: ClothingNeckBase # Frontier: removed BaseCommandContraband
id: ClothingCloakCmo
name: chief medical officer's cloak
description: A sterile blue cloak with a green cross, radiating with a sense of duty and willingness to help others.
description: A sterile blue cloak with a red Caduceus helix, radiating with a sense of duty and willingness to help others. # Obelisk: Changed Description
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/cmo.rsi
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
parent: ClothingNeckBase # Frontier: removed BaseCommandContraband
id: ClothingNeckMantleCap
name: captain's mantle
description: A comfortable and chique mantle befitting of only the most experienced captain.
description: A stylish brown shoulder mantle descorated in square spirals. Great addition to any outfit. # Obelisk: Changed Description
components:
- type: Sprite
sprite: Clothing/Neck/mantles/capmantle.rsi
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/Neck/Cloaks/cap.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.
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/cap.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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/Textures/Clothing/Neck/Cloaks/cap.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/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, colors edited by Skarletto (github), recolored by infinityPandaRed",
"copyright": "WyvernRer",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/equipped-NECK.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/Neck/Cloaks/ce.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.
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/ce.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/Neck/Cloaks/ce.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.
2 changes: 1 addition & 1 deletion Resources/Textures/Clothing/Neck/Cloaks/ce.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/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
"copyright": "WyvernRer",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.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/Neck/Cloaks/cmo.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.
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/cmo.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/Neck/Cloaks/cmo.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.
2 changes: 1 addition & 1 deletion Resources/Textures/Clothing/Neck/Cloaks/cmo.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/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, fixed by @mishutka09",
"copyright": "WyvernRer",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.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/Neck/Cloaks/hop.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.
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/hop.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/Neck/Cloaks/hop.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.
2 changes: 1 addition & 1 deletion Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, sprites updated by JORJ949",
"copyright": "WyvernRer",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.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/Neck/Cloaks/hos.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.
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/hos.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/Neck/Cloaks/hos.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.
2 changes: 1 addition & 1 deletion Resources/Textures/Clothing/Neck/Cloaks/hos.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/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, sprites updated by JORJ949",
"copyright": "WyvernRer",
"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/Neck/Cloaks/nanotrasen.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": "Created by You#1818, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
"copyright": "WyvernRer",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/equipped-NECK.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/Neck/Cloaks/qm.rsi/icon.png
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/inhand-left.png
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/inhand-right.png
2 changes: 1 addition & 1 deletion Resources/Textures/Clothing/Neck/Cloaks/qm.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/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
"copyright": "WyvernRer",
"size": {
"x": 32,
"y": 32
Expand Down
2 changes: 1 addition & 1 deletion Resources/Textures/Clothing/Neck/Cloaks/rd.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/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
"copyright": "WyvernRer",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/icon.png
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/inhand-left.png
Binary file modified Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/inhand-right.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Shiptest at https://github.com/shiptest-ss13/Shiptest/commit/0116c3dc37bece6ed865daf22bb7be4ac630d081, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
"copyright": "WyvernRer",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "made by Emisse (github) for ss14, edited by Skarletto (github)",
"copyright": "WyvernRer",
"size": {
"x": 32,
"y": 32
Expand All @@ -15,4 +15,4 @@
"directions": 4
}
]
}
}
Binary file modified Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "made by emisse for ss14",
"copyright": "WyvernRer",
"size": {
"x": 32,
"y": 32
Expand All @@ -15,4 +15,4 @@
"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": "made by emisse for ss14",
"copyright": "WyvernRer",
"size": {
"x": 32,
"y": 32
Expand All @@ -15,4 +15,4 @@
"directions": 4
}
]
}
}
Binary file modified Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/icon.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "made by emisse for ss14",
"copyright": "WyvernRer",
"size": {
"x": 32,
"y": 32
Expand All @@ -15,4 +15,4 @@
"directions": 4
}
]
}
}
Binary file modified Resources/Textures/Clothing/Neck/mantles/qmmantle.rsi/icon.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "drawn by Ubaser",
"copyright": "WyvernRer",
"size": {
"x": 32,
"y": 32
Expand All @@ -15,4 +15,4 @@
"directions": 4
}
]
}
}
Loading