diff --git a/code/WorkInProgress/SkyMarshal/wardrobes.dm b/code/WorkInProgress/SkyMarshal/wardrobes.dm index b9658601246..3dd9bb2837b 100755 --- a/code/WorkInProgress/SkyMarshal/wardrobes.dm +++ b/code/WorkInProgress/SkyMarshal/wardrobes.dm @@ -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)) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 7f0ce6dbf90..2c8e1aa88cb 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -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"], diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 8bc5ce81fd4..6bfb785c571 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -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) diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 1b039da7326..936eb43737f 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ