diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 50ebcc61d40..64399375d98 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -2,19 +2,25 @@ name = "technology fabricator" desc = "Makes researched and prototype items with materials and energy." layer = BELOW_OBJ_LAYER - var/efficiency_coeff = 1 //Materials needed / coeff = actual. + /// Materials needed / coeff = actual. + var/efficiency_coeff = 1 var/list/categories = list() var/datum/component/remote_materials/materials var/allowed_department_flags = ALL - var/production_animation //What's flick()'d on print. + /// What's flick()'d on print. + var/production_animation var/allowed_buildtypes = NONE var/list/datum/design/cached_designs var/list/datum/design/matching_designs - var/department_tag = "Unidentified" //used for material distribution among other things. + /// Used for material distribution among other things. + var/department_tag = "Unidentified" var/screen = RESEARCH_FABRICATOR_SCREEN_MAIN var/selected_category + /// What color is this machine's stripe? Leave null to not have a stripe. + var/stripe_color = null + /obj/machinery/rnd/production/Initialize(mapload) . = ..() create_reagents(0, OPENCONTAINER) @@ -23,6 +29,7 @@ update_designs() materials = AddComponent(/datum/component/remote_materials, "lathe", mapload, mat_container_flags=BREAKDOWN_FLAGS_LATHE) RefreshParts() + update_icon(UPDATE_OVERLAYS) /obj/machinery/rnd/production/Destroy() materials = null @@ -397,3 +404,20 @@ l += "" return l + +// Stuff for the stripe on the department machines +/obj/machinery/rnd/production/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/screwdriver) + . = ..() + update_icon(UPDATE_OVERLAYS) + +/obj/machinery/rnd/production/update_overlays() + . = ..() + if(!stripe_color) + return + var/mutable_appearance/stripe = mutable_appearance('icons/obj/machines/research.dmi', "protolate_stripe") + if(!panel_open) + stripe.icon_state = "protolathe_stripe" + else + stripe.icon_state = "protolathe_stripe_t" + stripe.color = stripe_color + . += stripe diff --git a/code/modules/research/machinery/departmental_protolathe.dm b/code/modules/research/machinery/departmental_protolathe.dm index dcd691eb4c8..ae678efaae9 100644 --- a/code/modules/research/machinery/departmental_protolathe.dm +++ b/code/modules/research/machinery/departmental_protolathe.dm @@ -9,33 +9,39 @@ allowed_department_flags = DEPARTMENTAL_FLAG_ENGINEERING department_tag = "Engineering" circuit = /obj/item/circuitboard/machine/protolathe/department/engineering + stripe_color = "#EFB341" /obj/machinery/rnd/production/protolathe/department/service name = "department protolathe (Service)" allowed_department_flags = DEPARTMENTAL_FLAG_SERVICE department_tag = "Service" circuit = /obj/item/circuitboard/machine/protolathe/department/service + stripe_color = "#83ca41" /obj/machinery/rnd/production/protolathe/department/medical name = "department protolathe (Medical)" allowed_department_flags = DEPARTMENTAL_FLAG_MEDICAL department_tag = "Medical" circuit = /obj/item/circuitboard/machine/protolathe/department/medical + stripe_color = "#52B4E9" /obj/machinery/rnd/production/protolathe/department/cargo name = "department protolathe (Cargo)" allowed_department_flags = DEPARTMENTAL_FLAG_CARGO department_tag = "Cargo" circuit = /obj/item/circuitboard/machine/protolathe/department/cargo + stripe_color = "#956929" /obj/machinery/rnd/production/protolathe/department/science name = "department protolathe (Science)" allowed_department_flags = DEPARTMENTAL_FLAG_SCIENCE department_tag = "Science" circuit = /obj/item/circuitboard/machine/protolathe/department/science + stripe_color = "#D381C9" /obj/machinery/rnd/production/protolathe/department/security name = "department protolathe (Security)" allowed_department_flags = DEPARTMENTAL_FLAG_SECURITY department_tag = "Security" circuit = /obj/item/circuitboard/machine/protolathe/department/security + stripe_color = "#DE3A3A" diff --git a/code/modules/research/machinery/departmental_techfab.dm b/code/modules/research/machinery/departmental_techfab.dm index bf2315b40cf..5c252a2dfcb 100644 --- a/code/modules/research/machinery/departmental_techfab.dm +++ b/code/modules/research/machinery/departmental_techfab.dm @@ -9,33 +9,39 @@ allowed_department_flags = DEPARTMENTAL_FLAG_ENGINEERING department_tag = "Engineering" circuit = /obj/item/circuitboard/machine/techfab/department/engineering + stripe_color = "#EFB341" /obj/machinery/rnd/production/techfab/department/service name = "department techfab (Service)" allowed_department_flags = DEPARTMENTAL_FLAG_SERVICE department_tag = "Service" circuit = /obj/item/circuitboard/machine/techfab/department/service + stripe_color = "#83ca41" /obj/machinery/rnd/production/techfab/department/medical name = "department techfab (Medical)" allowed_department_flags = DEPARTMENTAL_FLAG_MEDICAL department_tag = "Medical" circuit = /obj/item/circuitboard/machine/techfab/department/medical + stripe_color = "#52B4E9" /obj/machinery/rnd/production/techfab/department/cargo name = "department techfab (Cargo)" allowed_department_flags = DEPARTMENTAL_FLAG_CARGO department_tag = "Cargo" circuit = /obj/item/circuitboard/machine/techfab/department/cargo + stripe_color = "#956929" /obj/machinery/rnd/production/techfab/department/science name = "department techfab (Science)" allowed_department_flags = DEPARTMENTAL_FLAG_SCIENCE department_tag = "Science" circuit = /obj/item/circuitboard/machine/techfab/department/science + stripe_color = "#D381C9" /obj/machinery/rnd/production/techfab/department/security name = "department techfab (Security)" allowed_department_flags = DEPARTMENTAL_FLAG_SECURITY department_tag = "Security" circuit = /obj/item/circuitboard/machine/techfab/department/security + stripe_color = "#DE3A3A" diff --git a/icons/obj/machines/research.dmi b/icons/obj/machines/research.dmi index 00884c7f52a..d834bbd32f5 100644 Binary files a/icons/obj/machines/research.dmi and b/icons/obj/machines/research.dmi differ