47296 Commits

Author SHA1 Message Date
MixityMaxity 6323ddd65b Replaces Providence Ruin relay with a powered off subtype (#32205)
* adds powered off relay subtype

* gives providence ruin power off relay
2026-07-09 03:13:37 +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
CRUNCH ac2d34eaab Adds Announcement Feedback to Brand Intelligence (#32170)
* Update brand_intelligence.dm

* Update brand_intelligence.dm

* Apply suggestions from alfalfascout's code review

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

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: Alan <alfalfascout@users.noreply.github.com>
2026-07-08 00:21:44 +00:00
Mirka-l eae8fbfde2 Fix simulated floor sprite (#32147)
* tile sprite fix

* fix for failed test

* del icon_state

---------

Co-authored-by: Mirka-l <mirkahadii@gmail.com>
2026-07-08 00:14:16 +00:00
Alan 0276cbfd54 Add wetsuits and a pair of towels to the athletic wardrobe. (#32160)
* Add wetsuits and a pair of towels to the athletic wardrobe.

* 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-08 00:13:20 +00:00
MixityMaxity 24ad1c0ac5 Resprites Circuit boards, adds unique sprites for mecha voicekits (#32161)
* resprites module.dmi

* gives unique sprites to mecha voicekits

* airlock electronics

* resprites bluespace array

* new robobrain and abductor upgrade sprites by ell good
2026-07-08 00:09:53 +00:00
Alan 5769a4197b Add beach-related supply crates. (#32162) 2026-07-08 00:08:24 +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 e5badf4a11 Remove large light tubes. (#32153)
* Allow large light tube printing in hacked autolathes.

* Remove large light tubes and several tube vars.
2026-07-07 23:47:33 +00:00
AurouraPlays eee30d7046 Fixes comma issues in Magistrate Simulator (#32195)
* 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

* Fixes comma issues in Magistrate Simulator

* Formatting 1

Co-authored-by: Zephyr <116982774+Burzah@users.noreply.github.com>
Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com>

* Formatting 2

Co-authored-by: Zephyr <116982774+Burzah@users.noreply.github.com>
Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com>

* Formatting 3

Co-authored-by: Zephyr <116982774+Burzah@users.noreply.github.com>
Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com>

* Formatting 4

Co-authored-by: Zephyr <116982774+Burzah@users.noreply.github.com>
Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com>

* Formatting 5

Co-authored-by: Zephyr <116982774+Burzah@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: Burzah <116982774+Burzah@users.noreply.github.com>
2026-07-07 23:46:26 +00:00
Alan 99310edc81 Add light replacer to utility belt, tweak sprite. (#32152) 2026-07-07 23:46:22 +00:00
Hayden Redacted 2f2a50c137 Adds Heavy Duty Cables to the YouTool Vendor (#32151) 2026-07-07 23:45:04 +00:00
CRUNCH 645945312f Gives Materials and Tech Levels to Tendril Loot (and moves them to the new attack chain) (#32134)
* Update tendril_loot.dm

* Update tendril_loot.dm

* Update tendril_loot.dm

* Update tendril_loot.dm

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-07-07 23:39:40 +00:00
serapher 52ca8b2c01 Adds a crafting hint to Tajaran veils' examine text (#32030)
* adds the veils to various places

* Revert "adds the veils to various places"

This reverts commit 504f789420.

* Adds a helpful description to Tajaran veils
2026-07-07 23:21:54 +00:00
Alan d78940d717 Update damage overlay when using nanopaste. (#32172) 2026-07-01 23:32:28 +00:00
Alan 3a5cbdb1f0 Allow autoclaving entire surgical tray. (#32155) 2026-07-01 23:29:38 +00:00
Alan 56775e8e2a Update hand hud on limb reattachment and unmutate. (#32146)
* Update hand hud when performing reattachment surgery.

* Fix hand hud on unmutate.
2026-07-01 23:28:11 +00:00
Alan 99c3082a75 Expand drink lists for random bottles and advanced diseases. (#32143) 2026-07-01 23:27:49 +00:00
Alan b13b9d91eb Migrate golem shell to the new attack chain. (#32141) 2026-07-01 23:26:25 +00:00
Alan 9d21c3d10a Update Skkulakin spines when changed in mirror. (#32140) 2026-07-01 23:26:10 +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
CRUNCH 514b053bdb Gives Workboots Actual Armour (#32138)
* Update misc_shoes.dm

* Update misc_shoes.dm

* Update misc_shoes.dm
2026-07-01 23:23:51 +00:00
CRUNCH 7b88c6eb5d Update outfit_admin.dm (#32137) 2026-07-01 23:18:21 +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
1080pCat d0d1f1bf71 Fixes ORM checking access for extracting materials if the ID wire is hacked (#32135)
* Update machine_redemption.dm

* lin*ers 😠
2026-07-01 23:17:33 +00:00
CRUNCH 45e149ddd3 Reworks the Wisp Latern (#32132)
* Update tendril_loot.dm

* Update tendril_loot.dm

* Update tendril_loot.dm

* Update tendril_loot.dm

* Update ashdragon_loot.dm

* Update tendril_loot.dm
2026-07-01 23:15:22 +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
Alan 82062b5d05 [s] Fix an exploit involving air alarms. (#32171)
* Fix an exploit involving air alarms.

* Apply sug

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-06-26 22:28:34 +00:00
CRUNCH b9b365e7fe allows silicons to examine turfs again (#32126) 2026-06-25 03:32:03 +00:00
Drsmail d336711755 Fix access checks for point redemption machines (#32125)
Co-authored-by: Kar4es <odnakotrove@gmail.com>
2026-06-25 03:31:46 +00:00
MixityMaxity a07c4a9bc9 adds "paved" floors (#32112) 2026-06-25 03:31:02 +00:00
MixityMaxity efdbf30f0c Raises IMS biotech level to 7 (#32107)
* raises IMS biotech level to 7

* adds origin tech to IMS
2026-06-25 03:30:31 +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 9d76cfee8e Fixes non-antags being able to exfiltrate (#32097)
* Fixes non-antags being able to exfiltrate

* Update code/modules/antagonists/_common/antag_exfiltration.dm

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

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-06-24 22:22:07 +00:00
PollardTheDragon 297312f075 Nian Caterpillar Adjustment (#32120)
* Fixes

* Variant
2026-06-24 22:20:54 +00:00
AurouraPlays 982a22500a Fixes the title of the Premium Havana Cigar Crate (#32129) 2026-06-24 22:19:13 +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
Alan 793143b810 Resprite HUD glasses for monitor heads. (#32089) 2026-06-15 22:47:50 +00:00
Mirka-l 99c7062d44 Fix for Icon State issues with Indestructible Walls (#32116)
* fix

* removing an extra call

* removing an extra call
2026-06-15 22:41:04 +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
Ahzpy 5825696ff3 Zombie Rebalance (#31658)
* tumor

* 45 to 40 seconds

* Update zombie_virus.dm

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

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2026-06-15 05:08:43 +00:00