Merge pull request #5753 from DeityLink/fixtwitch

[Bugfix] Fixing twitch/tourettes pixel offset not resetting
Chronitonity · Sep 21, 2015 · 3fe30f1 · 3fe30f1
2 parents 49d4fb8 + 34863ca
commit 3fe30f1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/code/modules/mob/living/carbon/human/life/handle_disabilities.dm b/code/modules/mob/living/carbon/human/life/handle_disabilities.dm
@@ -26,10 +26,12 @@
 					emote("twitch")
 				if(2 to 3)
 					say("[prob(50) ? ";" : ""][pick("SHIT", "PISS", "FUCK", "CUNT", "COCKSUCKER", "MOTHERFUCKER", "TITS")]")
-			var/x_offset = pixel_x + rand(-2,2)
-			var/y_offset = pixel_y + rand(-1,1)
-			animate(src, pixel_x = x_offset, pixel_y = y_offset, time = 1)
-			animate(pixel_x = pixel_x, pixel_y = pixel_y, time = 1)
+
+			var/x_offset_change = rand(-2,2)
+			var/y_offset_change = rand(-1,1)
+
+			animate(src, pixel_x = (pixel_x + x_offset_change), pixel_y = (pixel_y + y_offset_change), time = 1)
+			animate(pixel_x = (pixel_x - x_offset_change), pixel_y = (pixel_y - y_offset_change), time = 1)
 
 	if(getBrainLoss() >= 60 && stat != DEAD)
 		if(prob(3))

diff --git a/html/changelogs/DeityLink_5753.yml b/html/changelogs/DeityLink_5753.yml
@@ -0,0 +1,4 @@
+author: Deity Link
+delete-after: true
+changes:
+  - bugfix: Fixed twitch/tourettes pixel offset not resetting. Which caused players to permanently appear offset.