From 6adff4c337a745a28311a2aede5c0c635ac15402 Mon Sep 17 00:00:00 2001 From: "Lila S." Date: Sat, 7 Sep 2024 01:20:06 +0200 Subject: [PATCH] handful of fixes --- .../colony_fabricator/code/machines/ore_silo.dm | 5 ++++- .../colony_fabricator/code/repacking_element.dm | 16 +++++++++++----- .../sapper_gang/sapper_outfits.dm | 8 ++++---- modular_doppler/overwrites/card/card.dmi | Bin 0 -> 2424 bytes 4 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 modular_doppler/overwrites/card/card.dmi diff --git a/modular_doppler/colony_fabricator/code/machines/ore_silo.dm b/modular_doppler/colony_fabricator/code/machines/ore_silo.dm index ce30e344da617..3d2adec9c18fa 100644 --- a/modular_doppler/colony_fabricator/code/machines/ore_silo.dm +++ b/modular_doppler/colony_fabricator/code/machines/ore_silo.dm @@ -7,10 +7,13 @@ /// What this packs into var/packed_type = /obj/item/flatpacked_machine/ore_silo +/obj/machinery/ore_silo/colony_lathe/Initialize(mapload) + . = ..() + AddElement(/datum/element/repackable, packed_type, 10 SECONDS) + /obj/machinery/ore_silo/colony_lathe/silo_log(obj/machinery/machinery_in_question, action, amount, noun, list/mats) . = ..() playsound(src, 'sound/machines/beep.ogg', 30, TRUE) - AddElement(/datum/element/repackable, packed_type, 10 SECONDS) /obj/machinery/ore_silo/colony_lathe/default_deconstruction_crowbar() return diff --git a/modular_doppler/colony_fabricator/code/repacking_element.dm b/modular_doppler/colony_fabricator/code/repacking_element.dm index dec98f4877eb0..4d11cece58c6f 100644 --- a/modular_doppler/colony_fabricator/code/repacking_element.dm +++ b/modular_doppler/colony_fabricator/code/repacking_element.dm @@ -20,28 +20,34 @@ src.disassemble_objects = disassemble_objects RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(examine)) - RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND_SECONDARY, PROC_REF(on_right_click)) + RegisterSignal(target, COMSIG_CLICK_ALT, PROC_REF(on_alt_click)) RegisterSignal(target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) /datum/element/repackable/Detach(datum/target) . = ..() UnregisterSignal(target, COMSIG_ATOM_EXAMINE) - UnregisterSignal(target, COMSIG_ATOM_ATTACK_HAND_SECONDARY) + UnregisterSignal(target, COMSIG_CLICK_ALT) UnregisterSignal(target, list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM)) /datum/element/repackable/proc/examine(datum/source, mob/user, list/examine_list) SIGNAL_HANDLER - examine_list += span_notice("It can be repacked with right click.") + examine_list += span_notice("It can be repacked with alt-click.") /// Checks if the user can actually interact with the structures in question, then invokes the proc to make it repack -/datum/element/repackable/proc/on_right_click(atom/source, mob/user) +/datum/element/repackable/proc/on_alt_click(atom/source, mob/user) SIGNAL_HANDLER - if(!user.can_perform_action(source, NEED_DEXTERITY)) + var/mob/living/living_user = user + if(DOING_INTERACTION_WITH_TARGET(user, source)) + return + if(istype(living_user) && living_user.combat_mode) + return + if(!living_user.can_perform_action(source, NEED_DEXTERITY)) return INVOKE_ASYNC(src, PROC_REF(repack), source, user) + return CLICK_ACTION_SUCCESS /// Removes the element target and spawns a new one of whatever item_to_pack_into is /datum/element/repackable/proc/repack(atom/source, mob/user) diff --git a/modular_doppler/modular_antagonists/sapper_gang/sapper_outfits.dm b/modular_doppler/modular_antagonists/sapper_gang/sapper_outfits.dm index cabcd14774c4f..10b8ac42a50bd 100644 --- a/modular_doppler/modular_antagonists/sapper_gang/sapper_outfits.dm +++ b/modular_doppler/modular_antagonists/sapper_gang/sapper_outfits.dm @@ -50,7 +50,7 @@ outfit_uniform.sensor_mode = SENSOR_OFF equipped.update_suit_sensors() - SSquirks.AssignQuirks(equipped, equipped.client, TRUE, TRUE, null, FALSE, equipped) + SSquirks.AssignQuirks(equipped, equipped.client) /obj/item/clothing/mask/gas/atmos/sapper @@ -141,9 +141,9 @@ /datum/id_trim/sapper assignment = "Sapper" trim_state = "trim_sapper" - trim_icon = 'modular_doppler/modular_antagonists/sapper_gang/icons/sapper_trim.dmi' - department_color = COLOR_ORANGE - subdepartment_color = COLOR_ORANGE + trim_icon = 'modular_doppler/overwrites/card/card.dmi' + department_color = COLOR_ENGINEERING_ORANGE + subdepartment_color = COLOR_ENGINEERING_ORANGE sechud_icon_state = SECHUD_SAPPER access = list(ACCESS_SAPPER_SHIP) threat_modifier = 2 diff --git a/modular_doppler/overwrites/card/card.dmi b/modular_doppler/overwrites/card/card.dmi new file mode 100644 index 0000000000000000000000000000000000000000..ab07a250afc6ccf1bfabfb6079685972b240d01b GIT binary patch literal 2424 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 E0L1l=O#lD@ literal 0 HcmV?d00001