Commit graph

5346 commits

Author SHA1 Message Date
Vigers Ray
46ba4fbc5f Казуальные разгермы 2024-12-15 14:58:57 +03:00
Vigers Ray
8bee9142ee Хиллиум и БЗ в фильтры скрубберов 2024-12-15 13:49:55 +03:00
Vigers Ray
84bfe8cda6
Merge pull request #246 from space-sunrise/casual
Оказуаливание геймплея
2024-12-15 10:49:39 +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
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
db72c8a03c Changeling 2024-12-13 13:40:03 +00:00
Vigers Ray
da19a63c83 Фикс спавна за нежелаемые роли 2024-12-13 03:36:48 +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
cdb8b870b4 refactor to net entity
(cherry picked from commit eaf2d9d49732e4723346000cf8b6d8545760cbee)
2024-12-12 20:49:53 +02:00
Rinary
b438613a5d thierd 2024-12-12 20:49:23 +02:00
Rinary
b99f4c2d61 second 2024-12-12 20:48:50 +02:00
Rinary
84a1d573f0 init 2024-12-12 20:43:10 +02: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
96a2e04bd9 фикс липких следов 2024-12-12 01:03:02 +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
metalgearsloth
1a8e469c58
Fix battery self-recharge mispredicts (#33384) 2024-12-11 16:58:02 +01:00
TGRCDev
89522e7144
Made anchor visuals generic (#33810)
Added a generic anchor visuals enum
2024-12-11 14:50:20 +01:00
metalgearsloth
2b487baea0
Fix blank newline on empty examine groups (#33813)
Construction always grants a blank newline even if it not currently constructing.
2024-12-10 14:45:20 +01: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
Odleer
c195c9567e
БЗ и хилиум (#808)
* Готово

* Подправил цены

* Мини фикс

* Упростил
2024-12-09 22:07:58 +03:00
Plykiya
8f2b19e103
Popup when being pulled shows who is pulling you (#33612)
* Popup when being pulled

* Update Content.Shared/Movement/Pulling/Systems/PullingSystem.cs

Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>

* Update Resources/Locale/en-US/movement/pulling.ftl

Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>

---------

Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
2024-12-08 21:51:53 -06:00
Pieter-Jan Briers
299b13f21b
Give silicons proper lobby/character editor previews (#33763)
* Give silicons proper lobby/character editor previews

No more naked dummies, properly show a borg/AI sprite now.

This means taking the JobEntity into account when spawning the dummy. For AIs I had to add a "JobPreviewEntity" field because they'd look like a posibrain otherwise. AI therefore uses a custom dummy entity I defined.

Also I had to add some margins to the UI, because otherwise the 32x32 sprite of the AI would look bad.

* Update Content.Shared/Roles/JobPrototype.cs

* Update Content.Client/Lobby/LobbyUIController.cs

* Update Resources/Prototypes/Entities/Mobs/Player/silicon.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-08 02:46:41 +01:00
Vigers Ray
ff3038e763 Фикс робаста с шоковой дубинкой 2024-12-07 09:18:45 +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
Vigers Ray
db22b09c92 Еще кусок к суициду 2024-12-07 07:36:34 +03:00
Vigers Ray
c707a98283 еще кусок к фиксу суицида 2024-12-07 07:34:19 +03:00
Vigers Ray
3977d8ad2f Фиксы суицида 2024-12-07 07:33:48 +03:00
Vigers Ray
46b3ed5e8c Фикс револьверов и еще больше трассеров. 2024-12-07 07:28:15 +03:00
metalgearsloth
9365e3a99b
Predicted gas pumps (#33717)
* Predicted gas pumps

I wanted to try out atmos and first thing I found.

* a

* Remove details range
2024-12-07 14:39:52 +11:00
MilenVolf
b66fd98514
Localize ai dataset names (#33608)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-06 16:38:00 +01:00
0tito
de19418126
Add Sprite changes to Logic Gates to show the input/output state (#33277) 2024-12-06 16:35:48 +01:00
beck
6add781c4a
Added several variables to make ClumsyComponent more modular for developers. (#33715)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-06 16:31:31 +01:00
ScarKy0
274c3ab0b9
Derelict Borg Revival (#33433)
* Derelictn'tn't Borg!

* Clean *sparkles*

* Removed "S: Awaiting Changes"
2024-12-06 00:22:38 -06:00
Vigers Ray
6455ba2d7d Мини реворк системы следов 2024-12-05 20:34:00 +03:00
Vigers Ray
ff336595e7 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
2024-12-05 15:50:34 +03:00
Vigers Ray
8a06ab5f14 Фиксы рефлекта 2024-12-05 14:59:30 +03:00
Vigers Ray
27d04c106f Доработки хитскана 2024-12-05 14:54:08 +03:00
Vigers Ray
afebbddff1 Уменьшил частоту ЯО в голосованиях 2024-12-04 23:24:24 +03:00
keronshb
82528dce37
Adds Store on Collide and Wand of the Locker (#33710)
* Adds wand of locker and locker projectile

* Adds IsOpen method to check if storage is open

* Adds store on collide

* Adds Store On Collide to Wizard Locker

* Adds Lock API

* Adds locking support

* Adds resist override and custom visual layers

* Fixes decursed states, adds comment for a future visualizer

* adds locker wand visuals and descriptions

* shrinks locker radius, moves TODO for throw support

* Adds whitelist and moves storage and lock logic into their own methods

* Adds support to disable store on collide after the first open. Fixes prediction issues with disabling.

* Adds wand of locker to the grimoire

* Adds wizard access prototype

* Adds Wizard to universal access

* Moves Lock on collide to on collide method

* Comments

* Changes layer order

* Fixes prediction issues when locking.

* Adds Wiz access to universal ID
2024-12-04 17:49:54 +01:00
Vigers Ray
da303de374 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-04 07:34:54 +03:00
Partmedia
cf202e805d
Fix sinks and toilets not draining (#33691)
* Fix AutoDrain

Per the system comments, AutoDrain is designed to automatically move
puddles into the drain (like a floor drain). Drains without AutoDrain
are still supposed to gradually empty the buffer, but not remove puddles
(like sinks and toilets).

However, a logic error in the original implementation causes drains with
AutoDrain set to false to simply not work. Hence sinks never emptied.

* Update documentation
2024-12-04 03:42:16 +01:00
Vigers Ray
3eeeaaa05c
Реворк огнестрела под хитскан. (#755)
* Реворк огнестрела под хитскан

* борги на хитскане

* Анимация трассировки пули
2024-12-04 02:44:24 +03:00