From 0f710f70c6336129fc02f7fec5c0000cb0e64715 Mon Sep 17 00:00:00 2001 From: nicbn Date: Tue, 27 Jun 2017 23:10:19 -0300 Subject: [PATCH 1/2] Revert "Freezers and heaters now drop the correct materials (Fixes #28560)" --- .../components/unary_devices/thermomachine.dm | 21 +++++++++---------- code/modules/power/cable.dm | 3 --- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 1ff374a9bb7..1f9b119ce76 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -11,7 +11,7 @@ max_integrity = 300 armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 80, acid = 30) layer = OBJ_LAYER - + var/on = FALSE var/min_temperature = 0 var/max_temperature = 0 @@ -32,18 +32,17 @@ req_components = list( /obj/item/weapon/stock_parts/matter_bin = 2, /obj/item/weapon/stock_parts/micro_laser = 2, - /obj/item/stack/cable_coil/one = 1, + /obj/item/stack/cable_coil = 1, /obj/item/weapon/stock_parts/console_screen = 1) -/obj/item/weapon/circuitboard/machine/thermomachine/Initialize() - . = ..() - if(!build_path) - if(prob(50)) - name = "Freezer (Machine Board)" - build_path = /obj/machinery/atmospherics/components/unary/thermomachine/freezer - else - name = "Heater (Machine Board)" - build_path = /obj/machinery/atmospherics/components/unary/thermomachine/heater +/obj/item/weapon/circuitboard/machine/thermomachine/New() + ..() + if(prob(50)) + name = "Freezer (Machine Board)" + build_path = /obj/machinery/atmospherics/components/unary/thermomachine/freezer + else + name = "Heater (Machine Board)" + build_path = /obj/machinery/atmospherics/components/unary/thermomachine/heater /obj/item/weapon/circuitboard/machine/thermomachine/attackby(obj/item/I, mob/user, params) var/obj/item/weapon/circuitboard/machine/freezer = /obj/item/weapon/circuitboard/machine/thermomachine/freezer diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 69d705012cf..f63cee2bced 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -511,9 +511,6 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai singular_name = "cable piece" full_w_class = WEIGHT_CLASS_SMALL -/obj/item/stack/cable_coil/one - amount = 1 - /obj/item/stack/cable_coil/cyborg is_cyborg = 1 materials = list() From a362a991fabb6cf55028f187d0070973c111de7d Mon Sep 17 00:00:00 2001 From: nicbn Date: Tue, 27 Jun 2017 23:35:51 -0300 Subject: [PATCH 2/2] initialize .=.. --- .../machinery/components/unary_devices/thermomachine.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 1f9b119ce76..5ddc83c40f0 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -35,8 +35,8 @@ /obj/item/stack/cable_coil = 1, /obj/item/weapon/stock_parts/console_screen = 1) -/obj/item/weapon/circuitboard/machine/thermomachine/New() - ..() +/obj/item/weapon/circuitboard/machine/thermomachine/Initialize() + . = ..() if(prob(50)) name = "Freezer (Machine Board)" build_path = /obj/machinery/atmospherics/components/unary/thermomachine/freezer