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

Refactor /obj/screen to /atom/movable/screen (#19852)

Browse Source 
Part of backend stuff required for #19188. Should probably be test
merged.

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
This commit is contained in:
Cody Brittain
2024-09-21 12:12:07 +00:00
committed by GitHub
co-authored by Cody Brittain
parent 3c474b70df
commit dc610520fe
88 changed files with 732 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/psionics/complexus/complexus.dm
+1 -1
View File
@@ -23,7 +23,7 @@
var/aura_color = "#ff0022"
var/datum/component/armor/psionic/armor_component
var/obj/screen/psi/hub/ui // Reference to the master psi UI object.
var/atom/movable/screen/psi/hub/ui // Reference to the master psi UI object.
var/mob/living/owner // Reference to our owner.
var/image/_aura_image // Client image
code/modules/psionics/complexus/complexus_process.dm
+1 -1
View File
@@ -63,7 +63,7 @@
P.apply(owner)
/datum/psi_complexus/proc/wipe_user_abilities()
for(var/obj/screen/ability/obj_based/psionic/P in owner.ability_master.ability_objects)
for(var/atom/movable/screen/ability/obj_based/psionic/P in owner.ability_master.ability_objects)
if((P.connected_power.ability_flags & PSI_FLAG_APEX) && get_rank() < PSI_RANK_APEX)
owner.ability_master.remove_ability(P)
if((P.connected_power.ability_flags & PSI_FLAG_LIMITLESS) && get_rank() < PSI_RANK_LIMITLESS)