From ac7a71460450d5430005ad77ebdc327dd0f75fd5 Mon Sep 17 00:00:00 2001 From: Marvin Megavolt <71851679+CapnMachaddish@users.noreply.github.com> Date: Wed, 31 Mar 2021 21:53:46 -0500 Subject: [PATCH] Back for round 2 --- code/modules/vending/clothesmate.dm | 3 +++ hyperstation/code/modules/clothing/gloves.dm | 13 +++++++++++++ .../code/modules/clothing/suits/misc.dm | 15 +++++++++++++++ hyperstation/icons/mobs/gloves.dmi | Bin 520 -> 570 bytes hyperstation/icons/mobs/suits.dmi | Bin 2342 -> 2922 bytes hyperstation/icons/obj/clothing/gloves.dmi | Bin 501 -> 894 bytes hyperstation/icons/obj/clothing/suits.dmi | Bin 552 -> 777 bytes .../code/modules/client/loadout/gloves.dm | 7 ++++++- .../code/modules/client/loadout/suit.dm | 11 +++++++++++ tgstation.dme | 1 + 10 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 hyperstation/code/modules/clothing/gloves.dm diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index b5ec7e12..92d5b25a 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -129,6 +129,9 @@ /obj/item/clothing/under/syndicate/tacticool/skirt = 3, /obj/item/clothing/mask/balaclava = 3, /obj/item/clothing/head/ushanka = 3, + /obj/item/clothing/suit/gcvest = 2, + /obj/item/clothing/suit/gcvest/alt = 2, + /obj/item/clothing/gloves/guncaster = 4, /obj/item/clothing/under/soviet = 3, /obj/item/storage/belt/fannypack/black = 3, /obj/item/clothing/suit/jacket/letterman_syndie = 5, diff --git a/hyperstation/code/modules/clothing/gloves.dm b/hyperstation/code/modules/clothing/gloves.dm new file mode 100644 index 00000000..c3ecb21f --- /dev/null +++ b/hyperstation/code/modules/clothing/gloves.dm @@ -0,0 +1,13 @@ +/obj/item/clothing/gloves/guncaster + name = "fingerless leather gloves" + desc = "Sturdy leather gloves with no fingertips, buckled at the wrist." + icon_state = "guncaster" + item_state = "guncaster" + icon = 'hyperstation/icons/obj/clothing/gloves.dmi' + alternate_worn_icon = 'hyperstation/icons/mobs/gloves.dmi' + item_color = null //So they don't wash. + transfer_prints = TRUE + strip_delay = 40 + equip_delay_other = 20 + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT \ No newline at end of file diff --git a/hyperstation/code/modules/clothing/suits/misc.dm b/hyperstation/code/modules/clothing/suits/misc.dm index 63b16e84..9fe5af86 100644 --- a/hyperstation/code/modules/clothing/suits/misc.dm +++ b/hyperstation/code/modules/clothing/suits/misc.dm @@ -7,3 +7,18 @@ icon = 'hyperstation/icons/obj/clothing/suits.dmi' alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION + +/obj/item/clothing/suit/gcvest + name = "Guncaster's Vest" + desc = "An open leather vest with battlescarred metal shoulderpads, perfect for hunting interdimensional wazards. Smells of gunpowder and plasma." + icon_state = "guncaster" + item_state = "guncaster" + icon = 'hyperstation/icons/obj/clothing/suits.dmi' + alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi' + mutantrace_variation = NO_MUTANTRACE_VARIATION + +/obj/item/clothing/suit/gcvest/alt + name = "Hellraider's Vest" + desc = "An open leather vest with battlescarred metal shoulderpads, discovered in a dimensional anomaly. Smells of gunpowder and plasma." + icon_state = "guncaster_alt" + item_state = "guncaster_alt" \ No newline at end of file diff --git a/hyperstation/icons/mobs/gloves.dmi b/hyperstation/icons/mobs/gloves.dmi index 4ac51a780cc22175a47a04af753e2d89b377b22a..70fa72dc875610417c849302367043b18503ba06 100644 GIT binary patch delta 445 zcmeBR*~OyT8Q|y6%O%Cdz`(%k>ERLtq#J-ZfrA-HK3dXM4Ww))s%q$lxLJ1=#g`@p zMS9tpt1;*+GKAVN6bCS5pMNC^RKr*je#rg*vEIi69|{EY zbw_@=7yHBMliQcHlH`WUoT}a{l&ESN!}TY{S&S_pPQ`h>#*|g^0sZF{n1skrX-%XWdu5ap<(@! z*K?zpp8r}G^uOTk@7HC^eWvAaxb`N5*|k>d?Kg>nRgB_!-z?V!+2P0AuY)h?`4}Z l0(hpBs%ko?=`%3=k&D9z|`RQ4Z0iLdYF6*2UngH~UwATOt delta 395 zcmV;60d)Sl1c(GBiBL{Q4GJ0x0000DNk~Le0001B0001B1Oos701&on3jhEBCy^y6 z7{I{5+;>*D00001bW%=J06^y0W&i*HZ;^Ure{m^PR&e!m0oxA%oYW>JCL>a;0003L zNkl+uLYB!kA(loI*K)*{2eNLlwajg`&3>jQI~-3+O0g<$i;m5 z4E1;ti9{N!v-XwqR&UNAEa`tyQBB9X?XLFJ_wu%zz_8@PQHXw3)6lCf*d2d%v51dREh pl^0!V%?D;)bhfbO14@H`*9!xZH1miXE>Qpg002ovPDHLkV1o42p?LrR diff --git a/hyperstation/icons/mobs/suits.dmi b/hyperstation/icons/mobs/suits.dmi index 16b97a02cb89ccb825694047b1649f79dfa4748f..1fee3289f9da63bb6d6f8ce9d167092c39020ff8 100644 GIT binary patch delta 2641 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 delta 2058 zcmYk7dpy$%AIG+{$5_4-b4xu=_p+RTQlK_HM= zX@1!@p~tOG?dx zK-9~;JxC{#O6Dk6>BWu+&wb`?)DliBN6+Hu^hn#t-r{@1tE=3BjLg)n-k72Dz0-po zhiC`w65F3mV3D5Cb**Y3`eT=)aheBa%na%w4e}Io!Sf+wQZ(RoX~!)g+$wJTGF?p8^8nFL<>K8FmD1j4Gm3X-dV;-hU#cxS)Go=WPW&Hmq0J zmNIzo9jHAhN+SPjc!pRju`1cD-hNBAGgf z9Ya?|4l|p5WLz9Hqm;%Kjhto_O02<_h|NiH z#!L3qE*JYWqY`*6Vedu8M}UolXDkMz)5K=x0G&5{JK0TBZgyngR~wuO`bx;xcp)q6 zuryL2nnQ1H&R_Z>q&z=@1KZEZ4?y&IV2YKa30nMzp*g_})4k+`F~iX3oP_YcKqybW zjKAFhjL89AP368)+|QGsb#JxP&+oSjTukW`ZLprB{jdEKfR2Lhga)Tm8;WL2Ac?PZ zlbkAGW6c^j0(99EnPtK+VFCD#f`PEW4d#S}QEO)af4{Cb2(Wc`+ru_ct5!eQJD-dif~=^%P)h(5SgZAH*I><5B^!h{*CFx~eW5 z>Mx$Hb^E)*?92GLk`QT8TT=u%BQq>X`mj9HR&0}2?%+V2KxyUgzw(|Z(Y9beERfMW zqPWvP+AsLG`DAwKz`tqfW`YJ&WVvVhW38Al`3AQ@_UlpbZxvrd`BOKM;N-LhzW?lk z85G=`5l&AWlzB!?0(Vi{M0u&6Ce?TRL_uir2*ZJ z2vi9XR0viNTFUR8Mw!nXa6}n<{dgZ7S@MZXo zM<<%QcIUaqX+NIW8S@Lli#;eChE=Oj+g_lL_ri(<;nFGnp;xkjQvWFMjzJo4%a=|b zq|}xSf0StvO)O`ZD#pLUERi=mo0yQ_8k2Kh`_{B^>}nMJ8tuGecIYy}3(&Mt23_^B zctmJRFft5dveCYn@j|!={c|v3EUkrak4})FZuXk`Ei1TIBQNs;sDIg(D;N%f^sU9v{E?uus(8dAsd# zqeylLv5!=zABwFIC;IHv2|{*OdQ^o&^!hmHKD$vfP-{k6GSu|fS#S0^^m&q99UAk1 z>@UowF~ck~hCe7&_4{Ry zg|=kTo2*^?0WTH-7}#LgFB`Hpd>}s4rmy^@>6jKoh+(gKDJ>WzGzLE?$v zjfAH8U}9M6$v&y-PWQ(Z)k|i@Y%K`}_juA1w~_+Q8QGL#8L<+rVAbU&IJ`*eAoZeL zsI$JTKA9S@u36-uj$x_!pv->%T*;c5bx1Th3$m<9d}Y8L#D^=03py(dEDdl^c-}qw9{3#{>AJABbQodMSZ(3PqQ^_aVr}I|@ a&jo4u{j{7WO!C@Khj@GXd2rmR>Hh_carF2A diff --git a/hyperstation/icons/obj/clothing/gloves.dmi b/hyperstation/icons/obj/clothing/gloves.dmi index 652a7a561fb45fec4ce4b5f37aea5a5b29338b4b..6f425bd06e553cb253f9dc74b118a1e92f36f089 100644 GIT binary patch delta 739 zcmV<90v!GI1O5h(7Y;xO0{{R3owtGP0002YktH;Lz`(#aCIDGVK2%0KiE>|cVp2#l z0CGTB zYDoZKLjW@*0A4`=b5Hr%on z5QVceq_%)gNh>0#G>BqB#e4CJ`u^|aZdw$D+SD0mbf)J=A^G;4-H;B9mHMLs_?}lP z-#`lhES{ZEK~<|+2|(hUi;M)#ZQEX3odAv&MSlouMZ!DJNI))JffXFjz?Tyic-6L- z6Mze%wR!`atVsC8S0&K#gr2b>1Rmq-1Yfwl?8gS6k11+`N(ynpwFXv*c?Hf{gge3! z^&0Ia6}Vii$mO^aj{c2AdQRcsU4kjEALZ|YjHQdi9F6= z1Akjs*Z|vro)<6CaX%X5a6KZ_@%;jKUVv{64GU%*SDGh?SzMRl)0E?$MI2A3p9xre zQSvyIq?=j)19`kusZynWM_#k}L#OmS?e~M9B}iXNPy7AmrdQbRNk0gDnfO~{aw^fXS;xZcdth#DT6>Jet%S`%>DiS#52I(A@vVb|G;#H!=XA#yLM$X z8k0Rd9*#~<4Fe`>c&5$=GYPdyY?WA?pp^B zkEVXcqRB*!cVac2K4HM@`Gv)!)+{piQ^a`dl||hyHI2v_#ScaNWSBonmHL-@0~B{l VDbWf4Sg-&9002ovPDHLkV1jxUH4gv) delta 344 zcmV-e0jK`{2K57w7Y-l@0{{R3l|zoU0000mktH-01DwVA00001bW%=J06^y0W&i*H zZ<7iEWPe-=l@(n5T)_4N0Gr7sAc-VoPXGV__(?=TR7i>Kl+l)hAPhtuiD5x)|Nn10 ziMVU4h<)oh+dQb@j*~<fQ5)?#ld-u@#ok9$-^u( z960>)iUYZ3r9wD^>>W0Ih;i=#QKREDv&ezN6MsK)u<_J;oK-o-YX>hp?%!tt_?SAX zN#5dy$C(OU73}jJo;2w++UlZUx>YneGfn=Dw9KiAdx@)jVv-7g_|5RDX!4tY3x(Tu z^En5}WhYv^!<{7p3$P5lUv6T`e+3%cTg1fkg}e%QYOGmY>B~ quO$oE9+Vb0Nm;D@2U`3a|2-ZTVhvkxH8ctU0000sc#&@r9smUf4=pc}C@lBJ zMppm;00DGTPE!Ct=GbNc0054Wn`eKfm*yoW7MG+J#V6*J5U-k`%AC^Nq|~CU#N=#T zN|hB{{anD_0{|x&Lr3|W$G`vp0hUQbK~z|U?Umbdf-n$<0||nP31ZSn)LQHL@cz%& zU8KF*RR=EY1%Dtglleb(m%s|q>t8AA>IZeQ$8p?^5ThOvq*5>|B_9Cdh|PZ_Nu&Y< zoH9umzyOZ{ok^0WnUX^oDoay>fPm2eHHxVqvMd`b34W=@aLZiN zK(T=Oo62)81p)g2^vK^3IKY2vit>(xDC!si5<2}^kkHBAt5>i0OB(~TF}j^SNwfh3 zoSN+aLKM?!ai2&(^nasuIn##j|H8VWn0`!)!dVJ{{T~1`tqtA(y?1kOVa%QPbP@>A z2%r|LuyD@$rMJ#4LPY}f3JGRK7P0yaZtd-t^=lVCTL8qS3T|PS76M?YHgpOIn6UsM z!gufs4>Pm=9I)L%1iLK{C~H8;0`>>L^M`$V!0~imo=-;>a4G8|mKP3iy@g%49UTV{ m%|2k)uK{&s*L(GPpMC(hs~UHz5yCG300002UNc@fhfGkJlJOfAWt zkGt1ZCQESYrGozSR*;+FBsgEFr_1@BAXz2waJ_Z6>#!p58n#;)@7(i!KvOV%Qz=<3 zxRI4{CI2*7f+)Y?Q=!58!V1(-^k-2+QT)rlc>tcb3Adge{{R30002ovPDHLkV1g#e Bt+fCE diff --git a/modular_citadel/code/modules/client/loadout/gloves.dm b/modular_citadel/code/modules/client/loadout/gloves.dm index 7d0f0543..c02b298b 100644 --- a/modular_citadel/code/modules/client/loadout/gloves.dm +++ b/modular_citadel/code/modules/client/loadout/gloves.dm @@ -3,6 +3,11 @@ category = SLOT_GLOVES path = /obj/item/clothing/gloves/fingerless +/datum/gear/gcgloves + name = "Fingerless Leather Gloves" + category = SLOT_GLOVES + path = /obj/item/clothing/gloves/guncaster + /datum/gear/goldring name = "A gold ring" category = SLOT_GLOVES @@ -19,4 +24,4 @@ name = "A diamond ring" category = SLOT_GLOVES path = /obj/item/clothing/gloves/ring/diamond - cost = 4 + cost = 4 \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index b43dd4c0..bf0fc556 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -120,6 +120,17 @@ path = /obj/item/clothing/suit/flakjack cost = 2 +/datum/gear/gcvest + name = "Guncaster's Vest" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/gcvest + +/datum/gear/gcvestalt + name = "Hellraider's Vest" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/gcvest/alt + + /datum/gear/trekds9_coat name = "DS9 Overcoat (use uniform)" category = SLOT_WEAR_SUIT diff --git a/tgstation.dme b/tgstation.dme index 382ade0f..652cffdd 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3066,6 +3066,7 @@ #include "hyperstation\code\modules\cargo\sweatshop\wooden.dm" #include "hyperstation\code\modules\client\loadout\glasses.dm" #include "hyperstation\code\modules\client\loadout\tablet.dm" +#include "hyperstation\code\modules\clothing\gloves.dm" #include "hyperstation\code\modules\clothing\head.dm" #include "hyperstation\code\modules\clothing\glasses\polychromic_glasses.dm" #include "hyperstation\code\modules\clothing\spacesuits\hardsuit.dm"