diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index 65afc0f64ef..eda83e47cb4 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -78,6 +78,8 @@ playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) sleep(10) user.put_in_hands(R) + else + return ..() /obj/item/autopsy_scanner/attack_self(mob/user) var/scan_data = "" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 1e3acfc7812..b98e6d9acfc 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -309,7 +309,7 @@ /obj/item/radio/headset/attackby(obj/item/W as obj, mob/user as mob) user.set_machine(src) if(!( istype(W, /obj/item/screwdriver) || (istype(W, /obj/item/encryptionkey/ )))) - return + return ..() if(istype(W, /obj/item/screwdriver)) if(keyslot1 || keyslot2) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 63b9b00eeb0..f0c6a9b0af5 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -135,6 +135,8 @@ return canhear_range /obj/item/radio/intercom/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/stack/tape_roll)) //eww + return switch(buildstage) if(3) if(iswirecutter(W) && b_stat && wires.IsAllCut())