diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 3817a16685..768a5ac217 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -16,25 +16,25 @@
var/obj/item/weapon/electronics/airlock/electronics
var/start_showpiece_type = null //add type for items on display
-/obj/structure/displaycase/Initialize()
- . = ..()
+/obj/structure/displaycase/Initialize()
+ . = ..()
if(start_showpiece_type)
showpiece = new start_showpiece_type (src)
update_icon()
/obj/structure/displaycase/Destroy()
if(electronics)
- QDEL_NULL(electronics)
+ QDEL_NULL(electronics)
if(showpiece)
- QDEL_NULL(showpiece)
+ QDEL_NULL(showpiece)
return ..()
/obj/structure/displaycase/examine(mob/user)
..()
if(alert)
to_chat(user, "Hooked up with an anti-theft system.")
- if(showpiece)
- to_chat(user, "There's [showpiece] inside.")
+ if(showpiece)
+ to_chat(user, "There's [showpiece] inside.")
/obj/structure/displaycase/proc/dump()
@@ -175,7 +175,7 @@
user.changeNext_move(CLICK_CD_MELEE)
if (showpiece && (broken || open))
to_chat(user, "You deactivate the hover field built into the case.")
- dump()
+ dump()
src.add_fingerprint(user)
update_icon()
return
@@ -247,96 +247,100 @@
desc = "A glass lab container for storing interesting creatures."
start_showpiece_type = /obj/item/clothing/mask/facehugger/lamarr
req_access = list(GLOB.access_rd)
-
-
-
-/obj/structure/displaycase/trophy
- name = "trophy display case"
- desc = "Store your trophies of accomplishment in here, and they will stay forever."
- var/trophy_message = ""
- var/placer_key = ""
- var/added_roundstart = TRUE
- alert = TRUE
- integrity_failure = 0
-
-/obj/structure/displaycase/trophy/Initialize()
- . = ..()
- GLOB.trophy_cases += src
-
-/obj/structure/displaycase/trophy/Destroy()
- GLOB.trophy_cases -= src
- return ..()
-
-/obj/structure/displaycase/trophy/examine(mob/user)
- ..()
- if(trophy_message)
- to_chat(user, "The plaque reads:")
- to_chat(user, trophy_message)
-
-/obj/structure/displaycase/trophy/attackby(obj/item/weapon/W, mob/user, params)
-
- if(!user.Adjacent(src)) //no TK museology
- return
-
- if(!added_roundstart)
- to_chat(user, "You've already put something new in this case.")
- return
-
- if(is_type_in_typecache(W, GLOB.blacklisted_cargo_types))
- to_chat(user, "The case rejects the [W].")
- return
-
- for(var/a in W.GetAllContents())
- if(is_type_in_typecache(a, GLOB.blacklisted_cargo_types))
- to_chat(user, "The case rejects the [W].")
- return
-
- if(user.drop_item())
-
- if(showpiece)
- to_chat(user, "You press a button, and [showpiece] descends into the floor of the case.")
- QDEL_NULL(showpiece)
-
- to_chat(user, "You insert [W] into the case.")
- W.forceMove(src)
- showpiece = W
- added_roundstart = FALSE
- update_icon()
-
- placer_key = user.ckey
-
- trophy_message = W.desc //default value
-
- var/chosen_plaque = stripped_input(user, "What would you like the plaque to say? Default value is item's description.", "Trophy Plaque")
- if(chosen_plaque)
- if(user.Adjacent(src))
- trophy_message = chosen_plaque
- to_chat(user, "You set the plaque's text.")
- else
- to_chat(user, "You are too far to set the plaque's text.")
-
- SSpersistence.SaveTrophy(src)
-
- else
- to_chat(user, "\The [W] is stuck to your hand, you can't put it in the [src.name]!")
-
- return
-
-/obj/structure/displaycase/trophy/dump()
- if (showpiece)
- if(added_roundstart)
- visible_message("The [showpiece] crumbles to dust!")
- new /obj/effect/decal/cleanable/ash(loc)
- QDEL_NULL(showpiece)
- else
- ..()
-
-/obj/item/showpiece_dummy
- name = "Cheap replica"
-
-/obj/item/showpiece_dummy/Initialize(mapload, path)
- . = ..()
- var/obj/item/I = path
- name = initial(I.name)
- icon = initial(I.icon)
- icon_state = initial(I.icon_state)
+
+
+
+/obj/structure/displaycase/trophy
+ name = "trophy display case"
+ desc = "Store your trophies of accomplishment in here, and they will stay forever."
+ var/trophy_message = ""
+ var/placer_key = ""
+ var/added_roundstart = TRUE
+ alert = TRUE
+ integrity_failure = 0
+
+/obj/structure/displaycase/trophy/Initialize()
+ . = ..()
+ GLOB.trophy_cases += src
+
+/obj/structure/displaycase/trophy/Destroy()
+ GLOB.trophy_cases -= src
+ return ..()
+
+/obj/structure/displaycase/trophy/examine(mob/user)
+ ..()
+ if(trophy_message)
+ to_chat(user, "The plaque reads:")
+ to_chat(user, trophy_message)
+
+/obj/structure/displaycase/trophy/attackby(obj/item/weapon/W, mob/user, params)
+
+ if(!user.Adjacent(src)) //no TK museology
+ return
+
+ if(!(user.mind && user.mind.assigned_role == "Curator"))
+ to_chat(user, "You're not sure how to work this. Maybe you should ask the curator for help.")
+ return
+
+ if(!added_roundstart)
+ to_chat(user, "You've already put something new in this case.")
+ return
+
+ if(is_type_in_typecache(W, GLOB.blacklisted_cargo_types))
+ to_chat(user, "The case rejects the [W].")
+ return
+
+ for(var/a in W.GetAllContents())
+ if(is_type_in_typecache(a, GLOB.blacklisted_cargo_types))
+ to_chat(user, "The case rejects the [W].")
+ return
+
+ if(user.drop_item())
+
+ if(showpiece)
+ to_chat(user, "You press a button, and [showpiece] descends into the floor of the case.")
+ QDEL_NULL(showpiece)
+
+ to_chat(user, "You insert [W] into the case.")
+ W.forceMove(src)
+ showpiece = W
+ added_roundstart = FALSE
+ update_icon()
+
+ placer_key = user.ckey
+
+ trophy_message = W.desc //default value
+
+ var/chosen_plaque = stripped_input(user, "What would you like the plaque to say? Default value is item's description.", "Trophy Plaque")
+ if(chosen_plaque)
+ if(user.Adjacent(src))
+ trophy_message = chosen_plaque
+ to_chat(user, "You set the plaque's text.")
+ else
+ to_chat(user, "You are too far to set the plaque's text.")
+
+ SSpersistence.SaveTrophy(src)
+
+ else
+ to_chat(user, "\The [W] is stuck to your hand, you can't put it in the [src.name]!")
+
+ return
+
+/obj/structure/displaycase/trophy/dump()
+ if (showpiece)
+ if(added_roundstart)
+ visible_message("The [showpiece] crumbles to dust!")
+ new /obj/effect/decal/cleanable/ash(loc)
+ QDEL_NULL(showpiece)
+ else
+ ..()
+
+/obj/item/showpiece_dummy
+ name = "Cheap replica"
+
+/obj/item/showpiece_dummy/Initialize(mapload, path)
+ . = ..()
+ var/obj/item/I = path
+ name = initial(I.name)
+ icon = initial(I.icon)
+ icon_state = initial(I.icon_state)