Commit graph

33546 commits

Author SHA1 Message Date
Vigers Ray
bf973907d2 Revert "#34771 Fix door system assuming all door layer states are in single RSIs (#34775)"
This reverts commit 60f531b637.
2025-03-29 16:14:32 +03:00
Vigers Ray
1ae2769351 фикс питания в транзите 2025-03-29 15:14:41 +03:00
Vigers Ray
014e6ac131
Культ крови (#847)
Signed-off-by: pacable <igor.mamaev1@gmail.com>
Co-authored-by: pacable <igor.mamaev1@gmail.com>
Co-authored-by: Babaev <129369024+babaevlsdd@users.noreply.github.com>
2025-03-29 14:46:54 +03:00
Vigers Ray
8c45632d02 бафф культа плоти 2025-03-29 14:43:45 +03:00
Vigers Ray
37851e8d02 ы 2025-03-29 14:12:27 +03:00
GayBot
b945a1a8e4 Automatic changelog update 2025-03-29 14:04:39 +03:00
Francus_
56c1e20c30
Console (#1593) 2025-03-29 14:03:19 +03:00
Vigers Ray
eafbb469ba фиксы линтера 2025-03-29 13:51:54 +03:00
Vigers Ray
53b55afd47 Включил ДО и Культ Плоти 2025-03-29 13:42:53 +03:00
GayBot
c467001bfc Automatic changelog update 2025-03-29 13:33:03 +03:00
temm1ie
6dc7476dac
Убрать мешки с землей из каталога карго (#1592) 2025-03-29 13:31:42 +03:00
🐊SqerDust🐊
68df808ce3
Цветные варианты для рюкзака, вещмешка, сумки в ОдеждоМат (I: #1520) (#1591) 2025-03-29 13:31:18 +03:00
temm1ie
f74fc8ecfd
Новые растения в ботанику (#1521) 2025-03-29 13:31:01 +03:00
GayBot
d43990a0cc Automatic changelog update 2025-03-29 13:31:02 +03:00
XMukai
ff05a70b8e
Игрушки в виде котиков (#1590) 2025-03-29 13:30:44 +03:00
SplikZerys
02674a5a44
transit_hub.yml remap (#1587) 2025-03-29 13:30:32 +03:00
ARMAN007aa
506c41557c
Провод доступа в консоли (#1580) 2025-03-29 13:29:36 +03:00
GayBot
8c3702b435 Automatic changelog update 2025-03-29 13:25:26 +03:00
Babaev
526e4a6802
Фикс автоподнятия у NPC (#1471) 2025-03-29 13:24:03 +03:00
Vigers Ray
0a3558feb8 фикс хисткана 2025-03-28 05:17:56 +03:00
Vigers Ray
ea8170ea1a Merge remote-tracking branch 'space-wizards/master' 2025-03-28 04:22:29 +03:00
Milon
92a3fd99ca
Fix gas pressure pump prediction (#35865)
* ACTUALLY predict gas pumps

* generic fake

* aaaaaaaaaaaaa
2025-03-28 10:42:16 +11:00
Errant
ea785da1b2
Unhardcode role type names and colors within localization text (#36096)
* localize role type names within localization text

* also unhardcode colors

* comment

* typo
2025-03-28 00:34:20 +01:00
PJBot
b38a341ac9 Automatic changelog update 2025-03-27 22:30:10 +00:00
metalgearsloth
948588399c
Mob movement rewrite (#35931)
* Conveyor optimisations

- Optimise movement for moving stuff. Better flags + less resolves + slapped parallelrobustjob on it.
- Sleeping for entities getting conveyed into walls.

* Blocker version

* Finish

* Final

* Fix conveyor power mispredict

* Bagel save

* Revert "Bagel save"

This reverts commit 1b93fda81fb852d89b89b0beae0b80f8a61165f2.

* Conveyor resave

* Fix prediction

* Mob movement rewrite

* Bandaid

* Working version

* Tentatively working

* Friction to fix cornering

* More fixes

* Revert bagel

* Revert this

* a

* Reviewed

* Funky re-save

* Fix velocity

* Table fix

* Review

* a
2025-03-28 09:29:02 +11:00
PJBot
e98df217e2 Automatic changelog update 2025-03-27 17:44:04 +00:00
lzk
8f049f174d
make admin interacts with storages silent (#35417)
* make admin interacts with storages silent

* review

* silent insert and transfer

* i love code

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-03-27 18:42:57 +01:00
Vigers Ray
84c607c84a Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Server/Ghost/GhostSystem.cs
#	Resources/Locale/en-US/_strings/administration/antag.ftl
#	Resources/Locale/en-US/_strings/administration/commands/adminnotes.ftl
#	Resources/Locale/en-US/_strings/construction/components/block-anchor-component.ftl
#	Resources/Locale/en-US/_strings/power/commands.ftl
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png
2025-03-27 20:37:49 +03:00
PJBot
f9320aacd7 Automatic changelog update 2025-03-27 17:20:43 +00:00
SlamBamActionman
5c505958a7
Add a new poster (#36104)
* Poster

* THAT tortilla...

* roombareview
2025-03-27 18:19:36 +01:00
Chaoticaa
db65e3241e
Updates to Hydroponic sprites (#35004)
* changes to some hydroponics plant sprites

* tomato changes

* added tomatoes and further changes

* added tomatoes and adjustments

* added tomatoes and adjustments

* added apples and meatwheat

* watermelon + adjustments

* sugarcane

* blood tomatoes & pumpkin harvest

* final changes for a while

* poppy harvest repaint

* smoller melon + holy melon stages

* final changes + attributions added to json files

* oops

* changes

* changes x2

* egg success + tree changes and additions

* bagel mistake

* lemon lime garlic fly

* grapes and stuff

* Potate

* peas and attributes

* more veg while my monitor flashbangs me repeatedly trying to find source links

* soyyyyyyy

* eggplant and berries yuuumm

* corn life

* grape disaster

* my computer is slow

* Pray

---------

Co-authored-by: Your Name <[you@example.com])>
Co-authored-by: beck-thompson <beck314159@hotmail.com>
2025-03-27 10:11:02 -07:00
PJBot
56e0cb642a Automatic changelog update 2025-03-27 17:05:33 +00:00
slarticodefast
7c44038f63
Add paradox clone to admin antag control (#36105)
* make paradox clone receive the original's objectives

* antag control verb

* rename verb
2025-03-27 10:04:25 -07:00
PJBot
f4adb0bdb3 Automatic changelog update 2025-03-27 06:27:21 +00:00
Centronias
f45794002b
Raw meatball cooks into cooked meatball (#36003)
meatballs can be cooked on their own
2025-03-26 23:26:13 -07:00
metalgearsloth
da2c9510b2
Update submodule to v250.0.0 (#36108) 2025-03-27 15:29:14 +11:00
Errant
e4a5043d4e
Overlay stack sorting fix (#36103)
* round float before sorting

* weh
2025-03-26 21:40:13 +01:00
ScarKy0
5bedf1761a
1984 the unsafe gift from smuggler stashes (#36102)
1984
2025-03-26 20:42:08 +01:00
Tayrtahn
bf17f85ced
Cleanup AdminVerbSystem (#36099)
* Fix 3 warnings in AdminVerbSystem.Tools

* Fix 3 warnings in AdminVerbSystem.Smites

* Use SetMapCoordinates directly
2025-03-26 19:36:29 +01:00
PJBot
18cc899897 Automatic changelog update 2025-03-26 16:14:09 +00:00
slarticodefast
c8494dd5c9
Improve paradox clone item copying (#35993)
* even better item copying for the paradox clone

* copy paper

* fix

* blacklist implanter

* string.Empty

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-03-26 17:13:02 +01:00
PJBot
f31a568ccc Automatic changelog update 2025-03-26 15:35:27 +00:00
slarticodefast
f838e6730d
Fix faction icons for paradox clones (#35910)
* fix nukie icon

* add revs to cloning pod again
2025-03-26 16:34:17 +01:00
PJBot
e066dd3abe Automatic changelog update 2025-03-26 15:31:21 +00:00
slarticodefast
9ff43f344e
Show paradox clones in deadchat (#35940)
show clones in deadchat
2025-03-26 16:30:14 +01:00
PJBot
6d63e3c1f4 Automatic changelog update 2025-03-26 15:21:22 +00:00
Velcroboy
b7b3167302
Add smuggler stashes (#19460)
* Add smuggler stashes

* Prevent anchor/collision test fail

* Enabled = false

* Oops, missed one

* NYAH!1984

* Split/Rebalance loot pools and fix test fail

* Errg, still with the canCollide thing

* Removed notes, additional balance tweaking, removed some blank lines

* Replace generator IDs

* Adjust briefcase fill

* Node moved

* Use noSpawn

* Goldschlonger

* Adjusts fills for grid-inv

* Replace removed items

* Replace removed items part 2

* Add empty satchel to clothesmate contraband inventory

* Merge master and switch spawning to roundstart event

* Cleaned up and converted to entity spawn tables + Added funny clown satchel

* Adds comp to prevent stacking bags

* Inital cleanup

* More changes

* ff

* Some fixes but yaml needs to be organized and a few bugs remain

* Final fixes

* Cleanup

* good

* One more

* minor tweaks

* Rename

* Combine dupe fields

* address review

* review

* make linter happy

* names, contraband status

* uplink

* small bugfix

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: beck-thompson <beck314159@hotmail.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-03-26 16:20:15 +01:00
Tayrtahn
9b28aedbc5
Cleanup TabletopSystem.Map (#36097)
* Add SharedMapSystem dependency

* IMapManager.MapExists -> SharedMapSystem.MapExists

* IMapManager.CreateMap & IMapManager.GetMapEntityId -> SharedMapSystem.CreateMap

* IMapManager.DeleteMap -> SharedMapSystem.DeleteMap

* Remove IMapManager dependency
2025-03-26 15:17:28 +01:00
Milon
b97de9d603
add predicted popups with PVS filtering (#36092)
add
2025-03-26 12:45:29 +01:00
Errant
2f30fe3ceb
adminnotes command cleanup (#36086)
localize adminnotes command, autocomplete
2025-03-25 22:42:17 -07:00