Revert "Psionics Rework: Kyoushiki Murasaki (#16805)" (#16948)

This reverts commit 27c40bdaf6.
This commit is contained in:
Matt Atlas
2023-07-31 01:51:40 +00:00
committed by GitHub
parent 06ca379a91
commit 87f637564f
145 changed files with 1617 additions and 3162 deletions
+6 -11
View File
@@ -112,7 +112,7 @@
new_character.make_vampire()
if(active)
new_character.key = key //now transfer the key to link the client to our new body
/datum/mind/proc/store_memory(new_text)
. = length(memory + new_text)
@@ -179,6 +179,11 @@
/datum/mind/Topic(href, href_list)
if(!check_rights(R_ADMIN)) return
if(current && isliving(current))
if(href_list["set_psi_faculty"] && href_list["set_psi_faculty_rank"])
current.set_psi_rank(href_list["set_psi_faculty"], text2num(href_list["set_psi_faculty_rank"]))
return TRUE
if(href_list["add_antagonist"])
var/datum/antagonist/antag = all_antag_types[href_list["add_antagonist"]]
if(antag)
@@ -436,16 +441,6 @@
for(var/datum/objective/objective in objectives)
to_chat(current, "<B>Objective #[obj_count]</B>: [objective.explanation_text]")
obj_count++
else if(href_list["set_psi_rank"])
current.set_psi_rank(text2num(href_list["set_psi_rank"]))
return
else if(href_list["set_psi_rank_limitless"])
var/sure = input(usr, "Limitless is INTENTIONALLY STUPIDLY OVERPOWERED! YOU SHOULD NOT BE USING THIS WITHOUT KNOWING EXACTLY WHAT YOU'RE DOING!", "Don't Get A Staff Complaint") as anything in list("I know what I'm doing!", "I fear no man. But that thing... it scares me!")
if(sure == "I know what I'm doing!")
current.set_psi_rank(PSI_RANK_LIMITLESS)
return
edit_memory()
/datum/mind/proc/find_syndicate_uplink()
+1
View File
@@ -172,6 +172,7 @@
/datum/outfit/admin/syndicate/mercenary/loner
name = "Loner"
head = /obj/item/clothing/head/helmet/space/psi_amp/lesser
l_ear = /obj/item/device/radio/headset/syndicate
r_pocket = /obj/item/device/special_uplink/burglar
@@ -251,8 +251,3 @@
name = ".50 Pistol"
telecrystal_cost = 5
path = /obj/item/gun/projectile/deagle/adhomai
/datum/uplink_item/item/visible_weapons/psionic_jumpstarter
name = "Psionic Jumpstarter"
telecrystal_cost = 19
path = /obj/item/psionic_jumpstarter