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

Can now slide drinks accross tables

Browse Source
This commit is contained in:
Shifty/Anthomansland
2019-08-24 23:49:47 +02:00
parent 48a9124176
commit 307716a1ca
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/reagents/reagent_containers/food/drinks.dm
View File

@@ -1513,15 +1513,14 @@
// Sliding from one table to another // Sliding from one table to another
/obj/item/weapon/reagent_containers/food/drinks/MouseDropFrom(atom/over_object,atom/src_location,over_location,src_control,over_control,params) /obj/item/weapon/reagent_containers/food/drinks/MouseDropFrom(atom/over_object,atom/src_location,over_location,src_control,over_control,params)
var/mob/user = usr var/mob/user = usr
to_chat(world, "[user]")
if (!istype(src_location)) if (!istype(src_location))
return return
if (!user || user.incapacitated()) if (!user || user.incapacitated())
return return
if (!user.Adjacent(src) || !src_location.Adjacent(over_location)) if (!user.Adjacent(src) || !src_location.Adjacent(over_location))
return return
if (istype(src_location, /obj/structure/table) && istype(over_location, /obj/structure/table)) if ((locate(/obj/structure/table) in src_location) && (locate(/obj/structure/table) in over_location))
user.visible_message("<span class='notice'>\The [user] slides \the [src] down the tables.</span>", "<span class='notice'>You slide \the [src] down the tables!</span>") user.visible_message("<span class='notice'>\The [user] slides \the [src] down the table.</span>", "<span class='notice'>You slide \the [src] down the table!</span>")
forceMove(over_location, glide_size_override = DELAY2GLIDESIZE(2)) forceMove(over_location, glide_size_override = DELAY2GLIDESIZE(2))
return return
return ..() return ..()