Fixes for package wrap, added proper buttons and hotkeys to the gun system, fixed PDA manifest.

This commit is contained in:
SkyMarshal
2012-03-03 15:08:01 -07:00
parent 1e4bdf7183
commit 1107f6e768
15 changed files with 102 additions and 61 deletions
+2
View File
@@ -149,6 +149,8 @@
src.welded =! src.welded
for(var/mob/M in viewers(src))
M.show_message("\red [src] has been [welded?"welded shut":"unwelded"] by [user.name].", 3, "\red You hear welding.", 2)
else if(istype(W,/obj/item/weapon/packageWrap))
return
else
src.attack_hand(user)
return
+3
View File
@@ -333,6 +333,7 @@
/obj/item/device/pda/Topic(href, href_list)
..()
var/mob/living/U = usr
U.last_target_click = world.time
//Looking for master was kind of pointless since PDAs don't appear to have one.
if ((src in U.contents) || ( istype(loc, /turf) && in_range(src, U) ) )
if ( !(U.stat || U.restrained()) )
@@ -382,6 +383,8 @@
mode = 2
if("21")//Read messeges
mode = 21
if("41")//Read messeges
mode = 41
if("3")//Atmos scan
mode = 3
if("4")//Redirects to hub