shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

April sync (#360)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/Space_Station_13_areas.dm
+2 -2
View File
@@ -1002,7 +1002,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
*/
//SPACE STATION 13
var/list/the_station_areas = list (
GLOBAL_LIST_INIT(the_station_areas, list (
/area/atmos,
/area/maintenance,
/area/hallway,
@@ -1031,4 +1031,4 @@ var/list/the_station_areas = list (
/area/ai_monitored/turret_protected/ai_upload, //do not try to simplify to "/area/ai_monitored/turret_protected" --rastaf0
/area/ai_monitored/turret_protected/ai_upload_foyer,
/area/ai_monitored/turret_protected/ai,
)
))
code/game/area/areas.dm
+29 -29
View File
@@ -64,20 +64,20 @@
/*Adding a wizard area teleport list because motherfucking lag -- Urist*/
/*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/
var/list/teleportlocs = list()
GLOBAL_LIST_EMPTY(teleportlocs)
/proc/process_teleport_locs()
for(var/V in sortedAreas)
for(var/V in GLOB.sortedAreas)
var/area/AR = V
if(istype(AR, /area/shuttle) || AR.noteleport)
continue
if(teleportlocs[AR.name])
if(GLOB.teleportlocs[AR.name])
continue
var/turf/picked = safepick(get_area_turfs(AR.type))
if (picked && (picked.z == ZLEVEL_STATION))
teleportlocs[AR.name] = AR
GLOB.teleportlocs[AR.name] = AR
sortTim(teleportlocs, /proc/cmp_text_dsc)
sortTim(GLOB.teleportlocs, /proc/cmp_text_dsc)
// ===
@@ -137,24 +137,24 @@ var/list/teleportlocs = list()
var/list/cameras = list()
for (var/obj/machinery/camera/C in src)
cameras += C
for (var/mob/living/silicon/aiPlayer in player_list)
for (var/mob/living/silicon/aiPlayer in GLOB.player_list)
if (state == 1)
aiPlayer.cancelAlarm("Power", src, source)
else
aiPlayer.triggerAlarm("Power", src, cameras, source)
for(var/obj/machinery/computer/station_alert/a in machines)
for(var/obj/machinery/computer/station_alert/a in GLOB.machines)
if(state == 1)
a.cancelAlarm("Power", src, source)
else
a.triggerAlarm("Power", src, cameras, source)
for(var/mob/living/simple_animal/drone/D in mob_list)
for(var/mob/living/simple_animal/drone/D in GLOB.mob_list)
if(state == 1)
D.cancelAlarm("Power", src, source)
else
D.triggerAlarm("Power", src, cameras, source)
for(var/datum/computer_file/program/alarm_monitor/p in alarmdisplay)
for(var/datum/computer_file/program/alarm_monitor/p in GLOB.alarmdisplay)
if(state == 1)
p.cancelAlarm("Power", src, source)
else
@@ -168,23 +168,23 @@ var/list/teleportlocs = list()
for(var/obj/machinery/camera/C in RA)
cameras += C
for(var/mob/living/silicon/aiPlayer in player_list)
for(var/mob/living/silicon/aiPlayer in GLOB.player_list)
aiPlayer.triggerAlarm("Atmosphere", src, cameras, source)
for(var/obj/machinery/computer/station_alert/a in machines)
for(var/obj/machinery/computer/station_alert/a in GLOB.machines)
a.triggerAlarm("Atmosphere", src, cameras, source)
for(var/mob/living/simple_animal/drone/D in mob_list)
for(var/mob/living/simple_animal/drone/D in GLOB.mob_list)
D.triggerAlarm("Atmosphere", src, cameras, source)
for(var/datum/computer_file/program/alarm_monitor/p in alarmdisplay)
for(var/datum/computer_file/program/alarm_monitor/p in GLOB.alarmdisplay)
p.triggerAlarm("Atmosphere", src, cameras, source)
else if (src.atmosalm == 2)
for(var/mob/living/silicon/aiPlayer in player_list)
for(var/mob/living/silicon/aiPlayer in GLOB.player_list)
aiPlayer.cancelAlarm("Atmosphere", src, source)
for(var/obj/machinery/computer/station_alert/a in machines)
for(var/obj/machinery/computer/station_alert/a in GLOB.machines)
a.cancelAlarm("Atmosphere", src, source)
for(var/mob/living/simple_animal/drone/D in mob_list)
for(var/mob/living/simple_animal/drone/D in GLOB.mob_list)
D.cancelAlarm("Atmosphere", src, source)
for(var/datum/computer_file/program/alarm_monitor/p in alarmdisplay)
for(var/datum/computer_file/program/alarm_monitor/p in GLOB.alarmdisplay)
p.cancelAlarm("Atmosphere", src, source)
src.atmosalm = danger_level
@@ -203,9 +203,9 @@ var/list/teleportlocs = list()
if(A.fire)
cont = FALSE
break
if(cont)
if(cont && D.is_operational())
if(D.operating)
D.nextstate = opening ? OPEN : CLOSED
D.nextstate = opening ? FIREDOOR_OPEN : FIREDOOR_CLOSED
else if(!(D.density ^ opening))
INVOKE_ASYNC(D, (opening ? /obj/machinery/door/firedoor.proc/open : /obj/machinery/door/firedoor.proc/close))
@@ -224,13 +224,13 @@ var/list/teleportlocs = list()
for (var/obj/machinery/camera/C in RA)
cameras += C
for (var/obj/machinery/computer/station_alert/a in machines)
for (var/obj/machinery/computer/station_alert/a in GLOB.machines)
a.triggerAlarm("Fire", src, cameras, source)
for (var/mob/living/silicon/aiPlayer in player_list)
for (var/mob/living/silicon/aiPlayer in GLOB.player_list)
aiPlayer.triggerAlarm("Fire", src, cameras, source)
for (var/mob/living/simple_animal/drone/D in mob_list)
for (var/mob/living/simple_animal/drone/D in GLOB.mob_list)
D.triggerAlarm("Fire", src, cameras, source)
for(var/datum/computer_file/program/alarm_monitor/p in alarmdisplay)
for(var/datum/computer_file/program/alarm_monitor/p in GLOB.alarmdisplay)
p.triggerAlarm("Fire", src, cameras, source)
START_PROCESSING(SSobj, src)
@@ -245,13 +245,13 @@ var/list/teleportlocs = list()
for(var/obj/machinery/firealarm/F in RA)
F.update_icon()
for (var/mob/living/silicon/aiPlayer in player_list)
for (var/mob/living/silicon/aiPlayer in GLOB.player_list)
aiPlayer.cancelAlarm("Fire", src, source)
for (var/obj/machinery/computer/station_alert/a in machines)
for (var/obj/machinery/computer/station_alert/a in GLOB.machines)
a.cancelAlarm("Fire", src, source)
for (var/mob/living/simple_animal/drone/D in mob_list)
for (var/mob/living/simple_animal/drone/D in GLOB.mob_list)
D.cancelAlarm("Fire", src, source)
for(var/datum/computer_file/program/alarm_monitor/p in alarmdisplay)
for(var/datum/computer_file/program/alarm_monitor/p in GLOB.alarmdisplay)
p.cancelAlarm("Fire", src, source)
STOP_PROCESSING(SSobj, src)
@@ -282,7 +282,7 @@ var/list/teleportlocs = list()
for (var/obj/machinery/camera/C in RA)
cameras += C
for (var/mob/living/silicon/SILICON in player_list)
for (var/mob/living/silicon/SILICON in GLOB.player_list)
if(SILICON.triggerAlarm("Burglar", src, cameras, trigger))
//Cancel silicon alert after 1 minute
addtimer(CALLBACK(SILICON, /mob/living/silicon.proc/cancelAlarm,"Burglar",src,trigger), 600)
@@ -454,7 +454,7 @@ var/list/teleportlocs = list()
return 1
else
// There's a gravity generator on our z level
if(T && gravity_generators["[T.z]"] && length(gravity_generators["[T.z]"]))
if(T && GLOB.gravity_generators["[T.z]"] && length(GLOB.gravity_generators["[T.z]"]))
return 1
return 0