cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bevy of newhydro fixes.

Browse Source 
Conflicts:
	code/game/machinery/vending.dm
	code/modules/projectiles/guns/energy/special.dm
	icons/obj/hydroponics.dmi
This commit is contained in:
Zuhayr
2014-07-28 13:49:18 -04:00
committed by ZomgPonies
parent 21a9d92930
commit d1059b488b
8 changed files with 111 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/click.dm
+11 -1
View File
@@ -360,7 +360,17 @@
G.next_shock = world.time + time
// Simple helper to face what you clicked on, in case it should be needed in more than one place
/mob/proc/face_atom(var/atom/A)
if( stat || (buckled && !buckled.movable) || !A || !x || !y || !A.x || !A.y ) return
// Snowflake for space vines.
var/is_buckled = 0
if(buckled)
if(istype(buckled))
if(!buckled.movable)
is_buckled = 1
else
is_buckled = 0
if( stat || is_buckled || !A || !x || !y || !A.x || !A.y ) return
var/dx = A.x - x
var/dy = A.y - y
if(!dx && !dy) return