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

10207 Commits

Author SHA1 Message Date
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
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
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
breeplayx3
7f511abb94 Berry Delight recipe edit (#40085) 
berry delight change
 2025-09-03 14:06:04 -07:00
SlamBamActionman
1a452494e6 Add senior courier PDA for cargo techs (#37661) 2025-09-03 22:22:28 +02:00
MissKay1994
3e63e4590d Adjust bureaucratic error to prevent only passenger being available (#40001) 
Fire all the interns
 2025-09-03 22:16:07 +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
Hannah Giovanna Dawson
b2eeedb348 Lizard Tails Can Be Hidden By Clothing (#40026) 
Taken from @TiniestShark's PR.
 2025-09-01 12:16:12 -04:00
SlamBamActionman
2624647e71 Fix incorrect bullet & cartridge names (#39993) 
* Fix conflicting names

* zero zeroes
 2025-09-01 18:27:21 +03:00
slarticodefast
86e77f05ce Predict InjectorSystem (#39976) 
* predict injectors

* hide verbs if no options
 2025-09-01 18:24:37 +03:00
SlamBamActionman
817a2973e5 Moths cannot eject items from military boots (#40049) 2025-09-01 17:07:43 +02:00
Quasr
145b2a645b set slot priority to 4 2025-09-01 09:07:44 -05:00
slarticodefast
0ba5d036a2 improve spawnpoint error logging (#40021) 2025-08-31 11:50:37 -07: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
āda
9e22aa4cd5 Clown bags squeak when inserting items (#39931) 
squeak!

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-08-30 20:10:34 +02:00
Kowlin
c7a10e8bce Stop derelict borgs from duplicating their ghost roles. (#39992) 
Add reregister to derelict borgs
 2025-08-30 19:17:49 +02:00
ScarKy0
5a40913beb Messy drinker immunity and cleanup (#39989) 
init
 2025-08-30 17:38:28 +02:00
Hannah Giovanna Dawson
8f55a4fcfc Scurrets - can wear pet bags, mail bags and spears (#38774) 
* Scurrets - can wear pet bags, mail bags and spears

* a

* Resolve PR comments
 2025-08-30 16:42:43 +02:00
Princess Cheeseballs
941e0daca7 Staging into Master (#39977) 2025-08-29 17:05:47 -07:00
Princess Cheeseballs
3d2877f353 [STAGING] 1984 Derelict Syndicate Borgs (#39978) 
1984

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-08-29 16:33:04 -07: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