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
d73fcd53ffcc51446cd8d176da5bade12135c20f
Commit Graph

11676 Commits

Author SHA1 Message Date
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
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
Red
621ee3fa73 Hotfix (#1811) 
* fix #1809

* fairies disable
 2025-09-28 23:53:15 +03:00
Kit
f6ef53e24e Spell/Shield tweaks (#1804) 
* Spell changes

* shield changes
 2025-09-27 22:17:27 +03:00
Red
51a3fb53aa God rays (#1803) 
* god rays

* fix

* fix?
 2025-09-27 22:14:11 +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
Nim
d16e4aaf2f Fixs zombie and loot (#1799) 
* loot zombie

* fix
 2025-09-26 00:26:03 +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
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
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
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
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
ā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
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
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
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
Nim
3b7d6579b6 Microbalance of Vampires (#1773) 
* micro vamp

* breakOnMove

* revert CP14ActionDoAfterSlowdown
 2025-09-23 13:23:39 +03:00
Kit
4623afed40 Demiplane difficulty rework (#1798) 
* yea thats alot

* russian translation and fix

* Update Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
 2025-09-23 13:19:47 +03:00
Kit
14e1fd9247 fix 2025-09-22 18:03:21 -04:00
Kit
fa2c1968f8 Requested changes 2025-09-22 17:44:54 -04:00
Minerva
95d91283a3 Fixes all departamental typos (both just in comments) (#40502) 
Fixes all departamental typos
 2025-09-22 21:44:45 +02:00
Nim
13ec48b980 Microbalance weapon (#1790) 
* Microbalance weapon

* dagger

* dagger2

* shield

* fix
 2025-09-22 13:38:47 +03:00
Princess Cheeseballs
c7f5545a46 Vulpkanin Admin Smite (#40360) 
* Cheeborger

* Vulp smite

* validate those ProtoIds

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-09-21 23:22:25 -07:00
chromiumboy
2824334a1e Health increase for station AI cores (#40487) 
* Initial commit

* Increased health further
 2025-09-22 03:39:16 +02:00
Nyxilath
92f246058c bugfix - correcting poster damage resistances (#40489) 2025-09-21 13:40:58 -07:00
Charlie Morley
818a715822 prevent repeat TriggerOnCollide triggers (#40428) 
* prevent repeat TriggerOnCollide triggers

* review comment: remove TriggerOnCollide when out of triggers
 2025-09-21 17:23:37 +02:00
Nim
81164228ee Debaff rat (#1794) 
* debaff rat

* XP
 2025-09-21 13:47:14 +03:00
2DSiggy
b85fed759a Fixing a syntax error (#40473) 2025-09-20 22:02:17 +02:00
Tiniest Shark
4796c92609 Inhand Sprites for Clear Glass (#40427) 2025-09-20 11:25:01 -07:00
Minerva
5b255d13c6 Renames the radar console computer board to "mass scanner computer board" (#40430) 2025-09-20 11:17:58 -07:00
deltanedas
7c650da7d7 fix disposal pipes deleting contents when welded (#40451) 2025-09-20 11:13:23 -07:00
IProduceWidgets
2b411b244e The Experimental Lecter 8 (#40372) 
* XL8 files

* slap dat on the ERT lead

* oop mag indicator offset

* fix newline
 2025-09-19 21:30:07 +02:00
Minerva
4f311d6c44 Fixes some refuling welder typos (#40447) 2025-09-19 12:15:22 +02:00
Lordbrandon12
ed89c0e061 adds ConveyorMask colission mask to it's fixture component (#40439) 2025-09-18 13:31:29 -07:00
2DSiggy
e1da7ec9c5 Better thief objectives (#39867) 
* finally some good objectives

* oopsie

* guh fuck

* more steal objectives that are actually good

* i want to die

* fucking upload to github please

* adding it to the objectiveGroups.yml

* higher weights for testing

* upload

* just need to do text shit. coding done waow

* OBJECTIVES WORK AND HAVE TEXT. FIX VIS

* I THINK ITS DONE AAAAAAAAAAAAAAA

* grammatical fix

* more formatting fixes

* i might be stupid

* forgot to fix a weight issue

* more grammar grrrrrrrrrrrrr

* made the double barrel obj have higher difficulty since it's cared about more than beer goggles

* Requested Changes

* forgot a thing oopsie
 2025-09-18 13:09:44 -07:00
Kittygyat
5a67e3c26a Made all tarantulas able to drag entities (#40433) 
Sent tarantulas to the gym
 2025-09-18 21:59:29 +02:00
Hi-Im-Shot
d95b5da7d2 Added Cutting Slicing and Executing options to the cane blade (#40311) 
* Added Cutting Slicing and Executing options to the cane blade

* swaped from BaseItem to BaseSword for cleaner code

* fixed a double gap in code
 2025-09-18 21:37:04 +02:00
SlamBamActionman
9d0a7b7729 Add contraband levels for several reagents (#40426) 
* Initial commit

* Minor changes
 2025-09-18 12:01:22 -07:00
rumaks
fbb9c9c524 Make ichor heal brute, burn, and toxin evenly (#39466) 
* Make ichor heal brute, burn, and toxin evenly

* Nerf healing to more reasonable values
 2025-09-18 11:47:25 -07:00
Hitlinemoss
5cb0917d5f Ninja items are now highly illegal (#39855) 
* 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

* Made ninja items highly illegal

* Rerun checks
 2025-09-18 19:49:01 +02:00
āda
128d06518e Silence mime bags (#40317) 
silence!!!

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-09-18 10:47:55 -07:00
Mora
0e0f015422 Rename medifab implanter to implant extractor and made it's description clearer (#40375) 
* Renamed regular implanter (the extractor from the medifab) to implant extractor

* wrong way
 2025-09-18 19:47:38 +02:00