Commit Graph

921 Commits

Author SHA1 Message Date
lukevale
f27bdf1dc4 Beakres
Adds in beakers. Fully working. As long as I didn't fuck up any pathing that is.
2020-12-17 12:06:36 -06:00
Novacat
41c8e4a671 Merge pull request #9032 from VOREStation/upstream-merge-7475
[MIRROR] Hydro upkeep
2020-09-21 19:42:43 -04:00
Atermonera
84b9867fd0 Merge pull request #7669 from Mechoid/FixBeakerdipping
Fix Beaker Dipping
2020-09-21 12:49:38 -04:00
Mechoid
68a37c64fa Hydro upkeep 2020-09-16 19:40:41 -04:00
Novacat
070a3489fe Merge pull request #8940 from VOREStation/upstream-merge-7583
[MIRROR] FBP Internals Additions
2020-09-01 00:51:59 -04:00
Atermonera
a5c829ea53 FBP Internals Additions 2020-08-31 23:25:13 -04:00
Mechoid
97831abf14 Distillery Upkeep, Chemistry Tweakening (#7573)
* Distillery For Chemistry

* Synthplasma, Synthblood but not horrifically strong.

* Rectify, I said, damnit!

* Distillery for Chem. Now with STRONG DMM.

* changeling
2020-08-31 22:37:18 -04:00
Novacat
f6e61ea8f1 Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions
Massive Ambience and Sound Overhaul + Addition
2020-08-28 00:47:23 -04:00
Atermonera
4acd8a7a87 Merge pull request #7584 from Rykka-Stormheart/shep-dev-borgo-fixes
Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
2020-08-27 21:45:33 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Mechoid
496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045
[MIRROR] Removes limits on eating, centralizes nutrition changing.
2020-04-29 19:23:55 -04:00
Novacat
c70af70266 Merge pull request #7463 from Novacat/nova-ert
Overhauls First Aid Kits
2020-04-29 18:44:43 -04:00
Aronai Sieyes
893130bdff Merge nutrition refactor for vorestation 2020-04-29 18:34:22 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Unknown
1048a969d4 Admin discussion changes 2020-04-29 15:23:01 -04:00
Unknown
31fbcefac9 Additional tweaks 2020-04-27 00:52:08 -04:00
Unknown
afe4c7498f Tweaks 2020-04-26 17:44:33 -04:00
Unknown
63e368cc93 Last Second Changes 2020-04-26 13:39:45 -04:00
Unknown
a6deb3078d Overhauls First Aid Kits
- Refactors First aid kits to be mostly autoinjector and pill based. No syringes, just autoinjectors and pills. Health analyzers are also removed.
Regular First Aid Kit: 3x Gauze, 2x Ointment, 1x Paracetamol pill bottle, 1x Inaprovaline pill bottle
Toxin First Aid Kit: 1x Dylovene Pill Bottle, 6x Dylovene Autoinjectors
Burn First Aid Kit: 1x Kelotane pill bottle, 6x Dermaline autoinjectors.
Oxy First Aid Kit: 5x Dexalin Plus autoinjectors, 1x Iron pill bottle, 1x Dexalin Pill Bottle
Adv First Aid Kit: Replaces Autoinjector with Assorted Pill bottle (3 Inaprov, 3 Dylovene, 2 Iron, 2 Tramadol, 3 Hyronalin, 1 Spaceacillin pills)
- Buffs default pill bottle contents. This narrows the effectiveness between autogenerated pills and pill bottles, and those brewed up by players.
- Splits Miner autoinjector into four seperate autoinjectors, one for each damage type. Reduces the price in the mining/exploration vendors.
- Tweaks Pill contents for a bit better consistency. Biggest change is that dexalin pills are 7.5u each.
- Changes Vermicetol chemical color to something more reddish.
- Overhauls Internals closet, removed O2 kits from them, adds more emergency spacesuits.
- Removes Organ Kits, Combat First Aid Kits now have a pill bottle with assorted organ repair pills.
- Surgical kits now have a regular health analyzer, and can hold health analyzers.
2020-04-26 13:38:28 -04:00
Atermonera
ba2f4c76dc QoL: Small Medical Things 2020-04-05 03:03:06 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Aronai Sieyes
545a6cc447 Fix building med stands 2020-03-01 19:13:40 -05:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman
9490261230 Adds Kitsuhanan Cure for resleeving sickness 2020-01-06 07:15:13 +10:00
Atermonera
45b4947d1e Merge pull request #6584 from TheFurryFeline/TFF-Print_Da_Sprayers
Printable Spray Bottles
2019-12-25 18:10:16 -05:00
Unknown
ea4c6075b7 Fixes busted syringes 2019-12-07 10:25:28 -05:00
Mechoid
e1fa847bc2 Xenowork Prep For Future (#6491)
* Xenowork, weeds walls and material blobs.

* More weeds

* XenoUpdoots

* Stop that, me.
2019-11-04 21:38:02 -05:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Unknown
fdca4f7554 Master Runtime Fix 2019-10-01 03:09:58 -04:00
Heroman
31d459f230 Fixes Blood-Onator 2019-09-14 15:01:58 +10:00
Unknown
14eb525030 Adjusts Vorestation pills and pillbottles 2019-08-28 04:06:19 -04:00
Atermonera
8f067fe785 Chemistry Expansion 2019-08-21 17:43:01 -04:00
Novacat
dd7a7842ed Merge pull request #5567 from Novacat/nova-survival
Adds Prototype Hypospray
2019-08-12 13:15:35 -04:00
Atermonera
0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
Novacat
8e321b3725 Update hypospray.dm 2019-08-06 22:10:50 -04:00
Unknown
d7406088b5 Test 2019-08-06 21:07:40 -04:00
Unknown
b5824871ed Removes unnecessary check 2019-08-06 21:05:51 -04:00
Unknown
03976d3dd3 Moves var 2019-08-06 21:03:35 -04:00
Unknown
f699825119 Forgot a Var 2019-08-06 20:58:25 -04:00
Unknown
1fb88e40e2 Adds Prototype Hypospray
- Can be researched and manufactured by Science
- Identical to a mk1 hypospray, except does not instantly inject reagents at friendly intents

Not terribly useful right now under the current meta, but probably will be useful down the road if/when syringes become disposable again.
2019-08-06 20:54:14 -04:00
Atermonera
6a12033368 Merge pull request #6321 from Nalarac/patch-2
Allows Longer Visible Text on Beakers
2019-07-22 00:44:19 -04:00
GeneriedJenelle
12df030c0a Adds Cider Bottles (#6201)
* Adds Cider

How has SS13 alcohol gone on so long without cider? Let's fix that.

* Update cartridge_presets.dm

* Update dispenser2_energy.dm

* Update dispenser_presets.dm

* Adds cider bottle sprite + adds to borgs

* Update Chemistry-Reagents-Food-Drinks.dm

* Removes additional cider entry
2019-06-18 20:05:06 -04:00
Novacat
b7205d3b60 Update pill.dm 2019-06-16 21:51:52 -04:00
Novacat
13739440c2 Grey scale pills and colored pillbottles 2019-06-16 21:28:56 -04:00
Spades
fafd7675ef Merge pull request #4986 from Heroman3003/zoooooooom
Rebalances zoom pills
2019-06-12 17:11:48 -04:00
Heroman
2de30ebaf7 Removes fertilizer aspect 2019-06-02 07:09:44 +10:00
Unknown
eeb198d3a4 Metabolism effects 2019-05-02 19:41:17 -04:00