juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,094 Commits 57 Branches 0 Tags
34131cd70e56d60b07daaf77d665e6c8e1dedfcf
Commit Graph

33094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
34131cd70e Update LockSystem.cs 2025-05-14 12:35:08 +03:00
Ed
1551f2fb6d Update CP14SharedMagicSystem.cs 2025-05-14 12:29:18 +03:00
Ed
59e6435fe2 Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Construction/UI/ConstructionMenuPresenter.cs
#	Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
#	Resources/Prototypes/Procedural/vgroid.yml
 2025-05-12 14:25:42 +03:00
Errant
c261cc21a0 [HOTFIX] Ensure that mobs wake up when zombified (#37346) 
zombie sleep fix
 2025-05-11 18:49:22 +02:00
Ed
9e409a1eaf Update Dev.toml 2025-05-11 17:05:32 +03:00
Nim
abd69892c5 Myconide (#1265) 2025-05-11 17:04:52 +03:00
Nim
3164cb5b94 Fixing issues (#1258) 
* fix

* gib frog

* zombie

* not damage
 2025-05-10 21:45:11 +03:00
Ed
a243d2f8cd Update Dev.toml 2025-05-10 14:11:32 +03:00
paige404
ebaa57133f Slime Crown (#1257) 
* Add slime crown, an admin-spawn artifact hat that makes all slimes friendly with the wearer.

* Add slime crown sprites
 2025-05-10 14:11:09 +03:00
Viator-MV
44f1c03e34 Spells extension (#1202) 
* fire

* trance_compression_distoration

* scroll loot

* fix

* myeh

* again mb?

* compression fix

* crystal fix

* disorion debuff

* delete all it

* final?

* nah

* not mine

* fix

* fix

* mmmm

* mana trance rebalance

* relocate trance

* fix

* blyat

* no compression

* delete all

* fix

* Update modifier_sets.yml

* Update heat.yml

* Update heat.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-10 13:28:33 +03:00
Nim
6e86a54a88 meat cooked (#1261) 2025-05-10 12:21:55 +03:00
Militore
aa2e080e31 Guard bell (#1242) 
* add Guard Bell

* revert vanila changes, add same functionality

* revert more vanila changes, replace .ogg, fix locale and locale usage

* Update GuardBell.yml

* Update base.yml

* add attributions.yml for alerts

* try changing to proper license

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-09 15:07:05 +03:00
Vasilis The Pikachu
d19a421671 Merge remote-tracking branch 'upstream/master' into staging 2025-05-08 19:37:20 +02:00
Vasilis The Pikachu
c91bd05239 Merge remote-tracking branch 'upstream/staging' into staging 2025-05-08 19:37:14 +02:00
Myra
8d4b3c0fdc Revert "Traumoxadone" (#37284) 2025-05-08 19:08:27 +02:00
PJBot
047ef64661 Automatic changelog update 2025-05-08 16:51:06 +00:00
Thinbug
0c6be8bb0d Tweaks to the push horn so its less of a shitter tool (#37281) 
* Empty commit

* tweaks to the push horn

* forgor to change the delay

* keeping the speed the same for now
 2025-05-08 18:49:58 +02:00
ScarKy0
746134edd3 fuck the cl 2025-05-08 18:32:58 +02:00
slarticodefast
307d0b1c8b merge stable into master (#37286) 2025-05-08 18:32:53 +02:00
Myra
d515a1dbf6 Add ratelimit retry to discord changelog bot and continue publish changelog error. (#37051) 
* Add ratelimit retry to discord changelog bot and continue publish changelog error.

oops we missed some changelogs cause of this... this should prevent anything funny

* Update actions_changelogs_since_last_run.py
 2025-05-08 18:30:50 +02:00
ScarKy0
9e582157ac Revert "Traumoxadone (#37126)" 
This reverts commit efc8d8600d.
 2025-05-08 18:13:33 +02:00
PJBot
e94a50b4cc Automatic changelog update 2025-05-08 14:29:22 +00:00
Krunklehorn
1ee9b25927 Fix borg chassis gibbing not dropping items (#37276) 
BeingGibbedEvent and TryEjectPowerCell
 2025-05-08 10:28:11 -04:00
slarticodefast
0973218054 merge stable into master (#37277) 2025-05-08 11:00:20 +02:00
nikthechampiongr
ef3deedecb Implement Rules amendment (#37200) 
* Implement Rules amendment

* Update Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update RuleR9MassSabotage.xml

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
 2025-05-08 10:59:21 +02:00
github-actions[bot]
d9c2bd8e09 @paige404 has signed the CLA in crystallpunk-14/crystall-punk-14#1257 2025-05-08 08:40:48 +00:00
Tayrtahn
4aa635620c Fix debug asserts in WoolySystem and UdderSystem (#35314) 2025-05-08 09:55:41 +02:00
PJBot
4a521c56cf Automatic changelog update 2025-05-08 01:40:18 +00:00
Southbridge
129204b54e Amber Station - Security and AI Sat Overhaul (#37262) 2025-05-07 18:39:09 -07:00
Cojoke
fdf860d64f Small InventorySystem.Equip Unequip Reason bugfix (#37265) 
Fix small bug
 2025-05-07 20:47:03 -04:00
Quantum-cross
6bb3b83bf1 For DamagedSiliconAccent use Destructible threshold for default "DamageAtMaxThreshold" (#37252) 
* set DamageAtMaxCorruption as nullable with null default and use destructible trigger threshold for this if null.

* fix documentation

* these really don't need to be passed by reference
 2025-05-07 20:44:36 -04:00
Tayrtahn
d80934b156 Move random species selection earlier in player spawning logic (#37258) 
* Select random species earlier in spawning logic

* ternary operator

* Move it even earlier to fix more bugs
 2025-05-07 20:38:56 -04:00
themias
14adb1ff01 Cargo request and bounty console deny sound cooldown (#37234) 
* Cargo bounty console deny sound cooldown

* ordering computer cooldown

* Update Content.Shared/Cargo/Components/CargoBountyConsoleComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Cargo/Components/CargoBountyConsoleComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Server/Cargo/Systems/CargoSystem.Bounty.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* AutoGenerateComponentPause

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-05-07 20:34:44 -04:00
B_Kirill
b3c4c7c32b Cleanup warnings: CS8321, CS0105, CS0168 (#36949) 
* Clean up

* CS0168
 2025-05-07 20:01:02 -04:00
B_Kirill
c196538aaf Cleanup warnings: CS0414 (#36950) 
* Clean up

* Use #pragma
 2025-05-07 20:00:12 -04:00
PJBot
057cc2304a Automatic changelog update 2025-05-07 23:49:46 +00:00
B_Kirill
9ff5850667 AI context menu fix (#37224) 
* AI context menu fix

* Revert "AI context menu fix"

This reverts commit 86a0476fcb0aa952c0dcadb1bc4246532abd62b7.

* Better implementation

* Retry
 2025-05-07 19:48:39 -04:00
PJBot
d28289c3c4 Automatic changelog update 2025-05-07 23:27:55 +00:00
SlamBamActionman
90c3ba8f36 Add 3 new Exomorph posters (#37260) 
Initial commit
 2025-05-07 19:26:48 -04:00
Tayrtahn
ef79373904 Fix chairs deleting players (#37261) 
Unbuckle entities when a strap is about to be deleted
 2025-05-07 19:25:17 -04:00
Verm
47258651a3 Make container draw disableble for mob-affecting Hyposprays (#30683) 
* Seperate container draw from affects mobs

* Spaces

* More spaces

* Fix toggle

* Use better ands

* Reorder checks for Performance™️

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-05-07 16:43:47 -04:00
PJBot
df10d75cf7 Automatic changelog update 2025-05-07 20:29:35 +00:00
themias
8edc8c7596 Genpop closet cargo orders (#37237) 
* Genpop closet cargo orders

* change icon to locker base
 2025-05-07 22:28:28 +02:00
deltanedas
50bad5ad60 fix pka admin log (#37255) 2025-05-07 10:56:20 -07:00
lzk
4420d67f92 make throw insert container code more clear (#36873) 
make throw insert container more clear
 2025-05-07 15:08:28 +02:00
PJBot
132dadeca8 Automatic changelog update 2025-05-07 12:46:00 +00:00
Zalycon
31ce616c25 Raises max chest markings for all species (except Reptilian) to 2 (#37065) 
* Update arachnid.yml

* Update diona.yml

* Update human.yml

* Update moth.yml

* Update slime.yml

* Update vox.yml
 2025-05-07 14:44:53 +02:00
PJBot
86c851ba5d Automatic changelog update 2025-05-07 11:39:06 +00:00
K-Dynamic
ae6f96fa87 Four-way pipe junction, swapping junction construction fix (#37092) 
* pipe x-junction assets, yml, construction

* remove duplicate asset

* attribution

* x junction instead of junctioncross for utilities.yml
 2025-05-07 13:37:59 +02:00
PJBot
e5ab034aa7 Automatic changelog update 2025-05-07 10:07:49 +00:00