diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 9a73ed0eec8..83ce6d3f49f 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -17,6 +17,7 @@ var/amount = 1 var/max_amount //also see stack recipes initialisation, param "max_res_amount" must be equal to this max_amount var/stacktype //determines whether different stack types can merge + var/build_type = null //used when directly applied to a turf var/uses_charge = 0 var/list/charge_costs = null var/list/datum/matter_synth/synths = null diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index f86ecbade96..4f4b53c7c0a 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -12,7 +12,6 @@ desc = "A non-descript floor tile" w_class = 3 max_amount = 60 - var/build_type = null /obj/item/stack/tile/New() ..() diff --git a/code/game/turfs/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm index 13e36882a34..c8cc2660c97 100644 --- a/code/game/turfs/simulated/floor_attackby.dm +++ b/code/game/turfs/simulated/floor_attackby.dm @@ -57,7 +57,7 @@ var/decl/flooring/F = flooring_types[flooring_type] if(!F.build_type) continue - if(C.type == F.build_type) + if((S.type == F.build_type) || (S.build_type == F.build_type)) use_flooring = F break if(!use_flooring) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index b5aa43077f9..25c8c4827fa 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -871,26 +871,34 @@ obj/structure/cable/proc/cableColor(var/colorC) update_wclass() /obj/item/stack/cable_coil/yellow + stacktype = /obj/item/stack/cable_coil color = COLOR_YELLOW /obj/item/stack/cable_coil/blue + stacktype = /obj/item/stack/cable_coil color = COLOR_BLUE /obj/item/stack/cable_coil/green + stacktype = /obj/item/stack/cable_coil color = COLOR_LIME /obj/item/stack/cable_coil/pink + stacktype = /obj/item/stack/cable_coil color = COLOR_PINK /obj/item/stack/cable_coil/orange + stacktype = /obj/item/stack/cable_coil color = COLOR_ORANGE /obj/item/stack/cable_coil/cyan + stacktype = /obj/item/stack/cable_coil color = COLOR_CYAN /obj/item/stack/cable_coil/white + stacktype = /obj/item/stack/cable_coil color = COLOR_WHITE /obj/item/stack/cable_coil/random/New() + stacktype = /obj/item/stack/cable_coil color = pick(COLOR_RED, COLOR_BLUE, COLOR_LIME, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN) ..()