Commit Graph

7976 Commits

Author SHA1 Message Date
Ed
d6a8c169b2 Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream
# Conflicts:
#	.github/CODEOWNERS
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Content.Server/IdentityManagement/IdentitySystem.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
2025-09-29 14:00:54 +03:00
Jessica M
b2d09ba457 Rat King Refactor Part 0: Separate Rummaging from RatKingComponent. (#40530)
* separate rummager into its own component/system

* thing

* address review and entitytables

* reviews

* review

* warnings

* Update Content.Shared/RatKing/Systems/RummagerSystem.cs

---------

Co-authored-by: Jessica M <jessica@maybe.sh>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-09-25 03:50:24 +02:00
Hitlinemoss
d699a4e985 Xenoborg items are now highly illegal (#39856)
* Added tactical katana + tactical katana shipment (placeholder descriptions)

* Revert "Added tactical katana + tactical katana shipment (placeholder descriptions)"

This reverts commit aa1928be7f4d938df1838943781e63c47a03cc11.

Whoops, committed to master by mistake

* Xenoborg contraband is highly illegal now
2025-09-24 20:28:40 -05:00
Keer-Sar
705e4d3aa1 Add "Lizard Visage" Snout Markings to lizards (#35294)
* initial commit

* Update attribution in meta.json

* Fix yaml formating in meta.json
2025-09-24 18:13:14 -05:00
Samuka-C
ea3c44686c Xenoborg jammer now ignores xenoborg associated frequencies (#38005)
* stop jammer from jamming radio of certain frequency

* xenoborg jammer no longer jamms xenoborg radio

* stop jammer from jamming device network signals from certain frequency

* xenoborg jammer no longer jamms xenoborg camera signal

* the old tale of the missing ;

* backwards

* fix issue with readonly

* comments to the frequencies excluded

* triple typo

* clearer summary

* add summary

* fixed 4th hidden typo
2025-09-24 17:02:46 -05:00
Nox
0663576c46 Descriptions for .20 Rifle (#36496)
* Initial commit - added Lecter and munitions descriptions, need to make one for the M-90GL...

* Fixed a formatting issue in the Lecter description, should be ready for review!

* Tests gaslighting me

* Third times the charm

* 99% of gamblers quit before the big win

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Updated with roomba's changes

* Formatted descriptions, ready to go!

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed formatting WITHOUT using spaces

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Updated weapon names.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added Roomba's suggestions

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Reverted AKMS formatting - outside the scope of this PR.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Updated Estoc's description.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added AugustSun's suggestions.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Slightly rephrased, im happy with it now.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed projectile names

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* thats not even a bullpup dumbass

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-09-24 16:48:34 -05:00
RedBookcase
f6cd8673d3 Recharger tweaks. (#38138)
* Recharger tweaks.

* Remove note.

* Fix Potato blacklist.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-09-24 15:33:45 -05:00
lzk
c55b41dff8 bunch of small cleanups (#40529)
* bunch of cleanups and fixes

* AND REMOVE THIS
2025-09-24 03:36:36 +02:00
āda
fabef941c2 Move circuit tiles and faux tiles to the cutter machine (#37982)
* super cutter machine

* split the big tile pack

* re-add new faux

* consistent naming

* missing category

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-09-23 19:12:45 -05:00
āda
005683d074 Miscellaneous Food/Drink/Edible fixes (#40060)
* bugfixes

* Revert "bugfixes"

This reverts commit 7fe31a866fc4dc299a1667291c0744716092db19.

* Revert "bugfixes"

This reverts commit 7fe31a866fc4dc299a1667291c0744716092db19.

* more reverting

* conflicts

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-09-24 01:41:11 +02:00
beck-thompson
329908df92 Agent ID verbs now don't require you to pick it up (#40524)
make consitant
2025-09-23 22:55:53 +02:00
hoshizora
3f575a64f3 Fire helmets alone no longer prevent you from heating up while on fire (#40481)
* do the thing yeah

* tweaked values on regular fire helmet including cooling

* adjusted values again after further testing also to the atmos fire helmet
2025-09-23 12:02:49 -05:00
slarticodefast
8e9aa1dbb6 Merge stable into master (#40512) 2025-09-23 13:07:00 +02:00
Princess Cheeseballs
add531a434 [HOTFIX] Chameleon projector invisibility (#40509)
* GOGOGO

* Hotfix

* TODO

* Update Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-09-23 12:55:11 +02:00
Minerva
95d91283a3 Fixes all departamental typos (both just in comments) (#40502)
Fixes all departamental typos
2025-09-22 21:44:45 +02:00
chromiumboy
2824334a1e Health increase for station AI cores (#40487)
* Initial commit

* Increased health further
2025-09-22 03:39:16 +02:00
Nyxilath
92f246058c bugfix - correcting poster damage resistances (#40489) 2025-09-21 13:40:58 -07:00
Charlie Morley
818a715822 prevent repeat TriggerOnCollide triggers (#40428)
* prevent repeat TriggerOnCollide triggers

* review comment: remove TriggerOnCollide when out of triggers
2025-09-21 17:23:37 +02:00
Tiniest Shark
4796c92609 Inhand Sprites for Clear Glass (#40427) 2025-09-20 11:25:01 -07:00
Minerva
5b255d13c6 Renames the radar console computer board to "mass scanner computer board" (#40430) 2025-09-20 11:17:58 -07:00
IProduceWidgets
2b411b244e The Experimental Lecter 8 (#40372)
* XL8 files

* slap dat on the ERT lead

* oop mag indicator offset

* fix newline
2025-09-19 21:30:07 +02:00
Minerva
4f311d6c44 Fixes some refuling welder typos (#40447) 2025-09-19 12:15:22 +02:00
Lordbrandon12
ed89c0e061 adds ConveyorMask colission mask to it's fixture component (#40439) 2025-09-18 13:31:29 -07:00
2DSiggy
e1da7ec9c5 Better thief objectives (#39867)
* finally some good objectives

* oopsie

* guh fuck

* more steal objectives that are actually good

* i want to die

* fucking upload to github please

* adding it to the objectiveGroups.yml

* higher weights for testing

* upload

* just need to do text shit. coding done waow

* OBJECTIVES WORK AND HAVE TEXT. FIX VIS

* I THINK ITS DONE AAAAAAAAAAAAAAA

* grammatical fix

* more formatting fixes

* i might be stupid

* forgot to fix a weight issue

* more grammar grrrrrrrrrrrrr

* made the double barrel obj have higher difficulty since it's cared about more than beer goggles

* Requested Changes

* forgot a thing oopsie
2025-09-18 13:09:44 -07:00
Kittygyat
5a67e3c26a Made all tarantulas able to drag entities (#40433)
Sent tarantulas to the gym
2025-09-18 21:59:29 +02:00
Hi-Im-Shot
d95b5da7d2 Added Cutting Slicing and Executing options to the cane blade (#40311)
* Added Cutting Slicing and Executing options to the cane blade

* swaped from BaseItem to BaseSword for cleaner code

* fixed a double gap in code
2025-09-18 21:37:04 +02:00
Hitlinemoss
5cb0917d5f Ninja items are now highly illegal (#39855)
* Added tactical katana + tactical katana shipment (placeholder descriptions)

* Revert "Added tactical katana + tactical katana shipment (placeholder descriptions)"

This reverts commit aa1928be7f4d938df1838943781e63c47a03cc11.

Whoops, committed to master by mistake

* Made ninja items highly illegal

* Rerun checks
2025-09-18 19:49:01 +02:00
āda
128d06518e Silence mime bags (#40317)
silence!!!

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-09-18 10:47:55 -07:00
Mora
0e0f015422 Rename medifab implanter to implant extractor and made it's description clearer (#40375)
* Renamed regular implanter (the extractor from the medifab) to implant extractor

* wrong way
2025-09-18 19:47:38 +02:00
Kittygyat
d9d968a479 Crashed the snakeskin boots stock-market by removing their hidden no-slip properties (#40201)
Crashed the snakeskin boots stockmarket by removing their non-slip properties
2025-09-18 19:39:35 +02:00
pathetic meowmeow
940eaa4674 Bring vulpkanin in-line with other species on hugging (#40183) 2025-09-18 19:17:37 +02:00
Minerva
4a815c006f Renames the "Integrated GPS" to "integrated GPS" (#40431)
Renames the Integrated GPS to not use title case
2025-09-17 18:42:35 -07:00
PicklOH
1a92ada5bd Adds Nukie IDs and PDAs, makes Nukie IDs able to copy accesses. (#37304)
* Adds Nukie IDs and PDAs, makes IDs able to copy access.

* Fixed PDA and ID parenting

* Meta.json spacing

* PDA parenting

* retest

* Forgot a comma OOPS

* Spacing

* Minor meff fix

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-17 17:15:18 -07:00
Errant
b692b6e33e Antag Rolebans (#35966)
Co-authored-by: beck-thompson <beck314159@hotmail.com>
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>
2025-09-17 23:59:07 +02:00
IProduceWidgets
933da32da5 Remove Misgendering (#40425)
fix misgendering
2025-09-17 23:49:50 +02:00
Princess Cheeseballs
fc89f231a5 Mothership Core Prototype Cleanup (#40410)
* I cannot escape bodysystem no matter how hard I try

* Move 2 things

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-17 00:25:53 +02:00
chromiumboy
bc0691822a Bug fix for Station AI damaged accent (#40399)
Initial commit
2025-09-16 16:09:38 +02:00
SlamBamActionman
09a197eb91 Detunes Ninja Stun To Actually Have Some Counterplay (#39707) 2025-09-16 01:31:50 +02:00
chromiumboy
7444c8ea4a The station AI can be destroyed (#39588)
* Initial commit

* Fixing merge conflict

* Merge conflict fixed

* Anchorable entities can now be marked as 'unanchorable'

* Revert "Anchorable entities can now be marked as 'unanchorable'"

This reverts commit 6a502e62a703cf06bd36ed3bdefe655fc074cfc5

This functionality will be made into a separate PR

* Error sprite

* Update AI core appearance with sustained damage, spawn scrap on destroyed

* Added intellicard sprite

* AI damage overlays

* Added fixtures

* AI core accent changes when damaged or low on power

* Bug fix and pop up messages for inserting AIs into inoperable cores

* Updated 'dead' sprite

* Destroying the AI core reduces the number of AI job slots available

* AI battery duration set to 10 minutes

* Initial commit

* Allow MMIs used in the construction of AI cores to take them over

* Initial resources commit

* Initial code commit

* Sprite update

* Bug fixes and updates

* Basic console UI

* Code refactor

* Added lock screen

* Added all outstanding UI features

* Added purge sprites

* Better appearance handling

* Fixed issue with purge sprite

* Finalized UI design

* Major components finalized

* Bit of clean up

* Removed some code that was used for testing

* Tweaked some text

* Removed extra space

* Added the circuitboard to the RD's locker

* Addressed reviewer comments plus tweaks

* Addressed reviewer comments plus tweaks

* Removed instances of granular damage

* Various improvements

* Removed testing code

* Fixed issue with disabled buttons

* Finalized code

* Addressed review comments

* Added a spare Station AI core electronics to the research director's locker

* Fixing build failure

* Addressed review comments

* Addressed review comments

* Added reverse path for construction graph

* Removed unneeded reference

* Parts can be purchased through cargo

* Fixing merge conflict

* Merge conflict resolved

* Fixing merge conflict

* Code update

* Code updates

* Increased AI core health and gave it a sell price to fix test fail

* Added screen static sprite

* Added better support for ghosted AI players plus code tweaks

* Various improvements and clean up

* Increased purge duration to 60 seconds

* Fixed needless complication

* Addressed reviewer comments part 1

* Addressed reviewer comments part 2

* Further fixes

* Trying lower battery values to see if it fixes the test fail

* Adjusted power values again

* Addressed review comments

* Addressed review comments

* Fixed test fail

* Fixed bug with endless rebooting. Using rejuvenation on an AI core revives the AI inside.

* Added pop up text

* Bug fix

* Tweaks and fixes

* Fixed restoration console not updating when the AI finishes rebooting

* Update SharedStationAiSystem.Held.cs

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-09-15 16:18:32 +02:00
Ed
3409e0f752 Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Overlays/StencilOverlay.cs
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/SkinColor.cs
#	Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
2025-09-15 13:50:49 +03:00
chromiumboy
02061592dd Devices with access restrictions list those restrictions in their examination description (#37712) 2025-09-15 10:19:25 +03:00
SharkSnake98
fd20cc2a00 Dark/Light Grass & Desert Astrotiles (#37867)
* Added Waterjug, a low-mid pop map with a tropical theme and custom evac shuttle

* Fixed postmapinittest issues (Hopefully)

* Actually fixed the afformentioned issue.

* Added Warden Spawnpoint which I forgot

* Named APCs, Substations, & Cameras, added some more decals

* Decorated some more, notably the bar.

* Minor adjustments, added cans, slightly reworked salv and maints bar

* Fixed some small issues, notably weird closed doors, added a few small things (shutters mostly)

* Added 2 new astrotiles, dark grass and desert sand.

* Removed map. Fixing issue. Please hold.

* Forgot to remove a comma, please god forgive me maptainers. I blame Rider IDE for it's autoaddition of all changes made even on seperate branches.

* Added localization for stacks.

* Actually fixed the loc. issue. Maybe. Please.

* Hopefully fixed the last localization issue.

* Added Light Astro-tiles, and edited the names of the inhand png's for the dark grass astrotiles to be more internally consistant

* Fixed some issues caused by another PR I made, added more maints stuff

* Made some small decorative and practical changes

* Fixed, changed, and added a ton of stuff. I don't think I can list it all, honestly.

* Removed shields to try to fix an issue with the test

* Hopefully fixed issues relating to a failed test.

* Replaced grass/flora decals with randomized ones, readded shields to armory

* Fixed some YML issues, whitelisted files for flora decal spawners

* Added a bridge-beach, added some misc. items and objects.

* Small changes to buttons, fixed wires and flooring

* Fixed AME-Holopad issue.

* Added a Custom Waterjug Parallax, made it so the parallaxes actually work, and made some minor adjustments to the map

* Fixed an accidental adjustment to CoreStation's parallax prototype YML

* Changed some Salvage and Cargo stuff

* Fixed some merge issues, updated Adriatic with a locker and added some little details to Waterjug

* Fixed some stuff, added docking arm near evac

* meta json fix tiles

* fixed again

* fixed once more

* Removed all the waterjug stuff.

* fix spacing

* fix unnecessary formatting

---------

Co-authored-by: SharkSnake98 <sharksnake87@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-09-14 18:30:12 -07:00
Princess Cheeseballs
11d434818e Merge staging into master (#40356) 2025-09-14 13:57:50 -07:00
Vasilis The Pikachu
b9ddcc9e9f Revert "Can't crawl over counters (#40099)"
This reverts commit 01a7fc66f0.

@Princess-Cheeseballs

This is being reverted per maintainer vote for the release cycle, check out the meeting video here https://youtu.be/N5-UYCLha2I?t=872
2025-09-14 20:42:51 +02:00
Huaqas
7616b9aa1c Fix Heterochromia for Vulpkanin (#40320)
* Add More Holy Books

* Revert "Add More Holy Books"

This reverts commit 665eb0de10fe0784d634f9eaf672e60f18a62995.

* Fix eyes

* Add the undergarments and ftl designations.

* Missed something.

* second edited line didnt save for some reason

* Im tired dont judge me

* Fix eyes

* Reverting stuff

* fix markings

* Its joever

* Update meta.json

* small tweak

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-09-14 11:18:48 -04:00
ScarKy0
fdd4789d32 Give vulps correct undergarments (#40341)
init
2025-09-14 00:39:38 -07:00
Huaqas
f1ae8ecdfe Add Undergarments to Vulpkanin (#40321)
Putting underwear on dogs.
2025-09-13 13:36:28 -04:00
IProduceWidgets
a4b7cd73c5 +1 Spam mail (#40310)
* 2nd edition

* remove OOC

* oop

* double oops
2025-09-13 09:15:10 +02:00
FungiFellow
bcc30813e9 Cockroach Gib when Stepped on (#40103)
* Cockroach Gib

* Prevent Cockroaches From Gibbing Eachother

* Added - type: RandomChanceTriggerCondition

* Update animals.yml

* Named SuccessChance Datafield

* successChance

* Revert Change

* Uncapitalize C

* RECAPITALIZE THE C
2025-09-13 00:01:13 -07:00
SurrealShibe
71bcda1fec Toilet fixes: Exception when constructing, proper seat layering (#40313)
they call me a plumber the
the way i fix da toiler
2025-09-12 15:47:21 -07:00