Merge pull request #7249 from Crazylemon64/radio_gc_fix

Radios no longer double-dip initialize 4noraisin
This commit is contained in:
Fox McCloud
2017-05-07 06:03:58 -04:00
committed by GitHub
2 changed files with 2 additions and 4 deletions
+2 -2
View File
@@ -26,7 +26,7 @@
// If you're wondering what goofery this is, this is for things that need the environment
// around them set up - like `air_update_turf` and the like
if((ticker && ticker.current_state == GAME_STATE_PLAYING))
if((ticker && ticker.current_state >= GAME_STATE_SETTING_UP))
attempt_init()
/atom/movable/Destroy()
@@ -231,7 +231,7 @@
if(isobj(A))
if(A.density && !A.throwpass) // **TODO: Better behaviour for windows which are dense, but shouldn't always stop movement
src.throw_impact(A,speed)
/atom/movable/proc/throw_at_fast(atom/target, range, speed, thrower, no_spin)
set waitfor = 0
throw_at(target, range, speed, thrower, no_spin)
@@ -66,8 +66,6 @@ var/global/list/default_medbay_channels = list(
/obj/item/device/radio/New()
..()
wires = new(src)
if(radio_controller)
initialize()
internal_channels = default_internal_channels.Copy()
global_radios |= src