Ed
dc47bb2283
Merge remote-tracking branch 'upstream/stable' into ed-15-10-2024-upstream
...
# Conflicts:
# Content.Server/Station/Systems/StationSpawningSystem.cs
2024-10-15 15:25:44 +03:00
Ed
d259191d3d
Cargo system ( #487 )
...
* simple storeship arriving
* pupu
* ship cycling
* buy positions prototypes
* i hate UI
* PriceControl
* second tab ui
* baloon! pallets!
* update shop in town
* setup billboard timer
* split to sell and buy categories
* renaming gaming
* actually selling
* fix infinity selling
* improve timer
* move description too rigt part UI
* bar selling
* iron cabinet
* purge currency categories
* remove town balance, add money box
* special proposal, FTLImmune anchor
* fix UI
* remove tests buying
* Update CP14StoreWindow.xaml.cs
* currency converter
* currency clean up
* Update CP14CargoSystem.cs
* clean up part 2
* rider petpet
* coins audio
* coin improvment
* Update coins.yml
* translate
* more coins roundstart
* Update wallet.yml
* Update wallet.yml
* generate coin problem fix
* refactor proto reading
* fixes
* huh
* shuttle logshit fix, add to tavern map
* Update CP14StationTravelingStoreShipTargetComponent.cs
2024-10-15 15:22:06 +03:00
Errant
519a6b2474
HOTFIX: Fix tech anomaly nexttimer ( #32805 ) ( #32807 )
...
Fix tech anomaly nexttimer (#32805 )
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2024-10-14 11:41:31 +02:00
Ed
4425b77c90
Return RU lang
2024-10-14 11:39:12 +03:00
Pieter-Jan Briers
796764d755
Fix some rounds failing to end due to mind roles ( #32792 ) ( #32793 )
...
* Fix some rounds failing to end due to mind roles
Fixes #32791
This is caused by ShowRoundEndScoreboard running into a bug trying to display antags: some player is showing up as antag with MindIsAntagonist(), but has no antag roles listed in MindGetAllRoleInfo().
This was caused by one of the roles of the player having the Antag boolean set, but having no AntagPrototype set.
The responsible mind role appeared to be MindRoleSubvertedSilicon which is missing a set for the SubvertedSilicon antag prototype.
I also added resilience to the round-end code to make it so that an exception showing the scoreboard (and sending the Discord message) would not cause the round end logic to completely abort from an exception.
I am planning to add an integration test to cover this bug (no prototype in mind roles), but I'll leave that for not-the-immediate-hotfix.
* At least one maintainer approved this tiny PR without reading it, not naming names.
2024-10-13 23:00:40 +02:00
Errant
e5ad32fe93
Fix random test fail in DeleteAllThenGhost ( #32753 )
...
It's simple. We kill the heisentest
2024-10-13 17:31:38 +02:00
Ed
648505dc15
Switch to ENG language
2024-10-13 15:02:57 +03:00
Jezithyr
af72f2e17c
Applying Fix from #32764 to staging
2024-10-12 22:21:44 -07:00
Nim
40959cf422
fix resp ( #488 )
2024-10-13 02:09:41 +03:00
Nim
a6fc5e6ace
Rabbit ( #486 )
...
* rabbit
* meat
* гладить
* тоже гладить
2024-10-12 20:01:13 +03:00
scrivoy
e98af125dc
Fixed capitalization in Interface description ( #32739 )
2024-10-10 21:40:41 +02:00
PJBot
bc64676747
Automatic changelog update
2024-10-10 14:36:43 +00:00
nikthechampiongr
e7b7e2270d
Fix bounties(and potentially other things) running out of ids ( #32700 )
...
* Make NameIdentifier Ids get refreshed after round restarts
Before this commit the existing values would just get shuffled.
This means that eventually the server would run out of ids to give to
new entities for different groups. As a result everything would get id 0
* Comply with what seemingly is the convention for sawmills
* Make it impossible to insert a bounty with a duplicate id
* Reduce duplication
* Remove unused sawmill
* Fix rustbrain and skill issue
* Aaaa
* Apply suggestions from code review
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com >
2024-10-10 16:35:35 +02:00
PJBot
740288eb96
Automatic changelog update
2024-10-10 08:50:05 +00:00
Errant
93c7bdc134
Mind Role Entities ( #31318 )
...
* Mind Role Entities wip
* headrev count fix
* silicon stuff, cleanup
* exclusive antag config, cleanup
* jobroleadd overwerite
* logging stuff
* MindHasRole cleanup, admin log stuff
* last second cleanup
* ocd
* minor cleanup
* remove createdTime datafield
* now actually using the event replacement I made for role time tracking
* weh
2024-10-10 10:48:56 +02:00
Pieter-Jan Briers
3e078ab3e0
Fix error log when recycling something with small material counts. ( #32723 )
...
* Fix error log when recycling something with small material counts.
MaterialStorageSystem.SpawnMultipleFromMaterial now doesn't call StackSystem.SpawnMultiple if it tries to spawn zero. This happens because the recycler calls SpawnMultipleFromMaterial for everything recycled, even if the amount it has stored is < the amount for one sheet.
* Update Content.Server/Materials/MaterialStorageSystem.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-10-10 03:29:26 +02:00
PJBot
ac16a05fef
Automatic changelog update
2024-10-09 18:02:38 +00:00
beck-thompson
327466a6e2
Plushies can now have pAIs stuffed into them (v2)! ( #30805 )
...
* First commit
* I forgot silly me
* Actually added comments
* spellin
* fixes
* more blacklists
* Minor fixes
* Speech Verb also changes now
* Simple name stuff
* Other fixes
* remove one line of whitespace
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-10-09 20:01:32 +02:00
chavonadelal
6d99597349
Job title localization ( #32338 )
...
* Job title localization
* Correcting fields
2024-10-09 17:05:36 +02:00
Ed
844b4d4616
underworld ( #485 )
2024-10-09 16:19:38 +03:00
PJBot
fc1c709d44
Automatic changelog update
2024-10-09 12:45:45 +00:00
beck-thompson
5a41cc81b3
Decrease price of radio jammer from 4 tc -> 3 tc ( #32472 )
...
* First commit
* increase price by one tc
2024-10-09 14:44:38 +02:00
lzk
d450b613d6
fix typo ( #32712 )
2024-10-09 14:41:07 +02:00
PJBot
b657aba2e1
Automatic changelog update
2024-10-09 11:56:57 +00:00
SlamBamActionman
ddaa0e83c6
Add admin log for codewords ( #32531 )
...
* initial commit
* Delta review
2024-10-09 13:55:48 +02:00
Pieter-Jan Briers
1dbbf315c7
Update submodule to v236.1.0 ( #32704 )
2024-10-09 13:41:03 +02:00
Ed
b9df2a495a
some blacksmith bandage ( #483 )
...
* anvil
* iron and copper ore walls + procedural cave update
* vladimirs rocks
* furnace
* Revert "furnace"
This reverts commit f378e4fb85b2c6a193fcdc6d70b10e3ab164999291c226d18d3c3a87c25e7fb44b4908891c3ba0aa4f2eaef6c19d7e042ddf
2024-10-09 13:40:06 +03:00
PJBot
357e998cbb
Automatic changelog update
2024-10-08 23:30:49 +00:00
beck-thompson
384ff7e8f6
Add pumpkin pie! ( #32623 )
...
* first commit
* Licence fix
* rosysyntax licence change (permission granted!)
* simplify
* Better wording
2024-10-09 10:29:41 +11:00
Nim
1ca7456363
AI Factions ( #481 )
...
* factions
* CP14
* Update ai_factions.yml
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2024-10-08 22:52:46 +03:00
PJBot
dc2899c274
Automatic changelog update
2024-10-08 18:30:44 +00:00
K-Dynamic
6f9b4f4226
CHIMP and APE particle speed increase ( #32690 )
...
* swap omega and delta particle colours
* remove upgrade doafter
* explicit syndicate chip description
* Syndicate CHIMP stealth
* fast projectile speed
* 10 to 12 shots
* buff heat dmg
* upgrade chip mentions omega particle
* Revert "remove upgrade doafter"
This reverts commit 8a321980b7a384daca06215656494e0c116e7333.
* Revert "explicit syndicate chip description"
This reverts commit c803c773739a61fc5b3a6cb90810622a6d5846c9.
* Revert "Syndicate CHIMP stealth"
This reverts commit 698a108580892addabf8d51494a72e1ee651b8e6.
* Revert "10 to 12 shots"
This reverts commit 858ac0392be0549eb0a288648413d1020cabae1a.
* Revert "swap omega and delta particle colours"
This reverts commit 4c000b2f110a5d35f317cb61cb5b03ea32841ad5.
* Revert "buff heat dmg"
This reverts commit 02a8690dafbd41631b098e51ef9afba5b6ee6ac4.
2024-10-08 20:29:37 +02:00
PJBot
28f576dae8
Automatic changelog update
2024-10-08 09:54:56 +00:00
Plykiya
1366f6b405
Replace the Librarian's round-start D10 with a D20 ( #32648 )
...
Replace D10 with a D20
2024-10-08 11:53:50 +02:00
averystarbit
0e0887bd49
Added proper capitalisation for supervisors when entering the game ( #32683 )
...
changed punctuation for jobs, added proper capitalization and comma usa
2024-10-08 11:52:46 +02:00
PJBot
1f04117edf
Automatic changelog update
2024-10-08 09:52:31 +00:00
shamp
922dd0bce6
Fix cloth dupe ( #32685 )
...
Update curtains.yml
2024-10-08 11:51:23 +02:00
lzk
33042b00d0
Fix cryo locale again ( #32654 )
...
* Fix cryo locale again
* yeep
2024-10-08 11:50:54 +02:00
Ubaser
38fd54a1bf
Update Core ( #32665 )
...
* add
* remove invalids
* fix
* yes
2024-10-07 19:59:06 -06:00
PJBot
34df781668
Automatic changelog update
2024-10-07 22:43:51 +00:00
Saphire Lattice
f22f9e39c5
Change minibomb to be explosion resistant and start timer on damage ( #32429 )
...
* Make minibomb explosion resistant and trigger timer on damage
* Tune damage behaviour and threshold for minibomb
2024-10-08 00:42:42 +02:00
Pieter-Jan Briers
eecbfb63a0
Move client dumpentities command to "DEBUG" ( #32687 )
2024-10-07 19:19:42 +02:00
Scribbles0
6b10e00da4
oasis update ( #32679 )
...
sec apcs and ai core wiring
2024-10-06 19:24:44 -06:00
Ed
d2c5aa74b4
Ritualizm ( #474 )
...
* ritual cucumber setup
* entities requirements
* try graph???
* Revert "try graph???"
This reverts commit c90c6353cb
2024-10-06 18:04:18 +03:00
Nim
a6532a2801
fix ( #480 )
2024-10-06 17:12:31 +03:00
PJBot
a6c468b697
Automatic changelog update
2024-10-06 13:34:08 +00:00
Golinth
46a2eb545e
Fully Revert Clown Waddling ( #32652 )
...
Fully revert Clown Waddling (revival of #29161 )
A sad day, see #29156 for discussion
2024-10-06 15:33:02 +02:00
PJBot
35fc1b4037
Automatic changelog update
2024-10-06 12:49:56 +00:00
Арт
867efe8b5b
Add flowers to loadout ( #32097 )
...
* Add_Poppy&Lily
* Add_FlowerWreath
* Add_Headflowers
Sprites, meta, prototype
* Id_Changes
* Changes
* Update_Sprite
* Desc_Change
* Scale_Change
* Sprite_Scaling
2024-10-06 14:48:49 +02:00
Spessmann
126c1786de
Cog update fix ( #32657 )
...
* fixes for cog
* ok fixed that
2024-10-05 20:30:10 -06:00
