juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,272 Commits 57 Branches 0 Tags
93ed28d34cec43de0f6b84eebcdf479c075d7c4b
Commit Graph

5556 Commits

Author SHA1 Message Date
Ed
93ed28d34c Trading content (#1010) 
* reroll positions

* more trading content

* bugfixes

* more content

* guidebook uodate

* Update buy.yml
 2025-03-12 00:51:58 +03:00
Link
0168dbabbb Separated mana modifiers (#1001) 
* brainrot

* Update test_armor.yml
 2025-03-11 10:23:09 +03:00
Nim
74fa1251c7 Modular armour 1 (#936) 
* armor

* fix

* fix color

* migra

* + *

* balance

* caustic

* presets

* migr2

* plate

* chainmail

* fix speed

* ehh

* ehh2

* ehh3

* fix layers

* mask craft

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-03-10 16:24:10 +03:00
Ed
66058ffc49 Auto CBT (#997) 
* auto doggy

* fix

* fix
 2025-03-09 23:29:20 +03:00
Ed
759260c2ba unique loot rework 2025-03-09 18:48:48 +03:00
Ed
2be52084d6 Update CP14SharedDayCycleSystem.cs 2025-03-08 15:43:27 +03:00
Ed
c06323374f fix sun inside storage 2025-03-08 14:55:37 +03:00
Link
15798a44df Update CP14MagicManacostModifySystem.cs (#987) 2025-03-07 17:14:29 +03:00
Ed
0b5712ce97 Vampire antag (#988) 
* new blood types

* vampire systems setup

* death under sun

* vampire blood nutrition

* alerts

* autolearn skills

* base bite actions

* suck blood spell

* polish

* Update blood.yml

* unshitcode

* vampire hunger visual

* nerf speed

* hypnosis + map update

* darkness demiplane warning
 2025-03-07 14:52:43 +03:00
Tornado Tech
4a11cf9c53 Merge pull request #977 from crystallpunk-14/skill-remaster 
Knowledge refactor
 2025-03-06 22:29:36 +10:00
Tornado Tech
e6a28307a4 refactor: server CP14KnowledgeSystem 2025-03-06 19:42:20 +10:00
Ed
c1acf81541 NewTrade (#969) 
* trading portal replace traveling storeship

* clean up content

* clean up content 2

* seel and buy realization

* fixes

* Update migration.yml

* Update migration.yml

* Update dev_map.yml

* Update dev_map.yml

* thats work correctly now

* bugfies and visual

* factions

* faction restruct + name reduce

* unnesting sell cargo positions

* unnesting cargo positions

* more cargo content

* Update buy.yml

* improve tradeportal visual

* Update migration.yml

* Bank ad Commandant removal

* merchant objectives

* finish

* clean up content

* Update migration.yml

* fix goal calculation

* Update comoss.yml

* Update dev_map.yml
 2025-03-06 12:01:43 +03:00
Tornado Tech
45a6919994 fix: KnowledgeRequired 2025-03-06 18:46:51 +10:00
Tornado Tech
35e6bae5fe refactor: Add AllKnowing comp, separate paper and events 2025-03-06 18:40:17 +10:00
Tornado Tech
44f4c17266 refactor: Orthographic and obsolete in Knowledge 2025-03-06 18:22:01 +10:00
Ed
acc9886242 Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2 
# Conflicts:
#	Content.Client/Options/UI/OptionsMenu.xaml
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
 2025-03-03 23:23:40 +03:00
Ed
bef78c62c0 Alchemical bomb (#965) 
* smoke bomb system

* collector fixes

* bomb integration

* fix

* tweak
 2025-03-03 14:06:50 +03:00
Ed
9a787bc7b8 Thaumaturgic alchemy refactor WIP (#955) 
* essences thaumaturgy refactor

* migrate structure crystals

* shard migrate

* bruh

* fix migration

* fixes

* 1 combining

* Create essence_brewing.yml

* Update magic.yml

* stack essence support

* FUCK THIIA ALL, DELETE ALL

* redesign counter spell

* Update precurser.yml

* magic splitting solution

* precurser splitting

* Praecantatio

* Update cleaner.yml

* add potions recipe

* fuck alchemy guidebook

* guidebook update

* fixes

* energia fix

* Update migration.yml

* fixes

* Update Alchemy.xml

* fix

* medium vial

* fixes?

* Update essence_combining.yml

* Update target_effect_creation_water.yml

* alchemist Comoss update

* Update closets.yml

* mana opertion glove

* Update migration.yml

* Update vials.yml

* Update GuideReagentReaction.xaml

* try to fix

* manual migration

* Update comoss_d.yml

* fix

* manual migration 2

* precursor admixture

* Update heater.yml
 2025-03-02 13:28:13 +03:00
Ed
2225de9ce4 switch to ru CBT 2025-03-01 14:13:46 +03:00
Ed
b8c2d662b6 English OBT setup (#956) 
* fix

* Update Dev.toml
 2025-02-28 20:18:28 +03:00
Ed
3fd47443ae Essence collector (#952) 
* collector attract essence

* collector

* Update magic-essence.yml

* Update essence_collelctor.yml
 2025-02-28 15:55:47 +03:00
ActiveMammmoth
cec05d697e Staff of Animation Fixes (#35491) 
* staff of animation fixes and system

* requested changes

* size back to normal

* Update AnimateSpellSystem.cs

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
 2025-02-27 20:11:57 +01:00
SlamBamActionman
41c51e2905 Implanter draw rework (#32136) 
* Initial commit

* Clean-up

* Fix ftl, new damage

* ftl fix for real

* Updates based on feedback

* Child implant fix

* Make the UI only open when implanter is in draw mode

* Review fixes

* shunting
 2025-02-27 18:57:28 +01:00
SlamBamActionman
c7b9a76342 Prevent crates, pet carriers and other things from going into disposals (#35557) 
* Initial commit

* Solve underlying bug, readd to disposals

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-27 18:43:56 +01:00
deltanedas
7520d8a2c8 add button to print logprobe logs (#32255) 
* add EntityName at the bottom of LogProbe

* pass User into CartridgeMessageEvent

* add button to print logprobe logs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2025-02-27 14:47:16 +01:00
kosticia
a5aab8b8a1 Fire resist now can be examined. (#35183) 2025-02-27 23:39:55 +11:00
āda
3127f73c48 Multiple categories for lathe recipes (#34315) 
* first

* lint

* changes

* change null comparison

* linq

* indent

* fix indent

---------

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-02-27 12:33:39 +01:00
Dora
53dc27cb1e Adding sorting to chem master (#34763) 
* Adding sorting to chem master

* Chem Master can now sort based on following categories
 - Alphabetical
 - Quantity
 - Time Added to Machine

* Sorting is disabled by default and persist in the machine for everyone

* Removed some pointless code from Chem Master's UI

* Changed None and Time Added's text to reflect what they do better

* Minor adjustments to the code requested by maintainers
 2025-02-27 12:19:52 +01:00
Ed
5524e029f4 Essence splitter (#948) 
* disable rotting

* pipipi

* essence storage

* energy splitter

* Update essence_splitter.yml

* Update impact.png

* visual fixes

* sound fix

* Update twoHandedStaffs.yml

* unhardcode

* Update meta.json

* fix
 2025-02-27 13:48:38 +03:00
qwerltaz
7b0b401312 t-ray reveal for entities and draw depth fix (#33012) 
* t-rays show above catwalk

* a

* RevealSubfloorComponent

* revealSubfloorOnScan, add it to catwalk

* TrayScanReveal sys and comp

* Rr

* handle anchoring

* use tile indices for vector2i

* fix IsUnderRevealingEntity reset on pvs pop in reanchor

* fix exception on TrayScanRevealComponent remove

* fix IsUnderRevealingEntity not updating on pvs enter

* update to ent

* make subfloor retain respect for their relative draw depth

* fix carpets not revealing subfloor on plating

* chapel carpet

* ??

* draw depth gap for subfloor entities.

* revert alpha change

* remove abs from draw depth difference

* move TrayScanReveal to client

* delete old refactor

* let's show them above puddles too

* Remove superfluous component classes

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
 2025-02-27 11:46:09 +01:00
slarticodefast
7283f9b6dc fix delta state in SharedGunSystem (#35510) 2025-02-26 22:11:17 +11:00
SpeltIncorrectyl
e86770f5a0 Mime can no longer write on paper without breaking their vow (#35043) 
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
 2025-02-26 10:11:59 +01:00
Ed
aed7e0994a pax bard (#943) 2025-02-26 12:01:14 +03:00
Ed
ba901d5e0e Crystals Update (#925) 
* portal frame

* resprited sharpening stone

* portal frame entity

* darkness -> dimension magic type

* thaumaturgy platforms, some refactor

* magic energy refactor

* Update AirlockPryingTest.cs

* transfering tweaks

* fixed magic manipulation
 2025-02-25 23:37:05 +03:00
noirogen
263f915671 Adds new speech bubble opacity sliders to the accessibility menu. (#35346) 
* Adds new accessibility slider for speech bubble text opacity.
Adds new accessibility slider for speech bubble background opacity.
Adds new Cvars to track speech bubble text and background opacity settings.

* Adds a separate option slider for the opacity of the speaker's name on speech bubbles.

* Changes text and speaker default opacity to 100%, as it was before.

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-25 17:00:12 +01:00
Theodore Lukin
7f67ff4b26 borgs don't scream (#33038) 
* borgs don't scream

* revert that
 2025-02-25 14:45:19 +01:00
Ed
3e26334c53 healing bard spell (#938) 2025-02-25 15:44:22 +03:00
Winkarst
1e435822c7 Cleanup: Fix formatting in `CCVars.Game` (#35483) 
Cleanup
 2025-02-25 00:42:15 +01:00
Winkarst
7fc8dcb811 Cleanup: Pass in `IComponentFactory in EntityPrototype.TryGetComponent calls inside SharedChameleonProjectorSystem` (#35465) 
* Cleanup

* Yes
 2025-02-24 20:45:17 +01:00
Winkarst
670791ac49 Cleanup: Remove redundant checks from `SharedWieldableSystem` (#35466) 
Cleanup
 2025-02-24 20:22:19 +01:00
Winkarst
bb110b376e Cleanup: Pass in `IComponentFactory in EntityPrototype.TryGetComponent calls inside SharedStackSystem` (#35464) 
Cleanup
 2025-02-24 18:59:06 +01:00
Winkarst
02f0190c35 Cleanup: Pass in `IComponentFactory in EntityPrototype.TryGetComponent calls inside SharedMaterialStorageSystem` (#35463) 
Cleanup
 2025-02-24 18:58:25 +01:00
Winkarst
22398ea342 Cleanup: Fix field naming rule violation in `GhostComponent` (#35454) 
* Fix

* Update Content.Shared/Ghost/GhostComponent.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-24 18:48:32 +01:00
ScarKy0
88308356db Move FingerprintComponent and FingerprintMaskComponent to shared (#35451) 
* init

* review

* whoopsie
 2025-02-24 17:23:11 +01:00
ScarKy0
c3784a3005 GettingUsedAttemptEvent (#35450) 
* init

* review

* doc

* Update Content.Shared/Interaction/Events/GettingUsedAttemptEvent.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-24 17:21:17 +01:00
Winkarst
f4fab85e34 Cleanup: Use `SoundSpecifier instead of string literals in EyeClosingComponent` (#35425) 
* Cleanup

* Update

* Update

* Update
 2025-02-24 17:10:23 +01:00
Tayrtahn
6f925dd610 Fix prototypes so they pass analyzer checks (#35435) 2025-02-24 15:21:59 +11:00
Ed
37ff029956 return black roofs 2025-02-24 01:07:03 +03:00
Ed
b8575aba8f roofs update 2025-02-23 23:29:45 +03:00
Ed
07e0606ecf Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream 
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
 2025-02-23 23:07:55 +03:00