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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Advanced Mop can now make its own water #21903

Merged
merged 2 commits into from Dec 4, 2016
Merged

Advanced Mop can now make its own water #21903

merged 2 commits into from Dec 4, 2016

Conversation

GunHog
Copy link
Contributor

@GunHog GunHog commented Dec 3, 2016

馃啈 Gun Hog
add: Nanotrasen Janitorial Sciences Division is proud to announce a new concept for the Advanced Mop prototype; It now includes a built-in condenser for self re-hydration! See your local Scientist today! In the event that janitorial staff wish to use more expensive solutions, the condenser may be shut off with a handy handle switch!
/:cl:

  • The Advanced Mop can now produce its own water at a rate of 1 unit per
    process() tick, up to 10 units of water.

  • The advanced mop includes a switch on attack_self() to toggle wetting itself.

The Advanced Mop can now produce its own water at a rate of 1 unit per
process().

The advanced mop now has a switch to toggle wetting itself.
/obj/item/weapon/mop/advanced/Destroy()
if(refill_enabled)
STOP_PROCESSING(SSobj, src)
..()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pretty sure you need return ..() for Destroy()

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any other things I should know before I commit?

Copy link
Contributor

@lzimann lzimann Dec 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

none that i've noticed

START_PROCESSING(SSobj, src)
else
STOP_PROCESSING(SSobj,src)
user << "<span class='notice'>You turn [refill_enabled ? "on" : "off"] the condenser.</span>"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it look better being: "You turn the condenser [on : off]." ? Maybe it's just me.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will change it a little, but not exactly that, it seems weird.

Uses the proper return ..()
Rearranged the text a little.
@Jordie0608
Copy link
Member

Definitely power creep

@ma44
Copy link
Contributor

ma44 commented Dec 3, 2016

Has science gone to far?

@WJohn WJohn added Feature Exposes new bugs in interesting ways Tweak and removed Feature Exposes new bugs in interesting ways labels Dec 3, 2016
@WJohn
Copy link
Contributor

WJohn commented Dec 3, 2016

Thank god there's actually a reason to make this for the janitor now.

@XDTM
Copy link
Contributor

XDTM commented Dec 3, 2016

Do some real powercreep and make it generate lube when emagged

@GunHog
Copy link
Contributor Author

GunHog commented Dec 3, 2016

Do NOT tempt me. If a maintainer says I can do it, then I WILL DO IT.

@FantasticFwoosh
Copy link
Contributor

Something else infinite = water taps.

Generating space cleaner/ammonia would have been better so it instantly converts to space cleaner when dipped inside a water bowl

@AnturK
Copy link
Member

AnturK commented Dec 4, 2016

Hilarious, can't wait to VV it.

@AnturK AnturK merged commit b283fd0 into tgstation:master Dec 4, 2016
@GunHog GunHog deleted the THE_SLIPPENING branch March 3, 2017 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants