20839 Commits

Author SHA1 Message Date
Cameron Lennox e1ad4e7eb2 Trashpile Expansion (#19607)
* Some expansion

* fix
2026-07-17 06:56:42 -04:00
Kashargul 26cf2c20fd fixes a few runtimes (#19615)
* fixes two runtimes

* .

* split that proper

* Fix indentation in handle_removal function

* .

* Update personal_shield_generator_vr.dm

* yuck

* Remove power supply handling for active weapon

* .

* .

* trithium

* needs to be here

* Update personal_shield_generator_vr.dm

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-07-16 22:41:05 -04:00
Will 036a7450d3 unify ranged_disarm procs (#19613)
* unify ranged_disarm procs

* clarity

* shoot at that
2026-07-16 22:39:56 -04:00
Cameron Lennox 12b3d80872 Update exploration.dm (#19618) 2026-07-16 20:56:23 -04:00
Will 5d2ed77b57 Stasis Cage Exporting (#19612)
* sellable stasis cage

* Sellable mobs

* crate code cleanup

* export fix

* clamp

* sold mobs should vanish
2026-07-16 20:12:59 -04:00
Cameron Lennox f16080262e Removes some unsued vars (#19598)
Removes unused vars from IDs
2026-07-16 20:07:18 -04:00
Will 8b274afc5c fix (#19610) 2026-07-14 17:07:14 -04:00
Kashargul b6cee1119b rids of default immutable (#19608)
* rids of default immutable

* why...

* .

* .

* ugh

* some mobs qdel on death

* hmm na should be fine

* l
2026-07-14 17:06:50 -04: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
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
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
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 d18b561106 is_hot() global proc removal (#19576)
* use actual typechecks

* turns out it's entirely unneeded
2026-07-07 14:57:55 +02:00
Cameron Lennox cd108df152 glass fix (#19570)
* glass fix

* Update glass_wire.dm

* Reemoves unused variable
2026-07-06 15:43:20 -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 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 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 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 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 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 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
Will 7a05cbcbf0 fix that (#19535) 2026-06-20 21:54:03 +02:00
Guti f653cd3811 Hats! Hats! Hats! (#19529) 2026-06-19 12:03:51 -04:00
Cameron Lennox 33fee7fbb8 Multi Bugfix (#19524)
* Makes prosthetic cycler not break

* Fixes diagnostic

* Cell fix

* Update modifiers_vr.dm

* Update personal_shield_generator_vr.dm

* Update fever.dm

* Update personal_shield_generator_vr.dm

* Fixes lighters

* Update carbon.dm

* Fixes fuel stacking

* Fixes remotely touching walls

* Fixes changeling lock

Properly carries over the changeling lock

* Fixes some changeling bugs

* lung

* Update sleevemate.dm

* Removes an unused var

* Makes this file sane

* Fixes painspam

* Fixes painspam

* Apply suggestion from @Cameron-The-Raven

* updates

* Update other_vr.dm
2026-06-19 11:24:33 -04:00
Guti 0682e2dee9 Ports tg's mystery boxes (#19520)
* Mystery boxes

* Box :)

* That one out
2026-06-14 02:38:53 -04:00
Will d96a2fea1c Fix Zoomed Item Qdel Loop (#19523)
* lets refactor that

* unzoom fix

* taur fix
2026-06-14 02:04:58 -04:00
Will 5f64e0810b cheaper pipes (#19522) 2026-06-14 01:57:35 -04:00
Guti 43760c792a Unlucky Trait changes & additions (#19515)
* Unlucky stuff

* stone_grind

* Wall vendors stay

* For good measure

* Real flatten
2026-06-09 22:44:35 +02:00
Azzy a51313f663 Talon Channel Fix (#19511)
* Update talon_v2.dm

* Update maps/offmap_vr/talon/talon_v2.dm

* Update maps/offmap_vr/talon/talon_v2.dm

* clean that up

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2026-06-09 22:40:23 +02:00
Cameron Lennox 774e502814 recoil fix (#19514) 2026-06-07 01:20:46 -04:00
Cameron Lennox c898d6daa0 allow TTS while down (#19508) 2026-06-06 21:08:18 +02:00
Zerum cace3a6bb7 Lunchbox selection fix (#19505) 2026-06-05 16:18:58 -04:00
Cameron Lennox cd9730a0ff Fix promie shock mechanic & enables additional footsteps (#19500)
* Shock Absorb flag

* Cleans up unused species var

* Update species.dm

* FOotsteps

* Update footsteps.dm

* Update footsteps.dm

* Flash fix

* Update flash.dm

* Update human_powers.dm

* Gets rid of unused var

* Unused variable

* Update gun.dm

* Unused var

* grr

* Get rid of duplicate define

This was overwritten by the 70 below.

* Consolidate these

* Update species_helpers.dm
2026-06-04 08:08:03 -04:00
Will b324bd75cc Remote view fix again (#19488)
* lets get the foundations right

* collapsing

* more cleanup

* coordinator

* more cleanup

* put those in a better place

* awa

* these live in config now

* that too

* cleanup

* changed over

* cleanup

* more cleanup

* oop

* Cleanup

* deargod

* sanity achieved

* cleanup stuff

* cleared duplicated hud code

* documenting

* clarify

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-05-27 20:43:47 -04:00
Will fa2a7227d7 partial gas meter code revert (#19492)
* old meter

* revert

* revert
2026-05-27 19:43:24 -04:00
Will 6e3fe5de0f Optimize Cryoplanet Subsystem (#19490)
* optimize

* cleanup

* use this instead
2026-05-26 19:11:27 -04:00
Will b05f5555b3 meters on any pipe layer (#19484) 2026-05-24 11:42:06 -04:00
Cameron Lennox ae41178560 typofix (#19485) 2026-05-24 11:41:33 -04:00
Will 1b9c975ef8 Let borgs pick up paper bundles (#19481)
* grungular

* oop
2026-05-23 10:12:27 -04:00
Will 397d569b37 Atmos Pipe Improvements (#19478)
* pumps use their layer to connect pipes visually

* connectors for supply and scrubbers

* pump dmi stuff

* fixed volume pump dmi

* Vents support multiple connection types

* prevent multiple pipes attaching to the same side

* old code

* prioritize linking already connecting pipes

* constructable pressure tanks

* tank icon fix

* color fix

* fixes

* multiple connection universal pipes

* possible network fix

* buh buh

* tanks no longer go invisible
2026-05-21 20:22:25 -04:00
Guti afc02440a9 Mime care package (#19456)
* Mimes!

* Apply suggestion from @Cameron-The-Raven

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-05-21 11:02:30 -04:00
Cameron Lennox 6ac39e264e Adds Inflation (#19447)
* it's yours my friend

as long as you have enough

* Sellable

AND bombcode is fixed

* this

* Craftable

* Update code/controllers/subsystems/supply.dm

* Update code/modules/economy/cargo_point_scanner.dm

* Apply suggestion from @Cameron-The-Raven
2026-05-21 10:22:06 -04:00