cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 04:22:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+11 -9
View File
@@ -106,16 +106,18 @@ var/global/enabled_spooking = 0
var/mob/living/psyker = M
if(psyker.psi)
body += "<a href='?src=\ref[src];remove_psionics=\ref[psyker.psi]'>Remove psionics.</a><br/><br/>"
body += "<a href='?src=\ref[src];trigger_psi_latencies\ref[psyker.psi]'>Trigger latencies.</a><br/>"
body += "<table width = '100%'>"
for(var/psi_rank in list(PSI_RANK_SENSITIVE, PSI_RANK_HARMONIOUS, PSI_RANK_APEX, PSI_RANK_LIMITLESS))
var/owner_rank = psyker.psi ? psyker.psi.get_rank() : 0
var/psi_title = psychic_ranks_to_strings[psi_rank]
if(psi_rank == owner_rank)
psi_title = "<b>[psi_title]</b>"
if(psi_rank != PSI_RANK_LIMITLESS)
body += "<tr><a href='?src=\ref[psyker.mind];set_psi_rank=[psi_rank]'>[psi_title]</a></tr>"
else
body += "<tr><a href='?src=\ref[psyker.mind];set_psi_rank_limitless=1'><font color='red'>[psi_title]</font></a></tr>"
for(var/faculty in list(PSI_COERCION, PSI_PSYCHOKINESIS, PSI_REDACTION, PSI_ENERGISTICS))
var/datum/psionic_faculty/faculty_decl = SSpsi.get_faculty(faculty)
var/faculty_rank = psyker.psi ? psyker.psi.get_rank(faculty) : 0
body += "<tr><td><b>[faculty_decl.name]</b></td>"
for(var/i = 1 to LAZYLEN(psychic_ranks_to_strings))
var/psi_title = psychic_ranks_to_strings[i]
if(i == faculty_rank)
psi_title = "<b>[psi_title]</b>"
body += "<td><a href='?src=\ref[psyker.mind];set_psi_faculty_rank=[i];set_psi_faculty=[faculty]'>[psi_title]</a></td>"
body += "</tr>"
body += "</table>"
if (M.client)
code/modules/admin/topic.dm
+2 -2
View File
@@ -432,8 +432,8 @@
else if(href_list["trigger_psi_latencies"])
var/datum/psi_complexus/psi = locate(href_list["trigger_psi_latencies"])
log_and_message_admins("triggered psionics for [key_name(psi.owner)].")
psi.check_psionic_trigger(100, "outside intervention", redactive = TRUE)
log_and_message_admins("triggered psi latencies for [key_name(psi.owner)].")
psi.check_latency_trigger(100, "outside intervention", redactive = TRUE)
else if(href_list["monkeyone"])
if(!check_rights(R_SPAWN)) return
code/modules/admin/verbs/buildmode.dm
+2 -3
View File
@@ -42,11 +42,10 @@
/obj/effect/bmode//Cleaning up the tree a bit
density = 1
anchored = 1
layer = SCREEN_LAYER + 1
layer = SCREEN_LAYER
dir = NORTH
icon = 'icons/misc/buildmode.dmi'
mouse_opacity = MOUSE_OPACITY_OPAQUE
var/obj/effect/bmode/buildholder/master
var/obj/effect/bmode/buildholder/master = null
/obj/effect/bmode/Destroy()
if(master && master.cl)