From c1b1270e8ed9e48aefc07160d8d94aa5e90d03dd Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Tue, 24 May 2016 23:31:17 +0100
Subject: [PATCH 1/2] Fixes a toy having the wrong icon

---
 icons/obj/toy.dmi | Bin 32989 -> 32989 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
index 37785865d17d0c16deff3920ba50b42caa6204a7..0f56c51d230268164d571140ebfeeebc53c9eff4 100644
GIT binary patch
delta 606
zcmV-k0-^ogfdbuu0+2d?v2NTj42Ea>DTHLb7QO2g=;EbFP-IBnfwpLiIZ0F~Igan?
zJ2YsnNemI541D^@pCV~rn_suT?;gy}{ayQvl8K|~%<=2Dwpqv)XFBu!&^8Wfa^>$!
zE>O^P=4xaJ7NlIYjU~yZGsm_W1p;Q%nf)6$K$_<GhV4JcMusqd2<P1MQiXGblsMJ7
z)bmS~TA-lx;5~Ca&wiF%KBs=PjYSWu>CArj`m~K_PVXdyPq-QBlLMCte!<Oyj!RBl
zOlS7T-Ot^HfWTBWCNO#0aCUfecGz7sfl%_e7GCSuOM-gZA{3{`r*(oCmF_GMZ4x?f
zR`DO}IG%K50D;+mqUh+10?BEWXRp;|yXK5@*3rqqnWK&^4h7OGXtgK{#7Ql@qW6lS
zf2AkE?csS3_kLEVk!DH0PWPPWxH!s10S|$z4CG9?K-`$UOR@yc^#nl*MvJ1bBK5t{
zbAd=(JMaHRUx4aYGk{E7aBy`}QD6tjtD-s_HBeAl^}N)7LlV>(iv@>5&vmCZKh02|
zK#UVbR9wDOd_SF{-JU`fd4x!X>nXv6iYf5a3y7w;p<b>)L9vD@Dhe7YK0^IxgU%rJ
zyfg^+TxihrYaR$=QIR<CIMSf-o7ZTmUc3dwDi-#H5tVLIUI)jXClw3=0WA&n$&tF6
z6^@wvoZY2R^Nl}Wf~Z9YkW^tC!G)rIx114EKCRj?Cn^O$CbiYjYe-HD2cGlC%50AC
s8N_PooXDbR=@DcBwX~znEqHBiA8yRe{ayP9+h^ARF@LiAvxWj!epj6?1ONa4

delta 606
zcmV-k0-^ogfdbuu0+2d?!A|5b42I9`Q$%o`UG1=}w3l8GXvG2E!A(4knIsNQO6ffP
z9u_Slpo-N~r7yqzJGR?Pb949S{?Xh%-1jdig*chPTz~)3cMG}d&0v0B^_@qWeEs)Q
zDpWLsxi~OH2U0Kk&XE)|nCref2t+JqF#C7VLZ0UIj_tq34h+$M3YRkS(u7NboH@6-
zJo0OkTA-qg5CU^M&vBMgzovfmox=dD8O(n7_Vis~&L1R%kGL7>iv#Bge#6a!o@>cm
z&0zM|yWhJr0fDJ$OkfJM;q2<&+12i>350UMwes4&UJ}&P4xxHIKCKhHs&r?8<g(Cd
zvx@&&&*`WmBM8iY4n;>76v$qyJO`~VyR{UYi;m77PMmaX^(c^6L8nDoAWdrF6+=)A
z{Tn?AZV%5#cnq^TjXX;ZZF=M~r^QpL3fM+&GEfSY3Tb2Z&dD0Nv=aoWm>i12inRB_
z1mZ9$)GXu*)V>-EGI2%g+oYnv9&%7c^?1-gk+#<RITv_;X@?|eGY%`-N-u4vt~}4s
zo<K|!B~)COSA0LcqTQZj6M2F}mD?%7go-H$Gzy5OxUpTXNKvtdNz?y{(i60QHs}P>
z&P#*v$d#<7UyCJ7RYjuZ!-1^AZ&{P0cJUSvr&!n%CRDn~Wwo9IPbwG$B093|$&t32
z6Hb`JT>QCE^Nl}Wf}}+)NN%v5;6llL*x-n{99M0aBh`wZliF(NHD<4cBhTe?Wj06n
s1md)G$>dP9^Z{f6wX~<rEqH0}9&gR<!+rl37m3#7xvEsdvxWj!embi!&j0`b


From 6ff72935853848ba237c2c61678fa67a3aef67d9 Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Tue, 8 Dec 2015 16:21:15 +0000
Subject: [PATCH 2/2] Removes unused Xeno stuff

---
 code/__defines/mobs.dm                       | 1 -
 code/game/mecha/medical/odysseus.dm          | 2 --
 code/modules/mob/living/carbon/human/life.dm | 3 ---
 3 files changed, 6 deletions(-)

diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm
index 8bac7f560ca..df633d1ae54 100644
--- a/code/__defines/mobs.dm
+++ b/code/__defines/mobs.dm
@@ -13,7 +13,6 @@
 #define GODMODE     0x1000
 #define FAKEDEATH   0x2000  // Replaces stuff like changeling.changeling_fakedeath.
 #define DISFIGURED  0x4000  // Set but never checked. Remove this sometime and replace occurences with the appropriate organ code
-#define XENO_HOST   0x8000  // Tracks whether we're gonna be a baby alien's mummy.
 
 // Grab levels.
 #define GRAB_PASSIVE    1
diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm
index ede4ccf410e..65ed711f2fd 100644
--- a/code/game/mecha/medical/odysseus.dm
+++ b/code/game/mecha/medical/odysseus.dm
@@ -101,8 +101,6 @@
 			holder = patient.hud_list[STATUS_HUD]
 			if(patient.stat == 2)
 				holder.icon_state = "huddead"
-			else if(patient.status_flags & XENO_HOST)
-				holder.icon_state = "hudxeno"
 			else if(foundVirus)
 				holder.icon_state = "hudill"
 			else if(patient.has_brain_worms())
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 9790559edfb..497a67fcb76 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1584,9 +1584,6 @@
 		if(stat == DEAD)
 			holder.icon_state = "huddead"
 			holder2.icon_state = "huddead"
-		else if(status_flags & XENO_HOST)
-			holder.icon_state = "hudxeno"
-			holder2.icon_state = "hudxeno"
 		else if(foundVirus)
 			holder.icon_state = "hudill"
 		else if(has_brain_worms())