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

9636 Commits

Author SHA1 Message Date
Łukasz Lindert
8bed0f4b62 Booze and soda dispenser activate ui fix (#37347) 
booze and soda
 2025-05-11 15:39:52 +02:00
Futuristic-OK
48d134cc7d New hairs2 (#36613) 
* Update human-hair.ftl

1

* Update human_hair.yml

* longwithbangs.png

* Update meta.json

* fix png

* Update meta.json

* Update Resources/Locale/en-US/accessories/human-hair.ftl

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

* Update Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-05-10 20:09:27 -04:00
JCGWE30
29147edabd Dragon Direction Briefing Fixed (#37181) 
* All Fixed Up

* Remove Log Manager

* Updated Conventions

* Typo Fix
 2025-05-10 19:35:27 -04:00
Nemanja
dfc8934782 Fix observer pointlights being broken (#37335) 2025-05-10 23:41:40 +02:00
Winkarst
51205454f3 Fix: Add ability to execute using crusher weapons (#37330) 
* Fix

* Oops

* Skill issue
 2025-05-10 09:47:57 -04:00
Nemanja
38f6e6e849 Add EvenHealthChange effect (#37129) 
* Add EvenHealthChange effect

* cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-05-10 14:51:28 +02:00
PotentiallyTom
29860c03ea Modified the T2/T3 laser recipies to (hopefully) see more than just xray cannons (#37308) 
the numbers mason
 2025-05-10 11:58:03 +02:00
pathetic meowmeow
4407eab96b Fix reagent dispenser test (#37324) 2025-05-10 00:46:48 -04:00
B_Kirill
2f7ca220e7 Fix meteors deceleration (#37320) 
* Fix meteors deceleration

* Again

* Just do it
 2025-05-09 23:55:35 -04:00
pathetic meowmeow
5a0e0524ca Make reagent dispensers gridinv-based instead of pseudo-listinv (#34205) 
This simplifies the code and makes the experience of examining contents
easier without the reagent dispenser UI, as well as adding the possibility
for dispensers to have items of heterogeneous sizes in them, which would
allow configuring reagent dispensers to accept smaller containers such
as beakers or vials in order to allow for more types of smaller quantities
of reagents, or other flexibilities brought by using a standard storage
component.
 2025-05-09 23:49:05 -04:00
Nemanja
942b2b4dcb Change atmos plaques to yaml (#37318) 
* Change atmos plaques to yaml

* remove locale strings
 2025-05-10 02:24:07 +02:00
Winkarst
b13975cad2 Fix: Make gas canisters eject inserted tank/jetpack on break (#37314) 
Fix
 2025-05-09 20:01:44 -04:00
Tayrtahn
b769ab0f7e Add test that mob damage thresholds have alerts (#37307) 
* Add test that mob damage thresholds have alerts

* Docs

* Add BorgDead state to MobSiliconBase
 2025-05-09 13:07:17 -04:00
Gamewar360
d0dc8faed0 [Cargo]New Bounty: Salvage (#34926) 
* uoy

* Fix vague tag names, issues with bounty text

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2025-05-09 11:52:30 -04:00
Vladislav Suchkov
554f6f3d68 Fixed Silo not accepting diamonds (#37305) 
init
 2025-05-09 11:41:44 -04:00
paige404
9610b23d55 Rainbow Jumpskirt (#37291) 
* Add a rainbow jumpskirt. <3

* minor spelling mistake dot gif

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
 2025-05-09 07:48:08 -04:00
robinthedragon
beefabc588 add basic operative bundle (#37290) 
* add nukie bundle

* Update Resources/Prototypes/Catalog/uplink_catalog.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-05-09 13:32:29 +02:00
Nyxilath
f2c7b39e13 readded trashbags to Autolathe recipes (#37296) 2025-05-08 20:35:49 -07:00
Nemanja
7bec148634 Validate Cargo Markets (#37271) 
* Validate cargo markets

* readonly market ID
 2025-05-08 21:53:19 +02:00
Myra
8d4b3c0fdc Revert "Traumoxadone" (#37284) 2025-05-08 19:08:27 +02:00
Thinbug
0c6be8bb0d Tweaks to the push horn so its less of a shitter tool (#37281) 
* Empty commit

* tweaks to the push horn

* forgor to change the delay

* keeping the speed the same for now
 2025-05-08 18:49:58 +02:00
ScarKy0
9e582157ac Revert "Traumoxadone (#37126)" 
This reverts commit efc8d8600d.
 2025-05-08 18:13:33 +02:00
SlamBamActionman
90c3ba8f36 Add 3 new Exomorph posters (#37260) 
Initial commit
 2025-05-07 19:26:48 -04:00
themias
8edc8c7596 Genpop closet cargo orders (#37237) 
* Genpop closet cargo orders

* change icon to locker base
 2025-05-07 22:28:28 +02:00
Zalycon
31ce616c25 Raises max chest markings for all species (except Reptilian) to 2 (#37065) 
* Update arachnid.yml

* Update diona.yml

* Update human.yml

* Update moth.yml

* Update slime.yml

* Update vox.yml
 2025-05-07 14:44:53 +02:00
K-Dynamic
ae6f96fa87 Four-way pipe junction, swapping junction construction fix (#37092) 
* pipe x-junction assets, yml, construction

* remove duplicate asset

* attribution

* x junction instead of junctioncross for utilities.yml
 2025-05-07 13:37:59 +02:00
Flareguy
cdcc57e467 Moth displacement maps (#37231) 
moth displacement maps
 2025-05-07 13:06:42 +03:00
Archee
012eeb3158 Cryotube draw-depth (#37240) 
* removes changing draw depth when occupied

* changes collision to square

* small texture changes
fixes slight perspective size when comparing side columns to the direct column facing the camera
removes the baked in pipe exit (the yml's sprite adds it anyway)
 2025-05-06 22:01:09 -04:00
Ghagliiarghii
bcdb17597a Fix borg soap (#36961) 
* Create SoapBorg and replace SoapNT with SoapBorg in BorgModuleCustodial

* Reparent SoapBorg

No longer a container so the soap reagent cannot be extracted from the soap, no longer a food, no longer slippery since it can't be removed from the borg to be placed on the ground

* Move SoapBorg to end of soap.yml

* correct comp order

* fix failing tests
 2025-05-06 15:10:10 -04:00
pathetic meowmeow
cfba56c2b4 Make departmental orders consoles print slips (#36944) 
* Make departmental orders consoles print slips

* feed back cycle
 2025-05-06 15:04:18 -04:00
OnyxTheBrave
e527adea92 Fixed holy water metabolism rate (#37106) 
* Fixed holy water metabolizing at 1u instead of .5u a second

* Update Resources/Prototypes/Reagents/medicine.yml

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-05-06 14:31:23 -04:00
Princess Cheeseballs
64f7fe10cc Ichor double-metabolize fix + Very minor cleanup (#37107) 
Not a yaml vacation apparently
 2025-05-06 14:16:13 -04:00
Prole
6cdc436f5f Water bottle dispenser fix & Bottle Yaml Organizing (#37108) 
* A New Parent/Category For The Soda & Tonic Water Bottle

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* New Parent For water bottle & Cleanup

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* More Cleanup

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Details

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Organizing For Additions

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Streamlining waterbottle to be compatible with DrinkBottleVisualsAll Parent

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Replacing/Renaming Parents

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* New Tonic/Soda Water Bottle Sprites

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Misc Fixes

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* New Parent for Small Glass Bottles & Organizing

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Organizing & uSize Parity.

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* File Parity

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Merged Categories & Misc Fixes

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Removed Silly

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Parent Name Parity & Cleanup

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Large Glass Bottles Category & Cleanup

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
 2025-05-06 14:13:33 -04:00
lzk
740ce0e8ad Port fancy speech bubbles (#29349) 2025-05-06 20:49:42 +03:00
YoungThug
c0935e5b59 AI Law Board File Clean Up (#37195) 2025-05-06 12:51:32 -04:00
archee1
ef881fe655 Removing redundant trash tags on medipens (#37215) 
removes redundant tag components
 2025-05-06 12:24:52 -04:00
brainfood1183
d7f5dac0b8 Fix for Whoopie Cushions (Fixes #32028) (#36984) 
* Fixes whoopie cushions so they no longer launch you into oblivion when stacked in a large pile.

* Update Resources/Prototypes/Entities/Objects/Fun/toys.yml

* streamlined the components for the prototype

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-05-05 01:01:27 +02:00
Perry Fraser
61d524a983 Allow shelves to be placed rotated when built by hand (#37186) 
fix: shelves can be placed rotated when built by hand
 2025-05-05 00:42:21 +02:00
J
7b352643d5 Refactor magic speak system to be a component added to actions (#36328) 2025-05-04 13:34:19 -04:00
Nemanja
f1a17f360d Revert "add material composition to some salv treasure" (#37149) 
* Revert "add material composition to some salv treasure (#31970)"

This reverts commit 125258ea48.

* Remove ring materials as well
 2025-05-04 04:39:19 +02:00
Nemanja
9afa15ab41 Salvage Threat: Gibtonite (#37160) 2025-05-03 17:38:47 -07:00
Minemoder5000
42a5b03743 Replace uplink thieving gloves with chameleon thieving gloves (#36369) 
* replace thieving gloves with chameleon thieving gloves

* increase TC cost by one

* add a TODO comment
 2025-05-03 15:28:47 -04:00
Nemanja
0c8c757a42 Revert "Resprited the Chief Engineer's mantle/manica" (#37060) 
Revert "Resprited the Chief Engineer's mantle/manica (#36697)"

This reverts commit d0c2a64436.
 2025-05-03 14:28:59 -04:00
Ghagliiarghii
885eb7bc35 ClothingOuterEVASuitSyndicate (#36738) 
* ClothingOuterEVASuitSyndicate

* Update migration.yml

* Resolve merge conflict in migration.yml

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-05-03 12:06:35 -04:00
Radezolid
aaa4c75341 Fix some maintenance doors not using wires configuration + cleanup + minor changes (#36735) 
* Kill useless maints doors + general fixes

* Migrate the common maints airlock

* Fix parenting

* Service Theatre

* migrate out the other removed airlock

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2025-05-03 11:07:57 -04:00
Errant
79187cecb9 randomize names for mindshielded eventhumanoids (#37143) 2025-05-03 08:10:43 -04:00
3nderall
213a9ef36d Renders reagent grinders over lights (#31218) 
* Adds a new layer to DrawDepth.cs for use with objects similar to the reagent grinder and properly summarises its uses

* applies new layer in DrawDepth.cs to reagent_grinder.yml

* Fix merge conflict

* oops
 2025-05-03 14:27:20 +10:00
Unkn0wn_Gh0st
11096ad9bf New Weapon: Knuckle Dusters (#33470) 
* New Weapon: Knuckle Dusters

* Tag YAML Error Fix

* Crafting Graph Node Error

(Thank you slarticodefast)

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

* Crafting Node Error Part 2 Electric Boogaloo

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

* Contraban & QM Dusters Nerf

* Stun Knuckledusters (Unfinished)

* Typo

* Fix test fails

* The dastardly maintainer balance webedit

* Fix contraband parenting

* Fix construction failure

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2025-05-03 00:18:08 -04:00
ScarKy0
efc8d8600d Traumoxadone (#37126) 
* init

* salicylic acid
 2025-05-03 00:56:47 +02:00
Prole
c153f84e42 noRot on 2-way lever (#37125) 2025-05-02 13:07:20 -07:00