Commit Graph

28613 Commits

Author SHA1 Message Date
Toastical fe7d3ca3f3 update staffsay log title (#29585) 2025-06-11 15:18:45 +00:00
Kyani fdcf4899a2 Frankenstein Station 13: Introducing dissections and alien organs to xenobiology (#29093)
* ddsadsa

ddsadsa

* moderate again

* revert

* beginning with rebase

* organssssssssss

* organs now process!

* analyzer finished! + mapping

* tool bit implementation and quality

* organs and fixes and reworks

* more organ work

* more organs done

* more organ progress!

* more organ work

* MORE. ORGANS.

* temp

* more organsssss

* ITS DONE!!!!!!!!

* oops

* also oops

* linter stuff

* forgot this + oops

* linter

* i forgot to save!

* lots of improvements and tweaks

* move icon over

* icon tweaks

* icon mistake

* oops

* dumb

* more icon validations

* i think thisll fix it?

* Apply suggestions from code review

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

* fixes

* fixes+tweaks

* fix

* oops

* linter

* i didnt save....

* this should give -some- warning

* forgot a span

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* beginning edits

* more fixed and tweaks with cooldowns

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* lots of tweaks

* more review changes

* comment change

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* returns start back to gland

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* code review fixes

* trying to make surgery work....

* might as well push this

* perfection. now i need text

* text + small tweaks and bugfixing

* linting

* forgot to implement this

* deconflicting maps

* modifying for xenos again

* i guess this wasnt needed???

* added surgical belts to xeno

* minor swap

* quick fix

* small tweaks

* small tweak

* tiny tweak

* some slime updates

* more tweaks

* more updates

* first batch of fixes

* hiero audio fix

* robotic fauna fixes

* more rounds of bugfixes

* prevents teleporting

* tiny fix

* makes sharp more common

* misc fixes

* surgery and revenant fixes + extractor

* adds cursed organ logging

* small bananium organ tweak

* actually gives teleporter access

* adds a message to the analyzer

* can now drag naughts

* slime behavior tweaks

* headslug tweak, cant eat organs

* Update code/datums/components/special_tastes.dm

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

* Update code/datums/components/special_tastes.dm

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

* Update code/datums/components/special_tastes.dm

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

* Update code/modules/mob/living/simple_animal/slime/slime_mob.dm

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

* Update code/modules/mob/living/simple_animal/slime/slime_mob.dm

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

* Update code/game/gamemodes/miniantags/revenant/revenant.dm

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

* Update code/datums/components/special_tastes.dm

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

* Update code/game/gamemodes/miniantags/abduction/gland.dm

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

* Update code/game/gamemodes/miniantags/abduction/gland.dm

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

* moved this

* major rework prep

* didnt save

* rework done

* small fix

* makes aliens draggable by crew after death

* shouldnt have cut this

* xeno organ tweak + tips

* oops

* fixes and tweaks to slimes

* not used

* temp revert

* rebase map files to master

* re-applying changes

* access fix

* access tweak

* big fix for new refactor

* more refactoring

* forgot a span

* Update code/datums/components/surgery_initiator.dm

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

* hiero only doesnt target dead megafauna

* various fixes

* fix requests

* fixed weird conflict markers

* deconflict

* deconflicting

* antimagic flags

* merge fixing

* Update code/modules/mining/lavaland/loot/hierophant_loot.dm

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

* regen mesh fix

* small fixes

* tick fix

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* grammar

* Update code/modules/surgery/organs/organ_internal.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/surgery/organs/organ_internal.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/research/xenobiology/xenobiology_organs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/research/xenobiology/xenobiology_organs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/research/xenobiology/xenobiology_organs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* tweaks

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-06-10 16:46:56 +00:00
PollardTheDragon d8f47f5ee9 Fixes AI program nanites (#29373)
* Fixes AI program nanites

* Updates descriptions

* Fixes bad indentation from merge conflict resoltion

* Makes nanite cost work with one var

* All one var

* Linters

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-06-07 14:20:32 +00:00
PGray 796f91aeb5 Fix: Reset smithing machinery operation state when power is lost during operation, preventing equipment from getting stuck (#29419) 2025-06-07 14:15:26 +00:00
Qwertytoforty 4f0e877948 Allows ruins to block other ruins from spawning on the same level (#29435) 2025-06-07 14:08:58 +00:00
Contrabang 74694e5059 Allows cult fall to have more cultists on lowpop (#29453)
* Makes cult fall more forgiving on lowpop

* oops
2025-06-07 14:04:26 +00:00
Seren Highwater. 22636353c7 Adds tracksuits to the loadout. (#29510)
* track

* loadout
2025-06-07 13:55:57 +00:00
AmityBlamity 067cc4c4e9 Typo fixes to magboots.dm (#29544)
* Typo fixes

* Corrected back to mph
2025-06-07 13:34:18 +00:00
AffectedArc07 174a68a507 SMES Noises (#29394) 2025-06-07 13:29:07 +00:00
Contrabang f9e95a2b1d Adds an icon for non-abstract nodrop items (#29452) 2025-06-07 13:25:01 +00:00
chuga-git 46823f220a mouse in a box (#29479) 2025-06-07 13:21:04 +00:00
CRUNCH 9b5a3264ca Update angel_statue.dm (#29512) 2025-06-07 13:19:07 +00:00
Toastical c9c0519b59 split if check (#29539) 2025-06-07 13:15:33 +00:00
CRUNCH 96e1cb8560 Fixes Incorrect Dublin Drop Recipe (#29540)
* Update drinks_reactions.dm

* Update drinks_reactions.dm
2025-06-07 13:13:44 +00:00
AffectedArc07 11d527c819 READY - Rust HTTP Stuff (#28997)
* WIP AND BROKEN - Rust HTTP Stuff

* this mostly works

* TM ready???

* Build Rust library

* handle failed requests properly

* Build Rust library

* Build Rust library

* Remove TM stuff

---------

Co-authored-by: Chuga <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
2025-06-06 16:51:05 +00:00
Chap 772aa6d21a Gorilla icon updates on death (#29524)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2025-06-04 14:59:03 +00:00
Toastical f6e75a479f added handling for wirecutter interaction (#29407) 2025-06-04 13:17:17 +00:00
CRUNCH df362db8af Gives Medical Cyborgs a Holo Stretcher Upgrade (#29352)
* creation

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

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

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-06-04 13:15:57 +00:00
CRUNCH 3c80dcf246 BSG Extended Description no Longer Lies to You (#29351)
* Update special_eguns.dm

* Update code/modules/projectiles/guns/energy/special_eguns.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update special_eguns.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
2025-06-04 13:08:59 +00:00
Osetrokarasek 0e06151754 More Silly Crates (#29310)
* bleh

* blah

* bluh

* Update folders.dm

* Update pack_miscellaneous.dm

* baba

* bebe

* bobo

* Increased energy use per shot for fake egun

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

* Update code/modules/projectiles/guns/energy/energy.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

---------

Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-06-04 13:00:35 +00:00
Bm0n 4c2928a2bb Makes ban notes public (#28946)
* first commit

* Update code/modules/admin/topic.dm

Co-authored-by: Paul <90473506+pwbokie@users.noreply.github.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Paul <90473506+pwbokie@users.noreply.github.com>
2025-06-04 12:51:55 +00:00
Contrabang c482c8543b fix payroll (#29451) 2025-06-04 11:54:24 +00:00
warriorstar-orion d4851ef6d6 fix putting shells/rounds in mags in zero-g (#29533) 2025-06-04 11:52:47 +00:00
warriorstar-orion a4895a9865 fix putting things/beakers in grinders in zero-gravity (#29531) 2025-06-04 11:04:21 +00:00
Contrabang d0170a11c6 Adds buttons for admins/mentors to see amount of open adminhelp/mentorhelp tickets. (#29498)
* wham

* fix
2025-06-03 21:30:00 +00:00
AmityBlamity 52f5ab0efc Standardized plant names (#29455)
* 🆑 AmityBlamity
fix: Changed ambrosia_gaia to ambrosiagaia to standardize with other plant names
/🆑

* Update code/modules/hydroponics/grown/ambrosia.dm

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

---------

Signed-off-by: AmityBlamity <142629851+AmityBlamity@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-06-03 21:24:41 +00:00
warriorstar-orion 72a4ec7dc9 support running saved sdql scripts (#29480)
* support running saved sdql scripts

* Update code/modules/admin/verbs/SDQL2/SDQL_2.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2025-06-03 21:23:38 +00:00
warriorstar-orion bf27083c53 fix supply console BSOD (#29384) 2025-06-02 18:47:15 +00:00
PollardTheDragon 7fa2648ab3 Nerfs gun parts material costs (#29296) 2025-06-01 16:30:25 +00:00
AmityBlamity 4360b856d1 Spelling fixes/Britishims removed (#29494) 2025-06-01 16:21:52 +00:00
AmityBlamity b81ad78d7c Minor spelling fix in organs_internal.dm (#29474) 2025-06-01 16:15:53 +00:00
AmityBlamity ee4d3615a0 Minor spell fixings/removal of Britishism in bscrystal.dm (#29495)
* Minor spell fixings/removal of Britishism in bscrystal.dm

* Update code/modules/telesci/bscrystal.dm

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

---------

Signed-off-by: AmityBlamity <142629851+AmityBlamity@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-06-01 16:15:32 +00:00
Bm0n 2e91a86a3b thefix (#29500)
Co-authored-by: Bmon <no@email.com>
2025-06-01 16:14:36 +00:00
PollardTheDragon b0fdf5fec1 Fixes components staying hot after completion (#29506) 2025-06-01 16:13:55 +00:00
PollardTheDragon c283aa5d03 Fixes casting basin access not properly denying (#29507)
* Fixes casting basin access not properly denying

* Better positioning
2025-06-01 16:13:31 +00:00
PollardTheDragon 81a9ff0663 Fixes scientific assembler boards (#29508) 2025-06-01 15:50:34 +00:00
warriorstar-orion 2950ebd936 fix hermit in admin equip menu (#29481) 2025-05-30 21:19:41 +00:00
chuga-git 49a677d567 Fixes slime management console runtime (#29460)
* fixes slime management console help action runtime

* Update code/modules/research/xenobiology/xenobio_camera.dm

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

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-05-30 21:18:00 +00:00
PopeDaveThe3th 5837434099 Adds Federation marine combat armor (#29285)
* finally

* grey
2025-05-30 21:13:03 +00:00
YoureNotTheSharpest 50ebfe143a removes sterilizine and replace all mentions with spaceacilin (#29124) 2025-05-30 20:49:00 +00:00
Toastical 9cb55b2970 Move borg hypo interactions to appropriate procs (#29165)
* moved borg hypo interactions to appropriate procs

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

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

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

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

---------

Signed-off-by: Toastical <20125180+Toastical@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-05-30 20:48:01 +00:00
Migratingcocofruit c042c6d874 Makes it clear when the BSH is dirty (#29084)
* Makes it clear when the BSH is dirty

* Update tgui.bundle.js

* Update tgui.bundle.js

* Update tgui.bundle.js
2025-05-30 20:29:13 +00:00
AmityBlamity 8e8efd8e10 Minor grammarfix in antag_org_syndicate.dm (#29488) 2025-05-30 19:54:55 +00:00
Toastical 812bc63308 shuffle wire interact + add warning when calling without a freq (#29362) 2025-05-30 19:49:35 +00:00
Qwertytoforty c52cc0f3a8 fixes non infectious zombies. Again. Hopefully for the last bloody time. (#29496) 2025-05-30 19:40:12 +00:00
Toastical b81b794818 prevent wireless transfer amount setting on reagent containers (#29493) 2025-05-30 15:49:44 +00:00
warriorstar-orion 75c9f0d972 fix bapping rd console with disks (#29447) 2025-05-27 20:55:24 +00:00
PollardTheDragon 5a298513fc Smith Polish: Adds access requirements to smith machines (#29295)
* Adds access requirements to smith machines

* No smashy without access

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-05-27 20:53:28 +00:00
kyunkyunkyun 5f138d61e7 Update gasmask.dm (#29364) 2025-05-27 20:52:44 +00:00
Qwertytoforty 275677675b no patrick you don't get the zombie apocalypses every 3 rounds (#29458) 2025-05-27 00:17:09 +00:00