Skip to content

Commit

Permalink
maybe this works.
Browse files Browse the repository at this point in the history
  • Loading branch information
TheGamerdk committed Aug 16, 2023
1 parent fb1a4b1 commit e2a416d
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions code/modules/cm_marines/overwatch.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
to_chat(user, SPAN_WARNING("You don't have the training to use [src]."))
return

user.set_interaction(src)

tgui_interact(user)

/obj/structure/machinery/computer/overwatch/get_examine_text(mob/user)
Expand All @@ -95,7 +97,7 @@
return data

/obj/structure/machinery/computer/overwatch/tgui_interact(mob/user, datum/tgui/ui)
user.set_interaction(src)

if(!tacmap.map_holder)
var/level = SSmapping.levels_by_trait(tacmap.targeted_ztrait)
if(!level[1])
Expand Down Expand Up @@ -326,7 +328,9 @@

var/mob/user = usr

user.set_interaction(src)
if((user.contents.Find(src) || (in_range(src, user) && istype(loc, /turf))) || (ishighersilicon(user)))
user.set_interaction(src)

switch(action)
if("pick_squad")
if(current_squad)
Expand Down Expand Up @@ -859,9 +863,6 @@
/obj/structure/machinery/computer/overwatch/almayer/broken
name = "Broken Overwatch Console"

/obj/structure/machinery/computer/overwatch/almayer/broken/process()
return PROCESS_KILL

/obj/structure/machinery/computer/overwatch/clf
faction = FACTION_CLF
/obj/structure/machinery/computer/overwatch/upp
Expand Down

0 comments on commit e2a416d

Please sign in to comment.