cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

IT LIVES (#13044)

Browse Source
This commit is contained in:
jakmak3
2016-12-28 18:07:40 -05:00
committed by Probe1
parent 49145337fa
commit 907fa8b2e0
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/mecha/mech_fabricator.dm
View File

@@ -84,6 +84,8 @@
/obj/item/weapon/stock_parts/matter_bin, /obj/item/weapon/stock_parts/matter_bin,
/obj/item/weapon/stock_parts/matter_bin, /obj/item/weapon/stock_parts/matter_bin,
/obj/item/weapon/stock_parts/manipulator, /obj/item/weapon/stock_parts/manipulator,
/obj/item/weapon/stock_parts/manipulator,
/obj/item/weapon/stock_parts/micro_laser,
/obj/item/weapon/stock_parts/micro_laser, /obj/item/weapon/stock_parts/micro_laser,
/obj/item/weapon/stock_parts/console_screen /obj/item/weapon/stock_parts/console_screen
) )

2
code/modules/research/designs/stock_parts.dm
View File

@@ -129,7 +129,7 @@
id = "pico_mani" id = "pico_mani"
req_tech = list(Tc_MATERIALS = 5, Tc_PROGRAMMING = 2) req_tech = list(Tc_MATERIALS = 5, Tc_PROGRAMMING = 2)
build_type = PROTOLATHE build_type = PROTOLATHE
materials = list(MAT_IRON = 30) materials = list(MAT_IRON = 30, MAT_URANIUM = 10, MAT_SILVER = 20)
reliability_base = 73 reliability_base = 73
category = "Stock Parts" category = "Stock Parts"
build_path = /obj/item/weapon/stock_parts/manipulator/nano/pico build_path = /obj/item/weapon/stock_parts/manipulator/nano/pico

17
code/modules/research/fabricators.dm
View File

@@ -62,21 +62,22 @@
max_material_storage = (initial(max_material_storage)+(T * 187500)) max_material_storage = (initial(max_material_storage)+(T * 187500))
T = 0 T = 0
for(var/obj/item/weapon/stock_parts/micro_laser/Ma in component_parts) for(var/obj/item/weapon/stock_parts/manipulator/Ma in component_parts)
T += Ma.rating T += Ma.rating //T is the ammount of stock parts grade. 1 tier 1 part is a T=1, 2 tier 2 parts is a T=4, 1 tier 1 and 1 tier 3 part is a T=5
if(T >= 1) if(T >= 2) // this removes 1 part tier level. This is to account for the fact that machines like the protolathe have 1 micro manip in them by default which means 1 tier level
T -= 1 T -= 2
var/diff var/diff
diff = round(initial(resource_coeff) - (initial(resource_coeff)*(T))/25,0.01) diff = round(initial(resource_coeff) - (initial(resource_coeff)*(T * 3))/25,0.01)
if(resource_coeff!=diff) if(resource_coeff!=diff)
resource_coeff = diff resource_coeff = diff
T = 0 T = 0
for(var/obj/item/weapon/stock_parts/manipulator/Ml in component_parts) for(var/obj/item/weapon/stock_parts/micro_laser/Ml in component_parts)
T += Ml.rating T += Ml.rating
if(T>= 2) if(T>= 2) // same idea for the formula for above
T -= 2 T -= 2
diff = round(initial(time_coeff) - (initial(time_coeff)*(T))/25,0.01) diff = round(initial(time_coeff) - (initial(time_coeff)*(T *5))/25,0.01)
if(time_coeff!=diff) if(time_coeff!=diff)
time_coeff = diff time_coeff = diff