Mop, Mop Bucket, and Janicart Refactor #28049
Open
+224
−140
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What Does This PR Do
Migrates the mop, mop bucket, and janicart to the new attack chain.
Implements the following bug fixes:
crowbar_act()
andwrench_act()
of the janicart.The following alterations have been made to the janicart and mop bucket's behaviour:
crowbar_act()
andwrench_act()
'suser.visible_message()
s have been slightly altered and both are now audible to the blind.Mops no longer attack stuff unless you are in non-help intent.
Other changes:
snake_case
.Why It's Good For The Game
Attack chain migration progress.
Bugs are bad and should be fixed.
Minor alterations make the cart and bucket behave more intuitively.
Testing
Filled the janicart with a full set of items. Tried to add a second set, all items refused.
Removed all the items, added them back again.
Used various kinds of reagent containers on the mop bucket and janicart to make sure they can be filled. Stuff that did not used to fill them still do not.
Wetted my mop as a cyborg on the janicart and mop bucket.
Tried to store all my stuff on both the janicart and mop bucket as a borg (full and empty), I was unable to.
Used a crowbar to empty the janicart bucket as both a skrell and a borg.
Used a wrench to secure and unsecure the janicart as both a skrell and a borg.
Used a mop on a bucket as both a skrell and cyborg.
Hit janicarts with random items, and janitorial tools (only on non-help intent).
Declaration
Changelog
🆑
fix: Mop buckets no longer throw your mop to the floor if you use it on the mop bucket when it already has a mop.
fix: Janicarts no longer claim to already possess literally any non janitorial equipment you use on them (plutonium cores, guns, C4, you name it...)
fix: Janicarts can be crowbared again.
fix: Janicarts can be wrenched again.
tweak: Cyborgs can wet their mops with janicarts and mop buckets.
tweak: Janicarts can be attacked in melee. Janitorial tools can attack it and the mop bucket on non-help intents.
tweak: Mops no longer attack except in non-help intent.
/:cl: