shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
[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
parent 49e0a4e3a8 0ef3072f26
commit cd178d9756
12 changed files with 25 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/game/turfs/simulated/floor.dm
View File

@@ -21,12 +21,14 @@
broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
if (!burnt_states)
burnt_states = list()
if(!broken && broken_states && (icon_state in broken_states))
broken = TRUE
if(!burnt && burnt_states && (icon_state in burnt_states))
burnt = TRUE
. = ..()
//This is so damaged or burnt tiles or platings don't get remembered as the default tile
var/static/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","damaged4",
"damaged5","panelscorched","floorscorched1","floorscorched2","platingdmg1","platingdmg2", "foam_plating",
"platingdmg3","plating","light_on","light_on_flicker1","light_on_flicker2",
"light_on_clicker3","light_on_clicker4","light_on_clicker5","light_broken",
var/static/list/icons_to_ignore_at_floor_init = list("foam_plating", "plating","light_on","light_on_flicker1","light_on_flicker2",
"light_on_clicker3","light_on_clicker4","light_on_clicker5",
"light_on_broken","light_off","wall_thermite","grass", "sand",
"asteroid","asteroid_dug",
"asteroid0","asteroid1","asteroid2","asteroid3","asteroid4",
@@ -34,11 +36,11 @@
"basalt","basalt_dug",
"basalt0","basalt1","basalt2","basalt3","basalt4",
"basalt5","basalt6","basalt7","basalt8","basalt9","basalt10","basalt11","basalt12",
"oldburning","light-on-r","light-on-y","light-on-g","light-on-b", "wood", "wood-broken",
"oldburning","light-on-r","light-on-y","light-on-g","light-on-b", "wood", "carpetsymbol", "carpetstar",
"carpetcorner", "carpetside", "carpet", "ironsand1", "ironsand2", "ironsand3", "ironsand4", "ironsand5",
"ironsand6", "ironsand7", "ironsand8", "ironsand9", "ironsand10", "ironsand11",
"ironsand12", "ironsand13", "ironsand14", "ironsand15")
if(icon_state in icons_to_ignore_at_floor_init) //so damaged/burned tiles or plating icons aren't saved as the default
if(broken || burnt || (icon_state in icons_to_ignore_at_floor_init)) //so damaged/burned tiles or plating icons aren't saved as the default
icon_regular_floor = "floor"
else
icon_regular_floor = icon_state

15
code/game/turfs/simulated/floor/plating.dm
View File

@@ -19,7 +19,7 @@
to_chat(user, "<span class='notice'>It looks like the dents could be <i>welded</i> smooth.</span>")
return
if(attachment_holes)
to_chat(user, "<span class='notice'>There are few attachment holes for a new <i>tile</i> or reinforcement <i>rods</i>.</span>")
to_chat(user, "<span class='notice'>There are a few attachment holes for a new <i>tile</i> or reinforcement <i>rods</i>.</span>")
else
to_chat(user, "<span class='notice'>You might be able to build ontop of it with some <i>tiles</i>...</span>")
@@ -29,7 +29,10 @@
if (!burnt_states)
burnt_states = list("panelscorched")
. = ..()
icon_plating = icon_state
if(!attachment_holes || (!broken && !burnt))
icon_plating = icon_state
else
icon_plating = initial(icon_state)
/turf/open/floor/plating/update_icon()
if(!..())
@@ -89,8 +92,12 @@
name = "metal foam plating"
desc = "Thin, fragile flooring created with metal foam."
icon_state = "foam_plating"
broken_states = list("foam_plating")
burnt_states = list("foam_plating")
/turf/open/floor/plating/foam/burn_tile()
return //jetfuel can't melt steel foam
/turf/open/floor/plating/foam/break_tile()
return //jetfuel can't break steel foam...
/turf/open/floor/plating/foam/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/stack/tile/plasteel))

9
code/modules/holodeck/turfs.dm
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