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

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/processing/fastprocess.dm
+3 -3
View File
@@ -1,10 +1,10 @@
//Fires five times every second.
var/datum/subsystem/processing/fastprocess/SSfastprocess
/datum/subsystem/processing/fastprocess
var/datum/controller/subsystem/processing/fastprocess/SSfastprocess
/datum/controller/subsystem/processing/fastprocess
name = "Fast Processing"
wait = 2
stat_tag = "FP"
/datum/subsystem/processing/fastprocess/New()
/datum/controller/subsystem/processing/fastprocess/New()
NEW_SS_GLOBAL(SSfastprocess)
code/controllers/subsystem/processing/flightpacks.dm
+3 -3
View File
@@ -1,11 +1,11 @@
var/datum/subsystem/processing/flightpacks/SSflightpacks
/datum/subsystem/processing/flightpacks
var/datum/controller/subsystem/processing/flightpacks/SSflightpacks
/datum/controller/subsystem/processing/flightpacks
name = "Flightpack Movement"
priority = 30
wait = 2
stat_tag = "FM"
flags = SS_NO_INIT|SS_TICKER|SS_KEEP_TIMING
/datum/subsystem/processing/flightpacks/New()
/datum/controller/subsystem/processing/flightpacks/New()
NEW_SS_GLOBAL(SSflightpacks)
code/controllers/subsystem/processing/objects.dm
+6 -6
View File
@@ -1,5 +1,5 @@
var/datum/subsystem/objects/SSobj
/datum/subsystem/objects
var/datum/controller/subsystem/objects/SSobj
/datum/controller/subsystem/objects
name = "Objects"
priority = 40
flags = SS_NO_INIT
@@ -7,12 +7,12 @@ var/datum/subsystem/objects/SSobj
var/list/processing = list()
var/list/currentrun = list()
/datum/subsystem/objects/New()
/datum/controller/subsystem/objects/New()
NEW_SS_GLOBAL(SSobj)
/datum/subsystem/objects/stat_entry()
/datum/controller/subsystem/objects/stat_entry()
..("P:[processing.len]")
/datum/subsystem/objects/fire(resumed = 0)
/datum/controller/subsystem/objects/fire(resumed = 0)
if (!resumed)
src.currentrun = processing.Copy()
//cache for sanic speed (lists are references anyways)
@@ -28,5 +28,5 @@ var/datum/subsystem/objects/SSobj
if (MC_TICK_CHECK)
return
/datum/subsystem/objects/Recover()
/datum/controller/subsystem/objects/Recover()
processing = SSobj.processing
code/controllers/subsystem/processing/overlays.dm
+24 -21
View File
@@ -1,6 +1,6 @@
var/datum/subsystem/processing/overlays/SSoverlays
var/datum/controller/subsystem/processing/overlays/SSoverlays
/datum/subsystem/processing/overlays
/datum/controller/subsystem/processing/overlays
name = "Overlay"
flags = SS_TICKER|SS_FIRE_IN_LOBBY
wait = 1
@@ -13,33 +13,37 @@ var/datum/subsystem/processing/overlays/SSoverlays
var/list/overlay_icon_cache
var/initialized = FALSE
/datum/subsystem/processing/overlays/New()
/datum/controller/subsystem/processing/overlays/New()
NEW_SS_GLOBAL(SSoverlays)
LAZYINITLIST(overlay_icon_state_caches)
LAZYINITLIST(overlay_icon_cache)
/datum/subsystem/processing/overlays/Initialize()
/datum/controller/subsystem/processing/overlays/Initialize()
initialized = TRUE
for(var/I in processing)
var/atom/A = I
A.compile_overlays()
CHECK_TICK
processing.Cut()
Flush()
..()
/datum/subsystem/processing/overlays/Recover()
/datum/controller/subsystem/processing/overlays/Recover()
overlay_icon_state_caches = SSoverlays.overlay_icon_state_caches
overlay_icon_cache = SSoverlays.overlay_icon_cache
processing = SSoverlays.processing
/datum/subsystem/processing/overlays/fire()
/datum/controller/subsystem/processing/overlays/fire(resumed = FALSE, mc_check = TRUE)
while(processing.len)
var/atom/thing = processing[processing.len]
processing.len--
if(thing)
thing.compile_overlays(FALSE)
if(MC_TICK_CHECK)
break
if(mc_check)
if(MC_TICK_CHECK)
break
else
CHECK_TICK
/datum/controller/subsystem/processing/overlays/proc/Flush()
if(processing.len)
testing("Flushing [processing.len] overlays")
fire(mc_check = FALSE) //pair this thread up with the MC to get extra compile time
/atom/proc/compile_overlays()
if(LAZYLEN(priority_overlays) && LAZYLEN(our_overlays))
@@ -54,7 +58,7 @@ var/datum/subsystem/processing/overlays/SSoverlays
/proc/iconstate2appearance(icon, iconstate)
var/static/image/stringbro = new()
var/list/icon_states_cache = SSoverlays.overlay_icon_state_caches
var/list/icon_states_cache = SSoverlays.overlay_icon_state_caches
var/list/cached_icon = icon_states_cache[icon]
if (cached_icon)
var/cached_appearance = cached_icon["[iconstate]"]
@@ -92,16 +96,17 @@ var/datum/subsystem/processing/overlays/SSoverlays
new_overlays[i] = icon2appearance(cached_overlay)
else //image probable
appearance_bro.appearance = cached_overlay
appearance_bro.dir = cached_overlay.dir
if(!ispath(cached_overlay))
appearance_bro.dir = cached_overlay.dir
new_overlays[i] = appearance_bro.appearance
return new_overlays
#define NOT_QUEUED_ALREADY (!(flags & OVERLAY_QUEUED))
#define QUEUE_FOR_COMPILE flags |= OVERLAY_QUEUED; SSoverlays.processing += src;
#define QUEUE_FOR_COMPILE flags |= OVERLAY_QUEUED; SSoverlays.processing += src;
/atom/proc/cut_overlays(priority = FALSE)
var/list/cached_overlays = our_overlays
var/list/cached_priority = priority_overlays
var/need_compile = FALSE
if(LAZYLEN(cached_overlays)) //don't queue empty lists, don't cut priority overlays
@@ -116,7 +121,6 @@ var/datum/subsystem/processing/overlays/SSoverlays
QUEUE_FOR_COMPILE
/atom/proc/cut_overlay(list/overlays, priority)
var/static/image/appearance_bro = new()
if(!overlays)
return
@@ -135,7 +139,6 @@ var/datum/subsystem/processing/overlays/SSoverlays
QUEUE_FOR_COMPILE
/atom/proc/add_overlay(list/overlays, priority = FALSE)
var/static/image/appearance_bro = new()
if(!overlays)
return
@@ -165,7 +168,7 @@ var/datum/subsystem/processing/overlays/SSoverlays
if(cut_old)
cut_overlays()
return
var/list/cached_other = other.our_overlays
if(cached_other)
if(cut_old)
@@ -188,4 +191,4 @@ var/datum/subsystem/processing/overlays/SSoverlays
overlays -= x
/image/proc/cut_overlays(x)
overlays.Cut()
overlays.Cut()
code/controllers/subsystem/processing/processing.dm
+5 -5
View File
@@ -1,7 +1,7 @@
//Used to process objects. Fires once every second.
var/datum/subsystem/processing/SSprocessing
/datum/subsystem/processing
var/datum/controller/subsystem/processing/SSprocessing
/datum/controller/subsystem/processing
name = "Processing"
priority = 25
flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT
@@ -11,13 +11,13 @@ var/datum/subsystem/processing/SSprocessing
var/list/processing = list()
var/list/currentrun = list()
/datum/subsystem/processing/New()
/datum/controller/subsystem/processing/New()
NEW_SS_GLOBAL(SSprocessing)
/datum/subsystem/processing/stat_entry()
/datum/controller/subsystem/processing/stat_entry()
..("[stat_tag]:[processing.len]")
/datum/subsystem/processing/fire(resumed = 0)
/datum/controller/subsystem/processing/fire(resumed = 0)
if (!resumed)
currentrun = processing.Copy()
//cache for sanic speed (lists are references anyways)