Merge pull request #768 from CHOMPStationBot/upstream-merge-9257

[MIRROR] This is *not* what _onclick is for FFS

code/_onclick/observer_vr.dm

@@ -1,21 +0,0 @@
-/obj/item/device/paicard/attack_ghost(mob/user as mob)
-	if(src.pai != null) //Have a person in them already?
-		user.examinate(src)
-		return
-	var/choice = input(user, "You sure you want to inhabit this PAI?") in list("Yes", "No")
-	var/pai_name = input(user, "Choose your character's name", "Character Name") as text
-	var/actual_pai_name = sanitize_name(pai_name)
-	var/pai_key
-	if (isnull(pai_name))
-		return
-	if(choice == "Yes")
-		pai_key = user.key
-	else
-		return
-	var/turf/location = get_turf(src)
-	var/obj/item/device/paicard/card = new(location)
-	var/mob/living/silicon/pai/pai = new(card)
-	qdel(src)
-	pai.key = pai_key
-	card.setPersonality(pai)
-	pai.SetName(actual_pai_name)

code/game/objects/items/devices/paicard.dm

@@ -33,23 +33,29 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard)
 	QDEL_NULL(radio)
 	return ..()
 
-/obj/item/device/paicard/attack_ghost(mob/observer/dead/user)
+// VOREStation Edit - Allow everyone to become a pAI
-	if(istype(user) && user.can_admin_interact())
+/obj/item/device/paicard/attack_ghost(mob/user as mob)
-		switch(alert(user, "Would you like to become a pAI by force? (Admin)", "pAI Creation", "Yes", "No"))
+	if(pai != null) //Have a person in them already?
-			if("Yes")
+		return ..()
-				// Copied from paiController/Topic
-				var/mob/living/silicon/pai/pai = new(src)
-				pai.name = user.name
-				pai.real_name = pai.name
-				pai.key = user.key
 
-				setPersonality(pai)
+	var/choice = input(user, "You sure you want to inhabit this PAI?") in list("Yes", "No")
-				looking_for_personality = FALSE
+	if(choice == "No")
+		return ..()
 
-				if(pai.mind)
+	var/pai_name = input(user, "Choose your character's name", "Character Name") as text
-					update_antag_icons(pai.mind)
+	var/actual_pai_name = sanitize_name(pai_name)
+	if(isnull(actual_pai_name))
+		return ..()
+
+	var/turf/location = get_turf(src)
+	var/obj/item/device/paicard/card = new(location)
+	var/mob/living/silicon/pai/new_pai = new(card)
+	qdel(src)
+	new_pai.key = user.key
+	card.setPersonality(new_pai)
+	new_pai.SetName(actual_pai_name)
 	return ..()
-
+// VOREStation Edit End
 
 /obj/item/device/paicard/attack_self(mob/user)
 	if (!in_range(src, user))

vorestation.dme

@@ -159,7 +159,6 @@
 #include "code\_onclick\drag_drop.dm"
 #include "code\_onclick\item_attack.dm"
 #include "code\_onclick\observer.dm"
-#include "code\_onclick\observer_vr.dm"
 #include "code\_onclick\other_mobs.dm"
 #include "code\_onclick\rig.dm"
 #include "code\_onclick\telekinesis.dm"