From 2db5fec54a0b44d4f4a50238f28deb03cd0253d0 Mon Sep 17 00:00:00 2001 From: Regen Date: Sun, 21 Feb 2016 03:26:44 +0100 Subject: [PATCH 1/4] Adds immolator laser gun Adds an immolator laser gun, which has 7 shots and ignites the target. http://puu.sh/nfys1/b381d812de.png Will add more and better pictures tomorrow, but right now I need sleeps --- code/modules/projectiles/guns/energy/laser.dm | 8 ++++++++ code/modules/projectiles/projectile/beams.dm | 11 +++++++++++ .../research/designs/weapon_designs.dm | 11 +++++++++++ icons/obj/gun.dmi | Bin 79633 -> 80366 bytes 4 files changed, 30 insertions(+) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 1558304b191..08f0a90b29a 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -98,6 +98,14 @@ obj/item/weapon/gun/energy/laser/retro projectile_type = "/obj/item/projectile/beam/xray" charge_cost = 500 +/obj/item/weapon/gun/energy/immolator + name = "Immolator laser gun" + desc = "A modified laser gun, shooting highly concetrated beams with higher intensity that ignites the target, for the cost of draining more power per shot" + icon_state = "immolator" + fire_sound = 'sound/weapons/laser3.ogg' + projectile_type = "/obj/item/projectile/beam/immolator" + charge_cost = 1400 + ////////Laser Tag//////////////////// diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index cbe75d884ef..319633e6277 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -38,6 +38,17 @@ weaken = 5 stutter = 5 + +/obj/item/projectile/beam/immolator + name = "immolation beam" + +/obj/item/projectile/beam/immolator/on_hit(var/atom/target, var/blocked = 0) + . = ..() + if(istype(target, /mob/living/carbon)) + var/mob/living/carbon/M = target + M.adjust_fire_stacks(1) + M.IgniteMob() + /obj/item/projectile/beam/xray name = "xray beam" icon_state = "xray" diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 01917cb8ba0..4ce1f95e8d3 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -270,4 +270,15 @@ materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000, MAT_METAL = 4000) build_path = /obj/item/weapon/gun/energy/xray locked = 1 + category = list("Weapons") + +/datum/design/immolator + name = "Immolator Laser Gun" + desc = "Has fewer shots than a regular laser gun, but ignites the target on hit" + id = "immolator" + req_tech = list("combat" = 4, "materials" = 5, "powerstorage" = 5, "magnets" = 4) + build_type = PROTOLATHE + materials = list(MAT_METAL = 4000, MAT_GLASS = 1000, MAT_SILVER = 3000, MAT_PLASMA = 2000) + build_path = /obj/item/weapon/gun/energy/immolator + locked = 1 category = list("Weapons") \ No newline at end of file diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index d2eca5637a7a1cbf86a75db955fc413b84dc3148..8a5cc15671aab65e5f02ee2e171d1a5c8b0e2995 100644 GIT binary patch delta 20682 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 delta 20333 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 Date: Sun, 21 Feb 2016 14:19:18 +0100 Subject: [PATCH 2/4] Fixes Fixes typo in the gun sprite, adds origin_tech and tweaks charge cost --- code/modules/projectiles/guns/energy/laser.dm | 3 ++- icons/obj/gun.dmi | Bin 80366 -> 80363 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 08f0a90b29a..6a9e15282b6 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -104,7 +104,8 @@ obj/item/weapon/gun/energy/laser/retro icon_state = "immolator" fire_sound = 'sound/weapons/laser3.ogg' projectile_type = "/obj/item/projectile/beam/immolator" - charge_cost = 1400 + origin_tech = "combat=4;materials=4;magnets=3;plasma=2" + charge_cost = 1520 ////////Laser Tag//////////////////// diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index 8a5cc15671aab65e5f02ee2e171d1a5c8b0e2995..d410be0da53fa86531754aac2388018a87bbddd5 100644 GIT binary patch delta 2226 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 AlmGw# delta 2229 zcmV;m2uk578E1JHqApJ$fgCpLy?D9mlS{eb@}(te}4VD z{PFwO;*DyrHE7vXf;l!-V1`W<34R&d%b6Y++shOKjO}GY>y7PYLeq`yCDLx)AWXgn zo~)aEUE~x3QTBDj&#i~TP^rBx-F1hFu zG`mbUM*`|+& zWlgkgdI<~*o?O9XJZF1y4U_S_=gD|n(z={Z!fWqa*XFvmo zm1x@&k%9bw`eAOrz9Y+PO_&7Ib4@F*WawRg9-p(yR@o}Mql_oRyRzUbg*-Eq9T9CP zT_W00{(P*pw6g3C>GXlzHHsr$=W$L|M|6s!Bht1&hMy=Xsi+`FMC3kWaWL@<*2|Er z>{(zu^(Zi&dK4H>Yo&DfMZN>#uP!{`3}9}^DNa*=Np%y?%}H2d2Rjkcy^aJr*MUIS zIuPhs2Ob&c3Fs^%j*N5Mj3eV5Hsr`ShfO&$&S7JW1tN1qXBmSoVU09w47hwX!hkUc zrfE18OvaEhE3+~yZ`y^UMqNu*;u3v`P|fll!#(j{DJ za$%Hz*I=<1MtKc4?ZPOp(Z*dE8UFT&|g;ypx3SxK;L-85CQz><(>F+(&vKxxOLh#BZ-6-)Z8^0eVh##f4tOj64# zq#7fd*ejzD>6ek-^(kv0_y=dtl$laq(?su_~Jb zSl$6F&w%9_sJ!iJm3JtI>_n_@R7k9U3@8vM0|~^)Kmze0%I8&l3s98Ls}-=dB(^}^ zwgu9S+ai2uCFuILK#rD(ZIQ2l2-y~S8Q-83+X6WfCbmT$Kbj)8a~h4Efe_%)2C*%m zqY{Exx+igrNtXA2fbs?qIl?nxk+Agi8VHV&O)EL=sLND1N0v~v6m(WyQZ$Nx87upy zq49W?ZUH>6;_pL|t%_UWAu8Ntn_F4n3+mB6tW?ZUa8@FfZJBJKeY*(@FVD*!`m}Rc zC=&-gaw=q88&F_e8%SVW8%SVW8_0@N67b^rDt@x-C>l!8ED)-jJ9EbyIkd7kun+cC zCeQko4SzR!L2K3rj-*Wrc+Q4@zncP}6~2KzwKR}ez6IvgV-Z~uAAP&xJN9MQG5UCp ze+P}vc)%5XhXE+2urIacfvR@pxYP-}MhTKfkcwhGN&6L^+UPKx{Fc-SU~!!9`-FiDe+)#jp^Y@qFH zO>5-(jl<%#bsXZFBLTl02sq_H#3O2T{3xrYRx9MGRx7N*Rx7BzRx7BvRx7BrZ|n^_ zK(o%)*@stQ)WW%3(>KL`-+(b%Gi<*|GiA}er3s5|FKJaBf$ud#_CSja*;9=yn0OGF zT#abTWa(X%tU+ruqdKVqZ0X04J;m<7ph099r?R3oI@B1+IwU$I>yS;0a{2-~5t3dU z3FH?C0tv=}K!!0LJ5t+fbwXy_Q#$^!GNt1yTvIxJQ^QztIH&`EkxUTFfc1?*P_;w? zH)lp#85FLS0wT$=EhW&V_<#=!E&$$3IEhbTpz9|z6w?zPiR=lE#P6E>j=2`Dyq@H8}iu z2BWsunp*5k##xhi)SWd+z14Eo1iI65)&#lHa@GX7&vMoTxy>?UdUUFIQd+c%(_N?4 zf3&hHoULD`Gs4a7Li24=JEe(yaOpO^#E=2A>-KpChPrTncGW(wz)%p*uG;4n_}Qk- zEzfR3c887voa|;(1b?RDu`0Cb9#I88Hy*13yFZUbfs+`IMTu7IP1DOAv<)_*(68vc z)5wqByu-+E>Ab_pPxQRQfH6gOql9)dM-+DkyoxZwuruHliV;qAh6$lKvA`D(6N2zy zehD6M_vJ$)C)_=Z9C7z7a>m`W;ZFLx{Q2*X<&WRL7XJhL;l7TlufIrxvk14d2mv@T D8Z#!a From f4ba151d330cdd2971c690500eb1fd7c26a356e2 Mon Sep 17 00:00:00 2001 From: Regen Date: Sun, 21 Feb 2016 14:22:25 +0100 Subject: [PATCH 3/4] oops it's plasmatech, not plasma --- code/modules/projectiles/guns/energy/laser.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 6a9e15282b6..632b587bf42 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -104,8 +104,8 @@ obj/item/weapon/gun/energy/laser/retro icon_state = "immolator" fire_sound = 'sound/weapons/laser3.ogg' projectile_type = "/obj/item/projectile/beam/immolator" - origin_tech = "combat=4;materials=4;magnets=3;plasma=2" - charge_cost = 1520 + origin_tech = "combat=4;materials=4;magnets=3;plasmatech=2" + charge_cost = 1250 ////////Laser Tag//////////////////// From 097914386fdb442714a0cfabd7a552bb396c85fc Mon Sep 17 00:00:00 2001 From: Regen Date: Sun, 21 Feb 2016 23:02:56 +0100 Subject: [PATCH 4/4] Adds item state Also removed extra whitespace --- code/modules/projectiles/guns/energy/laser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 632b587bf42..2c0eb581bde 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -102,12 +102,12 @@ obj/item/weapon/gun/energy/laser/retro name = "Immolator laser gun" desc = "A modified laser gun, shooting highly concetrated beams with higher intensity that ignites the target, for the cost of draining more power per shot" icon_state = "immolator" + item_state = "laser" fire_sound = 'sound/weapons/laser3.ogg' projectile_type = "/obj/item/projectile/beam/immolator" origin_tech = "combat=4;materials=4;magnets=3;plasmatech=2" charge_cost = 1250 - ////////Laser Tag//////////////////// /obj/item/weapon/gun/energy/laser/bluetag