Commit Graph

5834 Commits

Author SHA1 Message Date
Red
1d093c3919 Critical bugfixes (#1291)
* fix modifier duplication

* fix scrap melting
2025-05-21 00:30:16 +03:00
Red
f4caea3c6c Garbage delete (#1284)
* fuck this

* and this

* aaand this

* content fix

* Update base.yml

* Update physical.yml

* kill bob
2025-05-19 14:53:00 +03:00
Ed
0274826e32 Species free innate skill (#1277)
* innate free job skills

* returns species magic buff + unlock all skill

* Update tiefling.yml

* fix
2025-05-18 00:37:04 +03:00
Ed
23c9e11019 Blood moon part 2 (#1272)
* som tweaks

* fixing all

* bloodlust spell

* atatat
2025-05-17 14:12:49 +03:00
Ed
132d1db37b search of life spell (#1273) 2025-05-16 00:58:48 +03:00
Ed
e0a4f5592f Blood moon (#1270)
* some setup

* fix dayccle events, add basic gamerules

* carcat guidebook update

* pfpf

* wawa

* fnish
2025-05-15 17:32:26 +03:00
Ed
26e4088cdd Silva Photosynthes returns + Carcat guidebook page (#1269)
* f

* restore silva feature

* carcat guidebook

* day cycle
2025-05-15 00:37:42 +03:00
Ed
be495f274c Skill progression system (#1263)
* delete skill trees

* Revert "delete skill trees"

This reverts commit 9d7fae73c4.

* learning refactor

* UI tweaks

* sword mastery skill

* telegraphy

* rapier mastery

* research table ui

* finish studing

* polish UI researching

* pyrokinetic

* more skill tree working

* heat adapt

* alchemist and metamagic update

* skill multiple effects support + metamagic bugg manapool

* impossible 😢

* skimitar gaming

* skimidi

* blacksmithing branch

* remove research restrictions

* remove species magic buff

* fix loc

* Update thaumaturgy.yml

* pip

* Delete skill_tree.yml
2025-05-14 12:43:43 +03:00
Ed
0fc9e28637 Demiplane maps aftertest tweaks (#1256)
* admin info panel in demiplane map

* fix core chasm destruction

* dimensit resource, more resources in demiplanes

* more fixes
2025-05-06 08:29:09 +03:00
Ed
aeedff5caa Demiplane exploration map (#1251)
* dehardcode nodeTreeControl part 1

* finish

* demiplane map system setup

* link map entity with station data!

* random demiplane map generation

* redesign demiplane map node tree

* center

* map generate v2

* location generation

* modifier generation

* missing location icons

* ui polish

* data refactor

* fix line color

* ejectabling

* split demiplane component into two

* blocker attempt

* revoking

* fix frontier calculation

* dimensit

* demiplane core room spawning

* demiplane cool destruction

* Update round_end.yml

* progression works now!

* Update CP14NodeTree.cs

* Update CP14NodeTree.cs

* documentation pass

* fix abusing, some balance pass

* demiplane naming fix

* см

* location names

* delete old keys

* Update buy.yml

* Update migration.yml

* fix guidebook

* Update misc.yml

* Update misc.yml
2025-05-05 15:19:44 +03:00
Ed
518b439c0f integrate 2025-04-30 20:50:03 +03:00
Ed
ef6d973301 Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync
# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml
2025-04-30 20:31:50 +03:00
Ed
2358bc46d6 Torches + Cotton (#1246)
* torches add, wallmount crystals deletion

* cotton

* Update buy.yml

* craftis

* delete elemental quartz

* energy crystal resprite and rewamp

* fix

* Update misc.yml

* а

* delete rituals

* riat

* Update migration.yml

* Delete CP14ClientRitualSystem.cs

* Update statues.yml

* fix

* Update wallmount_lamp.yml

* fix
2025-04-30 17:28:38 +03:00
Tornado Tech
ad2fc18356 Dimensional (#1140)
* add: Temporamancy tree with new shadow swap spell

* feat: Increased tempo loadout to 2

* feat: Remove most popups from swap spell

* fix: Swap with no mob entities

* feat: Add CanCast to spell effect

* fix: Handeling cancaled event & swap state

* feat: Add UseCustomCastConditions

* feat: Add swap to magic shadow staff

* feat: Add tempo essence & magic type

* feat: Add Tempo type to all dimension spells

* fix: Magic shadow staff tempo manacost modify

* fix: Spell type local

* feat: Add touhou lore

* fix: Review

* feat: Add target dead block component

* feat: Remove checking access

* feat: Add RequireCanInteract

* feat: Remove essence

* fix: Review

* fuck

* fuck part 2

* Update Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs

* Update dimension.png

* minor nitpick

* fix

---------

Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
2025-04-30 17:25:10 +03:00
slarticodefast
0e586e3fae Hotfix: Fix item toggling crashing the client for slimes (#37054)
fix item toggling crashing the server for slimes
2025-04-30 02:19:07 +02:00
ActiveMammmoth
a8ff930763 Staff of Animation Fixes & Recharging (#37021) 2025-04-29 20:40:49 +01:00
Milon
b9b854e179 ringer bugfixes (#36936)
AAAAAAAAAA
2025-04-29 19:08:23 +02:00
keronshb
0a394d4af5 Wizard Teleport Scroll (Teleport Location ECS) (#36424) 2025-04-28 19:42:24 +02:00
metalgearsloth
fe3fe95dfa Fix autorecharge 2025-04-28 15:53:40 +02:00
Ed
a1153843a2 Storage durability rebalance + Fuck nails (#1225)
* fix storage

* bye nails

* Update target.yml

* f

* Update migration.yml

* Update migration.yml
2025-04-26 17:20:52 +03:00
Ed
cff9dc6fcf Wendigo renamed to Lurker (#1213)
* Добавлены изменения для создания пулл реквеста

* Update Step.yml

* rename!

* fix

* interrupting toggleable spells
2025-04-26 16:38:54 +03:00
ArZarLordOfMango
07132cdbd8 [Fix]Roof (#1147)
* roof

* why you dont work...

* fix and locale

* weh check

* Update no-roof-in-tile.ftl

* Update no-roof-in-tile.ftl

* Update roofs.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
2025-04-26 15:23:11 +03:00
Ed
7941be4490 dungeon walls resprite, fix TOSTRING problem from C4viwlle 2025-04-26 13:29:23 +03:00
Ed
1ee7b9b76c fixes 2025-04-26 13:07:04 +03:00
Ed
a8b1b0ed37 sphere of light redesign 2025-04-25 14:11:36 +03:00
Ed
62cdf9e1c5 Bugfixes + QoL (#1218)
* fix keyring

* fix #1209

* fix #1116

* fix water, test reenable ambient loop

* recipe categories in workbecnhes

* Update CP14StoreWindow.xaml

* refactor: review

* Update CP14WorkbenchWindow.xaml.cs

* Update SharedCP14MagicEnergySystem.cs

* categorizize all recipes + some UI fix

* Update round_end.yml

---------

Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com>
2025-04-25 13:39:20 +03:00
ScarKy0
56ee29ab41 Turnstiles lower volume + access reader (#36900)
fixes
2025-04-25 00:14:47 +02:00
Nemanja
f9b3d59a53 Fix QSI bringing people into paused maps (#36834) 2025-04-24 14:18:26 -07:00
ScarKy0
a16504fa42 Tearable Deliveries V2 (#36815)
* Add new fields to DeliveryComponent for #36636

* Setting the baseSpesoPenalty for currently available deliveries

* Small fixes

* Basic delivery penalization

* Penalty and reward multiplier calculation in place

Also fixes an issue in SharedCargoSystem when opening a delivery in dev server due to trying to allocate cargo twice.

* Calling penalty no longer happens on opening

* Extract multiplier getting

* Removing unused include

* Changing method description. \n\n Not actually sure what I meant by the first one

* Localising default delivery messages

* Unused include removal

* init or smth

* minor tweaks

* I KEEP MERGE CONFLICTING MYSELF

* comments

* no icon

* slight increase

* slarti changes

* forgot

* stuffs

* yippee

* Locn't

* doc

* partial review

* message

* review

* pain

* stuff

---------

Co-authored-by: Lmorgan89 <billsmith116@gmail.com>
2025-04-24 21:47:46 +02:00
Nemanja
68881ac030 Fix small misc. turnstile issues (#36893)
* Fix small misc. turnstile issues

* more missing things

* quieter
2025-04-24 19:02:12 +02:00
J
1f722bcc44 Delivery system now has the possibility of penalisation (#36660)
* Add new fields to DeliveryComponent for #36636

* Setting the baseSpesoPenalty for currently available deliveries

* Small fixes

* Basic delivery penalization

* Penalty and reward multiplier calculation in place

Also fixes an issue in SharedCargoSystem when opening a delivery in dev server due to trying to allocate cargo twice.

* Calling penalty no longer happens on opening

* Extract multiplier getting

* Removing unused include

* Changing method description. \n\n Not actually sure what I meant by the first one

* Localising default delivery messages

* Unused include removal

* minor tweaks

* slarti changes

* forgot

* stuffs

* yippee

* Locn't

* doc

* Apply suggestions from code review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-24 18:05:32 +02:00
Nemanja
dc9844edd1 Genpop Closets & IDs (#36392)
* Genpop IDs and Lockers

* placeholder generation, no ui yet.

* UI

* Fix time offset

* fix meta.jsons

* big speller

* Scarkyo review

* Add turnstile prototypes

* make IDs recyclable

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-04-24 16:32:11 +02:00
Ed
4bb614981f Keys & Locks crafting (#1207)
* keeye

* random locks for demiplanes

* blank keys, material keys

* craft blank keys

* key file

* fix skill tree UIScaling

* fix audio and sounds and prediction

* delete crowbar, merge its into pickaxe

* QoL key shaping

* lock introdusing

* QoL progress lockpicking

* examinable lock

* lock insert

* mithril lockkpick

* Update wall_dirt.yml
2025-04-24 17:10:52 +03:00
Nemanja
712954f1c4 Turnstiles (#36313)
* construction rotation fix

* Turnstiles

* renaming

* review-slarticodefast-1

* mild attempts to fix (sorry sloth)

* move some more shit

* Remove engine dependency

* grid agnostic

* remove debug string

* fix json

* Update Content.Shared/Movement/Pulling/Systems/PullingSystem.cs

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Update Content.Shared/Movement/Pulling/Systems/PullingSystem.cs

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* remove pass delay for mispredict reasons.

* most minor of changes

* Give directional indicator on examine

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-24 13:39:40 +02:00
beck-thompson
186cef25ca Put items inside cakes! (#31015)
* First commit

* I'm silly

* Please be it

* Some more fixes

* Cleanup

* fine!

* removed = false

* review

---------

Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-24 05:00:50 +02:00
ArchRBX
8045373197 pAI Software Catalog (#36857)
* initial commit

* add the shop and make it work

* add existing pai actions to the software shop

* added power monitor app

* killed the power and crew monitor software, too powercreepy

* fix test failures

* fix more test failures

* fix merge conflicts

* code changes to conform with review

* fix unintentional submodule update

* submodule update

* remove unused currency prototype ref

---------

Co-authored-by: archrbx <punk.gear5260@fastmail.com>
2025-04-23 16:55:35 -07:00
Tayrtahn
43d9365abf Cleanup warnings in SharedCryostorageSystem (#36863)
Fix warnings in SharedCryostorageSystem
2025-04-24 00:05:10 +02:00
Tayrtahn
6d88dd910d Modernize GhostComponent & Ghost API (#36858)
* Move CanReturnToBody to system

* Move CanGhostInteract to system

* Cleanup redundant datafields and viewvariables

* Document datafields

* Document component

* Add SetTimeOfDeath Entity<T> overload, obsolete old version

* Document public methods

* Cleanup obsoleted method calls
2025-04-23 20:28:10 +02:00
Tayrtahn
88d8458b5d Remove redundant fields from MovementSpeedModifierComponent (#36859)
Delete _baseWalkSpeedVV and _baseSprintSpeedVV
2025-04-23 19:54:49 +02:00
Tayrtahn
441083e906 Fix warning CS0414 instances (#36832)
Fix warning cs0414 instances
2025-04-23 01:36:49 +02:00
godisdeadLOL
ebf9f4a38e Fingerprint taking improvements (#31864)
* now using event to check access to fingerprint

* Opps actually commiting the changes

---------

Co-authored-by: YourUsername <you@example.com>
Co-authored-by: beck-thompson <beck314159@hotmail.com>
2025-04-22 14:15:12 -04:00
pathetic meowmeow
907f4b39cd Make funding allocation computer more configurable (#36790)
* Make funding allocation computer more configurable

* admin logging

* unused

* ccvar enabled

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-04-22 08:34:53 -04:00
ShadowCommander
1bfa303f36 Firelock temperature and pressure warning lights (#28339)
* Add temperature and pressure lights to firelocks

* Replace sprites with new pressure and temperature light versions

* Remove obsolete deny and locked sprites

* Add SpriteSync for warning light animation synchronization

* Teal lights

* Partial animation implementation

* fixup! Teal lights

* Temperature lights

* Adjusted firelock light heights and added final warning light sprites

* Fix colors

* Testing colors

* Update light sprites

* updated sprites

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-04-21 18:39:28 -04:00
lzk
9e39f99a92 Fix some locale strings and make some code for them looks better (#32003)
* Fix a lot locale strings

add functions using
fix identity for meat spike and creaming

* comma

* fixes for fixes

* yeah

* fuck
2025-04-21 22:15:20 +02:00
J
ded94ebc3d Various sharedsystem spring cleaning (#36200)
* Various shared system warnings cleanup

* More shared system warnings cleanup

* Rearranging changes

* Using correct transform for unbuckle

* Small changes

* Revert buckle change

* Update Content.Shared/Ghost/SharedGhostSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-21 20:40:31 +02:00
Verm
dd308c6d2d Makes EventRole Ids properly set ID names. (#28958)
* Add id binding system

* Change so it activates when added too

* Add to eventhumanoid

* Add PDA binding, try to fix some things

* Still not fixed, PDA is working right

* Move to server, add on mind instead

* Implement suggestions

* Fix things

* Finish review stuff

* Messed up cluwne

* Remove after only changing id too

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-21 14:25:22 -04:00
ScarKy0
467fe23795 Further Allocation Tweaks (#36800)
* init

* fix lockboxes
2025-04-21 12:32:14 +02:00
ScarKy0
2fdfb4b14a Reworked Mail Spawning (#36774)
* init

* stuff
2025-04-21 11:32:18 +02:00
IProduceWidgets
98511d1b21 Binomial Number Selector for EntityTables (#36783)
* binomial dist

* lol initialize the int tho idiot

* xml docs my forgotten

* ditto
2025-04-21 02:57:20 +02:00
Tayrtahn
d4dfbcc853 Cleanup warnings in SharedPortalSystem (#36747)
* Cleanup warnings in SharedPortalSystem

* Formatting while we're here

* Replace uses of !Any() with Count == 0

* AnyEntitiesIntersecting
2025-04-21 02:32:34 +02:00