cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 23:11:52 +00: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 03:51:40 +02: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

48
code/_onclick/hud/ability_screen_objects.dm
View File

@@ -126,10 +126,6 @@
for(var/obj/screen/ability/A in ability_objects)
remove_ability(A)
/obj/screen/movable/ability_master/proc/remove_all_psionic_abilities()
for(var/obj/screen/ability/obj_based/psionic/A in ability_objects)
remove_ability(A)
/obj/screen/movable/ability_master/proc/get_ability_by_name(name_to_search)
for(var/obj/screen/ability/A in ability_objects)
if(A.name == name_to_search)
@@ -151,7 +147,7 @@
/mob/living/LateLogin()
. = ..()
if(ability_master)
ability_master.toggle_open(2)
ability_master.toggle_open(1)
client.screen -= ability_master
/mob/living/Initialize()
@@ -187,15 +183,10 @@
overlays += ability_icon_state
/obj/screen/ability/Click(var/location, var/control, var/params)
/obj/screen/ability/Click()
if(!usr)
return
var/list/click_params = params2list(params)
if(click_params["shift"])
examine(usr)
return
activate()
/obj/screen/ability/MouseDrop(var/atom/A)
@@ -292,44 +283,13 @@
//////////////////////////////
/obj/screen/ability/obj_based
var/obj/object
var/obj/object = null
/obj/screen/ability/obj_based/activate()
if(object)
object.Click()
/// Psionics.
/obj/screen/ability/obj_based/psionic
icon_state = "nano_spell_base"
background_base_state = "nano"
var/singleton/psionic_power/connected_power
/obj/screen/ability/obj_based/psionic/Destroy()
connected_power = null
return ..()
/obj/screen/movable/ability_master/proc/add_psionic_ability(var/obj/object_given, var/ability_icon_given, var/singleton/psionic_power/P)
if(!object_given)
message_admins("ERROR: add_psionic_ability() was not given an object in its arguments.")
if(!P)
message_admins("Psionic ability added without connected psionic power singleton!")
if(get_ability_by_instance(object_given))
return // Duplicate
var/obj/screen/ability/obj_based/psionic/A = new /obj/screen/ability/obj_based/psionic()
A.ability_master = src
A.object = object_given
A.ability_icon_state = ability_icon_given
A.name = object_given.name
A.connected_power = P
ability_objects.Add(A)
if(my_mob.client)
toggle_open(2) //forces the icons to refresh on screen
/obj/screen/ability/obj_based/psionic/examine(mob/user)
to_chat(user, SPAN_NOTICE("<font size=4>This ability is <b>[connected_power.name]</b>.</font>"))
to_chat(user, SPAN_NOTICE("[connected_power.desc]"))
/// Technomancer.
// Technomancer
/obj/screen/ability/obj_based/technomancer
icon_state = "wiz_spell_base"
background_base_state = "wiz"