Merge pull request #4921 from Citadel-Station-13/upstream-merge-34472

[MIRROR] Fixes irreparable plating, deprecates broken & burnt vars on maps
This commit is contained in:
LetterJay
2018-01-19 02:51:51 -06:00
committed by GitHub
12 changed files with 25 additions and 331 deletions

View File

@@ -1,13 +1,17 @@
/turf/open/floor/holofloor
icon_state = "floor"
thermal_conductivity = 0
broken_states = list("engine")
burnt_states = list("engine")
flags_1 = NONE
/turf/open/floor/holofloor/attackby(obj/item/I, mob/living/user)
return // HOLOFLOOR DOES NOT GIVE A FUCK
/turf/open/floor/holofloor/burn_tile()
return //you can't burn a hologram!
/turf/open/floor/holofloor/break_tile()
return //you can't break a hologram!
/turf/open/floor/holofloor/plating
name = "holodeck projector floor"
icon_state = "engine"
@@ -84,7 +88,6 @@
icon = 'icons/turf/floors/carpet.dmi'
icon_state = "carpet"
floor_tile = /obj/item/stack/tile/carpet
broken_states = list("damaged")
smooth = SMOOTH_TRUE
canSmoothWith = null