Commit Graph

2982 Commits

Author SHA1 Message Date
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
UpAndLeaves
1245487c9a storage and inventory toolshed commands (#39046)
* First commit

* CommandImplementation on singletons is die, a la moony

* Fix duplicated thingy because yes

* Prototypes, bugfixes, refactoring oh my

* Remember to actually stage your ftl changes next time, leaf
2025-09-11 15:07:37 -07:00
SlamBamActionman
690b4d1edd Merge remote-tracking branch 'upstream-origin/master' into fork/iaada/more-trash 2025-09-11 17:08:39 +02:00
SweetAplle
ff54410d6a "idk" no longer shrugs, instead sanitizing to "I don't know" (#39024)
* idk no longer shrugs

* accidentally had this in here!

* this was accidentally in here too!

* fucked up the removal

* fucked it up again this should HOPEFULLY be the last one

turns out it's hard to revert the edit of a file that's just numbers and spaces who woulda thunk?

* Restore SpaceStation14.sln to master

* Restore development.toml

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-09-10 13:09:58 -07:00
SlamBamActionman
3da0b0299f Add support for contraband text to the reagent guidebook (#37113)
* Add contraband text to reagent guidebook

* Add reagent for examining

* Update Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-09-10 15:30:53 +02:00
Ser11y
da210e812b Make location in crew monitoring console localizable (#40247) 2025-09-09 22:11:24 +02:00
ArtisticRoomba
a93f6b8cdf Atmos dP Guidebook Entry (#40194)
* Add Atmos dP guidebook

* Update Resources/ServerInfo/Guidebook/Engineering/DeltaPressure.xml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-09-07 17:10:39 +02:00
Mr. 27
4eab05b55e Add some alternate jumpsuit designs which can be toggled (#31213)
* inital

* testfa

* New Sec sprite

* Update atmos

* Update meta.json

* Update meta.json

* 0

* Update meta.json
2025-09-06 13:55:02 -04:00
iaada
29dda7949f Merge remote-tracking branch 'upstream/master' into up/drinks-yml
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
2025-09-05 17:07:09 -05:00
ScarKy0
b2c9106839 Vulpkanin Species (#37539)
* [April Fools] Elf species  (#35353)

elf

* [April Fools] Juice that makes me go insane (#35370)

* kill me

* MAKE IT STOP

* is it finally over?

* web edit

* webedit

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

* webedit

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

* webedit

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

* webedit

* WEBEDIT PLEASE

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

---------

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

* vulpkanin species

the ultimate april fools joke

Co-Authored-By: Kr8art <188977876+kr8art@users.noreply.github.com>

* cant be bothered

* make build and test debug run on the april fools branch (#35396)

welp

* Revert "[April Fools] Juice that makes me go insane (#35370)"

This reverts commit fcbdcf8452cb1247733242aa44ea5b9f38dfa3d2.

* Revert "[April Fools] Elf species  (#35353)"

This reverts commit 704293a051033026bfca0c9e161d97796bc0cb81.

* nuh uh

* localized names

* fix survival box

* abilities (Mostly don't work yet, pending PRs)

* wagging loc

* slight heat tweaks

* stuff

* Update Vulpkanin.xml

* vulp screams + quieter howl

* MessyDrinker by Orks

* MessyDrinker guidebook

* animal bones

* fix wagging

* missed

* no loc

* Lower damage, remove butchering

* Revert "animal bones"

This reverts commit 3457cde13e57336678f62a20bf57fb315844c240.

* leap

* collision

* leap desc update

* leap guidebook

* fix leap

* microbalance

* comment

* microbalancing pt 2

* microbalancing pt 3

* test fail fix (i hope)

* fix organs

* no leaping on the ground

* remove SolutionScanner + ling work

* fix clone

* add stuff back

* microbalancing pt yes

* male vulp names

mainly slavic names with some similiar sounding ones mixed in

* Revert "male vulp names"

This reverts commit 1666f81821bfea241262627160a594dd1b0ce050.

* male vulps names pr 2 (slavic, dog names, few puns)

Slavic names, with mixed in typical dog names and some puns

* female names (mainly slavic, other stuff mixed in)

* oops

* Update vulpkanin.yml

* Vulps WIP Work (#1)

* Modified aesprite tools

* WIP

* wipperoni

* We are done here, wawa

* Revert "Merge branch 'aseprite-tools' into hannah/vulps-wip"

This reverts commit d258645df60a94d0217fecd85a38545f2b951cde, reversing
changes made to 0ae39e862152ef6548533eba0547709594c55e90.

* Resolve merge issue

* Fix Urist McVulp forgetting his fursuit

---------

Co-authored-by: Southbridge-fur <southbridgefur@gmail.com>

* re-add ears and husk overlay

* revert adding ears to vox

* Crest Markings

* Fade Markings

* Sharp Markings

* microbalance + comments

* censor character nudity option compliance

* Ear Markings

* 1984 wagging animations

* Tail Markings

* tail wag icon

* annoyance

* guidebook

* slight temperature tweak

* seperate out snouts, port over 2 markings for testing

* fix

* seperate snout file

* Snout/Head Markings

* cleanup + locale for ears

* Head and Snout loc

* gray eyes

* crest and husk cleanup

* Tail and Chest loc

* Legs and Arms loc

* most important commit

* mime vulps like rations too

* missing loc

* microbalance

* not needed

* goatee

* white eyes

* harmony feedback tail fixes

* personal changes and fixes after playing

* fix fluffy tail clipping

* Sprite fixes, displacement fixes (#2)

* Tune head displacement

* Vulps Sprite Tuning

* helmets

* detail

* Urist

* wag

* comban't

* fix attributions

* remove vulp biosuits

* fix vulp beards

* fixed up ears

* comment note

* further ear tweaks

* engi helmets

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Kr8art <188977876+kr8art@users.noreply.github.com>
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>
Co-authored-by: Southbridge-fur <southbridgefur@gmail.com>
2025-09-05 12:43:17 +02:00
SpaceLizard
4125d28b75 Fixed a error in the "Adventures of Ian and Renault" books (#39932)
Fixed a publication error in the "Adventures of Ian and Renault" book series.

The editor of these books have been taken out back and shot.
2025-09-05 02:42:57 +02:00
Samuka-C
2f3d976c33 Fool players with decoy presets (#40053)
* added secret gamepresets

* cut down on alias

* remove all secret presets

* change the command to allow for a secret argument

* update test

* moved the secret argument after the number of rounds argument

* added completions

* localization and use of CompletionHelper.Booleans

* command now has a option for a decoy preset

* fixed decoy message in the end

* ops

* clean up

* hint 2

* improve localization

---------

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
2025-09-04 15:03:47 +02:00
ArtisticRoomba
20f2cb920b Atmos Delta-Pressure Window Shattering (#39238)
This PR adds delta-pressure damage. In short, airtight structures can now take damage proportional to the difference in pressures between the sides of the structure.
2025-09-03 16:58:48 -07:00
SlamBamActionman
1a452494e6 Add senior courier PDA for cargo techs (#37661) 2025-09-03 22:22:28 +02:00
Kyle Tyo
f5a980edc2 Cleanup AddPolymorphActionCommand and LEC conversion. (#38853)
commit
2025-09-03 22:16:43 +02:00
SlamBamActionman
e6d00428a8 Fix small issues with Text Highlighting (#38144) 2025-09-03 21:42:15 +02:00
Mora
d1deb5b059 Some more vox customization (#39083)
* Added docked and spiked tails, added talisman for vox

* Tail Talisman ftl

* adjusts talisman to be its own tail to avoid having to deal with other tails at all

* vox tail stuff

* Added amputated tail (courtesy of flareguy) and split tail

* adds TODO regarding marking conditionals

* rsi run check pls stop screaming at me

* Shelving the talisman for later, keeping the sprites around

* Add RSI credits

* Remove unnecessary files

* renamed amputated to vestigial
2025-09-03 20:05:48 +02:00
FungiFellow
e68e71c068 Trimmed Sentience Targets from Corgis Smile and Cockroaches (#39810)
* Update animals.yml

* Update pets.yml

* Removed Sentience Target from corgi

* Update random-sentience.ftl

* Obliterated Scurret from .ftl
2025-09-03 14:00:07 +02:00
Kyle Tyo
0e884da5eb Localize, cleanup, and LEC round control commands. (#38812)
* commit-progress

* commit
2025-09-03 12:49:34 +02:00
MilenVolf
d41786ff33 Remove empty drink-component.ftl file (#40064)
Probably had to be removed in #39031
2025-09-02 02:37:45 -07:00
Nox
05a4e6d00c Fixed Corpsman Name (finally) (#40055)
Fixed Corpsman name (finally)

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
2025-09-01 23:05:48 +02:00
slarticodefast
86e77f05ce Predict InjectorSystem (#39976)
* predict injectors

* hide verbs if no options
2025-09-01 18:24:37 +03:00
slarticodefast
8f5d05c8bb Stable merge (#40025) 2025-08-31 18:41:23 +02:00
Vasilis The Pikachu
5100068a78 Revert "Admin Log Browser Improvements (#39130)"
This reverts commit f67cebf7a4.

Per request of @Kowlin and @southbridge-fur

Check out https://github.com/space-wizards/space-station-14/issues/39960 for further information
2025-08-31 17:50:37 +02:00
AndrewFenriz
0e23e4537f Migrate all mechs to PartAssembly and remove legacy MechAssemblySystem (#39027)
* Removed the old MechAssembly system and component.
Converted all mechs to use the unified PartAssembly system.
Removed dismantling mechs during assembly logic to simplify the code.

* Delete Chassis via migration
2025-08-31 15:54:45 +03:00
ScarKy0
a590d65dc5 Add SnoutCover appearance layer (#39949)
* init

* cover
2025-08-29 19:12:51 +02:00
chromiumboy
65bffbebf1 Sentry turrets - Part 7: Electronics and construction graphs (#35236)
* Initial commit

* Fixing merge conflict

* Updated for deployment

* Whitespace fixes

* Linter fixes

* Test fail fix

* Fixed test failure

* Add separate command circuitboards

* Addressed review comments
2025-08-29 14:10:47 +02:00
Minemoder5000
9be78ced63 Remove a default Cyborg name (#39948)
* 1984 clanker

* Fix prototype
2025-08-29 10:38:48 +02:00
Fildrance
60ea135fd3 Revert "Added button and manager for in game bug reports (Part 1)" (#39872)
Revert "Added button and manager for in game bug reports (Part 1) (#35350)"

This reverts commit a8d6dbc324.
2025-08-28 01:46:24 -07:00
Winkarst-cpu
5028161c7b New Feature: Symptoms of radiation poisoning (#39805)
* New Feature

* Cleanup

* Bump threshold

* Update

* Update

* Single change

* Me when I forgor the yaml

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-08-27 14:56:09 -07:00
slarticodefast
f4056e854b tool lock 2025-08-26 20:04:10 +02:00
beck-thompson
688c0b5884 Syndicate locks are now selectable (#39532)
* Syndicate locks are now selectable

* Minor tweaks

* Make not syndicate themed

* Address refview

* review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-26 16:18:10 +02:00
Whatstone
b5529ecf2b Batchable lathe jobs, editable lathe job order (#38624)
* batchable lathe jobs, editable order

* requested changes

* LatheComponent comment, menu strings
2025-08-24 17:02:47 +02:00
FungiFellow
ed7bea8e01 Inflatable Module (#35100)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
2025-08-23 15:15:28 -07:00
RedBookcase
5c206ede67 Added more Derelict Cyborgs. (#38159)
* Added more Derelict Borgs.

* minor fix & salvage borg instead of mining borg name.

* I LOVE CAPITALIZATION!

* Fixed Derelict Engineer Cyborg name and added unshaded crystal layer.

* Ordering fixes & other cleanup.

* Updated Derelict Salvage Cyborg Sprites.

* New Salvage borg sprites.

* Updated module comments.

* Update events.yml

Extended the Derelict Syndicate Assault Borg's spawn timer to 25 minutes from 15.

* Fix for new borg hands

* Update events.yml

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-08-23 16:32:15 -04:00
Southbridge
f67cebf7a4 Admin Log Browser Improvements (#39130) 2025-08-21 22:12:16 +02:00
TheFlyingSentry
3d0573e7c8 Added Hemophilia Trait (#38224)
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-21 03:02:54 +02:00
Mora
cd0cc72157 Impaired Mobility Disability (#39398)
* Implements mobility impairment

* Implements mobility impairment

* Implements mobility impairment

* Removed white cane related stuff (impaired cane replacement and removed mobility aid component)

* fix development.toml

* Implements slower standing

* Prevent speed stacking by checking if the entity is already holding a mobility aid

* Move all speed handling into ImpairedMobilitySystem, added comments, made it so wielding a mobility aid doesn't grant the recovery benefit

* Move all speed handling into ImpairedMobilitySystem, added comments, made it so wielding a mobility aid doesn't grant the recovery benefit

* remove unused file

* Shorten description

* Apply suggestions

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>

* Suggestion cleanup

* formatting fix and removed extra datafield stuff

* added comment, fixed slashes, yadda yadda

* summary comments

* removed a word

* Add trait to clone whitelist

* Fix clone.yml

* my own review

---------

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-08-20 17:43:06 -07:00
Winkarst-cpu
021adbe1e1 New Feature: Kitchen spike rework (#38723)
* Start

* Wow, text

* Ultra raw

* More stuff

* Wow, DOT and gibbing!!!

* More stuff

* More

* Update

* Yes

* Almost there

* Done?

* I forgot

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Beck

* Unhardcode
2025-08-19 10:56:36 -07:00
Samuka-C
de240e1739 Xenoborgs part 5 (#37068)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: WarPigeon <DaedalusTheGamer@gmail.com>
2025-08-19 18:23:47 +02:00
IProduceWidgets
8768074706 More informative changeline devour armor text (#39745)
more informative armor text
2025-08-19 03:36:28 +02:00
SlamBamActionman
47cf99fb7e Fix medipen injectors not respecting entity identity (#39735)
* Remove StaminaResistance from places where it should not be

* I lost a nukie round because of this bug

* Who put the god damn changes on the god damn branch
2025-08-18 22:42:40 +02:00
SlamBamActionman
ac0c1d518e PR stable to master (#39729) 2025-08-18 18:04:38 +02:00
Hitlinemoss
9a4247c609 Added "highly illegal" contraband to guidebook (#38176)
* Added extreme contraband to guidebook

* Extreme -> Highly Illegal

* Whoops, one-letter typo

* Fixed a capital letter while I'm here
2025-08-18 17:51:33 +02:00
ScarKy0
14f949c311 Jumpability collisions (#39710) 2025-08-18 14:22:36 +02:00
EnrichedCaramel
05aad3bfd2 Expand soap making, but better (#39303)
* Add lye reagent and its recipes

* Move and add soap recipes

* Add temperature to soap recipes

* Silly comments

* Remove NaHO based lye recipe due to sigynate recipe conflict.

* Typo

* Typo, again

* Change lye color and description
2025-08-15 23:59:58 -07:00
CoolioDudio
d4f8568e50 Added baby and cube hair (awesome) (#39680)
* Added baby and cube hair (awesome)

* added yml and ftl (oops)

* Update cube.png

Made cube smaller
2025-08-15 18:50:13 -07:00
beck-thompson
a8d6dbc324 Added button and manager for in game bug reports (Part 1) (#35350)
* Added the button and manager

* Minor cleanup

* Reigstered to the wrong thing!

* Unload UI

* Address the review

* First commit :)

* Some cleanup

* Added some comments and now the placehoder text goes away once you start typing

* Some cleanup and better test command

* Basic rate limiter class (Not finished)

* Cleanup

* Removed forgotten comment xD

* Whitespace removal

* Minor cleanup, cvar hours -> minutes

* More minor tweaks

* Don't cache timer and add examples to fields

* Added CCvar for time between bug reports

* Minor crash when restarting rounds fixed

* It compiled on my computer!

* Fix comment indents

* Remove unecessary async, removed magic strings, simplfied sawmill to not use post inject

* Make struct private

* Simplfiy TryGetLongHeader

* Changed list to enumerable

* URI cleanup

* Got rid of the queue, used a much better way!

* Made the comments a little better and fix some issues with them

* Added header consts

* Maximum reports per round is now an error message

* Time between reports is now in seconds

* Change ordering

* Change hotkey to O

* only update window when its open

* Split up validation

* address review

* Address a few issues

* inheritance fix

* API now doesn't keep track of requests, just uses the rate limited response from github

* Rough idea of how channels would work

* refactor: reorganized code, placed rate limiter into http-client-handler AND manager (usually only manager-one should work)

* cleanup

* Add user agent so api doesn't get mad

* Better error logs

* Cleanup

* It now throws!

* refactor: renaming, moved some methods, xml-doc cleanups

* refactor: BugReportWindow formatted to convention, enforced 1 updates only 1 per sec

* Add very basic licence info

* Fixed the issues!

* Set ccvar default to false

* make the button better

* fix test fail silly me

* Adress the review!

* refactor: cleanup of entry point code, binding server-side code with client-facing manager

* Resolve the other issues and cleanup and stuff smile :)

* not entity

* fixes

* Cleanup

* Cleanup

* forgor region

* fixes

* Split up function and more stuff

* Better unsubs yaygit add -A

* I pray...

* Revert "I pray..."

This reverts commit 9629fb4f1289c9009a03e4e4facd9ae975e6303e.

* I think I have to add it in the pr

* Revert "I think I have to add it in the pr"

This reverts commit e185b42f570fe5f0f51e0e44761d7938e22e67f7.

* Tweaks

* Minor tweak to permissions

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-08-15 09:10:38 -07:00
Nemanja
f23e8c2861 Multiantag Gamemode (#37783)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-08-15 16:06:51 +02:00