juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,378 Commits 57 Branches 0 Tags
3ac8bc71f10e9ae538ad0517e25ff5d0d86ae708
Commit Graph

1012 Commits

Author SHA1 Message Date
kosticia
2076e8b02d Moth-pockets (#34517) 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-04-22 22:36:54 -07:00
Vladislav Suchkov
00af8f96f6 Fix construction orientation being ignored for some objects (#36488) 
* fixes

* removed empty "SnapToGrid"s and parent "completed"s
 2025-04-22 21:58:42 -04:00
Hanz
6cc53e3e1c Ashtray staticPack fix (#36835) 
Ashes to Ashes

God I love staticPacks
 2025-04-22 13:34:29 -07:00
Hanz
bd1f2af691 Ashtray Resprite and Fix (#31643) 
* The meat and potatoes

Yup

* Stupid recycler

bruh

* guh

guh
 2025-04-22 15:34:39 -04:00
Golden Can
106a31410f Command uniform (#32103) 
* Added generic command jumpskirt, jumpsuit and cap, and made them available in the HoP's clothing printer.

* fixed generic command jumpskirt and jumpsuit.

* Updated generic command jumpskirt/-suit textures, added generic command beret.

* Fixed game-breaking bug in previous commit relating to the command beret.

* altered generic command soft cap/baseball cap sprites.

* Update Resources/Prototypes/Entities/Clothing/Head/hats.yml

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>

* review

* whoopsie

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
 2025-04-22 14:35:43 -04:00
āda
f52445ec4e Reorder electronics recipe file, add filter categories (#35713) 
* electronics split

* split base recipe and category

* all but machines

* machine shuffle

* reorder

* delete unused recipes

* rename cargo to supply

* git weirdness

* git weirdness 2
 2025-04-20 18:27:49 -04:00
uhbg
94b46a9edc The Bartender can now make Eggnog (#34065) 
* Preliminary eggnog changes (egg in shaker crashes?)

* Fixed eggnog reagent name and description

* added - to flavor

* deleted a space

* Added eggnog glass sprite

* changed fill levels to match rsi

* Added two more fill levels to eggnog

* Removed fizziness, changed physical description, and fixed rsi

---------

Co-authored-by: uhbg <29674581+uhbg@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-04-20 17:27:35 -04:00
Alice4267
a8b954fb0c Fix glass duplication with beakers (#34441) 
Update chemistry.yml

Fixing glass dupe.
 2025-04-20 14:01:08 +02:00
Ps3Moira
d984259db6 Removed Interior Shuttle Walls (#34261) 
* Removed Interior Shuttle Walls

* Update migration.yml

* Update walls.yml

* Update girder.yml

* Fix Migration

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-04-19 10:41:35 -04:00
SharkSnake98
9599f582f3 New Drinks (#36287) 
Co-authored-by: RedBookcase <crazykid1590@gmail.com>
Co-authored-by: SharkSnake98 <sharksnake87@gmail.com>
 2025-04-18 22:12:10 -07:00
Alpaccalypse
07c1a6fd45 Change 'Irish slammer' to 'Grenade Penguin' (#34181) 
* Changed irish slammer to grenade penguin.

* changed DrinkGlass suffix to grenade penguin

* Fixed typo

* Added penguin squawk to reaction

* Added comment as ID differs from localisation

* Minor, post merge fix
 2025-04-18 20:24:26 -04:00
āda
44435a42ef Reorganize security lathe recipes, add category filters (#35594) 
* split

* touchup

* touchup

* double check

* minor rename
 2025-04-18 13:52:04 +10:00
Centronias
f72604bf92 Make tank harness smaller in inventories and craftable at lathes (#35590) 
* Make tank harness smaller in inventories and craftable at lathes

* pr comment
 2025-04-17 22:33:31 +10:00
ArtisticRoomba
a94f64d942 New Arsenal T3: Temperature Gun Revitalization (#35447) 
* tempgun real

* fixin shit

* Warios Couch

* fix tests. i hope

* add to lathes

* tests begone

* RIP svalinn

* maintainer for the project btw

---------

Co-authored-by: Flareguy <woaj9999@outlook.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
 2025-04-16 13:58:35 -04:00
Flareguy
92b0f62500 New Experimental Science T3: Desynchronizer (#35752) 
* desynchronizer real

* yaml stuff from slarti branch

* C# stuff

* oops

* review

* improve

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-04-16 11:33:39 +10:00
Nemanja
bbc0a09493 XenoArch Rebalancing (#36604) 
* Miscellaneous XenoArch Rebalancing

* Miscellaneous XenoArch Rebalancing

* 1 durability anomaly node

* better version
 2025-04-16 00:38:26 +02:00
beck-thompson
05f9e6d28e ID card computer bug fixed (And made it more fun!) (#32308) 
* First commit

* More feature yay

* comments

* good

* silly me

* review

---------

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-04-13 17:51:35 +02:00
SlamBamActionman
7f6756135b Add cooked dragon steak and cutlets (#36273) 
* Add cooked dragon steak and cutlets

* If it's worse for you it's even more of a delicacy

* Attribution
 2025-04-10 08:59:18 -07:00
Nyxilath
8d3b89ca9b Printable vials (#36380) 
* add vial recipe

* adding vial to lathe recipes

* adjusted vial production cost

* Reduced glass cost for vials
 2025-04-08 11:37:11 +02:00
K-Dynamic
dfbcfaf45d Add PKA and PTK-800 shuttle gun recipes to sec techfab (#34566) 
* add Magboots and PKA to sec lathe

* add kinetic shuttle gun to sec lathe

* use pack recipe

* remove magboot from prior commit
 2025-04-04 15:12:04 +02:00
Whatstone
983cf150e0 Recipes for curtains and tables using carpets now respect stacks. (#33721) 
* Carpet curtain/table recipes now respect stacks

* remove unused colour carpet tags

* Remove the tags outright
 2025-04-03 17:45:04 +03:00
MisterImp
899d318f01 New food recipe: World Peazza (#35191) 
* added world peazza

* fixed a comma in the pizza sprite json

* changed attribution comment on ArtisticRoomba's suggestion

* restored accidentally deleted line, thanks Tayrtahn
 2025-04-01 16:26:53 -07:00
Centronias
f45794002b Raw meatball cooks into cooked meatball (#36003) 
meatballs can be cooked on their own
 2025-03-26 23:26:13 -07:00
SlamBamActionman
43d08100b9 "New player" admin logging improvements (#35961) 
* Initial commit

* Adjust a whoooole bunch of logs

* Also spears

* Track going crit

* Review fix

* Review fixes
 2025-03-20 20:56:51 +01:00
MisterImp
7a539b3568 Fix recipe and animation for copypasta (#35925) 
* Fixed animation and recipe for Copypasta

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-03-19 17:35:34 -07:00
saga3152
36f6438c8e Light replacer is back on the menu (#35857) 
Lights on
 2025-03-15 17:26:38 -04:00
Coolsurf6
5d296d2dbb Added Bacchus' Blessing Drink (#35306) 
* added start to bacchus blessing with few more things left to do

* added sprites and trying to get the empty sprite to work

* fixed empty sprite will fill layer

* added missing fill image

* made flavor, physical description, recipe reaction and tweaked reagent threshold

* fixed fill levels

* removed name from drinks.yml, updated suffix instead

* delay is weird and broken, removing the difference

* updated copyright
 2025-03-13 23:49:26 -07:00
Firewars763
212bf99688 Add Gold and Coal Rock Anomalies (#34809) 
* This commit adds 2 new Rock Anomaly types, Coal and Gold. It also adds Resource Crabs, colored crystals, and lights for both.

* Added crafting recipes for yellow and black light tubes. Somehow I forgot that the first time.

* Sorted tags.yml alphabetically this time instead of not doing that.

* Updated Texture Copyright information

* Attempted to fix Merge Conflict

* Added bulb light variants for both yellow and black crystals.
 2025-03-13 01:45:22 +03:00
RedBookcase
80e674a9ae Added New Cocktails and new fill level sprites to existing drinks. (#33570) 
* Added New Cocktails and new fill level sprites to existing drinks

* Updated copyright info and fixed recipies for Caipirinha/Mojito.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
 2025-03-10 19:08:23 -04:00
DuckManZach
ff6c212335 Made butter require less milk (#35650) 
made butter take less milk
 2025-03-03 23:04:26 +01:00
Aisu9
2db57f11ac Sap-Syrup balance (#32996) 
Sap-Pancake balance

Change the conversion rate from 12:1 to 2:1
 2025-02-27 09:25:12 -08:00
āda
f80f305d1d Add filters to uniform printer (#34316) 
* uniform

* missing category

* lint

* bedsheets

* carpets

* typo

* indent
 2025-02-27 13:44:10 +01:00
slarticodefast
0c6081fe10 Fix egg cooking and make microwave code a little less bad (#35459) 2025-02-27 23:39:06 +11:00
āda
3127f73c48 Multiple categories for lathe recipes (#34315) 
* first

* lint

* changes

* change null comparison

* linq

* indent

* fix indent

---------

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-02-27 12:33:39 +01:00
MilenVolf
1c62e335b9 Add breakdown recipes for Insect and Ammonia blood (#33614) 2025-02-27 11:05:29 +01:00
Momo
f65ff0bd37 Lizard Plushie Slippers (#35381) 
* added the lizard plushie slippers yippeegit status

* fixed attributions so that the links arent broken

* update meta.json links

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

* four spacing in meta.json

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-02-25 18:18:42 -08:00
pathetic meowmeow
b7414d85b4 Add microwave recipes to the guidebook (#34105) 2025-02-23 16:24:44 +01:00
slarticodefast
55e22b6a94 Remove disablers from emagged lathe (#35423) 2025-02-23 10:05:23 -05:00
Boaz1111
54bb2a31b7 Adds Colored Light Bulbs (#35333) 
* goober

* changes parenting
 2025-02-21 19:01:31 +01:00
Smith
3c8fb2e865 Grilled Cheese Sandwich Entity and Recipe (#33807) 
* Grilled Cheese Prototype

* Typos

* Removed butter reagent to test flavour changes.

* Flavour corrections.

* CC-BY-SA-3.0 attribution

* Fixing meta.json

* I lost an hour of my life to a missing comma in meta.json

* Merge Conflict Rebase and Test Fixing

* Cook time to 10 seconds.

* Sandwich nutritional balance

* Grilled cheese sprite fixed, found the actual original source for copyright.
 2025-02-13 00:00:38 -08:00
beck-thompson
daad17c97d Add fultons as a T2 research (#34567) 
* commit

* fixed
 2025-02-11 16:29:13 -08:00
Джексон Миссиссиппи
0024f3fa0d Add loungewear to uniform printer (#35008) 
* Update clothing.yml

* Update clothing.yml
 2025-02-09 23:16:17 +01:00
deltanedas
1f5fab5761 move lathe recipes into packs (easier for forks and maintaining) (#33095) 
* add LatheRecipePackPrototype

* change Lathe and EmagLathe to use packs

* add AddRecipesFromPacks helper to SharedLatheSystem

* update lathe logic to work with packs and clean up some stuff

* migrate individual recipes to recipe packs

* update client

* remove node/artifact scanner from techs

* :trollface:

* fix test and make it include emag recipes

* add test that every dynamic recipe must be researched

* pro

* fix

* fix

* fix all tests, genuinely good test i wonder who made it

* add unused uranium and incendiary drozd mags to tech and lathe

* add recipes

* add incendiary prototype

* undo some changes

* troll

* :trollface:

* true

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>

* shitmed real

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>

* update funny test

* :trollface:

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
 2025-02-07 19:22:49 +01:00
SG6732
16aad5a168 Swapped butter w/ olive oil for making spaghetti (#34904) 
* > Swapped the butter in boiled spaghetti with olive oil

* Update meal_recipes.yml

---------

Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
 2025-02-06 12:45:33 +01:00
UpAndLeaves
20f5cbf3fd Fixed Wehxplosion yaml error (#34837) 2025-02-02 22:31:32 +01:00
Minty642
4aaa7baa7f Add Reagent gold and silver solification with frost oil (#33239) 
* Add Reagent gold and silver solification with frost oil

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

* edit frostOil value

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-02 02:00:31 +01:00
Boaz1111
db1b0a9144 Separates frost oil into coldsauce and frost oil (#34458) 2025-02-01 09:20:01 -06:00
August Sun
4085fe70e8 The Goliath Hardsuit (#34721) 
* Entities for hardsuit and helmet, graph and crafting recipe; modifies goliath hide drop rate

* Added hardsuit sprites, corrected some crafting YAML

* fixed crafting recipe, adjusted resource requirements

* Added durathread material req

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
 2025-01-29 20:45:56 -08:00
Southbridge
1af53b1e8d Astro Asteroid Sand (#34463) 
* Added astro asteroid sand

* fixed the stack name

* adjusted tile sprites for asteroid and ice

* Adjusted meta.json

* Realized the other tile sprites all have solid lines on their perimeters

* Update Resources/Prototypes/Stacks/floor_tile_stacks.yml

that works

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Update tiles.yml

* Update Resources/Locale/en-US/tiles/tiles.ftl

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* adjusted the snow sprite

* Update meta.json

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
 2025-01-29 20:41:58 -08:00
ArtisticRoomba
3e346019ff Adds better description to pneumatic valve and build menu description (#32655) 
* adds description to pneumatic valve and build menu description

* Change one atmosphere to kPa
 2025-01-27 08:40:22 +01:00