From 6d2331729da814ebbb5e7e9536a89d98d04e6db3 Mon Sep 17 00:00:00 2001
From: uporotiy <uporotiy@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sat, 2 Jul 2011 05:06:59 +0000
Subject: [PATCH]  Detective's office No longer noir anymore. The monochrome
 effect was lagging people who saw it for the first time in the round up due
 to the icon operations and it was just too high of a cost for this.  Kitchen
 Removed the chance of xenomeat being spawned.  Hydro I accidentally a default
 icon_state.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1754 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/area/Space Station 13 areas.dm |   2 ++
 code/game/objects/closets/kitchen.dm        |   8 ++------
 icons/obj/hydroponics.dmi                   | Bin 84144 -> 84147 bytes
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/code/defines/area/Space Station 13 areas.dm b/code/defines/area/Space Station 13 areas.dm
index b099f1061c3..09ae6afa069 100644
--- a/code/defines/area/Space Station 13 areas.dm	
+++ b/code/defines/area/Space Station 13 areas.dm	
@@ -766,6 +766,7 @@ proc/process_ghost_teleport_locs()
 	name = "Detectives Office"
 	icon_state = "detective"
 
+/*
 	New()
 		..()
 
@@ -780,6 +781,7 @@ proc/process_ghost_teleport_locs()
 						var/icon/newIcon = icon(objectToGrayscale.icon)
 						newIcon.GrayScale()
 						objectToGrayscale.icon = newIcon
+*/
 
 /area/security/nuke_storage
 	name = "Vault"
diff --git a/code/game/objects/closets/kitchen.dm b/code/game/objects/closets/kitchen.dm
index 330616965c3..cabba8cb4f9 100644
--- a/code/game/objects/closets/kitchen.dm
+++ b/code/game/objects/closets/kitchen.dm
@@ -44,12 +44,8 @@
 	new /obj/item/kitchen/egg_box(src)
 	new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
 	new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
-	if(prob(95))
-		new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
-	else
-		new /obj/item/weapon/reagent_containers/food/snacks/xenomeat(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/xenomeat(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
 
 /obj/secure_closet/fridge/New()
 	..()
diff --git a/icons/obj/hydroponics.dmi b/icons/obj/hydroponics.dmi
index bc11e52d6e4e52d32bfccdd90603f4902ef8fefc..1f0ebfc5d477d25277e70a827b1faed2e017a151 100644
GIT binary patch
delta 734
zcmV<40wMjdkp;7n1&|~G(vc-E6_GTR2+$-!F;;#1E@WwFHNiZhT{MwtA%CX6I#dt$
z+fC1=>(lhZkSK9=sJ`^)Hu@Cl{AIgoO&qF2b+_I8iFD-Y-~UU;ql#;e@%*)me!MHN
z_XYN$!0rp|V}bn++MeQxhXm@Dsa2^zaeT9Wbnht|SdWxA!n$X&smD0FM1SJ=Mwa6z
z^l`gs+0wZ>RCl|}9~s^B#*+yF9Dk-a)|iG%GM+gY^UT4dXAXuvb1?6jgOQtt%ThND
zW5ILRq37j7^}rXZhrLie=!NPbFH{ehyAD4ox$D4#lDjTga;Z?mr4SC4LpW3t;ZRwG
zL!}W8m1p8;i3WeJnH-p8uJs^ut>>6)J;q$?Ddt)aan_|7LVGv)BPCyCv6G|$7y<T^
zy#X74hEK*ZaBj>LI5cJooES6J!#x?tHCe0o0~Di2w@rqDwn{M2R0#%JD#1WQHDS0v
znmDu}tf@IBv_Z<Xo?fo?_+|}F`{->8&UvBwgcqvM_ULVkHvZ%iN4W17jkNuuk*<Hz
z;B#!`*ie9<WEn@EWf?~vPZthNJ=pgnI&ZOm`lQ9`GoCCoU2+{;aJpjk>5A2-J6UYH
zM{*_+I^j$MQ_eIn>5GO>j3zRNTbyEtOB0y`@Q~!cDN>XCC)Y$jKDeJ*-_it2F4diP
ztZzUb(h!jA$C0_kr1O?)wis@iQjgIgL^=nGX}~6nc8H4wI>f~S9pYkv4w1PXupQb<
zQ{<X0_-nXmEQ>3y$8p8=M6S3VO3Rdb$0=Fx4ksUgt#>^_U-Ei{zUuXevV~)<Up@lu
z|4NcA3biQDq9}_}EDEqNyCG1+qmRdvAp<l4#*<b9DFH*1fCC~Mbk>hUAH6?<g;)*H
z3$YrY7h*L)FGMx~T60a4y#pR32j4I2=tmPihWS_Q+g<i|dsF>-eX5>bp11!1jBWaD
Q;#Uc^gZu-x`~v~BM5L@@-2eap

delta 731
zcmV<10wn#jkp-}k1&|~G&ygiB6|ppx2v8(JF;;#1E@WwFHNiY0U9^#DA%CQ<I#dt$
z+fB!&?b7s*AyMM$P<`pnP4p?!`O9|Gm^f62>TbLF6RGFv@Bd53ql%9l<N0eF{diYk
z?+ffhf!!C_#{&Buv>nA04++!_Q=?LU;`nC$=-yK_upTLKgmuScQ-^VMiT=d#jV#Ac
z=;L<Nu%&Z#sP1-`9~oVD#*+yF9Dlkq)|i@0GM+gY^UT4dXAXuvb1?6jgOQt>%ThNr
zW5ILVqUYs8^}rXZhrLie=!NPbFH{eh+ZI15xoyFNlG`>|a;Z?mr4SC4LpW3t;ZRwG
zL!}W8m1p8;i3Wc@GC45GT<byRTF)`pdW^Z&Q_Qs<;;c(Eg!XRoJtbdcv6G|$7y)*Z
zy#X74noq_taBj>LI5cJooES6J!#x?tN3vG$2Pj65Zkr4PZIxi4sS*sdRDywqYQk`T
zG;wG{Saal<&;}{jdV0Cm<C`@!?cUo4oby8U2`^NiZSQS^HvZ%iN4W17jkNuuk*<Hz
z;B#!`SW|$XWEn@EWf?~vPZthNJ=pgiowrzjebQp}8BZ3PF1eO1I9;*&bj9k^oh&xp
zo}5X9PB_!Rlrs%X`l8_zqmIns7N^+ZQb*<hJS6#Vic}~6$u-fB5AJ8yw=}_$OUKqb
z);AyzX$Z*m<H+1#(s@fqwis@hQistYL^=nGX}~6nc8H4wI>f~S9pYkv4w1PTupQb<
zQRE|A@YitBSQb}YkK>B#iCl3#l!hsFj#IMW9Zo&~Tkm>=zU1`?ebws`WedkzzkCGR
z|CJ<L6lzhPMNt-|SQKDkc0-_=M<4r>Ap<l4+LKlTDFIEBfCC~MwAPP97rpPnLaYYp
zg;)*H3$YrY7a|(~t@%iky#pR0hl2hX<X^9EcUOPbKiiw?*XvXD^zyv@2j)ilQBoI@
N6NCQ)xBmkHv_$UTVa@;m