juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,173 Commits 57 Branches 0 Tags
ed-29-09-2025-upstream
Commit Graph

36173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
d73fcd53ff Update ContentLocalizationManager.cs 2025-10-06 12:38:49 +03:00
Ed
d25f979691 Update bucket.yml 2025-10-03 12:17:45 +03:00
Ed
824cddaa72 Update physical.yml 2025-10-03 12:12:46 +03:00
Ed
97ac343c6c edible 2025-10-03 12:02:03 +03:00
Ed
58b6f3d64e adapt codebase 2025-09-29 14:14:07 +03:00
Ed
d6a8c169b2 Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Content.Server/IdentityManagement/IdentitySystem.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
 2025-09-29 14:00:54 +03:00
CrystallEdge Server
fe0853a1f3 Automatic changelog update 2025-09-28 23:54:21 +03:00
Red
621ee3fa73 Hotfix (#1811) 
* fix #1809

* fairies disable
 2025-09-28 23:53:15 +03:00
Vasilis The Pikachu
b8ed3f9664 Empty commit 2025-09-28 17:54:18 +02:00
CrystallEdge Server
3d0b489392 Automatic changelog update 2025-09-28 11:17:58 +03:00
Red
c4087e9d5f Magic now respect physics again (#1805) 
* fixes

* Update silva.yml
 2025-09-28 11:16:52 +03:00
Ed
62589adb72 Update CP14RoofSystem.cs 2025-09-27 22:52:32 +03:00
CrystallEdge Server
2d91b5db65 Automatic changelog update 2025-09-27 22:18:32 +03:00
Kit
f6ef53e24e Spell/Shield tweaks (#1804) 
* Spell changes

* shield changes
 2025-09-27 22:17:27 +03:00
CrystallEdge Server
ae43454da2 Automatic changelog update 2025-09-27 22:15:17 +03:00
Red
51a3fb53aa God rays (#1803) 
* god rays

* fix

* fix?
 2025-09-27 22:14:11 +03:00
CrystallEdge Server
ec4a9a59cf Automatic changelog update 2025-09-26 19:32:08 +03:00
Kit
835cfa951f Merge pull request #1789 from KittyCat432/silva-buffs 
Silva buffs and liquid mana buffs
 2025-09-26 12:31:02 -04:00
CrystallEdge Server
00a9cf0fed Automatic changelog update 2025-09-26 00:27:08 +03:00
Nim
d16e4aaf2f Fixs zombie and loot (#1799) 
* loot zombie

* fix
 2025-09-26 00:26:03 +03:00
CrystallEdge Server
606a81d145 Automatic changelog update 2025-09-25 14:26:16 +03:00
nukkuminen
66379b65d1 added funny facial hair (#1797) 
* added funny facial hair

* fixed atributions

* new mustages
 2025-09-25 14:25:10 +03:00
Jessica M
b2d09ba457 Rat King Refactor Part 0: Separate Rummaging from RatKingComponent. (#40530) 
* separate rummager into its own component/system

* thing

* address review and entitytables

* reviews

* review

* warnings

* Update Content.Shared/RatKing/Systems/RummagerSystem.cs

---------

Co-authored-by: Jessica M <jessica@maybe.sh>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-09-25 03:50:24 +02:00
Hitlinemoss
d699a4e985 Xenoborg items are now highly illegal (#39856) 
* Added tactical katana + tactical katana shipment (placeholder descriptions)

* Revert "Added tactical katana + tactical katana shipment (placeholder descriptions)"

This reverts commit aa1928be7f4d938df1838943781e63c47a03cc11.

Whoops, committed to master by mistake

* Xenoborg contraband is highly illegal now
 2025-09-24 20:28:40 -05:00
PJBot
42786240ec Automatic changelog update 2025-09-24 23:14:22 +00:00
Keer-Sar
705e4d3aa1 Add "Lizard Visage" Snout Markings to lizards (#35294) 
* initial commit

* Update attribution in meta.json

* Fix yaml formating in meta.json
 2025-09-24 18:13:14 -05:00
Samuka-C
ea3c44686c Xenoborg jammer now ignores xenoborg associated frequencies (#38005) 
* stop jammer from jamming radio of certain frequency

* xenoborg jammer no longer jamms xenoborg radio

* stop jammer from jamming device network signals from certain frequency

* xenoborg jammer no longer jamms xenoborg camera signal

* the old tale of the missing ;

* backwards

* fix issue with readonly

* comments to the frequencies excluded

* triple typo

* clearer summary

* add summary

* fixed 4th hidden typo
 2025-09-24 17:02:46 -05:00
PJBot
4555b72608 Automatic changelog update 2025-09-24 21:49:42 +00:00
Nox
0663576c46 Descriptions for .20 Rifle (#36496) 
* Initial commit - added Lecter and munitions descriptions, need to make one for the M-90GL...

* Fixed a formatting issue in the Lecter description, should be ready for review!

* Tests gaslighting me

* Third times the charm

* 99% of gamblers quit before the big win

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Updated with roomba's changes

* Formatted descriptions, ready to go!

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed formatting WITHOUT using spaces

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Updated weapon names.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added Roomba's suggestions

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Reverted AKMS formatting - outside the scope of this PR.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Updated Estoc's description.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added AugustSun's suggestions.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Slightly rephrased, im happy with it now.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed projectile names

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* thats not even a bullpup dumbass

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-09-24 16:48:34 -05:00
PJBot
0678e3b468 Automatic changelog update 2025-09-24 20:34:55 +00:00
RedBookcase
f6cd8673d3 Recharger tweaks. (#38138) 
* Recharger tweaks.

* Remove note.

* Fix Potato blacklist.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
 2025-09-24 15:33:45 -05:00
PJBot
aa828b96ab Automatic changelog update 2025-09-24 04:20:45 +00:00
Kittygyat
7c39b4595f Added diagnostic huds to the engi-vend (#40461) 
Added diagnostic huds to the engivend
 2025-09-23 23:19:38 -05:00
lzk
c55b41dff8 bunch of small cleanups (#40529) 
* bunch of cleanups and fixes

* AND REMOVE THIS
 2025-09-24 03:36:36 +02:00
PJBot
1e219aaf49 Automatic changelog update 2025-09-24 00:13:53 +00:00
āda
fabef941c2 Move circuit tiles and faux tiles to the cutter machine (#37982) 
* super cutter machine

* split the big tile pack

* re-add new faux

* consistent naming

* missing category

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-09-23 19:12:45 -05:00
āda
7102da139b Fix dev crash when alt+clicking portals (#37540) 
* Ghost portal dev crash

* ent<T>

* better comments

* refuse to reuse

* touchup comments

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-09-23 19:04:53 -05:00
āda
005683d074 Miscellaneous Food/Drink/Edible fixes (#40060) 
* bugfixes

* Revert "bugfixes"

This reverts commit 7fe31a866fc4dc299a1667291c0744716092db19.

* Revert "bugfixes"

This reverts commit 7fe31a866fc4dc299a1667291c0744716092db19.

* more reverting

* conflicts

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-09-24 01:41:11 +02:00
āda
320e67a411 Predict identity (#40185) 
* crossing the pond

* share some station records

* share some criminal records

* single system

* comments

* minor touchups

* I always forget this part

* requested changes

* revert predicted spawn

* requested changes

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-09-24 01:32:20 +02:00
DrSmugleaf
dddb6163f5 Fix SpawnAndDeleteEntityCountTest Entities and last assert being incorrect (#40511) 
Fix SpawnAndDeleteEntityCountTest last assert being incorrect
 2025-09-23 23:52:15 +02:00
beck-thompson
329908df92 Agent ID verbs now don't require you to pick it up (#40524) 
make consitant
 2025-09-23 22:55:53 +02:00
Jessica M
2f7b73e830 Weather On Trigger (#40505) 
* Weather On Trigger!

* Clearing the weather

* address review, add duration option

---------

Co-authored-by: Jessica M <jessica@maybe.sh>
 2025-09-23 13:36:23 -07:00
āda
eee5751a22 TriggerOnPlayerSpawnComplete and ExplosionOnTrigger (#39820) 2025-09-23 22:24:45 +02:00
Prole
3ee7d81944 Target Dummies Now Show Damage Numbers from Projectiles to User (#40101) 
* Uh, guess this works for now

* Review Change
 2025-09-23 10:20:46 -07:00
PJBot
04d71da982 Automatic changelog update 2025-09-23 17:04:01 +00:00
hoshizora
3f575a64f3 Fire helmets alone no longer prevent you from heating up while on fire (#40481) 
* do the thing yeah

* tweaked values on regular fire helmet including cooling

* adjusted values again after further testing also to the atmos fire helmet
 2025-09-23 12:02:49 -05:00
slarticodefast
8e9aa1dbb6 Merge stable into master (#40512) 2025-09-23 13:07:00 +02:00
Princess Cheeseballs
add531a434 [HOTFIX] Chameleon projector invisibility (#40509) 
* GOGOGO

* Hotfix

* TODO

* Update Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-09-23 12:55:11 +02:00
CrystallEdge Server
a9d0551323 Automatic changelog update 2025-09-23 13:24:44 +03:00
Nim
3b7d6579b6 Microbalance of Vampires (#1773) 
* micro vamp

* breakOnMove

* revert CP14ActionDoAfterSlowdown
 2025-09-23 13:23:39 +03:00