Commit Graph

368 Commits

Author SHA1 Message Date
Verkister
1d396d2d08 Fixes buns having the power to break food inits
Fixes a bug that caused a bad index runtime on mapped-in buns during map init that somehow apparently makes all food cause nausea and vomiting or something.
2022-03-07 18:02:50 +02:00
Cerebulon
688f4e978d More Boxed Lunch Options 2022-02-20 06:05:48 +00:00
Atermonera
7428ac95c3 Fixes material bats not returning init hints (#8393)
* Fixes material bats not returning init hints

* Can the cans pass CI

* Brace for letting
2022-02-13 20:55:33 -08:00
Atermonera
4d8c43f106 What was supposed to be another straightforward major system overhaul that once again spiraled out of control (#8220)
* get_tool_quality has numerical meaning

* Basic tools set tool quality

* Toolspeed is replaced by tool quality checks

* Addresses assorted results from live test

* Extra cleanup
2022-01-16 15:52:55 -08:00
Atermonera
0232be9531 Repaths obj/effect/effect, datum/effect/effect [MDB_IGNORE] (#8312)
* Repaths obj/effect/effect, datum/effect/effect

* linter fixes

* No new

Co-authored-by: Atermonera <forslandm@gmail.com>
2022-01-16 00:14:39 -08:00
atermonera
5657f839b2 Fixes overflow bug that can delete sheets from smartfridge 2021-11-21 21:44:19 -08:00
MistakeNot4892
2f0a618d45 /atom New() => Initialize() [MDB IGNORE] (#8298)
* Find and replace argless atom New() to Initialize().

* Manual replacement of no-arg New() to Initialize().

* Manually replacing remaining New() overrides.

* Fixing linter issues with now-removed New() args.

* Tidying area init overrides.

* Porting Neb's atom subsystem.

* Trying to isolate init problems.

* Adjusting Init code post-test.

* Merging duplicate Initialize() procs.

* Merge resolution.
2021-11-14 00:09:14 -08:00
Schnayy
030741d681 fixes stray bugs 2021-09-11 01:28:49 -05:00
Schnayy
7121ae2383 Merge pull request #8283 from Cerebulon/StimulantSensitivity
Stimulant allergen for Tajaran
2021-09-10 10:13:13 -05:00
Cerebulon
a04e44433d helpful warning labels 2021-09-06 23:04:11 +01:00
Cerebulon
450e81132d Bar vendor cola bottle 2021-09-06 23:00:41 +01:00
Cerebulon
3b7cdc591f Stimulant allergen for Tajaran 2021-09-06 22:51:18 +01:00
Cerebulon
41b51e55f7 Misc runtime fixes 2021-09-06 19:40:48 +01:00
MistakeNot4892
f14907cdb9 Merge pull request #8203 from Cerebulon/food2021
Food Expansion
2021-09-03 11:55:26 +10: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
a567381931 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into food2021 2021-08-31 18:31:58 +01:00
MistakeNot4892
aa25456fcb Merge pull request #8236 from Cerebulon/wipedown
Allows wiping food off cutlery
2021-08-31 10:06:19 +10:00
Cerebulon
e2e54a7c8e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into food2021 2021-08-27 21:09:46 +01:00
Cerebulon
8a81e02c9c Requested changes, repaths peppermill 2021-08-27 21:08:17 +01:00
Cerebulon
1ac9d4fcc4 A Hint Of Lime 2021-08-26 18:03:24 +01:00
Cerebulon
f43c030924 Update drinks.dm 2021-08-23 16:22:57 +01:00
Cerebulon
22d073b193 Don't forget to wipe. 2021-08-23 14:41:07 +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
ee4cccf08e html 2021-08-10 00:30:06 +01:00
Cerebulon
7101189db3 final tweaks 2021-08-10 00:17:51 +01:00
Cerebulon
2368c341c0 and the rest 2021-08-09 23:24:00 +01: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
Cerebulon
18b6eeae21 Misc Vore-TG Port Ports 2021-07-13 03:30:04 +01:00
MarinaGryphon
ae1ec55bf3 Fixes utensils, adds variable scoop size (#8165)
* Fixes utensils, adds variable scoop size

* Update code/game/objects/items/weapons/material/kitchen.dm
2021-07-11 20:58:28 -09:00
MarinaGryphon
b634eb243f Removes unused var in select_recipe (#8151)
Iiiiiiiiiiiiiiiiiiiii should have caught this.
2021-06-20 17:11:14 -09: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
MarinaGryphon
4b964bb2da Indescribable! - A Food Flavor Fixing Pass (#8144)
* Indescribable! - A Food Flavor Fixing Pass
*You keep using that word. I do not think it means what you think it means.*
  - Food will no longer erroneously have double the nutriment it's supposed to.
  - Fixed a lot of invalid food nutriment tastes and spruced up some old ones.
  - Made all foods use `nutriment_amt` where applicable
  - Made those not applicable to the former use `nutriment_desc` when manually adding nutriment
  - Moved setting bitesize out of Initialize, because... why

* fixes stragglers
2021-06-20 11:49:14 -09:00
MarinaGryphon
c224b192a9 Improves select_recipe. (#8141)
* select_recipe improvement

Removes the call to Timsort and the recipe comparator proc;
uses a handrolled implementation of
`argmax(items + reagents + fruit)` instead.
This reduces the memory footprint of `select_recipe`
as well as the amount of processing needed to select the optimal recipe.

* angelogchay
2021-06-18 14:06:27 -09:00
MarinaGryphon
1672a51eff Refactors utensils to use weakrefs (#8140)
* Refactors utensils

* fixes + removes extraneous var

* fixes another missed arg
2021-06-18 14:01:35 -09:00
Ketrai
aea07924ef Makes the cake cheaper. 2021-06-12 12:40:54 +02:00
MarinaGryphon
f95bcd462d Fixes infinite loop following cooking error (#8118)
* Fixes infinite loop following cooking error

```
		while (select_recipe(available_recipes,C) == recipe)
			var/list/TR = list()
			TR += recipe.make_food(C)
```
This would never consume reagents due to an early return, meaning it would never terminate from the while loop. Clearing the reagents is an easy fix for something that will hopefully never happen, and avoids locking the server up if it does.
Also makes such failures obvious.
TODO: Unit test for recipes without results.

* Fixes/tweaks

* fix CI
2021-06-06 00:36:12 -09:00
ShadowLarkens
d1a081033d Initialize all vending products on server start & fix multiple food icons (#8102)
* Add icons for crablegs and crabmeat

* Build all vending machine inventories on startup (cursed)

* Fix cookie having no icon (convert everything to cookiesnack)

* Remove kabob with no actual definition

* Fix spicy burrito having no icon
2021-05-29 09:24:22 -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
Aronai Sieyes
9cd4a89782 SSpersistence tweaks (#8087)
* Add some 'lossy' smartfridges and options

* Convert persistence to JSON

* Update map_datum to specify persistence levels
2021-05-20 18:50:36 -09:00
klaasjared
1c7d9c4cba Food 4 thought (#8083)
* Adds Everything

* Small error fix

* Edit fix

* Update code/modules/food/food/snacks.dm

Co-authored-by: Greenjoe12345 <33647525+Greenjoe12345@users.noreply.github.com>

* Update code/modules/food/food/snacks.dm

Co-authored-by: Greenjoe12345 <33647525+Greenjoe12345@users.noreply.github.com>

* Edit Fix

* Vending Machine Fix

* More fixes

Co-authored-by: Greenjoe12345 <33647525+Greenjoe12345@users.noreply.github.com>
2021-05-20 18:11:19 -09:00
Atermonera
b123a4750b Adds persistent smartfridges for garden products, material sheets (#8042)
* Addsd sheet storage smartfridge
Implements persistent item storage

* Adds persistent produce smartfridge
Repaths smartfridge base type to /produce subtype

* Raises produce cap to 50, per staff meeting
2021-05-12 21:05:04 -09:00
klaasjared
64c7c62014 Drink Overhaul V1.2 (#8041)
* Adds Sprites

Adds the new bottled sprites for soda as well as some other additional drink sprites

* Added code and organization

Adds the code that'll modify the bottles as well as organizes the code that already exists

* Whoops - minor sprite error

Fixed the Schnapps sprites - forgot to change the 'alpha' of some pixels
2021-04-23 20:38:05 -09: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
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
135ccb7d69 Merge pull request #7981 from MistakeNot4892/cleanup
Minor cleanup.
2021-03-17 23:54:29 -09:00