cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes wisp lanterns not updating your sight when recalling (#28969)

Browse Source 
* Fixes wisp lanterns not updating your sight when recalling (#85106)

## About The Pull Request

Now uses a THERMAL_VISION trait instead of directly applying it to be a
tad bit cleaner, and actually updates your vision when it stops orbiting
you.

## Changelog
🆑
fix: Recalling lantern wisp now properly removes its effects from you
/🆑

* Fixes wisp lanterns not updating your sight when recalling

---------

Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-07-21 09:14:26 +05:30
committed by GitHub
co-authored by SmArtKar
parent 1b4fe0c516
commit 9b0bbc1c1f
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/tendril_loot.dm
+21 -17
View File
@@ -246,13 +246,13 @@
inhand_icon_state = "lantern-blue"
wisp.orbit(user, 20)
SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Freed")
return
else
to_chat(user, span_notice("You return the wisp to the lantern."))
icon_state = "lantern-blue-on"
inhand_icon_state = "lantern-blue-on"
wisp.forceMove(src)
SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned")
to_chat(user, span_notice("You return the wisp to the lantern."))
icon_state = "lantern-blue-on"
inhand_icon_state = "lantern-blue-on"
wisp.forceMove(src)
SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned")
/obj/item/wisp_lantern/Initialize(mapload)
. = ..()
@@ -278,26 +278,30 @@
light_flags = LIGHT_ATTACHED
layer = ABOVE_ALL_MOB_LAYER
plane = ABOVE_GAME_PLANE
var/sight_flags = SEE_MOBS
var/list/color_cutoffs = list(10, 25, 25)
/obj/effect/wisp/orbit(atom/thing, radius, clockwise, rotation_speed, rotation_segments, pre_rotation, lockinorbit)
. = ..()
if(ismob(thing))
RegisterSignal(thing, COMSIG_MOB_UPDATE_SIGHT, PROC_REF(update_user_sight))
var/mob/being = thing
being.update_sight()
to_chat(thing, span_notice("The wisp enhances your vision."))
if(!ismob(thing))
return
var/mob/being = thing
RegisterSignal(being, COMSIG_MOB_UPDATE_SIGHT, PROC_REF(update_user_sight))
to_chat(being, span_notice("The wisp enhances your vision."))
ADD_TRAIT(being, TRAIT_THERMAL_VISION, REF(src))
being.update_sight()
/obj/effect/wisp/stop_orbit(datum/component/orbiter/orbits)
. = ..()
if(ismob(orbits.parent))
UnregisterSignal(orbits.parent, COMSIG_MOB_UPDATE_SIGHT)
to_chat(orbits.parent, span_notice("Your vision returns to normal."))
if(!ismob(orbit_target))
return ..()
var/mob/being = orbit_target
UnregisterSignal(being, COMSIG_MOB_UPDATE_SIGHT)
to_chat(being, span_notice("Your vision returns to normal."))
REMOVE_TRAIT(being, TRAIT_THERMAL_VISION, REF(src))
being.update_sight()
return ..()
/obj/effect/wisp/proc/update_user_sight(mob/user)
SIGNAL_HANDLER
user.add_sight(sight_flags)
if(!isnull(color_cutoffs))
user.lighting_color_cutoffs = blend_cutoff_colors(user.lighting_color_cutoffs, color_cutoffs)