Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mop, Mop Bucket, and Janicart Refactor #28049

Open
wants to merge 11 commits into
base: master
Choose a base branch
from

Conversation

Fordoxia
Copy link
Contributor

@Fordoxia Fordoxia commented Jan 21, 2025

What Does This PR Do

Migrates the mop, mop bucket, and janicart to the new attack chain.

Implements the following bug fixes:

  • Mop buckets no longer throw your mop to the floor if you use it on the mop bucket when it already has a mop.
  • Janicarts no longer claim to already possess literally any non janitorial equipment you use on them (plutonium cores, guns, C4, you name it...)
  • Fixes the crowbar_act() and wrench_act() of the janicart.

The following alterations have been made to the janicart and mop bucket's behaviour:

  • Cyborgs can now wet their mops with the janicart and mop bucket.
  • You can now attack the janicart in melee. Janitorial tools can attack it by interacting in a non-help intent.
  • crowbar_act() and wrench_act()'s user.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:

  • Autodocs some variables.
  • Converts all variables to 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

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

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:

@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label Jan 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting type assignment This PR is waiting for its type to be assigned internally
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants