mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-10 06:34:45 +01:00
Fixes agent IDs not working when you are put into a different body (#21784)
* needs testing * okay this works * pinpointer fix * Steelslayer review * my bad, sorry
This commit is contained in:
@@ -410,10 +410,10 @@
|
||||
src.assignment = u
|
||||
src.name = "[src.registered_name]'s ID Card ([src.assignment])"
|
||||
to_chat(user, "<span class='notice'>You successfully forge the ID card.</span>")
|
||||
registered_user = user
|
||||
else if(!registered_user || registered_user == user)
|
||||
registered_user = user.mind.current
|
||||
else if(!registered_user || registered_user == user.mind.current)
|
||||
if(!registered_user)
|
||||
registered_user = user
|
||||
registered_user = user.mind.current
|
||||
|
||||
switch(alert(user,"Would you like to display \the [src] or edit it?","Choose","Show","Edit"))
|
||||
if("Show")
|
||||
@@ -652,6 +652,10 @@
|
||||
else
|
||||
..()
|
||||
|
||||
/obj/item/card/id/syndicate/Destroy()
|
||||
registered_user = null
|
||||
return ..()
|
||||
|
||||
/obj/item/card/id/syndicate_command
|
||||
name = "syndicate ID card"
|
||||
desc = "An ID straight from the Syndicate."
|
||||
|
||||
@@ -39,10 +39,10 @@
|
||||
|
||||
/obj/item/pinpointer/crew/contractor/attack_self(mob/living/user)
|
||||
if(owner)
|
||||
if(owner != user)
|
||||
if(owner != user.mind.current)
|
||||
to_chat(user, "<span class='warning'>[src] refuses to do anything.</span>")
|
||||
return
|
||||
else
|
||||
owner = user
|
||||
owner = user.mind.current
|
||||
to_chat(user, "<span class='notice'>[src] now recognizes you as its sole user.</span>")
|
||||
return ..()
|
||||
|
||||
Reference in New Issue
Block a user