Merge branch 'master' into upstream-2024-02-03

code/modules/events/scrubber_overflow.dm

@@ -22,20 +22,23 @@
 	/// A list of scrubbers that will have reagents ejected from them
 	var/list/scrubbers = list()
 	/// The list of chems that scrubbers can produce
+
+	// BUBBER EDIT START - DISABLES MESSY REAGENTS
+
 	var/list/safer_chems = list(/datum/reagent/water,
 		/datum/reagent/carbon,
-		/datum/reagent/consumable/flour,
+	//	/datum/reagent/consumable/flour,
 		/datum/reagent/space_cleaner,
-		/datum/reagent/carpet/royal/blue,
-		/datum/reagent/carpet/orange,
+	//	/datum/reagent/carpet/royal/blue,
+	//	/datum/reagent/carpet/orange,
 		/datum/reagent/consumable/nutriment,
 		/datum/reagent/consumable/condensedcapsaicin,
 		/datum/reagent/drug/mushroomhallucinogen,
 		/datum/reagent/lube,
-		/datum/reagent/glitter/blue,
-		/datum/reagent/glitter/pink,
+	//	/datum/reagent/glitter/blue,
+	//	/datum/reagent/glitter/pink,
 		/datum/reagent/cryptobiolin,
-		/datum/reagent/blood,
+	//	/datum/reagent/blood,
 		/datum/reagent/medicine/c2/multiver,
 		/datum/reagent/water/holywater,
 		/datum/reagent/consumable/ethanol,
@@ -48,16 +51,19 @@
 		/datum/reagent/consumable/laughter,
 		/datum/reagent/concentrated_barbers_aid,
 		/datum/reagent/baldium,
-		/datum/reagent/colorful_reagent,
-		/datum/reagent/consumable/salt,
+	//	/datum/reagent/colorful_reagent,
+	//	/datum/reagent/consumable/salt,
 		/datum/reagent/consumable/ethanol/beer,
 		/datum/reagent/hair_dye,
 		/datum/reagent/consumable/sugar,
-		/datum/reagent/glitter/white,
+	//	/datum/reagent/glitter/white,
 		/datum/reagent/gravitum,
 		/datum/reagent/growthserum,
 		/datum/reagent/yuck,
 	)
+
+	// BUBBER EDIT END
+
 	//needs to be chemid unit checked at some point
 
 /datum/round_event/scrubber_overflow/announce_deadchat(random, cause)

html/changelogs/AutoChangeLog-pr-1010.yml

@@ -0,0 +1,4 @@
+author: "Majkl-J"
+delete-after: True
+changes:
+  - rscadd: "Ghosts without clients get sent back into the menu after a while."

html/changelogs/AutoChangeLog-pr-1012.yml

@@ -0,0 +1,4 @@
+author: "Vynzill"
+delete-after: True
+changes:
+  - rscadd: "Added more perfumes to loadout."

html/changelogs/AutoChangeLog-pr-1134.yml

@@ -0,0 +1,4 @@
+author: "IgiariValkyr"
+delete-after: True
+changes:
+  - config: "Relocked some donator items from Skyrat on request"

html/changelogs/AutoChangeLog-pr-1137.yml

@@ -0,0 +1,4 @@
+author: "Sylphet"
+delete-after: True
+changes:
+  - balance: "scrubbers do not overflow with carpet and rainbow stuff anymore"

html/changelogs/AutoChangeLog-pr-788.yml

@@ -0,0 +1,5 @@
+author: "Majkl-J"
+delete-after: True
+changes:
+  - image: "New rockfruit sprites"
+  - code_imp: "Modularized hydroponics"

modular_skyrat/modules/cryosleep/code/cryopod.dm

@@ -387,7 +387,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod, 32)
 	GLOB.joined_player_list -= stored_ckey
 
 	handle_objectives()
-	mob_occupant.ghostize()
+	mob_occupant.ghostize(FALSE) // BUBBER EDIT FIX - Added FALSE.You are going to get qdelled. You should not keep your mind linked. Cmon skyrat you could do better
 	QDEL_NULL(occupant)
 	open_machine()
 	name = initial(name)

modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm

@@ -52,7 +52,7 @@
 /datum/loadout_item/gloves/hypnoring_bippy
 	name = "Hypnodemon's Ring"
 	item_path = /obj/item/clothing/gloves/ring/hypno/bippys
-	//ckeywhitelist = list("bippys")
+	ckeywhitelist = list("bippys")
 
 /datum/loadout_item/shoes/rax_armadyne_boots
 	name = "Tactical Boots"

modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_pocket.dm

@@ -7,7 +7,56 @@
 	item_path = /obj/item/reagent_containers/cup/glass/bottle/beer/starwine
 	ckeywhitelist = list("catmanpop") //donator item for Catmanpop
 
+/datum/loadout_item/pocket_items/fragrance_ash
+	name = "Ash Perfume"
+	item_path = /obj/item/perfume/ash
+
+/datum/loadout_item/pocket_items/fragrance_bergamot
+	name = "Bergamot Perfume"
+	item_path = /obj/item/perfume/bergamot
+
+/datum/loadout_item/pocket_items/fragrance_cardamom
+	name = "Cardamom Perfume"
+	item_path = /obj/item/perfume/cardamom
+
+/datum/loadout_item/pocket_items/fragrance_chocolate
+	name = "Chocolate Perfume"
+	item_path = /obj/item/perfume/chocolate
+
+/datum/loadout_item/pocket_items/fragrance_cinnamon
+	name = "Cinnamon Perfume"
+	item_path = /obj/item/perfume/cinnamon
+
+/datum/loadout_item/pocket_items/fragrance_citrus
+	name = "Citrus Perfume"
+	item_path = /obj/item/perfume/citrus
+
+/datum/loadout_item/pocket_items/fragrance_clove
+	name = "Clove Perfume"
+	item_path = /obj/item/perfume/clove
+
+/datum/loadout_item/pocket_items/fragrance_grass
+	name = "Grass Perfume"
+	item_path = /obj/item/perfume/grass
+
+/datum/loadout_item/pocket_items/fragrance_iron
+	name = "Iron Perfume"
+	item_path = /obj/item/perfume/iron
+
+/datum/loadout_item/pocket_items/fragrance_oil
+	name = "Oil Perfume"
+	item_path = /obj/item/perfume/oil
+
+/datum/loadout_item/pocket_items/fragrance_peach
+	name = "Peach Perfume"
+	item_path = /obj/item/perfume/peach
+
+/datum/loadout_item/pocket_items/fragrance_petrichor
+	name = "Petrichor Perfume"
+	item_path = /obj/item/perfume/petrichor
+
 /datum/loadout_item/pocket_items/stamp/donator/crow
 	name = "Mitchell Inc. Stamp"
 	item_path = /obj/item/stamp/donator/crow
 	ckeywhitelist = list("slippyjoe") //donator item for SlippyJoe, who woulda guessed.
+

modular_zubbers/modules/client/code/ssd.dm

@@ -0,0 +1,64 @@
+/mob/living/carbon/human/Logout()
+	. = ..()
+	if(HAS_TRAIT(src, TRAIT_SUICIDED))
+		alpha = GHOST_ALPHA
+
+	if(!(stat == DEAD || (HAS_TRAIT(src, TRAIT_FAKEDEATH))))
+		if(get_organ_by_type(/obj/item/organ/internal/brain))
+			if(!key)
+				alpha = GHOST_ALPHA
+
+/mob/living/carbon/human/Login()
+	. = ..()
+	alpha = 255
+
+
+/*
+	Code for sending ghosts into the lobby.
+	Handles ghostize() and observer Logout()
+
+*/
+
+#define GHOST_AFK_RESPAWN_TIME 15 MINUTES
+/mob/dead/observer
+	var/datum/timedevent/logout_timer
+
+// Handles fresh ghosts. This includes cryo chambers
+/mob/living/ghostize(can_reenter_corpse)
+	. = ..()
+	var/mob/dead/observer/ghost = .
+	if(!istype(ghost))
+		return
+	if(CONFIG_GET(flag/allow_respawn))
+		ghost.logout_timer = addtimer(CALLBACK(ghost, TYPE_PROC_REF(/mob/dead/observer, can_send_to_lobby)), GHOST_AFK_RESPAWN_TIME/3, TIMER_STOPPABLE)
+
+/mob/dead/observer/Logout()
+	. = ..()
+	if(CONFIG_GET(flag/allow_respawn))
+		logout_timer = addtimer(CALLBACK(src, PROC_REF(send_to_lobby)), GHOST_AFK_RESPAWN_TIME, TIMER_STOPPABLE)
+
+/mob/dead/observer/Login()
+	. = ..()
+	if(logout_timer)
+		deltimer(logout_timer)
+
+// Don't respawn people with a connected body or client
+/mob/dead/observer/proc/can_send_to_lobby()
+	if(!ckey) // Turns out sometime ghosts exist without ckeys? A curious thing that shouldn't happen
+		return FALSE
+	if(is_banned_from(ckey, BAN_RESPAWN))
+		return FALSE
+
+	return ((!mind || QDELETED(mind.current)) && !client)
+
+/mob/dead/observer/proc/send_to_lobby()
+	if(!can_send_to_lobby())
+		return
+	var/mob/dead/new_player/M = new /mob/dead/new_player()
+
+	log_access("Ghost sent to lobby due to disconnect: [key]")
+	M.key = key
+
+	qdel(src)
+
+#undef GHOST_AFK_RESPAWN_TIME

modular_zubbers/code/modules/hydroponics/grown/rocks.dm → modular_zubbers/modules/hydroponics/code/grown/rocks.dm

@@ -3,7 +3,7 @@
 	desc = "Small seedlings of the golem rockfruit plant. There's a warning label on its packaging: \n\
 	\"Remember: Legally speaking, rocking is more legal than stoning. \n \
 	We are not liable for any injury, death, or complete body evaporation caused by using or growing these plants\""
-	icon = 'modular_zubbers/code/modules/hydroponics/icons/seeds.dmi'
+	icon = 'modular_zubbers/modules/hydroponics/icons/seeds.dmi'
 	icon_state = "seed-rockfruit"
 	species = "rock"
 	plantname = "Rockfruits"
@@ -20,7 +20,7 @@
 
 
 	growthstages = 2
-	growing_icon = 'modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi'
+	growing_icon = 'modular_zubbers/modules/hydroponics/icons/growing_fruits.dmi'
 
 	genes = list(/datum/plant_gene/trait/plant_type/weed_hardy,
 				/datum/plant_gene/trait/fire_resistance,
@@ -40,7 +40,7 @@
 	force = 5 // Comparatively shit considering a nettle is 15
 	throwforce = 10 // Less shit but hey, it is a rock
 
-	icon = 'modular_zubbers/code/modules/hydroponics/icons/harvest.dmi'
+	icon = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi'
 	icon_state = "rockfruit"
 
 	var/product = /obj/item/food/grown/rockfruit
@@ -71,7 +71,7 @@
 
 	foodtypes = FRUIT
 
-	icon = 'modular_zubbers/code/modules/hydroponics/icons/harvest.dmi'
+	icon = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi'
 	icon_state = "rockfruit-peeled"
 
 	tastes = list("mountains" = 1)
@@ -81,8 +81,8 @@
 	desc = "The peeled shell of a rockfruit, or as you may call it, \"Literal pile of rocks\". \
 	Probably not edible, but a golem will try to prove you otherwise"
 
-	icon = 'modular_zubbers/code/modules/food_and_drinks/icons/rocks.dmi'
-	icon_state = "rocks"
+	icon = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi'
+	icon_state = "rockfruit-trash"
 
 	foodtypes = STONE
 	food_reagents = list(/datum/reagent/consumable/nutriment/mineral = 5)

modular_zubbers/modules/hydroponics/readme.txt

@@ -0,0 +1,8 @@
+# BUBBERSTATION MODULAR HYDROPONICS
+
+## What to put here
+Any completely new seeds, produce, sprites, and mechanics.
+Do not put any actual craftable foods here, instead either create or use, (if already created) the relevant modular folder.
+
+
+Overrides of mechanics on parent repos (TG, Skyrat) should still be done in the code folder.

modular_zubbers/modules/pollution/code/perfumes.dm

@@ -0,0 +1,47 @@
+/obj/item/perfume/ash
+	name = "ash perfume bottle"
+	fragrance_type = /datum/pollutant/fragrance/ash
+
+/obj/item/perfume/bergamot
+	name = "bergamot perfume bottle"
+	fragrance_type = /datum/pollutant/fragrance/bergamot
+
+/obj/item/perfume/cardamom
+	name = "cardamom perfume bottle"
+	fragrance_type = /datum/pollutant/fragrance/cardamom
+
+/obj/item/perfume/chocolate
+	name = "chocolate perfume bottle"
+	fragrance_type = /datum/pollutant/food/chocolate
+
+/obj/item/perfume/cinnamon
+	name = "cinnamon perfume bottle"
+	fragrance_type = /datum/pollutant/fragrance/cinnamon
+
+/obj/item/perfume/citrus
+	name = "citrus perfume bottle"
+	fragrance_type = /datum/pollutant/fragrance/citrus
+
+/obj/item/perfume/clove
+	name = "clove perfume bottle"
+	fragrance_type = /datum/pollutant/fragrance/clove
+
+/obj/item/perfume/grass
+	name = "grass perfume bottle"
+	fragrance_type = /datum/pollutant/fragrance/grass
+
+/obj/item/perfume/iron
+	name = "iron perfume bottle"
+	fragrance_type = /datum/pollutant/metallic_scent
+
+/obj/item/perfume/oil
+	name = "oil perfume bottle"
+	fragrance_type = /datum/pollutant/fragrance/oil
+
+/obj/item/perfume/peach
+	name = "peach perfume bottle"
+	fragrance_type = /datum/pollutant/fragrance/peach
+
+/obj/item/perfume/petrichor
+	name = "petrichor perfume bottle"
+	fragrance_type = /datum/pollutant/fragrance/petrichor

modular_zubbers/modules/pollution/code/pollutants_generic.dm

@@ -0,0 +1,39 @@
+/datum/pollutant/fragrance/ash
+	name = "Ash Perfume"
+	scent = "ash"
+
+/datum/pollutant/fragrance/bergamot
+	name = "Bergamot Perfume"
+	scent = "a fresh and fruity scent"
+
+/datum/pollutant/fragrance/cardamom
+	name = "Cardamom Perfume"
+	scent = "a minty and lemony scent"
+
+/datum/pollutant/fragrance/cinnamon
+	name = "Cinnamon Perfume"
+	scent = "cinnamon"
+
+/datum/pollutant/fragrance/citrus
+	name = "Citrus Perfume"
+	scent = "citrus"
+
+/datum/pollutant/fragrance/clove
+	name = "Clove Perfume"
+	scent = "a spicy and sweet scent"
+
+/datum/pollutant/fragrance/grass
+	name = "Grass Perfume"
+	scent = "a earthy and natural scent"
+
+/datum/pollutant/fragrance/oil
+	name = "Oil Perfume"
+	scent = "oil"
+
+/datum/pollutant/fragrance/peach
+	name = "Peach Perfume"
+	scent = "a sweet and peachy scent"
+
+/datum/pollutant/fragrance/petrichor
+	name = "Petrichor Perfume"
+	scent = "morning dew and fresh rain scent"