cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 04:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

/obj/screen --> /atom/movable/screen (#54403)

Browse Source 
Repaths screen objects to /atom/movable
This commit is contained in:
TemporalOroboros
2020-11-08 18:07:15 -08:00
committed by GitHub
parent e113320908
commit edd6500d78
155 changed files with 1169 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/item/computer.dm
+1 -1
View File
@@ -122,7 +122,7 @@
/obj/item/modular_computer/MouseDrop(obj/over_object, src_location, over_location)
var/mob/M = usr
if((!istype(over_object, /obj/screen)) && usr.canUseTopic(src, BE_CLOSE))
if((!istype(over_object, /atom/movable/screen)) && usr.canUseTopic(src, BE_CLOSE))
return attack_self(M)
return ..()
code/modules/modular_computers/computers/item/laptop.dm
+2 -2
View File
@@ -65,8 +65,8 @@
if(over_object == usr || over_object == src)
try_toggle_open(usr)
return
if(istype(over_object, /obj/screen/inventory/hand))
var/obj/screen/inventory/hand/H = over_object
if(istype(over_object, /atom/movable/screen/inventory/hand))
var/atom/movable/screen/inventory/hand/H = over_object
var/mob/M = usr
if(M.stat != CONSCIOUS || HAS_TRAIT(M, TRAIT_HANDS_BLOCKED))