cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix buckling and probably a lot more mousedrop interactions (#93352)

Browse Source
This commit is contained in:
MrMelbert
2025-10-08 04:47:52 -05:00
committed by GitHub
parent cf7d5b1e7b
commit e83fd2603f
4 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/_onclick/drag_drop.dm
View File

@@ -11,7 +11,8 @@
if(!usr || !over) if(!usr || !over)
return return
var/proximity_check = usr.client.check_drag_proximity(src, over, src_location, over_location, src_control, over_control, params) var/client/usrclient = GET_CLIENT(usr)
var/proximity_check = usrclient.check_drag_proximity(src, over, src_location, over_location, src_control, over_control, params)
if(proximity_check) if(proximity_check)
return proximity_check return proximity_check
@@ -38,7 +39,7 @@
var/combined_atom_flags = interaction_flags_atom | over.interaction_flags_atom var/combined_atom_flags = interaction_flags_atom | over.interaction_flags_atom
if(!(combined_atom_flags & INTERACT_ATOM_MOUSEDROP_IGNORE_CHECKS)) if(!(combined_atom_flags & INTERACT_ATOM_MOUSEDROP_IGNORE_CHECKS))
//Check for adjacency //Check for adjacency
if(!(combined_atom_flags & INTERACT_ATOM_MOUSEDROP_IGNORE_ADJACENT) && (!user.IsReachableBy(src) || user.IsReachableBy(src) || !user.IsReachableBy(over))) if(!(combined_atom_flags & INTERACT_ATOM_MOUSEDROP_IGNORE_ADJACENT) && (!IsReachableBy(user) || !over.IsReachableBy(user)))
return // should stop you from dragging through windows return // should stop you from dragging through windows
if(!(combined_atom_flags & INTERACT_ATOM_MOUSEDROP_IGNORE_USABILITY)) if(!(combined_atom_flags & INTERACT_ATOM_MOUSEDROP_IGNORE_USABILITY))

3
code/datums/mocking/client.dm
View File

@@ -85,3 +85,6 @@
/datum/client_interface/proc/set_fullscreen(logging_in = FALSE) /datum/client_interface/proc/set_fullscreen(logging_in = FALSE)
return TRUE return TRUE
/datum/client_interface/proc/check_drag_proximity(atom/dragging, atom/over, src_location, over_location, src_control, over_control, params)
return FALSE

1
code/modules/unit_tests/_unit_tests.dm
View File

@@ -110,6 +110,7 @@
#include "blindness.dm" #include "blindness.dm"
#include "bloody_footprints.dm" #include "bloody_footprints.dm"
#include "breath.dm" #include "breath.dm"
#include "buckle.dm"
#include "burning.dm" #include "burning.dm"
#include "cable_powernets.dm" #include "cable_powernets.dm"
#include "can_see.dm" #include "can_see.dm"

36
code/modules/unit_tests/buckle.dm Normal file
View File

@@ -0,0 +1,36 @@
/// Test you can buckle yourself to a chair
/datum/unit_test/buckling_self
/datum/unit_test/buckling_self/Run()
var/mob/living/carbon/human/consistent/dummy = EASY_ALLOCATE()
dummy.mock_client = new()
var/obj/structure/chair/chair = EASY_ALLOCATE()
var/old_usr = usr
usr = dummy // mouse drop still uses usr
dummy.MouseDrop(chair)
if(dummy.buckled != chair)
TEST_FAIL("The dummy failed to buckle themselves to a chair via mouse drop.")
usr = old_usr
/// Test you can buckle someone else to a chair
/datum/unit_test/buckling_others
/datum/unit_test/buckling_others/Run()
var/mob/living/carbon/human/consistent/dummy = EASY_ALLOCATE()
dummy.mock_client = new()
var/mob/living/carbon/human/consistent/victim = EASY_ALLOCATE()
var/obj/structure/chair/chair = EASY_ALLOCATE()
var/old_usr = usr
usr = dummy // mouse drop still uses usr
victim.MouseDrop(chair)
if(victim.buckled != chair)
TEST_FAIL("The dummy failed to buckle the victim to a chair via mouse drop.")
usr = old_usr