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

9448 Commits

Author SHA1 Message Date
Ed
ab8a5c3afd Sharedization of entityEffects and crystals slots system 2025-06-15 21:58:33 +03:00
Ed
62cd6bfe9b Merge branch 'master' into ed-10-06-2025-upstream-sync 2025-06-15 21:44:16 +03:00
Ed
5328714752 fix c# 2025-06-15 21:43:58 +03:00
Ed
5046ad1aeb longer weather 2025-06-15 21:34:33 +03:00
Red
b24ec5bc80 Bugfixes (#1432) 
* fix #1428

* CodTenAlt review

* fix map tests

* real this time

* fix #1429

* add wheat and cotton into victorian gardens trade faction

* Update PostMapInitTest.cs
 2025-06-15 21:25:58 +03:00
Red
71abce8db8 Skill scanning + bugfixes (#1424) 2025-06-14 19:04:33 +03:00
Red
fc0beb5ccf Gods part 3 (#1421) 
* apprice action, dead notice

* fix refollowing

* mist lumera action
 2025-06-14 02:11:36 +03:00
Red
b932d56f15 Gods part 2 (#1420) 
* spooky scary patreons

* Update CP14ReligionSystem.cs

* goodbye radio channel

* gods? no! Mana parasites! Muahahaha

* Update gods.yml

* Update primordial.yml
 2025-06-13 19:21:09 +03:00
Red
422a0c5e10 Gods and religions (#1405) 
* basic religion vision

* block god interactions

* skill tree mob specify

* silvania setup??

* clustering shader optimization

* gods department & job

* random gods jobs

* Luxian god

* Update Nature.png

* Update sphere_of_light.yml

* god chat

* Update ChatSystem.cs

* OBSERVATION

* public observation and basic follower api

* shader tweaks

* improve shaders

* spawning and praying on altars

* altars ppvs override

* move pvs overridiation from altars to observers

* shader coloration

* spectral z mover

* god magic radius restricted

* guide how to believe in god

* sends messages to god when smoeone wanna become follower

* follower doAfter

* goodbye luxian, welcome lumera

* goodbye silvania, welcome merkas

* som polish and renamings

* gods fast travel

* Update altar.ftl

* some lumera sfx

* renouncing patrons!

* renounce followers

* followewr percentage calculation

* remove from player-facing

* fix

* Update sphere_of_light.yml

* Update base.yml
 2025-06-13 14:15:48 +03:00
SenorJaba
8ab0939698 Merchant's monocle and ability (#1413) 
* New trading stuff

* Crafts skill tree

* More trading fixes, baby!

* Last trading fix I hope

* Merchants' supremacy

* Gimme money

* Readonly
 2025-06-13 12:24:36 +03:00
Ed
c0f4098ca9 spell fixes 2025-06-10 11:49:35 +03:00
Ed
42d39a7c67 Merge remote-tracking branch 'upstream/stable' into ed-10-06-2025-upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Lock/LockSystem.cs
 2025-06-10 11:33:34 +03:00
Jona-K
a67fa6f6d5 Made sure only the intent changes are present (#1408) 2025-06-09 08:56:18 +03:00
Jona-K
9e9b7f583f Removing The Scream Action From The Action Bar (#1348) 
* Removed Initilization For The Scream Action

* Commetet out code instead of Deleting it outright

* Commetet Out The Code Inititzilazing The Scream Action

* Update Content.Server/Speech/EntitySystems/VocalSystem.cs

* Update Content.Server/Speech/EntitySystems/VocalSystem.cs

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
 2025-06-05 11:46:08 +03:00
SlamBamActionman
d81e82cef7 Add Diona rooting (#32782) 
* Initial commit

* Add sound

* Review commets

* addressing review

* I think this is what Slart meant?

* Review fixes

* More fixes

* tiny formatting

* Review fixes

* Review fixes

* Fix small timing error

* Follow new action system

* review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-06-04 12:52:59 +02:00
SlamBamActionman
44000552c3 Merge stable into master (#38058) 2025-06-04 11:35:43 +02:00
Red
6c47cb8c77 f (#1380) 2025-06-04 11:43:15 +03:00
TheFlyingSentry
384dcae81d Fixes electropacks not ignoring insulation (#38011) 
Co-authored-by: TheFlyingSentry <Daniel.l.Elledge@gmail.com>
 2025-06-03 10:38:07 -07:00
Red
c41f20706e +rep (#1376) 2025-06-03 18:12:44 +03:00
ScarKy0
9dd0855dd0 Predict AME Fuel Examine (#38018) 
* init

* :)
 2025-06-03 13:51:50 +02:00
Krunklehorn
c2b1b81ec8 Add checks for various complex interactions (#37246) 
* Prevent toggling radiation collectors

* Prevent resisting locks

* Prevent unbuckling others, early exit before doafter

* Prevent camera and camera router setup

* Prevent rotating and flipping

* Also prevent adding the unbuckle verb.

* Revert ResistLocker changes

* Prevent emitter tampering

* Also prevent lock verb

* Prevent toggling welders

* Prevent gun open/close bolt, rack and switch mode

* Prevent toggling stun batons
 2025-06-02 10:06:45 -07:00
BarryNorfolk
b2d0f7ed28 Add multipart machines system (#35969) 2025-06-02 17:02:41 +03:00
Ciarán Walsh
d83f393fa4 Use distinct action labels for toggling internals on and off. (#36073) 
* Use distinct action labels for toggling internals on and off.

* Implement specific actions for enabling/disabling internals

Avoids potential confusing race conditions where two people might perform the "Toggle Internals On" action an the same person,
which would have jsut toggled twice.

* If no gas tank, will give popup

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
 2025-06-02 13:09:45 +02:00
chromiumboy
45012cbe1d Layering for atmospheric pipes (#36124) 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
 2025-06-01 22:01:43 -07:00
Red
f6dd89ea7a d (#1351) 2025-06-01 21:55:20 +03:00
Red
5c5a473ec0 More merchant content (#1349) 
* energy crystals

* thaumaturgy trading
 2025-06-01 19:21:41 +03:00
Red
a3ae67a762 Trade reputation rework + Merchants back + Mining contract (#1347) 
* refactor unlocking

* fix contract debug crashing

* Update dev_map.yml

* bugfixes and content rebalance

* ore buy contract
 2025-06-01 15:10:36 +03:00
Red
a99f2fcd50 Remove random reaction system (#1345) 
* wow

* d
 2025-06-01 15:01:32 +03:00
Princess Cheeseballs
9b03e8347b [HOTFIX] Salvage Job Computer Eating your Jobs (#37997) 
One line fix
 2025-06-01 17:06:34 +10:00
slarticodefast
e0ce82e1c7 Fix center of mass mispredict when placing tiles (#37969) 
fix COM mispredict
 2025-06-01 00:39:45 -04:00
Nemanja
e92b6b6a7e Add support for contextual information in EntityTables (#37737) 
* Add context support for entityTables

* fix build fail

* comments

* Update Content.Shared/EntityTable/EntityTableSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-05-31 15:40:25 +02:00
Centronias
9053c9692f Decouple Lights from Toggleable Visuals (and headphone music notes bugfix) (#35341) 
* - Combine enum keys `ToggleableLightVisuals` and `ToggleVisuals` into `ToggleableVisuals`
- Rename `ToggleableLightVisualsComponent` to `ToggleableVisualsComponent` and `ToggleableLightVisualsSystem` to `ToggleableVisualsSystem`
  - (The `SpriteLayer` field on the component is now required because the old default of `light` doesn't make sense anymore)
- Make it so that `ToggleableVisualsComponent` works even when there's not a light attached to the entity
  - (Amazingly this seems to have only applied to  Headphones, but I can only imagine there are many other things people would like to do with simple toggleable visuals)
- Explicitly make `ItemTogglePointLightComponent`'s purpose to make `ToggleVisualsComponent` apply to `PointLightComponent`s on the same entity.
  - Add field `ToggleableVisualsColorModulatesLights`, which makes the `Color` appearance value of `ToggleableVisuals` modulate the color of lights on the same entity
  - Lots of prototype updates to uptake the above

* fix bad merge

* unbork robust

* blindly letting rider reformat stuff

* I guess I never cleaned up these imports at all
 2025-05-30 19:53:56 -04:00
Fildrance
11ca728e41 fix: anomaly shooting no longer throws when it have no possible targets in range (#37927) 
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
 2025-05-30 19:11:25 -04:00
ArtisticRoomba
c4c528035b Show TEG theoretical supply on inspect (#37957) 
* Show TEG theoretical supply on inspect

* revert autoformatting changes
 2025-05-30 16:41:30 -05:00
Obani Gemini
57e5a091b2 Improved French accent (th sound) (#33630) 
* Improved French accent

* Remove the double consonna part to simplify the code and behaviour

* French accent: clarify a comment

Co-authored-by: Centronias <charlie.t.santos@gmail.com>

---------

Co-authored-by: Centronias <charlie.t.santos@gmail.com>
 2025-05-30 13:10:13 -07:00
Ed
f78b1e07c5 cs fix, demiplane fix 2025-05-30 13:28:08 +03:00
beck-thompson
05fac53de6 Chameleon controller implant (Clothing fast switch) (#33887) 
* Add the chameleon controller implant

* address the issues (Git please dont kill me)

* Address the review and fix some merge conflicts!

* Cleanup

* Add use delay

* Silly mistakes

* Making a PR at 2 am: Gone wrong

* Predict use delay and disable the buttons until you can choose another

* First phase custom clothing

* Better system, now relays to agent id and mindshield. Chameleon loadouts are a lot better to work with as well

* Address the review! No more evil goto

* Slams way is better I should have read more closely xD

* Some of the jobs

* Add to Cargo, CentComm, Service, Passenger, Ninja, Cluwne, Wizard + Minor changes to existing; Add chameleon to bandanas, medals, jugsuits and HUDs

* Add everything else

* Fix test

* Job name

* This looks better

* Add department organization

* Minor cleanup

* Added some mindshields

* Remove redudent comment and change funcion name to be clearer

* Fix cluwne outfit

* fix merge conflicts

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
 2025-05-30 12:07:25 +02:00
mhamster
caf18f4bc6 Chameleon clothes + EMP behaviour (#30924) 
* resolving conflicts??

* Controlled clothes changing

+ time stuff
+ EmpChangeIntensity

* Single clothes change

+ EmpContinious
+ moved random pick logic into GetRandomValidPrototype

* Changes from reviews

Co-Authored-By: Nemanja <98561806+emogarbage404@users.noreply.github.com>

* Update ChameleonClothingComponent.cs

* repairing irreparable damage

i failed, did i?

* damaging repaired irreparable

uh???

* 2025 FUN ALLOWED!!!!

* Minor changes from reviews

Co-Authored-By: beck-thompson <107373427+beck-thompson@users.noreply.github.com>

* Fix merge conflicts

* Fix that last bug

* cleanup

* Remove VV attr.

* AutoPausedField on emp time change

---------

Co-authored-by: Nemanja <98561806+emogarbage404@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: beck-thompson <beck314159@hotmail.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2025-05-29 20:06:03 -04:00
Quantum-cross
394aa7e7b8 Make TryGetWires<T> actually work. (#37937) 2025-05-29 19:48:27 -04:00
Ed
5e6d1d0b3a dungenore wawa 2025-05-29 22:14:14 +03:00
pathetic meowmeow
62bd5abfa0 Actually handle nutrition and robust harvest entity effects (#37912) 2025-05-29 00:51:09 +02:00
TemporalOroboros
f81d216630 Fix obsolete MapGridComponent warning in SpawnAfterInteractSystem (#37911) 2025-05-29 00:34:40 +02:00
Red
7642f49b00 Merge branch 'master' into ed-27-05-2025-upstream-sync 2025-05-29 00:50:36 +03:00
TemporalOroboros
29ccce134b Fix obsolete method warning in SimpleFloorPlanPopulatorSystem (#37910) 
Fix obsolete method warning
 2025-05-28 23:44:24 +02:00
Red
cde388f5dd Another Merchant gameplay attempt (#1308) 
* setup UI

* setup debug data

* graph control setup

* reputation trade component

* unlocking logic

* smoe real reputation costing

* remove sponsors part, add trading specific UI nodes

* port to default pricing system

* buy cooldown

* fuck off trading cabinets

* real good cooldown UI

* Cool unlock sound

* reputation earning

* cool purchare sound

* coin & sprite work

* delete old guidebooks

* cool purcharing VFX

* better ui

* victoria gardens

* Update migration.yml

* Update migration.yml

* cooldown removed

* contracts

* Update migration.yml

* remove CP14Material

* materials appraise

* food appraise

* auto economy pricing system

* alchemy reagents appraise

* coins resprite

* alchemy appraise 2

* modular weapon appraise

* selling platform

* Update PricingSystem.cs

* Update CP14TradingPlatformSystem.cs

* merchants returns + map update

* Update CP14StationEconomySystem.Price.cs
 2025-05-29 00:22:47 +03:00
deltanedas
b3825dce97 action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
Tayrtahn
447f866745 Cleanup warning in StealConditionSystem (#37903) 
Fix 1 warning in StealConditionSystem
 2025-05-28 18:17:43 +02:00
metalgearsloth
ea7350f3f1 Content changes required for physicsmap purge (#37878) 
* PhysMap changes

* Fix call

* Avoid tilefriction resolve

yummy

* a
 2025-05-28 19:38:47 +10:00
TemporalOroboros
10dee14893 Fix radiation system warnings (#37892) 
* Use SharedMapSystem for GetTileIndices

* Fix formatting errors in Server

* Fix formatting errors in Client
 2025-05-28 11:34:58 +02:00
TemporalOroboros
5f5f6765ce Use SharedMapSystem for GridTileToLocal (#37894) 2025-05-28 11:31:32 +02:00