From 810fe47c336b65e007f9ab7c4e5412db52169917 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Thu, 7 Mar 2024 16:06:17 +1100 Subject: [PATCH] Adjusting how walls handle dropping materials. --- code/game/turfs/simulated/wall_types.dm | 6 ++++++ code/game/turfs/simulated/walls.dm | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm index 1cf1ad579cc4..48b7fffed751 100644 --- a/code/game/turfs/simulated/wall_types.dm +++ b/code/game/turfs/simulated/wall_types.dm @@ -71,6 +71,9 @@ material = /decl/material/solid/stone/sandstone girder_material = null +/turf/simulated/wall/brick/get_dismantle_stack_type() + return /obj/item/stack/material/brick + /turf/simulated/wall/brick/get_wall_icon() return 'icons/turf/walls/brick.dmi' @@ -82,6 +85,9 @@ material = /decl/material/solid/organic/wood girder_material = null +/turf/simulated/wall/log/get_dismantle_stack_type() + return /obj/item/stack/material/log + /turf/simulated/wall/log/get_wall_icon() return 'icons/turf/walls/log.dmi' diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 8f7a409a00cf..9d044d5a54fa 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -205,6 +205,9 @@ var/global/list/wall_fullblend_objects = list( take_damage(log(RAND_F(0.9, 1.1) * (adj_temp - material.melting_point))) return ..() +/turf/simulated/wall/proc/get_dismantle_stack_type() + return + /turf/simulated/wall/proc/dismantle_wall(var/devastated, var/explode, var/no_product) playsound(src, 'sound/items/Welder.ogg', 100, 1) @@ -217,7 +220,7 @@ var/global/list/wall_fullblend_objects = list( placed_girder.prepped_for_fakewall = can_open placed_girder.update_icon() if(material) - material.place_dismantled_product(src, devastated) + material.place_dismantled_product(src, devastated, amount = rand(2, 3), drop_type = get_dismantle_stack_type()) for(var/obj/O in src.contents) //Eject contents! if(istype(O,/obj/structure/sign/poster))