Commit Graph

53 Commits

Author SHA1 Message Date
DGamerL 3a0d6860a6 Makes dry mops insert properly into the janicart (#26427)
* Makes dry mops insert properly into the janicart

* Oops
2024-08-08 00:40:54 +00:00
DGamerL 4787bf65e0 Refactors janitorialcart/attackby and removes a very duplicated proc on mops, lightreplacers and more (#26255)
* Wohooo refactor

* Whoops

* Adds unequip

* Fixes

* Update code/game/objects/items/weapons/mop.dm

Co-authored-by: Adrer <erwin@lombok.demon.nl>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/weapons/mop.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Adrer <erwin@lombok.demon.nl>
2024-08-02 18:08:06 +00:00
DGamerL 6c0163747c Makes NODROP mops not get stuck in mop buckets (#26250)
* Cleans up the proc

* Update code/game/objects/structures/mop_bucket.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Faron review

* Proc refactor

* CI fixes

* Unnecessary check

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-07-20 16:27:53 +00:00
Henri215 6826d2ba7b Moving some in hand icons to different files (#20748)
* Moving some icons out of left/righthand.dmi

* Moving sheets and ores
2023-04-25 21:13:02 +02:00
Henri215 17a8b219c8 Adds new sounds when sweeping and mopping (#20550)
* Its mopping time

* GDN suggestion
2023-03-26 12:18:34 +01:00
GDN 19c4c00503 deletes some unused variables (#20609) 2023-03-13 18:32:36 -04:00
Henri215 c4667311e7 Janitorial equipment tweaks and cleaners availability (#20037)
* Janitorial equipment tweaks and advanced cleaner

* cleaner availability tweaks

* old cleaner for drones

* Mop capacity buff

* advanced cleaner for sol traders

* conflict part 1

* Merge branch 'master' into janitorial_tweaks

* Revert "Merge branch 'master' into janitorial_tweaks"

This reverts commit 47129ea819.

* Revert "Revert "Merge branch 'master' into janitorial_tweaks""

This reverts commit a8c520b069.

* hahahahaha

* hahaha part 2

* hahaha part 3

* cerestation edit

* adv cleaner comes with 500 now and ERT belt

* lube spray upper case and moving it to spray.dm
2023-02-03 13:10:51 -06:00
Henri215 da3cbbbd37 inhand sprite for advanced mop (#20167) 2023-01-16 20:45:51 -05:00
GDN 1a5ce03ec3 fixes the mopbucket not taking mops (#20013) 2023-01-06 21:57:19 +01:00
FloFluoro 6a876e1994 Standardize cleaning object behavior into "cleaning_act" proc (#19001)
* Standardizes cleaning item functionality into "cleaning_act" proc

* Culling commented-out code

* Damp rag now checks for humans before cleaning

* Change proc scoping, moved mop reagent check out of cleaning.dm

* Adds can_clean and post_clean procs to handle mopping, removes ismop parameter

* Adds can_clean() to cleaning objects/mobs

* cleaning_act() now carries message strings as params

* Refactored cleaning_act() for earlier returns and less redundancy

* cleaning_act now runs on the target atom, instead of the cleaning object

* Changed turf checks to overrides, rescoped clean_turf, lots of tidying

* Removed cleaner param from post_clean, since it'll always be src

* Code review tidying

* Tidying..........

* Removed clean_turf and put its functionality in turf/simulated/cleaning_act(), added new param to keep track of original targeted object

* Moved cleaning.dm from datums to code/game/objects

* Added early return, defined cleanspeed in seconds
2022-10-03 20:25:00 +01:00
Vi3trice f4b37b4177 Port TG updating appearances (#17943)
* Get pants that match or else you gonna look silly yo

* Posters

* Fix other hud elements

* Rereviewed

* Update shotglass.dm

* Fix for new merged PRs

* Typo

* Coming across other stuff

* Update theblob.dm

* No takebacksies

* smh i forget to leave a comment

* Updated for the detgun and cards

* Should have rerun langserver again

* No longer plastic, more in scope

* Damn you bluespace

* Reverting turret logic, out of scope at this point

* Tweak that part

* Went over energy guns again, and fixed UI White's sprite sheet

* Welding masks, glasses, and JUSTICE

* Update portable_atmospherics.dm

* Cleaning up, clearing things up

* Review and suggestions

* Update valve.dm

* More tweaks

* Missing character

* Not distinct lightmasks, so they can be overlays

* Update generator.dm

* Add parameter so holodeck doesn't try to make a perfect copy

* Update unsorted.dm

* Spiders

* Better fix for spiders, fix vamps too

* Ghosts

* Update telekinesis.dm

* Cleaning up old procs

* It's set up to not copy datums... Unless they're in a list

* Donuts, duct tape, and detgun. D3VR coming to Early Access

* Update procs that interact with doors so they call update_state instead

* Forgot one spot, and actually might as well just force lock

* Cleaning up other things... Sigh, and kitty ears

* oops

* Getting used to how it works

* blinds

* Going back to the suit obscuring thing, so it doesn't update all the time

* Missed that from merging master

* I made this PR and forgot about it

* Fix runtimes in cards

* Make things a bit more unified

* Update update_icons.dm

* yarn, really?

* Update library_equipment.dm

* Update shieldgen.dm

* Every time Charlie merges something, I go back and see if I can improve things further

* what's this? more?

* Update misc_special.dm

* wow, paper

* Review

* More reviews

* To be sure, seems like being broken messed something sometimes

* Brought airlocks closer to how TG works to iron out some stuff

* Pizza and morgue

* Doesn't seem to hurt, tried with holodeck

* Revert "Doesn't seem to hurt, tried with holodeck"

This reverts commit 158529302b.

* Icon conflict

* Fix organ damage

* Don't ask how. Why. It's like that on prod too.

* Cutting down on things and updating from TG.

* More flexible. Just in case the thing you stuck it on didn't destroy.

* Hydro was one the things I touched earlier on, better rework it

* Reviews

* Cleaning up further, also bri'ish

* Undo a change I did, and switch over to a more recent implementation

* Update biogenerator.dm

* Rolling back to old airlocks, but with new duct taped note

* Functionally the same. I'd just rather not have the smoothing happen there

* Went over APCs again

* Fix welding helmet names in species files

* Update airlock.dm

* Update persistent_overlay.dm

* Oh, topic
2022-07-21 08:11:59 +02:00
Kugamo 7189ae5d65 Janitor QOL (#17594)
* Yes

* No

suggested changes

* Maybe

Suggestions + water in cart sprites

* Merge Conflict Resolve

* Suggested Changes :o)

* fixes bugs

* suggested changes round 2
2022-04-22 11:39:21 +01:00
Qwertytoforty 8dcb2c1a0f Prevents final summon rune by being cleaned by normal methods (#16224)
* Prevents final summon rune by being cleaned by normal methods

* Makes it a proc

* Moves cleanable, makes it work with space cleaner
2021-07-08 22:20:32 +01:00
AffectedArc07 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Fox McCloud a4641cc0cf Removes Dirty Floors (#12519) 2019-10-08 20:58:05 -04:00
Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
farie82 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud 0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Desolate c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox-McCloud fe6481f86f Buffs Advanced Mop 2017-07-04 21:45:15 -04:00
tigercat2000 633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Sam 07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Fox-McCloud 50051ee851 Garbage Collection and Code Cleanup 2017-03-27 18:37:44 -04:00
Fox-McCloud 037db0bdf7 Spring Cleaning 2017-03-21 14:43:53 -04:00
TullyBurnalot 9634181318 Janitorial Quality of Life Update (#5239)
* Janitorial Quality of Life

- Trash Bags fit in satchels/bags/duffelbags
- Advanced Mops clean faster, can clean more
- Holosign Projectors can create more signs
- New Closet added, with janitorial stuff that was previously on the
ground
- Ghosts can no longer create dirt
- Dirt creation slowed down
- Janitorial Closet tidied up

* Removes redundant check

* Trash Bags become heavier with use

* Fixes Map Merge not being done

* Re-adds Box Refilling because I am an idiot

Missing parenthesis, not even ONCE

* Unblocks MULEbot docking area

* Adds broken bulb recycling

* Addresses Fox's/DZD's concerns

* Adds sanity checks for NODROP
2016-08-17 17:23:19 -04:00
Fox-McCloud bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
monster860 3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Isaac Erwin 1b8c43b840 The mop now stores 40 units of water instead of having unlimited water, water must be recharged at a cyborg recharger or in a mop bucket 2016-07-04 19:19:16 -04:00
Isaac Erwin 6fd7f5741f Changes the janiborg's mop into an advanced mop with limitless water
Now the mop is potentially actually useful. How does it get water?
Bluespace, of course.
2016-07-03 16:16:26 -04:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
VampyrBytes 386ed87126 refactors washing items
fixes #3570
Could have fixed with another if statement in sink/attackby, but it was
already pretty snowflakey, and had the potential to get worse
Items now have a wash proc that the sink calls, that can be overridden
when needed
2016-02-20 12:01:40 +00:00
Fox-McCloud be672419ca Fixes a few Destroys 2015-09-28 18:15:39 -04:00
Fox-McCloud d7f23f4271 Oh, that kind of list 2015-09-27 19:39:09 -04:00
Fox-McCloud 4413911688 Janicart and Janitor Update 2015-09-26 06:17:29 -04:00
Tigercat2000 7f4ac72910 Progress bars + Wall Rationalization
This commit does the following:
 - Ports progress bars from -tg- (tgstation/-tg-station#9921)
 - Refactors wall attackby code to make it 100% less insane; Instead of
   manually checking every little thing, it uses do_after,
   consequentially, making the new progress bars affect dealing with walls
   as well.

Wall code makes a tiger sad.
2015-08-31 13:38:51 -07:00
Fox-McCloud 0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud dec621eefd Revert "R&D Research Levels Unification" 2015-04-07 01:16:19 -04:00
jack-fractal a0be969870 Unifying tech levels
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
DZD b3a0c9a975 Removes TABLEPASS and FPRINT flags
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
Fox-McCloud 4b2e3beb96 Weapon Changes 2014-11-30 08:18:29 -05:00
Markolie 3e67587869 Allows the freezer/heater to actually be connected, minor machine fixes, janitor mop fix, drone can now clean bottles 2014-11-18 17:31:43 +01:00
Fox-McCloud 111b24ceb8 Janitor Rework 2014-11-10 03:17:56 -05:00
Nienhaus 25a92c91fd Ports the TG style Jani Cart. 2014-11-07 22:48:44 -06:00
ZomgPonies 71ef471186 Well-used corridors become dirty with time 2013-11-21 21:41:32 -05:00
ZomgPonies 5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00