Merge pull request #12533 from Very-Soft/autoresleever

Smol fix
This commit is contained in:
Casey
2022-03-25 06:00:45 -04:00
committed by GitHub
2 changed files with 22 additions and 8 deletions

View File

@@ -12,7 +12,6 @@
var/respawn = 30 MINUTES //The time to wait if you didn't die from vore
var/spawn_slots = -1 //How many people can be spawned from this? If -1 it's unlimited
var/spawntype //The kind of mob that will be spawned, if set.
var/update_i = FALSE
/obj/machinery/transhuman/autoresleever/update_icon()
. = ..()
@@ -164,6 +163,12 @@
log_admin("[new_character.ckey]'s character [new_character.real_name] has been auto-resleeved.")
message_admins("[new_character.ckey]'s character [new_character.real_name] has been auto-resleeved.")
var/datum/transcore_db/db = SStranscore.db_by_mind_name(new_character.mind.name)
if(db)
var/datum/transhuman/mind_record/record = db.backed_up[new_character.mind.name]
if((world.time - record.last_notification) < 30 MINUTES)
global_announcer.autosay("[new_character.name] has been resleeved by the automatic resleeving system.", "TransCore Oversight", new_character.isSynthetic() ? "Science" : "Medical")
if(spawn_slots == -1)
return
else if(spawn_slots == 0)

View File

@@ -30694,8 +30694,7 @@
/obj/structure/disposalpipe/trunk{
dir = 2
},
/obj/machinery/disposal/deliveryChute,
/obj/structure/plasticflaps,
/obj/structure/disposaloutlet,
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
},
@@ -33890,10 +33889,6 @@
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"idk" = (
/obj/machinery/alarm{
dir = 8;
pixel_x = 22
},
/obj/effect/floor_decal/borderfloorwhite{
dir = 6
},
@@ -33903,6 +33898,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
/obj/machinery/alarm{
alarm_id = "pen_nine";
breach_detection = 0;
dir = 1;
pixel_y = -22
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/autoresleeving)
"iee" = (
@@ -36027,6 +36028,14 @@
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/weaponsrange)
"nzU" = (
/obj/machinery/door/airlock/medical{
id_tag = null;
name = "Auto Resleeving";
req_access = list(5)
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/autoresleeving)
"nAK" = (
/turf/simulated/wall/r_wall,
/area/maintenance/engineering/atmos/airlock/gas)
@@ -53936,7 +53945,7 @@ awz
aeU
uIU
uIU
uIU
nzU
uIU
axP
qBa