Skip to content

Commit

Permalink
requested changes
Browse files Browse the repository at this point in the history
  • Loading branch information
realforest2001 committed Jun 25, 2023
1 parent 52a33f7 commit d7673bc
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
26 changes: 14 additions & 12 deletions code/game/machinery/ARES/ARES_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ GLOBAL_DATUM_INIT(ares_link, /datum/ares_link, new)
if(operable()) // Powered. Console can response.
visible_message("[SPAN_BOLD("[src]")] states, \"AUTH LOGOUT: Session end confirmed.\"")
else
to_chat(usr, "You remove \the [authenticator_id] from \the [src].")
to_chat(usr, "You remove [authenticator_id] from [src].")
ticket_authenticated = FALSE // No card - no access
authenticator_id = null

Expand All @@ -598,38 +598,40 @@ GLOBAL_DATUM_INIT(ares_link, /datum/ares_link, new)
if(!usr.get_active_hand() && istype(usr,/mob/living/carbon/human))
usr.put_in_hands(target_id)
else
to_chat(usr, "You remove \the [target_id] from \the [src].")
to_chat(usr, "You remove [target_id] from [src].")
target_id = null

else
to_chat(usr, "There is nothing to remove from the console.")
return

/obj/structure/machinery/computer/working_joe/attackby(obj/O, mob/user)
if(istype(O, /obj/item/card/id))
/obj/structure/machinery/computer/working_joe/attackby(obj/object, mob/user)
if(istype(object, /obj/item/card/id))
if(!operable())
to_chat(user, SPAN_NOTICE("You tried to inject \the [O] but \the [src] remains silent."))
to_chat(user, SPAN_NOTICE("You try to insert [object] but [src] remains silent."))
return
var/obj/item/card/id/idcard = O
var/obj/item/card/id/idcard = object
if((ACCESS_MARINE_AI in idcard.access) || (ACCESS_ARES_DEBUG in idcard.access))
if(!authenticator_id)
if(user.drop_held_item())
O.forceMove(src)
authenticator_id = O
object.forceMove(src)
authenticator_id = object
authenticate(authenticator_id)
else if(!target_id)
if(user.drop_held_item())
O.forceMove(src)
target_id = O
object.forceMove(src)
target_id = object
else
to_chat(user, "Both slots are full already. Remove a card first.")
return
else
if(!target_id)
if(user.drop_held_item())
O.forceMove(src)
target_id = O
object.forceMove(src)
target_id = object
else
to_chat(user, "Both slots are full already. Remove a card first.")
return
else
..()

Expand Down
2 changes: 1 addition & 1 deletion maps/map_files/USS_Almayer/USS_Almayer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -42189,7 +42189,7 @@
unacidable = 1;
unslashable = 1;
indestructible = 1;
desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs. This one has a metail rail running above it, preventing something large passing over. Like you."
desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs. This one has a metal rail running above it, preventing something large passing over. Like you."
},
/turf/open/floor/almayer/no_build{
icon_state = "ai_floors"
Expand Down

0 comments on commit d7673bc

Please sign in to comment.