11834 Commits

Author SHA1 Message Date
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
AurouraPlays 53c9cbec6b Removes recipe conflict between Vampiro and Margarita (#32095)
* Removes recipe conflict between Vampiro and Tequila

* Fixes the amount of Vampiro returned to match the sum of its parts.

* Fixes Tequila Sunrise's ID in the vampiro recipe

* Correcting formatting in manuals.dm

Co-authored-by: Alan <alfalfascout@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: Alan <alfalfascout@users.noreply.github.com>
2026-06-13 22:19:08 +00:00
AurouraPlays 5657dcdb89 Adds Strawberry Daiquiri and Miami Vice. (#32069)
* Adds Strawberry Daiquiri and Miami Vice.

* Fixes the amout returned in the Miami Vice to equal the sum of its parts, and increases the alcohol percentage.

* Adds Strawberry Daiquiri and Miami Vice to the drinks manual.

* Corrects the formatting and alphabetization of manuals.dm entries.
2026-06-13 22:18:52 +00:00
Christer2222 7e64a2b9b8 Irradiated mouse tweaks (#32062)
* cheese heal

* admin spawned test fix

* brute kits no longer heal

* increased alpha

* lowered inherent radiation

* rad spike on eat + moved admin spawned check

* 20k rads on eat + moved brute pack logic
2026-06-13 22:07:01 +00:00
CRUNCH 5786470976 Update RCL.dm (#32052) 2026-06-13 22:06:27 +00:00
Alan f0f7ccf5ba Add the ability to install headsets in desk bells. (#32056)
* Add the ability to install headsets in desk bells.

* Update autosay proc to allow for emoting.
2026-06-11 00:59:44 +00:00
Hayden Redacted 28b2c14f41 Adds a New Space Ruin: The Gas Station (#32004)
* initial commits

* linter fix and makes it more messy

* linter pt 2

* linter pt 3

* webedit heresy

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* web editor heresy pt. 2

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

---------

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
2026-06-02 02:10:48 +00:00
Alan 9c721c5be3 Allow crafting clown boxes from single sheets of cardboard. (#32035) 2026-06-02 00:10:21 +00:00
CRUNCH 34acc9eab3 Fixes the RCL sometimes deleting itself when use() checks are called. (#32026)
* destroy upon empty general stack check

* Update stack.dm
2026-06-02 00:07:28 +00:00
CRUNCH 5c75ddb4c2 smooth mineral walls (#32016) 2026-05-24 10:01:46 +00:00
Alan 25aac32c63 Migrate /obj/item/assembly to the new attack chain. (#31987)
* Migrate /obj/item/assembly to the new attack chain.

* Migrate more procs.

* Add parent calls to activate_self().

* Add parent call to activate_self() in noise sensor.

* Apply CRUNCH's style suggestions.

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

* Change igniter attack to interact_with_atom().

* Restore assembly UIs.

* Ensure assembly interact procs fire, ensure fingerprints.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-05-17 18:42:49 +00:00
Alan a1b61fa2b6 Put disabled welders in open closets. (#31995)
* Put disabled welders in open closets.

* Include crates.

* 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-05-17 18:42:20 +00:00
Toastical 937e251683 migrate /mob/living/silicon to Initialize() (#31934)
* migrate /mob/living/silicon to Initialize()

* fix some arg calls for spawning borgs

* remove even more args from robot Initialize
2026-05-17 10:37:33 +00:00
PollardTheDragon 6b9c333636 Adds Security Fines (#31857)
* Adds Fines

* Forgot one

* Enhanced Clarity

* Fixes issue with linked account

* If no crime stated, states in the fine message

* Updates fine scanner sprite

* Updates fine scanner behavior

* Adds comment to records

* Apply suggestions from code review

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

* Removes capitalization

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2026-05-17 09:45:07 +00:00
Alan e3e6bae1c9 Add drinks and recipes from Hispania! (#31983)
* Add drinks and recipes from Hispania!

* Fix duplicate var in bottle.dm. Thanks, linters!

* Add fitness cups to stations, BSH loot.

* Dull some glass rims that don't need to be quite that bright.
2026-05-15 14:56:42 +00:00
Alan 31a27d13a8 Add alt-click ID swiping to more objects. (#31988)
* Add alt-click ID swiping to more objects.

* Add more alt-clickable bots. Add examine text.

* Bold alt-click hint, make display case alt clickable.

* Fix display case unlock message for CI.
2026-05-14 23:05:27 +00:00
CRUNCH 8fe4bf5ded blind cane craft (#31962) 2026-05-13 22:11:06 +00:00
MixityMaxity 9b570fc75c Wallening Mapping QoL (#31956)
* manual rotation vars and subtypes

* hacky (?) spawner fix

* light map fixes

* linter
2026-05-13 22:10:25 +00:00
Christer2222 2f2ebafb31 [EE] Adds a new medium midround event: Irradiated mouse (#31947)
* added irradiated mouse

* mouse pulling buff

* adds upgrade spells

* cooldown on upgrades

* icons and cats

* radioactive sludge, health decrease, upgrades counter

* objectives and sound

* spells to new file + check if alive in life

* afterimage

* description fix, contaminate, comments

* lintma?

* removed empty lines, , -> :, new -> new()

---------

Signed-off-by: Christer2222 <25958019+Christer2222@users.noreply.github.com>
2026-05-13 22:09:02 +00:00
MixityMaxity 483d62b942 CMO's very own modsuit - 'Salvation' (#31941)
* sprites and theme

* searchlight module

* suit storages

* trader spawner

* actual plating item

* misc updates

* species sprite hell

* linter

* module description

* Now protects contents from radiation

* CBRN module

* removes extra comment

* nerfs default rad protection to 75%

* clothing icon changes

* linter.

* removes searchlight module

* komrad request - removes fireproof, keeps high fire resistance

* fixes backside sprite
2026-05-10 08:06:54 +00:00
Alan d1dad9a639 Import several foods and recipes from Hispania! (#31831)
* Import several foods and recipes from Hispania!

* Fix trailing newlines, remove hispania icon reference.

* Fix list spacing, add drink reagents, correct annona spelling.

* Amend drink description, move icons

* Apply new timer from @CRUNCH-Borg

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

* Apply @CRUNCH-Borg's attack chain suggestions

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

* Fix many duplicate vars.

* Fix more duplicate vars.

* Remove duplicate toast.

* Fix unreachable callback. Now with @CRUNCH-Borg!

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

* Amend some icons.

* Add vendor seeds, tweak plant sprites.
- Add base seeds to MegaSeed Servitor.
- Change smoked salmon sushi to use smoked salmon instead of salmon steak.
- Make maize dough yellower.
- Fix capitalization in peyote description.
- Make coconut inedible.
- Modify cream cheese recipe to remove conflict with butter.
- Tweak sprites of growing plants to sit inside hydroponics trays and not move around so much.

* Add guacamole recipe, agave distill reagent.
- Add prep bowl recipe for guacamole, condiment container and icons.
- Change cactus salad icon to use new plastic cup shape.
- Add distill reagent "tequila" to agave.
- Make coconuts only attack on harm intent.
- Fix some whitespace.

* Prevent bombonuts from detonating instantly.

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Spellcheck.

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

* Change some item names, descriptions, recipes.
- Make custom robot head recipe step so that those recipes don't just call for "a head".
- Replace smoked salmon sushi ingredient with new smoked salmon.
- Fix some confusing item names.
- Update descriptions of cacti.
- Add raw mouse as mouse butchering result.

* Modify reagent colors. Make cream cheese bread with cream cheese.

* Adjust some recipes and descriptions.
- Remove hipster ridicule from mate. Add it as a reagent to the plant.
- Touch up some grammar.
- Amend recipe for sweet arepas.

* Fix grown food slicing debug message.

* Grammar improvements feat. CRUNCH

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>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2026-05-07 21:01:26 +00:00
unknownuser782 13c3cc803c Ape Uprising (#31609)
* Allow monkey-like species to craft

* Add signal for mobs entering vents

* Implement basic uplifted antag datum & nest

* Make phrasing nicer

* Allow primitive species to vary & add time requirements

* Add spawning functionality to nest

* Make primitives unable to be humanised a little less violently

* Fix linter complaints

* Fix typo which made the linter mad

* Add objectives and antag teams

* Make nests consider other nests for spawn limit

* Add greeting text

* Add guaranteed early spawns

* Allow deconstruction of nests & recovery of scrap

* Allow uplifted mobs to ventcrawl with small items

* Clarify nest spawning conditions on examine

* Tweak NPC numbers & AI

* Add obtain objective and give an extra objective

* Give thanks to the linter

* Change team objective & make the alert nicer

* Make event only spawn monkeys by default

* Add examine text explaining deconstruction

* Allow ghosts to see nest materials

* Handle stacks properly in nest deconstruction

* Add on-demand ghost spawn to reduce roll spam

* Add nest crafting

* Allow lesser mobs to use medical stacks

I don't believe this should affect anything else, as every other mob capable of holding these items is an advanced tool user.

* Add hint about crafting on examine

* Ensure only nest monkeys retaliate to nest damage

* Add uplifted primitive nests to the spawners menu
2026-05-07 05:03:30 +00:00
PollardTheDragon 7a5658a90a Improves Baseball Bat Deflect Mechanics (#31918)
* Improves Baseball Bat Deflect Mechanics

* Adjustments

* Update code/game/objects/items/weapons/weaponry.dm

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

* Update code/game/objects/items/weapons/weaponry.dm

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

* Reorders if chain

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2026-05-07 02:21:59 +00:00
Alan b0a8b84dbf Add cardboard recycling. (#31937)
* Add cardboard recycling.

* Add more cardboard items to the recycling list.
2026-05-02 00:47:14 +00:00
Alan 45b4859c99 Add mug cakes. (#31919)
* Add mug cakes.

* Remove duplicated var. Thanks, linters!

* Add mug cakes manual.
2026-04-29 00:10:57 +00:00
Ahzpy 566dd6b990 recipe + sprite (#31922) 2026-04-28 23:55:11 +00:00
Alan 01b55e0f21 Change some items to zero damage hitsounds. (#31854)
* Change some items to use zero_damage_hitsound.

* Remove duplicate var. Thanks, linters!

* Use Contra's method for zero damage hitsounds.
2026-04-28 23:38:50 +00:00
Ahzpy 68fb77a19a Wallening 2: Return of the attack of the girders [MDB IGNORE][IDB IGNORE] (#30609)
* WE HAVE LIFTOFF

* Reinforced wall + fixes

* (Reinforced) windows

* Adds nameless plasmaglass sprites

* Plasma windows

* Unnamed cult walls

* Add window edges back

* Wooden walls

* Plasma walls + THANK YOU CHAP

* Oops

* Wooden names

* Cult walls

* Plasma walls

* Uranium walls

* Golden walls

* Silver walls

* False wall basics

* All false walls

* Remove old walls

* Fixes

* First girders

* Build steps

* New floors and decalized floor tiles.

* satisfy linter

* Add command decals, remove old "blue tile" decal

* update script number

* have ATMs put their decals on last

* add engineering decals

* update spritesheets

* lots of tile coloring fixes

* more engi tile fixes

* more tile fixes

* linters

* fixes conflict?

* conflict fixes

* fix layering issue

* cult, necropolis, plastitanium, rocks, backrooms walls

* survival pod walls, prepare for titanium, plastitanium fwall fix

removes diagonal smoothing and the nodiagonal subtype from titanium walls as survival pod walls are a subtype of titanium

* linters

* linters again

* linters number 1 million and counting

* titanium walls

* brass walls, floors, windows

* titanium window, plastitanium window

* brass window smooths with wood and brass walls

* linters number 1 million and one

* all walls smooth with airlocks

in preparation for airlock sprites in a separate PR

* now all walls smooth with airlocks

* windows smooth with airlocks

* separate wallbumps, partially add apc

* tinted window

* survival pod windows

* oops i reverted apc.dm

* mapping fixes

* more mapping sprites

* more mapping stuff, fix my ungodly smooth rocks

* linters

* apc fix

* air alarm, apc, fire alarm offset preparations

* fire alarm implementation + rock fixes + firelock smoothing

* airlocks + supposed map fixes

* engi/atmos airlocks + overlays

* the rest of the doors lol

* linters + freezer fix

* fixes

* shuttle airlock + misc fixes

* firelocks

* fix

* oops

* i need to stop pushing fixes early

* shuttle airlock quickfix

* external airlocks + hatches + fixes

* centcom doors

* highsec airlocks

* vault airlock, double airlocks

* yaya deconflictsies

* lotsa fixes

* light fixes + blastdoor fixes

* firelock gap fix

* light construction fix + rcd fix

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <daan.lyklema@gmail.com>
Co-authored-by: Alexios <skillpointHD@Gmail.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2026-04-22 14:49:30 +00:00
Hayden Redacted 55e42f53a5 Make the Supermatter Crystal More Senstive and Adds More Events (#31767)
* initial commit

* oops i forgot to commit this

* Tidies up the SM manual, clamps the A-4 damage, and fixes a linter

* removes the change to operational temperature

* buffs the flood event

* Update code/modules/power/engines/supermatter/supermatter_event.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Miles <116982774+Burzah@users.noreply.github.com>

* Update code/modules/power/engines/supermatter/supermatter_event.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Miles <116982774+Burzah@users.noreply.github.com>

---------

Signed-off-by: Miles <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Miles <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2026-04-21 05:03:31 +00:00
CRUNCH 3c1d985e31 Attack Chain Migration: Grenades & Plastic Explosives (#31874)
* Update bomb.dm

* migration

* Fix CI

* Update mining_charges.dm

* Update deployable.dm
2026-04-21 04:58:44 +00:00
CRUNCH bea76c4592 Attack Chain Migration: Tanks (#31873)
* tanks attack chain migration.

Tanks, you're welcome. Now with less curses.

* AGGGHHHHHH!
2026-04-18 21:11:21 +00:00
CRUNCH 3046415a73 Attack Chain Migration: Trash (#31881)
* Update trash.dm

* Update customizables.dm

* Update customizables.dm
2026-04-18 21:10:28 +00:00
CRUNCH 91dd3e55c9 allows stack splitting mechanics to be disabled (#31911) 2026-04-17 00:21:18 +00:00
Alan a714de9149 Add beach towels. (#31667)
* Add beach towels.

* Add basic towel. Attempt absorbency. Add towel names.

* Make towels pick up and spread blood.
Move towel place-on-floor function to beach towels.

* Move amount to base cleanable. Refine towel procs.

* Ensure towel picks up blood.

* Add species sprites and inhands.

* Apply suggestions from code review.

* Fix ussp space ruin.

* Whitespace.

* Prevent picking up blood DNA already on the towel from mobs/items without decal amounts.
2026-04-14 16:24:53 +00:00
PollardTheDragon cf80c0b2b1 Fixes isopod oversight (#31898)
* Fixes isopod oversight

* Fixes some naming too
2026-04-14 04:13:18 +00:00
Contrabang d4595054ce Adds CI for checking if a variable exists (#31855)
* i leave for one month smh

* feature compatibility

* fixed
2026-04-14 03:26:31 +00:00
PollardTheDragon fb29bc6f4f Adds Isopods (#31842)
* Adds Isopods

* Fix

* Moved some values

* Om nom nom

* Pickups

* Linters

* Adjusted name
2026-04-14 03:16:49 +00:00
CRUNCH 5047c35ed3 Adds Durkehiet, removes Howler (#31844) 2026-04-13 23:46:01 +00:00
Toastical 9b5ed1f9e1 fix ore bag pickups for cyborgs (#31867) 2026-04-13 23:32:23 +00:00
CRUNCH 166ccc1a35 Update RCL.dm (#31889) 2026-04-13 23:31:58 +00:00
CRUNCH 8f842a2353 Adds Rations for the TSF, USSP, and ERTs (#31795)
* Creation

* revival AGAIN

* Update ration_pack.dm

* It returns yet again for the final time maybe

* e

* linter

* Update ration_pack.dm

* Update ration_pack.dm

* Update test_tiny.dmm

* Update bluespace_tap_spawners.dm

* Apply suggestions from code review

Co-authored-by: iramoye <projecteternal1@gmail.com>
Co-authored-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>

* Update rations.dm

* Update rations.dmi

* Update storage.dmi

* Update code/modules/food_and_drinks/food/foods/rations.dm

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

* Polish icons in rations.dmi

* Update ration storage icons.

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: iramoye <projecteternal1@gmail.com>
Co-authored-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
2026-04-11 04:59:54 +00:00
PollardTheDragon 62392cb2a8 Fixes infinite soap mouth (#31835) 2026-04-10 00:20:52 +00:00
PollardTheDragon 849e33e147 Adds dueling pistols (#31772)
* Adds dueling pistols

* Bonus damage for dueling

* Oops

* Sprite stuff

* Sprites and fixes
2026-04-09 20:45:31 +00:00
Alan ba5db365e3 Adjust earwear for monitor heads. (#31775)
* Adjust earwear for monitor heads.

* Tweak soviet headset, correct icon code.
2026-04-09 04:21:23 +00:00
CRUNCH 05eeff6df2 Fixes a Bunch of RCL Bugs (#31698)
* RCL cable migration

* e

* Pain and death

* merge master fixes

* e

* aaaaaa

* Update RCL.dm

* AaaaAAAAA

* Update cable_coil.dm

* Update cable_coil.dm

* returns throwforce

* removes color feature

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-04-09 02:50:24 +00:00
PollardTheDragon c6620a0c96 Adds Cargo Drop Pod Collision Moderate Event (#31771)
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2026-04-07 14:39:31 +00:00
CRUNCH 48ffe9dd63 Update stack.dm (#31850) 2026-04-07 03:41:35 +00:00
Alan e9fcd1b035 Adjust masks to fit monitor heads. (#31773)
* Adjust masks to fit monitor heads.

* Remove duplicate var. Thanks, linters!

* Tweak west-facing lucha masks.
2026-04-05 05:16:32 +00:00
PollardTheDragon 01726c44b5 Adds logging for if a grenade is primed by damage received (#31761) 2026-04-03 20:24:31 +00:00
Hayden Redacted 1b798b2155 Adds Paradise Trading Cards! (#31756)
* Initial commit

* oops no warns allowed

* linters along with descriptions, psych, forklift, and brad cards

* i can read errors, trust

* yes

* more linter

* remove extra declaration

* identical var fix

* Pollard suggestions

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* removes some comments and renames some TCG branded things

* CRUNCH's attack chain migration

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* various icon and adds packs to maintenance loot

* moved some coin stuff around and linters

* Coin icon fix and adds them to the NT merch vendor

* linter fix

---------

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-04-02 20:00:37 +00:00