Nuke merge.

This commit is contained in:
Zuhayr
2013-11-23 00:44:19 +10:30
3 changed files with 24 additions and 3 deletions
+13 -2
View File
@@ -166,8 +166,13 @@ var/bomb_set
/obj/machinery/nuclearbomb/attack_hand(mob/user as mob)
if (src.extended)
if (src.opened)
nukehack_win(user,50)
if (!ishuman(user))
usr << "\red You don't have the dexterity to do this!"
return 1
if (!ishuman(user))
usr << "\red You don't have the dexterity to do this!"
return 1
user.set_machine(src)
var/dat = text("<TT><B>Nuclear Fission Explosive</B><BR>\nAuth. Disk: <A href='?src=\ref[];auth=1'>[]</A><HR>", src, (src.auth ? "++++++++++" : "----------"))
if (src.auth)
@@ -216,6 +221,12 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob)
set name = "Make Deployable"
set src in oview(1)
if (!usr.canmove || usr.stat || usr.restrained())
return
if (!ishuman(usr))
usr << "\red You don't have the dexterity to do this!"
return 1
if (src.deployable)
usr << "\red You close several panels to make [src] undeployable."
src.deployable = 0
+10
View File
@@ -439,8 +439,18 @@
var/atom/movable/locked
var/mode = 1 //1 - gravsling 2 - gravpush
var/last_fired = 0 //Concept stolen from guns.
var/fire_delay = 10 //Used to prevent spam-brute against humans.
action(atom/movable/target)
if(world.time >= last_fired + fire_delay)
last_fired = world.time
else
if (world.time % 3)
occupant_message("<span class='warning'>[src] is not ready to fire again!")
return 0
switch(mode)
if(1)
if(!action_checks(target) && !locked) return
+1 -1
View File
@@ -22,7 +22,7 @@
if(H.species.name in species_restricted)
wearable = 1
if(!wearable)
if(!wearable && (slot != 15 && slot != 16)) //Pockets.
M << "\red Your species cannot wear [src]."
return 0