From 60f67f5583154c7018b8322e6eded53edff84e36 Mon Sep 17 00:00:00 2001 From: PixelTK <85175107+PixelTheKermit@users.noreply.github.com> Date: Tue, 17 Jan 2023 01:51:13 +0000 Subject: [PATCH] LGBTQIA+ pins (#13472) --- .../Catalog/Fills/Crates/salvage.yml | 20 +++ .../Entities/Clothing/Neck/pins.yml | 143 ++++++++++++++++++ .../Markers/Spawners/Random/maintenance.yml | 9 ++ .../Neck/Misc/pins.rsi/aro-equipped.png | Bin 0 -> 157 bytes .../Clothing/Neck/Misc/pins.rsi/aro.png | Bin 0 -> 296 bytes .../Neck/Misc/pins.rsi/asex-equipped.png | Bin 0 -> 172 bytes .../Clothing/Neck/Misc/pins.rsi/asex.png | Bin 0 -> 255 bytes .../Neck/Misc/pins.rsi/bi-equipped.png | Bin 0 -> 158 bytes .../Clothing/Neck/Misc/pins.rsi/bi.png | Bin 0 -> 276 bytes .../Neck/Misc/pins.rsi/inter-equipped.png | Bin 0 -> 138 bytes .../Clothing/Neck/Misc/pins.rsi/inter.png | Bin 0 -> 232 bytes .../Neck/Misc/pins.rsi/les-equipped.png | Bin 0 -> 161 bytes .../Clothing/Neck/Misc/pins.rsi/les.png | Bin 0 -> 303 bytes .../Neck/Misc/pins.rsi/lgbt-equipped.png | Bin 0 -> 152 bytes .../Clothing/Neck/Misc/pins.rsi/lgbt.png | Bin 0 -> 275 bytes .../Clothing/Neck/Misc/pins.rsi/meta.json | 74 +++++++++ .../Neck/Misc/pins.rsi/non-equipped.png | Bin 0 -> 168 bytes .../Clothing/Neck/Misc/pins.rsi/non.png | Bin 0 -> 262 bytes .../Neck/Misc/pins.rsi/pan-equipped.png | Bin 0 -> 158 bytes .../Clothing/Neck/Misc/pins.rsi/pan.png | Bin 0 -> 231 bytes .../Neck/Misc/pins.rsi/trans-equipped.png | Bin 0 -> 167 bytes .../Clothing/Neck/Misc/pins.rsi/trans.png | Bin 0 -> 278 bytes 22 files changed, 246 insertions(+) create mode 100644 Resources/Prototypes/Entities/Clothing/Neck/pins.yml create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/les.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index ca6dbd7467..4f01f57d14 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -83,6 +83,26 @@ prob: 0.001 - id: ClothingHeadHatCatEars prob: 0.01 + # - Pins + - id: ClothingNeckLGBTPin + prob: 0.025 + orGroup: LGBTQIAPlusPins + - id: ClothingNeckAromanticPin + orGroup: LGBTQIAPlusPins + - id: ClothingNeckAsexualPin + orGroup: LGBTQIAPlusPins + - id: ClothingNeckBisexualPin + orGroup: LGBTQIAPlusPins + - id: ClothingNeckIntersexPin + orGroup: LGBTQIAPlusPins + - id: ClothingNeckLesbianPin + orGroup: LGBTQIAPlusPins + - id: ClothingNeckNonBinaryPin + orGroup: LGBTQIAPlusPins + - id: ClothingNeckPansexualPin + orGroup: LGBTQIAPlusPins + - id: ClothingNeckTransPin + orGroup: LGBTQIAPlusPins # TRAITOR EQUIPMENT (0.01%) - id: Telecrystal10 prob: 0.0001 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml new file mode 100644 index 0000000000..cc9c2dd636 --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -0,0 +1,143 @@ +- type: entity + parent: ClothingNeckBase + id: ClothingNeckLGBTPin + name: LGBT pin + description: be gay do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: lgbt + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: lgbt-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckAromanticPin + name: aromantic pin + description: be aro do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: aro + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: aro-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckAsexualPin + name: asexual pin + description: be ace do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: asex + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: asex-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckBisexualPin + name: bisexual pin + description: be bi do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: bi + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: bi-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckIntersexPin + name: intersex pin + description: be intersex do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: inter + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: inter-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckLesbianPin + name: lesbian pin + description: be lesbian do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: les + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: les-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckNonBinaryPin + name: non-binary pin + description: "01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101" + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: non + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: non-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckPansexualPin + name: pansexual pin + description: be pan do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: pan + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: pan-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckTransPin + name: transgender pin + description: be trans do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: trans + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: trans-equipped diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index da17826f6b..3883bea6d6 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -25,6 +25,15 @@ - Skub - ClothingHeadHatCatEars - DrinkMugDog + - ClothingNeckLGBTPin + - ClothingNeckAromanticPin + - ClothingNeckAsexualPin + - ClothingNeckBisexualPin + - ClothingNeckIntersexPin + - ClothingNeckLesbianPin + - ClothingNeckNonBinaryPin + - ClothingNeckPansexualPin + - ClothingNeckTransPin rareChance: 0.01 prototypes: - Lighter diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png new file mode 100644 index 0000000000000000000000000000000000000000..ce50d896bccc0a8dd2a140b1c7c5ce81d5808dc8 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=DV{ElAr*7pUNYo$3KVd;sCZC} z*DT9OeXDMW7v#u-;>Tbm6mwuV!SDC@9L#(F;$QcX@D|+RH|jF zweM@qpM{Wzg};=_$u`g)I`P@uO!WL&2%JNVI_|@|q7BqPTR1-swrwYR^ZXnDckKf1 z!jJ(hPTk&+8lYA%lQn_EJ+sLCz~yeB9*YIV`40^H)+;{$KH>A*-8%Di zmwhXF#d{^HUUO;2T35}bySH!m&QF;8?z7a#o*n0+c^HA3VBpIy<~OSa`!B_=p9B)} MboFyt=akR{06dI7tN;K2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png new file mode 100644 index 0000000000000000000000000000000000000000..7df1114ffed37c3dc5d0b030b5e12510de6d0407 GIT binary patch literal 255 zcmV2H5@=fVP(l(Ea5Oxavv)T5)S}1ajmJqN&~^d*@R#*uiHPFnZLW4 z0Yy<1Wo0(DiKpXn7@x1Vn^i4w(!25A_b2-E@vt(olNuN|cU||Z2?-*%S(Xh+k`M&J zEY`Ly0992{6vfYVw-N(OAo_whj!Dy$Fbrq0rfC4^`(9*V^%oFNK~6bD&H;eP^FDfQ z40U(s!g={AsJlCnbD%b6qS;`*h;quwB9h)*Q4~e_8(tAoGwn4n@U{Q|002ovPDHLk FV1n^-WgY+k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png new file mode 100644 index 0000000000000000000000000000000000000000..cb9e1dd8bdf7eee6b9b09688e60bfed5768edb6c GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=sh%#5Ar*7po-^bFVdQ&MBb@0EqB6=>Px# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png new file mode 100644 index 0000000000000000000000000000000000000000..d6d32b8bbb1debd578512419aa650f940a465cab GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ+nz3tArY;~2@@ORI`MpSYQsnN?IgI9bJlWIoI|IInT`)sBby{VZ*F)|TrlWYx`2PDqGw*fKN4 zmC=;ZQ_&#)t#I>(7v5~FhG{%I*@g5aC4k`GzJEs!6m(Y@d!A#xlqLM1yF1HBqr+2C zr~WHX*3Z(m<=a1b8ckjz(9pPj{d!?lHy(xE3X{TScLWJceDyidfXnTmh6HOf(2xJy WO`qHNY|H?9lfl!~&t;ucLK6Tow`8vX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png new file mode 100644 index 0000000000000000000000000000000000000000..d72f516ec234e243cc880d82b9d2b9a6054ecf56 GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=fu1goAr*7pUUK9;pdi5DSd+kD zc(tAHpT|xX)~^LuFI+c$+0#^;lMPh5r~KQD)$a3b(@MQNuPT4uSM>G7t7$^}?SWEo a@M8|UsI9oV{Ff^kATdu@KbLh*2~7Yk&n$!h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png new file mode 100644 index 0000000000000000000000000000000000000000..c191729a24291df5d649934026df99f3e889a9b0 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ^`0({ArY;~2@)`aqkq1w(45kWo+fXw~>la>T1SaKyK0Hr}v7SZ{Q`jO8jh_YT` zNoj8YifqwPI4?74GhdZeLPCOq^*>386FiNNf5!`{y75SSXvzS)i_7g`12aS7GK?Iz?9WjjQi+u1aR7IB}5=lP9zlv)rjU+zZsQW8u2e2gW+@J1Sg{Sk*mWY5Veg zN?K@WYFg~wq9cn-6RN+x-e&)xMGmMG1{%`r$rJZ~;?K#F+a{)pot%{*w%V9uQOEt13jb-&5gw%tySk*Bmn|`227=}pt5jlQ zK7T82dwqVsk-?ptZj&lic9wN{9jwopcKCqy3gx1AJ_@&DCOI|ijhXFu@@Q)#5I8zI zGCKb|*v!uJ{o9+w1P|4FK59WS4%`kw93JQL6A~;bI?B8a#EHQk&kw;vu*Cb|- zbF9&8mi&L6?R=?`Ws-7S%-&N4A72Ht%}@6CG@6{k{^gY6pY();1OriLQTxAKPU7}T tXMHwtE6s3DXb9o&zH+dB@!+{~d;OXk;vd$@?2>_}ScE11s literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png new file mode 100644 index 0000000000000000000000000000000000000000..1bdd3de51e38027300d545a62cd95b3425cd3031 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=@t!V@Ar*7pUfL+=5Fo;E(A;Sz z7st_C0o@_$b;4c&&0;-%^Q2tv_uS>u+ra@;e{c8nZ867Ze7`j9mTqZ|Z&~&Hji!;- pOS>$u8Tq82+xYJbPz@YB$d+Tu7s!?DX}<~*^K|udS?83{1OTWAF|HZU-_A+gt8P~4VXu;0>a*76x1r3^=k^w=z! zSuNT+Co+2!y}hJ$@c*>FM?76^S`tOy&)-i>00N7B|5cq!ZdWfltE$big44r`IrIH} ze?Y#LVPov3CayT}3NEjwD++>|-?kwr$xMk|X?wrkT2Q|PR;n84Vh>td&S7RjT Q4D=;~r>mdKI;Vst0M9dN-~a#s literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json new file mode 100644 index 0000000000..57fab6a8ba --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json @@ -0,0 +1,74 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "PixelTK leaves his mark on upstream", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "aro" + }, + { + "name": "aro-equipped", + "directions": 4 + }, + { + "name": "asex" + }, + { + "name": "asex-equipped", + "directions": 4 + }, + { + "name": "bi" + }, + { + "name": "bi-equipped", + "directions": 4 + }, + { + "name": "inter" + }, + { + "name": "inter-equipped", + "directions": 4 + }, + { + "name": "les" + }, + { + "name": "les-equipped", + "directions": 4 + }, + { + "name": "lgbt" + }, + { + "name": "lgbt-equipped", + "directions": 4 + }, + { + "name": "non" + }, + { + "name": "non-equipped", + "directions": 4 + }, + { + "name": "pan" + }, + { + "name": "pan-equipped", + "directions": 4 + }, + { + "name": "trans" + }, + { + "name": "trans-equipped", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png new file mode 100644 index 0000000000000000000000000000000000000000..7774132a4dcb7d41f16b8b2d93d884a444382414 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=`JOJ0Ar*7po?FO!$bq5l;`}8{ z_czUj#)yRz^9a$oS;_+7U=X?b!^^?w1Nau{$}&p%sRXv(XsrGX$JPgg&e IbxsLQ0902#(f|Me literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png new file mode 100644 index 0000000000000000000000000000000000000000..9346d5fa6af05ed93994f160802832811a50b164 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJvz{)FArY;~2@l%R~L6-S_hpz6-wkbxra7 xtS_ha<;t1YC*Lf3GB?HhnY|7p&}bOA^O^CMlCXjK^fot;kf*Dk%Q~loCIFGbGQI!+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png new file mode 100644 index 0000000000000000000000000000000000000000..b74d31e792f840422713356e67eaac1b68bbcdf2 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJb)GJcArY;~2@i@ zSH_HsjeSZ@3xh>J91mmgHeJxTGssTvmnX+V8Afw+Mh1o-&h6I@+N*gzO{`z?We0a|5{h`fE{QD3@o@Q?GYmACnRq32PEX_>gTe~ HDWM4f+}}BY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png new file mode 100644 index 0000000000000000000000000000000000000000..a47420daa641e0cc34d7ab3ce328a30518c5190a GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJyPhtNArY;~2@*Q3ild}@Uva?<<=!oB6)vD9JVZy7154Y1Ld#-Mk5UJbW+-+XR~=$dz$pCTwmv@^E-ddx}ysgEb3AG{@`3J8yj1PveUD2!CXC0#Sizq zrZyftIrh~J$ zdloUA+{qAarC|O~QsTr3R_)MU$*_OP2^UgCoj9_%95*doWw`PfZ;hh~m)k)NkZ%q! ZGW70txZ8Y?