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

Fixed fishing rod duping with poly belts and shapeshift spells. (#87706)

Browse Source 
## About The Pull Request
It turns out the "shapeshifted from spell" status ejects everything
inside the shapeshifted mob when removed. That's been causing a little
issue with the fishing rod from the profound_fisher component, which a
few mobs have. This PR fixes just that.

## Why It's Good For The Game

![immagine](https://github.com/user-attachments/assets/b664ffa6-567f-4332-b7dc-a5d2badb43d3)

![immagine](https://github.com/user-attachments/assets/4c453f91-2852-40c0-8f54-c5d66f28fdb1)


## Changelog

🆑
fix: Fixed fishing rod duping with poly belts and shapeshift spells.
spellcheck: Fixed a small typo when examining fishing rods.
/🆑
This commit is contained in:
Ghom
2024-11-09 03:07:55 +00:00
committed by GitHub
parent 9d46482f2f
commit dfb5d07b88
4 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/profound_fisher.dm
+22 -7
View File
@@ -2,15 +2,18 @@
/datum/component/profound_fisher
///the fishing rod this mob will use
var/obj/item/fishing_rod/mob_fisher/our_rod
///Wether we should delete the fishing rod along with the component or replace it if it's somehow removed from the parent
var/delete_rod_when_deleted = TRUE
/datum/component/profound_fisher/Initialize(our_rod)
/datum/component/profound_fisher/Initialize(our_rod, delete_rod_when_deleted = TRUE)
var/isgloves = istype(parent, /obj/item/clothing/gloves)
if(!isliving(parent) && !isgloves)
return COMPONENT_INCOMPATIBLE
src.our_rod = our_rod || new(parent)
src.our_rod.internal = TRUE
src.delete_rod_when_deleted = delete_rod_when_deleted
ADD_TRAIT(src.our_rod, TRAIT_NOT_BARFABLE, REF(src))
RegisterSignal(src.our_rod, COMSIG_QDELETING, PROC_REF(on_rod_qdel))
RegisterSignal(src.our_rod, COMSIG_MOVABLE_MOVED, PROC_REF(on_rod_moved))
if(!isgloves)
RegisterSignal(parent, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(pre_attack))
@@ -37,14 +40,26 @@
examine_list += span_info("When [EXAMINE_HINT("held")] or [EXAMINE_HINT("equipped")], [EXAMINE_HINT("right-click")] with a empty hand to open the integrated fishing rod interface.")
examine_list += span_tinynoticeital("To fish, you need to turn combat mode off.")
/datum/component/profound_fisher/proc/on_rod_qdel(datum/source)
///Handles replacing the fishing rod if somehow removed from the parent movable if delete_rod_when_deleted is TRUE, otherwise delete the component.
/datum/component/profound_fisher/proc/on_rod_moved(datum/source)
SIGNAL_HANDLER
qdel(src)
if(QDELETED(src) || our_rod.loc == parent)
return
if(delete_rod_when_deleted)
UnregisterSignal(our_rod, COMSIG_MOVABLE_MOVED)
if(!QDELETED(our_rod))
qdel(our_rod)
our_rod = new our_rod.type(parent)
else
qdel(src)
/datum/component/profound_fisher/Destroy()
our_rod.internal = FALSE
UnregisterSignal(our_rod, COMSIG_QDELETING)
REMOVE_TRAIT(our_rod, TRAIT_NOT_BARFABLE, REF(src))
UnregisterSignal(our_rod, COMSIG_MOVABLE_MOVED)
if(!delete_rod_when_deleted)
our_rod.internal = FALSE
REMOVE_TRAIT(our_rod, TRAIT_NOT_BARFABLE, REF(src))
else if(!QDELETED(our_rod))
QDEL_NULL(our_rod)
our_rod = null
return ..()