cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-20 04:34:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] pool swimwear locker names, holo floor/item names (ABLE TO BE MERGED) (#12920)

Browse Source 
* 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-22 21:07:00 -04:00
committed by CHOMPStation2
parent 267b821389
commit 0caa51fc6b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holodeck/HolodeckObjects.dm
+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