Red
1d093c3919
Critical bugfixes ( #1291 )
...
* fix modifier duplication
* fix scrap melting
2025-05-21 00:30:16 +03:00
Red
7b7a837cf8
City Gate fix + Comoss update ( #1289 )
...
* city gate fix
* Update comoss.yml
* fix
* Update migration.yml
2025-05-20 22:36:43 +03:00
TheKittehJesus
2fc1384780
Proofreading changes [EN] ( #1288 )
...
* First batch of text fixes
* Tweaks
* that the tavern
---------
Co-authored-by: TheKittehJesus <29379890+SamGithubAccount@users.noreply.github.com >
2025-05-20 22:22:43 +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
Alexsey Bezyuk
3472feefea
Increase WorkbenchRadius ( #1281 )
2025-05-19 10:38:19 +03:00
Ed
e70e64011f
Update CP14BloodMoonCurseRule.cs
2025-05-18 16:59:39 +03:00
Ed
23c9e11019
Blood moon part 2 ( #1272 )
...
* som tweaks
* fixing all
* bloodlust spell
* atatat
2025-05-17 14:12:49 +03:00
Viator-MV
74707a98c3
emiplane ghostrole fix ( #1271 )
...
* fine
* fix
* Update Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
* Update Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
* Update Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
* Update Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2025-05-16 15:26:02 +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
c2c66e77c1
Shrimp progression ( #1268 )
...
* Ore modifier category
* roundstart adventurer weapon equip
* forgot about guard
* Update adventure.yml
2025-05-14 14:22:33 +03:00
Ed
be495f274c
Skill progression system ( #1263 )
...
* delete skill trees
* Revert "delete skill trees"
This reverts commit 9d7fae73c4😢
* 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
Militore
aa2e080e31
Guard bell ( #1242 )
...
* add Guard Bell
* revert vanila changes, add same functionality
* revert more vanila changes, replace .ogg, fix locale and locale usage
* Update GuardBell.yml
* Update base.yml
* add attributions.yml for alerts
* try changing to proper license
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2025-05-09 15:07:05 +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
0c8735f6df
some hotfixes 2
2025-04-30 19:44:38 +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
Princess Cheeseballs
84178dd534
Puddle code hotfix 2 ( #37046 )
2025-04-29 21:10:00 +01: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
ScarKy0
14cca7990a
[HOTFIX] Fix maroon objective, change the text ( #36990 )
...
* test
* text
* capital C
* guh
2025-04-28 11:31:42 +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
3313c648fe
Fix warnings in ServerDbManager ( #36871 )
...
Fix warnings in ServerDbManager
2025-04-24 01:48:27 +02:00
Tayrtahn
acee0e53f7
Cleanup warnings in SpawnSalvageMissionJob ( #36866 )
...
* DoMapInitialize and SetMapPaused
* GridTileToLocal
* Formatting
* Remove unused variables
* Update Content.Server/Salvage/SpawnSalvageMissionJob.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-04-24 01:33:30 +02:00
Tayrtahn
44106d5570
Move guardian sounds to component ( #36870 )
2025-04-24 01:29:49 +02:00
Tayrtahn
b3d761921f
Cleanup warnings in WorldgenConfigSystem ( #36864 )
...
Fix warnings in WorldgenConfigSystem
2025-04-24 00:39:17 +02:00
Tayrtahn
02814e1e8d
Cleanup warnings in PolymorphSystem.Map ( #36869 )
...
Fix warnings in PolymorphSystem.Map
2025-04-24 00:25:13 +02:00
Tayrtahn
411b563b1f
Cleanup warnings in CableSystem.Placer ( #36868 )
...
* Fix warnings in CableSystem.Placer
* Formatting
2025-04-23 18:14:50 -04:00
Tayrtahn
5ede1f7b4e
Cleanup warning in EmptyAllContainersBehaviour ( #36860 )
...
Fix warning in EmptyAllContainersBehaviour
2025-04-23 20:33:18 +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
a7b9694d10
Cleanup warnings in NinjaSuitSystem ( #36861 )
...
Fix warnings in NinjaSuitSystem
2025-04-23 20:24:21 +02:00
IProduceWidgets
4fa808ace5
Simulate command in minutes for real ( #36808 )
...
* 60
2025-04-22 18:20:45 -04:00
Southbridge
1e794a30d0
Cherry Pick Round-start Solar Variation ( #36825 )
...
* Roundstart Variation for Solar Panels (#86 )
* Added roundstart variation for solar panels
* Removed HV cable spawner since i don't want to bother with mapping them
* Solar Panel Variation Pass Fix (#96 )
Added a second variation pass for regular solar assemblies, since otherwise they would spawn both it and the broken variety
* Reorganized everything to no longer be in the _Moffstation subdirectory
* Removed a forgotten tag for Moffstation
* Removed the moffstation namespace settings
* Update Content.Server/GameTicking/Rules/VariationPass/Components/SolarPanelReplaceVariationPassComponent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
* Update Content.Server/GameTicking/Rules/VariationPass/Components/ReplacementMarkers/SolarPanelReplacementMarkerComponent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
2025-04-22 15:46:38 -04:00
Tayrtahn
b8a894bfd1
Banana cream pie loc improvements ( #36829 )
...
* CAPITALIZE(THE($owner))
* Rename "thrower" to "thrown"; use THE($thrown)
* "the banana cream pie" -> "a banana cream pie"
* Simplify filter
2025-04-22 20:15:39 +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
Nemanja
907aecb0ae
Fix identity grammar ( #36817 )
...
Fix identity
2025-04-22 02:26:29 +02: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
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
Łukasz Lindert
04ea0b5e5a
Solution drag and drop now checks if container is closed and drainable ( #34683 )
...
drainable fix
2025-04-21 17:50:07 +02:00
ScarKy0
467fe23795
Further Allocation Tweaks ( #36800 )
...
* init
* fix lockboxes
2025-04-21 12:32:14 +02:00
