Commit Graph

1745 Commits

Author SHA1 Message Date
MistakeNot4892
66b68e5302 Merge pull request #8274 from lbnesquik/Kot-polarsi-barista-sugar
Gives the baristas sugar in their dispenser
2021-09-03 15:34:20 +10:00
MistakeNot4892
f14907cdb9 Merge pull request #8203 from Cerebulon/food2021
Food Expansion
2021-09-03 11:55:26 +10:00
lbnesquik
f6fa98997c Gives the baristas sugar in their dispenser 2021-09-02 09:02:50 +02:00
MistakeNot4892
ad811cafe7 Merge pull request #8249 from Cerebulon/cubalibre
A Hint Of Lime
2021-09-01 10:25:48 +10:00
Cerebulon
81229b1fab requested changes, missing reagent, generic cubes 2021-08-31 20:08:01 +01:00
Cerebulon
71c814a8f6 Allergy severity tweaks 2021-08-29 18:06:33 +01:00
Cerebulon
e2e54a7c8e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into food2021 2021-08-27 21:09:46 +01:00
Cerebulon
1ac9d4fcc4 A Hint Of Lime 2021-08-26 18:03:24 +01:00
Atermonera
53118573a9 Merge pull request #8222 from MistakeNot4892/survivalism_nomap
General wilderness updates.
2021-08-22 21:04:17 -07:00
MistakeNot4892
9286036a3d Updates wine reagent id to redwine. 2021-08-20 11:06:05 +10:00
MistakeNot4892
4c53eda3b2 General wilderness updates; fixed frostbelle, adjusted scavenging, added some recipes and mushrooms.
Fixes for wilderness commit.
2021-08-17 18:54:37 +10:00
Cerebulon
3a9a58b12a code 2021-08-09 21:54:28 +01:00
Ghost Actual
d383606a6f 2021 Drink Revamp (#8185)
* Base Commit

* Code Fix

* Code Fix
2021-07-28 17:24:47 -09:00
klaasjared
b93ac41a9d Base Commit 2021-07-17 03:12:33 -04:00
Atermonera
959511918c Replaces DEFAULT_WALL_MATERIAL with MAT_STEEL, where applicable (#8156)
* Replaces DEFAULT_WALL_MATERIAL with MAT_STEEL, where applicable

* floorbot compiles
2021-06-29 20:28:16 -07:00
Atermonera
6e34b36bba Merge pull request #8159 from TheFurryFeline/patch-11
Typo Fixy
2021-06-27 22:53:09 -07:00
Novacat
80c6493979 Medicine Tweaks (#8157)
* Medicine Tweaks

Mostly, these are based off of notes I have been collecting over the past year or so, and I just got the motivation to actually act on those notes.

- Adminordrazine buffed again
- Myelamine buffed slightly, to reduce the chances of a standard clotting injector failing to treat IB
- Bicaridine Overdose slightly more effective at treating IB
- Inaprovaline metabolizes slower, to make it more useful in its role of patient stabilization
- Bone repair autoinjector changed to a 5u autoinjector with 5u of osteodaxon. Considering how osteodaxon works, 10u is overkill and leaves the patient feeling the side effects for longer than they should.
- Clone loss autoinjector added, patterned off the new bone repair autoinjector. 5u of Rezadone to deal with clone loss. Added to uplink as well as random unknown autoinjector spawners.

* Adjusted percentages and comments

* More Tweaks
2021-06-27 20:49:52 -09:00
TheFurryFeline
698060c382 Typo Fixy
Title, for Kompot.
2021-06-25 16:58:17 -04:00
MarinaGryphon
593246b595 Linter diagnostics + bans non-var relative pathing (#8150)
* Linter diagnostics + bans non-var relative pathing

* Enable DreamChecker Annotations

* make it executable

* update hashFiles

* oops

* tries to fix it... again

* trying again

* path

* repath

* fix perms

* fixes weird capitalisation issue
2021-06-20 13:14:29 -09:00
Neerti
fdabe51ee8 Linter Introduction + Cleanup (#8085)
* Adds linter defines to repo.

* Uncomments linter defines already in the code.

* Resolves unreachable code linter errors.

* Nukes decade+ old syndie specops code except for computer since that's mapped in?????

* Resolves procs has no parent linter error.

* Proc signature fixes

* Bad comments

* "In" danger

* Type safety

* Implied nested list abuse

* Top level ..() usage

* Sleepy coder typos

* Invalid kwargs calls

* Pointless returns

* Linter hacks (see full message)

Byond doesn't care and it has no effect but linter doesn't like var/proc
for holding references to procs, despite that it's valid byond code.

Also, the linter seems to have serious issues figuring out relative
proc names. This commit is a sort of take-it-or-leave-it thing. It's not
required, it just cuts down on warnings, but this code is valid DM code.

* WHATEVER THIS IS

* Trick dreamchecker linter into ignoring this file's sins in it's weird use of vars

* Fix list decoration syntax - Its a list, not list of lists

- To declare that a var is a list you can `var/list/blah = list()` syntax or the `var/blah[0]` syntax.  Both do exactly the same thing. But if you do `var/list/blah[0]` that is just like doing `var/list/list/blah = list()`

* Hopefully stops the ai holder subtype folder from going quantum and sometimes changes capitalization over time, and incidentally causing 20+ linter errors.

* Fixes unwrapped negated object in list linter error.

* Resolves colon-like list accessing linter error.

* Turns linter on in linter config.

* Fixes closet indentation properly and cleans up suit storage unit switch.

Co-authored-by: Aronai Sieyes <arokha@arokha.com>
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
2021-05-25 18:17:26 -09:00
ShadowLarkens
0198ff3fbf Personal Crafting & Dependencies 2021-05-02 18:05:54 -07:00
Atermonera
0c0dcb1738 Oops, I refactored Chemistry! (#8013)
Reorganizes Reagents dir structure
Refactors reactions to /decl
SSChemistry is no longer processing

Optimization isn't so optimized
Updates to distillery
New decl repository methods
Further tweaks
2021-04-20 18:31:49 -09:00
Novacat
157fe17963 fixes typo in qerr quem ID (#8026)
* fixes typo in qerr quem ID

* Removes unnecessary comments
2021-04-09 22:47:50 -09:00
klaasjared
a0ff9a0aa0 Boda Tweaks and Russian Drinks V2 (#8023)
* Adding Cans

Adds the following cans
-Boda
-Kvass
-Kompot

* Adds Russian Reagents

Adds the following reagents
-Kompot
-Kvass

* Fills the cans

Adds the code needed for the can additions

* Updates the BODA Machine

Removes the old products and contraband and replaces them with the new cans
2021-04-09 22:37:35 -09:00
Atermonera
003d47fbbc Tanning Tweaks (#7965)
* Tanning Tweaks

* tanning racks remove from SSobj on destroy
2021-03-29 20:48:11 -09:00
Atermonera
81ae48ba93 Merge pull request #7974 from MistakeNot4892/jager
Added Doctress' Jager drink.
2021-03-17 23:37:02 -09:00
MistakeNot4892
ca38755c7a Added Doctress' Jager drink. 2021-03-14 08:13:18 +11:00
cadyn
75dbadd12e Allergens v2 (#7950)
* Allergens v2

* The eggening

Add egg allergen, give it to skrell, apply egg allergen where it belongs.

* Update species_languages.dm
2021-03-10 09:53:07 -09:00
Killian
948d43afec Diet/Allergy Rework & Refactor Pt2 (#7940)
* Diet/Allergy Pt2

* couple more reaction types

* refactor and improve

* Update Chemistry-Reagents.dm
2021-03-07 12:09:18 -09:00
MistakeNot4892
b22a0568a3 Sideports a couple of init unit tests from Neb. (#7893)
* Sideports a couple of init unit tests from Neb.

* Trying to unfuck initialize logic.

* Removing del()s.

* Adjusting return values to Initialize().

* Moving some dangerous object logic from obj onto the two types that use it.

* Rolling back some init changes and commenting out initialized atom unit test.

* this comment formatting is a minor war crime

* Removed sleep() from signaler circuit Initialize().

* Additional Init fixes post-rebase.

* Uncomments subsystem test since that's passing.
2021-02-21 12:03:34 -09:00
Schnayy
83e0c14bcb adds sugary var (#7897) 2021-02-19 14:41:44 -08:00
Killian
4c4dc6fee1 small update for soft mixed drinks 2021-02-09 20:42:14 +00:00
Killian
2491dc89e9 Update Chemistry-Reagents-Dispenser.dm 2021-02-08 05:23:51 +00:00
Killian
8a8a4ac5b2 Merge remote-tracking branch 'upstream/master' into kk-diet 2021-02-08 05:12:01 +00:00
Killian
bd87eb06b0 extended allergy system first pass 2021-02-08 04:59:21 +00:00
Cerebulon
aa22ef3ef7 Every Food Fix 2021-01-29 10:46:10 +00:00
Atermonera
4fe327583c Space cleaner cleans mobs (#7802) 2021-01-03 15:19:20 -08:00
Mechoid
91aacb3f0f Plainleather & Tobacco (#7762)
* Rebrands leather to plainleather. Add tobacco and red-caps, redwood tallcaps.

* Seedpacket

* Sinks are wet.

* User
2020-12-07 15:48:49 -09:00
Atermonera
b592ac3f7e Fixes runtime in add_reagent() (#7676)
Bad index: data["species"] when data is not a list
2020-09-22 20:39:25 -07:00
Atermonera
05795bda4d Merge pull request #7672 from Meghan-Rossi/triglyceride_taste
Fix fat tasting bitter
2020-09-21 09:54:26 -07:00
Atermonera
a9e34c8e9f Merge pull request #7669 from Mechoid/FixBeakerdipping
Fix Beaker Dipping
2020-09-21 09:48:15 -07:00
Atermonera
6bd15bc200 Merge pull request #7625 from ShadowLarkens/tgui_med
TGUI Medical Conversion
2020-09-19 18:52:23 -07:00
Meghan-Rossi
e5db7f8ede Fix fat tasting bitter
*Fat (triglyceride) now tastes greasy instead of bitter
2020-09-19 14:04:03 +01:00
Atermonera
cdd1c024f3 Fixes runtime in Chemistry-Reagents-Food-Drinks.dm,25: bad index (#7654) 2020-09-18 20:28:12 -07:00
Mechoid
eb86ea9cd7 Dipping things into beakers now does not occur on help, since you're probably being careful. 2020-09-16 22:07:48 -07:00
Mechoid
f518a31458 Hydro upkeep (#7475)
* Start work on Hydro upkeep.

* Fix Cyborg interactions with kitchen tools.

* Add Wurmwoad to the vendors.

* Map

* changeling
2020-09-16 16:38:43 -07:00
ShadowLarkens
44f65e2602 TGUI Medical Conversion 2020-09-04 16:25:32 -07:00
Atermonera
24e638c433 Merge pull request #7583 from KillianKirilenko/kk-misc2
FBP Internals Additions
2020-08-31 20:24:17 -07:00
Mechoid
86cd06d283 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 19:35:25 -07:00
Rykka
f7fcdf2458 Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
ACTUALLY fixes problems with borgs permanently breaking their syringes and being able to put modules into potted plants, which causes unwanted fuckery.

Reverts #7560
2020-08-27 20:17:24 -04:00