7699 Commits

Author SHA1 Message Date
Alan 55731d405e Tweak flashlight messages and migrate to the new attack chain. (#32193)
* Tweak flashlight messages and migrate to the new attack chain.

* Call parent proc in activate_self() procs.

* Return ITEM_INTERACT_COMPLETE after eye check, add mob check to eye check.

* Apply some suggestions from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Apply other suggestions from CRUNCH review. Add CRUNCH flair.

* Apply additional suggestion from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Update other aperture message.

* Add fingerprints.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2026-07-17 06:31:24 +00:00
Alan d3bde6eef4 Migrate ashtrays to the new attack chain and tweak. (#32232)
* Migrate ashtrays to the new attack chain and tweak.

* Add fisher's fingerprint to ashtray too.

* Apply suggestions from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Add ashtray-fishing hint.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-07-17 06:30:04 +00:00
Alan 7285576335 Migrate body bags to the new attack chain. (#32231)
* Migrate body bags to the new attack chain.

* Skip wirecutter message if there's no tag to cut off.

* Tweak label cut message.

* Add and transfer fingerprints.
2026-07-17 06:29:32 +00:00
Alan 0afefe2a2e Migrate cardboard cutouts to the new attack chain. (#32230)
* Migrate cardboard cutouts to the new attack chain.

* Update messages in the spirit of CRUNCH revew.

* Add fingerprints.
2026-07-17 06:29:08 +00:00
Alan 5f2ecc5513 Migrate cosmetics to the new attack chain. (#32228)
* Migrate cosmetics to the new attack chain.

* Clean up code a bit more.

* Fix lipstick cap icon.

* Apply suggestions from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Add fingerprints.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-07-17 06:28:54 +00:00
Alan b7c0d81751 Migrate caution signs to the new attack chain. (#32227)
* Migrate caution signs to the new attack chain.

* Change sign explosion message to audible_message.

* Apply suggestions from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Add fingerprints.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-07-17 06:27:34 +00:00
Alan 2c7d140c79 Migrate flags, chess pieces, decorations, documents to new attack chain. (#32226)
* Migrate flags, chess pieces, decorations, documents to new attack chain.

* Apply suggestions from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Add fingerprints.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-07-17 06:24:43 +00:00
Alan dbb8902484 Migrate staff and horse broom to the new attack chain. (#32225)
* Migrate staff and horse broom to the new attack chain.

* Add fingerprints.
2026-07-17 06:23:55 +00:00
Alan 4bc3a6737b Migrate latex balloon to the new attack chain. (#32219)
* Migrate latex balloon to the new attack chain.

* Apply suggestion from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Hopefully clear CRLF error?

* Add fingerprint.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-07-17 06:23:04 +00:00
Alan 4c62c1c5b1 Migrate clown items to the new attack chain. (#32217)
* Migrate clown items to the new attack chain.

* Call parent in activate_self().

* Apply suggestion from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Add fingerprints.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-07-17 06:22:03 +00:00
Alan fac686542f Migrate courtroom items to the new attack chain. (#32216)
* Migrate courtroom items to the new attack chain.

* Apply suggestion from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Apply suggestion from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Add commas.

* Apply suggestion from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Add fingerprints.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-07-17 06:21:43 +00:00
Alan 59ee534680 Migrate slappers to the new attack chain. (#32214)
* Migrate slappers to the new attack chain.

* Apply suggestions from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-07-17 06:20:43 +00:00
Alan 3a9d3522b0 Migrate PAI data cable to the new attack chain. (#32213)
* Migrate PAI data cable to the new attack chain.

* Include paradise.dme.

* Apply suggestions from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Apply suggestion from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-07-17 06:20:36 +00:00
Alan f5b05aa16c Migrate candles to the new attack chain. (#32211)
* Migrate candles to the new attack chain.

* Add fingerprint.
2026-07-17 06:18:43 +00:00
Alan eb559ced05 Add Smith to station ID skins list. (#32210) 2026-07-17 06:18:24 +00:00
PollardTheDragon 24845b238a The Divine Flock - DaedalusDock Flockmind Port (#31984)
* Initial commit - FLOCKMIND - Probably has like a billion things to fix

* Do after conversions

* Config

* Moved the files, icon fixes

* Tick everything, language work, event, spawn landmark, role prefs, beginning mob port

* Spans and some other fixes. Also the tickening

* More tickening

* More fixes. Lots of fixes.

* More Fixes

* A whole lot more. Also flock TGUI.

* Fixes fixes fixes fixes fixes

* FIXES

* More fixes - PR ready, still needs a fuckton of testing

* Fixes

* fix incomplete upstream merge

* fix FlockPanel + sort button name

* TGUI review

* Fixes tealprint list

* Fixes

* More fixes

* Incapacitator Fix

* Filenames

* Linters

* Interceptor range buff

* Reagent counts

* Linters

* Fabricator vendor fix

* Keybinds and HUD - Flockdrones, Fixes Vendor Conversion, Cube Materials

* Reworks reagent, adds flock grilles, fixes compute node overlays

* Intent-based flockdrone parts

* Intent based drone parts

* Radial control panel for controlling drones manually, phasing through windows/grilles

* Movement fixes

* Radio talk power, stare fix

* Flock health HUD

* Fixes flock lights, linters

* Unit tests

* Adds countdown to relay

* Relay improvements

* Small fix

* Logic Schmogic

* Relay overlay and looping sound effect

* Ignore air when converting turfs

* Cage fixes and improvements

* Improved flock bolt

* Turret conversions

* Flock bolts taze simple or basic mobs

* Sentience type

* Fixe

* Linter

* tgui review stage 2

* Concentrated Repair Burst

* Improves radio detection

* Removes extra space

* Adds healing visual effect

* Cube tech levels

* Ghooost

* Excess

* Flock doors, chairs, lattices. Centralizes conversion code.  Crafting with Gnesis

* Update code/modules/antagonists/flockmind/ai_behaviors/flock_wander.dm

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

* Fixes the fix

* Astar movement detection

* Fix, extraneous code, language stuff

* Language fixes and wander fix

* Fixes

* Another fix

* Lints

* Another linter

* Language improvement

* More language improvements

* Time requirement and appearing in orbit menu as an antag

* Cube glow

* TGUI

* Minicache

* Linters

* Grammar

* Material ID fix

* Lid fix

* Reagent turf reaction

* Reagent fix

* Butcher results

* Conversion rates

* Flock stare fix

* Fixes stare behavior

* Staring

* Flock mob blood

* Flock mobs gibs and blood. Also some runtime fixes

* Flock mobs now resist out of grabs, buckles, lockers, and more

* Fixes flock orbit, fixes a runtime I think,

* Target mechs, damage mechs, other bug fixes

* Cage fix

* Cage resist change

* Some mind changes, gatecrash buff

* Drones now shoot mechs, stare improvement

* Cut down on spam a little

* Nest fix

* No more resist spam

* Fixed drone death control

* Resist statement

* Makes the relay alarm scarier

* Fixes dead flock camera mobs having no ghost sprite, something with ghosting

* Enhanced flockphasing

* Improved flockmob pathing

* Added required turf restriction to relay

* Increased needed bandwidth for relay construction

* Nerfed drone substrate rate

* Added new status tab items for relay progress

* Another relay cost adjustment

* Improves drone AI responsiveness

* Computer frames now become flock computers

* Improves target finding for conversion, building, and replicating

* Reduced flock event pop requirements

* Adjusts flock protection on structures. Adjusts overlays.

* Relay unlock tweak

* Fixwes flock being able to gib mech'd AIs with one button

* Map conflict

* Flock can no longer be outed by merely existing

* Fied bug causing drones to shoot themselves

* Prevents mobs from attacking while in a cage

* Converter tool can now open closets and crates.

* Adds descriptions to flockdrone tools.

* More informatic blurbs

* Adds xenobiology organs

* Organ lint

* TGUI merge

* bundle and mm

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Toastical <20125180+Toastical@users.noreply.github.com>
Co-authored-by: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2026-07-08 21:31:28 +00:00
Alan ab05a4ee3a Allow collaring foxes. Migrate collars to new attack chain. (#32188)
* Allow collaring foxes. Migrate collars to new attack chain.

* Apply suggestions from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-07-08 21:20:58 +00:00
Alan 08a1331e50 Migrate welding tools to the new attack chain. (#32169)
* Migrate welding tools to the new attack chain.

* Apply suggestions from CRUNCH review.
2026-07-08 00:25:14 +00:00
PollardTheDragon a909395bfc Adds suture and mesh packs (#32154)
* Adds suture and mesh packs

* Fixes, unmedicated needles and mesh
2026-07-07 23:48:47 +00:00
Alan 99310edc81 Add light replacer to utility belt, tweak sprite. (#32152) 2026-07-07 23:46:22 +00:00
Alan d78940d717 Update damage overlay when using nanopaste. (#32172) 2026-07-01 23:32:28 +00:00
Alan 99c3082a75 Expand drink lists for random bottles and advanced diseases. (#32143) 2026-07-01 23:27:49 +00:00
CRUNCH e694ab9ebf Updates TSF Marine Loadouts (#32139)
* marine gear

* Update outfit_admin.dm

* Update pda.dmi
2026-07-01 23:24:16 +00:00
MixityMaxity f7ba75e2d8 Resprites wallets, adds new wallet variants (#32136)
* new wallets

* fix id hanging

* adds pink and TSF variants - suggested

* adds crafting recipe for suggested wallets
2026-07-01 23:17:52 +00:00
CRUNCH f994362515 Adds Floor Lore (#32128)
* Adds floor lore

* Update code/game/turfs/simulated/floor/fancy_floor.dm

Co-authored-by: iramoye <projecteternal1@gmail.com>
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>

* changes the test to give the correct result

* Update indestructible.dm

* Update indestructible.dm

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: iramoye <projecteternal1@gmail.com>
2026-07-01 23:14:53 +00:00
AurouraPlays 98559dc063 Adds a new arcade game - NT Magistrate Simulator (#32111)
* Adds securitysim.dm, haven't yet changed anything from the default recruiter.dm

* Adds the relevant circuit board.

* Stage 1 of rewriting the code

* Renames securitysim.dmm to lawyersim.dmm to match the typepath

* Updates the DME with the new machine

* Reverting a change for testing purposes

* Adds the arcade machine to boxstation with a placeholder sprite for prototype testing

* Finished changing variable names preventing execution

* Adds a UI for the arcade game

* TGUI stuff

* Just a test

* Undoing testing

* Annother test

* Reverting test again

* Removes emagging and changes some wording

* Adds sprites

* Changes the sprite in the .dm to the new sprite.

* Adds random crime generation.

* Fixes the screwed-up RNG stuff

* Adds math and logic for sentencing calculation

* Fixes temporary sentences

* Adds in the "Manner of Arrest" text blurbs.

* Missed a comma.

* Minor grammar fixes

* Corrects a couple issues in the tgui menu.

* Updating branch to match main

* Reverts boxstation, preparing for official mapping

* Maps the arcade into every map

* Adds missing stolls and spawns in arcade remodels

* Making requested changes, part 1

* Prevents duplicate crimes

* Cleans up leftover placeholders

* Fixes apostrophe issues in TGUI

* Adds prevention for same-code crimes

* prettier maybe

* prettier maybe now

* bundle, fuck you tgui

* SPACES SUCK

* DIE, SPACES, DIE!

* Fixes DIRT! DIRT OF ALL THINGS! WHY IS THAT A PROBLEM!

* DIRT! AGAIN!

* Adds variable documentation

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2026-07-01 23:14:35 +00:00
Alan 7512a0b4f8 Limit robot part appearance choice list to valid ones. (#32085)
* Limit robot part appearance choice list to valid ones.

* Include appearance customization surgery.

* Apply suggestion from review.

* Revert "Apply suggestion from review."

This reverts commit 29fe67e4c5.

* Migrate robot parts to the new attack chain.

* Call parent in /obj/item/robot_parts/activate_self().

* Apply suggestions from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-07-01 23:13:30 +00:00
Alan 4c7e65d7b2 Allow simply putting soap/mop/rag in storage if clean. (#32092)
* Allow simply putting soap/mop/rag in storage if clean.

* Apply 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>
2026-07-01 23:13:20 +00:00
MixityMaxity a07c4a9bc9 adds "paved" floors (#32112) 2026-06-25 03:31:02 +00:00
MixityMaxity c08398b844 Combines Laser Scalpels (#32106)
* combines laser scalpels

* whoops, .1 off

* i blame hayden

* reverts IMS level change for atomicity

* fix design ID and adds origin tech

* lowers magnet origin tech by 1

* nevermind im stupid
2026-06-25 03:29:59 +00:00
CRUNCH 4422c6c125 Gives tech levels to all chameleon items (#32104)
* gives tech to chameleon items

* Update chameleonproj.dm
2026-06-25 03:29:07 +00:00
Alan 1d62aa048e Make round tuit spawns rarer, more varied, pocketable. (#32093) 2026-06-25 03:26:52 +00:00
PollardTheDragon 4d5b0e1286 Crashed Vulpkanin Ship - Lavaland Ruin (#32110)
* Charon's Revolver

* Dog tags

* Ash Whelps

* Ash walkers and resist adjustment

* Some providence stuff

* Minor wording adjustment

* Desc change

* Ruin, salvage, and ruin assets

* linters

* Mo linters

* quick

* Various fixes

* Variety of fixes

* Update

* Naming

* FIX
2026-06-24 22:37:10 +00:00
PollardTheDragon 5a446efbec Adds 'Prospector' Mining Turrets (#32108)
* Adds 'Prospector' Mining Turrets

* Linters
2026-06-24 22:17:48 +00:00
PollardTheDragon 8f654dfcc7 Adds Kidan Ship Ruin (#32081)
* Kidan Warriors

* Linters

* Kidan mob AI adjustments and stat adjustments. Kidan Princess Megafauna

* Bug spray vulnerability

* Ragnarok props and kidan spear update

* The ship

* Fixes and adjustments

* Map update

* Linters
2026-06-24 21:49:27 +00:00
MixityMaxity c086a1df7a Improves the Health Analyzer sprite (#32063)
* Sprites!

* upgrade sprite

* makes advanced analzyer not an overlay

* deletes the old advanced overlay

* deletes the old advanced overlay

* Somehow deleted the fine scanner whoops
2026-06-15 22:40:03 +00:00
AurouraPlays 53c9cbec6b Removes recipe conflict between Vampiro and Margarita (#32095)
* Removes recipe conflict between Vampiro and Tequila

* Fixes the amount of Vampiro returned to match the sum of its parts.

* Fixes Tequila Sunrise's ID in the vampiro recipe

* Correcting formatting in manuals.dm

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

---------

Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com>
Co-authored-by: Alan <alfalfascout@users.noreply.github.com>
2026-06-13 22:19:08 +00:00
AurouraPlays 5657dcdb89 Adds Strawberry Daiquiri and Miami Vice. (#32069)
* Adds Strawberry Daiquiri and Miami Vice.

* Fixes the amout returned in the Miami Vice to equal the sum of its parts, and increases the alcohol percentage.

* Adds Strawberry Daiquiri and Miami Vice to the drinks manual.

* Corrects the formatting and alphabetization of manuals.dm entries.
2026-06-13 22:18:52 +00:00
Christer2222 7e64a2b9b8 Irradiated mouse tweaks (#32062)
* cheese heal

* admin spawned test fix

* brute kits no longer heal

* increased alpha

* lowered inherent radiation

* rad spike on eat + moved admin spawned check

* 20k rads on eat + moved brute pack logic
2026-06-13 22:07:01 +00:00
CRUNCH 5786470976 Update RCL.dm (#32052) 2026-06-13 22:06:27 +00:00
Alan f0f7ccf5ba Add the ability to install headsets in desk bells. (#32056)
* Add the ability to install headsets in desk bells.

* Update autosay proc to allow for emoting.
2026-06-11 00:59:44 +00:00
Alan 9c721c5be3 Allow crafting clown boxes from single sheets of cardboard. (#32035) 2026-06-02 00:10:21 +00:00
CRUNCH 34acc9eab3 Fixes the RCL sometimes deleting itself when use() checks are called. (#32026)
* destroy upon empty general stack check

* Update stack.dm
2026-06-02 00:07:28 +00:00
Alan 25aac32c63 Migrate /obj/item/assembly to the new attack chain. (#31987)
* Migrate /obj/item/assembly to the new attack chain.

* Migrate more procs.

* Add parent calls to activate_self().

* Add parent call to activate_self() in noise sensor.

* Apply CRUNCH's style suggestions.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Change igniter attack to interact_with_atom().

* Restore assembly UIs.

* Ensure assembly interact procs fire, ensure fingerprints.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-05-17 18:42:49 +00:00
Toastical 937e251683 migrate /mob/living/silicon to Initialize() (#31934)
* migrate /mob/living/silicon to Initialize()

* fix some arg calls for spawning borgs

* remove even more args from robot Initialize
2026-05-17 10:37:33 +00:00
PollardTheDragon 6b9c333636 Adds Security Fines (#31857)
* Adds Fines

* Forgot one

* Enhanced Clarity

* Fixes issue with linked account

* If no crime stated, states in the fine message

* Updates fine scanner sprite

* Updates fine scanner behavior

* Adds comment to records

* Apply suggestions from code review

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

* Removes capitalization

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2026-05-17 09:45:07 +00:00
Alan e3e6bae1c9 Add drinks and recipes from Hispania! (#31983)
* Add drinks and recipes from Hispania!

* Fix duplicate var in bottle.dm. Thanks, linters!

* Add fitness cups to stations, BSH loot.

* Dull some glass rims that don't need to be quite that bright.
2026-05-15 14:56:42 +00:00
CRUNCH 8fe4bf5ded blind cane craft (#31962) 2026-05-13 22:11:06 +00:00
Alan d1dad9a639 Import several foods and recipes from Hispania! (#31831)
* Import several foods and recipes from Hispania!

* Fix trailing newlines, remove hispania icon reference.

* Fix list spacing, add drink reagents, correct annona spelling.

* Amend drink description, move icons

* Apply new timer from @CRUNCH-Borg

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Apply @CRUNCH-Borg's attack chain suggestions

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Fix many duplicate vars.

* Fix more duplicate vars.

* Remove duplicate toast.

* Fix unreachable callback. Now with @CRUNCH-Borg!

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Amend some icons.

* Add vendor seeds, tweak plant sprites.
- Add base seeds to MegaSeed Servitor.
- Change smoked salmon sushi to use smoked salmon instead of salmon steak.
- Make maize dough yellower.
- Fix capitalization in peyote description.
- Make coconut inedible.
- Modify cream cheese recipe to remove conflict with butter.
- Tweak sprites of growing plants to sit inside hydroponics trays and not move around so much.

* Add guacamole recipe, agave distill reagent.
- Add prep bowl recipe for guacamole, condiment container and icons.
- Change cactus salad icon to use new plastic cup shape.
- Add distill reagent "tequila" to agave.
- Make coconuts only attack on harm intent.
- Fix some whitespace.

* Prevent bombonuts from detonating instantly.

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

* Spellcheck.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Change some item names, descriptions, recipes.
- Make custom robot head recipe step so that those recipes don't just call for "a head".
- Replace smoked salmon sushi ingredient with new smoked salmon.
- Fix some confusing item names.
- Update descriptions of cacti.
- Add raw mouse as mouse butchering result.

* Modify reagent colors. Make cream cheese bread with cream cheese.

* Adjust some recipes and descriptions.
- Remove hipster ridicule from mate. Add it as a reagent to the plant.
- Touch up some grammar.
- Amend recipe for sweet arepas.

* Fix grown food slicing debug message.

* Grammar improvements feat. CRUNCH

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2026-05-07 21:01:26 +00:00
unknownuser782 13c3cc803c Ape Uprising (#31609)
* Allow monkey-like species to craft

* Add signal for mobs entering vents

* Implement basic uplifted antag datum & nest

* Make phrasing nicer

* Allow primitive species to vary & add time requirements

* Add spawning functionality to nest

* Make primitives unable to be humanised a little less violently

* Fix linter complaints

* Fix typo which made the linter mad

* Add objectives and antag teams

* Make nests consider other nests for spawn limit

* Add greeting text

* Add guaranteed early spawns

* Allow deconstruction of nests & recovery of scrap

* Allow uplifted mobs to ventcrawl with small items

* Clarify nest spawning conditions on examine

* Tweak NPC numbers & AI

* Add obtain objective and give an extra objective

* Give thanks to the linter

* Change team objective & make the alert nicer

* Make event only spawn monkeys by default

* Add examine text explaining deconstruction

* Allow ghosts to see nest materials

* Handle stacks properly in nest deconstruction

* Add on-demand ghost spawn to reduce roll spam

* Add nest crafting

* Allow lesser mobs to use medical stacks

I don't believe this should affect anything else, as every other mob capable of holding these items is an advanced tool user.

* Add hint about crafting on examine

* Ensure only nest monkeys retaliate to nest damage

* Add uplifted primitive nests to the spawners menu
2026-05-07 05:03:30 +00:00