Disposal/Pipe Dispenser can no longer be used 'remotely' or while stunned or while they are unwrenched. Fixes issue 517.

Can no longer eject the nuke disk from the nuke while stunned. Fixes issue 497.

PA can now be powered down again.

Cyborg 'skull' masks now have east and west facing sprites. Fixes issue 468.
- I encourage anyone with actual spriting skills to redo them though, I just spent 5 second in photoshop whipping these up. (icons/mob/mask.dmi the icon labeled 'Death')

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3681 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
2012-05-27 04:14:56 +00:00
parent bf3fe07b27
commit 329c71c306
4 changed files with 6 additions and 3 deletions
+1 -1
View File
@@ -74,7 +74,7 @@
/obj/machinery/nuclearbomb/Topic(href, href_list)
..()
if (usr.stat || usr.restrained())
if (!usr.canmove || usr.stat || usr.restrained())
return
if (!ishuman(usr))
usr << "\red You don't have the dexterity to do this!"
+4 -1
View File
@@ -44,7 +44,7 @@
/obj/machinery/pipedispenser/Topic(href, href_list)
if(..())
return
if(unwrenched)
if(unwrenched || !usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
usr << browse(null, "window=pipedispenser")
return
usr.machine = src
@@ -133,6 +133,9 @@
usr.machine = src
src.add_fingerprint(usr)
if(href_list["dmake"])
if(unwrenched || !usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
usr << browse(null, "window=pipedispenser")
return
if(!wait)
var/p_type = text2num(href_list["dmake"])
var/obj/structure/disposalconstruct/C = new (src.loc)
@@ -93,7 +93,7 @@
part.update_icon()
else if(href_list["strengthdown"])
strength++
strength--
if(strength < 0)
strength = 0
else
Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB