Commit Graph

7577 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Toastical
8a5087a646 migrate tapes and tape recorder to the new attack chain (#31201) 2025-12-16 07:52:57 +00:00
Christer2222
5ed784bc25 Improves the UX of crafting menus by adding more categories (#31035)
* metal, wood, cloth, runed, bamboo,

* plastic

* brass

* glass

* electronics -> wall-mounted

* removed extra parenthesis

* moved floor lights to construction

* renamed stuff
2025-12-14 15:50:34 +00:00
kyunkyunkyun
b0463d3c83 Convert most spans to defines (#31080)
* spanish?

* aaaagain

* keep maptext

* Update robot_items.dm

* Update span_defines.dm

* compiles

* Update silicon_mob.dm

* compile
2025-12-13 23:55:48 +00:00
Contrabang
ef7e48db9c Makes a ton of dirs into defines (#31244)
* Makes a ton of dirs into defines

* lol oops

* "fix"

* ignore everything
2025-12-12 20:32:33 +00:00
Hayden Redacted
5728e0c46f Adds Water Vapor and the Electrolyzer (#30875)
* this will work first try (adds water vapor and the electrolyzer)

* naming fix

* removes a warn

* makes water vapor able to be seen and adds it to the tiny_test atmos map

* Build Rust library

* adds the electrolyzer to all maps, and linter fix

* linter fix part 2

* electrolyzer tweak and more work on the test_atmos map

* tgui rebuilding

* re
rebuilding tgui

* makes the electrolyzer consume power and some small test atmos touch ups

* im axing the test_tiny because i don't want to map it

* clarifies how much power the electrolyzer uses

* Build Rust library

* suggestionss

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* updating the SM manual

* electrolyzer tweaks

* dg suggestions pt. 2

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

* removed unused code

---------

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@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: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2025-12-10 00:04:11 +00:00
DGamerL
ead98c299a Fixes a bunch of bugs with chemical flamethrower canisters (#31177)
* Finally got around to this

* Killing the linters

* Apply suggestions from code review

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-12-09 02:50:17 +00:00
Alan
439b610530 Replace captain's garment bag with CapDrobe (captain's dresser-wardrobe). (#30885)
* Replace captain's garment bag with CapDrobe.

* Incorporate feedback
- Restore chef vendor items from a stash apply gone wrong
- Make captain's gloves free
- Make basic captain wardrobe items more numerous
- Correct CapDrobe broken icon state name

* Fix small map error.

* Convert 'capdrobe' to a lockable dresser-wardrobe.

* Notify silicons of items they remove from wardrobes.

* Apply recommendations from review.
2025-12-08 22:00:52 +00:00
PollardTheDragon
5d4a01148e Smithing Expansion: Knives and Mothsilk (#31084)
* Smith Knives Initial Commit

* sprites and handling

* Knife stuff, mothsilk

* Touch ups

* Linters

* 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>

* Abstract type desc

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-12-08 21:34:30 +00:00
PollardTheDragon
9248c028b1 [PTBF] Example PR: Kill Station Pet (#30650)
* Pet Assassination

* Antag rolls

* Adjusts weights to equal 1000

* Map deconflict

* Linter

* Update code/game/gamemodes/objective.dm

Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-12-05 22:16:33 +00:00
Hayden Redacted
f4adee5f3a Fixes a Typo in the Reagent Scanner (#31178) 2025-12-04 23:54:27 +00:00
Ahzpy
f36344740c Adds Blind Cane (#31136)
* blind cane

* fix equal sign spacing

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

---------

Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-12-04 15:59:23 +00:00
Alan
c7ac9f1037 Add soft drinks to bar secondary goals. (#31100)
* Add soft drinks to bar secondary goals.

* Thanks, linters!

* Update bar manual to reflect that procurement will accept soft drinks.

* Add drink difficulties to synthetic soft drinks.
Amend bar manual.

* Thanks, linters!
2025-12-03 18:31:30 +00:00
Alan
101af16180 Adjust monitor headwear, featuring cowboy hats. (#31066) 2025-12-03 16:58:02 +00:00
Toastical
4506011bbf add an argument that toggles spammability of use_tool() (#30962)
* add an argument that toggles spammability of use_tool()

* make argument more specific
2025-12-03 16:12:10 +00:00
funglios8s
6a6f81131e Adds Tapioca and Cassava plants (#30937)
* dat

* Fixes a few issues and makes the pudding look good

* fixes all sprites with hope

* actually should fix the sprites

* fixes cassava sprites and dough recipe oversight

* fixes tabbing issues and prevents botany gaming

* makes the linter happier + deletes duplicate file

* changes many things about the order

* generalizes the food reagentcontainer + linter gud

* fixes the merge conflict

* removes the settings on my vs code from my pr

Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com>

* Adds suggested changes

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

* adds an abstract description

* fixes an accidental deletion of vscodesettings

* Update code/modules/reagents/reagent_containers/food.dm

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

* adds a missing typepath

* Apply suggestions from code review

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

* Propose 2 tapioca pudding sprites.

* removes unused tapioca pudding sprite

* fixes my paradise.dme file

* Add new teas to the bar manual.

* adds alfalfa scout's recommended mix message

* attempts a fix for the .dme file

* removes a deconflicter mistake

* Apply suggestions from code review

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

---------

Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
2025-12-01 19:12:50 +00:00
Toastical
a1fc8db55f standardize temperature_expose args (#30903)
* standardize temperature_expose args

* some i missed

* remove dubious use of temperature_expose()

* fix hardsuit tank insertion proc

* remove unused gas_mixture arg

* revert test_tiny.dmm
2025-12-01 18:58:38 +00:00
Alan
99fad46e39 Prevent non-adjacent mobs from spinning the roulette. (#31161) 2025-12-01 14:07:55 +00:00
CRUNCH
9a21d7363c Updates Mineral Doors (#31071)
* door

* Update mineral_doors.dm

* Update test_attack_chain_structures.dmm

* Update rocky_motel_submap.dmm

---------

Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
2025-11-30 09:49:05 +00:00
CRUNCH
425d9313fa Update kitchen.dm (#31073)
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
2025-11-30 09:48:40 +00:00
Hayden Redacted
0e8a6d0267 Fixes a Typo When You Deconstruct with an RCD (#31130) 2025-11-28 09:39:48 +00:00
Christer2222
d4a435f740 You can now color boxes using crayons (#30977)
* Americanized spelling

* more spelling

* spelling + alt click

* recoloring box, put it in hand and in bag

* in backpack now

* remove old comments

* updates inventory if backpack is open

* place in bags even on floor

* null check + checks actual type

* added the color tables

* added empty subtypes. Fixed movign away bug

* lint

* mapload + as mob removal

* early returning

* removed type checks. Added more checks for coloring

* added a description + early return on color tables

* lint

* documentation, formatting, HAS_TRAIT

* formatting
2025-11-28 03:51:46 +00:00
Alan
b29d968148 Add 23 new drinks; update bar manual. (#31026)
* Add 23 new drinks; update bar manual.
- Add three new drinks that use the beet shrub and their effects
- Add nine new synthanolic drinks and their effects
- Add two new soft drinks for both synthetic and organic customers, and their effects
- Add 10 new soft drinks for synthetic customers and their effects
- Add decals for reagent splashes and drips
- Update bar manual to include these drinks as well as all other mixed drinks currently on the wiki
- Add new sprite for welding fuel in a glass to reflect the liquid's color instead of Dr. Gibb
- Add chemistry recipes to mix electrolytes
- Change Robot Tears' drink difficulty to easy, to reflect the loss of ubiquitous oil tanks
- Add many, many puns, both visual and in written text

* Thanks, linters!

* Thanks, linters! (part 2)

* Thanks, linters! (part 3)

* Incorporate review suggestions.
- Add reagents to the zero day drips
- Rewrite many if statements to be early returns/continues
- Use nutrition defines
- Make hard and soft reset also purge themselves (my choice)

* Update dryer martini sprite to match proposal #31050

* Incorporate review suggestions.
- Remove reagents, weren't needed.
- Make sure basecolor is applied.
- Convert more if-blocks to early returns.
- Adjust spacing in function calls to match standard.

* Implement whitespace suggestions from review.
2025-11-26 21:24:06 +00:00
Alan
07074ec6fe Proof of concept/proposal: Add page-seeking URL capability to books. (#31007)
* Add page-seeking URL capability to books; Update bar manual.

* Capitalize all instances of 'back to Table of Contents'
2025-11-25 21:25:24 +00:00
CRUNCH
0b1b8866fc The Service Borg RSF Can Put Stuff in People's Hands (#30974)
* Update RSF.dm

* Update RSF.dm

* Update RSF.dm

---------

Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
2025-11-23 03:05:34 +00:00
CRUNCH
9c92917dd2 Gives the Janiborg a Push Broom (and allows the janiborg combat broom to sweep) (#30820)
* BROOOOOOM!

* Update robot_items.dm

* Update robot_items.dm

* Update robot_items.dm

---------

Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
2025-11-22 22:18:53 +00:00
Chap
d3c7c82372 [FIX/SPRITES] Fixes a bunch of in-hand weapon sprites (#31023)
* Fix a bunch of in-hand weapon sprites

* Correct chainsaw names

* Readd KC sprites

* Remove empty state

* Spellblade and darkblade

* Spellblade fixed

* Chainsaw fixes

* Darkblade renamed

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

Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
2025-11-17 19:18:45 +00:00
CRUNCH
082b5283ad Update rpd.dm (#30973)
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
2025-11-16 11:52:42 +00:00
DGamerL
0d7929f34f Mops can now clean on disarm and grab intent (#30828)
* Mops can now clean more easily

* Also changes the janicart

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

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@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>
2025-11-13 23:23:57 +00:00
Christer2222
7615c724d3 adds xenobiology headset (#30780)
* adds xenobiology headset

* created xenobiologist locker

* adds the lockers to maps
2025-11-12 20:16:57 +00:00
kyunkyunkyun
f96b26b75a /obj/item/projectile --> /obj/projectile (#30411)
* yers

* vars

* map changes

* some comments (clearly not stolen from items)

* fix component

* summary
2025-11-12 10:23:20 +00:00
iramoye
9f1a329238 initial commit (#30887) 2025-11-11 10:30:36 +00:00
Alan
3af59de586 Update Research Director's suit and skirt, re-add (#30848)
* Update rd's old suit and skirt and re-add them

* Thanks, linters!
2025-11-10 16:32:38 +00:00