mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Merge pull request #4087 from Mechoid/Efficient_Me_Fabricators
Fixes SCIENCE-fabs, Changes Mech-fab Sprite.
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
/obj/machinery/mecha_part_fabricator
|
/obj/machinery/mecha_part_fabricator
|
||||||
icon = 'icons/obj/robotics.dmi'
|
icon = 'icons/obj/robotics.dmi'
|
||||||
icon_state = "fab-idle"
|
icon_state = "mechfab-idle"
|
||||||
name = "Exosuit Fabricator"
|
name = "Exosuit Fabricator"
|
||||||
desc = "A machine used for construction of mechas."
|
desc = "A machine used for construction of mechas."
|
||||||
density = 1
|
density = 1
|
||||||
@@ -56,11 +56,11 @@
|
|||||||
/obj/machinery/mecha_part_fabricator/update_icon()
|
/obj/machinery/mecha_part_fabricator/update_icon()
|
||||||
overlays.Cut()
|
overlays.Cut()
|
||||||
if(panel_open)
|
if(panel_open)
|
||||||
icon_state = "fab-o"
|
icon_state = "mechfab-o"
|
||||||
else
|
else
|
||||||
icon_state = "fab-idle"
|
icon_state = "mechfab-idle"
|
||||||
if(busy)
|
if(busy)
|
||||||
overlays += "fab-active"
|
overlays += "mechfab-active"
|
||||||
|
|
||||||
/obj/machinery/mecha_part_fabricator/dismantle()
|
/obj/machinery/mecha_part_fabricator/dismantle()
|
||||||
for(var/f in materials)
|
for(var/f in materials)
|
||||||
@@ -155,9 +155,9 @@
|
|||||||
if(materials[S.material.name] + amnt <= res_max_amount)
|
if(materials[S.material.name] + amnt <= res_max_amount)
|
||||||
if(S && S.amount >= 1)
|
if(S && S.amount >= 1)
|
||||||
var/count = 0
|
var/count = 0
|
||||||
overlays += "fab-load-metal"
|
overlays += "mechfab-load-metal"
|
||||||
spawn(10)
|
spawn(10)
|
||||||
overlays -= "fab-load-metal"
|
overlays -= "mechfab-load-metal"
|
||||||
while(materials[S.material.name] + amnt <= res_max_amount && S.amount >= 1)
|
while(materials[S.material.name] + amnt <= res_max_amount && S.amount >= 1)
|
||||||
materials[S.material.name] += amnt
|
materials[S.material.name] += amnt
|
||||||
S.use(1)
|
S.use(1)
|
||||||
@@ -212,7 +212,7 @@
|
|||||||
|
|
||||||
/obj/machinery/mecha_part_fabricator/proc/can_build(var/datum/design/D)
|
/obj/machinery/mecha_part_fabricator/proc/can_build(var/datum/design/D)
|
||||||
for(var/M in D.materials)
|
for(var/M in D.materials)
|
||||||
if(materials[M] < D.materials[M])
|
if(materials[M] < (D.materials[M] * mat_efficiency))
|
||||||
return 0
|
return 0
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
|||||||
@@ -239,7 +239,7 @@
|
|||||||
|
|
||||||
/obj/machinery/pros_fabricator/proc/can_build(var/datum/design/D)
|
/obj/machinery/pros_fabricator/proc/can_build(var/datum/design/D)
|
||||||
for(var/M in D.materials)
|
for(var/M in D.materials)
|
||||||
if(materials[M] < D.materials[M])
|
if(materials[M] < (D.materials[M] * mat_efficiency))
|
||||||
return 0
|
return 0
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
|||||||
@@ -170,10 +170,10 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
|
|||||||
|
|
||||||
/obj/machinery/r_n_d/circuit_imprinter/proc/canBuild(var/datum/design/D)
|
/obj/machinery/r_n_d/circuit_imprinter/proc/canBuild(var/datum/design/D)
|
||||||
for(var/M in D.materials)
|
for(var/M in D.materials)
|
||||||
if(materials[M] < D.materials[M])
|
if(materials[M] < (D.materials[M] * mat_efficiency))
|
||||||
return 0
|
return 0
|
||||||
for(var/C in D.chemicals)
|
for(var/C in D.chemicals)
|
||||||
if(!reagents.has_reagent(C, D.chemicals[C]))
|
if(!reagents.has_reagent(C, D.chemicals[C] * mat_efficiency))
|
||||||
return 0
|
return 0
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
|||||||
@@ -164,10 +164,10 @@
|
|||||||
|
|
||||||
/obj/machinery/r_n_d/protolathe/proc/canBuild(var/datum/design/D)
|
/obj/machinery/r_n_d/protolathe/proc/canBuild(var/datum/design/D)
|
||||||
for(var/M in D.materials)
|
for(var/M in D.materials)
|
||||||
if(materials[M] < D.materials[M])
|
if(materials[M] < (D.materials[M] * mat_efficiency))
|
||||||
return 0
|
return 0
|
||||||
for(var/C in D.chemicals)
|
for(var/C in D.chemicals)
|
||||||
if(!reagents.has_reagent(C, D.chemicals[C]))
|
if(!reagents.has_reagent(C, D.chemicals[C] * mat_efficiency))
|
||||||
return 0
|
return 0
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 12 KiB |
Reference in New Issue
Block a user