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

9658 Commits

Author SHA1 Message Date
LaCumbiaDelCoronavirus
d6e998272f Change balancing of atmos gas tank bombs (#36780) 
* i will put functionality in salt later

* la

* to 10
 2025-05-14 21:49:57 +02:00
MisterImp
9868932cfe New food recipe: Draco (dragon taco) (#37212) 
* Added draco (dragon taco)

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

* fix whitespace

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-05-14 21:33:37 +02:00
LevitatingTree
fb3bad6fb8 Tweak ND pin names and descriptions (#37416) 
* Edit item names and descriptions

* Description tweak

---------

Co-authored-by: LevitatingTree <None>
 2025-05-14 20:03:04 +02:00
ToastEnjoyer
89ea0ac253 Replaced high value target contraband on ID board and comms boards to command restricted. (#37452) 
Update computer.yml
 2025-05-14 19:47:10 +02:00
Hitlinemoss
3681de257b Removed the emergency crowbar from the chef's closet (#37403) 
* removed emergency crowbar from chef's closet

* removed emergency crowbar and spray bottle from chef's closet

* removed emergency crowbar from chef's closet
 2025-05-13 22:16:17 -07:00
Qerd
08a6260c0e Acquisition Slips fitting in folders and clipboards (#37439) 
* Acquisition Slips in folders and clipboards

* Adding Paper tag to slips

* No more repeated error messages on write attempt on slips

* Update PaperSystem.cs

Didn't mean to change this in this pr.
 2025-05-13 21:42:07 -07:00
Archee
b7056ea851 Red Candle state fix (#37423) 
fixed
 2025-05-13 21:19:39 +02:00
AsnDen
37853de4d2 Ability to pull for supplybot (#32468) 
* Alerts for silicons and ability to pull for supplybot

* Removed alerts
 2025-05-13 19:15:30 +02:00
Sparlight
26c5d77f07 Add smart corgi prototype (#36664) 
* Add smart corgi prototype

* 1984 - exploded dog names

* Tag fixes

* exploded anomalyhost tag

* Demolish the mysterious corgi flesh-pocket

* Review changes:  yml convention tweaks and reparenting of Corgi and Smart Corgi to new abstract base

* new week, new review, new me
 2025-05-13 18:10:10 +02:00
Nemanja
866f1fb47b Adjust walking sounds (#36941) 2025-05-13 02:16:16 -07:00
chromiumboy
7ac67ebf8c Station AI customizations (#34501) 
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-05-13 01:50:43 -07:00
Perry Fraser
1bbb017c96 Allow linking uniform printers to silos (#37393) 
tweak: Make uniform printers silo clients
 2025-05-12 19:56:01 -04:00
Nemanja
ec66c70295 New Salvage Mob: Basilisk (#37135) 
* Basilisk

* Less health

* Unique projectile

* Selfmerge incoming

* Update Resources/Textures/Mobs/Aliens/Asteroid/basilisk.rsi/meta.json

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-05-12 19:42:51 -04:00
Hanz
b589c75c2a Dans soaked smokes redux (#36979) 
* Meat and Potatoes

* Whoops

Whoops

* entityTables my beloathed

reworked the cig fill for Dan's soaked smokes to use an entity table. There was just, a useless bit of code calling for a cig that didn't exist the in mixed cig parent for dan's and it was what was fucking it up and making it SO HARD for me to get it to work. Thanks Dan.

* ehhh, its good for the diff I guess

* Augh

* Why mappers why

* Welp

* migration.yml is pretty cool

Also like there is no reason for nasty and medical, they probably originally were made as a workaround.
 2025-05-13 01:27:26 +02:00
Velcroboy
ccd5b153ba Swap forward/reverse for default lever links (#37394) 
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
 2025-05-12 19:24:20 -04:00
Gentleman-Bird
3e9af2ef4c Add utensil box, add muffin tins to Kitchen Dinnerware Crate (#36948) 
* Adds muffin tins to dinnerware crate

* removed forks and spoons

* Added utensile box, added utensile box to dinnerware crate
 2025-05-12 10:52:04 -07:00
Winkarst
08d9d46b46 New Feature: Slot blockers (#35172) 
* First commit

* More comments

* Update

* Update

* For Beloved Maintainers

* Beck T, my beloved

* Update

* Old stuff

* Update EquipAttemptEvents.cs

* Update UnequipAttemptEvent.cs

---------

Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
 2025-05-12 10:35:42 -07:00
Radezolid
6bb47515cb Bugfix - restore the cable module to the lathe (#37361) 
Restored the cable module
 2025-05-12 12:28:16 -04:00
kosticia
5e38a0cdca Cotton baguette for moths (#36953) 
* SAVE MILLIONS MOTHS FOREVER🗣🗣🗣🗣🗣🗣🗣

* now i forgot about it???
 2025-05-12 14:37:12 +02:00
Nemanja
954dbcbd2d Add chem barrels to salvage (#37204) 
* Add chem barrels to salvage

* Resprite and attribution before someone gets on my ass

* redo rad barrel too
 2025-05-12 12:55:11 +02:00
JrInventor05
0386bd332d Make the Syringe gun a science research (#37251) 
* LauncherSyringe

* fix

* fixfortest

* Update technologies.ftl

* Change

* Change
 2025-05-12 02:14:13 +02:00
Winkarst
078814ce41 Refactor: ProximityDetectionSystem (#35133) 
* Refactor: ProximityDetectionSystem

* Update

* Update

* Update

* Yikes

* Update

* Dirty

* Update

* Update

* Lil cleanup

* Update

* Update
 2025-05-12 00:33:35 +10:00
Ł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