Commit graph

8922 commits

Author SHA1 Message Date
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
Vigers Ray
71ede86a8d Фиксы сохранения карт 2024-12-19 02:15:56 +03:00
Vigers Ray
009b28bb09 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/migration.yml
2024-12-16 23:44:23 +03:00
beck-thompson
74e9576e66
Figures can now be activated remotely (#32769)
* First commit

* I'm silly

* weh

* will this work?

* Better design

* Fixes!

* rider :(

* L rider
2024-12-16 19:52:09 +01:00
Vigers Ray
2340dabe4b Бля еще раз говно 2024-12-16 21:43:30 +03:00
Vigers Ray
4b91629832 Вигерс не умеет в простую логику 2024-12-16 20:06:22 +03:00
Vigers Ray
28484c893c Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Damage/modifier_sets.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
#	Resources/migration.yml
2024-12-16 18:50:05 +03:00
Vigers Ray
540f264f4a фикс революции 2024-12-16 18:37:43 +03:00
Vigers Ray
e938379766 Фикс AntagSelectionSystem.cs 2024-12-16 18:33:35 +03:00
deathride58
d8afcdcdf0
Makes admins not count towards the playercount cap (#33424)
* Makes admins not count towards the playercount cap

* Update Content.Shared/CCVar/CCVars.Admin.cs (thx Aeshus

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Actually fixes whitespace on the comments
Thanks VScode very good IDE

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
2024-12-16 17:19:15 +03:00
Preston Smith
01c1d8f824
Prevent pulling when teleporting (#33252)
* No more teleporting pulling

* pulled dash

* Update Content.Shared/Ninja/Systems/DashAbilitySystem.cs

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

* Update Content.Server/Implants/SubdermalImplantSystem.cs

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-16 17:09:17 +03:00
Baa
1f42413416
Fix udder wooly reagent creation V2 (#32905)
* Changed comments to be more clear and uniform.
EggLayer uses NextGrowth instead of frame accumulation.
Egglayer uses much less energy to make eggs, and lay time is randomized for player and AI chicken.

* UdderComponent ReagentId can be changed now
UdderSystem and WoolySystem use SharedSolutionContainerSystem now

* Entities with udders can be examined to see a rough hunger level
udders and wooly stop reagent generation/extra nutrient usage once the solution container is full

* Moved stuff to Shared
AutoPausedField now

* Cleanup moving stuff to Shared

* Oops. Make UdderSystem sealed instead of abstract.

* Switch PopupEntity for PopupClient

* Didn't mean to delete Access

* new() instead of default! prototype
revert egglayer balance change
NextGrowth += timespan   in egglayer

* forgot [Datafield] for NextGrowth

* forgot NetworkedComponent again...

* Renaming Shared Animal to Shared Animals to match Server
Hopefully also resolve merge conflicts.

* Fix incorrect filename

* Update with requested changes
Put UdderSystem dependencies in alphabetical order.
Initialise NextGrowth for Udder and Wooly components on MapInitEvent.
Clean-up EggLayerSystem a little.
Re-write OnExamine function for UdderSystem, improving clarity.
Add full stops to end of udder examine locales.
And more :)

* Add some additional descriptions for cow hunger levels.

* Add Udder and Wooly quantity to AutoNetworkedField

* Account for less than starving threshold.

---------

Co-authored-by: sirionaut <sirionaut@gmail.com>
Co-authored-by: Sirionaut <148076704+Sirionaut@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-12-16 13:53:21 +01:00
deltanedas
2635888b6a
add SpawnTableOnUse (#32620)
* add SpawnTableOnUse

* make BaseEmitSound more flexible and remove sound from spawntable

* add log

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-12-16 15:23:14 +03:00
Plykiya
a4d6f09a4f
Cluster grenade refactor and contra markings (#31108)
* Cluster grenade refactor

* oopsies on the name

* Solve client-side errors

* reviews addressed

* filling scattering grenades is now predicted

* reviews addressed
2024-12-16 13:08:07 +01:00
Vigers Ray
ee47475c69 Шанс на запуск голосования за режим - 50% 2024-12-16 00:07:22 +03:00
Vigers Ray
43eaa6d9f8 фикс глав предателей в лейтджоине 2024-12-15 23:22:00 +03:00
Vigers Ray
273746cb38 Максимум 1 глава предатель и фикс нулевых зомби 2024-12-15 16:26:24 +03:00
haiwwkes
9cbb3c3d14
уже не надо (#856) 2024-12-15 13:24:30 +03:00
lunarica
00dc0382f9 alt-switching 2024-12-15 14:28:04 +05:00
Vigers Ray
4fac0d3ff1 фикс дублирования дохлых ролей 2024-12-14 21:25:55 +03:00
Vigers Ray
6f1366814f Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
2024-12-14 21:22:31 +03:00
Nim
df7b9d1e04
Other colour of the binary channel (#33841)
* radio

* color 2

* console-announcement

* 5ed7aa
2024-12-14 17:03:18 +01:00
lzk
115b3e0519
Increase war ops evac time (#33628) 2024-12-12 21:10:20 -06:00
Vigers Ray
da19a63c83 Фикс спавна за нежелаемые роли 2024-12-13 03:36:48 +03:00
Vigers Ray
2fd4797159 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/ServerInfo/Guidebook/Science/APE.xml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
2024-12-13 02:10:38 +03:00
Vigers Ray
572830e879 Merge remote-tracking branch 'origin/master' 2024-12-13 02:09:12 +03:00
Vigers Ray
60ed11501b Фикс яо 2024-12-12 22:19:31 +03:00
Rinary
aedefceb38 some fixes 2024-12-12 21:15:43 +02:00
Rinary
b656c66270 update gargantua abilities 2024-12-12 21:13:35 +02:00
Rinary
3fb8df3305 add unholy strenght as action
(cherry picked from commit 42fbf815002fd5c6e54834d38767ec3c5abacc53)
2024-12-12 20:52:56 +02:00
Rinary
f0fc53fb13 debaff lightning 2024-12-12 20:52:44 +02:00
Rinary
cdb8b870b4 refactor to net entity
(cherry picked from commit eaf2d9d49732e4723346000cf8b6d8545760cbee)
2024-12-12 20:49:53 +02:00
Rinary
b99f4c2d61 second 2024-12-12 20:48:50 +02:00
Rinary
84a1d573f0 init 2024-12-12 20:43:10 +02:00
lzk
18322ec76f
fix ghost command error string (#33838) 2024-12-12 11:18:53 -05:00
Vigers Ray
d326baa2c9 фикс абуза команды ghost 2024-12-12 02:59:38 +03:00
Vigers Ray
7c376e48f1 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
2024-12-12 02:27:31 +03:00
Vigers Ray
f3c8dbf9b7 Убрал возможность по мете использовать призрака. 2024-12-12 02:24:54 +03:00
Vigers Ray
59e82effc8 фикс зеков 2024-12-12 02:21:53 +03:00
Vigers Ray
63f0b07083 Вероятно уже не надо 2024-12-12 01:06:32 +03:00
Vigers Ray
96a2e04bd9 фикс липких следов 2024-12-12 01:03:02 +03:00
Vigers Ray
f7b65c97c7 фикс побега зеков 2024-12-12 00:19:59 +03:00
BramvanZijp
ce9fc82382
Rework the HoS's Energy Shotgun (Varying energy consumption depending on fire-mode + re-adds a toned down self recharge.) (#32104)
* Rebalance HoS's Energy Shotgun

* SLIGHTLY Up the max charge so the gun properly recharges all of its charges, which matters a lot more with the self charge cooldown system.

* Prevent recharge cooldown if 0 power is used.

* Makes the clientside HUD actually update to reflect the changes in firecost and thus max/current charges.

* Properly fix that recharging to just under full issue instead of applying a budget fix to only the eshotgun.

* Clean up the client ammo UI fix.

* Update the self recharger component to comply with maintainer request.

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

* Remove code that was made redundant by a hotfix from another PR.

* Make the recharge pause on EMP, document things where needed, clean up code as per maintainer request, add a note to make the code better when power is moved to shared.

* Fix another internal issue

* Code cleanup + fix the rapid recharge verb to remove pause.

* cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-12-11 17:21:04 +01:00
Vigers Ray
1e38dbb7df Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
2024-12-11 18:58:14 +03:00
Vigers Ray
ba02c5db47
Merge pull request #825 from Odleer/atmos3
Хилиум и БЗ
2024-12-11 18:55:48 +03:00
Vigers Ray
925ade605b Фикс эвака 2024-12-11 18:53:41 +03:00
slarticodefast
c28f4fdc7f
Fix greytide virus hitting other maps (#33806)
fix greytide virus hitting other maps
2024-12-11 15:30:29 +01:00
Odleer
93460d8141 Хилиум 2024-12-11 18:58:25 +05:00
TGRCDev
89522e7144
Made anchor visuals generic (#33810)
Added a generic anchor visuals enum
2024-12-11 14:50:20 +01:00