Commit Graph

21714 Commits

Author SHA1 Message Date
Ed
61edcf69df Update Dev.toml 2025-04-15 01:45:15 +03:00
Ed
5420469d62 Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync
# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
2025-04-15 00:44:29 +03:00
creamybag
e7cd69e383 Carcat sprites fix (#1176)
* CarcatSpritesFix

* fix
2025-04-14 17:16:08 +03:00
SlamBamActionman
961d2cfdef Clarify "purple text" characters in rules & readd Space Law non-restricted item seizure (#36414)
Initial commit
2025-04-14 16:12:03 +02:00
Nim
b7e4fbb74a Amulets are jewellery (#1126)
* amulets are jewellery

* transfer textures
2025-04-14 14:50:07 +03:00
Nim
85204144fb magic modifier (#1103) 2025-04-14 14:45:36 +03:00
creamybag
f2520fd468 beards 2.0 (#1182) 2025-04-14 13:18:38 +03:00
chromiumboy
87b6eb55e5 Hotfix for water/fuel tank fixtures (#36527)
Sharing the same fixture layer as walls causes dragged water/fuel tanks to be blocked by things that they really shouldn't be, such as lights and holopads

Being PRed as a hotfix in order to fully finalize #36341
2025-04-13 22:02:29 -07:00
Pieter-Jan Briers
7bb35889ce Revert "Feature/shader radial menu" due to shader issue (#36470) 2025-04-13 23:55:27 +02:00
Ed
5df9a526f0 new horns 2025-04-13 23:27:24 +03:00
Myra
1741f40f8a Disable mob pushing
Part of maint meeting
2025-04-13 22:04:52 +02:00
Ed
4a98d86330 wastelands (#1181) 2025-04-13 22:43:47 +03:00
Ed
aef6eb155e back to ru cbt 2025-04-13 21:06:44 +03:00
Ed
78c61c3094 ssss 2025-04-13 21:02:25 +03:00
Ed
5646e419bc Update Fear.yml 2025-04-13 19:51:20 +03:00
Ed
6f665266c4 s (#1179) 2025-04-13 15:37:00 +03:00
Ed
ac541b63ef new round leave system (#1178)
* round leave

* maps update
2025-04-13 15:36:41 +03:00
Viator-MV
0f37c24df0 fix (#1177) 2025-04-13 14:48:33 +03:00
Ed
e968c7a9b8 wendigo tweak 2025-04-13 12:34:03 +03:00
Ed
26d81b684b Weather refill (#1175)
* refillable by weather

* fix
2025-04-13 01:01:22 +03:00
Ed
51b3492cea Update wendigo.yml 2025-04-12 22:01:14 +03:00
Ed
517bc5418b Wendigo demiplane antag (#1174)
* wendigo

* ritual3

* Update sky_lightning.yml
2025-04-12 17:32:53 +03:00
Viator-MV
ee30ae1341 frigid coast (#1173)
* frigid coast

* fix

* Update snow.yml

* Update default.yml

* Update Frigid_Coast.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-04-12 16:35:41 +03:00
Ed
3c27e0ed99 Revert "Another Try" (#1170)
* Revert "Another Try (#1167)"

This reverts commit 355fc410a3.

* Update EntityTest.cs

* Revert "Update EntityTest.cs"

This reverts commit 1f75981e59.
2025-04-12 12:03:18 +03:00
Ed
e64c8f3d4f Dead tree (#1172)
* farming rebalance

* Update base.yml

* Update CP14FarmingSystem.Resourse.cs

* dead tree

* Update scattering_grenades.yml
2025-04-12 11:43:45 +03:00
Ed
da5190ae60 Farming rebalance (#1171)
* farming rebalance

* Update base.yml

* Update CP14FarmingSystem.Resourse.cs
2025-04-11 23:45:03 +03:00
Ed
355fc410a3 Another Try (#1167)
* tick

* Update simple.yml

* revert deep

* revert straw

* revert surko

* revert fix

* revert beards

* Revert "revert surko"

This reverts commit 9ea597414a.

* Revert "revert fix"

This reverts commit 910da9d6e6.

* Revert "revert beards"

This reverts commit a941a41788.

* Revert "revert deep"

This reverts commit 8dd25a4b96.

* Reapply "revert deep"

This reverts commit cbde613021.
2025-04-11 19:53:00 +03:00
Ed
948d711336 Bunch of bugfixes (#1165)
* watcher fix

* fix #1162

* fix #1111

* make watcher move smoothly

* s

* Delete test_xeno.yml
2025-04-10 22:28:50 +03:00
Emisse
418b931ab8 Job count annotation for each map yml file (#36433) 2025-04-10 11:43:52 -06:00
PJBot
32e6203a9d Automatic changelog update 2025-04-10 16:00:25 +00:00
SlamBamActionman
7f6756135b Add cooked dragon steak and cutlets (#36273)
* Add cooked dragon steak and cutlets

* If it's worse for you it's even more of a delicacy

* Attribution
2025-04-10 08:59:18 -07:00
PJBot
08679be702 Automatic changelog update 2025-04-10 14:19:42 +00:00
chromiumboy
00ab7775d0 Holopad fixtures bugfix (#36341)
Initial commit
2025-04-10 16:18:36 +02:00
PJBot
4862f072c2 Automatic changelog update 2025-04-10 13:56:20 +00:00
ArtisticRoomba
c6581e655c Fix power cells/cages counting for laser weapon bounties (#36431)
fix cargo bounty bug
2025-04-10 15:55:13 +02:00
PJBot
48004bfad7 Automatic changelog update 2025-04-10 10:45:17 +00:00
slarticodefast
f6bfce38da remove mind roles from EntityWhitelist (#36089)
* remove mind roles from EntityWhitelist

* remove redundant dependency
2025-04-10 20:45:12 +10:00
RedBookcase
dc6ed30ec8 Fixed the empty mass scanner still being a normal item, whoops. (#36340)
* Fixed the empty mass scanner still being a normal item, whoops.

* Fixed parenting duplication and issues with item state.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-04-10 20:44:06 +10:00
Fildrance
56710697a9 Feature/shader radial menu (#35152)
* it works! kinda

* so it works now

* minor cleanup

* central button now is useful too

* more cleanup

* minor cleanup

* more cleanup

* refactor: migrated code from toolbox (as it was rejected as too specific)

* feat: moved border drawing for radial menu into RadialMenuTextureButton. Radial menu position setting into was moved to OverrideArrange to not being called on every frame

* refactor: major reworks!

* renamed DrawBagleSector to DrawAnnulusSector

* Remove strange indexing

* Regularize math

* refactor: re-orienting segment elements to be Y-mirrored

* refactor: extracted radial menu radius multiplier property, changed color pallet for radial menu button

* refactor: removed icon backgrounds on textures used in current radial menu buttons with sectors, RadialContainer Radius renamed and now actually changed control radius.

* refactor: in RadialMenuTextureButtonWithSector all sector colors are converted to and from sRGB in property getter-setters

* refactor: renamed srgb to include Srgb suffix so devs gonna see that its srgb clearly

* fix: enabled any functional keys pressed when pushing radial menu buttons

* fix: radial menu sector now scales with UIScale

* fix: accept only one event when clicking on radial menu ContextualButton

* fix: now radial menu buttons accepts only click/alt-click, now clicks outside menu closes menu always

* feat: simple radial menu prototype for easier creation

* refactor: cleanup, restored emote filtering, button models now have class hierarchy

* refactor: remove usage of closure from 'outside code'

* refactor: remove non existing type from UiControlTest

* refactor: remove unused using

* refactor: revert ability to declare radial menu layers in xaml, scale 32px sprites using scale in radial menu

* refactor: whitespaces

* refactor: subscribe for dispose on existing radial menus

* feat: now simple radial menu button models can have custom color for each sector background (and hover background color). Also added OpenOverMouseScreenPosition inside SimpleRadialMenu

* fix: AI door menu now can be closed by verb if it gets unpowered

* overlay and its registration

* radial menu shader but it requires wierd offset

* remove unused file

* smol cleanup

* remove unused code

* neat internal subsctors in radial menu shaders

* refactor finalize visual style

* comments, simplify, extract variable and other minor refactors on radial-menu shader

* refactor: extract more data from radial menu with sector to radial container for shader drawing

* replaced DrawSeparators for RadialMenuTextureButtonWithSector with DrawBorder (no reason to make them separate), also now colors are properly applied

* refactor: simplify hiding border, extended xml-doc for simple radial menu settings

* refactor: remove duplication of radial menu shaders, use ValueList to collect ClearExistingChildrenRadialButtons buttons to remove

* refactor: remove linq

* fix: fix AI radial action serialization using invalid type

* refactor: fix duplicate ShowDeviceNotRespondingPopup for AI by properly checking if it can interact

* refactor: removed *if* blocks from shader, replaced with branchless logic

* refactor: whitespaces, changed list to array in simple radial button preparing methods

* fix: merge duplicated code

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2025-04-10 20:42:53 +10:00
PJBot
2172eaa492 Automatic changelog update 2025-04-10 10:40:21 +00:00
beck-thompson
149c42f385 Predict inflatable barriers verb (#32420)
* First commit

* evil

* Made it not do weird things

* address review!
2025-04-10 20:39:13 +10:00
Damn Feds
e2296f6d58 remove duplicate CE entry 2025-04-10 22:06:10 +12:00
Damn Feds
829f8199e0 job counts for each map 2025-04-10 21:55:45 +12:00
Ed
41b84f43eb Delete Factoria (#1156)
* bue

* Update PostMapInitTest.cs
2025-04-10 11:10:04 +03:00
PJBot
728603f714 Automatic changelog update 2025-04-09 22:34:06 +00:00
Alex Parrill
74ca51dac8 Mark the spider clan explosive as major contraband (#36421)
Even though it's an unsanctioned explosive device, it's currently
not considered contraband. This patch adds BaseMajorContraband to it.
2025-04-10 00:32:57 +02:00
Ed
0decd375e4 Birch tree (#1154)
* birch

* wooden birch log and planks

* birch tile crafting

* add birch to worldgen

* Update grasslands.yml

* wooden planks (any)

* universal wood crafting

* birch wall
2025-04-09 15:54:38 +03:00
Emisse
cc167b0c2f Convex update (#36401) 2025-04-08 17:51:41 -06:00
Spessmann
2d25c1266a convex fixes 2025-04-08 15:38:28 -07:00
PJBot
394affeb95 Automatic changelog update 2025-04-08 21:55:10 +00:00