Commit Graph

6 Commits

Author SHA1 Message Date
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
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
Nemanja
d87d8f2886 predict emag and make blessed record struct events (#13623) 2023-01-22 02:12:45 +11:00
Rane
6054c5bc53 Familiars respawn (#7640) 2022-04-23 19:27:19 -07:00
Leon Friedrich
4ad36f10e7 Fix two interaction prediction issues (#7356) 2022-03-31 18:08:30 +11:00
Rane
8049a709e6 Emags (#6738) 2022-02-17 19:43:24 -07:00