mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-10 09:42:29 +00:00
778ed9f1ab
## About The Pull Request This PR kills the abstract internal and external typepaths for organs, now replaced by an EXTERNAL_ORGAN flag to distinguish the two kinds. This PR also fixes fox ears (from #87162, no tail is added) and mushpeople's caps (they should be red, the screenshot is a tad outdated). And yes, you can now use a hair dye spray to recolor body parts like most tails, podpeople hair, mushpeople caps and cat ears. The process can be reversed by using the spray again. ## Why It's Good For The Game Time-Green put some effort during the last few months to untie functions and mechanics from external/internal organ pathing. Now, all that this pathing is good for are a few typechecks, easily replaceable with bitflags. Also podpeople and mushpeople need a way to recolor their "hair". This kind of applies to fish tails from the fish infusion, which colors can't be selected right now. The rest is just there if you ever want to recolor your lizard tail for some reason. Proof of testing btw (screenshot taken before mushpeople cap fix, right side has dyed body parts, moth can't be dyed, they're already fabolous):  ## Changelog 🆑 code: Removed internal/external pathing from organs in favor of a bit flag. Hopefully this shouldn't break anything about organs. fix: Fixed invisible fox ears. fix: Fixed mushpeople caps not being colored red by default. add: You can now dye most tails, podpeople hair, mushpeople caps etc. with a hair dye spray. /🆑
103 lines
3.1 KiB
Plaintext
103 lines
3.1 KiB
Plaintext
/// Tests to make sure tail wagging behaves as expected
|
|
/datum/unit_test/tail_wag
|
|
// used by the stop_after test
|
|
var/timer_finished = FALSE
|
|
|
|
/datum/unit_test/tail_wag/Run()
|
|
var/mob/living/carbon/human/dummy = allocate(/mob/living/carbon/human/consistent)
|
|
var/obj/item/organ/tail/cat/dummy_tail = allocate(/obj/item/organ/tail/cat)
|
|
dummy_tail.Insert(dummy, special = TRUE, movement_flags = DELETE_IF_REPLACED)
|
|
|
|
// SANITY TEST
|
|
|
|
// start wagging
|
|
dummy.wag_tail()
|
|
if(!(dummy_tail.wag_flags & WAG_WAGGING))
|
|
TEST_FAIL("Tail did not start wagging when it should have!")
|
|
|
|
// stop wagging
|
|
dummy.unwag_tail()
|
|
if(dummy_tail.wag_flags & WAG_WAGGING)
|
|
TEST_FAIL("Tail did not stop wagging when it should have!")
|
|
|
|
// TESTING WAG EMOTE
|
|
|
|
// start wagging
|
|
dummy.emote("wag")
|
|
if(!(dummy_tail.wag_flags & WAG_WAGGING))
|
|
TEST_FAIL("Tail did not start wagging after using the *wag emote!")
|
|
|
|
// stop wagging
|
|
dummy.emote("wag")
|
|
if(dummy_tail.wag_flags & WAG_WAGGING)
|
|
TEST_FAIL("Tail did not stop wagging after using the *wag emote!")
|
|
|
|
// TESTING WAG_ABLE FLAG
|
|
|
|
// flip the wag flag to unwaggable
|
|
dummy_tail.wag_flags &= ~WAG_ABLE
|
|
|
|
// try to wag it again
|
|
dummy.wag_tail()
|
|
if(dummy_tail.wag_flags & WAG_WAGGING)
|
|
TEST_FAIL("Tail should not have the ability to wag, yet it did!")
|
|
|
|
// flip the wag flag to waggable again
|
|
dummy_tail.wag_flags |= WAG_ABLE
|
|
|
|
// start wagging again
|
|
dummy.wag_tail()
|
|
if(!(dummy_tail.wag_flags & WAG_WAGGING))
|
|
TEST_FAIL("Tail did not start wagging when it should have!")
|
|
|
|
// TESTING STOP_AFTER
|
|
|
|
// stop wagging
|
|
dummy.unwag_tail()
|
|
if(dummy_tail.wag_flags & WAG_WAGGING)
|
|
TEST_FAIL("Tail did not stop wagging when it should have!")
|
|
|
|
// start wagging, stop after 0.1 seconds
|
|
dummy.wag_tail(0.1 SECONDS)
|
|
// because timers are a pain
|
|
addtimer(VARSET_CALLBACK(src, timer_finished, TRUE), 0.2 SECONDS)
|
|
if(!(dummy_tail.wag_flags & WAG_WAGGING))
|
|
TEST_FAIL("Tail did not start wagging when it should have!")
|
|
|
|
UNTIL(timer_finished) // wait a little bit
|
|
|
|
if(dummy_tail.wag_flags & WAG_WAGGING)
|
|
TEST_FAIL("Tail was supposed to stop wagging on its own after 0.1 seconds but it did not!")
|
|
|
|
// TESTING TAIL REMOVAL
|
|
|
|
// remove the tail
|
|
dummy_tail.Remove(dummy, special = TRUE)
|
|
|
|
// check if tail is still wagging after being removed
|
|
if(dummy_tail.wag_flags & WAG_WAGGING)
|
|
TEST_FAIL("Tail was still wagging after being removed!")
|
|
|
|
// try to wag the removed tail
|
|
dummy.wag_tail()
|
|
if(dummy_tail.wag_flags & WAG_WAGGING)
|
|
TEST_FAIL("A disembodied tail was able to start wagging!")
|
|
|
|
// TESTING MOB DEATH
|
|
|
|
// put it back and start wagging again
|
|
dummy_tail.Insert(dummy, special = TRUE, movement_flags = DELETE_IF_REPLACED)
|
|
dummy.wag_tail()
|
|
if(!(dummy_tail.wag_flags & WAG_WAGGING))
|
|
TEST_FAIL("Tail did not start wagging when it should have!")
|
|
|
|
// kill the mob, see if it stops wagging
|
|
dummy.adjustBruteLoss(9001)
|
|
if(dummy_tail.wag_flags & WAG_WAGGING)
|
|
TEST_FAIL("A mob's tail was still wagging after being killed!")
|
|
|
|
// check if we are still able to wag the tail after death
|
|
dummy.wag_tail()
|
|
if(dummy_tail.wag_flags & WAG_WAGGING)
|
|
TEST_FAIL("A dead mob was able to wag their tail!")
|