diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 7e095329af..0faf54151a 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -2108,10 +2108,6 @@ }, /turf/closed/indestructible/riveted, /area/space) -"fy" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/tdome/arena_source) "fz" = ( /turf/open/floor/plasteel, /area/tdome/arena_source) @@ -15117,10 +15113,6 @@ }, /turf/open/floor/plasteel, /area/tdome/tdomeobserve) -"Is" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/tdome/arena) "It" = ( /turf/open/floor/plasteel, /area/tdome/arena) @@ -16975,6 +16967,13 @@ }, /turf/open/floor/wood, /area/centcom/holding) +"Oy" = ( +/obj/machinery/computer/cryopod{ + dir = 8; + pixel_x = 26 + }, +/turf/open/floor/wood, +/area/centcom/holding) "Oz" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -18243,6 +18242,12 @@ }, /turf/open/floor/wood, /area/centcom/holding) +"WB" = ( +/obj/machinery/cryopod/ghost_cafe{ + dir = 8 + }, +/turf/open/floor/wood, +/area/centcom/holding) "WC" = ( /obj/structure/table/reinforced, /obj/item/pen, @@ -47762,9 +47767,9 @@ Xk Xk GY NT -Xk +Oy Ms -Xk +WB NT vt Mx @@ -60356,14 +60361,14 @@ GM HW HW Il -Is +IF IE IX Jh Jh Js IE -Is +IF JI JP JZ @@ -63954,14 +63959,14 @@ GM HW HW Il -Is +IF IJ IY Jk Jk Jt IJ -Is +IF JI JP Kc @@ -78178,14 +78183,14 @@ fa fn fr fx -fy +fF fE fL fN fN fS fE -fy +fF ab aa aa @@ -81776,14 +81781,14 @@ dA dA dA fx -fy +fF fJ fM fQ fQ fT fJ -fy +fF ab aa aa diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 98dd91d3bd..b26cae2fb0 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -177,6 +177,8 @@ // 15 minutes-ish safe period before being despawned. var/time_till_despawn = 15 * 600 // This is reduced by 90% if a player manually enters cryo var/despawn_world_time = null // Used to keep track of the safe period. + var/penalize_cryo = TRUE // Makes it so that players who cryo are not eligible for midround antags. + var/announce_cryo = TRUE // Makes it so when players cryo it's announced to the station var/obj/machinery/computer/cryopod/control_computer var/last_no_computer_message = 0 @@ -401,14 +403,14 @@ if(control_computer) control_computer.frozen_crew += "[mob_occupant.real_name]" - if(GLOB.announcement_systems.len) + if(GLOB.announcement_systems.len && announce_cryo) var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems) announcer.announce("CRYOSTORAGE", mob_occupant.real_name, announce_rank, list()) visible_message("\The [src] hums and hisses as it moves [mob_occupant.real_name] into storage.") // Ghost and delete the mob. if(!mob_occupant.get_ghost(1)) - mob_occupant.ghostize(FALSE, penalize = TRUE) + mob_occupant.ghostize(FALSE, penalize = penalize_cryo) QDEL_NULL(occupant) open_machine() @@ -491,4 +493,8 @@ //Attacks/effects. /obj/machinery/cryopod/blob_act() - return //Sorta gamey, but we don't really want these to be destroyed. \ No newline at end of file + return //Sorta gamey, but we don't really want these to be destroyed. + +/obj/machinery/cryopod/ghost_cafe + penalize_cryo = FALSE + announce_cryo = FALSE