From 2f70c9f836f3ec5fe10ce761e79b25c8ca385688 Mon Sep 17 00:00:00 2001 From: Gandalf Date: Tue, 15 Sep 2020 16:26:26 +0100 Subject: [PATCH] Additional content and a bug fix. (#803) --- .../master_files/{icons => }/readme.md | 2 + .../crates_lockers/closets/secure/security.dm | 1 + .../code/modules/jobs/job_types/blueshield.dm | 12 +++++ .../projectiles/guns/energy/special.dm | 44 ++++++++++++++++++ .../mob/inhands/weapons/guns_lefthand.dmi | Bin 0 -> 1253 bytes .../mob/inhands/weapons/guns_righthand.dmi | Bin 0 -> 1225 bytes .../blueshield/icons/obj/guns/energy.dmi | Bin 0 -> 966 bytes tgstation.dme | 1 + 8 files changed, 60 insertions(+) rename modular_skyrat/master_files/{icons => }/readme.md (95%) create mode 100644 modular_skyrat/modules/blueshield/code/modules/projectiles/guns/energy/special.dm create mode 100644 modular_skyrat/modules/blueshield/icons/mob/inhands/weapons/guns_lefthand.dmi create mode 100644 modular_skyrat/modules/blueshield/icons/mob/inhands/weapons/guns_righthand.dmi create mode 100644 modular_skyrat/modules/blueshield/icons/obj/guns/energy.dmi diff --git a/modular_skyrat/master_files/icons/readme.md b/modular_skyrat/master_files/readme.md similarity index 95% rename from modular_skyrat/master_files/icons/readme.md rename to modular_skyrat/master_files/readme.md index 54b2b6cd98d..5aa8b6a7386 100644 --- a/modular_skyrat/master_files/icons/readme.md +++ b/modular_skyrat/master_files/readme.md @@ -9,3 +9,5 @@ MASTER ICON FILES MASTER SOUND FILES - N/A + +MASTER CODE FILES diff --git a/modular_skyrat/modules/blueshield/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/modular_skyrat/modules/blueshield/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 4999c8dca38..d6392ecaf3f 100644 --- a/modular_skyrat/modules/blueshield/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/modular_skyrat/modules/blueshield/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -22,3 +22,4 @@ new /obj/item/clothing/suit/armor/vest/blueshield(src) new /obj/item/clothing/shoes/laceup(src) new /obj/item/clothing/under/rank/security/blueshield(src) + new /obj/item/choice_beacon/blueshield(src) diff --git a/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm b/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm index 780b931b5b7..6e3fd702d44 100644 --- a/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm +++ b/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm @@ -48,3 +48,15 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/blueshield uniform = /obj/item/clothing/under/plasmaman/blueshield + +/obj/item/choice_beacon/blueshield + name = "blueshield's shotgun beacon" + desc = "A beacon, allowing the blueshield to select between two available models of personal shotguns." + +/obj/item/choice_beacon/blueshield/generate_display_names() + var/static/list/bshield + if(!bshield) + bshield = list() + bshield["Energy Revolver"] = /obj/item/gun/energy/e_gun/revolver + bshield["PDW-9"] = /obj/item/gun/energy/e_gun/revolver/pdw9 + return bshield diff --git a/modular_skyrat/modules/blueshield/code/modules/projectiles/guns/energy/special.dm b/modular_skyrat/modules/blueshield/code/modules/projectiles/guns/energy/special.dm new file mode 100644 index 00000000000..06df8d468dc --- /dev/null +++ b/modular_skyrat/modules/blueshield/code/modules/projectiles/guns/energy/special.dm @@ -0,0 +1,44 @@ +/obj/item/gun/energy/e_gun/revolver //The virgin gun. + name = "energy revolver" + desc = "An advanced energy revolver with the capacity to shoot both electrodes and lasers." + force = 7 + ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser) + ammo_x_offset = 1 + charge_sections = 4 + fire_delay = 4 + icon = 'modular_skyrat/modules/blueshield/icons/obj/guns/energy.dmi' + icon_state = "bsgun" + inhand_icon_state = "minidisable" + lefthand_file = 'modular_skyrat/modules/blueshield/icons/mob/inhands/weapons/guns_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/blueshield/icons/mob/inhands/weapons/guns_righthand.dmi' + obj_flags = UNIQUE_RENAME + cell_type = /obj/item/stock_parts/cell/blueshield + pin = /obj/item/firing_pin/implant/mindshield + +/obj/item/stock_parts/cell/blueshield + name = "internal revolver power cell" + maxcharge = 1500 + chargerate = 300 + +/obj/item/gun/energy/e_gun/revolver/pdw9 //The chad gun. + name = "PDW-9 taser pistol" + desc = "A military grade energy sidearm, used by many militia forces throughout the local sector. It comes with an internally recharging battery which is slow to recharge." + ammo_x_offset = 2 + icon_state = "pdw9pistol" + inhand_icon_state = null + cell_type = /obj/item/stock_parts/cell/pdw9 + +/obj/item/stock_parts/cell/pdw9 + name = "internal pistol power cell" + maxcharge = 1000 + chargerate = 300 + self_recharge = TRUE + var/obj/item/gun/energy/e_gun/revolver/pdw9/parent + +/obj/item/stock_parts/cell/pdw9/Initialize() + . = ..() + parent = loc + +/obj/item/stock_parts/cell/pdw9/process() + . = ..() + parent.update_icon() diff --git a/modular_skyrat/modules/blueshield/icons/mob/inhands/weapons/guns_lefthand.dmi b/modular_skyrat/modules/blueshield/icons/mob/inhands/weapons/guns_lefthand.dmi new file mode 100644 index 0000000000000000000000000000000000000000..73dc7d7dd3f60911e9202a889ccc0ca27a48daf3 GIT binary patch literal 1253 zcmZuwdrVVT7(Yk=B?Cn=P#4x_=olIb1YfA-szasnay-Us(yD+eC>Bb6QJA&8NJ}s6z3ts)y8reiCnx9RoZt8Te!uTK zeIRL{kM|mH0Duo8E;a=Kx1Eb?sXKY&NJ_6Gw}=A?X?qAjtPc&PQmF(0d_G^LQk?)G zEG&${V6a%MV+8TVF%AIr#6xhk8jz235pE{=*R3QaDHZHAjOCLDU3pq&No*eXNb%94 zlA|0p0AJJJdpvlviE)K5mI` z%WsmkJ?Go~ZPMe9KT1yBkvO~Y-dDa2n^LF)(!KYhe|*bbQ$N!M|LX4HTVYa74*{)p zC92R&!nFz%$ul_{voNSPD>pjuVxOr%5ZB$Rs2^@BH=@Hi@byUteSS397@R$N7nRSt z#WrnQ*}OvD1%P`wBX(C>nbf2kFTS~Rg~x$rKkmyZ0zz5q{nlmPjqo3@R7_TE{*sp5 z+tBJp3InJE{STMre^w&1S1eHl4vBJ>WQA98gN zxyN}NbgR+UBB;bS2NT7+Z#@%F48qs&0DU4;_;$-OqB=JePJBoVVtjw;+if}w#gYad zsh85&Ci`MOGCDUtaVoWz7L4aHH{OoFD3R$0Zxd?VDmvIWf>ab$o9*8kl5dyYz;z4D zbofKjL9Hd63iU8E#3BLQ;lhiXG2WB^&{U6=n9#%KCCZ;So*c?RWd0a0eVSS28Is^5 zx}>K>DfAgUR|agh)ePHp3qHyttti%PS-#r-sFR7Vo_YJP+pJit{mBJzzv3cH5!=H$&b&=}7I4?2YpRe*O=r87QhMhkobd_=i)^2+7?(Gn< z9m#VDmjx0MymYT}zO>_kDYf~&rM5FlI+5f=u3ggXB|4iy|X7B?TI610AHgrNoV@dms8hXL0 zL^i~*3GH2?9)$h?j4tE zC=RAwF^pU;YSPPl8_gCq*P>2VhmXtSy>k=(UwN|G(vk4vG^djLHO%e`vZYHJ?84_t zTcFFVxhx}n6NnG_>*Z|~;urkM0V`HG!L0N9WbCZ5 zR2h}|DyD>J)JGy{yN-U4=9FNBV-rLgnn+yN&E3`ZkM2F^Iq!L%_kEt<@BDsGerQO5 zh1qs9001n=$9%&9z{m#+`_0B!T7t=LnQO*eKg_S|<@)A5RKdQkNdp=~5R_4WKj z7cEo2Hascn6`-w;AVFZwV{6(>@LI#TEK^aiOGII6z2_xxbpRy@zsz@=6vHOn3r?Rl zbo}}Z0E}bFzF$$(%TyDR@Nt5bPuS**TkZQ%PU7>S3W8)i&12MzD}CUyI%cMl-dJD4 zM8Sk~xJl$x^!uuj2`PJ;vgt7*ZE}=ka@L_b+_l6MTQ^oR+JRIw5~J6fwP{}Mk|(5$ zY1b{$3?aG=CbbanO`wGb%XQ|cW%>@(m$KAM+?iy!d4GA*95l;w zv=%oKY197d3(Bmw&;T$usr9b^yAOEmM+c0**haA#fbJ#1ze<)o*NvA(;K~m zh&jwxD4FW>gCjM15I1NURL;YxIRXQtnIQ1nhPan3D^8d3_Imfy9E7J%iiKg$NQeR( z7c_^pAZ>N$6qf5hq>0Qb`EtsR#osl?>Pbq$5%Bhe>ASg?RezQ9lp;>_A-S!Io}%~- zb3^kI>R$D(y0zhq<_*-n^zkSEVhNK2!M}*9Hz;tjHpfPEQ*R>Iwucw zmeiHR+JjCJH0A_I%f^3BE$Z< z!C>n1k*JX}HRj>D%DebQjJ5I$d|)!|iE;s>eP9Aab<%!Ks%WM4e~Ym}ln*!Z<%6YJ z?6VDvdQChRl)1o&a8zO2Hozt(>7bnF@1Khnq0U8b0HEnibFB8PZ0f@~Z!jbKh4?ld HjmiEG5b=O? literal 0 HcmV?d00001 diff --git a/modular_skyrat/modules/blueshield/icons/obj/guns/energy.dmi b/modular_skyrat/modules/blueshield/icons/obj/guns/energy.dmi new file mode 100644 index 0000000000000000000000000000000000000000..85194b408546f9b2d5081ec065e12f2712783ee4 GIT binary patch literal 966 zcmV;%13CPOP)C0001!P)t-sz`(%& z%m89qIw~qE92giMA0JFbDra9rRZcTCGBHCyKSfVVYHCh1EE3EB0RP@w{{R3fDJdf( zBRnPmFgiA3YG)`gEeZ+>E-o%7CnpsZ6*xFJT`DPk0000NE>a&JcTP(HLW3+UEC5iT zW->7VF=9MCJX-(&CMG6SR8&PpMKLikVow1700yLk0F?{?z`($+A>~Z~0004WQchC< zK<3zH0002JdQ@0+L}hbha%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r z;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DXBQUG*5|(GbOXA7|1u|;!G<_%uR)` zQB}nkmk_NqIU}(sJ(Ua{*_k;xMCu?xX=-jkNhNl*z<^0f%}J~Tg^P|cLSsQnxn)6S zaY;U5I}l2V^DvTnQo;#I8&O`zw1!k|#08t7fsPTEvVyCh3pfP=0BbSB>hruWH~;_w z7)eAyRCt{2+3ix|Fcb#huuYJ(E{a>bG}3|#Dofq<{_oC{52R&HqoXvl&imv?JDv{b z?FpzI7y|%+|JUf-C%<6AIZrf^2%>+|ZZ|% zGLbX^GlxTQJU(ZW5$U_@QJ}-LrzWyg+Ovd4ApV^InOu;*30wpMT=vvvsZ6fSnWT-^ z_bx=5B;AXCkkjltV>y?0^Xc}T6Ls?Rzs_s|Idtcj{&~(*##xN+CP1DST*xSQZ~A9h z!Q=Ec3fh5~{aKOaQ3t?gSrIn?oAJ2)0RRBLzModa0Q330EX$(=N)6RtwXp7Cpa3_< zTvPUF4}k#F#mDN^zOL#vvm456iYohFZn;|awmYg<{(61;%dIt`3_{TO%TlP;bI5eD zT5UAX?S$%8PrbgocWb@A)#{qrcgEqG#bU)aQ{rjxruqYUwSJhtZhuGWT5Y%6&K5AX zxgkpkht3vgOX3^x8|qj7It6GNRVqDTwKiK470_@rYh|piD$N}hgu8P=SkHAHU6~IPlRJ{H!g8n-k zEr5#HDHNcSn1_A&8z2F<-gm^ArjI000000002t o=X<+OCiHwCssjK30Kf-416$`li~TTU0ssI207*qoM6N<$g1!x+&;S4c literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index 452e79d33ca..22a53330088 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3268,6 +3268,7 @@ #include "modular_skyrat\modules\blueshield\code\modules\clothing\under\jobs\security.dm" #include "modular_skyrat\modules\blueshield\code\modules\clothing\under\jobs\Plasmaman\security.dm" #include "modular_skyrat\modules\blueshield\code\modules\jobs\job_types\blueshield.dm" +#include "modular_skyrat\modules\blueshield\code\modules\projectiles\guns\energy\special.dm" #include "modular_skyrat\modules\horrorform\code\modules\antagonists\changeling\powers\horror_form.dm" #include "modular_skyrat\modules\horrorform\code\modules\mob\hostile\true_changeling.dm" #include "modular_skyrat\modules\icspawning\code\_onclick\observer.dm"