Commit Graph

2900 Commits

Author SHA1 Message Date
Gatchapod
99bdc91ac2 Expansion of Chemmaster 3000 capabilities + minor QoL for chemistry equipment (#31296)
* Beginning

* Buffer works, alt-click

* ChemMaster mostly done

* Should be ready

* tgui rebuild

* Purging some debug code

* Hello map tests let me pass

* AltClick now works better

* TGUI

* Replace incapacitated()

* Missed one

* Stupid typos

* Replacing locs

---------

Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
2026-01-21 14:27:33 +00:00
Alan
8f87fa0b98 Add juice boxes. (#31331)
* Add juice boxes.
- Include juice boxes in packed lunches quirk.
- Make juice names and drink names in drinks_reagents.dm more consistent.

* Appease linters with static typing?

* Add juice box box. It's a variety pack.

* Add trailing commas to positive quirks as requested.

* Add random juice box spawners.
- Spawn random and specified juice boxes on station maps.
- Spawn partial juice variety packs on station maps.

* Add juice box variety pack supply crate.

* Make juice box storage even fancier.

* Thanks, linters!

* Thanks, linters! part 2

* Give the pre-packaged juice boxes a brand name.

* Apply whitespace suggestion from review.

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-12-30 05:32:56 +00:00
DGamerL
47f9d5a2ef Kidney overhaul (#31324)
* The Kidneying

* Oculine
2025-12-29 05:21:28 +00:00
PollardTheDragon
a590870d00 Monke Business - Ports monkey AI from TG (#31067)
* Monke Mode

* Punch

* Some comment stuff

* Linters, excess

* Linters

* Emote stuff

* Pause monkey AI during do afters

* Small improvements

* Oops

* Fixes monkeys trying to drink forever from a glass

* Knockdowns and stamcrit fixes

* Removes eating/drinking from Pun Pun

* Monkey controller improvement, bug fix

* Fixes monkey item giving

* Fixes brain swaps

* Fixes

* Update code/datums/ai/monkey/monkey_controller.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Addresses code review

* Oops

* Oops round 2

* Fixes monkeys staying in trip mode when evolved

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-12-26 22:44:52 +00:00
CRUNCH
eeb980f191 Adds Reycleable Materials to a Bunch of Objects (#31320)
* recycle

* moar

* Update glass_containers.dm

* Update spray.dm

* cost adjustment because sheets are 2000, not 1000

* Update hydroitemdefines.dm

* Update hydroitemdefines.dm
2025-12-25 21:03:22 +00:00
Wenlock_The_British_Hobo
a3bb94b905 Cannibalism Update™️ (#31142)
* dmi time

* .dmi stuff done, maybe

* Created cannibalism.dm and moved KFV's obj stuff.

* Update cannibalism.dm

* Wild Wings and Bug Bar

* A few more.

* Meow Mein

* Lead and Plasma-Bone Broth

* Multiple possible sprites.

* Last food item. Next recipes and the Bone Rod.

* Adding bone rod sprites and sprites for bone rod variants of food with metal rods in them

* Fix complaining of the compiler.

* Bone Rods

* Almost everything done.

* Bone Rods ticked.

* dme updated on compile.

* Forgor the BBQ variant of Moffolo Wings needed a unique path.

* Probably make Plasma-Bone Broth flammable like plasma sheets.

* Should light now, will test later.

* Some recipes, and processor.

* Processor was complaining, also changed a parameter to be readable.

* More bone rod.

* The rest of them.

* No more errors on compile.

* Recipes tested and things fixed.

* Lead works.

* Kidneys dead? Toxin.

* Soy Sauce in the Meow Mein.

* Working sprite RNG.

* Make Linters happy

* Apply suggestions from CRUNCH's code review to fix Plasma-Bone Broth's flame.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Make linters happy

* Updated bone rod description to be less vague.

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* More descriptive recipe names in code

* Replace Meow Mein sprites with Feline Mignon

I'll see about using the Meow Mein sprite for chef craftable Chow Mein, as the issue is with Meow Mein not the sprite.

* Change code from Meow Mein to Feline Mignon

* Don't need the blank recipe list in this PR.

* Update code/game/objects/items/stacks/bone_rods.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/stacks/bone_rods.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-12-24 20:21:36 +00:00
Toastical
ff1f7c2556 fix slime blood not transfusing to vampires (#31314)
* fix slime blood not transfusing to vampires

* fix non-vampire slime transfusion

* santa claus but it's a guard
2025-12-19 13:23:36 +00:00
Alan
9a30586488 Add a cooldown to Bubbly Beep's drink message. (#31228) 2025-12-16 07:56:08 +00:00
kyunkyunkyun
b0463d3c83 Convert most spans to defines (#31080)
* spanish?

* aaaagain

* keep maptext

* Update robot_items.dm

* Update span_defines.dm

* compiles

* Update silicon_mob.dm

* compile
2025-12-13 23:55:48 +00:00
Alan
a2557daaa4 Add bubble tea flavor overlays. (#31182)
* Add bubble tea flavor overlays.

* Thanks, linters!

* Apply suggestions from review.

* Fix duplicated reagent color; Thanks linters.

* Remove identical reagent color. Again.

* Apply suggestion from review.
2025-12-10 00:07:45 +00:00
Alan
158000c8fa Change reagent color of syndicate bomb. (#31187) 2025-12-04 21:48:26 +00:00
Alan
118e76f7ea Change beverage colors in code to match sprites. (#31181) 2025-12-04 19:54:24 +00:00
Alan
c7ac9f1037 Add soft drinks to bar secondary goals. (#31100)
* Add soft drinks to bar secondary goals.

* Thanks, linters!

* Update bar manual to reflect that procurement will accept soft drinks.

* Add drink difficulties to synthetic soft drinks.
Amend bar manual.

* Thanks, linters!
2025-12-03 18:31:30 +00:00
Alan
dbd2101d34 Fix missing icon for tapioca pearls in drinking glass. (#31169) 2025-12-02 09:49:45 +00:00
funglios8s
6a6f81131e Adds Tapioca and Cassava plants (#30937)
* dat

* Fixes a few issues and makes the pudding look good

* fixes all sprites with hope

* actually should fix the sprites

* fixes cassava sprites and dough recipe oversight

* fixes tabbing issues and prevents botany gaming

* makes the linter happier + deletes duplicate file

* changes many things about the order

* generalizes the food reagentcontainer + linter gud

* fixes the merge conflict

* removes the settings on my vs code from my pr

Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com>

* Adds suggested changes

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com>

* adds an abstract description

* fixes an accidental deletion of vscodesettings

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com>

* adds a missing typepath

* Apply suggestions from code review

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com>

* Propose 2 tapioca pudding sprites.

* removes unused tapioca pudding sprite

* fixes my paradise.dme file

* Add new teas to the bar manual.

* adds alfalfa scout's recommended mix message

* attempts a fix for the .dme file

* removes a deconflicter mistake

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com>

---------

Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
2025-12-01 19:12:50 +00:00
Arthri
4f7a03e257 Fix ChemMaster custom input (#31069)
* Move chem_master to tgui inputs

* Fix state bug in ComplexModal

* Build /tg/ui

* Remove isgoodnumber

* rerun CI

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
2025-11-30 02:46:56 +00:00
Alan
b29d968148 Add 23 new drinks; update bar manual. (#31026)
* Add 23 new drinks; update bar manual.
- Add three new drinks that use the beet shrub and their effects
- Add nine new synthanolic drinks and their effects
- Add two new soft drinks for both synthetic and organic customers, and their effects
- Add 10 new soft drinks for synthetic customers and their effects
- Add decals for reagent splashes and drips
- Update bar manual to include these drinks as well as all other mixed drinks currently on the wiki
- Add new sprite for welding fuel in a glass to reflect the liquid's color instead of Dr. Gibb
- Add chemistry recipes to mix electrolytes
- Change Robot Tears' drink difficulty to easy, to reflect the loss of ubiquitous oil tanks
- Add many, many puns, both visual and in written text

* Thanks, linters!

* Thanks, linters! (part 2)

* Thanks, linters! (part 3)

* Incorporate review suggestions.
- Add reagents to the zero day drips
- Rewrite many if statements to be early returns/continues
- Use nutrition defines
- Make hard and soft reset also purge themselves (my choice)

* Update dryer martini sprite to match proposal #31050

* Incorporate review suggestions.
- Remove reagents, weren't needed.
- Make sure basecolor is applied.
- Convert more if-blocks to early returns.
- Adjust spacing in function calls to match standard.

* Implement whitespace suggestions from review.
2025-11-26 21:24:06 +00:00
Alan
ae642762fc Resprite martini glass drinks, cherry shakes, puddings. (#31050) 2025-11-26 20:13:35 +00:00
Alan
6192180e4f Tweak new soft drink effects. (#30979)
* Tweak new soft drink effects.

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-11-23 03:06:59 +00:00
kyunkyunkyun
f96b26b75a /obj/item/projectile --> /obj/projectile (#30411)
* yers

* vars

* map changes

* some comments (clearly not stolen from items)

* fix component

* summary
2025-11-12 10:23:20 +00:00
JimKil3
b61cc19628 fix (#30955) 2025-11-10 18:14:05 +00:00
Alan
95a22490ae Add ginger ale. (#30915)
* Add ginger ale.

* Change name of ginger ale can to Zingiber Gold.
2025-11-10 16:37:19 +00:00
JimKil3
b49a6b86ab change (#30941) 2025-11-10 12:56:23 +00:00
CRUNCH
707c75fbd8 Buffs Species Drinks (#30613)
* Update alcohol.dm

* Update alcohol.dm

* drinks

* Update alcohol.dm

* Update alcohol.dm

* Update alcohol.dm

* WIP

* Fixed everything 😎

* Signal handler

* Update code/modules/reagents/chemistry/reagents/alcohol.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/alcohol.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-11-06 05:49:11 +00:00
CRUNCH
990f04d961 Update drinks_reagents.dm (#30790) 2025-11-03 10:39:22 +00:00
Alan
b2e34ff79c Add 17 new soft drinks and their recipes. (#30717)
* Add 17 new soft drinks and their recipes.

* Add mix messages, tweak egg coffee sprite.

* Incorporate suggestions from review.
2025-11-03 10:32:23 +00:00
PollardTheDragon
ae4489cb2f Converts bees to basic mobs (#30662)
* Converts bees to basic mobs

* Undefs

* Linters
2025-10-28 20:53:18 +00:00
JimKil3
0f250ed33d oops (#30743) 2025-10-28 11:08:24 +00:00
AmityBlamity
1b616b3f25 Spelling, grammar, and Britishism fixes for food and drink (#30664)
* Spelling, grammar, and Britishism fixes

* Update code/modules/food_and_drinks/food/condiment.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: AmityBlamity <142629851+AmityBlamity@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/customizables.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: AmityBlamity <142629851+AmityBlamity@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/food_reagents.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: AmityBlamity <142629851+AmityBlamity@users.noreply.github.com>

---------

Signed-off-by: AmityBlamity <142629851+AmityBlamity@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
2025-10-26 13:06:11 +00:00
Alan
3134338d04 Make chem dispensers appear off when they have no power. (#30679) 2025-10-26 13:05:31 +00:00
CRUNCH
da1f812bc7 Update reagentgrinder.dm (#30734) 2025-10-26 13:02:59 +00:00
kyunkyunkyun
3d121511ec cleanup (#30405) 2025-10-23 10:49:57 +00:00
hyperholy
203f82dc3c Improves spray bottles reagent dividing (#30667)
* fixes the things

* i think it works now

* lets not make infinite reagents actually

* clamping is smarter
2025-10-21 18:44:23 +00:00
JimKil3
e5832d6d1f Makes sutures and regenerative mesh craftable (#30556)
* gauze/ointment changes
Changes gauze and ointment's recipe back to using sterilizine, nerfs their healing (they both serve other purposes)

* yummy microplastics
Makes plastic require cooling to solidify into sheets

* the rest of the PR

* oops

* what was he cooking

* Apply suggestions from code review

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* plastic volume

---------

Signed-off-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-10-11 15:58:24 +00:00
CRUNCH
00244358c9 Update slime_extracts.dm (#30624) 2025-10-08 19:32:52 +00:00
warriorstar-orion
d9717041da don't let slimes spawn abstract burgers (#30625) 2025-10-08 19:31:47 +00:00
Qwertytoforty
cd3ee6ab90 fixes xenomicrobes (#30622) 2025-10-07 19:13:21 +00:00
CRUNCH
d1d1393ee2 Adds Glass Sandwiches and Supermatter Sandwiches (#30435)
* glass sammich

* Update cutting_board_recipes.dm

* yummy

* Update test_tiny.dmm

* Update test_tiny.dmm

* Update toxins.dm

* Update test_tiny.dmm

* Update test_tiny.dmm

* Update test_tiny.dmm

* Update test_tiny.dmm

* Revert "yummy"

This reverts commit b2a5736618.

* yummy but without test tiny shit

* Update cooking_container.dm

* isolate sliver handling to a recipe step

* fix

---------

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-10-04 17:20:21 +00:00
Alan
d371951ee9 Remove cable coil from upgraded chem dispenser drops. (#30573) 2025-10-03 02:07:42 +00:00
iramoye
36c57dafb1 init (#30575) 2025-10-01 16:20:43 +00:00
PollardTheDragon
e14a43eea1 Basic diona nymphs, spiderbots, and crabs (#30377)
* Basic nymphs, spiderbots, and crabs

* Nutrition fix

* Forgot a line

* Cooldown on eat

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-10-01 14:32:00 +00:00
iramoye
3cc5de1a94 Init (#30565) 2025-09-28 16:32:20 +00:00
kyunkyunkyun
99626b8121 fix (#30456) 2025-09-24 13:05:41 +00:00
kyunkyunkyun
83509c3967 Some more armor tweaks (#30398)
* summary

* (required)

* undef

* oh this is unused, nice

* ok but.. why

* a tiny bit more

* Update human_defense.dm

* Update mass_hallucination.dm
2025-09-19 15:43:42 +00:00
Osetrokarasek
b9581ce380 Adds New "Carcinoma Angel" Cigs (#30338)
* vkfdnvhy

- Added "Densed Nicotine" reagent, which is similiar to Nicotine, but has lower overdose threshold, is not addictive and also deals minor lung damage, makes people cough, sends evil messages to user
- Added "Carcinoma Angel" cigs which contains "Densed Nicotine". They can be found in hacked or syndie/beach cigarette vendors or in maints as loot.

* Update drugs.dm

* Apply suggestions from code review

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

* cough... new()...

* Update cigs.dm

* Update fancy.dm

* Update drugs.dm

* Update cigarettes.dmi

* Update cigarettes.dmi

* Update cigarettes.dmi

* Revert "Update cigarettes.dmi"

This reverts commit 831790523e.

* Update cigarettes.dmi

---------

Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
2025-09-19 14:24:59 +00:00
warriorstar-orion
3208049a8a Attack chain migration: structures. (#30365)
* Attack chain migration: structures.

* whoops

* wth
2025-09-14 19:21:36 +00:00
kyunkyunkyun
8821ab9a66 Updates a couple of /obj/item variables (#29829)
* compiles checkpoint

* fix some

* updatepaths

* fix

* rrr

* linters

* fiexs

* icon fixes

* plasmemes

* fix

* fix

* fix bit more

* fix

* well

* cleanup

* fix glasses layer

* conflict

* fuck gun code

* fixes

* fix

* fixes to energy guns

* review

* conflict

* support that 1 unathi pixel

* fix
2025-09-14 15:23:56 +00:00
Alan
619c440436 Add melonade. (#30265) 2025-09-11 03:07:52 +00:00
kyunkyunkyun
67bf9ea40b exploit fix (#30416) 2025-09-09 13:51:02 +00:00
PopeDaveThe3th
6330252351 Redoes tank descriptions (#30310)
* deep lore

* Update code/modules/reagents/reagent_dispenser.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2025-09-07 05:44:05 +00:00