From 122d1612bff05edee2fc188178ce905eb07984bd Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 13 Feb 2024 01:05:31 +0100 Subject: [PATCH] [MIRROR] Fix love not working right before Valentines day (VERY HIGHI priority) (#26490) * Fix love not working right before Valentines day (VERY HIGHI priority) (#81440) ## About The Pull Request The parent new call is what handles showing the alt appearance to the mob So we add the alt appearance to our date, try to show to any mob, it fails (there is no seer), then set seer Fixes this by fixing the order ## Changelog :cl: Melbert fix: You can once again see love on Valentines Day /:cl: * Fix love not working right before Valentines day (VERY HIGHI priority) --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/datums/status_effects/neutral.dm | 1 + code/game/atom/alternate_appearance.dm | 6 +++--- code/modules/wiremod/components/bci/hud/bar_overlay.dm | 1 + code/modules/wiremod/components/bci/hud/counter_overlay.dm | 2 ++ code/modules/wiremod/components/bci/hud/object_overlay.dm | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index 84f30ab7855..3f267cb3bad 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -61,6 +61,7 @@ /datum/atom_hud/alternate_appearance/basic/one_person, "in_love", image(icon = 'icons/effects/effects.dmi', icon_state = "love_hearts", loc = date), + null, new_owner, )) diff --git a/code/game/atom/alternate_appearance.dm b/code/game/atom/alternate_appearance.dm index 86732dd9ed4..e22e5c89519 100644 --- a/code/game/atom/alternate_appearance.dm +++ b/code/game/atom/alternate_appearance.dm @@ -166,8 +166,8 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances) return TRUE return FALSE -/datum/atom_hud/alternate_appearance/basic/one_person/New(key, image/I, mob/living/M) - ..(key, I, FALSE) - seer = M +/datum/atom_hud/alternate_appearance/basic/one_person/New(key, image/I, options, mob/living/seer) + src.seer = seer + return ..() /datum/atom_hud/alternate_appearance/basic/food_demands diff --git a/code/modules/wiremod/components/bci/hud/bar_overlay.dm b/code/modules/wiremod/components/bci/hud/bar_overlay.dm index 5a1a46f5716..07d13a4ccfb 100644 --- a/code/modules/wiremod/components/bci/hud/bar_overlay.dm +++ b/code/modules/wiremod/components/bci/hud/bar_overlay.dm @@ -58,6 +58,7 @@ /datum/atom_hud/alternate_appearance/basic/one_person, "bar_overlay_[REF(src)]", cool_overlay, + null, owner, ) alt_appearance.show_to(owner) diff --git a/code/modules/wiremod/components/bci/hud/counter_overlay.dm b/code/modules/wiremod/components/bci/hud/counter_overlay.dm index d46c34ab047..a0f83b6f72e 100644 --- a/code/modules/wiremod/components/bci/hud/counter_overlay.dm +++ b/code/modules/wiremod/components/bci/hud/counter_overlay.dm @@ -76,6 +76,7 @@ /datum/atom_hud/alternate_appearance/basic/one_person, "counter_overlay_[REF(src)]", counter, + null, owner, ) alt_appearance.show_to(owner) @@ -101,6 +102,7 @@ /datum/atom_hud/alternate_appearance/basic/one_person, "counter_overlay_[REF(src)]_[i]", number, + null, owner, ) number_alt_appearance.show_to(owner) diff --git a/code/modules/wiremod/components/bci/hud/object_overlay.dm b/code/modules/wiremod/components/bci/hud/object_overlay.dm index 28e54cb7ee2..07e0f76761e 100644 --- a/code/modules/wiremod/components/bci/hud/object_overlay.dm +++ b/code/modules/wiremod/components/bci/hud/object_overlay.dm @@ -118,6 +118,7 @@ /datum/atom_hud/alternate_appearance/basic/one_person, "object_overlay_[REF(src)]", cool_overlay, + null, owner, ) alt_appearance.show_to(owner)