Merge branch 'master' of https://github.com/Monkestation/Monkestation2.0

 into aneri-test

code/__DEFINES/achievements.dm

@@ -56,6 +56,7 @@
 #define MEDAL_DEBT_EXTINGUISHED "Debt Extinguished"
 #define MEDAL_ARCHMAGE "Archmage"
 #define MEDAL_THEORETICAL_LIMITS "All Within Theoretical Limits"
+#define MEDAL_JARED_LETO "Jared Leto" // Monkestation addition
 
 //Skill medal hub IDs
 #define MEDAL_LEGENDARY_MINER "Legendary Miner"

code/game/machinery/medipen_refiller.dm

@@ -86,9 +86,9 @@
 	return ..()
 
 /obj/machinery/medipen_refiller/plunger_act(obj/item/plunger/P, mob/living/user, reinforced)
-	to_chat(user, span_notice("You start furiously plunging [name]."))
+	user.balloon_alert_to_viewers("furiously plunging...", "plunging medipen refiller...")
 	if(do_after(user, 30, target = src))
-		to_chat(user, span_notice("You finish plunging the [name]."))
+		user.balloon_alert_to_viewers("finished plunging")
 		reagents.expose(get_turf(src), TOUCH)
 		reagents.clear_reagents()
 

code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm

@@ -405,11 +405,12 @@
 
 	if(welded)
 		to_chat(user, span_notice("You cannot pump [src] if it's welded shut!"))
+		balloon_alert(user, "welded!")
 		return
 
-	to_chat(user, span_notice("You begin pumping [src] with your plunger."))
+	user.balloon_alert_to_viewers("plunging scrubber...", "plunging clogged scrubber...")
 	if(do_after(user, 6 SECONDS, target = src))
-		to_chat(user, span_notice("You finish pumping [src]."))
+		user.balloon_alert_to_viewers("finished plunging")
 		clogged = FALSE
 
 /**

code/modules/clothing/masks/animal_masks.dm

@@ -151,6 +151,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
 	animal_sounds = list("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
 	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEYES|HIDEEARS|HIDESNOUT
 	curse_spawn_sound = 'sound/magic/horsehead_curse.ogg'
+	flags_cover = NONE // Monkestation addition
 
 /obj/item/clothing/mask/animal/horsehead/cursed
 	cursed = TRUE

code/modules/plumbing/plumbers/_plumb_machinery.dm

@@ -37,9 +37,9 @@
 	return TOOL_ACT_TOOLTYPE_SUCCESS
 
 /obj/machinery/plumbing/plunger_act(obj/item/plunger/P, mob/living/user, reinforced)
-	to_chat(user, span_notice("You start furiously plunging [name]."))
+	user.balloon_alert_to_viewers("furiously plunging...")
 	if(do_after(user, 30, target = src))
-		to_chat(user, span_notice("You finish plunging the [name]."))
+		user.balloon_alert_to_viewers("finished plunging")
 		reagents.expose(get_turf(src), TOUCH) //splash on the floor
 		reagents.clear_reagents()
 

html/changelogs/AutoChangeLog-pr-1633.yml

@@ -0,0 +1,5 @@
+author: "dwasint"
+delete-after: True
+changes:
+  - bugfix: "Ensure deleted slimes are properly tracked, to prevent weird errors that broke slime pen management consoles."
+  - bugfix: "Fixed some wonky logic with liquid code."

html/changelogs/archive/2024-04.yml

@@ -126,3 +126,17 @@
   Tractor Mann:
   - bugfix: fixed Rocket Jump Waltz in the jukebox, you can actually listen to it
       end now hopefully.
+2024-04-09:
+  DimWhat:
+  - bugfix: Simians no longer turn invisible when husked.
+  KnigTheThrasher:
+  - rscadd: Added a new reagent container (aka. I fixed the bitrunning beach bar)
+2024-04-10:
+  JohnFulpWillard:
+  - bugfix: Malkavian bloodsuckers now whisper revelations again.
+2024-04-12:
+  Absolucy:
+  - qol: Added balloon alerts whenever you start plunging something.
+  Rex9001:
+  - rscadd: A new honeydew specific achievement
+  - balance: You can now eat whilst wearing a horsemask

monkestation/code/datums/achievements/misc_achievements.dm

@@ -0,0 +1,5 @@
+/datum/award/achievement/misc/jared_leto
+	name = "The Jared Leto of fruits"
+	desc = "Cantelopes dumb friend they insist on bringing to the party. The worst part of everything it is in."
+	database_id = MEDAL_JARED_LETO
+	icon = "jared_leto"

monkestation/code/modules/bloodsuckers/clans/malkavian.dm

@@ -41,7 +41,7 @@
 	if(prob(85) || bloodsuckerdatum.owner.current.stat != CONSCIOUS || HAS_TRAIT(bloodsuckerdatum.owner.current, TRAIT_MASQUERADE))
 		return
 	var/message = pick(strings("malkavian_revelations.json", "revelations", "fulp_modules/strings/bloodsuckers"))
-	INVOKE_ASYNC(bloodsuckerdatum.owner.current, /atom/movable/proc/say, message, , , , , , CLAN_MALKAVIAN)
+	INVOKE_ASYNC(bloodsuckerdatum.owner.current, TYPE_PROC_REF(/atom/movable, say), message, , , , , , CLAN_MALKAVIAN)
 
 /datum/bloodsucker_clan/malkavian/on_favorite_vassal(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum)
 	var/mob/living/carbon/carbonowner = vassaldatum.owner.current

monkestation/code/modules/hydroponics/grown/honeydew.dm

@@ -26,3 +26,21 @@
 
 /obj/item/food/grown/honeydew/make_processable()
 	AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/honeydewslice, 6, 20, screentip_verb = "Slice")
+
+/obj/item/food/grown/honeydew/Initialize()
+	. = ..()
+	// Used to check if they are wearing a horsemask
+	RegisterSignal(src, COMSIG_FOOD_EATEN, PROC_REF(check_horse_mask))
+
+/// Checks if the consumer of this honeydew is wearing a horse mask, if they are give them an achievement
+/obj/item/food/grown/honeydew/proc/check_horse_mask(obj/item/our_plant, mob/living/carbon/human/eater, mob/feeder)
+	SIGNAL_HANDLER
+
+	// If they arent wearing a horsemask they dont get the achievement
+	if(!istype(eater.wear_mask, /obj/item/clothing/mask/animal/horsehead))
+		return
+
+	to_chat(eater, span_notice("Not bad actually."))
+	// Gives them the honeydew achievement
+	eater.client.give_award(/datum/award/achievement/misc/jared_leto, eater)
+

monkestation/code/modules/liquids/liquid_groups.dm

@@ -515,7 +515,10 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 
 	if(group_burn_rate >= reagents_per_turf)
 		var/list/removed_turf = list()
-		for(var/num = 1, num < round(group_burn_rate / reagents_per_turf))
+		var/number = round(group_burn_rate / reagents_per_turf)
+		for(var/num in 1 to number)
+			if(!length(burning_members))
+				break
 			var/turf/picked_turf = burning_members[1]
 			extinguish(picked_turf)
 			remove_from_group(picked_turf)

monkestation/code/modules/slimecore/corral/corral_data.dm

@@ -51,9 +51,11 @@
 
 	RegisterSignal(arrived, COMSIG_ATOM_SUCKED, PROC_REF(remove_cause_sucked))
 	RegisterSignal(arrived, COMSIG_LIVING_DEATH, PROC_REF(remove_cause_sucked))
+	RegisterSignals(arrived, list(COMSIG_PREQDELETED, COMSIG_QDELETING), PROC_REF(try_remove))
 	managed_slimes |= arrived
 	for(var/datum/corral_upgrade/upgrade as anything in corral_upgrades)
 		upgrade.on_slime_entered(arrived, src)
+	update_slimes()
 
 /datum/corral_data/proc/check_exited(turf/source, atom/movable/gone, direction)
 	if(!istype(gone, /mob/living/basic/slime))
@@ -65,14 +67,34 @@
 
 	UnregisterSignal(gone, COMSIG_ATOM_SUCKED)
 	UnregisterSignal(gone, COMSIG_LIVING_DEATH)
+	UnregisterSignal(gone, list(COMSIG_PREQDELETED, COMSIG_QDELETING))
 	managed_slimes -= gone
 	for(var/datum/corral_upgrade/upgrade as anything in corral_upgrades)
 		upgrade.on_slime_exited(gone)
+	update_slimes()
 
 /datum/corral_data/proc/remove_cause_sucked(atom/movable/gone)
 
 	UnregisterSignal(gone, COMSIG_ATOM_SUCKED)
 	UnregisterSignal(gone, COMSIG_LIVING_DEATH)
+	UnregisterSignal(gone, list(COMSIG_PREQDELETED, COMSIG_QDELETING))
 	managed_slimes -= gone
 	for(var/datum/corral_upgrade/upgrade as anything in corral_upgrades)
 		upgrade.on_slime_exited(gone)
+	update_slimes()
+
+/datum/corral_data/proc/try_remove(mob/living/basic/slime/source)
+	managed_slimes -= source
+	update_slimes()
+
+/datum/corral_data/proc/update_slimes()
+	for(var/mob/living/basic/slime/slime as anything in managed_slimes)
+		if(QDELETED(slime) || !(get_turf(slime) in corral_turfs))
+			managed_slimes -= slime
+			if(QDELETED(slime))
+				continue
+			UnregisterSignal(slime, COMSIG_ATOM_SUCKED)
+			UnregisterSignal(slime, COMSIG_LIVING_DEATH)
+			UnregisterSignal(slime, list(COMSIG_PREQDELETED, COMSIG_QDELETING))
+			for(var/datum/corral_upgrade/upgrade as anything in corral_upgrades)
+				upgrade.on_slime_exited(slime)

monkestation/code/modules/slimecore/machines/slime_pen_controller.dm

@@ -53,6 +53,7 @@
 
 	else
 		data["slimes"] = list()
+		linked_data.update_slimes()
 		for(var/mob/living/basic/slime/slime as anything in linked_data.managed_slimes)
 			var/list/slime_data = list()
 			slime_data += list(

tgstation.dme

@@ -5680,6 +5680,7 @@
 #include "monkestation\code\datums\patreon_data.dm"
 #include "monkestation\code\datums\stamina_container.dm"
 #include "monkestation\code\datums\twitch_data.dm"
+#include "monkestation\code\datums\achievements\misc_achievements.dm"
 #include "monkestation\code\datums\ai\idle_behaviors\idle_dukeman.dm"
 #include "monkestation\code\datums\ai\monkey\dukeman_controller.dm"
 #include "monkestation\code\datums\ai_laws\laws_monke.dm"
@@ -6731,7 +6732,6 @@
 #include "monkestation\code\modules\skyrat_snipes\vending_machines\vendors.dm"
 #include "monkestation\code\modules\slash_commands\world_topics.dm"
 #include "monkestation\code\modules\slimecore\research_and_recipes.dm"
-#include "monkestation\code\modules\slimecore\slime_accessories.dm\_base_accessory.dm"
 #include "monkestation\code\modules\slimecore\animations\slime_effects.dm"
 #include "monkestation\code\modules\slimecore\assets\xenobiology.dm"
 #include "monkestation\code\modules\slimecore\components\basic_scared_of_item.dm"
@@ -6794,6 +6794,7 @@
 #include "monkestation\code\modules\slimecore\mobs\pet_commands\stop_feeding.dm"
 #include "monkestation\code\modules\slimecore\reagents\_base_reagent.dm"
 #include "monkestation\code\modules\slimecore\reagents\base_colors.dm"
+#include "monkestation\code\modules\slimecore\slime_accessories\_base_accessory.dm"
 #include "monkestation\code\modules\slimecore\slime_color_mutations\_base_color.dm"
 #include "monkestation\code\modules\slimecore\slime_color_mutations\colors.dm"
 #include "monkestation\code\modules\slimecore\slime_color_mutations\mutations\_base_mutation.dm"

tools/HubMigrator/HubMigrator.dm

@@ -9,7 +9,6 @@
 #define MEDAL_MATERIALCRAFT "Getting an Upgrade"
 #define MEDAL_SINGULARITY_BUSTER "The Lord Dethroned" //Singularity Nullified
 
-
 //Boss medals
 
 // Medal hub IDs for boss medals (Pre-fixes)