shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TG Sync 12/15/17

Browse Source 
s

s
This commit is contained in:
kevinz000
2017-12-15 06:27:57 -08:00
parent b6b0ab69e3
commit 253c819bc1
762 changed files with 13429 additions and 14872 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/circuitboards/circuitboard.dm
+1
View File
@@ -12,6 +12,7 @@
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
materials = list(MAT_GLASS=1000)
w_class = WEIGHT_CLASS_SMALL
grind_results = list("silicon" = 20, "sacid" = 0.5) //Retrieving acid this way is extremely inefficient
var/build_path = null
/obj/item/circuitboard/proc/apply_default_parts(obj/machinery/M)
code/game/objects/items/circuitboards/machine_circuitboards.dm
+19 -18
View File
@@ -261,28 +261,29 @@
/obj/item/stack/cable_coil = 1,
/obj/item/stack/sheet/glass = 1)
#define PATH_FREEZER /obj/machinery/atmospherics/components/unary/thermomachine/freezer
#define PATH_HEATER /obj/machinery/atmospherics/components/unary/thermomachine/heater
/obj/item/circuitboard/machine/thermomachine/Initialize()
. = ..()
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
#define FREEZER /obj/item/circuitboard/machine/thermomachine/freezer
#define HEATER /obj/item/circuitboard/machine/thermomachine/heater
if(!build_path)
if(prob(50))
name = "Freezer (Machine Board)"
build_path = PATH_FREEZER
else
name = "Heater (Machine Board)"
build_path = PATH_HEATER
/obj/item/circuitboard/machine/thermomachine/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/screwdriver))
var/obj/item/circuitboard/new_type
var/new_setting
switch(build_path)
if(FREEZER)
new_type = HEATER
if(PATH_FREEZER)
new_type = /obj/item/circuitboard/machine/thermomachine/heater
new_setting = "Heater"
if(HEATER)
new_type = FREEZER
if(PATH_HEATER)
new_type = /obj/item/circuitboard/machine/thermomachine/freezer
new_setting = "Freezer"
name = initial(new_type.name)
build_path = initial(new_type.build_path)
@@ -291,16 +292,16 @@
else
return ..()
#undef FREEZER
#undef HEATER
/obj/item/circuitboard/machine/thermomachine/heater
name = "Heater (Machine Board)"
build_path = /obj/machinery/atmospherics/components/unary/thermomachine/heater
build_path = PATH_HEATER
/obj/item/circuitboard/machine/thermomachine/freezer
name = "Freezer (Machine Board)"
build_path = /obj/machinery/atmospherics/components/unary/thermomachine/freezer
build_path = PATH_FREEZER
#undef PATH_FREEZER
#undef PATH_HEATER
/obj/item/circuitboard/machine/deep_fryer
name = "circuit board (Deep Fryer)"