Commit Graph

36 Commits

Author SHA1 Message Date
Pirouette
38e137f3c3 Adds new foods, both IRL and lore (#17745)
* tomixfood

* Update recipes_human.dm

* Update recipes_human.dm

* fixes blue raspberry issue

* Update code/game/objects/items/trash.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-11-13 19:50:09 +00:00
Cody Brittain
4e2b58f02a Added new drugs from lore and otherwise (#16773)
* Initial commit of new drugs

Start on caromeg and oracle

Further work on caromeg

Fix nicotine and caromeg

Begin populating map

Designer cocaine effects

Weaken heroin, Joy now causes genetic damage

Added an artificial alternative to morphine, tramarine, that can be used in its place.

Nerf new opioids, fix tramaline recipe

Added special mentholated adhomian cigarettes, for NKA cigarettes

General fixes

Fix recipe pathing

Add coca leaves, cocaine recipes, and coca drinks

Update Chemistry-Reagents-Medicine.dm

Null name for abstract drug class

Remove abstract_class from reagents (shouldn't be used there)

* Oracle sprites by Wezzy

* .

* Begin resolving issues from code review

* Remove all per-player data from drug singletons

* Resolve Arrow's code review

* Apply suggestions from code review

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

Update code/modules/hydroponics/seed_datums/smokables.dm

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

* Removed coca plants from the standard garden and hydroponics vendors (they remain as contraband and in the xenobotany garden)

* Fix merge conflict errors caused by snack PR

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-20 17:55:13 +00:00
RustingWithYou
0c5ea41216 Hivenet Electronic Warfare + Black K'ois Tweaks (#17234)
* hivenet emergency transmission

* no phoron + harder to remove

* a fuckton of stuff

* hive verbs

* hive admin verbs

* admin verbs again

* encrypt

* mute

* Camera Access, Neural Shock & More

* electronic warfare

* changelog

* changelog 2

* more changelog updates

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* Update html/changelogs/RustingWithYou - willofthequeens.yml

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* test failures begone

* ok, now test failures begone

* addresses requested changes

* more requested changes

* missing span classes

* fullshield

* traits!

* addresses requested changes

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/mob/living/carbon/carbon.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/admin/topic.dm

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

* Update code/modules/mob/living/carbon/human/human_powers.dm

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

* Update code/modules/organs/subtypes/vaurca.dm

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

* hivenet checks to proc, admin socket to var

* Update code/modules/organs/subtypes/vaurca.dm

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

* Update code/modules/organs/subtypes/vaurca.dm

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

* parasite.dm span fixes

* spacing

* purge a couple unnecessary returns

* fuck your spaces

* dominia is right bots should be destroyed

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-27 09:19:00 +00:00
Ramke
c16b98a568 the meal (#17014) 2023-08-07 10:12:28 +00:00
Doxxmedearly
2a1fe5acdb Fixes some plants not having growth stages (#16776) 2023-07-19 12:13:10 +00:00
Doxxmedearly
2ad8e7b482 Fixes mulitple invisible sprites (#16719)
* Fixes mulitple invisible sprites

* oh yeah we need these

* Cosmic Cape Fixes
2023-07-14 12:10:26 +00:00
WhatsUpBrotendo
68e3a9813e More Skrell food and drink (#16656)
* fixes seed packets

fjylozyn and wulumunusha seed packets should now exist

* skrell seed pack sprites

* skrell plant updates

* adds jylara to the snack machine

* skrell alcohol

* skrell drinks

* skrell food

* food sprites

* recipes

* drink sprites

* empty sprites

* reagents

* (some) skrell food options for lunchboxes

* changelog

* credit where credit's due

* haha oopsie! :3

rstweak doesn't exist

* Update drinks.dm

I made a trash item then realised I don't need a trash item, but forgot to delete the related code.
2023-07-11 01:51:09 +00:00
Butterrobber202
71cd97b2c4 Back in Black (#16517)
* Update mushrooms.dm

* Create koisrevival

* Rename koisrevival to koisrevival.yml
2023-07-02 09:55:31 +00:00
RustingWithYou
c80e65f58e fixes unathi plants (#16506) 2023-06-25 00:38:59 +00:00
Geeves
69a3cc7c49 Food Stuff (#16333)
* Food Stuff

* the aussies are ruining my life again
2023-05-17 11:52:32 +00:00
RustingWithYou
5799493c24 Unathi Plants (#16321)
* lizard plants

* lizard meals

* seeds in vendors

* changelog
2023-05-13 08:11:45 +00:00
TheDanseMacabre
2a0b326ade Some mob changes (#15737) 2023-02-08 11:28:49 +01:00
Sniblet
e7b5f5fc38 Revert "Adds k'ois contaminated phoron (1)" (#15719) 2023-02-04 03:05:29 +01:00
Sniblet
08010788a3 Adds k'ois contaminated phoron (1) (#15644) 2023-02-03 23:52:13 +01:00
Fluffy
04d89f212a Singletons + refactor of /datum/observ + refactor of /decl/ into /singleton/ (#15519) 2023-01-10 19:22:14 +01:00
Matt Atlas
b1869884c1 Revert "Singletons + refactor of /datum/observ (#15487)" (#15515) 2023-01-05 19:21:22 +01:00
Fluffy
0ddcf0817a Singletons + refactor of /datum/observ (#15487) 2023-01-05 18:41:40 +01:00
Alberyk
6a843ccf64 Adds a new sprite for the peanut (#15320) 2022-12-17 15:03:49 +01:00
SleepyGemmy
c1511cbc71 Changes Jargon to Nralakk (#14734) 2022-09-01 21:47:36 +02:00
listerla
4ab5fd409b Adds neaera foods and fjylozyn (#14566) 2022-08-14 21:38:01 +02:00
Roostercat12
a7b8b5fe0a Adds Grape Jelly and missing Condiment Bottles (#14499) 2022-08-06 16:55:38 +02:00
TheStryker
e90e6a635b Adds Konyanger food. (#14176) 2022-06-06 08:12:29 +02:00
Xxxxyobdab
f08b106522 Berry Redelightful (#12990) 2022-04-19 12:01:52 +02:00
sadkermit
79372075e8 Recreational Drug & Toxins Tweaks & Additions (#13129)
This took way too long.
2022-04-08 16:38:18 +02:00
VisVirific
b70ced9eff Peanuts, and Toasts, and More (#13209) 2022-02-25 18:34:50 +01:00
martinlyra
5a2f491a36 Unit-test kitchen tags in fruits & recipes (#12739) 2021-11-08 20:53:43 -03:00
Xxxxyobdab
c6abfb0653 Vanilla plant, extract, syrup (#12509) 2021-09-24 18:18:23 -03:00
Xxxxyobdab
3dac12ad68 Grapes, wine, mint, tea, coffee (#12485) 2021-09-22 22:47:11 +02:00
Casper3667
ad5c28f27d Adds several new taj food & recipes (#11930) 2021-05-22 21:38:09 -03:00
Geeves
051904d557 K'ois Spores Buff (#11641) 2021-04-18 12:47:15 +02:00
Doxxmedearly
2d912541ff Golden Apple and transmutation bugfix (#11095) 2021-02-01 09:36:45 +01:00
MarinaGryphon
c720e947ed /decl/chem (#10538) 2021-01-17 00:11:28 +02:00
Alberyk
100534dd97 Tajaran Consular Officer Updates: Diplomatic Incident Edition (#10228) 2020-10-14 17:40:36 -03:00
Alberyk
df11c39f37 Fixes the sugar tree candy recipe not working properly (#10231) 2020-10-11 18:31:21 -03:00
Geeves
d155132fa1 Aquaponics and Molluscs (#10067) 2020-10-03 13:48:29 +02:00
MarinaGryphon
f060df8b24 Cooking Update: Cooking Moona (#9454) 2020-09-02 10:49:14 +02:00