From 3c874640f2979d8eeaa74c54497d26d1f6ace92a Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Sat, 31 Aug 2019 18:28:22 -0400 Subject: [PATCH] NO THE OPEN TURFS --- code/game/turfs/simulated/floor/chasm.dm | 2 +- code/game/turfs/simulated/floor/fancy_floor.dm | 4 ++-- code/game/turfs/simulated/floor/indestructible.dm | 8 ++++---- code/game/turfs/simulated/floor/lava.dm | 2 +- code/modules/events/spacevine.dm | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm index 17807bd255b..1768b2d472a 100644 --- a/code/game/turfs/simulated/floor/chasm.dm +++ b/code/game/turfs/simulated/floor/chasm.dm @@ -22,7 +22,7 @@ if(!drop_stuff()) STOP_PROCESSING(SSprocessing, src) -/turf/open/chasm/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) +/turf/simulated/floor/chasm/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) underlay_appearance.icon = 'icons/turf/floors.dmi' underlay_appearance.icon_state = "basalt" return TRUE diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index b326f93fe27..2ce85481751 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -122,7 +122,7 @@ burnt = 1 update_icon() -/turf/open/floor/carpet/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) +/turf/simulated/floor/carpet/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) return FALSE /turf/simulated/floor/carpet/black @@ -147,7 +147,7 @@ floor_tile = /obj/item/stack/tile/arcade_carpet smooth = SMOOTH_FALSE -/turf/open/floor/fakespace/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) +/turf/simulated/floor/fakespace/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) underlay_appearance.icon = 'icons/turf/space.dmi' underlay_appearance.icon_state = SPACE_ICON_STATE underlay_appearance.plane = PLANE_SPACE diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm index 3705e24eea0..159f78ddd80 100644 --- a/code/game/turfs/simulated/floor/indestructible.dm +++ b/code/game/turfs/simulated/floor/indestructible.dm @@ -23,17 +23,17 @@ return /turf/simulated/floor/indestructible/attackby(obj/item/I, mob/user, params) - return + return /turf/simulated/floor/indestructible/attack_hand(mob/user) - return + return /turf/simulated/floor/indestructible/attack_hulk(mob/user, does_attack_animation = FALSE) return /turf/simulated/floor/indestructible/attack_animal(mob/living/simple_animal/M) return - + /turf/simulated/floor/indestructible/mech_melee_attack(obj/mecha/M) return @@ -81,7 +81,7 @@ planetary_atmos = TRUE desc = "A floor with a square pattern. It's faintly cool to the touch." -/turf/open/indestructible/hierophant/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) +/turf/simulated/floor/indestructible/hierophant/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) return FALSE /turf/simulated/floor/indestructible/hierophant/two diff --git a/code/game/turfs/simulated/floor/lava.dm b/code/game/turfs/simulated/floor/lava.dm index 66d7eaca83d..b2c29a5ee01 100644 --- a/code/game/turfs/simulated/floor/lava.dm +++ b/code/game/turfs/simulated/floor/lava.dm @@ -41,7 +41,7 @@ /turf/simulated/floor/plating/lava/remove_plating() return -/turf/open/lava/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) +/turf/simulated/floor/plating/lava/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) underlay_appearance.icon = 'icons/turf/floors.dmi' underlay_appearance.icon_state = "basalt" return TRUE diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 9199d8ca3bd..a7f9feb1c16 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -137,7 +137,7 @@ if(prob(50)) ChangeTurf(baseturf) -/turf/simulated/floor/vines/ChangeTurf(turf/open/floor/T) +/turf/simulated/floor/vines/ChangeTurf(turf/simulated/floor/T) . = ..() //Do this *after* the turf has changed as qdel in spacevines will call changeturf again if it hasn't for(var/obj/structure/spacevine/SV in src)