Skip to content

Commit

Permalink
Merge pull request #297 from She-Is-Trying-To-Form-Her-First-Thought/…
Browse files Browse the repository at this point in the history
…jarvis

lets the modsuit pda app be linked to worn modsuits (with consent) (for entombed users) (fetishcoding)
  • Loading branch information
Nerev4r authored Dec 29, 2024
2 parents cf4e3af + 98d17e1 commit 2714ace
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
23 changes: 23 additions & 0 deletions modular_doppler/modsuit_pda_app/tap_to_control.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/datum/computer_file/program/maintenance/modsuit_control/tap(atom/tapped_atom, mob/living/user, params)
. = ..()

if(!ishuman(tapped_atom))
return
var/mob/living/carbon/human/john_modsuit = tapped_atom
for(var/obj/item/mod/control/target_suit in john_modsuit.contents)
if(!do_after(user, 5 SECONDS, john_modsuit))
return
var/response = tgui_alert(
john_modsuit,
"[user] is attempting to link their PDA to your MOD, [target_suit]. This gives them TOTAL control of your suit, do you let them?",
"Connection Attempt",
list(
"Connect",
"Refuse",
),
)
if(response == "Connect")
sync_modsuit(target_suit, user)
playsound(target_suit, 'sound/effects/industrial_scan/industrial_scan2.ogg', 50, TRUE)
else
return
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6844,6 +6844,7 @@
#include "modular_doppler\lore\overrides\station_traits\neutral_traits.dm"
#include "modular_doppler\lore\overrides\station_traits\positive_traits.dm"
#include "modular_doppler\loud_asay\code\loud_asay.dm"
#include "modular_doppler\modsuit_pda_app\tap_to_control.dm"
#include "modular_doppler\modular_antagonists\_dynamic_rulesets.dm"
#include "modular_doppler\modular_antagonists\changeling\changeling.dm"
#include "modular_doppler\modular_antagonists\datums\antag_recipes.dm"
Expand Down

0 comments on commit 2714ace

Please sign in to comment.