Added a missing icon, fixed a wardrobe/evidence bag interaction bug, fixed a nuke radio bug, added another update_clothing() call.

This commit is contained in:
SkyMarshal
2012-02-27 11:09:07 -07:00
parent 54a1a7e640
commit f64dcf2e31
4 changed files with 10 additions and 2 deletions
+1 -1
View File
@@ -22,7 +22,7 @@
return
attackby(var/obj/item/I as obj, var/mob/user as mob)
if(istype(I, /obj/item/wardrobe))
if(istype(I, /obj/item/wardrobe) || istype(I, /obj/item/weapon/evidencebag))
return
if(contents.len < 20)
if(istype(I, /obj/item/weapon/grab))
+7 -1
View File
@@ -97,7 +97,7 @@ var
var/datum/radio_frequency/connection = signal.data["connection"]
if(!intercept) // if syndicate broadcast, just
if(!intercept || (nuke && connection.frequency == NUKE_FREQ)) // if syndicate broadcast, just
if(connection.frequency == frequency && !nuke)
Broadcast_Message(signal.data["connection"], signal.data["mob"],
signal.data["vmask"], signal.data["vmessage"],
@@ -110,6 +110,12 @@ var
signal.data["radio"], signal.data["message"],
signal.data["name"], signal.data["job"],
signal.data["realname"], signal.data["vname"],, signal.data["compression"])
else
Broadcast_Message(signal.data["connection"], signal.data["mob"],
signal.data["vmask"], signal.data["vmessage"],
signal.data["radio"], signal.data["message"],
signal.data["name"], signal.data["job"],
signal.data["realname"], signal.data["vname"],, signal.data["compression"])
else
if(nuke)
Broadcast_Message(signal.data["connection"], signal.data["mob"],
+2
View File
@@ -164,6 +164,7 @@ WELDINGTOOOL
attack_self(mob/user as mob)
toggle()
user.update_clothing()
return
@@ -223,6 +224,7 @@ WELDINGTOOOL
src.damtype = "brute"
src.icon_state = "welder"
src.welding = 0
return
eyecheck(mob/user as mob)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 48 KiB