diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 1d8ddf21ac..d8ad23b960 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -317,6 +317,9 @@ uplink-costume-pyjama-desc = Contains 3 pairs of syndicate pyjamas and 3 plushie uplink-costume-clown-name = Clown Costume Duffel Bag uplink-costume-clown-desc = Contains a complete Clown outfit. Includes PDA and service radio. +uplink-carp-suit-bundle-name = Carp Suit Duffel Bag +uplink-carp-suit-bundle-desc = Contains a carp suit and some friends to play with. + uplink-operative-suit-name = Operative Jumpsuit uplink-operative-suit-desc = A suit given to our nuclear operatives with fine fabric to make sure you stand out, no other benefits aside from looking cool. diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 59bade855b..777f48dbd3 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -180,6 +180,18 @@ - id: ClownPDA - id: ClothingHeadsetService +- type: entity + parent: ClothingBackpackDuffelSyndicateBundle + id: ClothingBackpackDuffelSyndicateCarpSuit + name: carp suit duffel bag + description: Contains a carp suit and some friends to play with. + components: + - type: StorageFill + contents: + - id: ClothingOuterSuitCarp + - id: PlushieCarp + amount: 6 + - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicatePyjamaBundle diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 34bd6789f5..022e22781c 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1312,6 +1312,16 @@ categories: - UplinkPointless +- type: listing + id: UplinkCarpSuitBundle + name: uplink-carp-suit-bundle-name + description: uplink-carp-suit-bundle-desc + productEntity: ClothingBackpackDuffelSyndicateCarpSuit + cost: + Telecrystal: 4 + categories: + - UplinkPointless + - type: listing id: UplinkOperativeSuit name: uplink-operative-suit-name diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 35a4ecd958..68ca524e0b 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -142,6 +142,36 @@ - type: Clothing sprite: Clothing/Head/Hoods/goliathcloak.rsi +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHoodIan + noSpawn: true + name: ian hood + description: A hood to complete the 'Good boy' look. + components: + - type: Sprite + sprite: Clothing/Head/Hoods/iansuit.rsi + - type: Clothing + sprite: Clothing/Head/Hoods/iansuit.rsi + - type: Tag + tags: + - HidesHair + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHoodCarp + noSpawn: true + name: carp hood + description: A gnarly hood adorned with plastic space carp teeth. + components: + - type: Sprite + sprite: Clothing/Head/Hoods/carpsuit.rsi + - type: Clothing + sprite: Clothing/Head/Hoods/carpsuit.rsi + - type: Tag + tags: + - HidesHair + - type: entity parent: ClothingHeadBase id: ClothingHeadHatHoodMoth diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 0c7017fe0b..c4eb38ed80 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -155,3 +155,42 @@ sprite: Clothing/OuterClothing/Suits/monkey.rsi - type: Clothing sprite: Clothing/OuterClothing/Suits/monkey.rsi + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterSuitIan + name: ian suit + description: Who's a good boy? + components: + - type: Sprite + sprite: Clothing/OuterClothing/Suits/iansuit.rsi + - type: Item + size: 30 + - type: Clothing + sprite: Clothing/OuterClothing/Suits/iansuit.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodIan + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterSuitCarp + name: carp suit + description: A special suit that makes you look just like a space carp, if your eyesight is bad. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Suits/carpsuit.rsi + - type: Item + size: 30 + - type: Clothing + sprite: Clothing/OuterClothing/Suits/carpsuit.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodCarp + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} diff --git a/Resources/Textures/Clothing/Head/Hoods/carpsuit.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/carpsuit.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..3bc7149755 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/carpsuit.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/carpsuit.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/carpsuit.rsi/icon.png new file mode 100644 index 0000000000..b57489f9ef Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/carpsuit.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/carpsuit.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/carpsuit.rsi/meta.json new file mode 100644 index 0000000000..7d275df034 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hoods/carpsuit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by deltanedas (github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..25006c0110 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/icon.png new file mode 100644 index 0000000000..32b21f4bb8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/meta.json new file mode 100644 index 0000000000..7d275df034 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hoods/iansuit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by deltanedas (github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..0a2217753e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/icon.png new file mode 100644 index 0000000000..400b17e96e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/inhand-left.png new file mode 100644 index 0000000000..77189f4d7e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/inhand-right.png new file mode 100644 index 0000000000..3fd6bdcdd4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/meta.json new file mode 100644 index 0000000000..542edf0002 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/meta.json @@ -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. Modified by deltanedas (github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..d4fdcc272f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/icon.png new file mode 100644 index 0000000000..2851091bf4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/inhand-left.png new file mode 100644 index 0000000000..4f0f0ea3a0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/inhand-right.png new file mode 100644 index 0000000000..55246b7e15 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/meta.json new file mode 100644 index 0000000000..542edf0002 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi/meta.json @@ -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. Modified by deltanedas (github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}