Commit Graph

503 Commits

Author SHA1 Message Date
SkyratBot
7402ba86a8 [MIRROR] Adds database tracking to maintenance pills (#2747)
* Adds database tracking to maintenance pills (#56179)

I originally added maintenance pills, and while already perfect, I felt like polishing them a bit. I didn't do much, just:

- Maintenance pills now track a players score. Gotta eat em all to get that leaderboard highscore!
- More names and decriptions for maintenance pills, most of them suggestions from the old PR
- Renamed floorpill to pill/maintenance in code because that's what they are, no idea why I didn't originally do it

I've also polished the sprite a little bit, because it always looked a bit _too_ shady
![image](https://user-images.githubusercontent.com/7501474/104741899-19624880-574a-11eb-8211-65d89d8d36c4.png)
(Below is old sprite, above is new sprite)

* Adds database tracking to maintenance pills

Co-authored-by: Time-Green <timkoster1@hotmail.com>
2021-01-17 13:39:53 +01:00
MissFox0810
24466daf22 removes Uraium from matsbox, debugtools (#2603)
* removes Uraium from matsbox, debugtools

* Update code/game/objects/items/storage/boxes.dm

Co-authored-by: Azarak <azarak10@gmail.com>

Co-authored-by: MissFox <github@aesir.org.uk>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-09 23:04:17 +01:00
SkyratBot
940b4df0bf [MIRROR] Resprites for Leather Satchel & Briefcases (#2537)
* Resprites for Leather Satchel & Briefcases (#55974)

Co-authored-by: TWAT <twaticus.tg@ gmail.com>

* Resprites for Leather Satchel & Briefcases

Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: TWAT <twaticus.tg@ gmail.com>
2021-01-07 18:30:52 +01:00
SkyratBot
89da9c0b88 [MIRROR] minor cytology related tweaks (#2528)
* minor cytology related tweaks (#55910)

makes the new cytology items compatible with Biobags and Labcoats

* minor cytology related tweaks

Co-authored-by: 小月猫 <alina.r.starkova@gmail.com>
2021-01-07 00:14:12 +01:00
SkyratBot
d7f054b035 [MIRROR] Refactors monkeys into a species (#2379)
* Refactors monkeys into a species

* aaa

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-31 21:08:07 +01:00
Azarak
0992fc86a5 Medical update - Muscle wound, Splints, Bandages, Closer Examine (#2336)
* everything but wound topics

* Update bodypart_aid.dm

* aaa

* aaa

* aaa

* aaaa

* Update _bodyparts.dm

* Update carbon_examine.dm

* Update bodypart_aid.dm

* Update slash.dm

* Wound topics, self grasping on a topic, bandages on top uniform

* Merge branch 'master' into med
2020-12-29 23:48:58 +00:00
SkyratBot
3711feef02 [MIRROR] wrenches the diy dish kit (#2322)
* wrenches the diy kit (#55701)

* wrenches the diy dish kit

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2020-12-25 21:41:34 +00:00
SkyratBot
d5148ab919 [MIRROR] adds new wiz spell: duffelbag curse (#2304)
* adds new wiz spell: duffelbag curse (#55286)

it gives target a no drop duffelbag which every around 100s will try check if there is food inside else it attacks you, you can poison the food to make it die faster.
more variety for wiz to annoy crew that isnt murder bone

* adds new wiz spell: duffelbag curse

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2020-12-24 12:34:53 +01:00
Azarak
f964b1b562 aaa (#2240) 2020-12-19 15:26:10 +00:00
SkyratBot
0e26de1f3e [MIRROR] You can sacrifice souls to toolboxes (#2152)
* You can sacrifice souls to toolboxes (#55306)

So, now that it's December, this PR makes it so you can use a soulstone with a shade in it on a mechanical toolbox to sacrifice the shade to give the toolbox back its SOUL (it goes back to the old sprite)

* You can sacrifice souls to toolboxes

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2020-12-13 00:51:38 +00:00
SkyratBot
0c14229ef4 [MIRROR] Adds in the admin outfit. (#2123)
* Adds in the admin outfit. (#55374)

So i was told to make this if i wanted to get an outfit that actually could work on things like radiation. I also gave it a box full of stabilized extracts because those give quite good effects like more speed and regeneration.

* Adds in the admin outfit.

Co-authored-by: CRITAWAKETS <sebastienracicot@hotmail.com>
2020-12-11 00:26:34 +00:00
Zenitheevee
28bc070e57 ExpansiveSmuggling (#2035) 2020-12-07 00:36:32 +00:00
SkyratBot
2913364658 [MIRROR] Kills oldfood, Puts newfood on top. (#2041)
* Kills oldfood, Puts newfood on top. (#55160)

Slays the last of old-food, making new-food the new normal.

Co-authored-by: MrMelbert <kmelbert4@ gmail.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>

* Kills oldfood, Puts newfood on top.

* Update collars.dm

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: MrMelbert <kmelbert4@ gmail.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-04 16:46:26 +01:00
SkyratBot
c487c73f39 [MIRROR] Grep for space indentation (#1969)
* Grep for space indentation

* aa

* Update species.dm

* Update species.dm

* Update maps.dm

* Update examine.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-01 12:26:41 +01:00
Azarak
b989accb77 [NON-MODULAR] The 30TC traitor update (#1744)
* a

* Update uplink_items.dm

* Update uplink_items.dm

* aaa

* Update uplink_kits.dm

* Update uplink_items.dm

* Update uplink.dm

* Update uplink_items.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-11-29 16:09:02 +00:00
Azarak
ecdb48d0c8 Duffelbags now slow you down less (#1914)
* Update backpack.dm

* Update backpack.dm
2020-11-28 21:12:59 +00:00
SkyratBot
e6879819ea [MIRROR] CanUseTopic() refactor. (#1829)
* CanUseTopic() refactor. (#54747)

* CanUseTopic() refactor.

* Forgot about default_can_use_topic. Tested and working.

* Update bin.dm

* no-nonsense.

* CanUseTopic() refactor.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-11-25 13:56:56 +01:00
SkyratBot
65368300d2 [MIRROR] Refactors Pastries into newfood. (#1824)
* Refactors Pastries into newfood. (#54996)

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Floyd <Floydje123@ hotmail.com>

* Refactors Pastries into newfood.

* Update collars.dm

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Floyd <Floydje123@ hotmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-11-25 01:02:00 +00:00
SkyratBot
7d653f1f6b [MIRROR] Moves grown food to newfood (#1794)
* Moves grown food to newfood (#55040)

Moves grown food to newfood
Gives trash element support for callbacks for item creation override

* Moves grown food to newfood

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-11-23 22:35:35 +00:00
SkyratBot
89a8cb991a [MIRROR] moves misc food to newfood code (#1725)
* moves misc food to newfood code (#54788)

misc food is now using newfood code

* moves misc food to newfood code

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-11-19 07:21:23 +01:00
SkyratBot
964adb7828 [MIRROR] Fixes disabled limbs from compound fractures, only robotic limbs can be disabled by pure damage now (#1709)
* Fixes disabled limbs from compound fractures, only robotic limbs can be disabled by pure damage now (#54922)

* Fixes disabled limbs from compound fractures, only robotic limbs can be disabled by pure damage now

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2020-11-17 00:50:36 +01:00
SkyratBot
9e88359f04 [MIRROR] Re-assesses 99% of vending prices through Arconomics to match player resources and round-length. (#1686)
* Re-assesses 99% of vending prices through Arconomics to match player resources and round-length. (#54715)

* The Re-pricening

* Rewritten and adjusted for paycheck defines.

* I made the map changes finally.

* And the refills too.

* "OH YEAH REPLACING IT ALL WITH DEFINES AND SCALING IT THE EXCEL DOCUMENT WILL BE EASY, ARCANE!!!"

* And the premium ones too.

* Accidently spoiled a future pr due to dme bleedover

* Re-assesses 99% of vending prices through Arconomics to match player resources and round-length.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-11-14 21:49:11 +01:00
SkyratBot
bfaa5be1c0 [MIRROR] Pies are now refactored for new foods. (#1677)
* Pies are now refactored for new foods. (#54751)

Moves over pies to the newfood typepaths, as well as the few select pie slices.

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>

* Pies are now refactored for new foods.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
2020-11-11 02:55:01 +00:00
SkyratBot
eedf2362cc [MIRROR] Refactored 'IsAdvancedToolUser' into a macro plus relative trait. Tweaked 'can_hold_items'. (#1674)
* Refactored 'IsAdvancedToolUser' into a macro plus relative trait. Tweaked 'can_hold_items'. (#54665)

The PR aims to allow advanced tool users to be defined by traits rather than a hardcoded proc.
Also necessary for the CanUseTopic refactor I'm working on, which will be PRed separately for atomization purposes.
This PR also fixes an inconsistency with can_hold_items (since monkeys can actually hold items).

* Refactored 'IsAdvancedToolUser' into a macro plus relative trait. Tweaked 'can_hold_items'.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-11-11 02:52:32 +00:00
SkyratBot
665a7d3673 [MIRROR] Easier Medipen Identification, Medipen Box (#1619)
* Easier Medipen Identification, Medipen Box (#54698)

* Medipen Differences

Adds a box for medipens, and gives each of the "common" pens a new look.

* Adds medipen box to craftables.

* Lighter first aid pen.

* Easier Medipen Identification, Medipen Box

Co-authored-by: Winter Flare <7543955+Owai-Seek@users.noreply.github.com>
2020-11-08 01:06:21 +00:00
SkyratBot
4df9bf0979 [MIRROR] Speargun: Now actually a gun! Again! (#1610)
* Speargun: Now actually a gun! Again! (#54289)

Turns the speargun from the syndikit bundle into a bolt action rifle instead of a pnuematic cannon.

The spears the rifle fires embeds using the new bullet embedding system by Ryll. The spears do a lot of fucking damage.

The new bundle includes:

The Ballistic Harpoon Gun

The weapon is a single shot rifle that can be loaded with harpoons. The rifle, being bolt action, requires pulling back the bolt, loading the new harpoon, then locking the bolt every time you wish to fire the weapon. This is more busy work than the pnuematic cannon version, but more reliable in functionality without any messy business with throwing.

The harpoons do 60 force, have a high wound chance against unarmored targets and very high embed chance, with a 100% against unarmored targets. They also have considerable armor piercing at 50, letting you nearly entirely shoot through a ballistic vest.

The weapon is essentially a powered-up single shot mosin or a significantly more powerful improvised shotgun filled with slugs.

The Quiver

Now a bag that goes on your belt. It holds up to 40 harpoons for your harpoon gun. This change was done because the harpoons cannot be retrieved, unlike the magspears, which were simply hacky ninja stars and could be pulled out with surgical tools/wirecutters. Previously you had 20 magspears, which because of their retrievable nature lasted a little longer than you would expect.

Sprites

New back sprites for the harpoon gun, ensuring nobody is missing it when you have it. Additionally, the Mosin Nagant now has it's back sprite as a suit storage sprite.

New sprite for the quiver.

* Speargun: Now actually a gun! Again!

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2020-11-07 15:43:22 +00:00
SkyratBot
0afaaa89d1 [MIRROR] rad_insulation component is now an element. (#1496)
* rad_insulation component is now an element. (#54625)

* rad_insulation component is now an element.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-10-27 22:51:52 +00:00
Gandalf
2b4367093b Vending machine dispenses into hand [NON-MODULAR] (#1362)
* Update _vending.dm

* Update _vending.dm

* Update bags.dm

* Update _vending.dm
2020-10-19 09:47:53 +02:00
SkyratBot
eb92ea9cb8 [MIRROR] adds more cursed animal masks (#1335)
* adds more cursed animal masks (#53539)

Animal masks refactor

* adds more cursed animal masks

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2020-10-15 22:12:00 +01:00
SkyratBot
1f58e4c363 [MIRROR] The trashbag of holding now has its own inhand sprite. (#1300)
* Merge pull request #54347 from uomo91/trashbagsprite

The trashbag of holding now has its own inhand sprite.

* The trashbag of holding now has its own inhand sprite.

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2020-10-14 12:51:19 +02:00
SkyratBot
81ba096768 [MIRROR] One more pass on null rod sprites + null rod storage sanity pass (#1277)
* Finishes the job on null rod sprites hopefully once and for all (#54235)

* One more pass on null rod sprites + null rod storage sanity pass

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2020-10-12 23:28:11 +02:00
SkyratBot
097e14956b [MIRROR] Serving Tray Fix (#1241)
* Serving Tray Fix (#54267)

* Serving Tray Fix

Co-authored-by: Winter Flare <7543955+Owai-Seek@users.noreply.github.com>
2020-10-11 03:46:38 +02:00
SkyratBot
bba021046c [MIRROR] Converts Pizza to use the new food component. (#1205)
* Converts Pizza to use the new food component. (#53641)

pizzas now use processing component

* Converts Pizza to use the new food component.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2020-10-08 17:30:13 +02:00
Azarak
544ca60e45 fixes vox breath issues (#1139) 2020-10-03 23:05:32 +01:00
SkyratBot
42e44d002e [MIRROR] tray belt and worn sprite (#1125)
* Merge pull request #54127 from Tlaltecuhtli/peniss

tray belt and worn sprite

* tray belt and worn sprite

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2020-10-03 02:31:44 +02:00
SkyratBot
ada67ac929 [MIRROR] Ports soup, snacks, icecream, salads and meat to newfood (#1074)
* Ports soup, snacks, icecream, salads and meat to newfood (#54028)

Ports soup, snacks, icecream, salads and meat to newfood

* Ports soup, snacks, icecream, salads and meat to newfood

* Update true_changeling.dm

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-09-30 14:37:15 +02:00
SkyratBot
5359878eac [MIRROR] Nice, Corgi Pinning Action for the whole family. (#1077)
* Nice, Corgi Pinning Action for the whole family. (#53913)

Adds pin the tail on the corgi, a basic party game last seen at the summer ball, that I had lying around on one of my branches since then. The corgi is a poster that functions like most other posters, but has an interaction with the fake "Corgi tail" object, which can be pinned onto the poster to visually place the tail onto the poster.

Are you a bad enough dude to pin the tail on the corgi blindfolded?

Fun, cheap entertainment. Might make for a cheap thrill, or help set the scene of a birthday party. Works as a very player driven basic activity.

Also, the tail pins are harmless embeds. I'll leave that here for you to think about.

* Nice, Corgi Pinning Action for the whole family.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-09-30 14:17:11 +02:00
SkyratBot
9be3a7b8f6 [MIRROR] Moblity refactor: hands blocked and restrained edition. (#1051)
* Moblity refactor: hands blocked and restrained edition.

* Update carbon_defense.dm

* Update emotes.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-09-29 13:57:02 +02:00
SkyratBot
f8eef23e64 [MIRROR] Fixes incorrect Initialize() arguments (#1029)
* Fixes incorrect Initialize() arguments (#54013)

* Fixes incorrect Initialize() arguments

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-09-29 00:18:52 +02:00
SkyratBot
4b6cc9d088 [MIRROR] Arcane finishes the fight and adds all the missing belt sprites and a worn sprite Admin Tool. (#830)
* Arcane finishes the fight and adds all the missing belt sprites and a worn sprite Admin Tool. (#53305)

* Arcane finishes the fight and adds all the missing belt sprites and a worn sprite Admin Tool.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-09-17 02:05:30 +01:00
SkyratBot
7847364fc2 [MIRROR] s-s-s-spaghetti to newfood (#818)
* s-s-s-spaghetti to newfood (#53574)

🆑 Qustinnus
code: Moves spaghetti to new food
fix: Fixes some more size problems on food
fix: Fixes organs having wrong params
/🆑

fixes #53482 fixes #53572

* s-s-s-spaghetti to newfood

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-09-16 03:41:02 +01:00
SkyratBot
93534e18e1 [MIRROR] Improves cardboard box consistency. (#717)
* Improves cardboard box consistency. (#53525)

* Improves cardboard box consistency

* Also gives them cardboard datum mats.

* Improves cardboard box consistency.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-09-09 08:29:32 +02:00
SkyratBot
1e705faa19 [MIRROR] Process procs now properly utilize deltatime when implementing rates, timers and probabilities (#709)
* Process procs now properly utilize deltatime when implementing rates, timers and probabilities (#52981)

* Process procs now properly use deltatime when implementing rates, timers and probabilities

* Review fixes

* Geiger counters cleanup

Made hardsuit geiger code more similar to geiger counter code
Geiger counters are more responsive now

* Moved SS*_DT defines to subsystems.dm

* Rebase fix

* Redefined the SS*_DT defines to use the subsystem wait vars

* Implemented suggested changes by @AnturK

* Commented /datum/proc/process about the deltatime stuff

* Send delta_time as a process parameter instead of the defines

Also DTfied acid_processing

* Dtfied new acid component

* Process procs now properly utilize deltatime when implementing rates, timers and probabilities

Co-authored-by: Donkie <daniel.cf.hultgren@gmail.com>
2020-09-09 08:19:23 +02:00
SkyratBot
0553a3f738 [MIRROR] Medical belt/medical aid kit consistency updates (#673)
* Medical belt/medical aid kit consistency updates (#53442)

Lets the new blood filter tool be put in medical belts/medical aid kits since those are supposed to hold surgery tools
Lets spray bottles, amputation shears, and surgical tape be put in medical aid kits since it's supposed to hold the same stuff as the medical belt (I didn't add the plumbing stuff to medical aid kits though since chemists don't get them)
Removes bio bag and chem bag from the medical first aid kit since they're too big to go in there anyway
Adds blood filter mode to the debug omnitool since it's supposed to have a mode for every tool define

* Medical belt/medical aid kit consistency updates

Co-authored-by: Tony <19880843+AdmiralPancakes1@users.noreply.github.com>
2020-09-06 06:06:18 +02:00
SkyratBot
649528bf6b [MIRROR] Gives the Chef a Beacon to pick their ingredient box (#670)
* Gives the Chef a Beacon to pick their ingredient box (#53146)

* adds ingredients beacon

* starts the chef off with an ingredient beacon instead of a box

* Update boxes.dm

* Revert "Update boxes.dm"

This reverts commit b89fadab04.

* optimizes the list thingy (thank you, Floyd)

* Fixes a typo in one of the comments

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* fixes a definition

* moves ingredient box/beacon code to miscellaneous instead of boxes

* adds the random option

* adds a cute little bit of 'flavor' text... get it?

* Revert "adds a cute little bit of 'flavor' text... get it?"

This reverts commit a6541bf220.

* adds references to a new company and a bit of fun text

* moves randomFood out of the for loop

* Revert "moves randomFood out of the for loop"

This reverts commit e2c5171fce.

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* Gives the Chef a Beacon to pick their ingredient box

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2020-09-06 06:05:26 +02:00
SkyratBot
6f655cb5b6 [MIRROR] Makes the stomach important part of eating (#633)
* Makes the stomach important part of eating (#53228)

This puts food you eat in to the stomach.
If you do not have a stomach you can not eat, if you try to swallow anything you will spew it out.

Changes to surgeries:

    Stomach pump can now be done on the living, and pushes out the reagents in the stomach.
    Blood filter is a new tool and cleans the reagents out of the body.

This also makes it so that reagents that do not metabolize can accumulate in the stomach reducing how much food you can eat.

* Makes the stomach important part of eating

Co-authored-by: NightRed <nightred@gmail.com>
2020-09-04 00:12:43 +01:00
SkyratBot
c3fc25d082 [MIRROR] In memoriam of OrdoM (#572)
* In Memoriam 26th August, 2020 (#53234)

Our friend, tg admin, and champion of the "short" reply, OrdoDictionary
passed away recently.

While this news was not unexpected - Ordo had been fighting bravely
against prion disease for some time - it remains as heartbreaking as it
is unfair.

Ordo was sharp as a razor, with wit to match. During the time we knew
him he was pursuing a PhD, yet he still found time to volunteer on the
tgstation servers and help his fellow spessman.

In admin channels you were as likely to find Ordo pontificating on
history or food or ham radio as you were anything related to the game.
But you knew - no matter the topic - that his opinion was informed and
valuable, and that he would deliver it with nuance, class and charm.

This community - and the world - is worse off without him in it.
He will be missed.

So should you read this and should you get the chance, raise a glass in
his memory.
…but be sure to break out the good stuff.

That’s how he would have wanted it.

Adds a medal in memoriam of Ordo and adds it to the Head of Personnel
locker in a lockbox, along with three Medals of Bureaucratic Excellence,
for those who excel in managing the station.

Thanks to kryson for the sprite of the medal and thanks to OrdoM for all
the work he did on tg.

* In memoriam of OrdoM

Co-authored-by: oranges <email@oranges.net.nz>
2020-08-30 05:26:52 +02:00
SkyratBot
ec09510459 Bools and returns super-pr (#53221) (#565)
Replaces like 70-80% of 0 and such, as a side effect cleaned up a bunch of returns
Edit: Most left out ones are in mecha which should be done in mecha refactor already
Oh my look how clean it is

Co-authored-by: TiviPlus <TiviPlus>
Co-authored-by: Couls <coul422@gmail.com>

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Couls <coul422@gmail.com>
2020-08-30 05:12:59 +02:00
SkyratBot
a35183463d [MIRROR] Waterworks: Plumbing enabled sinks, tanks, plant trays, and showers. (#562)
* Waterworks: Plumbing enabled sinks, tanks, plant trays, and showers. (#52865)

https://cdn.discordapp.com/attachments/326831214667235328/740812723956482118/2020-08-06_02-04-14.mp4
For everything in this PR working at the same time, watch this video!

Alright, from the top:
Sinks now need plumbing to pump out liquids.

All sinks now has a demand-only plumbing pipe face the opposite direction of the sink itself. A standard iron sink will hold 100 units of water, and must be constructed from a sink frame. To complete the frame, a new stock part, the water recycler must be applied to the frame. Once the sink is constructed, it will only hold those 100 units of water until new water is piped in.
This however doesn't extend just to water, as a result. Any reagent can be piped into the sink, and will be used 5 units at a time per use. This means water isn't just an infinite resource, and will need to be resupplied to the station if, somehow, you're using a metric ton of water somehow.
image
A basic sink setup with water being plumbed in.
Showers now need plumbing to wash you off.

Want to dispense reagents faster on your Patients Victims Friends Coworkers? Well, you may also construct a shower frame, in a similar fashion to a sink frame, and pipe in your own reagents into the loop. The shower drains reagents much faster than the shower, and also preforms vapor and touch reagent reactions, resulting in a constant stream of chemicals being processed. This can lead to horrible situations, like a chemical heater hooked up to a vat of cooking oil being pumped into a shower.
Additionally, showers will display the reagents they're pumping out visually based on the color of their chemical contents. As a result, dangerous or unique showers are going to look noticeably different if their contents are dangerous looking.
image
A safe shower.
image
A very unsafe shower.
Wait what was that bit about cooking oil?

So, reagent dispensers, like water/fuel tanks, Virus Food, Cooking Oil Vats, Pepperspray, and the like, can now be converted into a stationary tank of reagents by using a sheet of metal on it, allowing it to behave as a simple supply of their respective contents, and can be pumped into a plumbing network. This means rolling water tanks can be used to resupply sinks and showers, as well as allow for inventive uses of otherwise unused chemicals located all around the station. Pump welding fuel into a resupply line to fight a blob! Pump pepper spray into the dorms showers! Create a deep fryer shower! The possibilities are LIMITED (Because we have very few reagent dispensers)! Still, this will prevent sinks and showers from being completely unfix-able should all the water run out, as cargo can purchase many of these chemical tanks at will.
Hydroponics is now also plumbing enabled.

So there I was, thinking, have I gone mad? Is the barking I hear in my noggin my own dogs rattling and raging against the eternal ocean tide, or are these the hounds of tindalos come to finally rip me to shreds within the sea of causality?
The answer to this is quite simple: I added plumbing simple-demand components to hydroponics.
Now, the trays will accept a pumping input, which can provide the plants themselves a reagent input for their nutrients, and SHOULD (current not fixed yet) also contribute to refilling the trays water. As a check to this horrible decision, there are very few plumbing chems that don't suffer from some kind of downside if exclusively pumped into the trays, so this should be done delicately and with forethought applied, or you'll have a row of plants with dead stats because they OD'd on ammonia.
image
Holy damn why are you doing this

I'm thinking this pr is probably in need of some serious trimming and will probably be closed as a result of the need to atomize this down, but this way I can start to get some feedback and ideas on which aspects would be better suited towards the current design direction of plumbing/bio-chem/reagent heavy jobs. As far as I'm aware, this is all in accordance with the relevant design docs, but this way I'll know for sure 🤷‍♂️
To-do before being 100% sparkly and clean

Fix hydroponics trays adding water to the nutrient reagents slot (NOT A TRUE FIX, SEE COMMENTS BELOW PLEASE)
Make disconnected sinks/showers slowly regenerate water so that a stationwide plumbing net isn't required so Anturk doesn't snap my kneecaps off
Make water/fuel tanks use their snowflaked stationary tank sprites instead of the custom overlay version

    Yeet out the existing psudo-plumbing from hydroponics

Why It's Good For The Game

We've discussed adding plumbing into the game for forever now, and with all the new and tangentally related plumbing content we have, almost everything we have now perfectly enables servers to properly create a station-wide plumbing network.

Sinks and showers provide an infinite supply of water all shift long, and since they can be produced with any material, anywhere, practically for free, that was the first and foremost reason why I made this PR, to make water slightly more precious on station, to justify the 20+ water tanks mapped across every station. Plus, no more meatsink spam in the middle of the hallways.

Hydroponics has a built in feature that was intended to work similar to plumbing, before we had plumbing, for sharing resources/water, but it was pretty rough and is still exceptionally difficult to make look very pretty on live servers. By integrating them with actual plumbing pipes, this enables one step closer to integrating chemistry and botany to merge going forward, and give them an incentive to include each other in their supply chains each shift.

On the reagent tank conversion, That's just an interesting feature I felt the need for while testing everything else, and found pretty great success in. Being able to pipe in large supplies of a single reagent that ordinarily would just sit on a wall or in mait somewhere proved extra useful, and would be beneficial for refilling plumbing heavy areas like bathrooms/medbay, etc.

* Waterworks: Plumbing enabled sinks, tanks, plant trays, and showers.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-08-29 20:34:23 +01:00
SkyratBot
fb3d8baf27 [MIRROR] [Ready] Wedding Content! Crate with tuxedo, wedding dress, cummerbund, veil, and craftable bouquets (#534)
* [Ready] Wedding Content! Crate with tuxedo, wedding dress, cummerbund, veil, and craftable bouquets (#52733)

Adds wedding content.

* [Ready] Wedding Content! Crate with tuxedo, wedding dress, cummerbund, veil, and craftable bouquets

Co-authored-by: OnlineGirlfriend <50865623+OnlineGirlfriend@users.noreply.github.com>
2020-08-27 03:08:55 +02:00