Tg port 2 15 (#230)

* defines/helpers

* globalvars, onclick, controllers

* datums and game

* woooooooooorld. Uh. dm

* modules sans mobs client admin

* modules/admin

* pref shit

* modules/mob

* icon updates

* extra things

* Cherrypicked fixes from open PRs

* metastation.tgm fix

* a better meta fix

* reverts async breakings
This commit is contained in:
Poojawa
2017-02-15 03:35:32 -06:00
committed by GitHub
parent fd3923d684
commit fc2dbcd9fe
192 changed files with 10451 additions and 160669 deletions
+2 -8
View File
@@ -37,17 +37,11 @@
create(ckey = user.ckey)
/obj/effect/mob_spawn/Initialize(mapload)
if(roundstart && (mapload || (ticker && ticker.current_state > GAME_STATE_SETTING_UP)))
if(instant || (roundstart && (mapload || (ticker && ticker.current_state > GAME_STATE_SETTING_UP))))
create()
else
poi_list |= src
/obj/effect/mob_spawn/New()
..()
if(instant)
create()
/obj/effect/mob_spawn/Destroy()
poi_list.Remove(src)
. = ..()
@@ -483,4 +477,4 @@
if(despawn == "No" || !loc || !Adjacent(user))
return
user.visible_message("<span class='notice'>[user.name] climbs back into cryosleep...</span>")
qdel(user)
qdel(user)