[MIRROR] Cleans up some Initializes (#943)
* Cleans up some Initializes * Update farm_animals.dm * Delete farm_animals.dm.rej * Update farm_animals.dm
This commit is contained in:
committed by
Poojawa
parent
620b756025
commit
c61bb0476f
@@ -45,13 +45,6 @@
|
||||
remove_radio(src, frequency)
|
||||
frequency = add_radio(src, new_frequency)
|
||||
|
||||
/obj/item/device/radio/New()
|
||||
wires = new /datum/wires/radio(src)
|
||||
if(prison_radio)
|
||||
wires.cut(WIRE_TX) // OH GOD WHY
|
||||
secure_radio_connections = new
|
||||
..()
|
||||
|
||||
/obj/item/device/radio/proc/recalculateChannels()
|
||||
channels = list()
|
||||
translate_binary = 0
|
||||
@@ -92,7 +85,11 @@
|
||||
return ..()
|
||||
|
||||
/obj/item/device/radio/Initialize()
|
||||
..()
|
||||
wires = new /datum/wires/radio(src)
|
||||
if(prison_radio)
|
||||
wires.cut(WIRE_TX) // OH GOD WHY
|
||||
secure_radio_connections = new
|
||||
. = ..()
|
||||
frequency = sanitize_frequency(frequency, freerange)
|
||||
set_frequency(frequency)
|
||||
|
||||
@@ -296,6 +293,7 @@
|
||||
// --- Cold, emotionless machines. ---
|
||||
else if(isobj(M))
|
||||
jobname = "Machine"
|
||||
voice = capitalize(voice)
|
||||
|
||||
// --- Unidentifiable mob ---
|
||||
else
|
||||
@@ -599,4 +597,4 @@
|
||||
|
||||
/obj/item/device/radio/off // Station bounced radios, their only difference is spawning with the speakers off, this was made to help the lag.
|
||||
listening = 0 // And it's nice to have a subtype too for future features.
|
||||
dog_fashion = /datum/dog_fashion/back
|
||||
dog_fashion = /datum/dog_fashion/back
|
||||
@@ -502,7 +502,7 @@
|
||||
|
||||
|
||||
/obj/item/weapon/storage/Initialize(mapload)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
can_hold = typecacheof(can_hold)
|
||||
cant_hold = typecacheof(cant_hold)
|
||||
|
||||
Reference in New Issue
Block a user