cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-18 11:30:35 +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 08:12:07 -04:00
committed by GitHub
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/modular_computers/computers/modular_computer/interaction.dm
+1 -1
View File
@@ -321,7 +321,7 @@
return
if(istype(over_object, /obj/machinery/power/apc) && tesla_link)
return over_object.attackby(src, M)
if(!istype(over_object, /obj/screen) && !(over_object == src))
if(!istype(over_object, /atom/movable/screen) && !(over_object == src))
return attack_self(M)
/obj/item/modular_computer/GetID()
code/modules/modular_computers/computers/subtypes/dev_wristbound.dm
+3 -3
View File
@@ -30,12 +30,12 @@
return
if(!over_object || over_object == src)
return
if(istype(over_object, /obj/screen/inventory))
var/obj/screen/inventory/S = over_object
if(istype(over_object, /atom/movable/screen/inventory))
var/atom/movable/screen/inventory/S = over_object
if(S.slot_id == equip_slot)
return
if(ishuman(usr))
if(!(istype(over_object, /obj/screen)))
if(!(istype(over_object, /atom/movable/screen)))
return ..()
if(!(loc == usr) || (loc && loc.loc == usr))