80 Commits
Author SHA1 Message Date
Merlin1230andGitHub 25dabc628b removes some mentions of Jargon in code. (#21553)
It hasnt been jargon for years, and the code still had a few references
I noticed. Most of these are just icon names, which arent at all visible
on the player side, but one description for specifically the cargo order
of a item still mentioned it. Funnily enough, the actual item itself had
a correct description.
2025-11-10 08:14:23 +00:00
07dcdb8a06 Medical cargo list tweaks. (#21156)
- The Dexalin Plus and Peridaxon autoinjectors in the medical cargo
category are now vials that come with 15 units.
- Added Arithrazine and Thetamycin to the medical cargo category.
- O- blood bags in the medical cargo category now come in a pair of two,
rather than just one.
- Changed the Dermaline crate to a Kelotane crate instead.
- The three body bag boxes crate now actually comes with three body bag
boxes.

---------

Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>
Co-authored-by: Matt Atlas <liermattia@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2025-09-06 11:19:15 +00:00
Wowzewow (Wezzy)andGitHub 47d26c04b2 Mining and Chem Bag fix (#20599)
Fixes #20596
Fixes #20594
2025-03-14 23:19:58 +00:00
SparkyandGitHub c9c70bbed0 Barista QoL Expansion (#19395)
Adds the ability to use pens to write names and orders on takeaway cups.

Allows you to click on syrup dispensers with a cup to dispense the
syrup, rather than having to pick them up.

Moves the chemical heater from the bar backroom to the front, so
bartenders don't need to walk away and come back every time they need to
make steamed milk.
2024-06-11 08:45:33 +00:00
9983fca311 Update SSOverlays (ported from Baystation) (#19051)
Our SSOverlays system is outdated, and is likely the cause of many of
the issues seen in #18895. It has also been linked to a massive server
performance decrease.

This brings an updated system from Baystation, hopefully with speed
increases.

Should be testmerged, ideally with #18895.

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2024-05-01 07:46:27 +00:00
smellieandGitHub 11f8eff319 Cryonics Additions + IV Bag Stuff (#18415)
### Summary:
This PR fleshes out cryonics, both inside a cryotube and outside of a
cryotube, and gives a pharmacist a lot more to do during those high
energy rounds as they will be required to prepare and oversee any
cryonic mixes. Lots of ways you can go about doing with the biggest
reward being brain regeneration that bypasses oxygenation requirements,
at the cost of significant downsides if done improperly.

This generally empowers pharmacists and physicians and offers
non-surgical treatment alternatives, though often incurs a penalty or
takes a little longer than surgical treatment, so it doesn't make
surgeons redundant.

This list'll be exhaustive so medical players aren't left in the dark
and can just refer to this while a wiki update is worked on, instead of
digging through code.

 **Changes to Stasis/Cryotubes:**
- Stasis at temperates between 120K and 200K has been reduced to between
5 and 10, as opposed to 10 and 20. This means chemicals still have a
good chance of metabolising if you set a cryotube to above ~140K.
Cryotubes will still achieve good stasis if you cool below 120K -
upgraded stockparts from the workshop/R&D will help with this.
- (Bugfix) IPCs will not longer be knocked unconscious if they enter an
active cryotube.

**Misc. Reagent Additions/Tweaks:**
- Bicaridine now only requires 30u in the blood to begin attempting to
repair arterial bleeds, as opposed to 50u.
- Adds a Blood Thinning chemical effect. This prevents Coagzolug's blood
clotting effect from working and works in the opposite way - increasing
how much blood you lose per blood loss tick. Fluvectionem and
Synaptizine apply Blood Thinning at a strength of 25, translating to 25%
faster blood loss.

**Cryonic Chemicals:**
- Cryoxadone and Clonexadone both overdose at 5u. **_This is not a
problem when using a cryotube due to how cryotubes administer
reagents._** Overdosing either results in genetic damage and severe eye
damage.
- Cryoxadone and Clonexadone's organ healing capabilities have been
significantly nerfed. The organ healing is still noticable and useful
for pharmacist/surgeonless rounds; they cannot heal the brain though.
- Cryosurfactant has been renamed to Cryosilicate, mimicking
Pyrosilicate - the recipe now uses silicate instead of surfactant.
- Cryosilicate and Pyrosilicate now have an effect when used in the
body: cryosilicate will supercool a patient; pyrosilicate will
chemically incinerate someone. Leporazine will inhibit these functions.
- Bicaridine will repair arterial bleeds when used in cryogenic
conditions.
- Kelotane will repair disfigurement when used in cryogenic conditions.
- Peridaxon 2x effective in cryogenic conditions. Peridaxon can
denecrotise livers and kidneys in extracool cryogenic conditions - it
cannot denecrotise other organs. Using peridaxon in cryogenic conditions
will result in benign tumour growth (see below).
- Red Nightshade can repair bone breaks in cryogenic conditions. It will
still put a patient into a berserk state.
- Cataleptinol - see below.

**Cataleptinol Rework:**
Cataleptinol has been reworked from the ground up and is where
pharmacist's will be able to shine by making fancy cryotube beaker
mixers or cryonic mixtures for use in IV stands.
- The new recipe is 2 parts Alkysine, 0.5 parts Phoron, 1 part
Clonexadone and a 5u Cryosilicate catalyst. This translates to: 120u
Alkysine + 60u Clonexadone + 30u Phoron w/ 5u Cryosilicate = 60u (1
bottle) of Cataleptinol - expensive and lots of tricky precursors,
leaves enough left over to make a 2nd bottle without having to remake
all of the precursors.
- **In cryogenic conditions**, Cataleptinol will restore 7.5% brain
activity per metabolisation tick. This _bypasses the 85% oxygenation
requirement_, at the cost of hallucinations, blood thinning and liver
damage. The trade is roughly 40% brain activity (assuming nothing is
causing brain damage) for total liver failure.
- **Outside of cryogenic conditions**, Cataleptinol becomes a lot less
reliable and a lot more dangerous to use, with only a 75% chance of
restoring 2% brain activity per metabolisation tick. It will still
bypass oxygenation requirements, making it useful during _**severe
emergencies**_, at the cost of inducing painshock in addition to the
above hallucinations, blood thinning and liver damage. The trade is
roughly 25% brain activity (assuming nothing is causing brain damage)
for total liver failure.
- Cataleptinol _**overdoses at 3u**_ and has a fast metabolisation of
0.6u/tick - this makes it hard to dose without using an IV drip. If you
overdose Cataleptinol by using another method of administration, then
the patient's liver will crash, brain regeneration undone and the
patient will have severe seizures resulting in more pain. Using
Cataleptinol outside of cryogenic conditions **is high risk and only
potentially high reward**, but it could buy a couple more minutes.

**Tumours:**
- Adds Benign Tumours. Benign tumours simply drain nutrition and cause
frequent pain; they do not spread or affect nearby organs.
- Adds Malignant Tumours. Malignant tumours will begin by draining
nutrition then effecting symptoms based on the tumour's location (chest
tumours -> coughing, gasping, chest pain; brain tumours ->
disorientation, memory loss; abdominal -> vomiting, abdominal pain;
anywhere else -> lethargy). In the later stages, malignant tumours will
begin to damage the organs they are close to, then will eventually enter
the circulatory _~~and lymphatic~~_ system and spawn more malignant
tumours in other parts of the body.
- Peridaxon will result in benign tumour growth when overdosed or used
in cryogenic conditions.
- Genetic damage will result in malignant tumour growth.
- Ryetalyn is the anti-tumour drug and will put both benign and
malignant tumours into recession. You can also surgically intervene and
excise tumours as you would k'ois mycosis or fluke parasites.
- You cannot have more than 3 of any tumour - things won't get too out
of hand.

**IV Bag Stuff:**
- Adds 2 labels for IV bags: Cryonics Mixture, denoted by a CR; Other
Mixture, denoted by an M.
- Renames `blood packs` to `IV bags` and changes their formatting. What
was `blood pack O+` will now appear as `IV bag - O+ Blood`; `blood pack
Saline Plus` -> `IV bag - Saline Plus`.

**Misc.:**
- Only 20 genetic degradation on a limb is required to deform it instead
of 30. This should make it slightly more common, as 30 is a large number
to reach when this number is calculated per limb.
- Seizures can be given variable strengths.
- (Bugfix) Coolant tanks no longer just set a room's temperature to 0K
when destroyed. The amount it cools a room scales with the amount of
coolant still in the tank but cannot go below 173K/-100°C.
- Cryocells now have stockparts and can be upgraded/deconstructed.
2024-04-13 16:14:51 +00:00
RustingWithYouandGitHub 21c74b3cae More ERTs 2: Even More ERTs (#18739)
* more erts

* fear of a bug planet

* klax

* fixes

* MORE

* #include moment

* a
2024-03-27 10:19:08 +00:00
82beece3db Backports the new zombification mechanics from the Konyang zombie event. (#18710)
* Reorder parasites

* sounds

* organ defines, dmdocs

* maiming stuff

* undead changes, abilities

* hylemnomil, undead sprites

* antibodies

* antibody extractor code

* icons

* antibody fixes

* antibodies vial, rock break sfx

* You're all going to die down here.

* hylemnomilz eta vial and attributions

* zombified organs can't be removed

* hylemnomil zeta edits

* fixes

* lmao

* easier check

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-03-24 14:04:52 +00:00
DreamySkrellGitHubDreamySkrell <>
3124122ea4 More coffee cups: SCC, Zavod, Orion, EE (#18693)
* a

* a

* c

* a

* huh

---------

Co-authored-by: DreamySkrell <>
2024-03-22 13:10:34 +00:00
juniperandGitHub 16f24d9008 Coalition of Snackolonies II: Fetch Harder Edition (#18626)
* ship it joe

* yangechog

* hoargh

* it's a plastic bottle

* little things

* MEAT

* last bit

* vanilla isn't real

* maps in the vendor + minor additions

* this may fix the Issue

* do this later

* last-minute changes i noticed while i was at work

* my agonies

* aeiou

* keep trying...

* what will this break hmm

* i clench my fist and beat it

* matt's changes

* fixes feni + 2275
2024-03-17 21:56:49 +00:00
fddefa054e Decrease food waste (Kitchens spawn with a few extra ingredients) (#18648)
* first commit

woo

* added changelog

* Update aurorastation.dme

* Update code/game/objects/random/misc.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

* Update code/modules/reagents/reagent_containers/food/condiment.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

* Update code/game/objects/random/misc.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

* Update code/modules/reagents/reagent_containers/food/condiment.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

---------

Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2024-03-17 21:55:12 +00:00
feartheblackoutandGitHub 1c03ed3745 Adds more Port Antillian paraphernalia (#18198) 2024-01-14 19:34:00 +00:00
0f70609936 Adds Konyanger tea leaves, teapots, and tea cups. (#18145)
* Adds Konyanger tea leaves, teapots, and tea cups.

* teatray to the glassware

* classic

* teapot correction

* updates

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-01-07 23:45:59 +00:00
65d32eabd6 Random spawn mobs now have random cultures, hair, and skin tone. (#18120)
* Random spawn mobs now have random cultures, hair, and skin tone.

* fixes + trioxin

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-01-05 17:48:13 +00:00
80cb0cd121 Triglyceride bottle (#17814)
* sadfas

* Update code/modules/reagents/reagent_containers/glass/bottle.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-11-27 00:47:33 +00:00
06601c9ec3 Split up and rename var/flags (#17794)
* Split up and rename `var/flags`

* Various fixes

* CL

* Don't rename Phoron Guard phoron preset

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-11-22 16:27:51 +00:00
FluffyandGitHub 4538e2a7cc Fix indentations (#17481)
* cbt

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* fsadffsda sad

* sadfasd

* jhn

* dsfa

* saf

* safsad

* sda
2023-10-05 10:15:58 +00:00
Wowzewow (Wezzy)andGitHub faca6da739 The Food Sortening, Extra Pain-In-My-Ass Edition (#17393)
* The Food Sortening, Extra Pain-In-My-Ass Edition

Sorts all food sprites and cuts down the MONOLITH snacks.dm and food.dmi. This was an absolute pain in my ass. No front-facing changes.

Planning to add more shit down the line. Makes everyone's lives easier.

* changelol

* finally

* inhands

* merge conflict

* this really "ticked" me off HAHAHAHAHS

* fixes

* make megalinter happy
2023-09-24 22:13:15 +00:00
Wowzewow (Wezzy)andGitHub d469e93fc3 3/4 reagent container sprite and cafe tweaks and fixes (#17259) 2023-09-07 14:49:00 +00:00
cc8eab09ef Reagent Containers : The 3/4thening & Contained Spritening (and other related food things) (#17231)
* food and drink

* sabrage

* kanpai and blasted on grain alcohol

* beakers

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/drinks/bottle.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/drinks/bottle.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* changelog

* the contained sprite-ening....

* deletes old file

* teapot

* aaaaahhhh

* AAAGH INHANDS

* volume = 30

* fixes invalid icon state

* is this really that fucking esoteric

* Revert "is this really that fucking esoteric"

This reverts commit 5b238c7821.

* this should fix it maybe

* fixes 2

* the simple solution

* skibidi toilet

* god dammit

* jyalra

* redundancy

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-06 18:54:20 +00:00
LlywelwynandGitHub 2f755aeafe San Colette zippo, and San Colette + Europa coffee cups (#16442)
* san colette coffee cup

* europa coffee cup

* san colette zippo + typo

+ cl

* oops forgot to stage this in last commit

* zippo inhands

* right inhands were out by a pixel

* as prev

* okay man whatever

* tiny change to extended desc of lighter

san colette aren't an independent state, just got recognised as a sub-polity
2023-06-10 12:34:10 +00:00
RamkeandGitHub 4ae0ee994b tajcups (#16058) 2023-03-22 22:40:48 +00:00
Wowzewow (Wezzy)andGitHub 12ddd59fa9 Adds Medpouches (and other Bay Stuff) (#15505) 2023-02-08 11:27:55 +01:00
FluffyandGitHub 04d89f212a Singletons + refactor of /datum/observ + refactor of /decl/ into /singleton/ (#15519) 2023-01-10 19:22:14 +01:00
Matt AtlasandGitHub b1869884c1 Revert "Singletons + refactor of /datum/observ (#15487)" (#15515) 2023-01-05 19:21:22 +01:00
FluffyandGitHub 0ddcf0817a Singletons + refactor of /datum/observ (#15487) 2023-01-05 18:41:40 +01:00
anconfuzedrockandGitHub 475b035cd8 Adds some basic medicine autoinjectors/bottles to the code so I can deviously try to add them to ops orders later. (#15031) 2022-11-11 15:16:57 +01:00
sheepletsandGitHub 596523de5a Replaces cough syrup in NanoMed Plus vendors with Coagzolug (#14904) 2022-10-17 20:29:19 +02:00
SleepyGemmyandGitHub c1511cbc71 Changes Jargon to Nralakk (#14734) 2022-09-01 21:47:36 +02:00
VisVirificandGitHub 6c24573c04 Chem Bottles, Beakers and Medcup Resprites (#13399) 2022-05-07 14:27:11 +02:00
Wowzewow (Wezzy)andGitHub a2f6f55584 Beakers, bottles and syringe resprite (#13096) 2022-03-04 18:45:19 +01:00
mikomyazakiandGitHub ac02830506 Fixes heating nitroglycerin. (#13201) 2022-02-18 12:13:31 +01:00
Casper3667andGitHub 9133ddff93 adds several new coffee cups (#12627) 2021-10-17 20:44:41 -03:00
desvenandGitHub 3f99489ea6 Adds a few more hand sprites (#12535) 2021-09-25 21:44:21 +02:00
listerlaandGitHub 12949678a2 Adds Vaurca food, drink, and cup. (#12226) 2021-07-28 18:27:30 -03:00
0bd55b87fd Fixes coffee cup bugs (#12166)
Co-authored-by: TheGreyWolf <mc-casper@hotmail.dk>
2021-07-09 11:52:34 -03:00
Casper3667andGitHub ee0086caa8 Adds new drinking glasses and coffee cups (#12133) 2021-07-06 22:30:02 -03:00
WickedCybsandGitHub f83401b128 Beacon Team Medical Responder Adjustments (#11685) 2021-04-20 13:10:49 +02:00
MarinaGryphonandGitHub c720e947ed /decl/chem (#10538) 2021-01-17 00:11:28 +02:00
sadkermitandGitHub d8e7edc931 Chemistry Update Tweaks/Fixes (very overdue, sorry) (#10102) 2020-10-01 01:45:23 -03:00
Matt AtlasandGitHub f498343146 Fixes drinking glasses and beakers not shattering when thrown. (#9904) 2020-09-07 16:38:36 +02:00
sadkermitandGitHub 36dc8a5220 Chemical Improvements & Tweaks: Side-effects, overdoses, and more. (#9708) 2020-09-01 14:29:40 +02:00
fernerrandGitHub b9db49aded CC-zlevel flattening, Antag base refurbishment, bugfixes and more (#9686) 2020-08-19 10:24:25 +02:00
Chada-1andGitHub d7e680a575 Full rename of all real chems to bone apple tea'd versions. (#9400)
As a continuation of #9389
As a bonus, any drugs that mentioned their IRL counterpart in their description now describe their predecessor as ancient, and the new ones as modern. The biggest difference here is just the Antihistamine which was given a full new name. They're similar enough that they'll be recognized (most of them) but different enough for us to call our own and not care what the real medicines are/do since these are our sci-fantasy versions just inspired by them.
2020-07-26 13:19:41 +03:00
Wowzewow (Wezzy)andGitHub 4557fe8a3f fixes some grammar for eating things (#9382)
rscadd: "Food that takes one bite to eat doesn't say 'you finish it' anymore. Sounded kind of weird to 'finish' something in one bite."
    bugfix: "Fixes some grammar with swallowing pills."
2020-07-24 11:16:54 +03:00
JoshieandGitHub fb8af14858 Renames all instances of "Norepinephrine" to "Inaprovaline" (#9389)
It was a mistake to use real life chemicals on the grounds of "realism", especially when the chemical doesn't actually act realistically to how it does in real life. With the removal of the Inaprovaline medication as well, we can return the name to Norepinephrine, which was originally called Inaprovaline anyway.
2020-07-21 17:57:44 +03:00
MarinaGryphonandGitHub 37c80988ce Converts Reagents to Typepaths and Centralises Reagent Spawning (#9140)
Converts reagents to use typepaths instead of IDs.
    Centralises reagent spawning in a lot of places to use reagents_to_add instead of a variety of custom methods or initialise overrides.
2020-07-05 20:47:48 +03:00
KaedwuffandGitHub 1529fa44c1 Removes Virology (#8927)
-Almost all aspects of virology and it's related machinery and objects have been purged from the code and map.
-Most of disease code has been purged. Some pieces of it remain as holdovers because they would require extensive rewrite of defines and codes for things like nanite robot transformation and appendicitis (that frankly isn't necessary)
-The outbreak event has been purged, as has the virology malicious code event variant.
-The Virology department has been remapped into the Abandoned Sector.
2020-06-05 20:27:46 +03:00
Wowzewow (Wezzy)andGitHub 723c711022 Inhands : the final fuckening (#8696) 2020-04-24 11:36:00 +02:00
DoxxmedearlyandGitHub 131baa9674 Chem Adjustments, Fixes, and Additions (#8554) 2020-04-01 23:34:28 +02:00