cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

i swear it compiled locally

Browse Source
This commit is contained in:
ancientpower
2020-02-04 17:18:13 -06:00
parent 5fb82a2e6b
commit dd521ef009
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__HELPERS/vector.dm
View File

@@ -35,7 +35,7 @@
/datum/vector/proc/is_integer() /datum/vector/proc/is_integer()
return ISINTEGER(x) && ISINTEGER(y) return ISINTEGER(x) && ISINTEGER(y)
/atom/movable/proc/datum/vector_translate(var/datum/vector/V, var/delay) /atom/movable/proc/vector_translate(var/datum/vector/V, var/delay)
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
var/turf/destination = locate(T.x + V.x, T.y + V.y, z) var/turf/destination = locate(T.x + V.x, T.y + V.y, z)
var/datum/vector/V_norm = V.duplicate() var/datum/vector/V_norm = V.duplicate()

2
code/modules/food_and_drinks/drinks/drinks.dm
View File

@@ -144,9 +144,9 @@
return return
if (!user || user.incapacitated() || !user.Adjacent(src)) if (!user || user.incapacitated() || !user.Adjacent(src))
return return
// Attempted drink sliding
if (!(locate(/obj/structure/table) in src_location) || !(locate(/obj/structure/table) in over_location)) if (!(locate(/obj/structure/table) in src_location) || !(locate(/obj/structure/table) in over_location))
return return
//Are we an expert slider? //Are we an expert slider?
var/datum/action/innate/D = get_action_of_type(user, /datum/action/innate/drink_fling) var/datum/action/innate/D = get_action_of_type(user, /datum/action/innate/drink_fling)
if(!D?.active) if(!D?.active)