From a6db77b79fe9063b756b7d396d741b62d8dcca95 Mon Sep 17 00:00:00 2001 From: nevimer Date: Sun, 9 Jun 2024 16:31:52 -0400 Subject: [PATCH 1/2] We need glasses (or a linter) weh --- .../modules/loadouts/loadout_items/loadout_datum_gloves.dm | 2 +- .../code/modules/loadouts/loadout_items/loadout_datum_shoes.dm | 2 +- .../code/modules/loadouts/loadout_items/loadout_datum_suit.dm | 3 +-- .../code/modules/loadouts/loadout_items/loadout_datum_under.dm | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_gloves.dm b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_gloves.dm index cbf8ebb80003e..a06428bf9390c 100644 --- a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_gloves.dm +++ b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_gloves.dm @@ -20,4 +20,4 @@ /datum/loadout_item/gloves/diver //Donor item for patriot210 name = "Black Divers Gloves" item_path = /obj/item/clothing/gloves/misc/diver - ckeywhitelist = list("sexmaster, leafydasurvivor") + ckeywhitelist = list("sexmaster", "leafydasurvivor") diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm index a634a5806990f..04f6e6920592d 100644 --- a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm +++ b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm @@ -34,4 +34,4 @@ /datum/loadout_item/shoes/diver //Donor item for patriot210 name = "Black Divers Boots" item_path = /obj/item/clothing/shoes/boots/diver - ckeywhitelist = list("sexmaster, leafydasurvivor") + ckeywhitelist = list("sexmaster", "leafydasurvivor") diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_suit.dm index ebb9f6f9cab1c..16858c87ded43 100644 --- a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -48,8 +48,7 @@ /datum/loadout_item/suit/diver //Donor item for patriot210 name = "Black Divers Coat" item_path = /obj/item/clothing/suit/jacket/diver - ckeywhitelist = list("sexmaster, leafydasurvivor") - + ckeywhitelist = list("sexmaster", "leafydasurvivor") /datum/loadout_item/suit/holographic name = "Holographic Suit V4000" item_path = /obj/item/clothing/suit/misc/holographic diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm index ce4d15b913298..230e80f4de80e 100644 --- a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm +++ b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm @@ -46,8 +46,7 @@ /datum/loadout_item/under/miscellaneous/diver name = "Black Divers Uniform" item_path = /obj/item/clothing/under/misc/diver - ckeywhitelist = list("sexmaster, leafydasurvivor") - + ckeywhitelist = list("sexmaster", "leafydasurvivor") /datum/loadout_item/under/miscellaneous/dress_strapped name = "Formal Evening Gown" item_path = /obj/item/clothing/under/dress/bubber/strapped From d68a852d5c9e38518e09b931bdbdba6da78d3c25 Mon Sep 17 00:00:00 2001 From: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Sun, 9 Jun 2024 08:13:13 +0200 Subject: [PATCH 2/2] Fixes brain transfers (#28068) --- modular_skyrat/modules/cortical_borer/code/cortical_borer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm b/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm index 54420c1c83903..2106fd628e079 100644 --- a/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm +++ b/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm @@ -32,7 +32,7 @@ GLOBAL_LIST_EMPTY(cortical_borers) return FALSE //so if a person is debrained, the borer is removed -/obj/item/organ/internal/brain/Remove(mob/living/carbon/target, special = 0, movement_flags = NO_ID_TRANSFER) +/obj/item/organ/internal/brain/Remove(mob/living/carbon/target, special = 0, movement_flags) . = ..() var/mob/living/basic/cortical_borer/cb_inside = target.has_borer() if(cb_inside)