Merge pull request #4059 from Miauw62/goodbyeparapen

Replaces the parapen
This commit is contained in:
Alex
2014-07-14 12:47:14 +01:00
6 changed files with 32 additions and 19 deletions
@@ -22,7 +22,7 @@
..()
/obj/item/weapon/plastique/suicide_act(var/mob/user)
. = (BRUTELOSS)
. = BRUTELOSS
user.visible_message("<span class='suicide'>[user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!</span>")
var/message_say = "FOR NO RAISIN!"
if(user.mind)
@@ -59,13 +59,9 @@
/obj/item/weapon/plastique/afterattack(atom/movable/target, mob/user, flag)
if (!flag)
return
if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/))
if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/))
return
user << "Planting explosives..."
if(ismob(target))
add_logs(user, target, "tried to plant explosives on", object="[name]")
user.visible_message("\red [user.name] is trying to plant some kind of explosive on [target.name]!")
if(do_after(user, 50) && in_range(user, target))
user.drop_item()
@@ -88,7 +84,6 @@
explode(get_turf(target))
/obj/item/weapon/plastique/proc/explode(var/location)
if(!target)
target = get_atom_on_turf(src)
if(!target)
@@ -98,7 +93,8 @@
if(target)
if (istype(target, /turf/simulated/wall))
target:dismantle_wall(1)
var/turf/simulated/wall/W = target
W.dismantle_wall(1)
else
target.ex_act(1)
if(target)