diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 2bb13f5454..9b8de5043a 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -75,6 +75,8 @@ # - Skub - id: Skub prob: 0.001 + - id: ClothingHeadHatCatEars + prob: 0.01 # TRAITOR EQUIPMENT (0.01%) - id: Telecrystal10 prob: 0.0001 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 890eb9d226..894422add9 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -371,6 +371,15 @@ category: Misc itemId: ClothingBackpackDuffelSyndicatePyjamaBundle price: 4 + +- type: uplinkListing + id: UplinkCatEars + category: Misc + itemId: ClothingHeadHatCatEars + listingName: Cat Ears + description: UwU. + price: 21 + - type: uplinkListing id: UplinkGigacancerScanner diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 6c3861963e..915c43b47f 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -111,3 +111,16 @@ sprite: Clothing/Head/Misc/cone.rsi - type: Clothing sprite: Clothing/Head/Misc/cone.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatCatEars + name: cat ears + description: "NYAH!" + components: + - type: Sprite + sprite: Clothing/Head/Hats/catears.rsi + - type: Clothing + sprite: Clothing/Head/Hats/catears.rsi + - type: AddAccentClothing + accent: OwOAccent diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 6ddea19f76..7504751dc3 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -19,6 +19,7 @@ - BalloonCorgi - PonderingOrb - Skub + - ClothingHeadHatCatEars rareChance: 0.01 prototypes: - Lighter diff --git a/Resources/Textures/Clothing/Head/Hats/catears.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/catears.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..8ec8dcfa92 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/catears.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/catears.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/catears.rsi/icon.png new file mode 100644 index 0000000000..840f565c5b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/catears.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/catears.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/catears.rsi/inhand-left.png new file mode 100644 index 0000000000..44583a3f36 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/catears.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/catears.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/catears.rsi/inhand-right.png new file mode 100644 index 0000000000..dbe6e62995 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/catears.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/catears.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/catears.rsi/meta.json new file mode 100644 index 0000000000..5626d8d738 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/catears.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fc9b91e3cb51b20987aab9630e73ac587bc00f3f", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4, + "delays": [ + [0.2, 0.2, 0.2, 0.2, 0.2], + [0.2, 0.2, 0.2, 0.2, 0.2], + [0.2, 0.2, 0.2, 0.2, 0.2], + [0.2, 0.2, 0.2, 0.2, 0.2] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}