[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 <killer65311@gmail.com>
This commit is contained in:
VirgoBot
2022-09-23 01:07:35 +00:00
committed by CHOMPStation2
co-authored by Sypsoti C.L
parent 267b821389
commit 0caa51fc6b
2 changed files with 8 additions and 2 deletions
+2
View File
@@ -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
+6 -2
View File
@@ -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" = (