Merge pull request #9867 from Ghommie/Ghommie-cit375

Ports "examine-code refactor"
This commit is contained in:
BlackMajor
2019-11-25 11:31:03 +13:00
committed by GitHub
332 changed files with 1296 additions and 1350 deletions
@@ -19,8 +19,8 @@
tiled_dirt = FALSE
/turf/open/floor/wood/examine(mob/user)
..()
to_chat(user, "<span class='notice'>There's a few <b>screws</b> and a <b>small crack</b> visible.</span>")
. = ..()
. += "<span class='notice'>There's a few <b>screws</b> and a <b>small crack</b> visible.</span>"
/turf/open/floor/wood/screwdriver_act(mob/living/user, obj/item/I)
if(..())
@@ -183,8 +183,8 @@
tiled_dirt = FALSE
/turf/open/floor/carpet/examine(mob/user)
..()
to_chat(user, "<span class='notice'>There's a <b>small crack</b> on the edge of it.</span>")
. = ..()
. += "<span class='notice'>There's a <b>small crack</b> on the edge of it.</span>"
/turf/open/floor/carpet/Initialize()
. = ..()
@@ -14,8 +14,8 @@
/turf/open/floor/light/examine(mob/user)
..()
to_chat(user, "<span class='notice'>There's a <b>small crack</b> on the edge of it.</span>")
. = ..()
. += "<span class='notice'>There's a <b>small crack</b> on the edge of it.</span>"
/turf/open/floor/light/Initialize()
. = ..()
@@ -5,8 +5,8 @@
burnt_states = list("floorscorched1", "floorscorched2")
/turf/open/floor/plasteel/examine(mob/user)
..()
to_chat(user, "<span class='notice'>There's a <b>small crack</b> on the edge of it.</span>")
. = ..()
. += "<span class='notice'>There's a <b>small crack</b> on the edge of it.</span>"
/turf/open/floor/plasteel/update_icon()
if(!..())
+4 -4
View File
@@ -20,14 +20,14 @@
var/attachment_holes = TRUE
/turf/open/floor/plating/examine(mob/user)
..()
. = ..()
if(broken || burnt)
to_chat(user, "<span class='notice'>It looks like the dents could be <i>welded</i> smooth.</span>")
. += "<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 a few attachment holes for a new <i>tile</i> or reinforcement <i>rods</i>.</span>")
. += "<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>")
. += "<span class='notice'>You might be able to build ontop of it with some <i>tiles</i>...</span>"
/turf/open/floor/plating/Initialize()
if (!broken_states)
@@ -13,8 +13,8 @@
tiled_dirt = FALSE
/turf/open/floor/engine/examine(mob/user)
..()
to_chat(user, "<span class='notice'>The reinforcement rods are <b>wrenched</b> firmly in place.</span>")
. = ..()
. += "<span class='notice'>The reinforcement rods are <b>wrenched</b> firmly in place.</span>"
/turf/open/floor/engine/airless
initial_gas_mix = AIRLESS_ATMOS
@@ -17,19 +17,19 @@
/turf/closed/wall/r_wall/deconstruction_hints(mob/user)
switch(d_state)
if(INTACT)
to_chat(user, "<span class='notice'>The outer <b>grille</b> is fully intact.</span>")
return "<span class='notice'>The outer <b>grille</b> is fully intact.</span>"
if(SUPPORT_LINES)
to_chat(user, "<span class='notice'>The outer <i>grille</i> has been cut, and the support lines are <b>screwed</b> securely to the outer cover.</span>")
return "<span class='notice'>The outer <i>grille</i> has been cut, and the support lines are <b>screwed</b> securely to the outer cover.</span>"
if(COVER)
to_chat(user, "<span class='notice'>The support lines have been <i>unscrewed</i>, and the metal cover is <b>welded</b> firmly in place.</span>")
return "<span class='notice'>The support lines have been <i>unscrewed</i>, and the metal cover is <b>welded</b> firmly in place.</span>"
if(CUT_COVER)
to_chat(user, "<span class='notice'>The metal cover has been <i>sliced through</i>, and is <b>connected loosely</b> to the girder.</span>")
return "<span class='notice'>The metal cover has been <i>sliced through</i>, and is <b>connected loosely</b> to the girder.</span>"
if(ANCHOR_BOLTS)
to_chat(user, "<span class='notice'>The outer cover has been <i>pried away</i>, and the bolts anchoring the support rods are <b>wrenched</b> in place.</span>")
return "<span class='notice'>The outer cover has been <i>pried away</i>, and the bolts anchoring the support rods are <b>wrenched</b> in place.</span>"
if(SUPPORT_RODS)
to_chat(user, "<span class='notice'>The bolts anchoring the support rods have been <i>loosened</i>, but are still <b>welded</b> firmly to the girder.</span>")
return "<span class='notice'>The bolts anchoring the support rods have been <i>loosened</i>, but are still <b>welded</b> firmly to the girder.</span>"
if(SHEATH)
to_chat(user, "<span class='notice'>The support rods have been <i>sliced through</i>, and the outer sheath is <b>connected loosely</b> to the girder.</span>")
return "<span class='notice'>The support rods have been <i>sliced through</i>, and the outer sheath is <b>connected loosely</b> to the girder.</span>"
/turf/closed/wall/r_wall/devastate_wall()
new sheet_type(src, sheet_amount)
+2 -2
View File
@@ -32,11 +32,11 @@
var/list/dent_decals
/turf/closed/wall/examine(mob/user)
..()
. = ..()
deconstruction_hints(user)
/turf/closed/wall/proc/deconstruction_hints(mob/user)
to_chat(user, "<span class='notice'>The outer plating is <b>welded</b> firmly in place.</span>")
return "<span class='notice'>The outer plating is <b>welded</b> firmly in place.</span>"
/turf/closed/wall/attack_tk()
return