From 29767f82e9dda079ca956cc2b36fa020326c62a6 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 24 Mar 2015 01:16:50 -0400 Subject: [PATCH 1/2] Thrown Object Spinning --- code/game/atoms_movable.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index fdb556a6b64..ba5c0371688 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -161,6 +161,7 @@ src.thrower = thrower src.throw_source = get_turf(src) //store the origin turf + SpinAnimation(5, 1) var/dist_x = abs(target.x - src.x) var/dist_y = abs(target.y - src.y) From 40b04de8c998dab1b0429efb6075dae8599193ff Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 24 Mar 2015 21:42:04 -0400 Subject: [PATCH 2/2] no spinning --- code/game/atoms_movable.dm | 4 +++- code/game/objects/items/weapons/twohanded.dm | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index ba5c0371688..5fe1ed9faba 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -11,6 +11,7 @@ var/turf/throw_source = null var/throw_speed = 2 var/throw_range = 7 + var/no_spin = 0 var/moved_recently = 0 var/mob/pulledby = null @@ -161,7 +162,8 @@ src.thrower = thrower src.throw_source = get_turf(src) //store the origin turf - SpinAnimation(5, 1) + if(!no_spin) + SpinAnimation(5, 1) var/dist_x = abs(target.x - src.x) var/dist_y = abs(target.y - src.y) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 5f5d913823b..b0e4fa781aa 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -291,6 +291,7 @@ obj/item/weapon/twohanded/ force_wielded = 18 // Was 13, Buffed - RR throwforce = 20 throw_speed = 3 + no_spin = 1 flags = NOSHIELD attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")