From c2aecbfc573583a48b572de995e3dc1f7d9f9ffb Mon Sep 17 00:00:00 2001 From: Shadow-Quill Date: Tue, 29 Apr 2025 21:24:05 -0600 Subject: [PATCH] additional fixes --- modular_skyrat/modules/clock_cult/code/language.dm | 2 +- .../modules/customization/modules/clothing/storage/belts.dm | 1 + modular_skyrat/modules/decay_subsystem/code/spawn_nest.dm | 2 +- .../deforest_medical_items/code/storage_items_robotics.dm | 2 +- modular_skyrat/modules/modular_items/code/tailoring.dm | 4 ---- modular_skyrat/modules/novaya_ert/code/mod_suit.dm | 2 ++ modular_zubbers/code/datums/quirks/_quirk.dm | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/modular_skyrat/modules/clock_cult/code/language.dm b/modular_skyrat/modules/clock_cult/code/language.dm index 4b4b4c7a2ba..d096e61903a 100644 --- a/modular_skyrat/modules/clock_cult/code/language.dm +++ b/modular_skyrat/modules/clock_cult/code/language.dm @@ -15,7 +15,7 @@ spans = list(SPAN_ROBOT) secret = TRUE -/datum/language/ratvar/scramble_sentence(input, user.get_partially_understood_languages()) +/datum/language/ratvar/scramble_sentence(input, list/mutual_languages) return text2ratvar(input) //Regexes used to alter english to ratvarian style diff --git a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm index 7088f33657d..55bafec0bfa 100644 --- a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm +++ b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm @@ -45,6 +45,7 @@ ) atom_storage.allow_big_nesting = TRUE // Lets the pouch work AddElement(/datum/element/update_icon_updates_onmob) + PopulateContents() //Overrides normal dumping code to instead dump from the pouch item inside /datum/storage/belt/crusader/dump_content_at(atom/dest_object, mob/dumping_mob) diff --git a/modular_skyrat/modules/decay_subsystem/code/spawn_nest.dm b/modular_skyrat/modules/decay_subsystem/code/spawn_nest.dm index 4d519904948..a96edc45d95 100644 --- a/modular_skyrat/modules/decay_subsystem/code/spawn_nest.dm +++ b/modular_skyrat/modules/decay_subsystem/code/spawn_nest.dm @@ -26,7 +26,7 @@ ADMIN_VERB(spawn_mob_spawner, R_ADMIN, "Spawn mob spawner", "Spawns a mob spawne ) ) - var/list/returned_prefs = present_pref_like_picker(usr, "Spawn mob spawner", "Spawn mob spawner", StealFocus = 1, Timeout = 0, settings=settings) + var/list/returned_prefs = present_pref_like_picker(usr, "Spawn mob spawner", "Spawn mob spawner", steal_focus = TRUE, timeout = 0, settings=settings) if (isnull(returned_prefs)) return FALSE diff --git a/modular_skyrat/modules/deforest_medical_items/code/storage_items_robotics.dm b/modular_skyrat/modules/deforest_medical_items/code/storage_items_robotics.dm index a70ece4f757..eeb5ab328f1 100644 --- a/modular_skyrat/modules/deforest_medical_items/code/storage_items_robotics.dm +++ b/modular_skyrat/modules/deforest_medical_items/code/storage_items_robotics.dm @@ -26,7 +26,7 @@ /obj/item/clothing/head/utility/welding, /obj/item/clothing/glasses/welding, ), - list = list(), + list(), list(/obj/item/clothing/head/utility/welding, ) ) diff --git a/modular_skyrat/modules/modular_items/code/tailoring.dm b/modular_skyrat/modules/modular_items/code/tailoring.dm index 8d7cf31f58f..aff06fea817 100644 --- a/modular_skyrat/modules/modular_items/code/tailoring.dm +++ b/modular_skyrat/modules/modular_items/code/tailoring.dm @@ -22,10 +22,6 @@ time = 30 category = CAT_CLOTHING -/datum/crafting_recipe/crusader_belt/on_craft_completion(mob/user, atom/result) - var/obj/item/storage/belt/crusader/crusader_belt = result - crusader_belt.PopulateContents() - /datum/crafting_recipe/crusader_satchel name = "Crusader Satchel" result = /obj/item/storage/backpack/satchel/crusader diff --git a/modular_skyrat/modules/novaya_ert/code/mod_suit.dm b/modular_skyrat/modules/novaya_ert/code/mod_suit.dm index 471175317e7..0eeea1af07c 100644 --- a/modular_skyrat/modules/novaya_ert/code/mod_suit.dm +++ b/modular_skyrat/modules/novaya_ert/code/mod_suit.dm @@ -316,9 +316,11 @@ UnregisterSignal(mod.wearer, COMSIG_LIVING_HEALTH_UPDATE) /obj/item/mod/module/auto_doc/on_install() + . = ..() RegisterSignal(mod, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_item_interact)) /obj/item/mod/module/auto_doc/on_uninstall(deleting) + . = ..() UnregisterSignal(mod, COMSIG_ATOM_ATTACKBY) /obj/item/mod/module/auto_doc/attackby(obj/item/attacking_item, mob/user, params) diff --git a/modular_zubbers/code/datums/quirks/_quirk.dm b/modular_zubbers/code/datums/quirks/_quirk.dm index b212c324278..e1248fb7d3e 100644 --- a/modular_zubbers/code/datums/quirks/_quirk.dm +++ b/modular_zubbers/code/datums/quirks/_quirk.dm @@ -4,7 +4,7 @@ /// List of species that this quirk is valid for, or empty if it's valid for all species. Only use species ids here. var/list/species_whitelist = list() -/datum/quirk/add_to_holder(mob/living/new_holder, quirk_transfer, client/client_source) +/datum/quirk/add_to_holder(mob/living/new_holder, quirk_transfer, client/client_source, unique) if(!can_add(new_holder)) CRASH("Attempted to add quirk to holder that can't have it.") . = ..()