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
Vigers Ray
4309b24a76
Фикс абуза автолатов
2024-12-11 05:00:09 +03:00
Vigers Ray
bdcb5a0982
Фикс спавна в дебаг сборке.
2024-12-11 04:56:18 +03:00
Vigers Ray
f2434c9fe7
пакабль блядь
2024-12-10 02:37:38 +03:00
Vigers Ray
aba216ebbb
Merge remote-tracking branch 'origin/master'
2024-12-10 02:35:42 +03:00
pacable
c250f52a46
maxcap ( #819 )
...
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-12-10 02:34:54 +03:00
Vigers Ray
220e264629
Фиксы и доработки следов
2024-12-10 02:33:09 +03:00
Vigers Ray
46d1ed8cc6
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/labeler.yml
# Content.Client/Lobby/LobbyUIController.cs
# Resources/Locale/en-US/_strings/movement/pulling.ftl
2024-12-09 23:32:58 +03:00
pacable
1c0704281c
Фикс следов ( #818 )
...
* fix следов
Signed-off-by: pacable <igor.mamaev1@gmail.com>
* asdfvzxcvz
Signed-off-by: pacable <igor.mamaev1@gmail.com>
---------
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-12-09 22:16:16 +03:00
Odleer
c195c9567e
БЗ и хилиум ( #808 )
...
* Готово
* Подправил цены
* Мини фикс
* Упростил
2024-12-09 22:07:58 +03:00
sleepyyapril
7fd89806e2
Fix Disposals Ejections ( #33468 )
...
* Fix disposals.
* Rename properly
---------
Co-authored-by: sleepyyapril <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>
2024-12-08 22:08:07 -06:00
Errant
d57e731635
Signal timer duration limit ( #33781 )
...
* max duration
* comment
2024-12-08 21:41:11 -06:00
slarticodefast
ede8a1d377
Fix gas pipe leaking when unanchoring or breaking them ( #33774 )
...
* fix gas pipe unanchoring
* remove unneeded update
* revert popup change
2024-12-09 00:20:04 +01:00
Pieter-Jan Briers
f9da25881d
Singularity equipment can now be activated with E interact ( #33762 )
...
These were coded to only listen to InteractHand, which doesn't follow our interaction model properly.
2024-12-08 23:37:32 +01:00
Vigers Ray
e24b72018f
Ой, бесконечные патроны.
2024-12-07 08:23:03 +03:00
Vigers Ray
bcd534952f
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/Names/arachnid_first.yml
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Prototypes/Datasets/Names/fake_human_first.yml
# Resources/Prototypes/Datasets/Names/fake_human_last.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Datasets/Names/vox.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Recipes/Lathes/mech_parts.yml
# Resources/ServerInfo/Guidebook/Mobs/Vox.xml
2024-12-07 07:45:07 +03:00
Vigers Ray
67a1903332
Смена клавиши для взаимодействия с затвором и магазинами
2024-12-07 07:40:41 +03:00
Vigers Ray
3ea76c6a45
Фикс осмотра урона боеприпасов и указание типа модификатора
2024-12-07 07:38:35 +03:00
