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
+5 -5
View File
@@ -27,15 +27,15 @@
"catastrophic" = 10))
switch(wave_name)
if("normal")
wave_type = meteors_normal
wave_type = GLOB.meteors_normal
if("threatening")
wave_type = meteors_threatening
wave_type = GLOB.meteors_threatening
if("catastrophic")
wave_type = meteors_catastrophic
wave_type = GLOB.meteors_catastrophic
if("meaty")
wave_type = meteorsB
wave_type = GLOB.meteorsB
if("space dust")
wave_type = meteorsC
wave_type = GLOB.meteorsC
else
WARNING("Wave name of [wave_name] not recognised.")
kill()