From ed97cb75697ad8974a371e67c90dae5f44281b6b Mon Sep 17 00:00:00 2001 From: nmajask Date: Wed, 11 Jan 2023 22:46:47 -0500 Subject: [PATCH] Ports goliath cloaks from TG (#13283) --- .../Entities/Clothing/Head/hoods.yml | 11 +++++++++++ .../Entities/Clothing/Neck/cloaks.yml | 16 ++++++++++++++++ .../Markers/Spawners/Random/maintenance.yml | 1 + .../goliathcloak.rsi/equipped-HELMET.png | Bin 0 -> 759 bytes .../Head/Hoods/goliathcloak.rsi/icon.png | Bin 0 -> 180 bytes .../Head/Hoods/goliathcloak.rsi/meta.json | 18 ++++++++++++++++++ .../Cloaks/goliathcloak.rsi/equipped-NECK.png | Bin 0 -> 1168 bytes .../Neck/Cloaks/goliathcloak.rsi/icon.png | Bin 0 -> 601 bytes .../Neck/Cloaks/goliathcloak.rsi/meta.json | 18 ++++++++++++++++++ 9 files changed, 64 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hoods/goliathcloak.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/goliathcloak.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/goliathcloak.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/goliathcloak.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/goliathcloak.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/goliathcloak.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 7e0eac1d7a..d589a5cdb4 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -128,3 +128,14 @@ coefficients: Heat: 0.95 Radiation: 0.65 + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHoodGoliathCloak + name: goliath cloak hood + description: A hood of a goliath cloak, it is made from the hide of resilient fauna from a distant planet. + components: + - type: Sprite + sprite: Clothing/Head/Hoods/goliathcloak.rsi + - type: Clothing + sprite: Clothing/Head/Hoods/goliathcloak.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 413a7b6aa7..d3e50a610b 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -114,3 +114,19 @@ components: - type: Sprite sprite: Clothing/Neck/Cloaks/trans.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakGoliathCloak + name: goliath cloak + description: A cloak made from the hide of resilient fauna from a distant planet, though its protective value has faded with its age. + components: + - type: Sprite + sprite: Clothing/Neck/Cloaks/goliathcloak.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodGoliathCloak + requiredSlot: + - neck + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 7e31949d56..da17826f6b 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -16,6 +16,7 @@ - ClothingHeadHelmetTemplar - ClothingNeckCloakTrans - ClothingNeckCloakAdmin + - ClothingNeckCloakGoliathCloak - ToySkeleton - Basketball - Football diff --git a/Resources/Textures/Clothing/Head/Hoods/goliathcloak.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/goliathcloak.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..d94e8c8afbdf1d4bac23488435337cb49f4d3d7c GIT binary patch literal 759 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/goliathcloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/goliathcloak.rsi/meta.json new file mode 100644 index 0000000000..4fd90ef5df --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/goliathcloak.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation from this PR https://github.com/tgstation/tgstation/pull/27537, original sprite by TechnoAlchemisto (https://github.com/TechnoAlchemisto) and modified sprite by FantasticFwoosh (https://github.com/FantasticFwoosh)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +}