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

Animated wand of animation works and animated wand of animation animating a wand of animation works (#95982)

Browse Source 
## About The Pull Request

Fix 1: argument 4 on a new mimic is delete parent, not not having googly
eyes, so the issue there is clear

fix 2: `remove_thing_from_blackboard_key()` had no handling for the list
not yet being up, so it crashes thinking it's been called where
`clear_blackboard_key()` should've been.

fix 3: same as 1 but on wand of nothing, replaced copypaste with just
calling the function

## Why It's Good For The Game

fixes #95981
fixes an animated wand of animation animating a wand of animation
runtiming
Also the same problem with the wand of nothing

## Changelog
🆑

fix: animating a wand of animation works, and that animated wand of
animation animating a wand of animation does not runtime

/🆑
This commit is contained in:
Leland Kemble
2026-05-06 12:30:42 +01:00
committed by GitHub
parent 357b1f84c2
commit 17f6533531
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/magic/wand.dm
+2 -6
View File
@@ -358,16 +358,12 @@
// Animating a nothing wand makes it into an animating wand (and also animates it)
/obj/item/gun/magic/wand/nothing/animate_atom_living(mob/living/owner)
var/obj/item/gun/magic/wand/animate/animated_wand = new()
var/obj/item/gun/magic/wand/animate/animated_wand = new(loc)
animated_wand.charges = charges
animated_wand.name = name + "?"
var/mob/living/basic/mimic/copy/ranged/living_wand = new(drop_location(), animated_wand, owner, TRUE) // It's already got eyes
QDEL_NULL(living_wand.ai_controller)
living_wand.ai_controller = new /datum/ai_controller/basic_controller/mimic_copy/gun/animator(living_wand)
qdel(src)
return living_wand
return animated_wand.animate_atom_living(owner)
/// Also wand of doing fuck all
/obj/item/gun/magic/wand/nothing/fake_resurrection
code/modules/projectiles/guns/magic/wands/wand_animate.dm
+1 -1
View File
@@ -50,7 +50,7 @@
return MANUAL_SUICIDE
/obj/item/gun/magic/wand/animate/animate_atom_living(mob/living/owner)
var/mob/living/basic/mimic/copy/ranged/living_wand = new(drop_location(), src, owner, TRUE) // It's already got eyes
var/mob/living/basic/mimic/copy/ranged/living_wand = new(drop_location(), src, owner, FALSE, TRUE) // It's already got eyes
QDEL_NULL(living_wand.ai_controller)
living_wand.ai_controller = new /datum/ai_controller/basic_controller/mimic_copy/gun/animator(living_wand)
return living_wand