cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-21 12:16:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8618 from Spookerton/cerebulon/swimwear

Browse Source 
pool swimwear locker names, holo floor/item names
This commit is contained in:
Sypsoti
2022-05-07 14:32:08 -05:00
committed by GitHub
parent 31e2a3751c 217ebbcc4b
commit e69a92bcb7
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
/turf/simulated/floor/holofloor/attackby(obj/item/W as obj, mob/user as mob)
@@ -272,6 +273,7 @@
no_attack_log = 1
/obj/item/holo/esword
name = "holographic energy sword"
desc = "May the force be within you. Sorta."
icon = 'icons/obj/weapons.dmi'
icon_state = "esword"