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

22006 Commits

Author SHA1 Message Date
vitopigno
ddefcbe147 Merge branch 'master' into fix_highlight 2025-06-12 17:20:50 +02:00
PJBot
aee55954d3 Automatic changelog update 2025-06-12 01:23:58 +00:00
SlamBamActionman
9a5bd9de6a Add propeller hat & swirl lollipop (#38260) 2025-06-11 18:22:51 -07:00
RedBookcase
a8801e4abf Removed Toys.rsi, reorganize toy RSIs, broad /Fun/ cleanup. (#37189) 
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-06-11 16:29:27 -07:00
PJBot
bbf6d745f6 Automatic changelog update 2025-06-11 22:26:46 +00:00
Vortebo
d9f5480397 Minor Relic improvements (#38269) 2025-06-11 15:25:38 -07:00
PJBot
5b271bb226 Automatic changelog update 2025-06-11 21:58:03 +00:00
Boaz1111
55540c374a scar availability for more species (#35645) 
* :D

* updated for new scars

* small eye scar
 2025-06-11 23:56:57 +02:00
āda
f5a28a5ad5 Cleanup exosuit fab recipes, add modules category (#38069) 2025-06-11 14:12:09 -07:00
PJBot
59472a0bc7 Automatic changelog update 2025-06-11 20:29:07 +00:00
Nox
edd2e80a4e Launchers require wielding (#38110) 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-06-11 13:28:00 -07:00
PJBot
cd57f50bfc Automatic changelog update 2025-06-11 20:21:55 +00:00
Princess Cheeseballs
6052b1cfba Basilisk Nerfs for Gameplay (#38089) 
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-06-11 13:20:48 -07:00
PJBot
a4fb272ef4 Automatic changelog update 2025-06-11 20:04:21 +00:00
Seam_Less
f046d8a1f6 Magazine rsi Cleanup + Magazine Type Recolor (#37709) 2025-06-11 13:03:14 -07:00
Perry Fraser
36c048ba65 Add disambiguation to most construction menu recipe names (#38197) 2025-06-11 12:52:22 -07:00
PJBot
372e1767fa Automatic changelog update 2025-06-11 18:33:55 +00:00
Simon
f5fbef7ccc Add the instrument names to the MIDI channel selector (#38083) 
* Add the instrument to the MIDI channel selector

* Reviews

Adds support for chained masters
Makes the channel UI update on its own when the midi changes (Works with bands too!)

* add to admin logs and limit track count

* Limit track names by length too

* remove left over comment

* Requested changes

* Reviews
 2025-06-11 20:32:48 +02:00
PJBot
33421ec9b4 Automatic changelog update 2025-06-11 15:37:27 +00:00
ScarKy0
b7c1849e11 Fix reinforced plasma window blocking laser shots (#38041) 
* init

* stuff
 2025-06-11 08:36:20 -07:00
PJBot
b1e6a0f2a1 Automatic changelog update 2025-06-11 14:02:50 +00:00
Boaz1111
f1e161acab Makes the grenadine bottle start closed. (#38219) 
* whywhywhy

* removes unneeded line
 2025-06-11 16:01:42 +02:00
PJBot
a67c26eb53 Automatic changelog update 2025-06-11 04:55:59 +00:00
hoshizora
905c298ed7 Fix mops, rags, and towels interacting with drains (#38252) 
added the stuff
 2025-06-10 21:54:50 -07:00
PJBot
58606ca230 Automatic changelog update 2025-06-11 01:17:03 +00:00
eoineoineoin
419b4e7916 Add technology to tech disk names (#38157) 2025-06-11 03:15:56 +02:00
Prole
1c99b8405b Guitar Sprite Fix (#38207) 
* Modified Guitar Sprites

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

* Attributions

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

---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
 2025-06-11 02:51:19 +02:00
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
PJBot
1e0d60826e Automatic changelog update 2025-06-10 21:41:55 +00:00
themias
509d650253 Fix missing bike horn implant cooldown (#38237) 2025-06-10 14:40:46 -07:00
PJBot
df8fcf5193 Automatic changelog update 2025-06-10 19:32:52 +00: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
qrwas
ca6ab02587 Add missing locale in Criminal Records Computer (#38217) 
add missing filter locale
 2025-06-10 14:19:37 +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
PJBot
5fcff99fbc Automatic changelog update 2025-06-10 09:37:43 +00:00
ArtisticRoomba
7dd202ebbe stop amber AI core from inducing seizures (#38209) 2025-06-10 02:36:33 -07:00
PJBot
ea9330b654 Automatic changelog update 2025-06-10 04:48:45 +00:00
Southbridge
cbf8fa2349 Remade the AI Camera Static Shader (#38093) 
Redid the camera static shader
 2025-06-09 21:47:35 -07:00
PJBot
370c314d88 Automatic changelog update 2025-06-10 00:06:55 +00:00
PJBot
1eeecc0e20 Automatic changelog update 2025-06-09 23:05:03 +00: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
PJBot
baaba203f2 Automatic changelog update 2025-06-09 22:57:41 +00:00
Spanky
bf3d09ea81 Emergency Shuttles Update (#38186) 2025-06-09 15:56:33 -07:00
PJBot
d7a4d1ed28 Automatic changelog update 2025-06-09 22:38:41 +00: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
PJBot
f2c4647948 Automatic changelog update 2025-06-09 22:34:31 +00:00