From 0caa51fc6be4e799701fbb0bd1f380413fb60112 Mon Sep 17 00:00:00 2001 From: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Thu, 22 Sep 2022 21:07:00 -0400 Subject: [PATCH] [MIRROR] pool swimwear locker names, holo floor/item names (ABLE TO BE MERGED) (#12920) * pool swimwear locker names, holo floor/item names * Update HolodeckObjects.dm Co-authored-by: Sypsoti <98442665+Sypsoti@users.noreply.github.com> Co-authored-by: C.L --- code/modules/holodeck/HolodeckObjects.dm | 2 ++ maps/cynosure/cynosure-2.dmm | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index c8b324d6f4..cf2a19f46a 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -4,6 +4,7 @@ // Holographic racks are in code/modules/tables/rack.dm /turf/simulated/floor/holofloor + desc = "A convincing simulation." thermal_conductivity = 0 flags = TURF_ACID_IMMUNE @@ -281,6 +282,7 @@ no_random_knockdown = TRUE /obj/item/weapon/holo/esword + name = "holographic energy sword" desc = "May the force be within you. Sorta." icon_state = "esword" var/lcolor diff --git a/maps/cynosure/cynosure-2.dmm b/maps/cynosure/cynosure-2.dmm index 832f0090da..d38f4e7d6d 100644 --- a/maps/cynosure/cynosure-2.dmm +++ b/maps/cynosure/cynosure-2.dmm @@ -3147,7 +3147,9 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/closet/athletic_swimwear, +/obj/structure/closet/athletic_swimwear{ + name = "swimwear wardrobe" + }, /turf/simulated/floor/tiled/freezer, /area/surface/station/crew_quarters/pool) "bwp" = ( @@ -9106,7 +9108,9 @@ "eni" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/window/reinforced, -/obj/structure/closet/athletic_swimwear, +/obj/structure/closet/athletic_swimwear{ + name = "swimwear wardrobe" + }, /turf/simulated/floor/tiled/freezer, /area/surface/station/crew_quarters/pool) "enM" = (