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
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
8c47af421f
balance pass
2025-05-14 18:22:05 +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
Nim
d8e360367e
Well and new bed, aristocratic cloak ( #1228 )
...
* well and bed
* aristocratic cloak
* fix
* GuardCommander
* fix2
* nop merchant
* bed resp
* fix well visual
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Ed <edwardxperia2000@gmail.com >
2025-05-06 09:47:46 +03:00
Nim
89c737f37d
Перевод на RU ( #1231 )
...
* translated
* end
* review desert
* review 2
* fix
2025-05-06 09:46:46 +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
Viator-MV
3bbf692da5
Ultraskeletom Revmech Update ( #1145 )
...
* help me
* reinforced swords
* skill tree
* fix
* T2 fix
* components
* fix 2
* fix
* halberd fix
* other variant
* recheck it please
* fix
* deskill
* deslikk++
* skel physical buffs
* bad fix
* fix
* extended life time
* fix
* fix
* fix
* heal from death
* sword fix
* fix
* try to fix
* valid crashout?
idk
* It's not my fault.
* fix
* fix
* fix
* review fix
* forgot
* fix
* ашч
* meh
* reequipment
* wrong agony
* fix
* gripfix
* fix
* looking for result
* coment remove
* some fixes
* ok
* aaaaaaaaaaaaaaaaa
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2025-05-03 16:51:25 +03:00
Ed
e792440c19
Gob hairs ( #1250 )
...
* renorma
* gobhairs
2025-04-30 22:14:13 +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
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
Ed
c3b6938388
unicorns
2025-04-29 17:14:05 +03: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
Deserty0
8089be4596
Loc fix ( #1229 )
...
* fun
* Revert "fun"
This reverts commit 419b4e9e8f
2025-04-27 13:11:23 +03: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
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
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
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
RedBookcase
9a646634d4
Removed syndicate surgery duffel, added advanced circular saw to Medical Doctor uplink. ( #35915 )
...
* Removed syndicate surgery duffel, added advanced circular saw to Medical Doctor uplink.
* Update Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
---------
Co-authored-by: RedBookcase <Usualmoves@gmail.com >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
2025-04-24 05:01:29 +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
Samuka-C
6ef03b082f
Xenoborgs part 1 ( #36830 )
...
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
2025-04-23 19:38:10 -07: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
T-Stalker
bad79973f2
Add 1 dragon name ( #36846 )
...
* this is a commit you cannot skip
* why do you have to add a count why
2025-04-23 20:11:34 +10: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
Nim
b70af8848c
Modular helmet ( #1206 )
...
* modular helmet
* fix
* del Bascinet
2025-04-22 14:12:41 +03: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
lzk
15f862a807
fix some datasets ( #36806 )
2025-04-21 18:59:11 +02:00
Phooooooooooooooooooooooooooooooosphate
a83402f382
Add the medical HUDs to medical's loadouts (except chem) ( #32847 )
...
Added the medical HUD and eyepatch to the medical (CMO, doctor, paramed and intern) loadout to let them choose between. Also gives the option for the regular glasses.
2025-04-21 14:07:33 +02:00
Thomas
df5e6a2b5c
Add RGA/RSI to Credits ( #36704 )
...
* Add RGA and RSI to Credits
* Move to thread + add directory field
2025-04-21 12:24:44 +02:00
ScarKy0
2fdfb4b14a
Reworked Mail Spawning ( #36774 )
...
* init
* stuff
2025-04-21 11:32:18 +02:00
āda
f52445ec4e
Reorder electronics recipe file, add filter categories ( #35713 )
...
* electronics split
* split base recipe and category
* all but machines
* machine shuffle
* reorder
* delete unused recipes
* rename cargo to supply
* git weirdness
* git weirdness 2
2025-04-20 18:27:49 -04:00
dffdff2423
592530593d
Remove MK ULTRA ai name ( #35726 )
...
* Remove bad AI names
* Fine, I won't try to sneak this in here.
2025-04-20 17:42:49 -04:00
Jackson Langley
256b6b88fb
Require traitors to maroon their objective no matter what ( #35825 )
...
* jesus
* okay.
* OOPS
* ok
* ok
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* ok
* Update Resources/Prototypes/Objectives/paradoxClone.yml
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* Update Resources/Prototypes/Objectives/base_objectives.yml
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* m
* ok
* ok
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-04-20 17:34:19 -04:00
uhbg
94b46a9edc
The Bartender can now make Eggnog ( #34065 )
...
* Preliminary eggnog changes (egg in shaker crashes?)
* Fixed eggnog reagent name and description
* added - to flavor
* deleted a space
* Added eggnog glass sprite
* changed fill levels to match rsi
* Added two more fill levels to eggnog
* Removed fizziness, changed physical description, and fixed rsi
---------
Co-authored-by: uhbg <29674581+uhbg@users.noreply.github.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
2025-04-20 17:27:35 -04:00
YoungThug
d8ea0a39fe
Wizard Figure Voiceline Fix #36771 ( #36779 )
...
DA WIZARDgit add -A
2025-04-20 16:30:04 -04:00
