juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,917 Commits 57 Branches 0 Tags
71bcda1feccc5cff360506441e9c7ff02aae7aa6
Commit Graph

10294 Commits

Author SHA1 Message Date
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
slarticodefast
82e7cb020c Delete DrinkComponent, migrate prototypes to EdibleComponent (#40308) 2025-09-12 15:26:56 -07: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
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
Stefano Pigozzi
960174acc5 Fix RGB staff not working (#40258) 
Add missing `TargetAction` to `ActionRgbLight`

This fixes the RGB staff not working.
 2025-09-10 13:42:33 +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
SlamBamActionman
905935e6ed Lets diona sap trigger artifact blood nodes (#40211) 2025-09-08 15:56:59 +02:00
keronshb
f885075d2e DoAfter support for Actions (#38253) 
* Adds Action DoAfter Events

* Adds DoAfterArgs fields to DoAfterComp

* Adds a base doafter action

* Adds Attempt action doafter logic

* Adds doafter logic to actions

* Changes Action Attempt Doafter and action doafter to take in Performer and the original use delay. Use delay now triggers when a repeated action  is cancelled.

* Readds the TryPerformAction method and readds request perform action into the action doafter events

* Adds a force skip to DoAfter Cancel so we can skip the complete check

* Adds a Delay Reduction field to the comp and to the comp state

* Fixes doafter mispredict, changes doafter comp check to a guard clause, sets delay reduction if it exists.

* Cancels ActionDoAfter if charges is 0

* Serializes Attempt Frequency

* Comment for rework

* Changes todo into a comment

* Moves doafterargs to doafterargscomp

* Adds DoAfterArgs comp to BaseDoAfterAction

* Removes unused trycomp with actionDoAfter

* Replaces DoAfterRepateUseDelay const with timespan.zero

* Removes unused usings

* Makes SharedActionsSystem partial, adds DoAfter partial class to ActionSystem, moves ActionDoAfter logic to the SharedActionsSystem.DoAfter class

* Cleanup and prediction

* Renames OnActionDoAfterAttempt to OnActionDoAfter, moves both to Shared Action DoAfter

* Removes ActionAttemptDoAfterEvent and moves its summaries to ActionDoAfterEvent. Converts OnActionDoAfterAttempt into TryStartActionDoAfter

* Removes Extra check for charges and actiondoafters

* Sloptimization

* Cleanup

* Cleanup

* Adds param descs

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-09-08 12:55:13 +03:00
OrbitSystem07
b7d595b57e Lets diona sap trigger artifact blood nodes 2025-09-07 21:23:45 -07: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
Hannah Giovanna Dawson
a699639834 Allow Vulps With Human Hair To Be Shaved Without Clyde Joining The Circus (#40171) 
* Revert "Disable vulpkanin human hair (#40144)"

This reverts commit d02aa1a4e2.

* You can once again shave your pet Vulp

* I can see the ass, I'm safe

* Rectified docstring as I am a good person

* I am doing this instead of playing Silksong please help

* Fix forgetting to re-add shader overriding
 2025-09-07 16:36:38 +02: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
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
ScarKy0
d02aa1a4e2 Disable vulpkanin human hair (#40144) 
init
 2025-09-06 01:22:46 +02: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
Matt Idzik
d4b9b45bdd Adjusted minimumPlayers for Wizard midround events. (#38424) 
* Adjusted minimumPlayers for Ninja and Wizard midround events

Wizard from 10->20
Ninja from 30->20
20 players matches Dragon and Loneop.

* Wizard midround minimum players from 20 to 30

* Update Resources/Prototypes/GameRules/events.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-09-05 18:23:06 +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
CawsForConcern
a8ba84ecf7 Fixes Theobromine missing from Iced Coffee (#40063) 
adding ice to coffee no longer removes its theobromine
 2025-09-05 00:46:44 +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
āda
12e8697648 Organize JobIconPrototype yml (#39774) 
grouped

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-09-04 20:58:17 +02: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
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
jkwookee
348f462b12 Fix QM Golden Knuckledusters not being a objective (#40096) 
test
 2025-09-04 13:08:25 +02:00
Quantum-cross
70ffc1eb5d Add heat distortion shader for hot gases (#39107) 2025-09-03 20:17:39 -07:00
ArtisticRoomba
723a0030ba Give inflatable walls the DeltaPressure component (#40098) 
give inflatable walls the deltapressure component
 2025-09-03 18:08:53 -07:00