diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index b4783d059e..93f315a972 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -6,7 +6,7 @@ desc = "A basic handheld radio that communicates with local telecommunication networks." dog_fashion = /datum/dog_fashion/back - flags_1 = CONDUCT_1 | HEAR_1 + flags_1 = CONDUCT_1 | HEAR_1 | NO_EMP_WIRES_1 slot_flags = ITEM_SLOT_BELT throw_speed = 3 throw_range = 7 @@ -43,7 +43,7 @@ //FREQ_BROADCASTING = 2 /obj/item/radio/suicide_act(mob/living/user) - user.visible_message("[user] starts bouncing [src] off [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] starts bouncing [src] off their head! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS /obj/item/radio/proc/set_frequency(new_frequency) @@ -95,10 +95,6 @@ for(var/ch_name in channels) secure_radio_connections[ch_name] = add_radio(src, GLOB.radiochannels[ch_name]) -/obj/item/radio/ComponentInitialize() - . = ..() - AddComponent(/datum/component/empprotection, EMP_PROTECT_WIRES) - /obj/item/radio/interact(mob/user) if (..()) return @@ -343,9 +339,6 @@ return ..() /obj/item/radio/emp_act(severity) - . = ..() - if (. & EMP_PROTECT_SELF) - return emped++ //There's been an EMP; better count it var/curremp = emped //Remember which EMP this was if (listening && ismob(loc)) // if the radio is turned on and on someone's person they notice @@ -360,6 +353,7 @@ emped = 0 if (!istype(src, /obj/item/radio/intercom)) // intercoms will turn back on on their own on = TRUE + ..() /////////////////////////////// //////////Borg Radios//////////