From d48ffa7af50f8c3705330771bfef305871edebe4 Mon Sep 17 00:00:00 2001
From: FalseIncarnate <false_incarnate@yahoo.com>
Date: Tue, 6 Sep 2016 05:07:15 -0400
Subject: [PATCH] Finally names Mob 14 and Mob 16, fixes normal weakness

---
 code/modules/arcade/mob_hunt/mob_datums.dm    |  31 +++++++++---------
 .../arcade/mob_hunt/mob_type_datums.dm        |   2 +-
 icons/effects/mob_hunt.dmi                    | Bin 51119 -> 51124 bytes
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/code/modules/arcade/mob_hunt/mob_datums.dm b/code/modules/arcade/mob_hunt/mob_datums.dm
index 70c4f23239d..d49f8ba7d90 100644
--- a/code/modules/arcade/mob_hunt/mob_datums.dm
+++ b/code/modules/arcade/mob_hunt/mob_datums.dm
@@ -426,20 +426,21 @@
 	turf_whitelist = list(/turf/simulated/floor/bluegrid)
 	lifetime = 3000
 
-/datum/mob_hunt/mob_14
-	mob_name = "Mob 14"
+/datum/mob_hunt/pandoom
+	mob_name = "Pandoom"
 	run_chance = 50
 	min_level = 5
-	max_level = 10
-	primary_type = TYPE_NORMAL
-	secondary_type = TYPE_NORMAL
-	icon_state_normal = ""
-	icon_state_shiny = ""
+	max_level = 15
+	primary_type = TYPE_GHOST
+	icon_state_normal = "pandoom"
+	icon_state_shiny = "pandoom_shiny"
 	area_blacklist = list()
 	turf_blacklist = list()
-	area_whitelist = list()
+	area_whitelist = list(/area/medical/morgue,
+						/area/chapel,
+						/area/medical/genetics_cloning)
 	turf_whitelist = list()
-	lifetime = 6000
+	lifetime = 4500
 
 /datum/mob_hunt/relish
 	mob_name = "Relish"
@@ -456,20 +457,20 @@
 	turf_whitelist = list()
 	lifetime = 3000
 
-/datum/mob_hunt/mob_16
-	mob_name = "Mob 14"
+/datum/mob_hunt/xofine
+	mob_name = "Xofine"
 	run_chance = 50
 	min_level = 5
 	max_level = 10
-	primary_type = TYPE_NORMAL
+	primary_type = TYPE_FIRE
 	secondary_type = TYPE_NORMAL
-	icon_state_normal = ""
-	icon_state_shiny = ""
+	icon_state_normal = "xofine"
+	icon_state_shiny = "xofine_shiny"
 	area_blacklist = list()
 	turf_blacklist = list()
 	area_whitelist = list()
 	turf_whitelist = list()
-	lifetime = 6000
+	lifetime = 3000
 
 /datum/mob_hunt/gitten
 	mob_name = "Gitten"
diff --git a/code/modules/arcade/mob_hunt/mob_type_datums.dm b/code/modules/arcade/mob_hunt/mob_type_datums.dm
index ed2109a4d4c..da7ba30ea7d 100644
--- a/code/modules/arcade/mob_hunt/mob_type_datums.dm
+++ b/code/modules/arcade/mob_hunt/mob_type_datums.dm
@@ -85,7 +85,7 @@
 
 /datum/mob_type/normal
 	name = "Normal"
-	weakness = list(/datum/mob_type/normal)
+	weakness = list(/datum/mob_type/fighting)
 	immunity = list(/datum/mob_type/ghost)
 
 /datum/mob_type/fighting
diff --git a/icons/effects/mob_hunt.dmi b/icons/effects/mob_hunt.dmi
index 605bf752a27423328dc8ee8eea4d62037f2a58e2..176907c6878f77cab63c401d028e76bcb5a59228 100644
GIT binary patch
delta 331
zcmV-R0kr<Fj{~%i1CS(tGI~^4bVOxyV{&P5bZKvH004NLmD9g&gD?=s@fn`NO7^P%
zR+fq=%8<N5b-;nG9yU4KY4i3SNHf;IY#@E~m33!t&BtzkIGOf%s4uM11#cSj{`6c|
z-)>0OH0JHKt}MIBru8Q#N^BalS%iAFK?c@MT@6m7Y0OJqjY>0ruitm;d8RH;sQZl8
z`D;<f6mmLeC-MMA+Y9$e33Xs~$R1T-vCHEaxjcZI1FPpuszCMT!0IInt0vUJw?Oj%
zob~3w>KG&@*MGqf>`vn5nROIWeh7noVeUilr~|8(q&x{r0#6}?4pd-qAwPsLqYkVp
zi;EUyVDl%8&X;#RzcO^5E+sB6ePv+NlS2%;pR0z+QY^pzyM*6AX%s52{tu!jwyeNI
dTG{{2t=XMg(;g4?FPtnj$m#&SC9_%qRmLMlp-2D#

delta 326
zcmV-M0lEIPj{~od1CS(tEqYW~bVOxyV{&P5bZKvH004NLmD90qgFp<%@fn`tl<Za0
zM%`E{qKF}Rg~)*6PBk3y-KEOgcK~H99~($N{bd=vH{Yjobv5Os${(!3`Oy^S`1YP>
zzpjne6z20I&n&y%#`z^gifjtAn}iy+URu^&p0!ScDa;|yI;DYs=jWFld7wJ=sJjL0
z#^<UI(WiJ%PGkc`+Y>iY33Xt#O(UwnVx77!@cIH42UhQiRDtT^!0ICjt47qpe}SeJ
zn00Yrweu39Ykpt|c6)Kdz}g8ZZ^B?-m>cg$)PYq?vc3sR0&l_l8dP9$@b&F*1R2;=
z78fkYw#@kjGIX0bE=FGe<TC@CBRRx?wdtw8w-nZI|0Ut;Ck;Xa4AF@#D{w|L`@gw2
Yr)z1-OO^it1q?Fgi%D0TvtI#K#?5)3BLDyZ