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
+9 -9
View File
@@ -1,6 +1,6 @@
var/hsboxspawn = 1
GLOBAL_VAR_INIT(hsboxspawn, TRUE)
/mob
var/datum/hSB/sandbox = null
@@ -113,13 +113,13 @@ var/hsboxspawn = 1
//
if("hsbtobj")
if(!admin) return
if(hsboxspawn)
if(GLOB.hsboxspawn)
to_chat(world, "<span class='boldannounce'>Sandbox:</span> <b>\black[usr.key] has disabled object spawning!</b>")
hsboxspawn = 0
GLOB.hsboxspawn = FALSE
return
else
to_chat(world, "<span class='boldnotice'>Sandbox:</span> <b>\black[usr.key] has enabled object spawning!</b>")
hsboxspawn = 1
GLOB.hsboxspawn = TRUE
return
//
// Admin: Toggle auto-close
@@ -216,7 +216,7 @@ var/hsboxspawn = 1
// Spawn check due to grief potential (destroying floors, walls, etc)
//
if("hsbrcd")
if(!hsboxspawn) return
if(!GLOB.hsboxspawn) return
new/obj/item/weapon/rcd/combat(usr.loc)
@@ -232,7 +232,7 @@ var/hsboxspawn = 1
// Clothing
if("hsbcloth")
if(!hsboxspawn) return
if(!GLOB.hsboxspawn) return
if(!clothinfo)
clothinfo = "<b>Clothing</b> <a href='?\ref[src];hsb=hsbreag'>(Reagent Containers)</a> <a href='?\ref[src];hsb=hsbobj'>(Other Items)</a><hr><br>"
@@ -246,7 +246,7 @@ var/hsboxspawn = 1
// Reagent containers
if("hsbreag")
if(!hsboxspawn) return
if(!GLOB.hsboxspawn) return
if(!reaginfo)
reaginfo = "<b>Reagent Containers</b> <a href='?\ref[src];hsb=hsbcloth'>(Clothing)</a> <a href='?\ref[src];hsb=hsbobj'>(Other Items)</a><hr><br>"
@@ -260,7 +260,7 @@ var/hsboxspawn = 1
// Other items
if("hsbobj")
if(!hsboxspawn) return
if(!GLOB.hsboxspawn) return
if(!objinfo)
objinfo = "<b>Other Items</b> <a href='?\ref[src];hsb=hsbcloth'>(Clothing)</a> <a href='?\ref[src];hsb=hsbreag'>(Reagent Containers)</a><hr><br>"
@@ -277,7 +277,7 @@ var/hsboxspawn = 1
// Safespawn checks to see if spawning is disabled.
//
if("hsb_safespawn")
if(!hsboxspawn)
if(!GLOB.hsboxspawn)
usr << browse(null,"window=sandbox")
return
+1 -1
View File
@@ -7,7 +7,7 @@
announce_text = "Build your own station... or just shoot each other!"
/datum/game_mode/sandbox/pre_setup()
for(var/mob/M in player_list)
for(var/mob/M in GLOB.player_list)
M.CanBuild()
return 1