From 88390a001049f2847ed7c613bad2578051d6170e Mon Sep 17 00:00:00 2001
From: Hawk-v3 <hawk.v3@ntlworld.com>
Date: Thu, 1 Mar 2012 03:16:34 +0000
Subject: [PATCH] [PATCH 056/285] TG UPdates: fingerprints on cans now log on
 any attackby() that isn't a wrench/analyzer/pda/tank; added a 2 minute
 countdown var to humans/monkeys that resets when move() is called;(for an
 actual fix to the cuffbreak bug(NOPE, NOT ACTUALLY IN ~Hawk.)) changed a typo
 in security levels

committed a gib animation fix for Sieve (todo: make custom gib animations for simple_animals/metroids)
---
 code/game/machinery/atmoalter/canister.dm       |  1 +
 code/modules/mob/living/carbon/human/human.dm   |  4 ++--
 code/modules/mob/living/carbon/human/life.dm    |  1 +
 code/modules/mob/living/carbon/monkey/life.dm   |  2 +-
 code/modules/mob/living/carbon/monkey/monkey.dm |  2 +-
 code/modules/mob/mob.dm                         | 16 ++++++++++++++++
 code/modules/mob/mob_helpers.dm                 | 10 ++++++++++
 7 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index 0b93d51d4a7..7cf86a03ed5 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -164,6 +164,7 @@
 		for(var/mob/V in viewers(src, null))
 			V.show_message(text("\red [user] hits the [src] with a [W]!"))
 		src.health -= W.force
+		src.add_fingerprint(user)
 		healthcheck()
 	..()
 
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 81d8c8a84a7..0d7b4ed0ed1 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -765,7 +765,7 @@
 
 	for(var/mob/living/carbon/metroid/M in view(1,src))
 		M.UpdateFeed(src)
-
+	src.moved_recently = 120
 	return
 
 /mob/living/carbon/human/update_clothing()
@@ -2643,4 +2643,4 @@ It can still be worn/put on as normal.
 
 /mob/living/carbon/human/proc/check_dna()
 	dna.check_integrity(src)
-	return
\ No newline at end of file
+	return
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 097bd3d3803..5665301948c 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -121,6 +121,7 @@
 
 	..() //for organs
 
+	src.moved_recently = max(0, moved_recently-1)
 
 /mob/living/carbon/human
 	proc
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index a20c54fda61..9704c9e7e45 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -93,7 +93,7 @@
 			step(src, pick(cardinal))
 		if(prob(1))
 			emote(pick("scratch","jump","roll","tail"))
-
+	src.moved_recently = max(0, src.moved_recently-1)
 
 /mob/living/carbon/monkey
 	proc
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 8cc04a4d2b0..99256ab7f5f 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -560,7 +560,7 @@
 
 	for(var/mob/living/carbon/metroid/M in view(1,src))
 		M.UpdateFeed(src)
-
+	src.moved_recently = 120
 	return
 
 /mob/living/carbon/monkey/verb/removeinternal()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 327bcbb0c14..e8ff62279c9 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -786,6 +786,14 @@
 		flick("gibbed-h", animation)
 	else if(ismonkey(src))
 		flick("gibbed-m", animation)
+	else if(ismetroid(src))
+		flick("gibbed-m", animation)
+	else if(iscrab(src))
+		flick("gibbed-m", animation)
+	else if(iscorgi(src))
+		flick("gibbed-m", animation)
+	else if(iscat(src))
+		flick("gibbed-m", animation)   //New-has monkey gib effect versus robogib
 	else if(isalien(src))
 		flick("gibbed-a", animation)
 	else
@@ -800,6 +808,14 @@
 			else
 				gibs(loc, viruses, dna)
 
+/*		else if(key)
+			if(istype(src, /mob/living/simple_animals))     //Should gib all simple_animals like a monkey
+				gibs(loc, viruses)
+			else if (istype(src, /mob/living/simple_animals))
+				gibs(loc, viruses)
+Currently doesn't work, but should be useful later or at least as a template
+*/
+
 		else
 			if(istype(src, /mob/living/silicon))
 				robogibs(loc, viruses)
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 3539ddf8080..91892dbfbda 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -50,6 +50,16 @@
 		return 1
 	return 0
 
+/proc/iscrab(A)
+	if(istype(A, /mob/living/simple_animal/crab))
+		return 1
+	return 0
+
+/proc/iscat(A)
+	if(istype(A, /mob/living/simple_animal/cat))
+		return 1
+	return 0
+
 /proc/istajaran(A)
 	if(istype(A, /mob/living/carbon/human/tajaran))
 		return 1