juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,043 Commits 57 Branches 0 Tags
8564d878c370f788cfbe9008a85537deb3b114b3
Commit Graph

7926 Commits

Author SHA1 Message Date
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
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
ApolloVector
8cc1b29ba4 Clake frag round fix (#40294) 
make the frag work
 2025-09-11 18:36:10 -07:00
Lillian Industries
7396d9e54c Added SmartFridge circuitboards (#39879) 2025-09-11 22:59:20 +03:00
SlamBamActionman
690b4d1edd Merge remote-tracking branch 'upstream-origin/master' into fork/iaada/more-trash 2025-09-11 17:08:39 +02:00
ScarKy0
1f1c71919b Remove unused BulletTennis (#40285) 
init
 2025-09-11 16:36:39 +02:00
SlamBamActionman
9519eb5f7a Fix Linter errors (#40283) 
Fix yoml
 2025-09-11 15:17:37 +02:00
SlamBamActionman
b3e06de0e5 They're milk jugs, not milk cartons! 2025-09-11 14:02:05 +02:00
SlamBamActionman
8a4a6ec7ab Food Item Size Adjustment (#39203) 2025-09-11 13:37:25 +02:00
IProduceWidgets
276e4df749 No take; Only throw. (#40143) 
* commit atrocities

* hail satan

* Channel Pavlovian horror

* pet kitty cat

* Taint universe forever

* Assault sensibilities

* sully existence

* tarnish morality

* The degunnening

* encratening

* Update toys.yml

* add few pixels to fix vulp inhands

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-09-11 12:57:30 +02:00
ToastEnjoyer
46f59300ac Laser rifle is contraband again (#40253) 
* Fixed contraband tag

* practice isnt contraband

* Added base

* Removal
 2025-09-10 19:37:10 -07:00
Princess Cheeseballs
2601853791 Cardboard Box Weightless Fix (#40260) 
Box is no longer space faring

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-09-11 00:13:58 +02:00
imatsoup
35bb5c633c Make Butterflies zombie immune (#40265) 
butterfly zombie no longer
 2025-09-10 23:48:53 +02:00
Deerstop
a05d466a5e Decal spawners spawn on a higher layer (#39956) 
changed decal spawn layer
 2025-09-10 11:58:06 +03:00
Kittygyat
cb4bbf3d38 Reworded the Galoshes description to be more clear about what they actually do. (#40200) 
Reworded the Galoshes description to be more clear about what they do
 2025-09-08 19:47:45 -07:00
Centronias
82b94ec6de Derelict Mediborgs can Scan Solutions and see Mob Health (#40206) 
Add mediborg unique components to derelict mediborg
 2025-09-08 19:44:31 -07:00
Ed
5f7600b6a2 Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/CargoTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
#	Content.Shared/Storage/Components/EntityStorageComponent.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/game_presets.yml
 2025-09-08 13:12:50 +03:00
Crude Oil
fb454351d2 Restore transfer amounts on regular syringes to 5, 10, 15 (#40197) 
add transferamounts to regular syringes
 2025-09-07 16:01:26 +02:00
ArtisticRoomba
ae9f56b234 fix: Atmos dP Window Inheritance (#40192) 2025-09-07 02:13:29 -07:00
ArtisticRoomba
8f8db391d8 Atmospherics Delta-Pressure YAML refactor (#40174) 2025-09-07 00:56:37 -07: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
ScarKy0
2201d29048 Revert antique laser and appraisal tool sizes (#40158) 
* init

* appraisal antique pistol sounds kinda cool tho ngl

* actually fuck items
 2025-09-06 17:13:42 +02:00
Princess Cheeseballs
ca32d83417 Stable Into Master (#40155) 2025-09-06 02:32:00 -07:00
Princess Cheeseballs
8a1a1b98c4 [HOTFIX] Fix Burgers (#39773) 
* Borgar

* Review

* Predicted queuedel

* Predict

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-09-06 02:19:19 -07:00
Princess Cheeseballs
adc7a829ae [HOTFIX] Fix Burgers (#39773) 
* Borgar

* Review

* Predicted queuedel

* Predict

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-09-06 02:18:06 -07:00
ArtisticRoomba
3aff3dff93 Fix resin windows inheriting wrong dP values (#40151) 
Fix resin windows inheriting from regular windows
 2025-09-06 01:02:47 -07:00
iaada
3a7f8fc1a7 update for glue/lube tube inhand 2025-09-05 17:24:50 -05: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
IProduceWidgets
dcd0f10070 Drink outta da toiler (#40133) 
* totally unrelated to any other recent additions

* dispare

* enum
 2025-09-05 22:03:10 +02:00
IProduceWidgets
e931771459 Expedite gender reassignment (#36894) 2025-09-05 11:55:54 -04: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
ArtisticRoomba
99cdbfc431 Give shutters the DeltaPressure component (#40126) 2025-09-05 00:47:31 -07:00
āda
60d1d2c9b1 Fix xenoborg action icons (#40118) 
commit

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-09-05 00:48:27 +02:00
Princess Cheeseballs
01a7fc66f0 Can't crawl over counters (#40099) 
Counters and Tables separation

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-09-04 14:03:10 -07:00
Quantum-cross
52c903cab8 Dynamic anomaly scanner texture (#37585) 2025-09-04 22:11:03 +03:00
Nemanja
7dbe1b219c Improve Gas Yaml Serialization (#40070) 
* Make yaml gas serialization cleaner

* fix exception

* fix validation code

* rudimentary test & permissive loading

* change it a bit

* Test fixes and adjustments
 2025-09-04 20:48:46 +02:00
VoidMeticulous
df4d923a9b Add 2.25 second delay to scurret petting (#40097) 
Add 2.25 second delay to scurret petting rate
 2025-09-04 17:41:45 +02:00
ArtisticRoomba
723a0030ba Give inflatable walls the DeltaPressure component (#40098) 
give inflatable walls the deltapressure component
 2025-09-03 18:08:53 -07: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
Tiniest Shark
7916819203 Burger Inhands (#39894) 
burger is in your hands
 2025-09-03 15:42:50 -04:00
Tiniest Shark
3aeecd0139 Add inhand sprites to Cartons and Cups, give new inhands to Cans. (#39814) 
* Added inhand sprites to cans, cartons and cups.

* small tweak
 2025-09-03 15:21:00 -04: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
Tiniest Shark
e0ead5a83a Reptilian tail sprites for hard/softsuits (#35842) 
* Reptilian helmets and tail sprites for hard/softsuits (and a few others)!

* Removed the new fins from helmets.

* don't know how the caustic resistances got doubled? oops

* Update pirate helm sprites for lizards

* fixin errors

* ugh

* softsuit updates

* okay maybe this works now

* Corgi fixes. Boy it sure would be nice to not have to do this again.

* please work

* Helmets removed, will be done in another PR.

* missed a few.

* evil punctuation killed

* scream

* Re-parented clothingvisuals.

* Suits modified with tails

* oops chaplain tail was misnamed

* a

* one more time

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml

* oops chaplain lost their suit

* Small fix

* roll back unrelated fix

---------

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
 2025-09-03 18:45:49 +02:00
Tiniest Shark
3775da3345 Helm + Mask Displacements for Reptilians (and some unique helmets) (#39351) 
* Liz displacements + unique helms

* small fix

* Couple of small fixes
 2025-09-03 18:45:18 +02:00
Quasr
103c3983df Updated inspector description to reflect functionality (#40072) 
update inspector desc.

Co-authored-by: Quasr <~182430031+quasr-9@users.noreply.github.com>
 2025-09-03 14:07:35 +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
SolidSyn
3bd1ba940b Adds a secHUD to the noir-tech glasses (#39859) 
* Adds a SecHUD to the noir-tech glasses

* Adds a Security HUD to the noir-tech glasses

* Revert "Adds a Security HUD to the noir-tech glasses"

This reverts commit 68d7b9b6e190618e44a94df71cf311e056892392.

* Adds a security HUD to the noir-tech glasses
 2025-09-02 16:32:18 +03:00
IProduceWidgets
e8583da476 prevent double-mapping lights (#39939) 
works?
 2025-09-02 16:30:11 +03:00
IProduceWidgets
8a041fa5cb Update 4 visitor shuttles & nanomed inventories (#39718) 2025-09-01 16:39:18 -07:00