cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Freezer and Heater boards randomizing

Browse Source
This commit is contained in:
Xhuis
2017-06-18 21:45:31 -04:00
parent ce39cd32de
commit fd1c8861ed
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@
max_integrity = 300 max_integrity = 300
armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 80, acid = 30) armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 80, acid = 30)
layer = OBJ_LAYER layer = OBJ_LAYER
var/on = FALSE var/on = FALSE
var/min_temperature = 0 var/min_temperature = 0
var/max_temperature = 0 var/max_temperature = 0
@@ -32,17 +32,18 @@
req_components = list( req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 2, /obj/item/weapon/stock_parts/matter_bin = 2,
/obj/item/weapon/stock_parts/micro_laser = 2, /obj/item/weapon/stock_parts/micro_laser = 2,
/obj/item/stack/cable_coil = 1, /obj/item/stack/cable_coil/one = 1,
/obj/item/weapon/stock_parts/console_screen = 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)) if(!build_path)
name = "Freezer (Machine Board)" if(prob(50))
build_path = /obj/machinery/atmospherics/components/unary/thermomachine/freezer name = "Freezer (Machine Board)"
else build_path = /obj/machinery/atmospherics/components/unary/thermomachine/freezer
name = "Heater (Machine Board)" else
build_path = /obj/machinery/atmospherics/components/unary/thermomachine/heater 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) /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 var/obj/item/weapon/circuitboard/machine/freezer = /obj/item/weapon/circuitboard/machine/thermomachine/freezer

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

@@ -511,6 +511,9 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
singular_name = "cable piece" singular_name = "cable piece"
full_w_class = WEIGHT_CLASS_SMALL full_w_class = WEIGHT_CLASS_SMALL
/obj/item/stack/cable_coil/one
amount = 1
/obj/item/stack/cable_coil/cyborg /obj/item/stack/cable_coil/cyborg
is_cyborg = 1 is_cyborg = 1
materials = list() materials = list()