From ceb4b5b76e1d03afea5bae0a99bb35e26aefa56a Mon Sep 17 00:00:00 2001 From: Denton Date: Mon, 27 Jan 2020 08:49:17 +0100 Subject: [PATCH] Fixes constructed display cases --- code/game/objects/structures/displaycase.dm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 6f39b907f0c..81e31dc49b1 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -214,7 +214,7 @@ to_chat(user, "You start adding [G] to [src]...") if(do_after(user, 20, target = src)) G.use(10) - var/obj/structure/displaycase/display = new(src.loc) + var/obj/structure/displaycase/noalert/display = new(src.loc) if(electronics) electronics.forceMove(display) display.electronics = electronics @@ -226,12 +226,10 @@ else return ..() -//The captains display case requiring specops ID access is intentional. -//The lab cage and captains display case do not spawn with electronics, which is why req_access is needed. +//The lab cage and captain's display case do not spawn with electronics, which is why req_access is needed. /obj/structure/displaycase/captain - alert = TRUE start_showpiece_type = /obj/item/gun/energy/laser/captain - req_access = list(ACCESS_CENT_SPECOPS) + req_access = list(ACCESS_CENT_SPECOPS) //this was intentional, presumably to make it slightly harder for caps to grab their gun roundstart /obj/structure/displaycase/labcage name = "lab cage" @@ -239,14 +237,15 @@ start_showpiece_type = /obj/item/clothing/mask/facehugger/lamarr req_access = list(ACCESS_RD) +/obj/structure/displaycase/noalert + alert = FALSE + /obj/structure/displaycase/trophy name = "trophy display case" desc = "Store your trophies of accomplishment in here, and they will stay forever." var/placer_key = "" var/added_roundstart = TRUE var/is_locked = TRUE - - alert = TRUE integrity_failure = 0 openable = FALSE