Merge branch '13113'

This commit is contained in:
silicons
2020-08-16 18:53:35 -07:00
100 changed files with 3832 additions and 185 deletions
+5 -2
View File
@@ -29,6 +29,9 @@
icon = 'icons/turf/walls.dmi'
explosion_block = 50
/turf/closed/indestructible/rust_heretic_act()
return
/turf/closed/indestructible/TerraformTurf(path, new_baseturf, flags, defer_change = FALSE, ignore_air = FALSE)
return
@@ -198,13 +201,13 @@
/turf/closed/indestructible/rock/glacierrock
name = "unaturally hard ice wall"
desc = "Ice, hardened over thousands of years, you're not breaking through this."
desc = "Ice, hardened over thousands of years, you're not breaking through this."
icon = 'icons/turf/walls.dmi'
icon_state = "snow_rock"
/turf/closed/indestructible/rock/glacierrock/blue
name = "blue ice wall"
desc = "The incredible compressive forces that formed this sturdy ice wall gave it a blue color."
desc = "The incredible compressive forces that formed this sturdy ice wall gave it a blue color."
icon = 'icons/turf/walls.dmi'
icon_state = "ice"
canSmoothWith = list(/turf/closed/indestructible/rock/glacierrock/blue)
@@ -63,6 +63,11 @@
to_chat(user, "<span class='notice'>You forcefully pry off the planks, destroying them in the process.</span>")
return make_plating()
/turf/open/floor/wood/rust_heretic_act()
if(prob(70))
new /obj/effect/temp_visual/glowing_rune(src)
ChangeTurf(/turf/open/floor/plating/rust)
/turf/open/floor/wood/cold
temperature = 255.37
@@ -267,3 +267,15 @@
icon = 'icons/turf/floors.dmi'
icon_state = "floor_padded"
floor_tile = /obj/item/stack/tile/padded
/turf/open/floor/plating/rust
name = "rusted plating"
desc = "Corrupted steel."
icon_state = "plating_rust"
footstep = FOOTSTEP_RUST
barefootstep = FOOTSTEP_RUST
clawfootstep = FOOTSTEP_RUST
heavyfootstep = FOOTSTEP_RUST
/turf/open/floor/plating/rust/rust_heretic_act()
return
@@ -8,6 +8,11 @@
. = ..()
. += "<span class='notice'>There's a <b>small crack</b> on the edge of it.</span>"
/turf/open/floor/plasteel/rust_heretic_act()
if(prob(70))
new /obj/effect/temp_visual/glowing_rune(src)
ChangeTurf(/turf/open/floor/plating/rust)
/turf/open/floor/plasteel/update_icon()
if(!..())
return 0
@@ -98,6 +98,11 @@
return TRUE
/turf/open/floor/plating/rust_heretic_act()
if(prob(70))
new /obj/effect/temp_visual/glowing_rune(src)
ChangeTurf(/turf/open/floor/plating/rust)
/turf/open/floor/plating/make_plating()
return
@@ -188,12 +188,20 @@
icon = 'icons/turf/walls/rusty_wall.dmi'
hardness = 45
/turf/closed/wall/rust/rust_heretic_act()
ScrapeAway()
/turf/closed/wall/r_wall/rust
name = "rusted reinforced wall"
desc = "A huge chunk of rusted reinforced metal."
icon = 'icons/turf/walls/rusty_reinforced_wall.dmi'
hardness = 15
/turf/closed/wall/r_wall/rust/rust_heretic_act()
if(prob(50))
return
ScrapeAway()
/turf/closed/wall/mineral/bronze
name = "clockwork wall"
desc = "A huge chunk of bronze, decorated like gears and cogs."
@@ -235,6 +235,13 @@
if(the_rcd.canRturf)
return ..()
/turf/closed/wall/r_wall/rust_heretic_act()
if(prob(50))
return
if(prob(70))
new /obj/effect/temp_visual/glowing_rune(src)
ChangeTurf(/turf/closed/wall/r_wall/rust)
/turf/closed/wall/r_wall/syndicate
name = "hull"
desc = "The armored hull of an ominous looking ship."
+5
View File
@@ -325,4 +325,9 @@
add_overlay(dent_decals)
/turf/closed/wall/rust_heretic_act()
if(prob(70))
new /obj/effect/temp_visual/glowing_rune(src)
ChangeTurf(/turf/closed/wall/rust)
#undef MAX_DENT_DECALS