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
@@ -21,15 +21,15 @@
/obj/structure/destructible/clockwork/New()
..()
change_construction_value(construction_value)
all_clockwork_objects += src
GLOB.all_clockwork_objects += src
/obj/structure/destructible/clockwork/Destroy()
change_construction_value(-construction_value)
all_clockwork_objects -= src
GLOB.all_clockwork_objects -= src
return ..()
/obj/structure/destructible/clockwork/ratvar_act()
if(ratvar_awakens || clockwork_gateway_activated)
if(GLOB.ratvar_awakens || GLOB.clockwork_gateway_activated)
obj_integrity = max_integrity
/obj/structure/destructible/clockwork/narsie_act()
@@ -78,7 +78,7 @@
return ..()
/obj/structure/destructible/clockwork/proc/get_efficiency_mod(increasing)
if(ratvar_awakens)
if(GLOB.ratvar_awakens)
if(increasing)
return 0.5
return 2
@@ -144,10 +144,10 @@
/obj/structure/destructible/clockwork/massive/New()
..()
poi_list += src
GLOB.poi_list += src
/obj/structure/destructible/clockwork/massive/Destroy()
poi_list -= src
GLOB.poi_list -= src
return ..()
/obj/structure/destructible/clockwork/massive/singularity_pull(S, current_size)
@@ -177,7 +177,7 @@
/obj/structure/destructible/clockwork/powered/ratvar_act()
..()
if(nezbere_invoked)
if(GLOB.nezbere_invoked)
needs_power = FALSE
else
needs_power = initial(needs_power)
@@ -225,7 +225,7 @@
new /obj/effect/overlay/temp/emp(loc)
/obj/structure/destructible/clockwork/powered/proc/total_accessable_power() //how much power we have and can use
if(!needs_power || ratvar_awakens)
if(!needs_power || GLOB.ratvar_awakens)
return INFINITY //oh yeah we've got power why'd you ask
var/power = 0
@@ -237,7 +237,7 @@
var/power = 0
var/area/A = get_area(src)
var/area/targetAPCA
for(var/obj/machinery/power/apc/APC in apcs_list)
for(var/obj/machinery/power/apc/APC in GLOB.apcs_list)
var/area/APCA = get_area(APC)
if(APCA == A)
target_apc = APC
@@ -259,7 +259,7 @@
/obj/structure/destructible/clockwork/powered/proc/try_use_power(amount) //try to use an amount of power
if(!needs_power || ratvar_awakens)
if(!needs_power || GLOB.ratvar_awakens)
return 1
if(amount <= 0)
return FALSE