Merge branch 'Bubberstation:master' into master

SPLURT-Station · Jun 9, 2024 · b0f8c63 · b0f8c63
2 parents f1906c6 + d68a852
commit b0f8c63
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git 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)

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
@@ -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
@@ -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
@@ -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
@@ -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