Vigers Ray
16d87dbfdc
убрал славную смерть
2024-12-15 16:27:01 +03:00
Vigers Ray
273746cb38
Максимум 1 глава предатель и фикс нулевых зомби
2024-12-15 16:26:24 +03:00
RaMbUt878
072ee5e0f8
Глава Персонала, КМ, НР, ГВ, СИ - Могут стать антагонистами ( #858 )
2024-12-15 16:05:24 +03:00
KaiserMaus
638201e1ce
Убрал Оазис из маппула ( #848 )
2024-12-15 15:27:25 +03:00
haiwwkes
b9d5f934aa
fix hiss spam in chat ( #857 )
2024-12-15 15:27:07 +03:00
Odleer
c3e4d387ac
Корона Сингуло ( #849 )
2024-12-15 13:24:43 +03:00
Vigers Ray
40d318cd2b
Merge remote-tracking branch 'origin/master'
2024-12-15 10:55:52 +03:00
Vigers Ray
84bfe8cda6
Merge pull request #246 from space-sunrise/casual
...
Оказуаливание геймплея
2024-12-15 10:49:39 +03:00
Vigers Ray
dee33c81aa
Вернул стандартное значение блокировки вентиляции
2024-12-15 10:41:21 +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
Vigers Ray
dd97b529bb
Merge pull request #837 from KaiserMaus/Changelings
...
Made Changeling Greate Again!
2024-12-14 21:04:46 +03:00
Vigers Ray
07f09504cb
Merge pull request #835 from KaiserMaus/Mech-Paint
...
Mech Tweaks, Weapons Tweaks, Ressearch Tweaks.
2024-12-14 20:59:46 +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
KaiserMaus
c889065cf1
No Festive state
2024-12-14 10:21:16 +00:00
Vigers Ray
617e2eac4d
АААААСУЖДАЮ
2024-12-14 10:04:36 +03:00
godisdeadLOL
06071a5d8a
Secret stash wrench anchoring fix ( #31779 )
...
* secret stash wrench fix
* fix
* cleanup
---------
Co-authored-by: YourUsername <you@example.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-14 00:00:45 +01:00
KaiserMaus
61de9a62e9
Линтер иди от сюдова
2024-12-13 14:23:32 +00:00
KaiserMaus
faddf99f48
Special for Nuke
2024-12-13 14:17:36 +00:00
KaiserMaus
5180fe4097
NT cell in NT Dome
2024-12-13 14:15:21 +00:00
KaiserMaus
a3a9da4788
Уэээ Линтер
2024-12-13 13:56:50 +00:00
LevitatingTree
b46f487503
Add meat tag to Five Alarm Burger ( #33848 )
...
* Add meat tag to Five Alarm Burger
* Revert "Add meat tag to Five Alarm Burger"
This reverts commit e483b5effe63a8cbdcce81eeddc622f5555ae240.
* Re-add tag, but in notepad
* Move tag down to follow hierarchy
---------
Co-authored-by: LevitatingTree <None>
2024-12-13 14:53:56 +01:00
KaiserMaus
db72c8a03c
Changeling
2024-12-13 13:40:03 +00:00
KaiserMaus
6244d18f8c
Merge branch 'space-sunrise:master' into Mech-Paint
2024-12-13 11:21:58 +00:00
KaiserMaus
8b8f88037e
Fix desc
2024-12-13 11:08:07 +00:00
KaiserMaus
a905de4e1a
Мяулер!
2024-12-13 11:01:04 +00:00
KaiserMaus
a3efab22f4
Cell
2024-12-13 10:51:05 +00:00
KaiserMaus
aea1b05c61
Fix Linter
2024-12-13 10:27:35 +00:00
Vigers Ray
da19a63c83
Фикс спавна за нежелаемые роли
2024-12-13 03:36:48 +03:00
Vigers Ray
572830e879
Merge remote-tracking branch 'origin/master'
2024-12-13 02:09:12 +03:00
KaiserMaus
a073256ee0
oops
2024-12-12 22:43:15 +00:00
Rinary
5a12200942
some fixes
2024-12-12 21:22:45 +02:00
Vigers Ray
09d54569b0
Merge remote-tracking branch 'origin/master'
2024-12-12 22:21:46 +03:00
Vigers Ray
60ed11501b
Фикс яо
2024-12-12 22:19:31 +03: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
KaiserMaus
b9328d5054
Merge branch 'Mech-Paint' of https://github.com/KaiserMaus/space-station-14 into Mech-Paint
2024-12-12 17:35:35 +00:00
KaiserMaus
e528643d7d
Meowler
2024-12-12 17:30:21 +00:00
Vigers Ray
715aa863f4
Merge pull request #826 from KaiserMaus/Weapon-Balance
...
Нерф зажиг, Бафф простых Револьверов.
2024-12-12 03:48:14 +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
96a2e04bd9
фикс липких следов
2024-12-12 01:03:02 +03:00
Vigers Ray
a76d8c34b5
Фикс станеров
2024-12-12 00:22:30 +03:00
banumbas
8ce9ab8a79
a
2024-12-11 23:30:19 +03:00
KaiserMaus
b7188144fe
Debuff
2024-12-11 19:38:01 +00:00
KaiserMaus
72db57c921
More Fire stack less damage
2024-12-11 17:41:30 +00:00
KaiserMaus
cd47c53739
HitScan Incendary debuff+Fix Weapon
2024-12-11 17:02:58 +00: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
1bcfa3af91
Фикс рендера трассеров с тикрейтом ниже 25
2024-12-11 18:51:29 +03:00
