From 2b33e966d1d52f7989781edae39343a6bc7f7695 Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Mon, 20 Dec 2010 00:20:15 +0000 Subject: [PATCH] Bugfixes for those explodies I made for noize You can now only plant them on items you are next to The item has to stay within one tile of you during the entire process You can no longer plant them on shuttle or unsimulated turfs, as these are apparently not meant to ever be damaged in any way short of a badmin using the Delete verb git-svn-id: http://tgstation13.googlecode.com/svn/trunk@674 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/weapons/explosives.dm | 8 ++++++-- code/game/objects/items/weapons/uplinks.dm | 11 +++++++++-- icons/obj/assemblies.dmi | Bin 13431 -> 13431 bytes 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 97b5986f33a..d7f21403898 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -3,9 +3,13 @@ src.timer = newtime user << "Timer set for [src.timer] seconds." -/obj/item/weapon/plastique/afterattack(atom/target as obj|turf, mob/user as mob) +/obj/item/weapon/plastique/afterattack(atom/target as obj|turf, mob/user as mob, flag) + if (!flag) + return + if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle)) + return user << "Planting explosives..." - if(do_after(user, 50)) + if(do_after(user, 50) && get_dist(user, target) <= 1) user.drop_item() src.target = target src.loc = null diff --git a/code/game/objects/items/weapons/uplinks.dm b/code/game/objects/items/weapons/uplinks.dm index 89ddf18bf90..d2c65fdb002 100644 --- a/code/game/objects/items/weapons/uplinks.dm +++ b/code/game/objects/items/weapons/uplinks.dm @@ -43,7 +43,8 @@ SYNDICATE UPLINK dat += "Energy Sword (4)
" dat += "Syndicate Bomb (4)
" dat += "Power Sink (5)
" - dat += "
  • Detomatix Cartridge (3)
    • " + dat += "Detomatix Cartridge (3)" + dat += "Syndicate-made Space Suit (inludes a helmet) (3)
    " dat += "
    " if (src.origradio) dat += "Lock
    " @@ -108,7 +109,8 @@ SYNDICATE UPLINK else if (href_list["item_bomb"]) if (src.uses >= 4) src.uses -= 4 - new /obj/spawner/newbomb/timer/syndicate(H.loc) + new /obj/item/weapon/plastique(H.loc) + new /obj/item/weapon/plastique(H.loc) else if (href_list["item_card"]) if (src.uses >= 3) src.uses -= 3 @@ -125,6 +127,11 @@ SYNDICATE UPLINK if (src.uses >= 5) src.uses -= 5 new /obj/item/device/powersink(H.loc) + else if(href_list["item_space"]) + if (src.uses >= 3) + src.uses -= 3 + new /obj/item/clothing/suit/space/syndicate(H.loc) + new /obj/item/clothing/head/helmet/space/syndicate(H.loc) else if (href_list["lock"] && src.origradio) // presto chango, a regular radio again! (reset the freq too...) usr.machine = null diff --git a/icons/obj/assemblies.dmi b/icons/obj/assemblies.dmi index 6665dcd69cb1a61269afec9ce17a82cfdcd960b9..3ecf86bcb899290eef65b9df05d425206674f1d9 100644 GIT binary patch delta 433 zcmV;i0Z#t+X!mH4I)Be@qc9MM&+rshdW}~h+aC77rAoERA$^5vgePHyv8!R0B>VJx zsLG}!)I)m%>HF}H`QtnD`1E`GY&N@X-XnJugDK7Zk5!%>$w_TW^K+eNHPWG$x0g;p z(3ED;)v;<`8j?kxIpWTgrpU8BLyK?E0}0$lwsZ(2$QA^4x_USj-v96flq(`mE-9~ktS+-Nf)>2b)Gr&a5kkWmJ{kasXkn( z?H?~BF?wanf&WU*LHtJ zeE&c)?FZTlgnve<4E5?7%k=?I*ZJ3S%GHd;l&hSJYv((Gm6LHJ^^99# zBuwO;7AEpt3Ci`qfVELR+xZLlh~6Pvj;@=-s<&+Kp+%`V9u;sB=)w2+k}g3HzQ^=^ z<)LdKiN(|TfFX%F?5Rp03IRK*QK(9y*diY=RA<$n2qje(Pp>|9)T83E9xF3<^2*n( bo5>T*U3{@u&u91FDzJOgNm-YfLB1Hc-oBO*l04OEl+cEb-S%rl1`4yH84VnSUe)w>h5 zee*&RqgSRJ_)BsQ@+C>fo%$)|xJ&AU431(tU9q@3--7YTDjGhX*tuP|0->2%PzFcw z^8?AW-)Jik8h@oS^jpa@IEqPDs72N<*Ec*}=ljK!s~L+aS2-7_&Tj%MC*w@&8Mnen zn8-UVOyoNelyfUk&b^aeE5cktp&=m%=+yR?1Z3Ea<