rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
34311 commits 1 branch 0 tags 1.2 GiB
Commit graph

34311 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jessica M
0d97699aae
Migrate revenant and PAI shops to use ActionGrant instead of hardcoding them (#40475) 
* add intrinsic store, replace revenant store with it.

* migrate PAI and also move to shared where possible

* fix typos and clean up... intrinisic

* oops, hopefully fixes test

* Move to StoreSystem and ActionGrant

* documentation and remove thing

* review

---------

Co-authored-by: Jessica M <jessica@maybe.sh>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-10-09 21:14:12 +00:00
blobadoodle
5185df4072
Add missing uranium glass locales (#40809) 2025-10-09 21:12:24 +00:00
Winkarst-cpu
e89651c774
Fix masks with flash, eye, and damage protection working while being pulled down (#40331) 
Fix
 2025-10-09 14:07:58 +00:00
PJBot
dc127d0857 Automatic changelog update 2025-10-09 14:01:16 +00:00
Connor Huffine
fda846ac85
Move Bulldog Drum to Emag (#40790) 
* Move Bulldog Drum to Emag

Bulldog drum removed from standard techfab
Moved to emag listing

* Update Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-10-09 13:37:09 +00:00
PJBot
8dd8a334ae Automatic changelog update 2025-10-09 13:47:30 +00:00
Princess Cheeseballs
3ac94ea7f5
PRevent the forever sleep. (#40366) 
* Fix

* Rejuvenate

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-10-09 13:32:43 +00:00
PJBot
cc4c7f5ada Automatic changelog update 2025-10-09 13:33:46 +00:00
SlamBamActionman
33c0c46b5d
Add slowdown to nocturine, buff duration and minor delay reduction (#40797) 
* Yawn

* Remove yawning because it's kind of a nerf tbh

* Remove newline

* Begone, condition
 2025-10-09 13:20:05 +00:00
Leon Friedrich
dac2c5212a
Add generic event listener for integration tests (#40367) 
* Add generic event listener for integration tests

* cleanup

* assert that the entity has the component

* comments & new overload
 2025-10-09 13:03:44 +00:00
ScarKy0
fea8ac4522
Change whitelist logic for parcel wrap (#40800) 
* init

* review
 2025-10-09 13:00:13 +00:00
slarticodefast
e3f6b00362
Stable to master merge (#40798) 
Update Mind Shielding section in Space Law (#40647)

* Update Mind Shielding section in Space Law

* Formatting
 2025-10-09 15:05:05 +02:00
SlamBamActionman
1f1461b9db
Update Mind Shielding section in Space Law (#40647) 
* Update Mind Shielding section in Space Law

* Formatting
 2025-10-09 13:59:43 +02:00
thetuerk
bb3fa43f1f
Predict LungSystem (#40729) 
* Initial edits of files
Untested yet. I would like to make sure all is accounted for before moving the files.

* trying my best

* Revert "trying my best"

This reverts commit 9aeece466df0169adec97e3947b061b54fd9b388.

* Revert "Initial edits of files"

This reverts commit 45c6e2343844b5fcafadbf2e5115fb2f241086a1.

* an actual meal

* Added networking to LungComponent.cs

* removed duplicate using

* moving GasRagents to SharedAtmosphereSystem.cs
 2025-10-09 10:26:21 +00:00
Connor Huffine
6f3f7d86b8
Fix terminology (#40792) 
c20r magazine description changed to "SMG"
 2025-10-09 05:14:41 +00:00
slarticodefast
8e3243a156
Fix changeling blindness (#40517) 
fix changeling blindness
 2025-10-09 05:03:11 +00:00
PJBot
ef0c9ecc63 Automatic changelog update 2025-10-08 23:47:04 +00:00
ToastEnjoyer
72852accbe
Remove enforcer from fland (#40786) 2025-10-08 23:34:48 +00:00
PJBot
61f7d3438d Automatic changelog update 2025-10-08 22:29:05 +00:00
Centronias
c54fb47f7c
Wrapped Parcels can be labelled with Papers (#40783) 
* labels

* oop

* Update Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
 2025-10-08 22:17:11 +00:00
PJBot
6a3a54535b Automatic changelog update 2025-10-08 22:00:47 +00:00
SlamBamActionman
df6307fe66
Allow more energy projectiles to hit holo creatures (#40782) 
* Allow more energy projectiles to hit holo creatures.

* Disabler SMG
 2025-10-08 21:48:52 +00:00
PJBot
0039dff91f Automatic changelog update 2025-10-08 20:42:56 +00:00
ToastEnjoyer
02ada04eb4
Removed wardens enforcer from box (#40785) 
box shotgun gone :dejected:
 2025-10-08 20:30:16 +00:00
PJBot
d3771a19e2 Automatic changelog update 2025-10-08 17:01:09 +00:00
Vortebo
3f2a58a157
Relic fixes and tweaks (#40537) 
* Various adjustments

* More accurate floors

* Changes

* This should be good

* Logic
 2025-10-08 16:48:07 +00:00
opl-
0805943c98
Fix wizard can teleport into the ATS wall (#40755) 
Co-authored-by: opl <4833621+opl@users.noreply.github.com>
 2025-10-08 16:45:28 +00:00
PJBot
c566b17da7 Automatic changelog update 2025-10-08 15:50:29 +00:00
Hitlinemoss
f80f322357
Added folders and clipboards to trinkets tab (#39920) 
* Added folders to trinkets tab

* Fixed loadout grouping

* Added plastic clipboards to trinkets

* Whoops, forgot to create BoxFolderPlasticClipboardThreePapers prototype

* Added regular clipboards as trinkets (1 hour of command required)

* Reduced folder bloat
 2025-10-08 15:37:34 +00:00
PJBot
e7f1d67df0 Automatic changelog update 2025-10-08 15:24:10 +00:00
K-Dynamic
1b62863e52
Fix: Allow energy shotgun lethal projectiles to hit holos (#37920) 
BulletLaser opaque mask
 2025-10-08 15:03:12 +00:00
PJBot
2a5a72d5bd Automatic changelog update 2025-10-08 15:11:27 +00:00
YoungThug
92082f8091
Fix the temperature gun not reflecting and going through windows (#37581) 
* Fix Temp Gun

* Fix mask, muzzle flash

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
 2025-10-08 14:59:36 +00:00
slarticodefast
7cdd8cb2a9
Add disclaimer about AI generated content to Readme.md (#39334) 
* Add disclaimer about AI generated content to Readme.md

* Update README.md

* rephrase
 2025-10-08 14:50:23 +00:00
āda
41c7229b9d
cleanup and reorganize belts.yml (#40773) 
commit discipline? Never heard of it

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-10-08 14:14:49 +00:00
PJBot
4f93089e42 Automatic changelog update 2025-10-08 14:12:08 +00:00
UpAndLeaves
91aa169784
Slightly re-nerf zombification speed (#37445) 
Initial Commit
 2025-10-08 13:57:55 +00:00
PJBot
532564e05f Automatic changelog update 2025-10-08 13:59:45 +00:00
āda
68b3c7a520
Clean up bucket.yml (#40772) 
SMASH that bucket

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-10-08 13:48:00 +00:00
B_Kirill
0c9d33d5d6
Cleanup warnings: CS0414, CS8524 (#40776) 
* Cleanup

* CS8524
 2025-10-08 12:43:59 +00:00
PJBot
44563dafdc Automatic changelog update 2025-10-08 11:31:38 +00:00
Archee
3f115fa1d4
Fix- Cobras killing adders (#37424) 
* fixed

* adds SimpleHostile to SpaceAdder (the stealth snake)

* whoops i branched this off a branch not master

This reverts commit fe1562581f91a113950cfedd284a1790e51a48e6.
 2025-10-08 11:19:17 +00:00
PJBot
694fd0628f Automatic changelog update 2025-10-08 02:52:31 +00:00
SlamBamActionman
33cd3df45a
Change Energy Shotgun to fit as a Warden weapon (#40757) 
* Initial commit

* Fix toggle mode name and also miscalculated charge times oops
 2025-10-08 02:40:44 +00:00
PJBot
86b1be88dd Automatic changelog update 2025-10-07 23:38:51 +00:00
Hitlinemoss
63c17b151d
Added the golden shaker (playtime reward for Bartenders) (#40762) 
* Added a golden shaker (playtime reward for Bartenders)

* Removed redundant icon line
 2025-10-07 23:26:56 +00:00
PJBot
e841cb9fc6 Automatic changelog update 2025-10-07 23:15:18 +00:00
Mora
5be5e280be
Added Vox Beak Types, New Markings, and Sprite Layering Fixes (#40569) 
* Added more Vox customizations

* Adds Vox Head Markings

* Update meta.json

* stray comma, woe be upon ye

* added tiny pixel to visage left and right

* Added eyeliner ftl

* Removed duplicate FTL

how the fuck did this happen

* Added cheek marking

* Made tip marking look a bit better

* Fix eyeliner ID

* ok whatever shut up build test. mean to me

* changed underbelly to have more flat transparency

* didnt like how it looked so i adjusted it

* Adjusted base eyeliner color

* Fixed inconsistency with nightling head tattoo

* Updated V tattoo

* Delete chest_v.png

* fix yml

ITS EVEN FUNNIER THE SECOND TIME

* minor sprite fix

* Update head.png

* Re added stray pixel, added square cere beak

* Added hooked beak

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
 2025-10-07 23:03:21 +00:00
PJBot
0734cdd18a Automatic changelog update 2025-10-07 19:37:39 +00:00
Hitlinemoss
afe11dc959
MRE wrappers / cotton nutri-bâtards are no longer twice as nutritious as nutribricks (#40761) 2025-10-07 19:25:19 +00:00