cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev

Browse Source 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
This commit is contained in:
Mloc-Argent
2014-06-20 22:02:40 +01:00
parent c2058864f0 33fa88e27a
commit dd7f0dac0e
41 changed files with 1524 additions and 1577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/WorkInProgress/buildmode.dm
View File

@@ -259,7 +259,8 @@
if(4)
if(pa.Find("left"))
holder.throw_atom = object
if(istype(object, /atom/movable))
holder.throw_atom = object
if(pa.Find("right"))
if(holder.throw_atom)
holder.throw_atom.throw_at(object, 10, 1)