Commit graph

8974 commits

Author SHA1 Message Date
Vigers Ray
d4aa4a9b34 фикс итогов разумной болезни. 2024-12-31 10:30:55 +03:00
Vigers Ray
ab3aaca605 Фикс доступа синдиката у карты агента 2024-12-31 10:30:12 +03:00
Vigers Ray
e124be5ac5 допустим 2024-12-31 06:10:44 +03:00
Vigers Ray
650bc1b33a Фикс действий 2024-12-31 05:54:49 +03:00
Vigers Ray
3c4b484362 HolidayClothingSwap для новогодних замен спрайтов одежды 2024-12-30 01:11:08 +03:00
Vigers Ray
036210f952 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-29 19:02:59 +03:00
chromiumboy
6c465153ab
UI improvements for holopads (#34055)
* Initial commit

* Minor update
2024-12-29 00:33:15 +01:00
Vigers Ray
1c41206802 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
#	Resources/Locale/en-US/_strings/actions/actions/wagging.ftl
2024-12-28 19:43:59 +03:00
psykana
616d34102b
Traitor can no longer get multiple objectives to save/help/kill the same person (#33704)
* Deduplicate traitor objectives

* Remove redundant check
2024-12-28 15:49:03 +01:00
Vigers Ray
cb00121117 Блядь, проебался с блокировкой описания. Добавил лимит клиенту 2024-12-28 07:29:15 +03:00
Vigers Ray
42841c0246 Описания для спонсоров 2024-12-28 05:31:26 +03:00
Babaev
cdeac2eb40
фикс зомби мехов (#948) 2024-12-28 01:40:21 +03:00
Vigers Ray
49c8596983 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-27 19:09:06 +03:00
Vigers Ray
411fffc5f5 фикс вигерс систем 2024-12-27 19:08:47 +03:00
Babaev
edeb09c3a1
фикс суперматерии (#946) 2024-12-27 18:45:58 +03:00
crazybrain23
34e9979dc5
Arrivals blacklist for bluespace lockers and QSIs (#34072)
* Ensure Arrivals Blacklist in Bluespace Locker rule

* While I'm at it, stop the QSI too

* fix thing I broke somehow

* Every bluespace locker arrivals blacklisted

* Add ArrivalsBlacklist to the prototypes too
2024-12-27 13:34:30 +01:00
Vigers Ray
4252733127 вы будете англичанами 2024-12-27 07:39:41 +03:00
Svinthefirst
20166104cc
Александар fixes (#937)
* Александар fixes

* using fix

* duplicated line fix
2024-12-27 00:41:39 +03:00
Vigers Ray
b8229ad40b Доработки прыжков и бхопа 2024-12-27 00:38:52 +03:00
Svinthefirst
091c73129c
Свиноматерь (#928)
* init

* fixes

* fixes

* balance changes

* saw added

* some fixes
facecast added

* sunrise marking fixes
added forgotten not versioned files from last commit

* space

* minor refactoring

* facecast box added
minor fixes

* minor fixes
added forgotten non versioned files from last commit

* balance changes

* merge conflicts resolved

* ftl fixea

* balance changes
2024-12-26 06:40:12 +03:00
Vigers Ray
80f2ef3e2e фикс HolidayGiveawayItem 2024-12-26 06:33:03 +03:00
Vigers Ray
eab23ce60f Доработка прыжков и сальто 2024-12-26 05:42:35 +03:00
Vigers Ray
10d04fffe3 Каждый тысячный прыжок или сальто - перелом шеи 2024-12-25 04:15:35 +03:00
Vigers Ray
4e6dbed549 Прыжки на пробел (боже зачем) 2024-12-25 03:29:18 +03:00
Vigers Ray
5208b1d9e6 Твики следов 2024-12-25 03:20:26 +03:00
haiwwkes
5192d120ea
Новая панель эмоутов. (#891)
* wacky

* work

* work

* work

* work

* eff

* a
2024-12-24 23:27:09 +03:00
Vigers Ray
d8547bf089 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-24 03:31:44 +03:00
Pieter-Jan Briers
285e9349b6
Fix race condition causing disconnected admins to appear in adminwho (#34033) 2024-12-24 11:18:31 +11:00
Vigers Ray
b360dd1ecb Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-24 02:49:28 +03:00
Vigers Ray
d18d556d59 упс 2024-12-24 01:49:16 +03:00
amatwiedle
b82605b185
Fix borgs being able to drink from buckets and spray bottles. (#32964)
* Added a check for if the entity trying to drink is a borg.

* Fixed missing namespace issue.

* Improved code conciseness.

* Removed borg chassis check, added stomach check.

* Removed unused namespace

---------

Co-authored-by: dankeaj <andrewjdanke@gmail.com>
2024-12-23 13:54:18 -06:00
Vigers Ray
0a8d60fd19 Наныли 2024-12-23 21:07:10 +03:00
Vigers Ray
b56448c3b6
Обновление спонсорской системы (#905)
* Апдейт спонсорки

* Доработка апдейта

* упс
2024-12-23 20:45:39 +03:00
Babaev
a52a2ad48c
фикс лимита (#903) 2024-12-22 22:14:11 +03:00
Vigers Ray
0e0aa04d11 Фикс IsCommandStaff 2024-12-21 20:12:38 +03:00
Vigers Ray
6bd2ed8d33 фиксы апстрима 2024-12-21 19:38:17 +03:00
Vigers Ray
0619ac9206 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	.github/workflows/build-test-debug.yml
#	Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
#	Content.Server/Zombies/ZombieSystem.cs
#	Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
#	Resources/Locale/en-US/_strings/atmos/gases.ftl
#	Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl
#	Resources/Locale/en-US/_strings/tools/components/tool-component.ftl
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Research/industrial.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/ai_factions.yml
#	Resources/toolshedEngineCommandPerms.yml
2024-12-21 18:51:37 +03:00
Babaev
c8926e230e
Update GameTicker.GamePreset.cs (#888) 2024-12-21 18:12:21 +03:00
DragonDidlo
9118217bce
Доступы для Мехов и Патрульный Под (#883)
* Mech Access and Sec Pod

* fix shit
2024-12-21 18:06:32 +03:00
Leon Friedrich
06e2bba8ab
Toolshed refactor (#33598)
* Content changes for engine toolshed PR

* add contains command

* more permissive commands
2024-12-21 17:45:48 +11:00
metalgearsloth
9f4aa1ebe0
Implement some field-level deltas (#28242)
* Update GasTileOverlayState

* Update DecalGridState

* Update NavMapState

* poke

* poke2

* poke3

* Implement field deltas for guns

* Content done

* Update

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2024-12-21 15:54:11 +11:00
ScarKy0
03a54e90f5
Increase syndicate uplink discount amount to 6. (#33950)
* Increase uplink discounts from 3 to 7

* nevermind, 6
2024-12-20 20:14:08 -06:00
beck-thompson
a0a405768a
Add clearer defib cooldowns! (#31251)
* First commit

* Fix silly test

* Swiched stuff up

* Update Content.Shared/Medical/DefibrillatorComponent.cs

* remove unneeded visuals

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-20 22:26:56 +01:00
chromiumboy
39600f9516
Minor fixes for the holopad (#33969)
Initial commit
2024-12-20 13:51:00 +03:00
chromiumboy
209c1769ee
Tweaks for the holopad (#33928)
* Initial commit

* AIs get a warning when trying to answer long distance calls

* Better handling of ending telephone calls

* Fixed issue with duplicated holopad window when an AI answers a summons

* Changed how ranges are handled, added the bluespace holopad

* Bug fixes

* More bug fixes

* More bug fixes

* Update Resources/Prototypes/Entities/Structures/Machines/holopad.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Structures/Machines/holopad.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-19 18:20:20 +01:00
Centronias
128721ee4e
Logic Gate Compatibility with Non-Logic Signals bugfix (#33792)
:)
2024-12-19 12:31:13 +01:00
ArtisticRoomba
9de569d973
Show battery level for selected devices in Power Monitoring Console (#33854)
* Use class instead of out variables

* Show battery level in power monitoring console

* Better color contrast for battery level + localized string

* Add visualization to battery percentage

* Reverts random ChatSystem.cs whitespace change

* Address review

* Show BatteryLevel stats in child view when selecting devices

---------

Co-authored-by: Crotalus <crotalus@users.noreply.github.com>
2024-12-19 01:46:36 +01:00
Vigers Ray
71ede86a8d Фиксы сохранения карт 2024-12-19 02:15:56 +03:00
Ed
18fe8b9df0
Sprite Movement working with AI movement (#33494)
* FINALLY

* Update animals.yml
2024-12-18 17:15:34 +01:00
slarticodefast
e7294bdf4f
Only disable panicbunker for admins with AdminFlags.Admin (#33879)
* Only disable panicbunker for admins with AdminFlags.Admin

* nicer curly braces
2024-12-18 14:15:04 +01:00