From 921249a335c85ca796d8808865a52de556c7e2db Mon Sep 17 00:00:00 2001
From: Raptor1628 <fdlisle@gmail.com>
Date: Mon, 8 Dec 2014 19:12:39 -0500
Subject: [PATCH] Hardsuit Fixes

Should merge now, was missing the .dme. Fixes #7307. Adds helmet cameras
for ERT and nukeops. Fixes incorrect lighting overlays. Fixes a weird
sprite.
---
 baystation12.dme                              |   1 +
 .../clothing/spacesuits/rig/suits/combat.dm   |  20 +------------
 .../clothing/spacesuits/rig/suits/ert.dm      |   1 +
 .../clothing/spacesuits/rig/suits/merc.dm     |  27 ++++++++++++++++++
 .../clothing/spacesuits/rig/suits/station.dm  |   5 +++-
 icons/mob/feet.dmi                            | Bin 26523 -> 26514 bytes
 maps/exodus-2.dmm                             |   2 +-
 7 files changed, 35 insertions(+), 21 deletions(-)
 create mode 100644 code/modules/clothing/spacesuits/rig/suits/merc.dm

diff --git a/baystation12.dme b/baystation12.dme
index a7176e3b98a..112c747f103 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -819,6 +819,7 @@
 #include "code\modules\clothing\spacesuits\rig\suits\combat.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\ert.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\light.dm"
+#include "code\modules\clothing\spacesuits\rig\suits\merc.dm"
 #include "code\modules\clothing\spacesuits\rig\suits\station.dm"
 #include "code\modules\clothing\spacesuits\void\merc.dm"
 #include "code\modules\clothing\spacesuits\void\station.dm"
diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm
index 8774a0310e7..55716179c6a 100644
--- a/code/modules/clothing/spacesuits/rig/suits/combat.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm
@@ -1,5 +1,5 @@
 /obj/item/clothing/head/helmet/space/rig/combat
-	light_overlay = "helmet_light_green_dual"
+	light_overlay = "helmet_light_dual_green"
 
 /obj/item/weapon/rig/combat
 	name = "combat hardsuit control module"
@@ -22,22 +22,4 @@
 		/obj/item/rig_module/power_sink,
 		/obj/item/rig_module/electrowarfare_suite,
 		/obj/item/rig_module/chem_dispenser/combat
-		)
-
-/obj/item/weapon/rig/combat/merc
-	name = "crimson hardsuit control module"
-	desc = "A blood-red hardsuit featuring some fairly illegal technology."
-	icon_state = "merc_rig"
-	suit_type = "crimson hardsuit"
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
-
-	initial_modules = list(
-		/obj/item/rig_module/mounted,
-		/obj/item/rig_module/vision/thermal,
-		/obj/item/rig_module/grenade_launcher,
-		/obj/item/rig_module/ai_container,
-		/obj/item/rig_module/power_sink,
-		/obj/item/rig_module/electrowarfare_suite,
-		/obj/item/rig_module/chem_dispenser/combat,
-		/obj/item/rig_module/fabricator/energy_net
 		)
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm
index 3a8fdf6cd2f..f5d7a2f71e0 100644
--- a/code/modules/clothing/spacesuits/rig/suits/ert.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm
@@ -1,5 +1,6 @@
 /obj/item/clothing/head/helmet/space/rig/ert
 	light_overlay = "helmet_light_dual"
+	camera_networks = list("ERT","SS13")
 
 /obj/item/weapon/rig/ert
 	name = "ERT-C hardsuit control module"
diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm
new file mode 100644
index 00000000000..7a0d95a4bda
--- /dev/null
+++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm
@@ -0,0 +1,27 @@
+/obj/item/clothing/head/helmet/space/rig/merc
+	light_overlay = "helmet_light_dual_green"
+	camera_networks = list("NUKE")
+
+/obj/item/weapon/rig/merc
+	name = "crimson hardsuit control module"
+	desc = "A blood-red hardsuit featuring some fairly illegal technology."
+	icon_state = "merc_rig"
+	suit_type = "crimson hardsuit"
+	armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60)
+	slowdown = 1
+	offline_slowdown = 3
+	offline_vision_restriction = 1
+
+	helm_type = /obj/item/clothing/head/helmet/space/rig/merc
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
+
+	initial_modules = list(
+		/obj/item/rig_module/mounted,
+		/obj/item/rig_module/vision/thermal,
+		/obj/item/rig_module/grenade_launcher,
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/power_sink,
+		/obj/item/rig_module/electrowarfare_suite,
+		/obj/item/rig_module/chem_dispenser/combat,
+		/obj/item/rig_module/fabricator/energy_net
+		)
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm
index 9abfe498557..44959068eb4 100644
--- a/code/modules/clothing/spacesuits/rig/suits/station.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/station.dm
@@ -59,7 +59,8 @@
 	offline_slowdown = 3
 	offline_vision_restriction = 1
 
-	//Todo: add xenoarch gear.
+	helm_type = /obj/item/clothing/head/helmet/space/rig/ert
+
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/weapon/storage/box/excavation,/obj/item/weapon/pickaxe,/obj/item/device/healthanalyzer,/obj/item/device/measuring_tape,/obj/item/device/ano_scanner,/obj/item/device/depth_scanner,/obj/item/device/core_sampler,/obj/item/device/gps,/obj/item/device/beacon_locator,/obj/item/device/radio/beacon,/obj/item/weapon/pickaxe/hand,/obj/item/weapon/storage/bag/fossils)
 
 	req_access = list(access_rd)
@@ -102,6 +103,8 @@
 	offline_slowdown = 3
 	offline_vision_restriction = 1
 
+	helm_type = /obj/item/clothing/head/helmet/space/rig/ert
+
 	allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton)
 
 	req_access = null
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index f738d072fdd1bf2c33c14cfb93bf7bb9d3e68fca..afeb796a299127f2e5637514535f44b25b736ed7 100644
GIT binary patch
delta 6574
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
JDOR!y{U3EoF3JD^

delta 6745
zcmcIobzBtDx1XhvS`|@5U{OSrl$I_jDT|Z_=@2CZVQ568c0p+bL=@@nRFDSA1(pz&
zT9EFIH~!vV@4xrQd-M71%-(bF+&SlbPu+tYgryC_N?&PR9IGtV_50yE6<^tKSN(ea
z@`j@wDpKn@>=mj&O9=GwiS%meLOPtr$(|-Z?}f8I6>2JcTnv{&PxZK3itbcJ^eb3O
z@Vc_$n$$4l9y@>T*M0q}G27(tGZ}GB(IH^{FQx&TlXLy#&(G*o*?39UDQ+KcZ|jBj
z@L#`v(a3yENC*z6yPQ)|A^N;X(O?<V;M2<zeZRs}T?NUFc98&kg|-6k6)05BTX%TY
zt)A{C5Ws-CH)U3J-bB*<iC_P2OUI;2Z)|MDE8jX7H&c$sq%>`weIDI5XC}cPaplE1
zjs{fn(vSQ<L(jlOuS+FzweY5>$Ce@~L!+ag>*d77#ml>Gm6eoWobEy<=1Ki7Hd}FC
z$Z20z?TJOL#mIBp)`1uB6(YhyE4y_@t7NT>>Afq^_#at5@GB6yHsvZ$4xD+reKbBI
zc8?n*3$V<dCUMg~kEXn3YC1eKL*Iaj4Uj=`X<r53%(uc4laj1f1~Tw+SlmE{%tHf%
z2y$x1uSEE4r6USYJlo1GETlItkz5xyFS%@IXXi^I9EmfLZ4jX$0|SHaA=-Wim4&Bp
z9(QOFI!G0FUg9KS;&x_U4la0fSoxkc^?gY*adexi)RgzI67M-I>>NmnJn`?D$lzlV
z&vhAex>j3i!bVcSgqO>GS3e|Wj`@-tH&H>tBzO7u_6pBpvKl2Ny@{YC^&q=(Oh+1<
z4eGD<O>*yzWE6{zj#kZd(d#Yp2Y#v#m*n96{r!vP!FSiWf*#jY%gYAhrB2VzItC7o
zjuwx17V%dFuB;LJIG(HXTc$#+r+$#RDq@>1?{yU#tRA6?bl5I$f2qdCQXP@f-bRto
zM$&M3*7)J24FEN#gA{ZRa3NBwe)cYWwe>@FGdm`TCIs>J{A+BIp>6(16uE$aub9j&
z{-Gy{GD|+`8K^AXYgF{~^On=Js5V`8vJEt9UY8v-*-q>T){`eP2P?)~<WA5T?aq@Q
zf2@~&)B8MhZmUZ$|Ke@+SZyhU+B&(S!E+W7(fmE<###A&KYy5_S3n;7wEN8~y7?EI
z<N}1Riq0P#a*4i_ULL6W^CQZ;9~Jb@GqTZl=gljxy4vc&iMT@6kvi8g0RhjRgd4e6
zXY;uLFa$w!{f^#M`s2wpRYv8uO9BGherLiUk!+UC-CZH{!v_|KlMZ)NlOfu9rBGPR
z9o%5|fZB@}cSRJ4%;xT#Ej-W%Gf!uIhDS%kUf#ipF2lCZ2p-ZIjqj`G0_d}5%5TDH
zu5;~}KQS=qDQVn&$D^reXP1{A?<=I6?w}3|`?98_jFj1S*XSQiIVVs1!z6&vKm|`P
zX|qAzElpZL2~KhM{qC+OD-Gpi;1`u;1=@qqo8|!V*4MYzc*&^(J@orG+0J;?#@@lf
z!9~UhrmOV4f`SokYpRbQUo565u|}8Q#N&r^vp#+MMoSe6bI$Z7)6vnnnDpLB#R$Ak
z5q48$mT10&9k}m2%{o@aI?;Sg7EVbw^rD*102iYF#|tktKJ79DlbZb<G6?Xqs_d$K
z2mV2AwJLmxWsjemhudl(M4_EhkLh!8Aa_2EQMC&#(G5$>Z(2>!eVYs-KHJ{6gqA2<
zD_`JWHXhO`4KRNAH~#YFsdz9sK5RL+%cE_C+}@a#f{PXK_@gQVD8i8o{CpkImZ@<Z
zD$r{zm#1=cS+13^EArC98K{m4fmi6MCf#n5S-iPN0XVqIgr;`YkH){(>bEhIZL>_3
zNMmrMBB#O!erBUL^5cWCxuS2w5D?exQeNwcE>$M;dj~eBg|gs`&z2aVX!wzCM6?B_
zd2Zh0C`%DZmYjLQ02vJc9ARV_M(nX|E4aupCsrSLF|W@rgYT5~gWjzUee+vvD+Kb8
zw%+*9z`h?0$*c&W+4-8}ady>)Y9MnnIX;jZH&LRlqr(7+tudaTL(rxU^zWesYTw)z
z<5bodwE?H6Uyj8`_f*%cK*LB!;$h;&O?&D1LcMUbEM0iG1ixTq%xPvK0H;ubTWy@?
zgPnNFI>^+Ae45E;O;H<U!HD|$XC6KzMl&<P+GlPM*YL(a)PQeO)2a+7N9C=M;bd4=
z31?IUD?H5hSpLj3Q1{;X;Un~%G8~!U0REe_5D(}i5!^)sPfX;R38n1v77Cs(_n<F?
zW^vY^+Bukq;PVRVwU*eVeVYPmy*It<&IWuCl9GuYu-4XAfQpJrEkIA}KQ<wJI6kp9
z8?XZUZvPxYKzK%99#lubRTpxUDahJNZIm>qBB)*udDqP>W?pKkX$EzD4qd3Xf?J0W
zB1Lt{BiqkMaVuhtQQFRe!eYPt5s()3?F@*sr_vdN6HJgCk!)8xkaS8K5fjsqKciPv
z;K&yw!dyEOc)U`uFU@OJK}vz9x+0Z>rlT&LvAWiEWdKsw7*h!Ek2oyutKAWmsqw-Y
zjNxo?<3%^deL&e$>vDAYi<m~c#Z=Ajd)?!=nwv`neRJ=UU%C3@&(A&egL@y~S7KPD
z3=id=un)!I&Wybjg^uu+?C(42>HSokH#0V~u3u@SM~wa+!%@yoF;EG0pozBu%OPCE
zaB}d>jO^10;7$*_r*#g1V0IW88CmeGd$G5yV^qXKqYR30-v)ry&CQ56d(BZ=YWKf!
z(R7!Z2-Lpb<9Q}1`Fms};Q%A~5VNS{6-RyP(xs_>n1|FgPhDL`EiJ8h6e_fvMwT&B
zB{1M;K{Az`UEK{YcE-qO`uagg<c0qI2U=SC`ugyv{vrW)Sxe_H;{c;G{D|k~p59BH
zhs<|bm3+b8PVsWycRrQTh|wS~fr_%jV!?^GCHxv?gWvL)f=UP$kTXN^me^rH!Fxod
z{~)VPV#Z32&aVkj(opk1W2FfFcvo0B$Z}gmkRdR;p!h<b8sr3<oAwBr?jamy^ZB92
z0@+!^BFm1c5T6n$+8P=f0Km=7-D)e+w%`H&^71M}({?X-{CdzZV3ns!{VF3m${Wh7
zlO0J(DeNmtOAfa=)oedWrf6HOR6UE9Mn5r>zs>Zl`CJ9MZ*CewE<H2-?PdwyS-U4a
z6-mb8La8(_!CP{2!bbhH>gFynhgTU+p@9sWTFLtG`0*oQ-!)_^QuSIzO|x!|+a~Cj
z;_BUDGUbA{s5G4Sj_>J9XT(p#_WuB-f9JXi=g#KlI?`2P<1@05Z$XH;bwGhM%nRg{
zJEbLIoT^%}o;QxhS4O9j?JX^Vs3@{xbA|&q-W5*O@eUBbQt||3+$<^?2_OxQ_YAM6
zAJpy>kB)@%HG|BB5QsU^0`M&M8+8yR>GS8$rAH_vGJ;Z7JZij%gO~58(g_clU7poM
zd9kPX0UsY9_UU(n9h>|S+PE(A+~HrLC39Pbk3ChBKXluM3_FB%Ee4OQEv*<9nTYdS
zrSOg=>CIMEHQ6m*t*hVF)M+M%2)itQd+eC98yeC`h0hM*LHc|~AYXtToea33{Q1jg
z00?PAP$<pQcIVuWu8e1Ds6o3#AZTc)RG6|y6PcHUo=NrTh9uKKQbKn5y7c^ScS$iL
zXH)b#%WoZ7sl5FB8+RYJ23ru$YD2PjUqWFLG6Ub%-oEr$$UOG_7QD-Y^*w*j21eA3
zk6F71WDMXo!Nm@ywY9Y&TzIK-Vz4pa-_O|-k$8%*2<67v=7+cBb7#*@LbjondtN>(
zuEzV~g$u%B%qDS@Xf&<2`R2G3&U|Zg6MLGGks+L-z3nTDpL7tr&c{dR>grm6);Bi3
zy@JImA-RE|uEm9w_i8tQ)|I_B2eEb!=a|)4b{R3yG0F{7|MdA)ZPc2mk@EF-*QKSU
zKdI>{LO#;#-M}t)S#Z81x20`xPU`Dp9`X%eY<Z-x&9b(bq-5@T-p8lk$ytUryk*GR
z5X7zA8$eK=w@j?KBstJ*R(Z`&NpY{prfNT>8f~p444<D1eGr-zdZ1dW*f;PEb825I
zZEwa*3PF5oXkc6Gj?&Q7A(y$eda&w^IyOYy>g-g@*cCNdXJdBWt@>^FsO;pPF&ybJ
zya#1R<v(KPOnp31m30H9U?f3aRK$StHF6MgaSg|~8S11_67PqH$8$$fgAEu)fQBMe
zYU@=_6+x89S`^6@NbFQH^TMKbTTx8Ll593MxnDH(o<6-aVg0pi5o2VDrBsGp0i2wj
zpQ5acdB~gmiKutR0^r(O@Zd^ErQ=9^VqzGdVKJmgE=bW(qGe}i_h~_2L6_M?x^=~}
zdunRZ`uQn0T&pn9*VAKy;*`hfzGGry;-}nPn|1*Yi7+T80f6lEBgTNzU2+;+%#f#`
zvYA;%EJH_WCR1mX^F+JLE9nd<P|&1_NtsXAW894Tz~>rBiigY(r9ci7z09Q*x|Kl{
zEt9L<njz+JU)*B>Xwl@RcWpz%$yTr>9OEWQ(ZrF%+ioqfH!pcUmGLji_>;YoJe<B&
zNYi&|xC;miQGjc`ZFbC{ZQ-{1hKU`?ubQSxOhBe~`peVj{6ZBg3ez+pTHR_EF+Q^q
zO3dJkwY|ZzucdH5rPek>XFG_M#$};SJUg#|KvHycG%T#yFu}C(!^e-kRH4BNiDQgp
z+H-5K+P98!8yla+x&)USruBbugnxw!2*(Ip;<mkAaX|sHil%k=EA&JQzADuH{rk5*
zR2Nkp+lwU-4V%fb{o?XSNdlH%2F<I$Lxmf^NxJ!>eLO{$Q4x<mo`AA4Lb1-5g2tS}
zyB6D$_zdTFd@ZX?x?ZNy4v&v_`Xl`O{2<cytp8RU)-&cT6FNzG>gdGuk&%Xm;1LlK
zLy!{z_@}IRRugJa4FW*-9z859L>?ETKh?8At=vt|H)piZ*lfZku}A=Io%yJQ%-TC1
ze4M8S5A%I}*DlbT*N35siu4DxCdj-=K69_xR&Ed{AqTRoHu9x2b3AfzkgnBpgMQ<5
zWM6bsLPqj+!zn?)ik1p@Df#Y5SmLPIjOc+m1f0V?;y{G;-xNQgM~_B?ZNA)gF;aHS
zwLrpYs61xZeylwP^M$>7m{%!-KfWxS3T(-$@r9KBny<E?;2kw}%Us-+JW(p}bmSwC
z`6TbDb{b_m<Uj0ZW{#ob#{{CVoE^rYf2ztkztqoQyn7`JEdEwp{ywmU6OBeYxVVho
zjwH8U09kx*5K3fA#1p*Q0xNZ;0R$J<LZ$}kj6i&G29k<zhk7cTIXT^dROhkS$pF-J
zb-2&e24`n;?eFhv^8#^Uy;x;ve(T+ludM7Oti}|lmDY73J_&1!wLUVOjWoM_az8pf
zs^n%NUW?6$4Bl^mNEE(3$Ekz4_NL0<uXn>g`{D%gY%{elE=HfDdtK_|<D<fSztnm1
z40MW<F>Kl|cbgm7Ea%pImftYVP=OA~q~o9<hXo2epx}Ql3PHtJa?)GyFli6@he?BV
z|AwQRTW3ytyVceMpIUQQvbK5ls_XuWc;t`X^E45+&gB-R$z;3GmXEJ?GO%rT5(y3p
zBf;b?SI_#k%ACk+I9vN7jNrYrEeYH_AWx5wf#G5d;jCl!=!^hoSZ8XPr5&GsXlmNq
zwQPe0?eyqyQPvVaLQYTp%=ixyXSzwyd8B@4<F!W@MNk#9v8A1W+xR-Qn~$cyEJr^%
zVx*_L`=8mi&)OW`ZunsweHo~Bo%Wuf#uy>PohORhEQKKef^Tu>4(ms|g45M&PEJm?
zab2MyA!PIn4EF<gbv~=-9G>K3p<tIRZFg=!CZqPnBF`3!y;0wCsZ9f>SWEJaSR!Uu
z(cw2|8vU=3bS375)YJ$|L{Mxj;}RB|{qN<5o7}k!VTE2`dDSJL-A@+M;|vC4BQTzv
zz)j0ianB_=Z+eqa1{}BM2-!XJS{>q=rA*1l=#R6QZ8CL5Tb)KSvi~t_Zr%KA@mz&J
zq@uhJl|bKE8{lumeogunO@;kn=ln|Wd3o`>iC7oN)XKQx3JUI|uy?hSVq#*XB}m!L
z&6%VDm$%^xiFQPlZ4e5`e^cx;Sq+shc+mt=dO;FbS4)7iej6Jb^mN1?!}05JW9ERC
zHqS*1+E$ZIDAifo>Ay6#ggkg)Wp9U@g2sXs&X<_#!VzKOWnp&m8LEpy_H=K}VB9D|
zIym`}*4L+O5tyqei_%iy_BY34?_tm5o3tz7){;WLUdB1o3WbM>QDGRjNN&wl?*^-C
zBghLutA`sppDyvQiJ0<3#10-FwW+TxkOcL!na$@L>d|$xnet<|U=k7%>yt*eJpB9a
z?fOX2nf4YNVXw&WRgA2?M{~DAwowO(I}!Pt)8svgd<nd1AxTo-guP|am|Ut*P}prb
z*8foU@~74b+5-GKU1y!w$Shqry0(1^?na8wC90!02lc5sjCc^I5o(Q}Mi#bOQUZ>m
z#plE4?(JAj+|%HD_oT_alEu~*IwX>L{EzO~`UCilZ+>fb8J^*-P#egNJT0n3+=U3M
zP;xZYrbp2Hac=v13sx>jocO5l-sa`Xr<Z>vVL-;qmMCa24<2Bd_He1GsZTgLzkU0b
zpu=<V+_`fR43fNaoH*{99b{r6#nHR#jm>x~9Z98kR1Z4MEr`N1eD5N3G@hgd$kg-}
z`jem-+Q&lYPS8S9RQwEqLZ^e9TLi|ft2tx(X;F0dcncdpqRW~l=%!rR#%tpm?<QGL
ziNi(0)Mx?(m%jHu@4!>OezRF^QffS(>j-1HeA!u^qi^3R#Z}^fc!YQOms_+A>#phY
zT_<dL*4gIGq07dJCB?<dy|5bu3loz&hK7b+eWV@{y=sz~;73_=QrsQbS4f(@y}grq
ze{7fxLTt8J7TlODd%-G-Z03CjzrPd9Bwwwn12X?i=7AOVm1&U~ZQCCdd2LfGd$G|_
zok;tSpV|rxSRz{O=i|gQH@_EfM)AIrWi@_c^sD6~#;s<#iHU#h{QZO@MW|?Ut|qg=
zOdXU5pdZPP)aT_<{`~pV!O4jX5EB>AuC2WyARy4bAUgv9l=hmcN>AQIR6{GrLI8j8
zSd<-baCB69@SwMJE@{G%mBNUfw^vqX`T{D-Aulg)w-Eio3d#ZaS{}ay;#{c}`K%vK
zK$dvC2o-;v;5GNA0~QIF$xq)%DFel34LPUaM6ub7U=d+(UD0^Cdsm^tZm~0Fv3~9=
z3uAfNE5sX#dn)(z5K|{nIioEjuR-kh@nr2UrP(x^NNZ^(gvslw%&=~r=DS9%R&8;V
zttH=^FW7~gcQh=tv@_sv4);t?pfr}i%|5T#`Sg9vQ%a&&AywDgTf&`Eq@gl1`BFcN
z-S;OC=&8t6cMi*IG(d;oa(Ux;Obe)B?z=#_G1rnso&C#sY}9a_H=qw+QVBkA&PjS*
zj^|v9D-&5S3ZjJ?S0Trz!o~k-yFq`QRQ}T|Qu@L5-^~KmYs&wZ1n~c5*Z=*d8X{i&
zms`r5l4hP~FaXDDS|WjsxU5$S1YApkka;~l!0SQaU{g3&%x_NN$`l}F(*sO>DWQ6U
z865+s7VG~geX%f0djiVQmd$!1T%BcZkU;tywdiX(Fq3==4w4!p<K#~@44*vVb|)?(
zlh44d1KhvK(w8VKNpH|A+j{*;KS9CktNLHBjQbzNFE<re2oIQk+Y2~^wyr3wtIZT%
zbp8(Bl1X2YE<-Kba)9cw*I38GTLKFn5t|pJ)8(3u?O!m?SUl^<l=FX;Ch7h`;7F$<
z?(@rEnF-;fZM~oGz}NQ=dMr<Y(ri*^DTOWADF=K?X-4*^N%oSiY$N>DSfEWBXWYTp
z0z9zQGXMPGlMwWF`fQk-|DnSd_BE1^-nA9jal+4|u2E7Q*m6&XA9n9dUodF$xCQF_
z2X>{NQe#Q#W}(Ncxp88{@=sb!spolQn!$(i>r7w}yNvg0wHxNn#}f1K#anuNxGY{0
z-_y-x7Xt6$ucDR4w^hZDvIran(LBrpDS`?QiH52Bt7_j#yY|(4Eu_<|r(H9ove7u}
zIQ$;ys#pkmC7o{g7+f~Z<Y)UxQa^xUJ2-(r?u<}uvm*eo;9;%kk?1Y9;>8KQr;N_o
zx)j)sIf$}3advk)83rV~_O%}32s07_`$>%u^7tPN?B-d<L9Ws_KmeTcV2{Jd=<pfq
zE_Hxu18*nnS>~hIr2j4C!Nx9=Ab>$8z_N|=Z3bzs>`TN6iQU;rn?SO5BXXvbEc*H<
z`bg63Zf@U>VH_s|=Kw{*0+W8T-%a4tn}a)}oJ0WF{^es}`QRs0JBPjnHNipq!(VW7
zT7an}+8UVBR38UVM5iB;DqOh;Sx<BEDVu=x3dsnkZd3m127$96+UflSNXlJ@y?s+!
zX>7l!)gI7Djc{D0W3CP4JY*Gb2+3U|pH~3@v9Y-457N92g>?kHZX6`>x(+L6;T2{+
z`0kL#i%jb>p`-oa%3?_&CC7=p4RpM^SRKB`7NZ8#ewS}h6CgC8KR>Ng{~a^hyxKs+
lTFz6yL`rZyEjS~QVD~QOnqah%6>0!<Y2MdWEmpP+`7a-L5n2EM

diff --git a/maps/exodus-2.dmm b/maps/exodus-2.dmm
index 8b355c5fe1f..48ff4e7bdf4 100644
--- a/maps/exodus-2.dmm
+++ b/maps/exodus-2.dmm
@@ -744,7 +744,7 @@
 "op" = (/obj/structure/rack,/obj/item/weapon/gun/energy/ionrifle,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership)
 "oq" = (/obj/structure/rack,/obj/item/ammo_magazine/a12mm,/obj/item/ammo_magazine/a12mm,/obj/item/ammo_magazine/a12mm,/obj/item/ammo_magazine/a12mm,/obj/item/ammo_magazine/a12mm,/obj/item/ammo_magazine/a12mm,/obj/item/weapon/gun/projectile/automatic/c20r,/obj/item/weapon/gun/projectile/automatic/c20r,/obj/item/weapon/gun/projectile/automatic/c20r,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership)
 "or" = (/obj/structure/closet,/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/syndicate_station/start)
-"os" = (/obj/structure/rack,/obj/item/weapon/rig/combat/merc,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership)
+"os" = (/obj/structure/rack,/obj/item/weapon/rig/merc,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership)
 "ot" = (/obj/structure/window/reinforced,/obj/structure/lattice,/turf/space,/area/space)
 "ou" = (/obj/structure/closet/hydrant{pixel_y = 32},/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/syndicate_station/start)
 "ov" = (/obj/structure/rack,/obj/item/clothing/tie/storage/brown_vest,/obj/item/clothing/tie/storage/brown_vest,/obj/item/clothing/tie/storage/brown_vest,/obj/item/clothing/tie/storage/brown_vest,/obj/item/clothing/tie/storage/brown_vest,/obj/item/clothing/tie/storage/brown_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership)