From 5830a7952c63aed138cce041f8126b2c7c08f87b Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sun, 17 May 2020 16:14:24 -0700 Subject: [PATCH] Custom RIGs function properly. --- code/game/objects/items/paintkit.dm | 20 ++++++++++++-------- icons/mob/custom_items_rig_boots.dmi | Bin 182 -> 718 bytes icons/mob/custom_items_rig_gloves.dmi | Bin 182 -> 663 bytes icons/mob/custom_items_rig_helmet.dmi | Bin 182 -> 1457 bytes icons/mob/custom_items_rig_suit.dmi | Bin 182 -> 871 bytes icons/obj/custom_items_obj.dmi | Bin 0 -> 395 bytes 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm index a0bebc699f..f3bd0c1d3a 100644 --- a/code/game/objects/items/paintkit.dm +++ b/code/game/objects/items/paintkit.dm @@ -157,6 +157,7 @@ /obj/item/device/kit/suit/rig/customize(var/obj/item/I, var/mob/user) var/obj/item/weapon/rig/RIG = I RIG.suit_state = new_icon + RIG.item_state = new_icon RIG.suit_type = "customized [initial(RIG.suit_type)]" RIG.name = "[new_name]" RIG.desc = new_desc @@ -170,17 +171,17 @@ piece.desc = "It seems to be part of a [RIG.name]." piece.icon_state = "[RIG.suit_state]" if(istype(piece, /obj/item/clothing/shoes)) - icon = 'icons/mob/custom_items_rig_boots.dmi' - icon_override = 'icons/mob/custom_items_rig_boots.dmi' + piece.icon = 'icons/mob/custom_items_rig_boots.dmi' + piece.icon_override = 'icons/mob/custom_items_rig_boots.dmi' if(istype(piece, /obj/item/clothing/suit)) - icon = 'icons/mob/custom_items_rig_suit.dmi' - icon_override = 'icons/mob/custom_items_rig_suit.dmi' + piece.icon = 'icons/mob/custom_items_rig_suit.dmi' + piece.icon_override = 'icons/mob/custom_items_rig_suit.dmi' if(istype(piece, /obj/item/clothing/head)) - icon = 'icons/mob/custom_items_rig_helmet.dmi' - icon_override = 'icons/mob/custom_items_rig_helmet.dmi' + piece.icon = 'icons/mob/custom_items_rig_helmet.dmi' + piece.icon_override = 'icons/mob/custom_items_rig_helmet.dmi' if(istype(piece, /obj/item/clothing/gloves)) - icon = 'icons/mob/custom_items_rig_gloves.dmi' - icon_override = 'icons/mob/custom_items_rig_gloves.dmi' + piece.icon = 'icons/mob/custom_items_rig_gloves.dmi' + piece.icon_override = 'icons/mob/custom_items_rig_gloves.dmi' if(RIG.helmet && istype(RIG.helmet, /obj/item/clothing/head/helmet) && new_light_overlay) var/obj/item/clothing/head/helmet/H = RIG.helmet H.light_overlay = new_light_overlay @@ -196,6 +197,9 @@ return return ..() +/obj/item/device/kit/suit/rig/debug/Initialize() + set_info("debug suit", "This is a test", "debug", CUSTOM_ITEM_OBJ, CUSTOM_ITEM_MOB) + /obj/item/device/kit/paint name = "mecha customisation kit" desc = "A kit containing all the needed tools and parts to repaint a mech." diff --git a/icons/mob/custom_items_rig_boots.dmi b/icons/mob/custom_items_rig_boots.dmi index cf74d73796c8c6121c0818fdac74e4a7f0ab9a5f..1d06e3033950d3bf8dcf118338a7b27a9616581a 100644 GIT binary patch delta 680 zcmdnSc#c)IGr-TCmrII^fq{Y7)59eQNGE_W2OE%lG^5-CNHt7!G_DWW5Ncrd=+POE zvp(lF8VkC-g}j4Ab3~_1*))(AEAa1X zy{Y{By~j?m&1Ob+9FTo)yI9%YHnDOT)zy!XD;@xp?0tw*nFZHaAf z{%4pPnf1#e{9Vx9ThWrqY(eziZADd6zXSe?T@?F1LUWu%*+kH*F zWF7wsqmSQRmwkQzu;^!LQB<=ut3m6!mO8c(^vKTyF{an^LB{Ts56(l4C diff --git a/icons/mob/custom_items_rig_gloves.dmi b/icons/mob/custom_items_rig_gloves.dmi index cf74d73796c8c6121c0818fdac74e4a7f0ab9a5f..be4669fad9f92c47eff0758c75e9e49266f45ecc 100644 GIT binary patch delta 625 zcmdnSIGt6sGr-TCmrII^fq{Y7)59eQNGE_W2OE%lG^5-CNHt7!G_DWW5Ncrd=+POE zvp(lF8VkC-g}j4Ab3~_1*JAnz z4hk;N3=1pxS{zvL@#_;NhV3&AG!E%)UC+S4c*)bnF{EP7+uI9^ZaavyK771PL8HX@ z5qImMB?5{cYa0!e&uUooPplUdER{Rr;S-W^Tw%>wZkD_W)-#WVsz#PwdG>!r`TM(5 za~4;t0Nn}&^Vft)ui2V-A}Tv~#Z|tj-7Wv_FOz@$3?(m^gpluziYv{)``{D7~*CD%a!km%|LNHYz`?<-6*4x#XM8fq7faES?{lQqxeJ zcVXVepAFxQKOdXHKR^F%SQ!oN2!__}t^k{AjK?pmWYp-u|i2 z$y}jn)BHX1CVPH=dzO7pvR&PpH(HnPzFs_U((j{Bgy&7FzPr~>YqwPW{d+YBgq}a% zecCTpBXynlH2)ugUaLQvR@XD$`+fD_!|+hk6*bPGp{q5zQhFwSuRApHm#OdOTlRmP w({H^k6EFV$X7%6K`>wnBUOrP74|dBx{d}c7E`H@L$F73-p00i_>zopr0AI`=fB*mh delta 140 zcmbQvx{cAXGr-TCmrII^fq{Y7)59eQNGpIaBQucn-11^OkYWz-32_C|%d2c}0V&3k zAirP+hi5m^KuRX68apu*_4MwrFb*=lZ0w~Vlgb)yFTR0|;p1)oT<_X@)<9J}o-U3d f95a&>B<=ut3m6!mO8c(^vKTyF{an^LB{Ts5_W>i# diff --git a/icons/mob/custom_items_rig_helmet.dmi b/icons/mob/custom_items_rig_helmet.dmi index cf74d73796c8c6121c0818fdac74e4a7f0ab9a5f..d0121b7dfb9b07bca473c8e076645ad8650e38a9 100644 GIT binary patch delta 1425 zcmV;C1#bGb0kI1uiBL{Q4GJ0x0000DNk~Le0001B0001B2nGNE0OFW;H~;_ufRRBn ze^9VhFgD`i%t*~l&nSU#ic1npQWb0!l$5wQQ!Jp@xj55`5_3}_Y`B7y)TGjM zgens}s^W`N6LV5ia4A++aP@OhaPjrz0syy}Fet(X$m%%P4b+P54>Jp$pe^JAovIL#fr9*(GW2XXHnju3Ldup?Is$n2N zflgYYX0evK2^?Q$0X%1MJIB|-KALhBSd@8+<-89tXi)^-k#{`Oz|hfG)?LE`_N-xo2DtTfA54C z@u#K(!pUWsBg-5;)&{m&<_3<78Go2@<4@HTWUbAAcaniS-iGf*Bx)O+%K+%H#`g9$ zSC0lj*k9Jv+yOzFrdVr}lRs&iPAtB286D|x@A5hw>EK+(xbdf|15O*=u}6PkOdWs+ z|J)wn;vUynoWSQ z;!jlv02pKZPwsbm9Ctv2Hb0s#aL!HSH8gZWQS8n?SBx=!l`X&8*z&7vd1K5({}8Lv z)b?2MqEBMvE2WfDN-3q3Qc5YMlu}A5rIb=?%8Zpw@U{fh38jZ8z`>BOf4sGJBAI?7 z;#;;wM>>SiU3E9S|=5 z_IJO~@At_vN4;(Um|d9V-lO$sop3`WNscalh!5bh3{$T&yD-ZSkJf83JE2$~koKVe zabbIyoLlC8i}8WH4aN9ttW`b$!n7OC zcfLEv^X7|u8`=Wprs9zg6cJy{0(LH=Ua#}?>C>TE$uT;B;*%#itOr+d)yN%StxfjLz87;7IG%Ev&84xcLrNKPNt?|j zj4}CVk7sj#(>v>;ybXoXZ})cK+VOt7x5G!wja8p8@<=JBg@=52k(>D(>|DmR?%@dd z)5J;oUEIUtVXrB9e@tWQSi4ICe07wwA1hToMtwr5gNLPoiyYn&ce)P;a`vl!5VmRO zu^Y5`+`J2bwY&K-A)tqvb1q8Cde!v_XTC_GQ$%iZr~5Fph;MtJR@wopjV({_@b|~f zyZME8&Lzf}1jwJ!dyy`F5ITVd(Bn*ZTxA!@7~{i~6yt#`eoW7h{%l^;KD{9*g2u|8p}`ha)6 ze*ZN$y#q)k^$Dd$ zN{sdMM|Dx_6G}JqU9O*h5$hAqM_Tn6OnZI8)OSGezSSq3OIn|xlu}A5rIb=iDW#NB fN-3q3QUm@29%Y400000NkvXXu0mjfkJrAZ delta 140 zcmdnUy^YbaGr-TCmrII^fq{Y7)59eQNGpIaBQucn-11^OkYWz-32_C|%d2c}0V&3k zAirP+hi5m^KuRX68apu*_4MwrFb*=lZ0w~Vlgb)yFTR0|;p1)oT<_X@)<9J}o-U3d f95a&>B<=ut3m6!mO8c(^vKTyF{an^LB{Ts52#O=^ diff --git a/icons/mob/custom_items_rig_suit.dmi b/icons/mob/custom_items_rig_suit.dmi index cf74d73796c8c6121c0818fdac74e4a7f0ab9a5f..0f836f31745282f98fa08cf100747f0190496b28 100644 GIT binary patch delta 821 zcmV-51Iqli0p|u>iBL{Q4GJ0x0000DNk~Le0001B0001B1Oos701&on3jhEB9#BkF zMF0Q*B_$&7bYCvR13)uVYQN!hb zX0u>lGXM1W40hx)sdmK%=-N8Fr=s$Qit66?hpb^Uzg)8cbXlG39XqUb$qdN=BH%(B z_LnME%(I4Yy))-J#T5TklvR=yprY>~<%LpL%?IXy^Uw4R3qF814yZvJM>0|1g|Une zVBI4(d@+771YXQ2FJj&?$PMV)p*`?_qIQfA!LZ|o9WkW52vO`W@Fg{T#P^%$O{Tnf z8UvJ}2B$QcA>l=cv$#%b@S*YH*|7S_3t|ZC=h-BaVzZ#(rm3`YLd??;>{dLY-6JCTb%ha%@4w>$YeQFraO-WwF>;H}$zOx5^B6y)x zmp-7DtKZ}WpdQ2S6jS_RjMWEei27iJ7c&2k@IurFkr(X27{&`(A4FbksbR)=A?t(4 z3qAwmg{%)EFOX$E%8MiQLFC2kW-z?iQeMRTZ~LC+f9QN?J`ILfuC;VYD|oCMn*YzN zjR{FeCohU8c`p>AZ(w8ic$+`hyY`+nP=d$P#W93qW^#hW9UyN31LIR^ R|8+nXgQu&X%Q~loCICZSAF==d diff --git a/icons/obj/custom_items_obj.dmi b/icons/obj/custom_items_obj.dmi index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0e8e9a0125860d7da5a989b3dcbb2158391d228e 100644 GIT binary patch literal 395 zcmV;60d)R}P)QE!*WBQ0z>l!Ka p&NS|5w!{;X42*(6fJc4=0stU=B3eDfz-#~j002ovPDHLkV1f*%m?Z!J literal 0 HcmV?d00001