Commit Graph

29552 Commits

Author SHA1 Message Date
DetectiveEnotsky 4801bf8ade Mask eye shine with glasses, eyepatches and whatever (#31940)
* masks eye shine with glasses

* fixes indentation yaaay

* definitely fixes indentation now trust

* Update code/modules/mob/living/carbon/human/human_mob.dm

no more funny comments

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: DetectiveEnotsky <87281888+DetectiveEnotsky@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/human_mob.dm

Useless code begone

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: DetectiveEnotsky <87281888+DetectiveEnotsky@users.noreply.github.com>

---------

Signed-off-by: DetectiveEnotsky <87281888+DetectiveEnotsky@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2026-05-10 08:07:00 +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 518140e03c Add chocolate milk cartons. (#31960) 2026-05-10 07:53:13 +00:00
azulez 3c145f7507 Fixing Phlog recipe and Phlog fire after Phosphoric Acid addition introduced chemistry bug. (#31953) 2026-05-10 07:52:27 +00:00
Hayden Redacted 21e7f56d45 Makes the Blind Cane Orderable From Cargo (#31902)
* initial commit

* lowered the price
2026-05-10 07:48:14 +00:00
Ahzpy 8b28cf5870 Adds Baseball Uniforms (#31923)
* loadout + obj + human + grey

* drask

* kidan

* kidan softcap fix

* vox

* oops i forgot the loadout

* skulk

* add them to the autodrobe
2026-05-10 07:47:43 +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 85002cca6c [EE] Adds Market Crash Event (#31870)
* Adds Market Crash Event

* Typo

* Bees

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

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2026-05-07 05:02:49 +00:00
Alan 0495f43b53 Unify style generators. (#31920)
* Unify hairstyle generators.

* Unify some body styling procs.

* Squash more duplicate logic.

* Change false value to define in link_processing.dm.

Co-authored-by: JimKil3 <47290811+JimKil3@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: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2026-05-07 05:02:06 +00:00
CRUNCH d255626d4c Improves mob/living/silicon/robot item_interaction() proc (#31907)
* Update robot_mob.dm

* Update test_attack_chain_borgs.dm

* Update test_attack_chain_borgs.dm

* Apply suggestions from code review

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

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2026-05-07 02:33:44 +00:00
PollardTheDragon 7d6e55b765 [EE] Adds Brass Pocketwatch Reward Item (#31963)
* [EE] Adds Brass Pocketwatch Reward Item

* Update code/modules/customitems/item_defines.dm

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

* Skkulakin vox sprites

* Adjustment

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Miles <116982774+Burzah@users.noreply.github.com>
2026-05-02 07:11:20 +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
MixityMaxity e5f570ec11 Area-Based Light Ambience (#31921)
* Basetype and Light init

* Custom Area Vars

* maybe fixes the ~8000 runtimes

* Testing mapchecks

* Maybe fixes the ~8000 runtimes attempt 2

* Contra Suggestions, please dont break the checks

* kills whitespace
2026-05-02 00:45:32 +00:00
MixityMaxity 17e33da381 Adds Solar Panel upgrades, Resprites solar equipment. (#31904)
* Spritesss

* Moves solar sprites out of goon folder

* adds upgrades, integrity power scaling

* Fixes glass_type comments

* woe, whitespace

* defines
2026-05-02 00:45:26 +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
warriorstar-orion 8d7d6a346b hide multiple cooking steps warning behind PCWJ_DEBUG macro def (#31924) 2026-04-29 00:00:41 +00:00
Hayden Redacted 869f091967 Adds a Variety of Keyboard Shortcuts to Thermomachine Operation (#31930)
* initial commit

* allows synthetics to also use the shortcuts
2026-04-28 23:59:14 +00:00
CRUNCH 773dec7759 fixes zombie claws on cure (#31917) 2026-04-28 23:52:30 +00:00
CRUNCH feb9c7313c Update cable_coil.dm (#31906) 2026-04-28 23:46:54 +00:00
Hayden Redacted 58467b3ed1 initial commit (#31905) 2026-04-28 23:46:32 +00:00
Alan 578450a191 Fix clamping of supermatter damage. (#31936) 2026-04-28 23:45:54 +00:00
Hayden Redacted a6818accea Adds Four New Nian Emotes (#31860)
* Adds the ability for nians to twitch their antennae.

* initial commit

* removes the underscore needed

* linter fix

* oops
2026-04-28 23:39:09 +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
PollardTheDragon 0b39a004c3 Fixes energy shuriken runtime (#31886)
* Fixes energy shuriken runtime

* Better fix
2026-04-21 05:11:18 +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
warriorstar-orion 2ea82c60db fix PDA recipe for supermatter sandwich (#31925) 2026-04-21 04:24:35 +00:00
PollardTheDragon a80e8cae9d Adds Wizard adept midround (#31784)
* Adds Wizard adept midround

* Fixes HUD bug

* Teaches fireproofing for sacred flame

* Teaches them better

* Mugwort compatibility
2026-04-18 23:00:15 +00:00
Alan aae704c3c1 Make microwave use recipe make_food proc. (#31841) 2026-04-18 21:15:58 +00:00
MixityMaxity 6dd63554cb Somewhat rebalances CO2 (#31802)
* mmm breath code

* removes prealert, adds chat warnings

* fixes murder code comment
2026-04-18 21:15:32 +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
Alan 0e50aeb0b9 Trim _s from under sprite states. (#31861)
* Trim _s from under sprite states.

* Fix some missing icons.

* Restore missing chameleon icon state.
2026-04-18 21:10:16 +00:00
CRUNCH c39d5923fa Update rcs.dm (#31880) 2026-04-18 21:09:43 +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 1895ea77cb EE Grid Check Event (#31812)
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2026-04-14 04:13:50 +00:00
PollardTheDragon cf80c0b2b1 Fixes isopod oversight (#31898)
* Fixes isopod oversight

* Fixes some naming too
2026-04-14 04:13:18 +00:00
PollardTheDragon 322280c196 Fixes dueling pistol reloading (#31894) 2026-04-14 04:11:28 +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 aea6c4d794 Nerfs Aggressive Spread (#31824) 2026-04-14 03:18:51 +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
PollardTheDragon 3d934ba704 [EE] Adds Aurora Caelus Event (#31816)
* EE Adds Aurora Caelus

* Reduce event to MAJOR

* Whoops
2026-04-14 03:02:58 +00:00
Ahzpy 8edfbe726a hair (#31838)
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2026-04-14 01:21:40 +00:00
CRUNCH 5047c35ed3 Adds Durkehiet, removes Howler (#31844) 2026-04-13 23:46:01 +00:00
CRUNCH 9f3ef95934 Moves Rod Chamber Plastitanium to Circuit (#31849)
Removes the 2 plastitanium sheets from the rod chamber construction and instead adds 4000 cm^3 (equal to 2 sheets) of plasma and titanium cost to the circuit board.
2026-04-13 23:45:06 +00:00
som030711 73668fe3bb Added vaccines to the list of safe chemicals for the hypospray. (#31741)
Signed-off-by: som030711 <som030711111@gmail.com>
2026-04-13 23:33:25 +00:00
Toastical 34e67e4698 fix wrong cyborg modules getting unselected when losing one to damage (#31868) 2026-04-13 23:32:12 +00:00
PollardTheDragon 89e8381f0d Updates False Alarm Event (#31845)
* Updates False Alarm Event

* Whoops
2026-04-11 22:13:09 +00:00