From 745c74c18bf9759e4f53cf86712c87d1a63c20b2 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 5 May 2017 00:04:35 -0500 Subject: [PATCH 1/4] Fixes spinning (Woops I used a <= instead of a <) --- code/modules/mob/mob.dm.rej | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 code/modules/mob/mob.dm.rej diff --git a/code/modules/mob/mob.dm.rej b/code/modules/mob/mob.dm.rej new file mode 100644 index 0000000000..6cfe50706e --- /dev/null +++ b/code/modules/mob/mob.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm (rejected hunks) +@@ -350,7 +350,7 @@ + /mob/proc/spin(spintime, speed) + set waitfor = 0 + var/D = dir +- if((spintime <= 1)||(speed <= 1)||!spintime||!speed) ++ if((spintime < 1)||(speed < 1)||!spintime||!speed) + return + while(spintime >= speed) + sleep(speed) From 8af1d05cc43341d3368fc7444775787c50eb426e Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sat, 6 May 2017 14:02:42 -0700 Subject: [PATCH 2/4] Delete mob.dm.rej --- code/modules/mob/mob.dm.rej | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 code/modules/mob/mob.dm.rej diff --git a/code/modules/mob/mob.dm.rej b/code/modules/mob/mob.dm.rej deleted file mode 100644 index 6cfe50706e..0000000000 --- a/code/modules/mob/mob.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm (rejected hunks) -@@ -350,7 +350,7 @@ - /mob/proc/spin(spintime, speed) - set waitfor = 0 - var/D = dir -- if((spintime <= 1)||(speed <= 1)||!spintime||!speed) -+ if((spintime < 1)||(speed < 1)||!spintime||!speed) - return - while(spintime >= speed) - sleep(speed) From d3d335d83581217f83cc05415e1d5da713324cdb Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sat, 6 May 2017 14:03:52 -0700 Subject: [PATCH 3/4] Update mob.dm --- code/modules/mob/mob.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 24b4d228cc..39d0f1b222 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -351,6 +351,8 @@ /mob/proc/spin(spintime, speed) set waitfor = 0 var/D = dir + if((spintime <= 1)||(speed <= 1)||!spintime||!speed) + return while(spintime >= speed) sleep(speed) switch(D) From bf5a9a5037cd3bdba07fee9c7205ba081631b9dc Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sat, 6 May 2017 14:04:17 -0700 Subject: [PATCH 4/4] Update mob.dm --- code/modules/mob/mob.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 39d0f1b222..819f7f3db2 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -351,7 +351,7 @@ /mob/proc/spin(spintime, speed) set waitfor = 0 var/D = dir - if((spintime <= 1)||(speed <= 1)||!spintime||!speed) + if((spintime < 1)||(speed < 1)||!spintime||!speed) return while(spintime >= speed) sleep(speed)