6845 Commits

Author SHA1 Message Date
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
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
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
Will d96a2fea1c Fix Zoomed Item Qdel Loop (#19523)
* lets refactor that

* unzoom fix

* taur fix
2026-06-14 02:04:58 -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
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
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
Will 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 Lennox 46ae76a7d5 Adds a box of legcuffs for mappers (#19457) 2026-05-14 01:28:04 +02:00
Cameron Lennox 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
Kashargul 5926589c16 removes var/ inside all procs (#19450)
* removes var/ inside all procs

* .

* ugh
2026-05-05 10:55:17 +02:00
Cameron Lennox 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
Cameron Lennox 1d2cbea8e9 Converts screen hardref to a weakref (#19443)
* Weakrefs the  master object

* whoops
2026-05-03 19:43:14 -04:00
Aura Dusklight c6e69e58ea compile commit.. (#19426)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-05-03 19:15:16 -04:00
Cameron Lennox d6d4f63893 Check devourable (#19442) 2026-05-01 00:51:13 -04:00
Cameron Lennox 8bf59b8181 Various QoL (#19438)
* Allows drag-dropping items into disposals

* Borg drag

* Sharp

* Update fluff.dm

* Update global_lists_vr.dm

* Fixes translocators

* Update translocator_vr.dm

* Makes alt-click allow removing accessories

* Update clothing.dm

* Update accessory.dm

* Fixes microwaves

* Update microwave.dm

* fluff fix

* Update microwave.dm

* Fixes adminjump
2026-04-30 22:56:44 -04:00
Cameron Lennox 69808a5b5b resolve_attackby bugfix (#19441) 2026-04-28 01:46:10 -04:00
Cameron Lennox 4760085246 Gripper fixes (#19436)
* Fixes compile warning

* SANE ARGS

* return YES NO

* Better
2026-04-26 21:19:22 -04:00
Guti 6f4955e8c2 Allows borgs to wear hats (#19424)
* Borg hat framework

* Change defines

* .

* Fix

* Change

* Rest of them

* Delete hat

* Actually just drop it

* Change

* .

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-04-23 20:47:05 -04:00
Will fb4cf2e80a Weakref cleanup (#19382)
* oh god help

* fixes

* oops

* container runtime

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-04-21 04:57:02 -04:00
Cameron Lennox 58470f5045 Logs buildmode (#19363)
* Logs buildmode

* edits

* Update buildmode.dm

* Update buildmode.dm

* adds comment for panel integration

* more logging than a lumber company

* Update buildmode.dm
2026-04-21 03:37:54 -04:00
Olive f5c333dcc6 expands misc gripper functionality (#19368)
* expands gripper functionality

* removes testing change

* of course i did an oops

* remove id

* mobss must have minds

* resolves issues

* oop

* Update leash.dm

* Update leash.dm

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-04-21 03:23:53 -04:00
Cameron Lennox 69d9e1bf43 Misc fixes (#19425)
* WIP swoopie fix

* no self suck

* Update vacpack.dm

* Update vacpack.dm

* Update vacpack.dm

* fixes CPR on self

* Fixes shoes

* Fixes leash issue

Fixes #18979

* Fixes looping sounds

Fixes it so that if a looping sound returns NULL or FALSE for its get_sound (i.e. geiger counters) they don't play(), meaning they don't send a sound that motion tracking can see.

* Makes paralysis and stunned count for incorp movement

* Fake flowers

* Fixes borg items turning brown

* Update industrial_reagent_waste.dm

* teshari rigfix

* Fixes urns and cyborgknives

* Update find_spawning.dm

* Makes telecube spawn mated

* Update inducer_vr.dm

* Update find_spawning.dm

* Fixes drop everything admin command

* Adds strip mine

* Update robot.dm

* typooo

* flarefix

* Update find_spawning.dm

* Makse archaeological_find abstract

This only spawns if a runtime occurs
2026-04-20 22:56:22 -04:00
Cameron Lennox 90ccdad347 fixes unused var (#19423) 2026-04-19 02:30:54 -04:00
Cameron Lennox 1f2345b090 Fixes a few runtimees (#19418)
* Update seed.dm

allows plants whose reagents have not been defined uniformly to splice properly

* Fixes runtime with mob products

* Fixes quickdraw runtime

* Update _appliance.dm

* Update remote_view.dm

* Update remote_view.dm

* Fixes a bug with pink slime potions

* Update _appliance.dm

* Gloves runtime

* Fixes leash runtime

* Fixes jump to coords

* leash adjustment
2026-04-18 15:22:00 -04:00
Cameron Lennox 51b00a200c Magboot and glove fix (#19415)
* Magboot and glove fix

* Update armblade.dm

* Update leash.dm
2026-04-16 10:40:31 -04:00
Cameron Lennox 20a0443b8e Clears unused research var (#19355)
* Removes stack_origin_tech

* Goodbye

* I HATE MAP EDITS
2026-04-14 20:02:43 -04:00
Will 60202429a7 Customizable Announcer (#19387)
* starting work

* most generic

* more alerts

* remaining alerts

* many fixes

* fix

* properly set

* virgo doesn't use those lines?

* actually they are used

* smallfixes

* oops

* silence of the bots

* docs
2026-04-14 16:32:50 -04:00
Kashargul 12c5adeeb3 removes the last of the old job controller (#19344)
* removes the last of the old job controller

* .

* .

* .

* .

* .

* Update admin_verbs.dm

* Update admin_verbs.dm

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-04-13 02:06:54 -04:00
Cameron Lennox d8c1932cb9 Flammable Items, Abstractness, and hypnosis (#19267)
* Laser Eyes

* Update dna.dm

* Mecha

* Update positive_genes.dm

* These

* These 2

* yeh

* Rest of these

* Update turf.dm

* Update food.dm

* Some moar

* mooove

* Update vorestation.dme

* Update burning.dm

* firesuit

* flags

* HYPNOCOLOR

* xd

* no filter

* dc

* Update ore_bag.dm

* Update misc.dm

* Update misc.dm
2026-04-13 00:30:02 -04:00
Cameron Lennox 26e9c25673 Recipes and Fryer Fixes (#19250)
* Recipies WIP

* moves this back to lazyadd

was testing

* fix alist VV and recipe globs

* change oven

* .

* .

* .

* adjust appliance tgui

* .

* eh

* .

* .

* small visual fix

* Clean up our food items

* Update _appliance.dm

* pouring

* frier oil level

* sizzlin

* slrok

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2026-04-12 17:40:44 -04:00
Cameron Lennox b4c3594844 Ore Bag Fixes [Requires #19383 merged first] (#19385)
* map stuff first

get this out of my changes

* Update vorestation.dme

* rest of it

* Better Bags

* Update ore_bag.dm

* Gets rid of bag override

* edits

* Less Jank

* aaa

* this doesnt work

* LOL WHY

* The future is NOW old man

* bye bye

* no hard refs~

* Update dog_sleeper.dm

* Update dog_sleeper.dm
2026-04-11 16:19:03 -04:00
Kashargul 087ae7f9e8 bunch of runtimes (#19383)
* bunch of runtimes

* fix that nif ref properly

* .

* Makes this more clear it's overriding

* Update geiger.dm

* Update geiger.dm

* Implement TG attack_ui

Makes get_item_by_slot actually work. It's the TG naming for our proc get_equipped_item(slot)

* Fixes geiger and ore signals

* These

* Update inventory.dm

* Unneeded

* These

* Leave this for another PR

* Update bags.dm

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-04-11 15:31:02 -04:00
Guti 8e357dd556 EMP & Wires refactor (#19401)
* EMP Refactor

* EVERYBODY gets wires

* Shield gen

* fix

* Fix those

* Changes

* ,

* kill

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-04-11 15:05:41 -04:00
Will 31e417e772 Text To Speech Device Shows Talking Indicator (#19389)
* beep

* apparently that's needed
2026-04-11 15:05:22 -04:00
Cameron Lennox 0c295af6e7 Some more radiation fixes (#19378)
* Some more rad fixes

* Minor fix

* fixes vox ghost goggles
2026-04-08 18:07:02 +02:00
Will 421c5746f7 fix (#19394) 2026-04-08 18:03:10 +02:00
Kashargul d29d74621c filters cig messages properly (#19369) 2026-04-06 02:00:04 -04:00
Kashargul 1c80ef4d35 plane holder hard dels (#19374)
* plane holder hard dels

* .

* .

* .

* vac hard del

* this

* .

* .

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-04-06 01:26:31 -04:00
Cameron Lennox 17afaef058 Fixes some bugs with spectral tech (#19376)
* I'm dumb

* Fixes

* Update trap.dm
2026-04-04 01:29:28 -04:00