Commit Graph

33 Commits

Author SHA1 Message Date
Hrosts
ae8b5c6097 Add rehydratable mop bucket cube, refactor the rehydratable yml (#34586)
* Refactor rehydratable items

* Finish main refactor

* Add mop bucket cube

* Move cube sprite and item size to RehydratableAnimalCube

* Fix sprite attribution

* Make it follow the conventions

* Refactor wrapped cube, leave MonkeyCube tag only on the cube and the Syndie Sponge

* Fix DehydratedSpaceCarp inheritance overwriting needed components

* no need for this comment

* remove whitespace

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* indentation

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Restore lost description

* reorder stuff

* line

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-21 13:16:25 -04:00
SeamLesss
4bb1a62f22 Add In-hand Sprites for miscellaneous items (#35433)
* guh???

* Merge branch 'master' of https://github.com/SeamLesss/space-station-14

* incomplete baseball bat

* bling

* attribution

* camera bug

* damp rag

* cap cap

* centcom cap

* Update Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
2025-03-19 21:04:41 -04:00
SlamBamActionman
4626904fa8 [#20285 fix] Carp Plush and Rehydratables can now be put into mop bucket (#33079)
* Make shark plush janitor-bucketable

* fix bucketed grey shark texture

* Make sprites less shiny and adapt copyright notice

* Made shark way way less shiny

* Allow carp plush and rehydratables in mop bucket.

* Remove old mop bucket shark sprites

* Fix post-merge bugs

* Fix errors

* Move ReactiveContainer stuff to shared

That should mean it is now predicted.

* Custom eject verb for the mop bucket

* Fixes OnSolutionChange, removes pop-up as there already is one.

* .ftl is not necessary as the custom pop-up was removed

* Review fixes

* Update Content.Shared/Chemistry/Components/ReactiveContainerComponent.cs

* Update Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs

---------

Co-authored-by: Psychpsyo <psychpsyo@gmail.com>
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-10-31 19:46:19 +01:00
Ghagliiarghii
b90c6acacd golden plunger (#29043)
* golden plunger

* Add wood material (the handle is still wood)

* 52 hours

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-06-21 00:24:36 +10:00
Tayrtahn
a4881f56b0 Add "fill level" sprites to mops and damp rag (#28590) 2024-06-04 14:48:24 -04:00
PoorMansDreams
655c7bd677 Buyable Jani Trolley (#25139)
Trolley
2024-02-11 23:35:19 -07:00
Ubaser
ecd84d8bfb Resprite buckets (#23866)
* add

* fix

* tweak

* bucket

* buckt

* bucket'd

* buckt

* bottm roundinger
2024-01-16 08:47:52 -05:00
Arendian
3e766402b9 Cluster grenades for uplink and security (#22029)
* clustergrenades go boom

* Small tweaks

* Some tweaks and soaplet

* clustergrenadesystem changes and launcher types

* small tweaks

* typo

* whitespace

* rsi edit

* another typo

* add containers

* Some changes related to merge

* Forgot to change name

* Made changes based on review

* Removed new china lake ammo based on feedback in other PR

* Unneeded nested loop moment

* Nested loop needed after all moment
2023-12-13 22:30:42 -05:00
Psychpsyo
6a18bdc023 Soapy Water & Edible Soap (#20364)
* soap reagent and soapy water

* make soapy water recognizable

* Fix tile cleaning bug

CleanDecalsReaction was able to take more than the reactVolume it was given.

* make soapy water an evaporating reagent

* Tile reactions when mopping

* Fix indescribably soap flavor

* Adjust soap flavours

Soap and soapy water now taste clean and syndie soap tastes like punishment.

* Better soap numbers & DeleteOnSolutionEmpty

* Changed TrashOnEmpty to TrashOnSolutionEmpty

* Last TrashOnSolutionEmpty change

* Fix merged code not compiling

* Requested changes.
2023-10-31 13:39:12 -07:00
Psychpsyo
008f2d9d1c Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311)
* Explosive wet floor sign & janitorial suicide vest

* fix attributions

* Remove name & desc from explosive wet floor sign

* Make wet floor sign chameleonable
2023-09-28 00:09:44 -04:00
Psychpsyo
067797fcb1 Make advanced mop show up on janitor trolley (#20124)
* Make advanced mop show up on janitor trolley

* Make blue trash bag show up on janitor trolley

* Revert "Make blue trash bag show up on janitor trolley"

This reverts commit 3f94b3cf81fba68255f60ca4b2ff085f4ab0c48f.
2023-09-17 20:23:35 -04:00
Psychpsyo
5d74447679 Make advanced mop wieldable (#20229) 2023-09-15 21:33:01 -07:00
Vasilis
99aa7e52c7 Plunger is now a hat (#18410)
* the plunger

* Copyright webedit
2023-07-28 18:10:45 -06:00
Topy
b85c902189 Added sink (#14348) 2023-06-30 18:10:47 -04:00
Lei Yunxing
b1391b35ef adds damp rag (#15553)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-03 10:01:55 -07:00
Nemanja
e4642cefcb [entity] Mega Spray Bottle (#15558) 2023-04-21 03:16:33 -06:00
EnDecc
5ed99bf497 [Tweak] Janibucket buffs (#15422)
* Improves Janitor trolley significantly by adding bucket slot with sprite overlay, and 300 extra water capacity. Improves Janitor bucket slightly by adding 100 extra water capacity.

* Reduces janitor trolley density by 100 to it's pull a bit faster
2023-04-15 16:46:00 -06:00
Lei Yunxing
cf61150ebd Adds advanced mop and research (#14917)
* add advanced mop

* make advmop clean faster

* works now

* tweak stats

* tweak speed again

* typo!!!

* copyright change for nerds
2023-03-30 22:21:54 -06:00
Easypoller
001c755a94 Mop usable as weapon (#12864) 2022-12-05 18:28:00 -08:00
Kara
b947151d9a Bucket solution fills + ECS SolutionContainerVisualizer (#10289) 2022-08-07 01:50:52 -07:00
Rane
18220b6488 Drains (#7678)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-04-23 18:04:49 -07:00
Alex Evgrashin
9c65f4b324 Janitor cart (#7367) 2022-04-11 16:21:15 -07:00
Swept
c55f3fd478 Adds mapped storage for lots of entities + a botanical belt (#4342)
* Cleans up belt stuff and some sprites

* Tag cleanup and sheathed sword

* Adds plant belt for botany chads and maps it's items

* CE belt, will most likely child it to utility instead

* Merges belt_icon and belt_mob into the same RSI

* Cut out alpha layers for wirecutters

* Added lots of equipped-BELT sprites for various items

* Medical, Janitor, Security, Assault, Chief Engineer, Utility and Botany have mapped storage layers

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-07-25 17:21:18 +10:00
Swept
ece403ca57 Copyright Pass/Pruning | Part 2 - Objects (#3905) 2021-04-29 18:09:14 +00:00
Swept
b9d9f01d39 Cleans up janitorial content (#3802)
* Initial

* Adds a drawdepth for hydroponics

* Maps 2 buckets in

* Moved the bucket into it's own yaml

* tg sprites for bucket and you can put it on your head now

* Cleanup timegit add . !

* Applied Reviews

* Attempts to revert the changes to Saltern
2021-04-15 21:21:10 +00:00
Alex Evgrashin
cfe427eb8c Light replacer (#3701)
* Add graphics

* Barebone light replacer

* Now light replacer stores bulbs

* More interactions

* Added text messages

* Better light refil

* Add light replacer to locker and lathe

* Added sound

* Fixed ignore error

* Better inhand

* You don't like this commas?

* Fixed typo

* Deferring spawning

* Moved interaction logic to system

Co-authored-by: Alex Evgrashin <evgrashin.adl@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-04-08 22:28:06 +10:00
Elijahrane
590453a57f Removed most redundant delays in meta.json (#3549) 2021-03-07 20:26:25 +01:00
Remie Richards
d45835e863 Janitor trashbag upgrade + FANCY ANIMATIONS (#3058)
* Janitor trashbag upgrade + FANCY ANIMATIONS

* Review, Bug fixes and Sounds
- Fixed hand-pickup animation playing if the entity originated from inside a container (e.g. bag on the ground) or from inside ourselves (e.g. something in our own inventory)

* Fix/Change. Just log if AnimateEntityPickup is called with an entity that has no SpriteComponent.

* More explicit log message. Error log.

* Merge. Fix.
2021-02-03 23:07:13 +01:00
Swept
a57db85208 Swept commits JSON genocide. (#2991)
* Clothing Folder Complete

* All Textures 1st Pass

* All Textures 2nd Pass

* All Textures 3rd Pass PLUS Manual Tweaking

* 5th Pass MORE MANUAL

* Fixes flares

* 4th Pass (I skipped over)

* The 6th Pass (Finality) - With Manual Fixes
2021-01-13 23:04:38 +11:00
Swept
898744f4a9 Icon fixing and general cleanup (#2156)
* Cable coils now look BEAUTIFUL and have inhands

* Editors note

* Materials have their own rsi + more icons fixed

* Fixed Mimic [AI]

* More icons fixed...

* Tanks have own rsi and fixed tank icons

* Airlock icons fixed

* Fuel tank hotfix

* Arcade fixed

* ChairBase is now abstract

* Fixes medical stuff

* Fixes rechargers

* Pump/Pipe icons

* Misc hotfixes

* All debug power icons fixed!

* Fixes auto/proto/research computer icons
2020-09-30 12:43:06 +02:00
Exp
b4f08811eb Adds Spray Bottles (#1522)
* Spray Bottle

* -"Proper" wall detection
-Removed some using
-Fixed sound

* Just don't add it

* -Removed spill sound
-Added sound parameter to SpillHelper.SpillAt

* Now spawns Vapor instead of Puddles instantly

* -Review
-Nullable

* Reworkkkk

* AABB shittery

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-08-08 14:33:36 +02:00
Víctor Aguilera Puerto
626c8c51a1 Adds slippery items (#1321)
* Start work on Slippery Component

* Slips work

* Add banana peel

* Add required slip speed

* Add slip sound

* Adds soap

* Make soapnt, soapsyndie and soapdeluxe inherit soap

* Adds homemade soap and omega soap

* Fix slipping not taking into account the entity being in a container
2020-07-09 17:00:37 +02:00
AJCM-git
ae41d03ec6 Re-organizing the Resources folder. Part 1. (#1234)
* First commit

* Lockers

* Lockers electric boogaloo

* Crates and Lockers

* Almost finishing the Textures folder

* Updating texture paths. Reminder to fix:
* Lockers
* Windows
* Vending Machines
* APC
* Catwalks
* Bedsheets and Cloaks
* Status effects

* dont know what happened here

* Commit before merge

* re-organizing

* Lockers broken

* Commit before merge

* Submodule

* renaming

* Fixing most issues

* forgot these ones

* Updating submodule

* typo

* Fixing some paths

* fixing some paths

* updating submodule

* (hopefully) fixing the submodule
2020-07-07 19:19:00 +02:00