cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 21:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-10840

Browse Source
This commit is contained in:
Nadyr
2021-07-03 21:00:21 -04:00
committed by GitHub
parent 896f6c1641 4a07e7ffe9
commit eae90a8412
286 changed files with 18423 additions and 12641 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/transcore_vr.dm
+6 -8
View File
@@ -15,7 +15,7 @@ SUBSYSTEM_DEF(transcore)
init_order = INIT_ORDER_TRANSCORE
// THINGS
var/overdue_time = 15 MINUTES
var/overdue_time = 6 MINUTES // Has to be a multiple of wait var, or else will just round up anyway.
var/current_step = SSTRANSCORE_IMPLANTS
@@ -113,8 +113,9 @@ SUBSYSTEM_DEF(transcore)
curr_MR.dead_state = MR_NORMAL
else
if(curr_MR.dead_state != MR_DEAD) //First time switching to dead
db.notify(curr_MR.mindname)
curr_MR.last_notification = world.time
if(curr_MR.do_notify)
db.notify(curr_MR.mindname)
curr_MR.last_notification = world.time
curr_MR.dead_state = MR_DEAD
if(MC_TICK_CHECK)
@@ -250,12 +251,9 @@ SUBSYSTEM_DEF(transcore)
return 1
// Send a past-due notification to the medical radio channel.
/datum/transcore_db/proc/notify(var/name, var/repeated = FALSE)
/datum/transcore_db/proc/notify(var/name)
ASSERT(name)
if(repeated)
global_announcer.autosay("This is a repeat notification that [name] is past-due for a mind backup.", "TransCore Oversight", "Medical")
else
global_announcer.autosay("[name] is past-due for a mind backup.", "TransCore Oversight", "Medical")
global_announcer.autosay("[name] is past-due for a mind backup.", "TransCore Oversight", "Medical")
// Called from mind_record to add itself to the transcore.
/datum/transcore_db/proc/add_backup(var/datum/transhuman/mind_record/MR)
code/controllers/subsystems/vis_overlays.dm
+16 -4
View File
@@ -29,18 +29,18 @@ SUBSYSTEM_DEF(vis_overlays)
return
//the "thing" var can be anything with vis_contents which includes images - in the future someone should totally allow vis overlays to be passed in as an arg instead of all this bullshit
/datum/controller/subsystem/vis_overlays/proc/add_vis_overlay(atom/movable/thing, icon, iconstate, layer, plane, dir, alpha = 255, add_appearance_flags = NONE, unique = FALSE)
/datum/controller/subsystem/vis_overlays/proc/add_vis_overlay(atom/movable/thing, icon, iconstate, layer, plane, dir, alpha = 255, add_appearance_flags = NONE, add_vis_flags = NONE, unique = FALSE)
var/obj/effect/overlay/vis/overlay
if(!unique)
. = "[icon]|[iconstate]|[layer]|[plane]|[dir]|[alpha]|[add_appearance_flags]"
overlay = vis_overlay_cache[.]
if(!overlay)
overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags)
overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags)
vis_overlay_cache[.] = overlay
else
overlay.unused = 0
else
overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags)
overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags)
overlay.cache_expiration = -1
var/cache_id = "\ref[overlay]@{[world.time]}"
vis_overlay_cache[cache_id] = overlay
@@ -56,7 +56,7 @@ SUBSYSTEM_DEF(vis_overlays)
thing.managed_vis_overlays += overlay
return overlay
/datum/controller/subsystem/vis_overlays/proc/_create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags)
/datum/controller/subsystem/vis_overlays/proc/_create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags)
var/obj/effect/overlay/vis/overlay = new
overlay.icon = icon
overlay.icon_state = iconstate
@@ -65,6 +65,7 @@ SUBSYSTEM_DEF(vis_overlays)
overlay.dir = dir
overlay.alpha = alpha
overlay.appearance_flags |= add_appearance_flags
overlay.vis_flags |= add_vis_flags
return overlay
@@ -75,3 +76,14 @@ SUBSYSTEM_DEF(vis_overlays)
thing.managed_vis_overlays -= overlays
if(!length(thing.managed_vis_overlays))
thing.managed_vis_overlays = null
/atom/proc/add_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags, unique)
// The extremely minimal version where you just pass a string and nothing else
if(istext(icon))
iconstate = icon
icon = src.icon
return SSvis_overlays.add_vis_overlay(src, icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags, unique)
/atom/proc/remove_vis_overlay(list/overlays)
return SSvis_overlays.remove_vis_overlay(src, overlays)