Commit Graph

470 Commits

Author SHA1 Message Date
ArcaneMusic
c6ed8a7fad Improves cardboard box consistency. (#53525)
* Improves cardboard box consistency

* Also gives them cardboard datum mats.
2020-09-08 20:09:01 -07:00
Donkie
53b212ddf2 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
2020-09-08 10:24:05 +02:00
Tony
c03794c934 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
2020-09-05 22:28:15 -03:00
LemonInTheDark
d60ed7d9e8 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>
2020-09-05 16:09:23 -07:00
NightRed
4e2dda164f 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.
2020-09-03 17:02:23 -03:00
oranges
8594f119fe 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.
2020-08-29 16:01:34 -07:00
TiviPlus
ca366c3ea1 Bools and returns super-pr (#53221)
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>
2020-08-28 14:26:37 -07:00
ArcaneMusic
4187c6f791 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.
2020-08-27 23:23:55 -07:00
OnlineGirlfriend
c838ba21da [Ready] Wedding Content! Crate with tuxedo, wedding dress, cummerbund, veil, and craftable bouquets (#52733)
Adds wedding content.
2020-08-26 15:01:16 +02:00
81Denton
3858b72bdb Merge pull request #53020 from Qustinnus/fatgrowing
[READY] Vatgrowing: Third time's the charm
2020-08-24 22:46:08 +02:00
TemporalOroboros
6e950daccc Defines damage flags. (#53158) 2020-08-24 08:20:33 -03:00
Radacitus
f231ef2e93 moves ingredient box/beacon code to miscellaneous instead of boxes 2020-08-24 02:11:29 -03:00
Radacitus
ec4706ab81 fixes a definition 2020-08-24 02:09:49 -03:00
uomo
ff9f5741b8 Pipe painters now fit in toolbelts. (#53127) 2020-08-23 05:14:18 -03:00
Radacitus
0de5821be9 Fixes a typo in one of the comments
Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2020-08-23 00:43:40 -03:00
Radacitus
74e20c117d optimizes the list thingy (thank you, Floyd) 2020-08-22 22:17:29 -03:00
Radacitus
1084a1e873 Revert "Update boxes.dm"
This reverts commit b89fadab04.
2020-08-22 22:08:43 -03:00
Radacitus
b89fadab04 Update boxes.dm 2020-08-22 22:06:27 -03:00
Radacitus
e6ec802045 adds ingredients beacon 2020-08-22 20:57:29 -03:00
floyd
d8c2e683a0 Merge branch 'master' into fatgrowing 2020-08-22 23:01:19 +02:00
Rohesie
7859721611 Explosions SS runtime fix + code cleanup (#52894)
* runtime fix

* turf references are immortal
2020-08-21 21:57:29 +02:00
floyd
9b4a488216 no food stuff 2020-08-20 23:36:18 +03:00
uomo
180ef034ba A bunch of tweaks to holsters. (#53031)
Regular holsters:

Can no longer hold pulse carbines.
Can now hold toy pistols.
Detective's holster:

Can no longer carry ALL ammo box types, it's crazy this was possible.
Can now carry all handguns instead of only revolvers, their ammo, the mini e-gun, and the toy pistol and its magazines.
Chameleon holster:

Can no longer hold pulse carbines.
Can now hold all the ammo of guns it can hold (handguns and revolvers), the toy pistol and its magazine, and the small energy crossbow.
Operative holster:

Can now hold... basically everything gun related. All guns, all ammo (except ammo boxes), all grenades.

Descriptions of all holsters changed to reflect this.
2020-08-19 15:58:40 -03:00
uomo
e0520a2e10 Utility belts can now hold airlock and decal painters. (#53027) 2020-08-19 15:21:39 -03:00
ATH1909
829f305b6d bruh moment (#52661) 2020-08-19 10:38:25 -04:00
Bampotio
a334bafee9 Adds floral somatoray to botany belt (#53010)
Makes it so you can store the floral somatoray in the botany belt
2020-08-18 20:39:55 -03:00
Arkatos1
b6b9caad10 Bible Radial (#52919) 2020-08-15 11:48:37 -07:00
kingofkosmos
3263decaad Personalized combat messages part 2 (#52890)
Adds more "personalized" combat messages for all participants in a fight: the attacker, the victim and the spectators
2020-08-13 11:34:57 -03:00
Jared-Fogle
e8c4b99ada Adds a sprite for advanced medkit medibots (#52775) 2020-08-11 20:02:41 +02:00
Timberpoes
8fc671f942 Implements job skillchip framework as per hackmd.io design document (#52630)
* Shift wire revealing logic to dedicated proc

* Bit of code modification. Framework for roundstart job skillchips.

* Implement roboticist skillchip trait functionality.

* Feex moth feet messup

* Add skill chips to robodrobe inventory

* Code refactor. Add missing skill_stations to Pubby and Delta.

* Implement special flags, changelings inherit skillchip skills

* Additional code refactor. Traitor chameleon skillchip framework.

* Implement traitor skillchip, fix up more code, move job chips to outfit datums

* Modify autosurgeon, create skillchip variant, add to uplink

* Implement chip cooldowns. Add new skillchip for station engineers. Cleanup some code. Add job chips to lockers.

* Feex

* Feex

* Code review implementation

* More feexes, improved chameleon chip code and more.

* Code review and minor refactor

* Additional review fixes, rebuild tgui

* Minor logic fixes

* Final Rohesie review

* Robust code changes, improved slot/complexity system.

* Rebuild tgui

* Code review

* Brain regeneration failsafe

* Lazylist cut fix
2020-08-05 21:21:29 +02:00
ArcaneMusic
5c7ce2f407 Food trays drop their contents when deleted or destroyed. (#52667)
* Food trays drop their contents when deleted or destroyed.

* Moves the traycheck up to the storage level.
2020-08-05 01:13:38 -04:00
AnturK
e5cf3c05b8 Simple skill/skillchip framework (#52314)
* Simple skills framework.

* Map changes.

* Adds skillchips to vendor

* Adds skill stations to the map.

* Circuitboards

* Fix typo

* Some minimal instability

* Fixes,tweaks etc

* Suggest better names or we'll end up with these.

* sharpness thing

* tgui build

* Makes wine from booze synthetizer show to wine tasters.

* Makes wine from dispenser have taste for wine tasters.

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

* Swaps to carbon var.

* wordy helper proc

* While i'm at it, other relaymoves

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-29 05:13:36 -03:00
Time-Green
f47dc74029 Renames instabitaluri to syntflesh (#52523)
* Renames instabitulari to synthflesh

* Recommits Jared Foggles correction
2020-07-28 00:05:21 +03:00
ArcaneMusic
a6b367f8c8 Adds an metric ton of belt sprites and suit sprites for worn objects. (#52390)
* Plant Belt sprites are fixed, Engy Sprites too

* I did belt sprites until my eyes started hurting
2020-07-25 02:58:52 -03:00
Ryll Ryll
46dd89b07a [READY] Wounds part 2: Piercing wounds, dismemberment changes, housekeeping (#51786)
* pierce the heavens

* starts doing projs

* continue pierce

* before armor

* before sharpness redefine

* rename sharp defines, before further implementation

* finishing undoing atk_type back to sharpness

* neatens up sharpness defines, FALSE -> SHARP_NONE

* more piercing, removes brute damage bleed, bubblegum no longer wound

* starts letting embeds get in on the fun

* half with embed

* work on dismembering

* continued embed work

* more moving bandaging to limbs

* more dismemberment work

* removing embed pierce stuff

* tweaking bullets

* more docs and work on dismemberment

* spans, piercing, guns

* dismemberment and scar fixes

* bee changes

* bullets embedding

* more bullet and dismember work

* dismemberment, surgery, piercing, formaldehyde,

* pleases travis

* pierce smite

* nicer on blood

* Auto stash before rebase of "tgstation/master"

* more neatening

* wounds only consider up to 35 damage, wounds on l6 and 762

* updates hulk

* balance

* defines

* lower slug to 50 brute to accommodate wounds

* adds differentiation for having flesh/bones/both in mobs

* moves scar descs to json, renames organic_state

* excises removed healing skill

* fixes logs, inconsistencies, some balance changes

* untab

* slight compress

* a

* kills pointed global list

* dmdoc

* halfway through roh

* finishes roh review

* okay NOW i finished roh's reviews

* roh roh roh your boat

* gently down the stream

* global lists

* list ops, fix scanner for bone gel improvised fix

* travis moment

* sounds added and moved

* pellet clouds can join the fun fully, slight gun balancing for wounds

* doc moment

* unconflicts myself

* update hulk

* Update code/_onclick/item_attack.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* crying ascii face

* final rohview

* oops

* final final

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-23 23:19:30 -03:00
jdawg1290
62676e72a8 Force LF line endings with gitattributes and convert repo (#52266)
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-07-16 03:02:40 +03:00
LordVollkorn
5fd23707d9 [READY] New Sprites and Icons to fix certain items (#52154)
* New icons and sprites

* DNA sample kit sprite

Co-authored-by: MrDoomBringer <mrdoomboyo@gmail.com>
2020-07-12 11:08:07 +02:00
Jared-Fogle
8a380db379 Accurate donut box sprites (#51971)
The sprite of the donut box will now be dependent on what donuts are inside and in what order.

Current donut boxes misinform hungry spacemen, and colorful donut boxes are cool.
Changelog

cl
imageadd: Donut boxes will now accurately show what donuts are inside.
/cl
2020-07-07 10:56:25 +12:00
MrMelbert
3b851845d4 Minor Adjustments to the "Brain Tumor" Quirk (#51770)
* brain tumor adjustments

* some requested changes + defines

* trait

* READ

* > self-merging

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-07-05 18:21:41 -04:00
ShizCalev
411dea9542 Merge pull request #51659 from TaG2e/master
Fixes more missing sprites and adds invisible icon
2020-07-01 11:58:17 -04:00
Timberpoes
24b2b928bd Feex belts (#51766) 2020-06-22 13:09:20 -04:00
TaG2e
8f72395637 Fixes more item icons, conflicts, and default hidden to false 2020-06-20 19:00:36 -05:00
Ryll Ryll
202120e5a1 Limits free shipping on goody orders in cargo (#51587)
* goody goody

* pleases travis

* moves preexisting line
2020-06-19 10:46:13 +12:00
nemvar
b87f65d95e Converts ALL typepaths to lowercase (#51642)
* Case of lower

* More changes

* Ruins the nice 420 diff, brainfart when doing the second batch of conversions

* More changes

* Next batch. I think

* Converts even more paths

* Restarts bots

* Capital Free Zone

* Come on travis, do something

* Renames areas

* Bots, please stop dying

* Updates CONTRIBUTING.md and updates a few paths I missed.

* APC recgarftzfvas
/obj/item/computer_hardware/recharger/apc to /obj/item/computer_hardware/recharger/apc_recharger
2020-06-17 20:47:57 -03:00
Tlaltecuhtli
d924b16bb1 adds the organ transport box (#51604)
* 1

* whiter box
2020-06-17 11:46:30 -04:00
Jordan Brown
951e0a4da8 Merge pull request #51643 from Kaffe-work/metaops-fix
Add a doorjack to the metaop bundle
2020-06-15 10:44:50 -04:00
TaG2e
b9ec327c17 Fixes more missing sprites and adds invisible icon 2020-06-15 01:56:12 -05:00
Jared-Fogle
6dcd5dc02f Reorders health analyzer to be first in the first aid (#51458) 2020-06-14 22:30:14 +02:00
Kaffe-work
2b1f47b8dd revert spelling error 2020-06-14 17:12:50 +02:00
Kaffe-work
0348783d51 Add a doorjack to the metaop bundle 2020-06-14 15:46:29 +02:00