Restore old machinery init behavior (#3380)

This commit is contained in:
Lohikar
2017-08-31 22:56:05 -05:00
committed by GitHub
parent c8510ec9a9
commit 67bac9475d
22 changed files with 31 additions and 88 deletions

View File

@@ -56,8 +56,6 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
/obj/machinery/r_n_d/circuit_imprinter/RefreshParts()
// Adjust reagent container volume to match combined volume of the inserted beakers
if(!component_parts)
populate_components()
var/T = 0
for(var/obj/item/weapon/reagent_containers/glass/G in component_parts)
T += G.reagents.maximum_volume

View File

@@ -25,8 +25,7 @@ Note: Must be placed within 3 tiles of the R&D Console
/obj/machinery/r_n_d/destructive_analyzer/RefreshParts()
var/T = 0
if(!component_parts)
T = 3
for(var/obj/item/weapon/stock_parts/S in component_parts)
T += S.rating
decon_mod = T * 0.1

View File

@@ -56,8 +56,6 @@
return t
/obj/machinery/r_n_d/protolathe/RefreshParts()
if(!component_parts)
populate_components()
// Adjust reagent container volume to match combined volume of the inserted beakers
var/T = 0
for(var/obj/item/weapon/reagent_containers/glass/G in component_parts)

View File

@@ -11,11 +11,6 @@
var/busy = 0
var/obj/machinery/computer/rdconsole/linked_console
/obj/machinery/r_n_d/Initialize()
. = ..()
populate_components()
/obj/machinery/r_n_d/attack_hand(mob/user as mob)
return
@@ -52,4 +47,4 @@
if(/obj/item/stack/material/uranium)
return "uranium"
if(/obj/item/stack/material/diamond)
return "diamond"
return "diamond"

View File

@@ -26,8 +26,7 @@
/obj/machinery/r_n_d/server/RefreshParts()
var/tot_rating = 0
if(!component_parts)
tot_rating = 2
for(var/obj/item/weapon/stock_parts/SP in component_parts)
tot_rating += SP.rating
idle_power_usage /= max(1, tot_rating)