cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] obj screen to atom movable screen (#11719)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-09-22 01:04:35 +02:00
committed by GitHub
co-authored by Kashargul
parent fd68853af6
commit 303e88c0b2
141 changed files with 1307 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/flashlight.dm
+2 -2
View File
@@ -191,7 +191,7 @@
if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech. why?
return
if (!( istype(over_object, /obj/screen) ))
if (!( istype(over_object, /atom/movable/screen) ))
return ..()
//makes sure that the thing is equipped, so that we can't drag it into our hand from miles away.
@@ -202,7 +202,7 @@
if (( usr.restrained() ) || ( usr.stat ))
return
if ((src.loc == usr) && !(istype(over_object, /obj/screen)) && !usr.unEquip(src))
if ((src.loc == usr) && !(istype(over_object, /atom/movable/screen)) && !usr.unEquip(src))
return
switch(over_object.name)