April sync (#360)

* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
This commit is contained in:
Poojawa
2017-04-13 23:37:00 -05:00
committed by GitHub
parent cdc32c98fa
commit 7e9b96a00f
1322 changed files with 174827 additions and 23888 deletions
+16 -8
View File
@@ -1,6 +1,4 @@
var/datum/controller/subsystem/persistence/SSpersistence
/datum/controller/subsystem/persistence
SUBSYSTEM_DEF(persistence)
name = "Persistence"
init_order = -100
flags = SS_NO_FIRE
@@ -13,9 +11,6 @@ var/datum/controller/subsystem/persistence/SSpersistence
var/list/saved_messages = list()
var/savefile/chisel_messages_sav
/datum/controller/subsystem/persistence/New()
NEW_SS_GLOBAL(SSpersistence)
/datum/controller/subsystem/persistence/Initialize()
LoadSatchels()
LoadPoly()
@@ -71,7 +66,7 @@ var/datum/controller/subsystem/persistence/SSpersistence
return 1
/datum/controller/subsystem/persistence/proc/LoadPoly()
for(var/mob/living/simple_animal/parrot/Poly/P in living_mob_list)
for(var/mob/living/simple_animal/parrot/Poly/P in GLOB.living_mob_list)
twitterize(P.speech_buffer, "polytalk")
break //Who's been duping the bird?!
@@ -86,12 +81,25 @@ var/datum/controller/subsystem/persistence/SSpersistence
var/saved_messages = json_decode(saved_json)
for(var/item in saved_messages)
var/turf/T = locate(item["x"], item["y"], ZLEVEL_STATION)
if(!islist(item))
continue
var/xvar = item["x"]
var/yvar = item["y"]
var/zvar = item["z"]
if(!xvar || !yvar || !zvar)
continue
var/turf/T = locate(xvar, yvar, zvar)
if(!isturf(T))
continue
if(locate(/obj/structure/chisel_message) in T)
continue
var/obj/structure/chisel_message/M = new(T)
M.unpack(item)
if(!M.loc)
M.persists = FALSE