From 8b7bd1dbb8ceb08f8dde3b6963d686faa6ef8e39 Mon Sep 17 00:00:00 2001
From: Poojawa <Poojawa@users.noreply.github.com>
Date: Wed, 12 Apr 2017 23:37:57 -0500
Subject: [PATCH] Removes Sizeplay (#356)

* Update tgstation.dme

Removes sizeplay entirely.

* Update voreconstants.dm

* Update living.dm
---
 code/__DEFINES/voreconstants.dm   | 6 +++---
 code/modules/mob/living/living.dm | 6 ------
 tgstation.dme                     | 2 --
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/code/__DEFINES/voreconstants.dm b/code/__DEFINES/voreconstants.dm
index cd4204514c..6a07a60f4b 100644
--- a/code/__DEFINES/voreconstants.dm
+++ b/code/__DEFINES/voreconstants.dm
@@ -9,9 +9,9 @@
 // Stance for hostile mobs to be in while devouring someone.
 #define HOSTILE_STANCE_EATING	99
 
-
+/*
 var/global/list/player_sizes_list = list("Macro" = SIZESCALE_HUGE, "Big" = SIZESCALE_BIG, "Normal" = SIZESCALE_NORMAL, "Small" = SIZESCALE_SMALL, "Tiny" = SIZESCALE_TINY)
-/* // moved to sound.dm
+ // moved to sound.dm
 
 var/global/list/digestion_sounds = list(
 		'sound/vore/digest1.ogg',
@@ -63,4 +63,4 @@ var/global/list/struggle_sounds = list(
 
 	for(var/client/C in admins)
 		if(C.prefs.toggles & CHAT_DEBUGLOGS)
-			C << "DEBUG: [text]" */
\ No newline at end of file
+			C << "DEBUG: [text]" */
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index bc304db040..6eddad7787 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -154,15 +154,9 @@
 				M.pass_flags &= ~PASSMOB
 
 			now_pushing = 0
-			// In case of micros, we don't swap positions; instead occupying the same square!
-			if (handle_micro_bump_helping(src))
-				return
 			return 1
 
 	//okay, so we didn't switch. but should we push?
-	// Handle grabbing, stomping, and such of micros!
-	if(handle_micro_bump_other(M))
-		return
 	//not if he's not CANPUSH of course
 	if(!(M.status_flags & CANPUSH))
 		return 1
diff --git a/tgstation.dme b/tgstation.dme
index 698b12be1b..dc1464a66f 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2120,8 +2120,6 @@
 #include "code\modules\vore\eating\simple_animal_vr.dm"
 #include "code\modules\vore\eating\vore_vr.dm"
 #include "code\modules\vore\eating\vorepanel_vr.dm"
-#include "code\modules\vore\resizing\resize_vr.dm"
-#include "code\modules\vore\resizing\sizegun_vr.dm"
 #include "code\modules\VR\vr_human.dm"
 #include "code\modules\VR\vr_sleeper.dm"
 #include "code\modules\zombie\items.dm"