11061 Commits
Author SHA1 Message Date
Cameron LennoxandGitHub a10740e4a8 Order of operations fix (#19676)
Makes it so showers clean the touching and then apply the reagents we're splashing on them.
2026-08-23 14:07:43 +02:00
e2e1b1f87d Fix some phased shadekin interactions (#19587)
* block those

* disposals

* wheelchair incorp check

* fix those

* not the issue

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-08-22 12:17:23 -04:00
GutiandGitHub 21330ec1ce Adds maintenance pills (#19673)
* Maint pills

* Vitamins!

* Pills here!

* funny

* Lowers the chance of alcohol to happen
2026-08-22 11:52:20 -04:00
7a313aa961 Mining machine construction (#19658)
* the horrors persist

* fix

* more work

* attempt to drop all sheets

* comment

* Techwebs

* oops

* organize

* fix warns

* Use a lookup

* Use bumps instead of input dir

* Smart direction search

* wrong machine!

* Update mineral.dm

* cleaned unneeded global list

* raise range slightly

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-08-15 10:56:42 -04:00
WillandGitHub 9dd2e6362a Glasswires no longer break from flashlight beams (#19655) 2026-08-10 12:32:57 +02:00
WillandGitHub 1d232bf567 fixes various net and stasis cage bugs (#19653) 2026-08-09 03:25:20 -04:00
GutiandGitHub 9e30b5e46a Fixes anomaly artifacts being active round-start (#19652)
* fix

* .
2026-08-07 20:01:05 -04:00
GutiandGitHub 1a8b70bc42 Anomaly xenoarch effect + Bioscrambler fixes (#19640)
* Anomaly stuff

* spacing
2026-08-01 12:21:25 -04:00
Cameron LennoxandGitHub 0fe39c5f85 Throwing Datum Fix (#19635) 2026-07-30 01:09:50 +02:00
Cameron LennoxandGitHub e1ad4e7eb2 Trashpile Expansion (#19607)
* Some expansion

* fix
2026-07-17 06:56:42 -04:00
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
WillandGitHub 036a7450d3 unify ranged_disarm procs (#19613)
* unify ranged_disarm procs

* clarity

* shoot at that
2026-07-16 22:39:56 -04:00
WillandGitHub 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 LennoxandGitHub f16080262e Removes some unsued vars (#19598)
Removes unused vars from IDs
2026-07-16 20:07:18 -04:00
Cameron LennoxandGitHub 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
WolvesAndOwlsandGitHub 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
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
GutiandGitHub 8fa0bcfab7 Fixes spring traps being triggered by abstract objects (#19582)
* Trap fixes

* These two too
2026-07-08 04:50:46 -04:00
Cameron LennoxandGitHub cd108df152 glass fix (#19570)
* glass fix

* Update glass_wire.dm

* Reemoves unused variable
2026-07-06 15:43:20 -04:00
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
Cameron LennoxandGitHub 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 LennoxandGitHub 29b2814d70 Eat (#19554) 2026-06-27 16:57:41 -04:00
GutiandGitHub 9cd4644f6a Oopsies (#19553) 2026-06-27 04:30:43 -04:00
Cameron LennoxandGitHub 9fe67ff586 Overlap fix (#19550)
* Overlap fix

* Update custom_clothes_vr.dm
2026-06-25 13:49:24 -04:00
Cameron LennoxandGitHub 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
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 LennoxandGitHub 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
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 LennoxandGitHub 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
GutiandGitHub f653cd3811 Hats! Hats! Hats! (#19529) 2026-06-19 12:03:51 -04:00
Cameron LennoxandGitHub 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
GutiandGitHub 0682e2dee9 Ports tg's mystery boxes (#19520)
* Mystery boxes

* Box :)

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

* unzoom fix

* taur fix
2026-06-14 02:04:58 -04:00
Cameron LennoxandGitHub 774e502814 recoil fix (#19514) 2026-06-07 01:20:46 -04:00
Cameron LennoxandGitHub c898d6daa0 allow TTS while down (#19508) 2026-06-06 21:08:18 +02:00
ZerumandGitHub cace3a6bb7 Lunchbox selection fix (#19505) 2026-06-05 16:18:58 -04:00
Cameron LennoxandGitHub 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
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
Cameron LennoxandGitHub ae41178560 typofix (#19485) 2026-05-24 11:41:33 -04:00
WillandGitHub 1b9c975ef8 Let borgs pick up paper bundles (#19481)
* grungular

* oop
2026-05-23 10:12:27 -04:00
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 LennoxandGitHub 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
4dd9a19c01 Cryogenic planet controller and station boiler upport (#19452)
* boiler basics

* more stuff

* tgui ported

* more cleanup

* more framework

* lets get this settled

* oops

* disabled regularly

* subsystem tweaks

* clean up spans

* name oopsie

* optimize

* you too

* actually optimize that

* linting

* much better optimization

* clean that too

* optimizing

* runtime on stack insertion

* more cleanup

* material handling fix

* pluralized

* oops

* clean that up

* tgui cleanup

* these should just be structures, tgui rework

* some tweaks

* small runtime caught

* polishing

* cleanup

* last tweak

* fixed burn calculation

* Keeeeeeeeeellllllllllll

* scroll fix

* move to proc

* requested changes

* optimization

* buh

* Well that didn't work

* clear those refs

* back to flags

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
2026-05-18 01:08:54 +02:00
Cameron LennoxandGitHub 46ae76a7d5 Adds a box of legcuffs for mappers (#19457) 2026-05-14 01:28:04 +02:00
Cameron LennoxandGitHub 3c937494cf Fixes a borg gripper bug (#19458)
* Fixes a borg gripper bug

* Add some admin vars and pass args
2026-05-13 19:27:06 -04:00
Reo LozzotandGitHub 73a7469739 Pleasantry (#19453) 2026-05-12 20:11:18 -04:00
KashargulandGitHub 5926589c16 removes var/ inside all procs (#19450)
* removes var/ inside all procs

* .

* ugh
2026-05-05 10:55:17 +02:00
Cameron LennoxandGitHub 7cdc25880a Some bugfixes (#19444)
* Fixes accessory removal

* Fixes partslathe

* Fixes a bug where field gen would be annihilated by windows

* Small runtime fix

* Fixes a robot runtime

* easter egg

* no coggers

* Update mop.dm

* Update antagonist.dm

* Update antagonist.dm

* Update partslathe_vr.dm

* Update mop.dm
2026-05-03 22:08:23 -04:00
8bbb5a00a9 Cargo Material Purchasing (#19435)
* material sell tweaks

* material purchases

* test this

* missing 50 spawners

* fix

* missing mats

* oops

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-05-03 19:43:46 -04:00
Cameron LennoxandGitHub 1d2cbea8e9 Converts screen hardref to a weakref (#19443)
* Weakrefs the  master object

* whoops
2026-05-03 19:43:14 -04:00