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
DrSmugleaf
f5d0e955e3
Fix imports
2024-11-19 21:16:49 -08:00
Ed
e79b046c4a
Magic redesign ( #594 )
...
* water spell textures
* water creation spell
* mana consume, and mana glove
* remove mana transfer ring
* Update migration.yml
* copy Wizden loadout PR
* add sprite component to all spells
* spell dummy loadouts
* delete spell traits
* really give spells from loadouts
* update crates fill and demiplane spawners
* beer creation spell, fix passivedamage
* Update PassiveDamageSystem.cs
2024-11-20 00:23:44 +03:00
Ed
7e4fb90e02
Spell T0 traits, recategorize magic ( #540 )
...
* move to gurps magic types
* spell traits, categorize spells
* Update TraitSystem.cs
* magic spells item provider
* Update twoHandedStaffs.yml
* Update CP14MagicManacostModifySystem.cs
* Update CP14SpellStorageSystem.cs
2024-11-06 18:02:37 +03:00
lzk
8b2ea59515
don't apply traits for borg and ai ( #31990 )
...
* doesn't apply traits for borg or ai
* add some comment and summaries
* weh
weh
* well ok
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2024-09-12 13:36:41 +03:00
Cojoke
b57174007c
Remove all Assigned Values that are Never Used ( #30110 )
...
Remove all Assigned Values that are never used
2024-07-18 20:22:23 -04:00
Plykiya
c5ff647ca6
Replace obsolete EntityWhitelist IsValid usages part 2 ( #28506 )
2024-06-03 17:40:03 -04:00
Ed
a4d1601758
Accent trait limit ( #28046 )
2024-06-03 14:47:06 -04:00
LordCarve
aafe815122
Obsolete Logger cleanup for EntitySystems ( #25941 )
...
* Small obsolete Logger cleanup
* Fixed three EntitySystem logs that weren't doing it right.
2024-03-10 01:15:13 +01:00
metalgearsloth
d254a7d2cb
Don't add trait comps if present ( #16424 )
2023-05-14 21:18:18 +10:00
forkeyboards
e72db80060
White Cane for Blind People ( #16318 )
2023-05-13 13:11:35 +10:00
Paul Ritter
bca66488bf
more proper serv4 usage because i forgot to push for the last pr ( #12965 )
2022-12-11 00:25:04 +01:00
Paul Ritter
3884c4d3db
serv4 + submodule update ( #12740 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com >
2022-11-27 19:25:55 +01:00
Rane
084b482cfe
Entity whitelist/blacklist for traits ( #12348 )
2022-11-04 12:37:17 +11:00
Visne
4cc5fa239e
Implement traits system ( #10693 )
2022-09-10 08:40:06 -07:00
