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

9840 Commits

Author SHA1 Message Date
Tayrtahn
3dbb8905b5 Add test that entity prototypes don't use LocIds for name/description (#38234) 
* Add test that entity prototypes don't use LocIds for name/description

* Fix violation
 2025-06-11 02:47:04 +02:00
themias
509d650253 Fix missing bike horn implant cooldown (#38237) 2025-06-10 14:40:46 -07:00
BramvanZijp
8c6b288853 Add stamina damage resists to the bloodred raid/hard-suits (and ERT hardsuits). [TEST MERGE] (#37040) 
Add stamina damage resists to the bloodred suits.
 2025-06-10 12:31:44 -07:00
lzk
6f852b6a49 cleanup mirror.yml (#38222) 2025-06-10 17:29:09 +02:00
lzk
3a4b7d62c7 WHYYYYYYY (cleanup) (#38220) 
* WHYYYYYYYY

* Delete Resources/Locale/en-US/actions/actions/rootable.ftl
 2025-06-10 15:36:58 +02:00
slarticodefast
0bdaf9e5ff merge stable into master (#38213) 2025-06-10 12:44:53 +02:00
slarticodefast
cad0b6b3fa HOTFIX: Stop AI turrets from causing flickering lights (#38212) 
no power draw
 2025-06-10 12:39:24 +02:00
nabegator
2d5ee82aa3 hi-viz vest laser reflect (#38180) 
* Update vests.yml

* Update vests.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-06-09 16:03:56 -07:00
slarticodefast
6abd44500f Stable master merge yippe among us print (#38192) 2025-06-10 00:38:10 +02:00
ArtisticRoomba
df6be08506 Derotate and remove several maps, remove unused maps (#38190) 2025-06-09 15:37:33 -07:00
cnv41
8f48eae3aa Typo fix in coffin description (#38193) 2025-06-09 15:33:23 -07:00
Disp-Dev
c3956eff6d New Recipes: Breakfasts (#37279) 
* Adds full english and american breakfasts and respective recipes

* sprite tweak and added random spawner

* reagent rebalance

* reagent re-rebalance

* spawner ID fix

* ACTUALLY actually fixed the spawner, also description changes

* reagent re-re-rebalance

* spawner fix so the linter stops screaming at me

* different check failed kekw

* trailing whitespace fix attempt #1

* identation fix? i think?

* indetation fix part 2, also vox cant eat this anymore

* more yaml fixes

---------

Co-authored-by: DispenserDev <mariousjoaquin@gmail.com>
 2025-06-10 00:33:02 +02:00
slarticodefast
d4c4606cf4 Revert tile aligned barsigns (#38185) 
fixtures for bar signs (#37756)"
 2025-06-10 00:02:31 +02:00
Tayrtahn
f8e89749c5 Give unique names to all curtain construction recipes (#38182) 
* Give unique names to all curtain construction recipes

* Duplicate entry
 2025-06-09 19:55:44 +02:00
Errant
99b2955c09 HOTFIX Revert #38004 : Change C-4 back to syndicate contraband (#38177) 
* Revert "Made C-4 Major contraband instead of syndicate contraband (#38004)"

This reverts commit 0a565469c7.

* remove changelog
 2025-06-09 18:59:37 +02:00
pathetic meowmeow
3d40bebbef Allow cargo request computers to send orders to the primary account (#37943) 2025-06-09 11:11:19 -04:00
Tiniest Shark
2d08f79229 Assorted device and core inhands (#38162) 
* Assorted device and core inhands

* whoops forgot the thief objective

* i missed literally on pixel on the fulton argh

* inhand pinpointer update
 2025-06-09 00:40:14 -07:00
Orsoniks
ef42c36cdb Improved Health examination text (#38126) 
* more health examinations

* better blood

* fix

* tweaks

* sizeable

* silicon fix

* tweaks

* bleeding color tweaks

* fix
 2025-06-09 00:31:49 -07:00
Archee
a46861e221 Missing contraband tags on explosives (#37521) 
* Firebombs as minor contraband

* Pipebombs as minor contraband

* Seismic charge as cargo/sec contra (like crushers)

* Modular payloads
 2025-06-08 18:05:22 -07:00
Nox
35411b5090 No raffle for space carp (#38101) 
No raffle for carp

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
 2025-06-07 22:49:44 -04:00
Perry Fraser
7ce2d241dd fix: allow ejecting diamonds from lathes/silos (#38132) 2025-06-07 13:36:58 -04:00
K-Dynamic
eb208a2ae8 Genpop wall lockers (#38102) 
* sprites

* genpop wall lockers

* number 5 alive

* slight boilerplate code, thank you slarti
 2025-06-07 17:51:38 +02:00
K-Dynamic
a84d718a09 Reduce disabler capacity to 16 shots (#36019) 
* 14 shots

* 14 to 16
 2025-06-07 15:05:25 +02:00
lzk
32301a6dcb chem.yml cleanup (#38129) 
Update chem.yml
 2025-06-07 13:38:36 +02:00
hoshizora
373ab740bb Add name to chameleon controller implanter (#38117) 
Update implanters.yml
 2025-06-06 19:29:13 -07:00
Spanky
668a0f0863 Light Up Landmines (#38092) 
* Adjust landmines to have unshaded lights.

* Someday I will give myself credit for the work I do.

* Adjust animation speed.
 2025-06-06 19:01:14 -04:00
jkwookee
57567a92c6 Reduce Liquid Frezon Duration (#38100) 
testing
 2025-06-06 18:41:21 -04:00
themias
afa62b5e69 Increase throwing into disposal chance (#38116) 2025-06-07 00:13:20 +02:00
Tayrtahn
136208dbc3 Fix throwing items into disposal units (#38106) 2025-06-06 23:40:08 +02:00
Minemoder5000
cddc9926b0 Shark toys use the bite animation. (#38113) 2025-06-06 14:07:09 -07:00
Errant
a332817803 emergency shuttle emergency lockers (#38095) 2025-06-06 12:12:33 +02:00
Samuka-C
bc4a45d6e5 Make improvised explosive devices minor contra (#38088) 
pipe bomb and fire bombs are minor contra
 2025-06-05 19:28:04 -07:00
RedBookcase
219015dcd8 Added Scrap Armor [Reupload]. (#37601) 
* Added Scrap Armor v2.

* Added a note to scrap helmet about vision reduction.

* Removed protection from step triggers.

* The patient needs broken kneecaps to live.

* Add in missing tag

* Missing tags pt 2

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-06-05 20:13:36 -04:00
K-Dynamic
2a4540fffa Rifle crate order (#35535) 
* lecter crate and gift

* revert cargo gift security armor change

* rifle cost down to 8000 spesos
 2025-06-05 19:40:51 -04:00
Xeri Marai
18fa45addd Improve Potted Plant Movability and Availability (#37591) 
* Added Purchasable Potted Plant Crate

* Removing some whitespace that made it in elsewhere

* Making Potted Plants Items and pickupable

* Revert Making potted plants not fade

This reverts part of commit a50a7def80c06e5be68a37263306007739952a28.

* Adding self to credits

* Fixing sus spacing
 2025-06-05 19:36:31 -04:00
August Sun
f9784206e0 Adds individual Bulldog magazines to the syndicate uplink (#37917) 
* Brief commit to update branch

* added more magazines to uplink, corrected spelling in ftl file for uplink, corrected sprite state for incendiary bulldog mag

* removed incendiary drum, increased cost of slug drum

* Emogarbage swoop

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-06-05 19:35:15 -04:00
vmzd
4cbfd19312 Add hair back to hardhats (#38086) 
adds hair back to hardhats
 2025-06-05 19:27:33 -04:00
RedBookcase
6fb613e87e Standardized running and walking speed debuffs for equipped gear. (#37828) 
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
 2025-06-05 19:27:01 -04:00
ArtisticRoomba
daeeae3ac0 Sellable syndicate contraband (#37835) 
* Sellable syndicate contraband

* 1984 tests, laughible

* Balancing
 2025-06-05 19:26:31 -04:00
Southbridge
0dd30c87a6 Reorganized Turret Prototypes (#37863) 
* Reorganized turret prototypes

* Added circuit board to migrations

* Fixed frequencies

* Fixed typos and set the base control panel to abstract since it's technically not constructable yet

* Fixed the typo in the migrations

* Addressed changes

* Whitespace fixes

* Whitespace check fix

---------

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
 2025-06-05 19:24:02 -04:00
Hitlinemoss
3d942e1cad Added security mime mask (#37890) 
* Added security mime mask

* Improved security mime mask equipped sprites

* Improved security mime mask icon sprite

* meta.json spacing fix
 2025-06-05 19:23:13 -04:00
Gentleman-Bird
076310bd58 Fix soap recipe so it actually works (#37923) 
Change soap recipe
 2025-06-05 19:20:44 -04:00
Simon
d7d7a6c80e Split codewords into its own system (#37928) 
* Split codewords into its own system

* Fix admin log

* Nuke unused code

* Fix formatting errors

* Fix tests

* Make the codeword system add itself if called when not active

* Put comment in right place.

* Review: Rename prototypes

* Review: Make codewords serializable

* Fix build

* Reviews: Change the system to not be a gamerule.

* Fix YAML Linter

* Fix test fail

* Remove unused import
 2025-06-05 19:19:41 -04:00
chromiumboy
ea1ecad3ff Tweak for the visual coverage granted to station AIs by holopads (#38059) 
* Initial commit

* Added option to require anchoring
 2025-06-05 19:15:55 -04:00
Orsoniks
e21fb8ff39 In-hand sprites for some food items (#38024) 
* so meow changes

* qwawa

* fixed sprites

* Update meta.json

* Update meta.json

* Update meta.json

* Update meta.json

* Update meta.json

* more inhand variations using coloring

not perfect but better than nothing

* more meats

* pizza inhands, ported from starlight and edited

* add link

* snack inhands

* worldpeas

* chips

* packets

* all snacks and trashes finished

* correction
 2025-06-05 17:06:38 -04:00
Spanky
9bb3140550 Evac Repair Lockers (#38075) 
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-06-04 23:08:38 -07:00
Cojoke
4b226eaad6 Remove Lube From Trash Puddle Spawns (#38048) 2025-06-04 14:16:24 +02:00
Funce
148fb5ca23 Blood-Red Magboots now correctly show if magboots are active (#38013) 
* Change JetPack Item Visuals to use GenericVisualizer instead of AppearanceChangeEvents

* Fix YAML indentation for jetpacks.yml
 2025-06-04 13:10:06 +02:00
SlamBamActionman
d81e82cef7 Add Diona rooting (#32782) 
* Initial commit

* Add sound

* Review commets

* addressing review

* I think this is what Slart meant?

* Review fixes

* More fixes

* tiny formatting

* Review fixes

* Review fixes

* Fix small timing error

* Follow new action system

* review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-06-04 12:52:59 +02:00
Moomoobeef
2184d38460 Stylized the nanotask printouts to be *pretty* (#37805) 2025-06-04 01:16:14 -07:00