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

61 Commits

Author SHA1 Message Date
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
metalgearsloth
fa35c9623d Revert "Purge uses of TransformComponent.Anchored.set. Also adds parentheses." (#35332) 2025-02-21 00:12:12 +11:00
TemporalOroboros
a4001fba1b Purge uses of TransformComponent.Anchored.set. Also adds parentheses. (#34938) 2025-02-20 23:06:39 +11:00
Kyle Tyo
c8dce26dbb Replace obsolete FromMap calls with ToCoordinates (#35304) 2025-02-20 23:03:42 +11:00
Ed
7328f3449c Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/EntityTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Procedural/DungeonSystem.Rooms.cs
#	Content.Server/Procedural/RoomFillComponent.cs
#	Content.Server/Procedural/RoomFillSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/migration.yml
 2025-02-16 11:58:47 +03:00
TemporalOroboros
08e5362f43 Purges uses of TransformComponent.WorldRotation (#34946) 2025-02-11 14:16:20 +11:00
ScarKy0
8d1a300b57 [Admin] Omni Accent Smite (#34824) 
gods forgive me
 2025-02-02 21:00:27 +01:00
Ed
677e5194d6 Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync 
# Conflicts:
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/Traits/TraitSystem.cs
#	Content.Shared/CCVar/CCVars.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/box.yml
#	Resources/Maps/core.yml
 2024-11-23 01:48:24 +03:00
beck-thompson
da4fa9bea9 Clumsy system refactor (#31147) 
* First commit

* Fixes

* Added the noise

* Renames

* Timespan

* Fixed space

* entity -> ent

* This shouldn't work

* opps....

* Datafield name change

* Better comments

* small comment

* Personal skill issue

* Event renames and stuff

* Couple fixes

* Defib ref fixes (Silly me)

* Added clumsy back!

* no hard code clumsy!

* Identity fix

* Event name change

* Comment change

* Function name change

* opp

* Update names

* Damage stuff!

* Fixes!

* Fixes

* opps

* This was hidden away!!

* negative diff feeds me
 2024-11-16 00:46:01 +01:00
Moomoobeef
6236d1abb3 Updated an incorrect sprite in the smite menu (#33043) 
changed the synth sprite used in the icon for the instrumentify smite out for the more accurate supersynth sprite
 2024-10-28 23:35:48 +01:00
IProduceWidgets
8cafd7261d Fix omega cursed smite code. (#32844) 
* le fixo smotes

* CURSE OF BLINDNESS

* Guh
 2024-10-17 09:24:31 +11:00
TsjipTsjip
736325a31f Log enrichment: Explosion damage to players (#29762) 
* Log enrichment: Explosion damage to players

* Update Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Revert to total damage variant only, currently serialised as string.

* Make this its own log type.

---------

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
 2024-08-09 16:24:05 +10:00
Plykiya
79fa810b9c Update stomach removal and lung removal smite to not use Component.Owner (#29927) 
* Update stomach removal and lung removal smite

* New function makes things simple

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-28 01:25:40 -07:00
Plykiya
2a7883b92e Update vomit organ smite to not use Component.owner (#29926) 
* Update vomit organ smite to not use Component.owner

* is this what you want...?

* am I winning, dad?

* update the comment

* we love entity<t>

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-25 05:24:40 -07:00
Kara
855234aa30 Resolve 'TransformComponent.MapPosition' is obsolete in content (#27939) 
* Resolve `'TransformComponent.MapPosition' is obsolete: 'Use TransformSystem.GetMapCoordinates'` in content

* build?
 2024-05-12 10:31:54 -04:00
Джексон Миссиссиппи
cf148288a0 Add an admin smite for making people slip really far (and localize the admin smites better) (#27246) 
* Sliiiiiiiiiiiiiiiiiip

* what

* Localize!

* antiterminate
 2024-05-11 22:01:58 -04:00
SlamBamActionman
f544c91298 Revert Exterminator pending newmed/redesign (#26978) 
* Reverts Exterminator

* Includes commented out parts + sprites

* Readd stuff, comment out yaml

* Popup ads

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-04-28 15:45:54 +10:00
Whisper
eee056eaf0 lower max firestacks to 10, refactor flammable (#27159) 
* lower max firestacks to 10, refactor flammable

* fix

* uncap fire stack damage, lower fire stack damage
 2024-04-23 21:30:01 +10:00
Tayrtahn
964c6d54ca Code cleanup: Purge obsoleted SharedPhysicsSystem methods (#26287) 
Updated calls to SharedPhysicsSystem methods
 2024-03-25 17:37:25 +11:00
Tayrtahn
4a83c36585 Code cleanup: Dirty(Comp) (#26238) 
* Replaced uses of Dirty(Component) with Dirty(Uid, Component)
Modified some systems (notably pulling-related) to use uids.

* Missed a few

* Revert changes to pulling

* No
 2024-03-19 23:27:02 -04:00
metalgearsloth
a9502be29e Revert "Fix chat bubbles (#25643)" (#25645) 
* Revert "Fix chat bubbles (#25643)"

This reverts commit 23d2c4d924.

* Revert "Fixes obsolete Transform warnings in Content. (#25256)"

This reverts commit f284b43ff6.
 2024-02-28 00:51:20 +11:00
TemporalOroboros
f284b43ff6 Fixes obsolete Transform warnings in Content. (#25256) 
* Fix TransformComponent.MapPosition warnings in Content.Client

* Fix TransformComponent.MapPosition warnings in Content.IntegrationTests

* Fix TransformComponent.MapPosition warnings in Content.Shared

* Fix TransformComponent.MapPosition warnings in Content.Server

* Fix TransformComponent.WorldPosition warnings in Content.Shared

* Fix TransformComponent.WorldPosition warnings in Content.Client
Excepts ClickableComponent b/c that needs to be ECS'd entirely later

* Fix TransformComponent.WorldPosition warnings in Content.Server

* Fix TransformComponent.WorldRotation warnings in Content.*

* Fix TransformComponent.MapPosition warnings I missed

* Fix TransformComponent.WorldMatrix warnings in Content.*

* Fix TransformComponent.InvWorldMatrix warnings in Content.*

* Fix TransformComponent.GetWorldPositionRotationMatrixWithInv warnings in Content.*

* Fix TransformComponent.GetWorldPositionRotationMatrix warnings in Content.*

* Fix TransformComponent.GetWorldPositionRotation warnings in Content.*

* Fix TransformComponent.Anchored.set warnings in Content.*

* Fix TransformComponent.Coordinates.set warnings in Content.*

* Fix TransformComponent.LocalPosition.set warnings in Content.*

* Fix TransformComponent.AttachToGridOrMap warnings in Content.*

* Fix TransformComponent.AttachParent warnings in Content.*

* Preempt TransformComponent.LocalRotation.set warnings in Content.Shared

* Preempt TransformComponent.LocalRotation.set warnings in Content.Client

* Preempt TransformComponent.LocalRotation.set warnings in Content.IntegrationTests

* Preempt TransformComponent.LocalRotation.set warnings in Content.Server

* Fix/Preempt the remaining obsolete TransformComponent properties/methods in Content.*

* ECS ClickableComponent

* Fix obsolete SharedTransformSystem methods in Content.*

* Fix ExplosionOverlay `SharedTransformSystem` dependency

* Maybe fix null eye position breaking tests

* MGS requested changes
 2024-02-27 12:06:20 +11:00
LordCarve
05a2e6b3a2 Obsolete refactor - ConnectedClient to Channel (#24409) 2024-01-23 09:14:13 +11:00
deltanedas
52532e4075 exterminator midround minor antag (#19946) 
* terminator locale

* terminate objective

* terminator components and shared system

* terminator roles rules and system

* terminator events

* skeleton recolour

* terminator and endoskeleton

* ghost role spawn

* damage modifier sets

* :trollface:

* :trollface:

* add antag prototype

* ghost role locale

* skynet

* :trollface:

* :trollface:

* :trollface:

* add endoskeleton body prototype

* :trollface:

* :trollface:

* smite locale

* implement terminate smite

* :trollface:

* :trollface:

* implement PopupBehavior

* endoskeleton transform popup

* move stuff from shared to server since nothing actually used it

* recolour everything

* update parts

* :trollface:

* :trollface:

* ok fire was using the damage set, back to 1.0

* tweak

* :trollface:

* :trollface:

* simplemob ops

* 1 rule per pro

* :trollface:

* :trollface:

* update some sprites

* structural damage

* :trollface:

* :trollface:

* Revert "update some sprites"

This reverts commit 459196c6a8942c5412885d5fe2f1a83a48408ddc.

* offbrand, add die objective to maybe remove fear of murderbone

* add shut down objective to the list

* fix ghost role

* fix control mob

* :trollface:

* :trollface:

* please

* naming

* code changes for GenericAntag terminator

* yml changes for GenericAntag terminator

* :trollface:

* moved kill objective override to an objective component

* use kill objective override

* fix

* oh

* locale changes

* change burn to heat for skin melting gib

* change some endoskeleton stuff

* pro

* i already did this dementia ops

* objective

* fix

* pro

* swap out full sprite

* update parts

* forgor

* fix mind transfer

* type

* endoskeleton has 500 mass

* evil

* fishops

* warops

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-12-24 20:16:56 -07:00
nikthechampiongr
bf2b441192 Super Bonk Smite (#22413) 
* Added the Super Bonk smite. It teleports the player from table to table
in the game and bonk their head into them. Also smashes them into glass
tables.

* Stopped using a timer and now instead use Comp + System. Also added proper logging impact.

* Fixed name inconsistency

* Admin CL which I forgot

* Made it funnier

* Moved basically all logic to the system and added a light version that stops when you die

* Hopefully made YAML Linter stop bullying me

* Removed fun(Glass tables no longer get smashed when the target is bonked over them)

General opinion seems that it would cause too much collateral damage. I kinda agree.

* Adressed reviews
 2023-12-18 14:39:23 -05:00
DrSmugleaf
f560f88eb5 Remove 700 usages of Component.Owner (#21100) 2023-10-19 12:34:31 -07:00
Jezithyr
31b2c9f830 Refactoring body system to use containers and general body cleanup (#20202) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-09-21 17:23:02 +10:00
metalgearsloth
db1ff07821 Weldable cleanup (#19809) 2023-09-05 00:07:01 +10:00
metalgearsloth
4cfc578011 Revert "Remove most usages of obsolete TransformComponent methods (#1… (#19714) 2023-09-01 12:30:29 +10:00
Visne
1416942bea Remove most usages of obsolete TransformComponent methods (#19571) 2023-08-30 12:05:19 +10:00
DrSmugleaf
35107f7c2b Fix component generic usages where IComponent would not be valid (#19482) 2023-08-24 20:10:55 +10:00
DrSmugleaf
7ab11dd20b Fix remove hands popup and remove single hand admin smite not being available (#19099) 2023-08-13 17:50:58 -05:00
Chief-Engineer
bfa3989011 improve ignite logs (#18669) 2023-08-05 12:18:09 +10:00
metalgearsloth
94e2c7a4b0 Fix godmode mispredicts (#18524) 
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
 2023-08-04 14:53:07 +10:00
Artjom
cae037d8a8 Zooming for everyone with keyboard keys (#16605) 2023-06-17 09:22:21 +10:00
metalgearsloth
9beec38b6f Fix monkey rsi error (#16407) 2023-05-14 14:47:32 +10:00
metalgearsloth
0e81cb4319 Remove diseases (#15684) 2023-05-07 17:50:37 +10:00
metalgearsloth
ae01618874 Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
metalgearsloth
acf79a8209 Revert "Replace ResourcePath with ResPath (#15308)" (#15551) 2023-04-20 11:43:54 +10:00
Ygg01
71f358a027 Replace ResourcePath with ResPath (#15308) 2023-04-19 23:39:17 +10:00
Nemanja
49f7575298 Cuffable/Handcuff ECS (#14382) 2023-03-13 19:34:26 -04:00
brainfood1183
c9e70d8ea0 Cluwne smite (#13367) 2023-03-06 11:09:24 -08:00
Nemanja
e412eda97c Clean up polymorphsystem (#14297) 2023-03-06 09:37:18 -08:00
metalgearsloth
3bb4dd97aa Fix material rsi (#14339) 2023-03-02 17:30:35 +11:00
metalgearsloth
44fb8a9e2d Fix rsi sprite access for verbs (#14284) 2023-02-26 18:48:57 +11:00
metalgearsloth
bf79d76666 Content update for ECS physics (#13291) 2023-01-15 15:38:59 +11:00
Jezithyr
eeb5b17b34 Mobstate Refactor (#13389) 
Refactors mobstate and moves mob health thresholds to their own component

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
 2023-01-13 16:57:10 -08:00
Leon Friedrich
881a2b2ece PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
Leon Friedrich
77683a95df Add point light to burning entities (#12959) 2022-12-12 14:35:33 +11:00
metalgearsloth
6c76061887 Content changes for mapgrid kill (#12567) 2022-11-22 13:12:04 +11:00