cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 07:59:01 +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/spell_system/spells/spell_code.dm
+2 -2
View File
@@ -54,7 +54,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
var/hud_state = "" //name of the icon used in generating the spell hud object
var/override_base = ""
var/obj/screen/connected_button
var/atom/movable/screen/connected_button
///////////////////////
///SETUP AND PROCESS///
@@ -76,7 +76,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
silenced = max(0,silenced-1)
sleep(1)
if(connected_button)
var/obj/screen/spell/S = connected_button
var/atom/movable/screen/spell/S = connected_button
if(!istype(S))
return
S.update_charge(1)
code/modules/spell_system/spells/spells.dm
+5 -5
View File
@@ -6,13 +6,13 @@
for(var/spell/spell_to_add in H.mind.learned_spells)
H.add_spell(spell_to_add)
/mob/proc/add_spell(var/spell/spell_to_add, var/spell_base = "wiz_spell_ready", var/master_type = /obj/screen/movable/spell_master)
/mob/proc/add_spell(var/spell/spell_to_add, var/spell_base = "wiz_spell_ready", var/master_type = /atom/movable/screen/movable/spell_master)
usr = src // whoever made screen objects is an asshole and forced me to do this, i regret absolutely nothing
if(!spell_masters)
spell_masters = list()
if(spell_masters.len)
for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
for(var/atom/movable/screen/movable/spell_master/spell_master in spell_masters)
if(spell_master.type == master_type)
LAZYADD(spell_list, spell_to_add)
spell_master.add_spell(spell_to_add)
@@ -20,7 +20,7 @@
LAZYDISTINCTADD(mind.learned_spells, spell_to_add)
return TRUE
var/obj/screen/movable/spell_master/new_spell_master = new master_type //we're here because either we didn't find our type, or we have no spell masters to attach to
var/atom/movable/screen/movable/spell_master/new_spell_master = new master_type //we're here because either we didn't find our type, or we have no spell masters to attach to
if(client)
src.client.screen += new_spell_master
new_spell_master.spell_holder = src
@@ -46,7 +46,7 @@
if(mind && mind.learned_spells)
mind.learned_spells.Remove(spell_to_remove)
LAZYREMOVE(spell_list, spell_to_remove)
for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
for(var/atom/movable/screen/movable/spell_master/spell_master in spell_masters)
spell_master.remove_spell(spell_to_remove)
return 1
@@ -57,5 +57,5 @@
if(!spell_masters || !spell_masters.len)
return
for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
for(var/atom/movable/screen/movable/spell_master/spell_master in spell_masters)
spell_master.silence_spells(amount)