cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes for those explodies I made for noize

Browse Source 
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
This commit is contained in:
n3ophyt3@gmail.com
2010-12-20 00:20:15 +00:00
parent 3764953090
commit 2b33e966d1
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/explosives.dm
+6 -2
View File
@@ -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
code/game/objects/items/weapons/uplinks.dm
+9 -2
View File
@@ -43,7 +43,8 @@ SYNDICATE UPLINK
dat += "<A href='byond://?src=\ref[src];item_sword=1'>Energy Sword</A> (4)<BR>"
dat += "<A href='byond://?src=\ref[src];item_bomb=1'>Syndicate Bomb</A> (4)<BR>"
dat += "<A href='byond://?src=\ref[src];item_powersink=1'>Power Sink</A> (5)<BR>"
dat += "<li><A href='byond://?src=\ref[src];item_cartridge=1'>Detomatix Cartridge</A> (3)</li>"
dat += "<A href='byond://?src=\ref[src];item_cartridge=1'>Detomatix Cartridge</A> (3)"
dat += "<A href='byond://?src=\ref[src];item_space=1'>Syndicate-made Space Suit (inludes a helmet)</A> (3)<BR>"
dat += "<HR>"
if (src.origradio)
dat += "<A href='byond://?src=\ref[src];lock=1'>Lock</A><BR>"
@@ -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