13 Commits

Author SHA1 Message Date
ScarKy0
189ebe61ab Seperate EMAG into EMAG and Authentication Disruptor (#34337)
(cherry picked from commit 253a9fbdf1372f80dad65a80dcb8e5d169861804)
2025-09-20 20:34:13 +03:00
Spatison
c8d4fe1025 Revert "Split Emag in half (#1426)"
This reverts commit c0af9b33
2025-09-20 20:34:12 +03:00
Saphire
937cef62b8 Temporarily make singularity a bit harder to loose as non-antag (#33358)
Temporarily make singularity a bit harder to loose as non-antag

(cherry picked from commit a68c6cb29ea4a3e3d78e16c867366e488c699fff)

Fix Fluent string ID copypaste fail

(cherry picked from commit 01d6df3d0ace170438aae3931339be539bd8b38e)

Fix the component defaults

(cherry picked from commit 476f90df095502089d9f60ad59099f405be36cd2)

Bump the failsafe timer down

(cherry picked from commit 68eaf6ff254e49789696f5a79691c119e26cbb18)

Add emag functionality

(cherry picked from commit 6e53cd98a400466640586bf19b41ec281944795e)

Move some of the new singularity code into shared

Hopefully without explosions yay

(cherry picked from commit 9c666457c2c13505725b7d3c336cae50f0666460)

Actually make the emagging popup work properly

(cherry picked from commit 44db676b24c8781e3290d499c7233125d7789cf6)
2025-09-20 20:32:54 +03:00
DVONIKS
f6175b95ab Revert "[Fix/Tweak] Vendomats and smuggling (#621)" (#668)
This reverts commit 1ff67e0309.
2025-07-24 14:14:34 +10:00
RedBurningPhoenix
1ff67e0309 [Fix/Tweak] Vendomats and smuggling (#621)
* NoMoreFreeItems

* Okay

* Okak...

* attrib. + markings

* space

* OkakX2
2025-07-05 12:14:22 +10:00
WarMechanic
f656850a99 Split Emag in half (#1426)
* make changes

* fix yaml linter bug

* locales

* consolidations

* fix DeltaV comment appearing in uplink

* e

* Update emag.yml

Signed-off-by: WarMechanic <69510347+WarMechanic@users.noreply.github.com>

* emag invalid target locale

* change id 'airlockaccessoverride' to 'doorjack'

* name consolidations + doorjack sprite

* Update Resources/Locale/en-US/deltav/store/uplink-catalog.ftl

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: WarMechanic <69510347+WarMechanic@users.noreply.github.com>

* Update Resources/Locale/en-US/store/uplink-catalog.ftl

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: WarMechanic <69510347+WarMechanic@users.noreply.github.com>

* Update Resources/Locale/en-US/emag/emag.ftl

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: WarMechanic <69510347+WarMechanic@users.noreply.github.com>

* Update Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: WarMechanic <69510347+WarMechanic@users.noreply.github.com>

* Update Resources/Prototypes/DeltaV/Entities/Objects/Tools/emag.yml

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: WarMechanic <69510347+WarMechanic@users.noreply.github.com>

* deltanedas

---------

Signed-off-by: WarMechanic <69510347+WarMechanic@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>

(cherry picked from commit c0af9b33761de17bb72207b337809fc20c10687c)
2025-02-05 18:27:32 +03:00
Arendian
e36dd93b60 Fix borg becoming emag immune if emag attempted with panel closed. (#23729)
* Fix borg becoming emag immune if emag attempted with panel closed.

* new event

* removed code added in accessreader

* fix emag 1984

(cherry picked from commit 23e714e523f18ffe5c4a2e1e2186142371dbf0bb)
2024-01-26 22:26:05 +01:00
deltanedas
24810d916b ninja 2 electric boogaloo (#15534)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:20:27 +10:00
deltanedas
6ddd8761a9 emag refactor (#15181)
* limitedcharges stuff from emag

* changes except broken

* fix

* the

* move recharging to server, emag namespace -> charges

* the

* use resolve

* pro

webedit gaming

* the

* the

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-18 22:46:00 -07:00
deltanedas
e0cfc42360 only add emag component if the event was handled (#14627)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-03-15 19:19:08 -07:00
Nemanja
13d71f14e2 add support for per-id access on AccessReaderComponent (#13659)
* add support for per-id access on AccessReaderComponent

* comments!!!

* oh yeah we predicting baby

* foobar

* sloth review

* weh
2023-02-28 08:03:55 -08:00
deltanedas
98b02b3d97 make emagged marker component (fixed version of #13867) (#14096)
* The all-in-one hacking solution
The thinking man's lockpick
The iconic EMAG

* emagged medbay's stasis bed

* left med, emagged sec' apc

* went back to chem, emagged the dispenser

* emagged the fax while i was there

* had a donut while waiting for emag to charge

* i broke into the bridge then announced 'mandatory johnson inspection in medical'

* get system instead of dependency

* feedback

* net suggestion

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* use EnsureComp and import NetworkedComponent

---------

Co-authored-by: deltanedas <user@zenith>
Co-authored-by: deltanedas <deltanedas@laptop>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-02-18 19:03:06 -06:00
Nemanja
d87d8f2886 predict emag and make blessed record struct events (#13623) 2023-01-22 02:12:45 +11:00