From e9b28a29bc3284fcf7ca23f7e468ccec5ff5bee3 Mon Sep 17 00:00:00 2001 From: Wallem <66052067+Wallemations@users.noreply.github.com> Date: Thu, 17 Feb 2022 17:08:30 -0500 Subject: [PATCH] Adds colored stripes to departmental protolathes/techfabs (#64889) Gives protolathes/techfabs colored stripes to make it easier to tell them apart if they're moved for whatever reason. --- .../modules/research/machinery/_production.dm | 30 ++++++++++++++++-- .../machinery/departmental_protolathe.dm | 6 ++++ .../machinery/departmental_techfab.dm | 6 ++++ icons/obj/machines/research.dmi | Bin 26119 -> 26364 bytes 4 files changed, 39 insertions(+), 3 deletions(-) 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 00884c7f52ac9fe830f36ebf5382fb1cd0181290..d834bbd32f5a37c354930984f44a0d13a07af3cd 100644 GIT binary patch delta 4743 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