From a1aba4983a9eacc2fb74a55db418fd5f890d92b5 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Thu, 12 May 2022 11:53:01 +0100 Subject: [PATCH] Adds cat ears as rare loot and traitor item (#6939) * adds cat ears that give uwu accent * error * Updated to 20tc Web edit yoink * 21 TC now --- .../Catalog/Fills/Crates/salvage.yml | 2 ++ .../Prototypes/Catalog/uplink_catalog.yml | 9 +++++ .../Entities/Clothing/Head/misc.yml | 13 +++++++ .../Markers/Spawners/Random/maintenance.yml | 1 + .../Head/Hats/catears.rsi/equipped-HELMET.png | Bin 0 -> 552 bytes .../Clothing/Head/Hats/catears.rsi/icon.png | Bin 0 -> 198 bytes .../Head/Hats/catears.rsi/inhand-left.png | Bin 0 -> 309 bytes .../Head/Hats/catears.rsi/inhand-right.png | Bin 0 -> 310 bytes .../Clothing/Head/Hats/catears.rsi/meta.json | 32 ++++++++++++++++++ 9 files changed, 57 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hats/catears.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/catears.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/catears.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/catears.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/catears.rsi/meta.json 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 0000000000000000000000000000000000000000..8ec8dcfa92287f5299bd0278cd4e8e7e746017fe GIT binary patch literal 552 zcmV+@0@wYCP)004jp0{{R3ySPx#7*I@9MF9T*;^^%7e0l z*tYAzTDrBjux)Kg-S*agM{KR_OX|mn%kOHssK&k80l>$owjhKMLI@#*5JG$})%hRH z2mQ?FK4%!!y7hOs;@+3kt@rD}TDtWQM=R-H!bAv|n-ikyKG5migP4#vKL)5VfWtV( zj3>L#TmV`kXfT`{&OR;<-XQFNG6-+LjKfrePdKCuhL6Zhd8ni36v{79pEZa+CV&-! z3y9uRSVsmpgKT|6IyR77UkD+D5JF^g6V9D-v2J(a+&RBiKm6V7F8q^g^#hN0?|HA) z1w))H!CVfsvk!!ZamNSyNh;BqxdPBKryGO~F`sFKGMQ-L6QmmiK?ftMb!+b7h-%&T9{(?|*2Po6 zER0MG>AVp3sCau2D1cgAv^|O6zZC0al0$E>qT@<>h0^m>83gBN4U#z!{|vD!kZv&B q0BaD1g|t6L*oIH8*?)`gT-Q51q zpTB$e?in*?+`M^nwz;q*Pz_^AkY6x^!?PP{Ku(OOi(`n!#N-5tGY$++hKGLmbO}Ux zFzPXc9pVrVFcM-3Y&zu?z?iB&LC8%}RCz|jW~G461rs=96f8Uf8Uh2Zil{A+niU7M sGEPj2MU;crn;|e~<-#kUZcJcg=sLui|9BRoEzlkYPgg&ebxsLQ0QF=-rvLx| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..44583a3f36868dbc51b881465f6308ab69453ab7 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|-g~+@hE&XX zd()q*$wB1!M?)rkfs3o8O{8B6yYbcC^AD`&-~LMA-&NiO&vXA9)+#qFWsi_z)Uk!RV#b;>Yn$mCc{i;+ w%Tmz!xXjxom18#Nf$5uK`^(KQ099@H!WLN3`b}=y%{Y)APgg&ebxsLQ05Xq&fdBvi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..dbe6e62995c117e9aa263138132f5897cf98b66f GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|K6tt~hE&XX zd&`ll$wB1U$9$C+Oo5I8>L+?jME$QYMwN6a+$xn5W>S7{p!>*mTI!OPOaHe|n(1Hp zo-*&* literal 0 HcmV?d00001 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 + } + ] +}