cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 01:57:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28892 from nicbn/revert-28577-freezer_heater_fix

Browse Source 
Revert "Freezers and heaters now drop the correct materials"
This commit is contained in:
Jordan Brown
2017-06-29 00:54:24 -04:00
committed by GitHub
parent 712428ec9c a362a991fa
commit 503a20119b
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
View File

@@ -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
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

3
code/modules/power/cable.dm
View File

@@ -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()