diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm index 2463d231311..69807067bb2 100644 --- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm +++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm @@ -257,7 +257,7 @@ loot.throw_at(get_step_rand(sacrifice), 2, 4, user, TRUE) // The loser is DUSTED. - sacrifice.dust(TRUE, TRUE) + sacrifice.dust(just_ash = TRUE, drop_items = TRUE) // Increase reward counter var/datum/antagonist/heretic/antag = GET_HERETIC(user) diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 6f6b87c5e17..daa701eb6cb 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -284,7 +284,7 @@ continue var/mob/living/carbon/human/H = X if(H.stat == DEAD) - H.dust(TRUE) + H.dust(just_ash = TRUE) spooky_scaries.Remove(X) continue list_clear_nulls(spooky_scaries) diff --git a/code/modules/awaymissions/cordon.dm b/code/modules/awaymissions/cordon.dm index 5a84b4381da..3d791168b22 100644 --- a/code/modules/awaymissions/cordon.dm +++ b/code/modules/awaymissions/cordon.dm @@ -65,7 +65,7 @@ . = ..() for(var/mob/living/enterer as anything in arrived.get_all_contents_type(/mob/living)) to_chat(enterer, span_userdanger("This was a bad idea...")) - enterer.dust(TRUE, FALSE, TRUE) + enterer.dust(just_ash = TRUE, drop_items = FALSE, force = TRUE) /// This type of cordon will block ghosts from passing through it. Useful for stuff like Away Missions, where you feasibly want to block ghosts from entering to keep a certain map section a secret. /turf/cordon/secret diff --git a/code/modules/deathmatch/deathmatch_lobby.dm b/code/modules/deathmatch/deathmatch_lobby.dm index 3c607089528..af4408ef58c 100644 --- a/code/modules/deathmatch/deathmatch_lobby.dm +++ b/code/modules/deathmatch/deathmatch_lobby.dm @@ -234,7 +234,7 @@ if(!gibbed && !QDELING(player) && !isdead(player)) if(!HAS_TRAIT(src, TRAIT_DEATHMATCH_EXPLOSIVE_IMPLANTS)) unregister_player_signals(player) - player.dust(TRUE, TRUE, TRUE) + player.dust(just_ash = TRUE, drop_items = TRUE, force = TRUE) if (players.len <= 1) end_game() diff --git a/code/modules/mining/lavaland/mining_loot/clothing.dm b/code/modules/mining/lavaland/mining_loot/clothing.dm index 620c93a8391..8bbca709e2e 100644 --- a/code/modules/mining/lavaland/mining_loot/clothing.dm +++ b/code/modules/mining/lavaland/mining_loot/clothing.dm @@ -42,7 +42,7 @@ var/mob/living/carbon/human/stored_owner = active_owner //to avoid infinite looping when dust unequips the pendant active_owner = null to_chat(stored_owner, span_userdanger("You feel your life rapidly slipping away from you!")) - stored_owner.dust(TRUE, TRUE) + stored_owner.dust(just_ash = TRUE, drop_items = TRUE) /obj/item/clothing/neck/necklace/memento_mori/proc/check_health(mob/living/source) SIGNAL_HANDLER diff --git a/code/modules/mob/living/basic/boss/boss.dm b/code/modules/mob/living/basic/boss/boss.dm index d519548d320..3d64e73c173 100644 --- a/code/modules/mob/living/basic/boss/boss.dm +++ b/code/modules/mob/living/basic/boss/boss.dm @@ -48,7 +48,7 @@ return return ..() -/mob/living/basic/boss/dust(just_ash, drop_items, force) +/mob/living/basic/boss/dust(just_ash, drop_items, give_moodlet, force) if(!force && health > 0) return return ..() diff --git a/code/modules/mob/living/basic/guardian/guardian.dm b/code/modules/mob/living/basic/guardian/guardian.dm index 8b9c14c0b29..cd903cbc020 100644 --- a/code/modules/mob/living/basic/guardian/guardian.dm +++ b/code/modules/mob/living/basic/guardian/guardian.dm @@ -200,7 +200,7 @@ /mob/living/basic/guardian/gib() death(TRUE) -/mob/living/basic/guardian/dust(just_ash, drop_items, force) +/mob/living/basic/guardian/dust(just_ash, drop_items, give_moodlet, force) death(TRUE) /// Link up with a summoner mob. diff --git a/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm b/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm index 93e78563112..4d7dd688350 100644 --- a/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm +++ b/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm @@ -278,7 +278,7 @@ /mob/living/basic/revenant/med_hud_set_status() return //we use no hud -/mob/living/basic/revenant/dust(just_ash, drop_items, force) +/mob/living/basic/revenant/dust(just_ash, drop_items, give_moodlet, force) death() /mob/living/basic/revenant/gib() diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index 0383b59d56a..e87b425acd7 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -91,19 +91,20 @@ * * drop_items - Should the mob drop their items before dusting? * * force - Should this mob be FORCABLY dusted? */ -/atom/movable/proc/dust(just_ash, drop_items, force) +/atom/movable/proc/dust(just_ash, drop_items, give_moodlet, force) dust_animation() // since this is sometimes called in the middle of movement, allow half a second for movement to finish, ghosting to happen and animation to play. // Looks much nicer and doesn't cause multiple runtimes. QDEL_IN(src, DUST_ANIMATION_TIME) -/mob/living/dust(just_ash, drop_items, force) +/mob/living/dust(just_ash, drop_items, give_moodlet = TRUE, force) ..() if(body_position == STANDING_UP) // keep us upright so the animation fits. ADD_TRAIT(src, TRAIT_FORCED_STANDING, TRAIT_GENERIC) - send_death_moodlets(dusted = TRUE) + if(give_moodlet) + send_death_moodlets(dusted = TRUE) if(drop_items) unequip_everything() diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm index 99c5686aa53..5fea50df04d 100644 --- a/code/modules/mob/living/silicon/robot/death.dm +++ b/code/modules/mob/living/silicon/robot/death.dm @@ -2,7 +2,7 @@ /mob/living/silicon/robot/gib_animation() new /obj/effect/temp_visual/gib_animation(loc, "gibbed-r") -/mob/living/silicon/robot/dust(just_ash, drop_items, force) +/mob/living/silicon/robot/dust(just_ash, drop_items, give_moodlet, force) // You do not get MMI'd if you are dusted QDEL_NULL(mmi) return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm index 29c84d42bdd..c3932fd77eb 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm @@ -112,7 +112,7 @@ set_health(0) return ..() -/mob/living/simple_animal/hostile/megafauna/dust(just_ash, drop_items, force) +/mob/living/simple_animal/hostile/megafauna/dust(just_ash, drop_items, give_moodlet, force) if(!force && health > 0) return loot.Cut()