From a1ccbfe198fac30404858e3a267b06e921dce92d Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 15 Nov 2012 23:39:28 +0400 Subject: [PATCH 1/2] Fixes issue #1889 Timers, proxy and other trigger =RSD= properly again. --- code/modules/assembly/signaler.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 6f70ad1a875..c304156a594 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -31,7 +31,7 @@ spawn(10) process_cooldown() -// signal() + signal() return 1 update_icon() From cda5f5c75553e0cf8fbb056a0670570e1133a9d2 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Fri, 16 Nov 2012 00:49:49 +0400 Subject: [PATCH 2/2] Fixes buckled people being still buckled after teleportation with artifact. Issue #1854 --- code/modules/research/xenoarchaeology/artifact_effect.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/research/xenoarchaeology/artifact_effect.dm b/code/modules/research/xenoarchaeology/artifact_effect.dm index 34f1df0619a..9bee8176db3 100644 --- a/code/modules/research/xenoarchaeology/artifact_effect.dm +++ b/code/modules/research/xenoarchaeology/artifact_effect.dm @@ -143,6 +143,8 @@ randomturfs.Add(T) if(randomturfs.len > 0) user << "\red You are suddenly zapped away elsewhere!" + if (user.buckled) + user.buckled.unbuckle() user.loc = pick(randomturfs) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(3, 0, get_turf(originator)) //no idea what the 0 is @@ -334,6 +336,8 @@ randomturfs.Add(T) if(randomturfs.len > 0) M << "\red You are displaced by a strange force!" + if(M.buckled) + M.buckled.unbuckle() M.loc = pick(randomturfs) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(3, 0, get_turf(originator)) //no idea what the 0 is @@ -421,6 +425,8 @@ randomturfs.Add(T) if(randomturfs.len > 0) M << "\red You are displaced by a strange force!" + if(M.buckled) + M.buckled.unbuckle() M.loc = pick(randomturfs) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(3, 0, get_turf(originator)) //no idea what the 0 is