From c1214335baa606c72c0d31a60f74a93afcdf7b9a Mon Sep 17 00:00:00 2001 From: KathrinBailey Date: Sun, 26 May 2024 21:43:25 +0100 Subject: [PATCH] poking away references to clockie walls --- .../Legacy Storage/[wip]_mapping_resources.dmm | 2 +- .../clockcult/clock_helpers/fabrication_helpers.dm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/coyote_bayou/Legacy Storage/[wip]_mapping_resources.dmm b/_maps/map_files/coyote_bayou/Legacy Storage/[wip]_mapping_resources.dmm index 9904b5192b4..e0b99de2a9d 100644 --- a/_maps/map_files/coyote_bayou/Legacy Storage/[wip]_mapping_resources.dmm +++ b/_maps/map_files/coyote_bayou/Legacy Storage/[wip]_mapping_resources.dmm @@ -39221,7 +39221,7 @@ icon = 'icons/turf/walls/rusty_reinforced_wall.dmi'; icon_state = "r_wall"; name = "rusty reinforced wall"; - canSmoothWith = list(/turf/closed/wall,/turf/closed/wall/r_wall,/obj/structure/falsewall,/obj/structure/falsewall/brass,/obj/structure/falsewall/reinforced,/turf/closed/wall/rust,/turf/closed/wall/r_wall/rust,/turf/closed/wall/clockwork,/turf/closed/indestructible/f13/obsidian); + canSmoothWith = list(/turf/closed/wall,/turf/closed/wall/r_wall,/obj/structure/falsewall,/obj/structure/falsewall/brass,/obj/structure/falsewall/reinforced,/turf/closed/wall/rust,/turf/closed/wall/r_wall/rust,/turf/closed/indestructible/f13/obsidian); smooth = 1 }, /area/f13/wasteland) diff --git a/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm b/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm index 7d0c57ded14..83effb0db0f 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm @@ -16,16 +16,16 @@ //Turf conversion /turf/closed/wall/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //four sheets of metal - return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 4), "spawn_dir" = SOUTH) + return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/cult, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 4), "spawn_dir" = SOUTH) /turf/closed/wall/mineral/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //two sheets of metal - return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2), "spawn_dir" = SOUTH) + return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/cult, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2), "spawn_dir" = SOUTH) /turf/closed/wall/mineral/iron/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //two sheets of metal, five rods - return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2) - (POWER_ROD * 5), "spawn_dir" = SOUTH) + return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/cult, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2) - (POWER_ROD * 5), "spawn_dir" = SOUTH) /turf/closed/wall/mineral/cult/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //no metal - return list("operation_time" = 80, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL, "spawn_dir" = SOUTH) + return list("operation_time" = 80, "new_obj_type" = /turf/closed/wall/cult, "power_cost" = POWER_WALL_TOTAL, "spawn_dir" = SOUTH) /turf/closed/wall/r_wall/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) return FALSE