Commit Graph

23906 Commits

Author SHA1 Message Date
warriorstar-orion
10aedabb19 refactor computerframe / circuitboard sources (#31408) 2026-01-25 08:31:21 +00:00
Alan
c23be0a5f9 Add round tuits. (#31452) 2026-01-25 08:22:09 +00:00
CRUNCH
489063ba73 Allows the Recycler to Recycle Wood (#31442)
* Update recycler.dm

* Update material_container.dm

* Update code/game/machinery/recycler.dm

Co-authored-by: Contrabang <91113370+Contrabang@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: Contrabang <91113370+Contrabang@users.noreply.github.com>
2026-01-25 08:21:02 +00:00
CRUNCH
2d636ff764 Migrates Null Rods to the New Attack Chain (#31370)
* Update holy_weapons.dm

* Update holy_weapons.dm
2026-01-24 06:15:21 +00:00
CRUNCH
0df30df20f The Signening: Ports SS14 Departmental Signage (with slight modification), and Adds Luminecent Evacuation Signs (#31360)
* SIGNS!

* signening

* lavaland

* remove news and genpop

* syndie space base

* Update moonoutpost19.dmm

* Add sign icons for genetics, mining, smith, labor camp.

* signs!

* Add evidence sign icon.

* evidence

* Update metastation.dmm

* Create .merge_file_7hTbQH

* Update metastation.dmm

* Update metastation.dmm

* e

* Delete .merge_file_7hTbQH

This is not supposed to be here.

* Apply suggestions from code review

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

* remove demons and change smoking sign types

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2026-01-24 06:15:18 +00:00
MixityMaxity
d44ce634d9 Resprites Mech Armor Modules (#31428)
* Resprites Projectile and Melee Booster, aswell as Mining Armour

* Makes the groove on melee armour smaller

* Alters the description on the three items to make them fit the new sprites

* changes part of the melee armour description
2026-01-22 06:29:06 +00:00
Pooble
db643c7460 Separates the wizard hat and fake beard into two different items (#31171)
* separate wizard hat and beard into two separate items

* small sprite tweak

* lint

* Update code/modules/clothing/suits/wiz_robe.dm

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Signed-off-by: Pooble <90473506+poobsie@users.noreply.github.com>

* make the wizzy beard clip onto the wizzy hat

---------

Signed-off-by: Pooble <90473506+poobsie@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2026-01-20 00:40:02 +00:00
Alan
86834604b3 Fix a bug related to storage gathering. (#31449) 2026-01-18 00:33:19 +00:00
AVeryReluctantSpider
6a1fc4f5c2 Praise Be and Skkula: The PR (Skkulakin Race 2025) [READY FOR REVIEW] (#30744)
* skulk.dm placeholder for testing purposes

* Made an oopsie, fixed

* Skulk flesh color and language color testing

* Adding working language key, fixed language color

* Changed skulk flesh color, may change it again soon

* Ran tgui, hopefully fixed language color

* Changed skulk language color, hopefully for good this time

* Missed a spot

* Tgui fuckery

* If at first you don't succeed, cry to yourself for a bit then try again

* Tgui makes me violent

* Eyewear no longer save Skkulakin from flashes

* Skulk bones now hurt really bad

* Adds Skulk Sprites, Back Accessories, and other Placeholders

* Desperately trying to get body_accessories to work

* Minor name changes

* Skkulakin now have colorable eyes

* Makes the silk-spinning ability somewhat work, more changes need to be made

* Fixes the Skulks' ability to spin silk, however still needs changes

* Changed Skulks easier bone breaks into a trait

* Skulks (Now with 100% ethically sourced back spines!)

* Gives Skkulakin the Vox clothing sprites (Not counting head, glasses, or masks)

* Added update_spines_layer() for testing and help purposes

* Working on getting Skulk Backspines to change color depending on preset

* Skulk Backspines are now colored the same as your preset up spawning in (Thank you, Qwerty)

* Undefines SILK_NUTRITION_AMOUNT (I made a woopsie)

* Readds a return I may have accidentally removed at some point

* Skkulakin can now chitter

* Silk now be used to craft cloth and has an icon

* TGUI is going to make me do things

* Fixes the Brittle Bones Trait to work with Frail Quirk

* Sprite Fix

* Adds masking helpers

* Made a small woopsie

* I'm genuinely a fucking idiot

* Adds a bunch of new clothing

* Changes some clothing descriptions

* Fixes more placeholders and adds two new outfits

* Made small mistake, fixed

* Temporary change (Will revert soon)

* Reverted previous changes as the event is now over

* New Skulk Clothing, added some to the racial tab in the loadout, and made low-inquis robes orderable from cargo

* Adds High-Inquis Robes into cargo console

* Adds Skkulakin Flag (Orderable From Merch Vendor)

* Made small mistake, fixed it

* Inquisitorial Crate only has Low-Inquisitor clothing again

* Commits all offered suggestions

* Converts spans to defines and sorts out the rest of Skulk clothing (No MODs just yet)

* Gives Skulks the Nian Butt Sprite for now

* Fixes a small error with biosuits

* Fixes small coding error

* Fixes a few mor small coding errors

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>

* Update code/modules/economy/merch_items.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>

* Removes 'collective' from outfit_admin.dm

* Basic Pixel-Shifting (Not Yet Complete)

* improve skulk headwear offset

* Revert "improve skulk headwear offset"

This reverts commit 2d93d61699.

* improve skulk headwear offset

* Cleans up some code and fixes ALL hats for Skkulakin

* Lets the AI speak Skkula-Runespeak, fixes Bomber Jackets and Winter Coats, makes Backpacks look better, fixes other small sprite issues

* Let them wear pants

* Update code/modules/mob/language.dm

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

* Fixes masks and glasses for skkulakin

* Fixes Inquisitor Masks and adds missing Engineering Outfits

* Fixes Explorer Suits and HECK Suit for Skulks

* Fixes a few small issues and resolves some suggested changes

* Rebuilds TGUI

* Fixes Science Jumpsuits & Radsuits

* Fix Skkulakin chef belt disappearance.

* fix string assoc lookups for alists

* Update code/game/objects/structures/mirror.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/species/skulk.dm

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

---------

Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
2026-01-17 20:54:56 +00:00
CRUNCH
090671b2a9 overlays woo (#31396) 2026-01-11 20:51:28 +00:00
iramoye
1f678ea5f8 Removes throwforce from bedsheets (#31397)
* Initial commit

* Deletes the throwforce var from bedsheet
2026-01-11 20:51:04 +00:00
CRUNCH
b7ac71d48a Adds Skeleton Crew Access (#31389)
* Spooky scary skeletons

* Spooky scary skeletons

* Spooky scary skeletons

* Merge

* Merge

* Update job_defines.dm

* Update support.dm

* Update support.dm

* Update science_jobs.dm

* Update support.dm

* Update security_jobs.dm

* Update cards_ids.dm

* Update cards_ids.dm

* Update support.dm

* Update cards_ids.dm

* config

* Update SSjobs.dm

* captaincy
2026-01-11 19:22:15 +00:00
Toastical
2df60ba208 Wire up client mobs to the spatial grid (#31330)
* Add client mobs to the spatial grid

* reviews

* apparently having a mob is not guaranteed
2026-01-10 20:20:36 +00:00
Pooble
4acbbc1e52 Vastly improve Protect objective targeting (#31041)
* make protect objective more robusto

* small tweak to fix an edge case with timers

* add delayed obj text to protect
2026-01-09 10:40:09 +00:00
Ahzpy
c8d32f8484 Locker Resprite (#31351)
* ALL THE LOCKERS

* forgot one

* mime locker fix

* bluespace locker animation tweak
2026-01-08 10:45:23 +00:00
Kyani
f81ef075f1 The NGCR: Nuclear Fission Reactor (#30493)
* coefficient balancing

* damage and meltdowns

* meltdown stuff

* alert stuff

* lots of work - whew

* some enrichment code

* rod encrichmnt

* working on enrichment

* more fabrication

* rod fab

* start to the nuke

* overload sprites

* overload code work

* some overload tweaking

* small tweak

* coolant ejections and QOL things

* overheat events + ripley gripper

* rebase + venting code

* save before rebase

* some pre-work for rods

* finishing the base rods

* fixed my dme

* de linting

* tiny lint fix

* more lint fixes

* linting

* linting

* linting

* linting

* linting

* temp delint

* temp delint

* undo TM stuff + minor fix

* didnt save

* some fixes

* fixes

* fixes and engine repair

* fixed broken durability decay

* LOTS of things

* tgui

* lint

* linter

* linter

* minor shit

* Update boxstation.dmm

* major refactors and fixes

* saved this

* critical testing tweaks and fixes

* fixes and tweaks

* smithing start

* forgot to save

* craftables + grill start

* saved

* fix

* more grill work

* Update tgui.bundle.js

* linter

* linter

* fixes

* rod fabricator initial

* cooking work

* push

* soundwork

* sound work tweak

* comments + sounds + toxins gen rework

* lots of work

* sprite stuff

* deconflicting

* delinting

* bundle rebuild

* prettier

* feex

* fuck you OD

* who asked?

* update to tgui

* another edit to tgui

* finish tgui

* remove debug metadata button

* rod tweaks for tgui

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/mecha/equipment/tools/work_tools.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/mecha/equipment/tools/work_tools.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/objects/items/robot/cyborg_gripper.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/parrot.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/parrot.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/parrot.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/parrot.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_misc.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_misc.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_misc.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/reactor.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/reactor.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/reactor.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/smithing/components/misc_components.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update tgui/packages/tgui/interfaces/NuclearRodFabricator.jsx

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Spans

* tgui build

* rod redo

* improve tgui for fabricator

* sprites and centrifuge/fab work

* tgui update

* spritework

* cyberiad + hydrogen conversion

* kerberos + counter

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* sprite + fab tweak

* tgui bundle

* lintering

* bugfixing

* linting

* linting

* event tweak

* add missing gases to fission monitor

* issue fixing

* sprite/overlay fixes

* mapping

* stations again

* space lattice

* tine tweak

* linter

* no rod alerts

* buttons

* loose wire

* make it so you can interact through rod casings and the uhh big thing in the center, what's that called again

* fixes

* door fix

* many bug fixes + crates

* fab ghost touch

* water convert + maint sprite + fixes

* pack changes + neighbor fix

* doors rename

* didnt save

* hydrogen fix

* map tweaks

* repair fixes + corium LETHALITY

* upped broken rad damage

* pipe rename + overload icons

* more roundstart moderators

* rod tree tweaks

* tweaks

* pack and enrichment fixes

* misc tweaks and fixes

* fixes: Density, circuits, coolant offline negation

* Apply suggestions from code review

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* review changes

* linter + fix

* reviews and fixes

* LOTS of tweaks and changes

* supermatter kit

* spacematter balance

* tgui

* fixes and tweaks

* didnt save this

* mapping + smith fix

* cargo rods arnt radioactive til opened

* Apply suggestions from code review

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* review items

* fixes

* linters

* moving components out of nullspace

* examine fix

* Update tgui.bundle.js

* explosion nerf and minor fix

* Apply suggestions from code review

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* reviews

* map fix + ripley rad immune

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* review

* fix chamber examine

* tweaks + rod fab disk drop

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* review changes

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* fixes

* tgui bundle

* small rod tweaks

* Update code/game/machinery/computer/buildandrepair.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/smithing/components/reactor_components.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/reactor_machines.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/reactor_machines.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* reviews

* Update code/modules/power/engines/fission/reactor_machines.dm

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

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Paul <pmerkamp@gmail.com>
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2026-01-07 09:19:43 +00:00
Christer2222
bd4bfa0754 Improves Identification Computer Card Skins UX + fixes unselectable NTC card skin (#31307)
* ImageButton

* icon from DM

* fixes NTC skin

* resized window

* build

* test
2026-01-05 01:37:50 +00:00
warriorstar-orion
1701729968 fix radio not working on shuttle, for real (#31383) 2026-01-04 10:58:33 +00:00
CRUNCH
a2f57761d2 Update defib.dm (#31375) 2025-12-31 16:21:53 +00:00
BrickTheHooman
b1c2651fe2 fixes it (#31378) 2025-12-30 19:39:04 +00:00
Alan
8f87fa0b98 Add juice boxes. (#31331)
* Add juice boxes.
- Include juice boxes in packed lunches quirk.
- Make juice names and drink names in drinks_reagents.dm more consistent.

* Appease linters with static typing?

* Add juice box box. It's a variety pack.

* Add trailing commas to positive quirks as requested.

* Add random juice box spawners.
- Spawn random and specified juice boxes on station maps.
- Spawn partial juice variety packs on station maps.

* Add juice box variety pack supply crate.

* Make juice box storage even fancier.

* Thanks, linters!

* Thanks, linters! part 2

* Give the pre-packaged juice boxes a brand name.

* Apply whitespace suggestion from review.

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@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: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-12-30 05:32:56 +00:00
CRUNCH
8519c59c7e Migrates Paper and Paper Bundles to the New Attack Chain (#31294)
* w

* migrated

* Update paper_bundle.dm

* linters

* Apply suggestions from code review

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@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: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-12-30 05:32:35 +00:00
Pooble
8e79d6c089 Adds configs for hijack population minimums (#31206)
* add config for hijack pop lock

* woopsie daisy

* doth this please you, your lintliness?

* nerd emoji

* address DGL's most beauteous code review
2025-12-29 13:49:45 +00:00
BrickTheHooman
00eb823fe6 migrates arcade battle to tgui (#31186)
* migrate arcade battle ui

* fixes a weird comment

* changes according to review

* fixes autodocs comments
2025-12-29 13:43:42 +00:00
CRUNCH
ee13dce3e1 Borg Push Broom Icon Updates When Braced (#31255)
* broom

* Apply suggestions from code review

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

* Update code/game/objects/items/robot/robot_items.dm

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

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-12-27 09:35:27 +00:00
PollardTheDragon
a590870d00 Monke Business - Ports monkey AI from TG (#31067)
* Monke Mode

* Punch

* Some comment stuff

* Linters, excess

* Linters

* Emote stuff

* Pause monkey AI during do afters

* Small improvements

* Oops

* Fixes monkeys trying to drink forever from a glass

* Knockdowns and stamcrit fixes

* Removes eating/drinking from Pun Pun

* Monkey controller improvement, bug fix

* Fixes monkey item giving

* Fixes brain swaps

* Fixes

* Update code/datums/ai/monkey/monkey_controller.dm

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

* Addresses code review

* Oops

* Oops round 2

* Fixes monkeys staying in trip mode when evolved

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-12-26 22:44:52 +00:00
DGamerL
a1e27c07da Turns some wounds into datumized versions (#31297)
* Wound datumization

* Rejuv additions

* Fixes

* Adds `get_wound()` proc

* Ruptured lungs get fixed now

* Apply suggestions from code review

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

* Fix this

* Potentially fix an issue, might remove the proc later

* Many fixes

* Fuck

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-12-26 22:29:05 +00:00
Vengie0
65441316e7 Turns off quick gather for duffel bag's and add's a duffel bag zip/unzip notice in chat. (#31281)
* Rebinds the duffelbag keybind to Alt+Click to prevent conflicting keybinds related to it.

* rebinds the unzip/zip hotkey back to what it was before and just removes the pickup_all_on_tile message at the bottom right for duffelbag's.

* Rearranges visible_message and replaces SPAN_WARNING to SPAM_NOTICE.

* Update code/game/objects/items/weapons/storage/backpack.dm

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Vengie0 <zaydrabah11@gmail.com>

* Update code/game/objects/items/weapons/storage/backpack.dm

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Vengie0 <zaydrabah11@gmail.com>

---------

Signed-off-by: Vengie0 <zaydrabah11@gmail.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2025-12-26 22:21:32 +00:00
PollardTheDragon
74d723496f Adds Paintball Guns (#31184)
* Paintball Guns

* Linters and cleanbot

* Fixed examine text

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Fixes decals

* Update code/game/objects/effects/decals/Cleanable/misc_cleanables.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Update code/modules/projectiles/guns/projectile/toy.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Spans

* Clean code fix

* Apply suggestions from code review

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

* Removes excess cut

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-12-26 22:12:03 +00:00
Alan
4af014d720 If a buckled mob enters a bear trap, damage buckled object (#31192)
* If a buckled mob enters a bear trap, damage buckled object

* Amend comment whitespace.
2025-12-26 21:03:40 +00:00
DGamerL
1955422059 Refactors reagent scanners to not use 7+ year old code (#31188)
* Fucking scanners man

* Remove debug

* Update code/game/objects/items/devices/scanners.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Aaaaaaaaaaaaaaaaaaaaaa

* Attackchain migration

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
2025-12-26 21:01:16 +00:00
DGamerL
7594638d6a Hopefully makes surplus safer (#31274) 2025-12-26 20:54:33 +00:00
DGamerL
231a1206c3 Larger than expected (#31265) 2025-12-26 20:44:42 +00:00
CRUNCH
8703edf492 Adds SSD for Silicons (#31205)
* Silicon SSD

* Tied everything with a bow

* Update code/modules/mob/living/silicon/robot/robot_logout.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>

* Update robot_mob.dm

* Apply suggestions from code review

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@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: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-12-26 20:35:14 +00:00
CRUNCH
ee228cdb6b Migrates restraints to the New Attack Chain (#31310)
* e

* Update legcuffs.dm

* Update umbrae_powers.dm

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

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-12-26 10:50:42 +00:00
Alan
58ce2e0d05 Fix a bug related to storage transfer. (#31353) 2025-12-26 05:52:17 +00:00
CRUNCH
eeb980f191 Adds Reycleable Materials to a Bunch of Objects (#31320)
* recycle

* moar

* Update glass_containers.dm

* Update spray.dm

* cost adjustment because sheets are 2000, not 1000

* Update hydroitemdefines.dm

* Update hydroitemdefines.dm
2025-12-25 21:03:22 +00:00
Christer2222
33dff2756e Adds a description to C4 and X4 showing you can set a timer (#31308)
* description

* new description
2025-12-25 21:00:41 +00:00
Toastical
4433f60e18 Make ruptured lung appear in the organ containing the lung (#31303) 2025-12-25 09:49:56 +00:00
Wenlock_The_British_Hobo
a3bb94b905 Cannibalism Update™️ (#31142)
* dmi time

* .dmi stuff done, maybe

* Created cannibalism.dm and moved KFV's obj stuff.

* Update cannibalism.dm

* Wild Wings and Bug Bar

* A few more.

* Meow Mein

* Lead and Plasma-Bone Broth

* Multiple possible sprites.

* Last food item. Next recipes and the Bone Rod.

* Adding bone rod sprites and sprites for bone rod variants of food with metal rods in them

* Fix complaining of the compiler.

* Bone Rods

* Almost everything done.

* Bone Rods ticked.

* dme updated on compile.

* Forgor the BBQ variant of Moffolo Wings needed a unique path.

* Probably make Plasma-Bone Broth flammable like plasma sheets.

* Should light now, will test later.

* Some recipes, and processor.

* Processor was complaining, also changed a parameter to be readable.

* More bone rod.

* The rest of them.

* No more errors on compile.

* Recipes tested and things fixed.

* Lead works.

* Kidneys dead? Toxin.

* Soy Sauce in the Meow Mein.

* Working sprite RNG.

* Make Linters happy

* Apply suggestions from CRUNCH's code review to fix Plasma-Bone Broth's flame.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Make linters happy

* Updated bone rod description to be less vague.

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* More descriptive recipe names in code

* Replace Meow Mein sprites with Feline Mignon

I'll see about using the Meow Mein sprite for chef craftable Chow Mein, as the issue is with Meow Mein not the sprite.

* Change code from Meow Mein to Feline Mignon

* Don't need the blank recipe list in this PR.

* Update code/game/objects/items/stacks/bone_rods.dm

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

* Update code/game/objects/items/stacks/bone_rods.dm

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

---------

Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-12-24 20:21:36 +00:00
Alan
e7dc0c3cf5 Fix bandana colors after dyeing. Fix typo. (#31243)
* Fix bandana colors after dyeing. Fix typo.

* Thanks, linters!
2025-12-24 20:20:33 +00:00
DGamerL
274a78d8b1 Compiles (#31302) 2025-12-24 16:10:19 +00:00
PollardTheDragon
5fa2a62c09 Adds smithed knives to smith spawners (#31236)
* Adds smithed knives to smith spawners

* Apply suggestions from code review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2025-12-24 01:12:34 +00:00
Hayden Redacted
6ba5dbfdbb Fixes burning tiles from plummeting to subfreezing temperatures (#31291) 2025-12-24 01:04:03 +00:00
CRUNCH
d360ca18cc Fixes Chemthrower Fire Burning Mobs That Don't Care About Fire (#31316)
* fire

* Update fire_effect.dm
2025-12-19 13:10:59 +00:00
CRUNCH
424af8e3e3 Update sheet_types.dm (#31319) 2025-12-19 11:29:28 +00:00
warriorstar-orion
481f035722 Metastation kitchen area redesign and related features, take 2 (#30754)
* Metastation kitchen area redesign and related features, take 2

* reviews
2025-12-18 23:46:17 +00:00
Christer2222
e2efb09016 Adds a display for job difficulty as well as a description of the job (#30960)
* tip window, comments, padding, difficulty supervisor

* spacing

* shows missing stars

* dmi to base64

* defines

* assigned difficulty to each job

* added star sprites

* assistant fix

* show stars when assistant

* Fixed restrictions

* comment

* consistent size work preference

* tooltips now work, indented html

* inlined the tooltip script

* Moved buttons to top

* padding and margins

* align learn more button right

* css cleanup

* added descriptions. HTML encoding.

* cargo description expansion

* linting

* null check

* l

* 3 half stars

* lint

* miner difficulty 3->4

* spacing and removed old test comments

* spacing pt1

* spacing pt2

* string names of colors

* spacing

* rearranged defines

* span -> defines

* snake_case

* removed extra space

* Apply suggestions from code review

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

* Update code/modules/client/preference/character.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-12-18 23:09:07 +00:00
1080pCat
1e86d30353 flips the light switch direction for building on diagonals (#31223) 2025-12-18 09:31:09 +00:00
CRUNCH
6fc59844e9 Improvements to Borg Icon Handling (#31251)
* e

* Update chameleonproj.dm

* death to custom panel

* Update robot_mob.dm

* Update robot_mob.dm
2025-12-18 08:57:42 +00:00