cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moves clickdrag nudge to ctrl+clickdrag due to conflicting controls/ease to use accidentally (#18985)

Browse Source 
* Moves clickdrag nudge to ctrl+clickdrag

* Sanity

* Gimme some more sanity
This commit is contained in:
I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE
2018-07-27 06:32:04 -03:00
committed by jknpj
parent 0e76fce8a1
commit fdda8729e3
48 changed files with 190 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/research/mechanic/flatpack.dm
View File

@@ -125,10 +125,10 @@
return 1
/obj/structure/closet/crate/flatpack/MouseDrop(over_object,src_location,over_location,src_control,over_control,params)
/obj/structure/closet/crate/flatpack/MouseDropFrom(over_object,src_location,over_location,src_control,over_control,params)
if(istype(over_object, /obj/structure/closet/crate/flatpack))
var/obj/structure/closet/crate/flatpack/flatpack = over_object
return flatpack.MouseDrop_T(src,usr)
return flatpack.MouseDropTo(src,usr)
var/mob/user = usr
if(user.incapacitated() || user.lying)
return //Validate mob status
@@ -138,7 +138,7 @@
return //Validate mob type
unstack(user, params, over_location)
/obj/structure/closet/crate/flatpack/MouseDrop_T(atom/dropping, mob/user)
/obj/structure/closet/crate/flatpack/MouseDropTo(atom/dropping, mob/user)
if(istype(dropping, /obj/structure/closet/crate/flatpack) && dropping != src)
var/obj/structure/closet/crate/flatpack/stacking = dropping
/* if(assembling || stacking.assembling)
@@ -151,7 +151,7 @@
return
if(!ishigherbeing(user) && !isrobot(user)) //check mob type
return
if(!user.can_MouseDrop(src, user)) //make sure it's adjacent and whatnot
if(!user.Adjacent(src))
return
user.visible_message("[user] adds [stacking.stacked.len + 1] flatpack\s to the stack.",
"You add [stacking.stacked.len + 1] flatpack\s to the stack.")