From b80a1bd055b632f4d45a4ef5f2dd588ea56dc27b Mon Sep 17 00:00:00 2001
From: "bizarre.babel@gmail.com"
 <bizarre.babel@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sun, 20 Mar 2011 00:21:13 +0000
Subject: [PATCH] New map is pointless without the .dme that includes it, derp
 derp. Headset+Earphones=Earset. Because headphones is too long. Sprite
 request fulfilled. Increased limits on cyborgs at round start. I still see
 people killing themselves to become cyborgs, so clearly it's in demand. On an
 average round this is potentially about 10% of the station, but that is lower
 than the number of potential engineers, security, or medical personnel by
 far.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1214 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/global.dm |   2 +-
 code/game/jobs/jobs.dm |   2 +-
 icons/mob/ears.dmi     | Bin 455 -> 533 bytes
 tgstation.dme          |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/defines/global.dm b/code/defines/global.dm
index f31a504f333..fd6f77ade2e 100644
--- a/code/defines/global.dm
+++ b/code/defines/global.dm
@@ -103,7 +103,7 @@ var
 	cmoMax = 1
 	mimeMax = 1
 	sorterMax = 2
-	borgMax = 2
+	borgMax = 5
 
 	list/bombers = list(  )
 	list/admin_log = list (  )
diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index 74ab6cd35ce..6aa389a62a1 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -14,7 +14,7 @@ var/list/occupations = list(
 	"Research Director",
 	"Chaplain",
 	"Roboticist",
-	"Cyborg","Cyborg", // --DH
+	"Cyborg","Cyborg","Cyborg","Cyborg","Cyborg",
 	"AI",
 	"Barman",
 	"Chef",
diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi
index 5edcb2298d9d5e4a437f5ae3773539f4092c0e84..08b53b870b298203417cbcd283b9166066d4664a 100644
GIT binary patch
delta 427
zcmV;c0aX6S1C<0{iBL{Q4GJ0x0000DNk~Le0001h0001h1Oos705K4J_y7O^Ay7<I
zMZmzol)tu#iHWeVuu)M_Y;0^s2ndY|3SkfsUJ??(z`)|~+{*v}00DGTPE!Ct=GbNc
z004=RTy=ke3W>28W*$*C<8z_1f~%hkIE(-k4pla<yph@f009k2L_t(&f$i8a4uUWg
z2H;A8=;jeP0tt&F3%i2{An^i@+(6w-9K_p7jLQT1e%daW{GT%X6`#}yePRr)#RiV;
z^#TbTEA#>-8npWRXJ40NvmZf3M6^^>>lw+0hn9a$*60Q5@6(+}X(In^u59vFFVGF!
z_TtW_yXpn{VcR|2+4Oh4K=c&opT+iaHUSMS5m5;5{@`>JF`z$4MXLS#1F>9&EUse3
z59trYivKjSA9x$wAIK?GC78mwDkdd}h=^8X)E@*$@h-aPztiZB0EF%cK)fSBE-#Rg
z{MJLtd}wF)Q^-@)2As0uDq%<2`w(ovRU-r0?+9ixG@i5XcMy31dEcrTi~S|iLLb~C
VBvlG3rp5pO002ovPDHLkV1o9jwhsUR

delta 348
zcmbQra-2D)Gr-TCmrII^fq{Y7)59f*fq~Hh$W~xs29gtP_ml%Exd5LK*8>L*1O^7?
z<m9+<a7@|1t(S`{Q9z)xvolUeXv2mLzJJS-fGQbFg8YIR9G=}s19F-s#+TM7aurIg
zT=U@7bEa=13^!fu_Rf+jd<2v{>FMGa649ERAi>%!%)$BKIloB)lT%F%o0?+CzC}#F
zcbgem4se*yXH<5O%zUF1a)9UPjvqW{*d(G1TqZDbI~uYl-DP7-bT}i{F#Ei~w62A$
z&McA}ghjL!4p#E;<T{+W2o%3Ct-KK|;iI5(!gJ4KhlW>yJ!k7e4A;a-ur5vz>0z>B
z&YJGJHpHxd^4-Q&&kUD8)ZN3*ydYn=U1ov71wI89wpsxr!7!r@2^ZQI9CEO3V32si
oc;b%Pjnj@<*HwTf@OU#YWGM1&a4$)&2l|S^)78&qol`;+0D}j3lK=n!

diff --git a/tgstation.dme b/tgstation.dme
index c5a9c43b4de..5425871871e 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -765,5 +765,5 @@
 #include "code\WorkInProgress\recycling\scrap.dm"
 #include "code\WorkInProgress\recycling\sortingmachinery.dm"
 #include "interface\skin.dmf"
-#include "maps\tgstation.2.0.4.dmm"
+#include "maps\tgstation.2.0.5.dmm"
 // END_INCLUDE