50320 Commits

Author SHA1 Message Date
Eli 452efce1a8 Fixed belly display name (#19600) 2026-07-11 13:13:17 +02:00
Will 27aab60031 fix (#19601) 2026-07-11 05:57:56 -04:00
Cameron Lennox 78ee44b05b Material hotfix (#19599)
* Moves MISC to proper spot

Moves table frames to being in furn out from misc.

Gets rid of a duplicate ladder assembly.

* Reflector
2026-07-11 05:10:49 -04:00
Cameron Lennox 69f538e892 Shock and Trauma adjustments & additions (#19583)
* Gets rid of trauma_mod

* Update life.dm

* Update life.dm

* Update life.dm

* Update positive.dm

* Apply suggestion from @Cameron-The-Raven
2026-07-11 05:05:33 -04:00
Will 38662f1865 Fix turf slip value persisting through turf change (#19597)
* fix that

* Update turf_changing.dm

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2026-07-10 23:44:15 +02:00
WolvesAndOwls b17541e91d Capture cryatal tweaks (#19593)
* Fix mob eating food pathway

* Remove redundant alert

* Moved eating message to better location

* Add capturing edge case

* Fix Capture crystal OOC Escape to stop CC ruining.

* Better OOC Fix for Caprture crystals

* Logic check

* Sync changes on branch Capture-crystal-tweaks

* Manual merge with upstream

* Added a very neccesary and time consuming "Space"

* 4 more Spaces added to the commit

* Cleared up admin log

* Spellcheck
2026-07-10 23:27:38 +02:00
Cameron Lennox dbcd2bdb44 Revert undocumented removals made in #19586 (#19595)
* Revert undocumented removals

Reverts the undocumented removals made in PR #19586

* Update wood.dm

* Update steel.dm

* Update steel.dm
2026-07-10 01:00:11 -04:00
Poojawa 1855351be0 Lab-like Chemistry Dispensors (#19590)
* Lab-like Chemistry Dispensors

* Update dispenser2.dm

* adjacent check

* Make these true

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-07-09 19:59:48 -04:00
CMDR Youth 8cb24a750d Accessible Weld Goggs Fix (#19585)
* Welding Goggles Autolathe, Gravitons Cargolathe

Adds Welding Goggles to the Autolathe.
Adds Graviton Goggles to the Cargo Protolathe.

* Readds "goggles"

Who the fuck keeps randomly deleting things out of my commits

* Fixes Welding Goggles in Autolathe

Was missing " RND_CATEGORY_INITIAL, " after " category = list( " and so was never added to list by default.

* Update engi_nodes.dm

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-07-09 19:39:15 -04:00
Guti e9d2322565 Makes material costs use sheets amount define (#19584)
* Material defines

* Move these

* Food sytnhetizer

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2026-07-09 18:24:13 -04:00
Poojawa 1cd36107fc Construction Menu Sorting (#19586)
* Sorts the construction menu UI

renames plasteel_vr to plastitaniuim because... well there's nothing else in it and it isn't plasteel at all. lmao

* Provides use context to frame parts

* is this really how unit tests work

* Revert "is this really how unit tests work"

This reverts commit 5976c1aa24.

* good old dme includes. honk
2026-07-09 22:12:08 +02:00
Poojawa ba0fd0be33 Food Synthesizers (#19569)
* Food Synthesizers

Initial port, need to figure out what madness you people have done to tgui... and sprite sheets.

At this moment, it compiles but I haven't tested it yet.  Too eepy

* iconforge spritesheet nonsense

* Cleaning up tgui menu

full disclosure, After six plus hours of trying to figure out how to do the spritesheets  and the tgui stuff I just gave up on this particular bit and threw it into Gemini for a looksie over.

As it's originally my code I figure it's worth at least a reasonable proof read. The side-by-side comparison is pretty wild.

* Passes tgu-lint building

* Appease Gripe err Grep checks

* Oh these for the grep as well whoops

* Sorts out the backend

also piss off linter check, it's COMMENTED OUT aaaaaaaaaa.

* changes from will

* changes from will and some UI splitting, needs proper testing and final adjustments

* passadata

* .

* can be combined

* .

* ml={1}

* id

* Crew category

* id handling

* .

* more cleanup

* smaller cleanup

* why not

* deps up, minor tgui core fix

* timer

* .

* .

* missed to put that back

* order

* this

* Change preference category for foodsynth cookies

* Enforce south facement for cookie image

* Maurice I am no longer asking

* .

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2026-07-09 20:50:35 +02:00
Will f9b794b7ea Allows borgs to open the grid checker UI (#19589)
* borgo

* unneeded
2026-07-08 18:07:34 +02:00
Will 298c6860f6 AI can hear ambiances through holograms (#19588)
* ambience handling

* you too
2026-07-08 17:52:36 +02:00
Guti 8fa0bcfab7 Fixes spring traps being triggered by abstract objects (#19582)
* Trap fixes

* These two too
2026-07-08 04:50:46 -04:00
Will e6a43a7248 lets fix this up (#19580) 2026-07-07 15:23:43 -04:00
Cameron Lennox b5ebc6cbfa Chameleon clerical kit (#19571) 2026-07-07 15:19:56 -04:00
Will d18b561106 is_hot() global proc removal (#19576)
* use actual typechecks

* turns out it's entirely unneeded
2026-07-07 14:57:55 +02:00
CMDR Youth 782bdc604c Accessible Weld Goggs & Gravitons (#19568)
* Welding Goggles Autolathe, Gravitons Cargolathe

Adds Welding Goggles to the Autolathe.
Adds Graviton Goggles to the Cargo Protolathe.

* Readds "goggles"

Who the fuck keeps randomly deleting things out of my commits

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-07-06 16:10:30 -04:00
Cameron Lennox cd108df152 glass fix (#19570)
* glass fix

* Update glass_wire.dm

* Reemoves unused variable
2026-07-06 15:43:20 -04:00
Cameron Lennox 78616fd0ad Fixes the fridge, tcomms, and shield gen (#19574)
* Fixes the fridge, tcomms, and shield gen

* Update sound.tsx
2026-07-06 15:43:00 -04:00
Zerum f6529f0eb4 Cyborg Footsteps (#19564)
* Cyborg Footsteps

* edits

* Update footstep.dm

* Apply suggestion from @Cameron-The-Raven

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-07-02 23:00:47 -04:00
Guti cf14d3206d Adds the spring trap (#19563)
* Spring trap

* spring sproing

* waddlefix

* Spring trap kit icon

* Delete this

Co-authored-by: Cameron Lennox <killer65311@gmail.com>

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-07-02 22:37:11 -04:00
Guti a8de454e03 Command borg (#19562) 2026-07-02 22:36:59 -04:00
Cameron Lennox 3497a05ecf GPS Rename (#19559)
* GPS and webbing

* Update loadout_accessories.dm

* Update watches.dm

* Apply suggestion from @Cameron-The-Raven
2026-07-02 22:36:47 -04:00
Cameron Lennox edecb015db Refactors throw vore code. Again. (#19556)
* Refactors throw code

* chc

* Update trash_eating.dm

* Healbelly CPU save

* Update bellymodes_datum_vr.dm

* Update bellymodes_datum_vr.dm

* Update trash_eating.dm

* Update trash_eating.dm
2026-07-02 22:36:24 -04:00
Cameron Lennox 7f1a1604e6 xenochimera scream (#19558) 2026-06-30 21:14:46 +02:00
Cameron Lennox a678ec3390 Fixes EMP double damage (#19552) 2026-06-30 19:58:38 +02:00
TheGreatKitsune c14c026e6a Expands the description for mechatronics research to point you to the correct mech parts (#19555) 2026-06-28 11:57:37 -04:00
Cameron Lennox 29b2814d70 Eat (#19554) 2026-06-27 16:57:41 -04:00
Guti 9cd4644f6a Oopsies (#19553) 2026-06-27 04:30:43 -04:00
Cameron Lennox 204ef00db9 Tail addition (#19551)
* Adds an Eyed Tail

* tail
2026-06-25 17:19:03 -04:00
Cameron Lennox 9fe67ff586 Overlap fix (#19550)
* Overlap fix

* Update custom_clothes_vr.dm
2026-06-25 13:49:24 -04:00
Cameron Lennox 5325be90b1 Aberrations (#19547)
* Start

Adds starts active versions of barbed wire.

Adds 'named from material' var.

Fixes spears from defaulting to fragile if they're made with a butterfly knife.

* Makes cautery properly stop bleeding

* Adds Glass Wire

Adds wire that cuts a limb, doing 12 damage and a surgical cut to the limb.

This is blocked via thick clothing.

* Combines traps & traps_vr

* Update alien_alloy.dm

Makes adminspawn object unobtainable

* wip

* wip

* Fire Abber

* awaw

* housekeeeping

* Glass

* ye

* Update fire.dm

* whoops infinite glass

* rando
2026-06-25 13:48:48 -04:00
Casey a717c051d0 ATC and Culture Channels (#19527)
* ATC and Culture Channels

* Fixup maps in TGM format

71c1418406: maps/groundbase/gb-z2.dmm
71c1418406: maps/tether/tether-03-surface3.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* 1539

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-06-25 12:02:32 -04:00
Cameron Lennox 902813379b Eye Markings (#19549) 2026-06-25 11:04:02 -04:00
Guti 1d510b21ea scream (#19548) 2026-06-25 11:03:47 -04:00
Cameron Lennox 1b1f852a6b Fixes synth surgery (#19546)
* Fixes synth surgery

* Consistent
2026-06-25 11:03:30 -04:00
Cameron Lennox 8d1c3f319a Horror modifier adjusments (#19544)
* Horror modifier adjusments

Removes nutrition drain

Makes it so your organs mutate every 200 seconds you've been under it instead of checking life ticks.

Makes it so only 1-2 organs get replaced per 200 seconds instead of 2-3
Makes redspace injection chance much lower (3%->0.5%)
Makes it so you won't repeatedly stab someone with fleshy spread if they already have it.

Makes exiting battle stance while infected a bit better.

Armor now lasts 1 minute. Lowers after 1 minute if health and the such is fixed.

Allows using bruise/ointment on changeling flesh armor...it's flesh and an extension of them.

Makes the fleshy virus chance of organ mutation from 5 to 0.5

Fixes GBS to be actually curable.

Implements COMSIG_ITEM_ATTACK_ZONE and COMSIG_ITEM_ATTACK

* Update redspace_corruption.dm

* Update vorestation.dme

* Update horror.dm
2026-06-25 11:03:17 -04:00
WolvesAndOwls bb47d45749 Mob nibble fix (#19542)
* Fix mob eating food pathway

* Remove redundant alert

* Moved eating message to better location

* Apply suggestion from @Cameron-The-Raven

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-06-25 11:02:49 -04:00
WolvesAndOwls 8e7bccd52e Borgs can now nibble kibble (again) (#19541)
* Borgs can now nibble kibble (again)

* Check borg distance, no more eating across map.

* Edits

* Balloon alerts

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-06-25 11:01:50 -04:00
Cameron Lennox eb690b5d8f No salve RNG (#19538) 2026-06-25 11:01:33 -04:00
Cameron Lennox 4772a4de6b Trasheat backend (#19509)
* Makes trasheating more generous

* Redo this

* Update trash_eating.dm

* Update trash_eating.dm

* Update trash_eating.dm

* Expansion

* Fixes PDA eating

* Change the name of adminbus_trash
2026-06-25 11:01:20 -04:00
Cameron Lennox ea4b8561c5 Prevents virus stacking (#19539) 2026-06-25 00:37:57 +02:00
Cameron Lennox 16c6676879 Update leather.dm (#19537) 2026-06-25 00:34:45 +02:00
Casey d9649186d8 Aghost Logging (#19528)
* aghost_logging

* adds key_name to the log_admin messages

* 1703

* 1953
2026-06-25 00:29:46 +02:00
Guti 222f143e6a Tilt (#19536) 2026-06-21 17:01:26 -04:00
Cameron Lennox e246c415fa Borg pens (#19534) 2026-06-20 21:56:03 +02:00
Will 7a05cbcbf0 fix that (#19535) 2026-06-20 21:54:03 +02:00
Guti 9cd4198626 Fix these (#19530) 2026-06-20 21:52:40 +02:00