From c7cf49ec6fbe2cc55c58fcf280a1a6bfa28e9caf Mon Sep 17 00:00:00 2001 From: Michiyamenotehifunana <31995558+Michiyamenotehifunana@users.noreply.github.com> Date: Mon, 23 Oct 2017 18:11:16 +0800 Subject: [PATCH] Revamps the recolor system of the Mk.37, gives variants appropriate firing pins, and adds a minor outline to the Model D sprite Mk.37P now has the Judge Dredd pin, S now has loyalty pins. P's description updated with a warning. Model D has slightly tweaked sprites. Recolor menu for Mk.37P is now less spammy. --- code/citadel/cit_guns.dm | 78 +++++++++++++++++++++++------------- icons/obj/guns/cit_guns.dmi | Bin 42302 -> 42315 bytes 2 files changed, 51 insertions(+), 27 deletions(-) diff --git a/code/citadel/cit_guns.dm b/code/citadel/cit_guns.dm index db529b84af..dec74ed999 100644 --- a/code/citadel/cit_guns.dm +++ b/code/citadel/cit_guns.dm @@ -922,13 +922,17 @@ obj/item/projectile/bullet/c10mm/soporific /obj/item/gun/ballistic/automatic/pistol/p37 name = "\improper CX Mk.37P" - desc = "A modern reimagining of an old legendary gun, the Mk.37 is a handgun with a toggle-locking mechanism manufactured by CX Armories. This model is coated with a special polychromic material. Uses 9mm bullets loaded into proprietary magazines." + desc = "A modern reimagining of an old legendary gun, the Mk.37 is a handgun with a toggle-locking mechanism manufactured by CX Armories. \ + This model is coated with a special polychromic material. \ + Has a small warning on the receiver that boldly states 'WARNING: WILL DETONATE UPON UNAUTHORIZED USE'. \ + Uses 9mm bullets loaded into proprietary magazines." icon = 'icons/obj/guns/cit_guns.dmi' icon_state = "p37" w_class = WEIGHT_CLASS_NORMAL spawnwithmagazine = FALSE mag_type = /obj/item/ammo_box/magazine/m9mm/p37 can_suppress = FALSE + pin = /obj/item/device/firing_pin/dna/dredd //goes boom if whoever isn't DNA locked to it tries to use it actions_types = list(/datum/action/item_action/pick_color) var/frame_color = "#808080" //RGB @@ -997,41 +1001,60 @@ obj/item/projectile/bullet/c10mm/soporific /obj/item/gun/ballistic/automatic/pistol/p37/ui_action_click(mob/user, var/datum/action/A) if(istype(A, /datum/action/item_action/pick_color)) - if(alert("Are you sure you want to repaint your gun?", "Confirm Repaint", "Yes", "No") == "Yes") //so you don't need to carefully click 8 times if you accidentally click on this + var/choice = input(user,"Mk.37P polychrome options", "Gun Recolor") in list("Frame Color","Receiver Color","Body Color", + "Barrel Color", "Barrel Tip Color", "Grip Light Color", + "Light Color", "Arm Color", "*CANCEL*") - var/frame_color_input = input(usr,"Choose Frame Color") as color|null - if(frame_color_input) - frame_color = sanitize_hexcolor(frame_color_input, desired_format=6, include_crunch=1) + switch(choice) - var/receiver_color_input = input(usr,"Choose Receiver Color") as color|null - if(receiver_color_input) - receiver_color = sanitize_hexcolor(receiver_color_input, desired_format=6, include_crunch=1) + if("Frame Color") + var/frame_color_input = input(usr,"Choose Frame Color") as color|null + if(frame_color_input) + frame_color = sanitize_hexcolor(frame_color_input, desired_format=6, include_crunch=1) + update_icon() - var/body_color_input = input(usr,"Choose Body Color") as color|null - if(body_color_input) - body_color = sanitize_hexcolor(body_color_input, desired_format=6, include_crunch=1) + if("Receiver Color") + var/receiver_color_input = input(usr,"Choose Receiver Color") as color|null + if(receiver_color_input) + receiver_color = sanitize_hexcolor(receiver_color_input, desired_format=6, include_crunch=1) + update_icon() - var/barrel_color_input = input(usr,"Choose Barrel Color") as color|null - if(barrel_color_input) - barrel_color = sanitize_hexcolor(barrel_color_input, desired_format=6, include_crunch=1) + if("Body Color") + var/body_color_input = input(usr,"Choose Body Color") as color|null + if(body_color_input) + body_color = sanitize_hexcolor(body_color_input, desired_format=6, include_crunch=1) + update_icon() - var/tip_color_input = input(usr,"Choose Barrel Tip Color") as color|null - if(tip_color_input) - tip_color = sanitize_hexcolor(tip_color_input, desired_format=6, include_crunch=1) + if("Barrel Color") + var/barrel_color_input = input(usr,"Choose Barrel Color") as color|null + if(barrel_color_input) + barrel_color = sanitize_hexcolor(barrel_color_input, desired_format=6, include_crunch=1) + update_icon() - var/grip_color_input = input(usr,"Choose Grip Light Color") as color|null - if(grip_color_input) - grip_color = sanitize_hexcolor(grip_color_input, desired_format=6, include_crunch=1) + if("Barrel Tip Color") + var/tip_color_input = input(usr,"Choose Barrel Tip Color") as color|null + if(tip_color_input) + tip_color = sanitize_hexcolor(tip_color_input, desired_format=6, include_crunch=1) + update_icon() - var/energy_color_input = input(usr,"Choose Light Color") as color|null - if(energy_color_input) - energy_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1) + if("Grip Light Color") + var/grip_color_input = input(usr,"Choose Grip Light Color") as color|null + if(grip_color_input) + grip_color = sanitize_hexcolor(grip_color_input, desired_format=6, include_crunch=1) + update_icon() - var/arm_color_input = input(usr,"Choose Arm Color") as color|null - if(arm_color_input) - arm_color = sanitize_hexcolor(arm_color_input, desired_format=6, include_crunch=1) + if("Light Color") + var/energy_color_input = input(usr,"Choose Light Color") as color|null + if(energy_color_input) + energy_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1) + update_icon() + + if("Arm Color") + var/arm_color_input = input(usr,"Choose Arm Color") as color|null + if(arm_color_input) + arm_color = sanitize_hexcolor(arm_color_input, desired_format=6, include_crunch=1) + update_icon() - update_icon() else ..() @@ -1110,6 +1133,7 @@ obj/item/projectile/bullet/c10mm/soporific name = "\improper CX Mk.37S" desc = "A modern reimagining of an old legendary gun, the Mk.37 is a handgun with a toggle-locking mechanism manufactured by CX Armories. Uses 9mm bullets loaded into proprietary magazines." spawnwithmagazine = FALSE + pin = /obj/item/device/firing_pin/implant/mindshield actions_types = list() //so you can't recolor it frame_color = "#808080" //RGB diff --git a/icons/obj/guns/cit_guns.dmi b/icons/obj/guns/cit_guns.dmi index c70692538337ceb3fcedd68388b49b6e82725774..69d8f3781036493e2e76f1866a591be09c84c7b7 100644 GIT binary patch delta 2145 zcmaJ+&QLDHFf-=!{_&mfJLfy+`v1moNEY!uZ}P{KfpAOYaqozPgxrl5LGKbV zBxk<)$CZ2%W2dt5*~}2V#uLl;+8yOF+s_^O2MU1oGwZSs3W|ArLoU@x&b`lc*;M_K zGbvlC>XJ1ehWD~jqT~H@Lj{Qr&_KD_(fg^>{u`*kGcp-wnEj0l3uv9Fo+*N(!5PY` zsupT80)Q0ZmekXsb{c3mvQ{^1X{iCxT3(*YHSFF)c|Qr>!fqK>R>7TJ+NJpXyL>y| zPK9Z=0VzM<43?AF!JszKDP4b~t-WG5GQ=hBeHu>E`t7K=sE&e{lT-5jWBQ)sd%8Dh zC#6NuJ$Z9NVsn3#GT@UX3{vk+|o=|5;+eaaBLA_Blm_=Y)Wuk7+ zp5}hl!OD$bR$Nb(;wuWc)%sAJI#@ft{^&%x*>{ie5&mB5TB}rh*RSUNV0!Mt!iR}y~WzSY#m?TvUKfI=4otZ=b$fW+N3B7vXz5uizlOPU$_ z`jczKf5XV}&Kyy#)-9z>9Jv2aZB-o#$17}kjHhm8TcYJ2|vd;oP;W;t~>HR9dH}XYkL{Kb`S? zDa+p)sSwfMOb_!Tg;C~xZ*`ZqRHO>1{vn0owel=XE=@#0^W(Q}6e zz7nE<0$olymBLfs(sbVMwD)B4!$f9{G_Xz>;<}qFm1&C#(~ae+X4Rt(Mg{2ge53!# zZgmev)>k8*Ck_U_cx)|y*IFI~wnfPWeBNOaDFoKyP@lfiP4v@^TtMQ5JAIko=&(f- z2-X3GXi6M(GjC{U*snJ-Bm_}5Fn<@5%}phc^5YGJAvuq(#zXRQ($hteFi7xlEpWel zFlpDO)dz^ckOb~qgNQ%mFb4B#oAA}$v9_Mf$JNcanfpb(6x37ER+Z83?e8uB* zT(M$+Dtc-1vWG{yJtkmWs<0R1iZ#h3;EHd83uX8=hm{@Q39k<`I@S^<{S$oV4nYuq z7#e}?kVxb#b6rm!27_s*fiEJF{sJc3J3PD6@3GOzNG_K=d&94E<`86H&BwhhX*uy*_h7Hr z>BAzGWkQzL8KeHI~&SPvCyPo{9;JKB%qVA7ui87?LJGVz!E=fQFzBP$2Hp^7%a^PsBx9?s@*7mDjtcfU#v|eRE4VyB>Hn}pdXgUPQl84 z_yRR78IG^X;O~lUYYMOkWtkO69scB8bH(S_zBkI;#PI{jssMN7kH2 G-~AUHtSE>8 delta 2132 zcmaJ>c{J1u8~%~fCCd=vj%1REEFsFCktO>jTbK~(T0UHjt@+71qpL)=t}RR`+ejtL zpkQ%H4YCO_UE;UO210(n_8R`riu4Me~d&Y6FD5a39i(t zi8g}schan1aljYevSBT?ma_8!++r)t>Z)neyH$Rs0HX3*?;o0rJVWxJ1b+KAofp&> zv>v|`ozTT^7fM0mnRl1HWW`Qmm%Ws?J#3%h+)C>h4?=>l2d%B%hil56W22tsN7biz z)CG<|@vz0Z0V!`si=uxFb49(Ln1*n0UPCzE-MivTMQXdhe!n~&14iEYpfC3D@w_jH z>Wd#kaTgeeOPw7Yj^z`3X{>pIhGB595v-{v+3#ZJ@xay3#eW{MNiUF!ynelxkn?Lq zGdTRv;9$musg5{}$gUWxtxt5B$pE}o5@RbHmlo8@j%;r6eVwBeQS>t}(=wmV2^t@u zT2(u0n;|dbf6Rj3G_x)b+ppBHYi6`KnW}({AtgG2{WRC95Q*F6bNQ@CMy?cfmQ5$; z^Kj*2$3?iBLLMjR)p~}Avd0wZWwLx8fBvZkTT9=(XSUN~N!tmf zT4p)?ZG2Rp{)m#aPOKFf2@MJP%;x4i2T~{uVL(U_6aXw@V`KZuTDP|C0fGzLg z?`#(CLaVtp*aF^It@FY-*h3n8fgWIjQ-itdiYUG`RDK5IZl5-}VsO(EAjNo--rbSI zC9xx~E3oGBDx7NX6Kix03^EWp2OY!Ao`Y%* zk!UBBX4!D%l~i?gH523{|8QkE=i1fg(A1BT(_Ve)lK`0=jnG?@e+A$H2bN*Q9B=A% zTVkdG!hZ?wJ{>Nn!~7~8ld^g%RW3=6kc_0(j)mzP8V1G0{1p7Euq*|%EVEQO8{Z5F zthKpLVe%Es<1uyKy64W1F^<5PblrMSp{@CO5n8BM(3{fgd=KlO~}tWy)HwC}-W_;B#r@dEq#NpR-~W}@A;jgUbJ z$dMt5v}GUzooQyP%d=S{w@e9EJq>na`fmeqsafFgdZVOGdL7?-(@LU~19wlzo)OqL zEgj3lViSQQ>~z5-o{uM#~na5Q^pM{=b5+?z|g$zgv- ziT5S5sZrTyiHHcr!zYqnkADEo`=2*yR8ePTOStVV3sIV9VLlVG?!BB1KbJEl@G~Xp zBF`IM>IL!FM+`~GwQw2{}l?1{?2S?EH5e^5@ z)6*06KgQC~HrGSOio;-r8rv$GdeYL;wyOD4Em!y5xN(Eov^&?j=3d;>#cGc8gP=pA zQk5DSeM_ySAg3WO80nj8!g<0q`AYmDq~}lPLI`N8DlF!&JbKEe1Z8H%XCr}2;y)tp zEzGlc%mDpzWyCxMo&lcP{N3W7SzOzyQt43hYBH>fS{IyEi9w?WI`aH8;d?RBlClS( zy@IMRSd4{T^S;N|Y~vCI;P3*BF#-mI3I8t-h!*da3TXa+;z3&qR;0u@vq~BCCNZK6 z1C%sQRG`s?5@Ukm)>dxX&Kj|0F3L3`_4khZ9j_{u((=HY%?wW-IQIPZ>Po}Vr7~x@ zRVkta0DuiUxTQOMEi_U4>wk<60Z01K*o3B%LQaqo6!rC7#)C5fN_3_K*%3CegdI5v zgR!N%$NX-Uf`ZVafE<01adBAzXKe;2*@(sJT*?-I6byp~5X&32P_}`bxI(XKW_+65JiqZokhz+v_zP-qgSMHz4=- hdG-Fgp??vdcMa{}jB=H?6?+o^?5v&OO&1WU{{RW9Hs}BV