cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactored MouseDrop_T (#18549)

Browse Source 
* sdafas

* sdaf
This commit is contained in:
Fluffy
2024-02-29 21:58:23 +00:00
committed by GitHub
parent c29a42a865
commit 9fc52575dd
30 changed files with 148 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+2 -1
View File
@@ -482,7 +482,8 @@
/obj/structure/closet/proc/is_open()
. = opened
/obj/structure/closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
/obj/structure/closet/MouseDrop_T(atom/dropping, mob/user)
var/atom/movable/O = dropping
if(istype(O, /obj/screen)) //fix for HUD elements making their way into the world -Pete
return
if(O.loc == user)
code/game/objects/structures/janicart.dm
+2 -1
View File
@@ -99,7 +99,8 @@
//everything else is visible, so doesn't need to be mentioned
/obj/structure/janitorialcart/MouseDrop_T(atom/movable/O as mob|obj, mob/living/user as mob)
/obj/structure/janitorialcart/MouseDrop_T(atom/dropping, mob/user)
var/atom/movable/O = dropping
if (istype(O, /obj/structure/mopbucket) && !mybucket)
O.forceMove(src)
mybucket = O
code/game/objects/structures/morgue.dm
+2 -1
View File
@@ -164,7 +164,8 @@
return
return
/obj/structure/m_tray/MouseDrop_T(atom/movable/O, mob/user )
/obj/structure/m_tray/MouseDrop_T(atom/dropping, mob/user)
var/atom/movable/O = dropping
if(!istype(O, /atom/movable) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O))
return
if(!ismob(O) && !istype(O, /obj/structure/closet/body_bag))
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+2 -2
View File
@@ -41,8 +41,8 @@
if(buckled)
buckled.set_dir(dir)
/obj/structure/bed/stool/chair/MouseDrop_T(mob/target, mob/user)
if(target == user && user.loc != loc && (GLOB.reverse_dir[dir] & angle2dir(Get_Angle(src, user))))
/obj/structure/bed/stool/chair/MouseDrop_T(atom/dropping, mob/user)
if(dropping == user && user.loc != loc && (GLOB.reverse_dir[dir] & angle2dir(Get_Angle(src, user))))
user.visible_message("<b>[user]</b> starts climbing over the back of \the [src]...", SPAN_NOTICE("You start climbing over the back of \the [src]..."))
if(do_after(user, 2 SECONDS, do_flags = DO_UNIQUE))
user.forceMove(loc)
code/game/objects/structures/trash_pile.dm
+1 -1
View File
@@ -28,7 +28,7 @@
if(icon_state == initial(icon_state))
icon_state = pick(icon_states(icon) - icon_state)
/obj/structure/trash_pile/MouseDrop_T(obj/structure/trash_pile/target, mob/user)
/obj/structure/trash_pile/MouseDrop_T(atom/dropping, mob/user)
if(!Adjacent(user) || use_check_and_message(user))
return
user.visible_message("<b>[user]</b> starts climbing into \the [src]...", SPAN_NOTICE("You start climbing into \the [src]..."))