From 67addca62b97df4dd9d34ca8fca060420caeba7b Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Thu, 27 Jul 2017 15:33:16 -0300
Subject: [PATCH] Improvised shotgun, double internal boxes and map fixes
 (#3171)

-fixes some issues with sawing off the ghetto shotgun
-adds cargo access to the maint leading to the elevator, to stop people from breaking so easily into cargo
-Fixes #3169
-Fixes #3158
-Fixes #3157
-Fixes #3147
-Fixes #3148
---
 code/game/jobs/job/security.dm                |   2 -
 .../mob/living/silicon/robot/robot_modules.dm |   2 +-
 .../projectiles/guns/projectile/improvised.dm |   6 +--
 icons/obj/improvised.dmi                      | Bin 5539 -> 5511 bytes
 maps/aurora/aurora-3_sublevel.dmm             |  44 ++++++++---------
 maps/aurora/aurora-4_mainlevel.dmm            |  45 +++++++-----------
 maps/aurora/aurora-5_interstitial.dmm         |  15 +++++-
 7 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index fd41d7d8db5..5fe6a4c31f9 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -165,10 +165,8 @@
 			H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
 
 		if(H.backbag == 1)
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_l_hand)
 		else
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack)
 
 		return TRUE
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index f31c2f37c5d..6d4f57eda17 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -687,7 +687,7 @@ var/global/list/robot_modules = list(
 	channels = list("Supply" = 1)
 	networks = list(NETWORK_MINE)
 	sprites = list(
-					"Basic" = "robotMine",
+					"Basic" = "robotmine",
 					"Advanced Droid" = "droid-miner",
 					"Sleek" = "sleekminer",
 					"Treadhead" = "miner",
diff --git a/code/modules/projectiles/guns/projectile/improvised.dm b/code/modules/projectiles/guns/projectile/improvised.dm
index f854c3a4339..3cd0931e165 100644
--- a/code/modules/projectiles/guns/projectile/improvised.dm
+++ b/code/modules/projectiles/guns/projectile/improvised.dm
@@ -32,7 +32,7 @@
 
 
 /obj/item/weapon/gun/projectile/shotgun/improvised/attackby(var/obj/item/A as obj, mob/user as mob)
-	if(w_class == 3 && (istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/gun/energy/plasmacutter)))
+	if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/gun/energy/plasmacutter) && w_class != 3)
 		user << "<span class='notice'>You begin to shorten the barrel of \the [src].</span>"
 		if(loaded.len)
 			for(var/i in 1 to max_shells)
@@ -41,7 +41,7 @@
 			return
 		if(do_after(user, 30))
 			icon_state = "ishotgunsawn"
-			item_state = "sawnshotgun"
+			item_state = "ishotgunsawn"
 			w_class = 3
 			force = 5
 			slot_flags &= ~SLOT_BACK
@@ -227,5 +227,5 @@
 	fire_delay = 2
 	dispersion = list(1.0, -1.0, 2.0, -2.0)
 	jam_chance = 20
-	
+
 	firemodes = null
diff --git a/icons/obj/improvised.dmi b/icons/obj/improvised.dmi
index 9f13a85d53dbd8fa793c6d0784363919e409a4c1..d926b7b2f50505de9756c896dcabf25b265feadb 100644
GIT binary patch
literal 5511
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

literal 5539
zcma)A2T)VZ+CGF9N~9N&4g!MGq=SG62vS85kPd><tMn$lBZMkQDAJ?^q)8EwBGN%h
z)X;mc351$I-nldX+?jvw_s^WOJG*E1-95X{KKs0HtgiNB2q_aO000nmHDx_q-ud?h
z6X8<587E>~_T69K$V=JQ)5gQz&CA}^1ps_=i$_~;geg)+F1`<nBbj7su17M)6oeYG
zgYjikOuP+aTwQA;6Qel1JyYQr-cU#HK@GKd)5<c)FpZkp2*aZD<O@RTB{g5ta>Hqe
zjbl9fH{K#Uqyq0VSEx{1Mm-)$!GVlf^2Q$g%g?Q4nkY6*9*YO}lA7WhxKCAyi=xf?
zT5V26?ZX#O>#(H1MXd*YEd*cg$hom_{d}le6n+tl#TT_1RpMo4xHwnA|1m)Olas-<
z<|{th{hjwq0HDoMSAMAPo4fnL+3A_#`#x-+w<a|Wl;F{ThPkk85zpjUYQ5QWF7uWO
zmp@jFbh|gU)Q}Duy+q{|<zm*)-c$s>E-v5DO>D7<ihL+*tNJYKQ+|0?m%do>&xDeC
zlG|GNCU#)RY+8wXE&(&L)<)rCac%Bb?5<QJeE-eJF|?W;aS}B0VEt^~bEIJ(3#MdL
zeQ{TnA=D}%g0NE!LKd3BL=SL@-vv}1jDUp68i29f3Qt(C8)W%0>fa6Cw}CAYr#^>5
zaao1RL)RiR1%?#k)2hT7tq#IVEM07Zeuv%Bl9oNP5yuaTVpNNy{84<Mx1lFD_iGGk
zzs!(B8B$LG`E8j5-{_hdgYb}<ovs)kFs_1GK2VC|Y;bT84{(-cMvcoVtec14ky%3l
zI&x<Oc%AnH8ef0yTx^p6es;W0Q++-)H3g1T0uz9I*U_1OO})L9d5G+WgMd64x7Q=>
z-TOLjI^VKLkvlAX77BvEf>hGzP9UvYmD_E#-t}X9tRc<UV}wGu<K~QZvAY2YP+V$B
zC2YsJtX|{uOTf-`>l#h5Ll2BeGQLHybyr`(xnry`+F})5;^N{*H4dz#29JAx(PyVg
zZ?`H|(+S4GF6HajRou_@)W{QGW$x73hg5$6ePd^u7N<4q?VGqZZFO07H9{!9wbVs0
zD!MnSl)Qm90D7}$(m{8)S$(}aPTnKf!VzpHZbAoZIj$h!Wal^3nF>;BWrknAUO?<H
zyK$528e=hoDSRCT&qhEto8IJY<oE3fOf_mMtb4cGzhc?wiX@wy{FQaMKJ;a`62E!Y
z#cZUYyf#J9^oyeGwju-qY3Ye^B`ew%MYgCLVm<djHxpkKMFaW4Z46gQs;12z4X>+Z
z__eeWy;cVd#wRD$_F^l(SbO3F=kU|@E7M6vm@yNua>`$I!*4G(=xLgB!SryaC<Tyz
zIx#1`Dwz%}L9s(X+^5eIwRNl?OTm+jXS5Fkj~D_>b}EUBso&ZMlhqqR*?<vpMKLWj
zJ}|RA+hXd0E6vbcfB=uYO2Lv9;<T1>wtYfj=qvt`4LrG94?fbniRk<Cdru2A1of^>
zH}C?Xqjw?3XadMKlN#MmYe%vM7orTm`n*nBkR@Z0@GxbJRYK_h7tsHJcuT6TZSj{k
z6lk1;i7lknLgwd^d_s<B<Ss9dr7nJI06^>PjfyE!U;)j9vPqH^d*=Jzia0NXwcTgF
zmp-0Q37n9eT-4UatV{r-3_bmh@`uEjz!z-+H6u6&B{<(XIvfXA@F9J=riT$gG=V@w
zyF`qW%U+-TpaPz7KIWuKOG|sbA7D31zl$C4hY0bS!SS+;a|(`M5|=yPzr0i;xMI+;
zM17mZ^m<2oFgJc$=XhtlL7i{+i-Rxssosb=oFgy3L!r=kqGIO{mUIuhmpqmze2wzG
z4J>R`#h^Hi(x400s3BL57~H_=i?{6yw#ALwTP-e}O0;KtzwmS_sS5yKgVxdcSr3j)
zz=e_QEd+eeILcmrHt)XR&3m?X>!xmkBZ%APS}v=P$wUb0{Gcf+ifHz3|0{%6KtQXD
zdkdh~WSZ=GwRC4oZv3G$l0~^@f=pJR%(<0o)t$^exa3E;7hO%AU{jo=!(b1CJR<HM
z>YVU5DaW<v;kG#Cjy=>O1AQ~qyZ%$S`-FbS8X4SwZZxRr%xEa@jC+UVo<zV;x%us5
z4&*txCjlkwvUl&s-SAhz)g)}A)(vGkP4bVz0QzS~6)PG9cAD3LpN*gvx6{F5cwZ2$
z>SjGwwFW@ITIu68^i52>u&M+7DuWd{^v-|dz<+?uKd`9Q2#8Nr=vwJ%g6#-#ZyJp>
zNq*K>44Q}SP51Wwk31pLDdA|ZfB;##pYijrD|VF-S|WLpWk050{aEeRN=*Fdf4DuR
zduWbUm2_%+1Jx2eI43V}3alP|S0}k)eX=x4_pj3c0AFDzcKX5QFb?svk=VBE<$;A>
z*ge_phuLwKBF2*pkF-~IB{s70z*9<ch}eGXC&7y4x2A$k(Th6YafN&-56=CQjh$W?
z)4%Mkp$OXKA330gNX*%AKX}cP_0M<3f2`9-T1DiIzQVI?Q~8l%9PHx?wBw3%?KsMT
zKi*Ph?gssZln>YYliG3zDgFc};1h>LjzC#Ts-U>kYheL?5Z=gk%PftPv)?ln2O-p-
z<@8BHU52>hW_`*U3U*N0u`+Rkv(Jhb>sBpmD}1sZefTS=SQ*$ASdtLHWH`M-dJ|Kn
zt?;t1uZUO|ZGN`s@O?t_P_S=XZoGhHaKlr>X9OXXH*jWJ{3mr+AAU(NhJ$Eaq2Bh^
zR{hamqD8R6C#$0ztXDh&llvaACP&NYcxCAk5U8xcADA1bG2HEL^rAb*jrroJB22ig
zQ@ydJMMh5&{bbg!F#JfGTbD4OHCa=S%|Uun)K89;z7r&IOOG840x!<%n3qJKwDHvt
zZ&0&Sv#*MK>Ka-+-onCuNyWk1uSIUikzAtC$?hk5YAdbzTg`0Q*T^5|Su7V|U{rMs
zraA-oA5+`RdlMVmeVAQ5<<*?H?*DaxGG}6D?rE-DU%R&+1|!+SQNj>+SW4LqvgPIF
zKkblP5(_)Bua3<n#HV+nf435p_2##z(aRc0*ID6ARaL6BJ>5X}iCzb`N9q|HWWTGj
zv9aO1cQ10vp|_`p0LX7>paVpo1hZ>Vyo;j`6Mm$#@Oz_RZqD3SE^dA#3UX@<fhaYR
zYn@GUlgh10CMYv$ipfr?WZCg<bvZQESf7)&cxv^bZhxx^jN5-cS58WHjRr!EOu^n=
zWRq3Hi`qBa&j~<yK<C)lyJ`7s9xTeLP9Qnu!8dfW_V_umk7Gal1dt?l*?OL_mSIO4
z-A!WnyhsStKY*JC2X558>b=}S^shBNP$<OliKsu;iNo|O9p1YD9bFSc4S+IH)&1hc
z833pXN=j4%Mpst2iHM2Q73jx!$oBB`6ShcXbi662@jmd%0070V-}phnFY8rQ@jJby
z92z00_+XkcZ1xuUd@Ro{<OsJWk@NeH{rsd0$N7keh-zN;Q|s&NcUouP8JsIU{aI_l
zJn;%lt5cvd=Jz>#3o#py(<)Cp_RK3oESn1YT~SjVy0&8xK(QesQ!-B*s}R8hl^UDA
z8wm*sfNqo=Kcd<!oD$UPv;TcKM{;~(0(vOoNeu{dfxhyF=Owb9Q)w?ZVD+yhWX^0=
z=)(CU-rGL+y%I4~IanPQA_SQG4yEA@GxJJ<nPh<5R@F1Ik=R^9U}K)<9pH=_x^(WT
zDQz~%-dkH=D-3qpG<Z^Wx*}%|?l-siF<WSQa25!JUT<F+uPU2YQK2^oTS_!A@Vw^W
z_mMAQz?I~X$c{QO$yf)Tl-_~|4~^30m^y|2{Y57zn{cyanZM4(#GH9IjS%b<f&OST
zU{9}!Rn&x&q*@d=A$IWdm-vdZe+)7!3Ss!aZzPsSE0PyUmau_D67v2p?fD;k@=pym
z?Snq1pU8hT%zWI0i4~^#d9Ef<Wn4#;-ICL<xXo2X0IZLEzz3w5ZzvZ%jZosyfBu}O
z&Bw`0GsIO_)dJ;k5IElUoO?KT56d+>@V9f&Q9o}Da`(N^YurYkpP%C(wCE+XczUsT
zeD=M`8R@-G%pi}kZnyaic>R^g<H(Kx*>z<j#c&&Bqw}A29$sE3tB!aIDAW;VG1w9~
z>_{jMH@Kt?qgoJ>2eBUv?}E=CdwCsXjZBL>PFwb;-u|;!P{0whna-Z8&0G0g0JyCE
z{MjR5zx3<)%V@njSpv%KshsnNH`+bk6^>`i=wV%(kW+Cz|6Poi*-bzISBmv@xv2{5
zdvVA574%skPDoQKb*>+O+w>}IY^1-sx+<%zjOev~JF%%Ll{B%bEXLGp<}(|aO5MA8
z##C)<CWu50jk6J5LJ2r6G1}bQ%eGyAfiA*~5A;}zXliOMjC_#I%FT@!whNzfP+_N3
zG%!d%PubTuG{h2zW=^n3+Ect!*DJdS|7O`GUorJw>`q(vT$=jR4c|H&*FW_nfMu-_
z?qQGU#9*Wb1_vK1Q!3@l_&=h-12C1_HLmmWz}QkoW+oRUcmcLYvQ&;Aeb8BSQAhu;
zdDPlG35UOEAgwjJYafo7o_2t_x6U%&x|QQu=_W<asdQJu#xP5R;y`Fvf?t3NtQxv)
z1F}fI(|+l1er2-f$^n#BRCEXIe=Yr>Bg~k4JU3Ngh|{Vrr;{ryD?aj<$I%SWSR`#J
zYW$AvfK4bU^h7A7@T0!E2-{iGY1b(~-v@=_E#rBdmK)3z!Us50V!RX7xC_nh;Voo8
zFtL-rnC_Dbxn7Mp{#0G9%0~+V<lZb$;vA^I><}D)nTiO)mlS+7n>ixcQCdoT@7_HU
zNcD?Q9W5;@2M5yU6?7Is==A9YK==9cC<^RlflI9K=@Z@T0G_jOjw_tFZjs-k#(}H3
z^1-hL^H`R6s;(499)X+%k7iv9i)1zKFq0;iw=p&TXb0r24nHp2Bm6u5p}cv4VUsV_
zGHDM(kWLc03L*0Lxb4w1OGn2cPMSRXx;{A`PMM_S(!1b1sN&oQW|vn~<TGCqMl7(J
z$R<auz<a<y<kaG3`a>4SivAKYjD8DIAI|)vCS@-n;;Zhav~#SJ5j%Bu*N+H~lyMVa
zbB)EeLLztbqH;gLX4$6k6)Z^NXb^j5>q7RDIpoUsIq!YhJ4?J~n_~iVPDmH_km=d}
zo}CwqoH$3avd_h9ZX>__8`vSkn5O#r6W^M^qrh<dEY@~#0wIZQy43NvNQ!!*j)UvS
zu%W7*36&(}^dn6bGU#Pz+i_AcP&2kdd?ZJrok@F^0JU!`u&21t%*6CZ{$4MyuFM{g
z50u9dfYV_m$k|;0jcL|lXU^tVHcE7b>rTF+3zdBN?cf8ZAoH_?sl=OtZ8P=<Pz9*(
zp~hv|;Q5Bir(-#sN2hJ0P#xkG7djMljK-NFiFn(A3GFWvMR9N@M3Z`=5uS4e+d3Si
z*_WG3AKGcDA1yyEGnuz^S;ji)8rJuJB=><UcbR1<X^Bld1itfdg0)oZ3v@W#govF#
z?D<tE-&wjvvAU1BRLSZW_9)C&|82KF(W>bK*C(Ki1sQ&g=s(am4`6+UEE<eSp&35o
z^SVhYvTuo(1uo)!Z&yTle1kqT7T3{Ub<!`IQt4vp{(KFfsm#IDmbJn5R(Fl%e2P#f
zOe>0tMl1VYA%J9M(f^18FttMl7~{X4Hhm%f-{8Q15Omg-M41DrtdvxY{#p%%JO()9
z<q?*Ui7Td~8!!_SId0U-ktl#SF~HDf#s?6IBv+?EF5%haMNyGRvu2OmIL_OfX@^+V
z4xMcZQ~hNooEHTgAVwAX3@s>ZC)t@hIu9Wkv6}?IOFL3o5s|l+!ZBN)_`&gn^c<92
zVE|>kBW1@tMMZDe>$@4X@uGb~mVtHPPW?R8%@zQEVCuU=Ew@*9t&wH`oA7Sp&3G$^
zKb~H5$_tptc-IWqu+a|>c>hWQLETVx#iZgJ{PzTIgLQ2UY`aPf-!2(~o|=VrT%S8C
zb5i}i>Rp<;t!vq7Nx$u%3hZ+!;Rx?8{Ub4^NZS^Zyf|e_l4vT@NZh2H|CrP@R!i8P
zNw?P?k`3o_yvxf&^=Iws$sq})sAFH7!*1Wc%_ks`6F}{rOqr3MKI~3@a&c8w{V5C~
zE4q)4T4s=HH;z)QJAL^D{H-kyRa{(5LezAKLZP@DHqBeN1grE5`qeR4%V3>eO0Hf}
zVb#vmpQ6Jjt@ZV^i~Z`#rLE>Taa68G&}IGbE`9j0-6KEao2vJj@jWj=-zA{{>g1!2
zs-Qd?sF`WVRr<!x!vpfG8u0ae5yFU>(a4H3cH?E#_EkkV9Xf71lz;k6-QC^I*MMB4
zAj0D$7aA*uTOLB_6}wIWJM>4L$X<tnl#R<-e~F%)iQqS~M0g9@!U<F8c~vZGi{CEM
z!n)}Z_-(ln`Jx-6#?DD$yagXM!MjyXf)@XurG?GK*)2u0Exn17r4T4xJ4r9>I5{(o
zb+GcVqwTC1d>6+4=CyU*i^E~bZZg5r@k26|Fkomy9TvAIc$F$dBWaxkx42YFJuu0~
zxVXxF^!*v)iImdu=NdyMW-aH$N3eD}<)Kt9>!qu94#^Uy@w3LE?PI>rhfS|&J^$2e
z4850-r?SePAbFe`aAKF_N+4m`g1pF(n>FW8kSHB~b@}=(QM}QwzJ$M@6x&^d=u~qi
z*6s&i-rKQ`#Z{ergcVS_^hCzMubG}*(b?7ZNP=?4XWM@ZpSNY|V<FSk<`8TTf$HPO
zhaHHEI>F>A2ZP}9X5h&0`gf0zm_$))kX;n9<ox51)3K{B;$ji21_pl$7s+gK66LP3
zRnfx^h2>YkQSA63L)h?!3ru~)!gWT`aJ1BzcU1SS;f9#WrDiSOcb|)du3ilo*ojD`
xDDvwS|NW9c?$i`;ogCG7VbQLC2lj@s_+1v{qA+*;SzOc=P*>4bu2!-P`ya`0ecJ#4

diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index c5970f9ad60..b7e003bcdad 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -9631,10 +9631,6 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/obj/machinery/camera/network/medbay{
-	c_tag = "Virology Starboard";
-	dir = 8
-	},
 /obj/structure/sign/deathsposal{
 	pixel_x = 32
 	},
@@ -10558,10 +10554,6 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
-/obj/machinery/camera/network/medbay{
-	c_tag = "Virology Starboard";
-	dir = 8
-	},
 /obj/effect/floor_decal/corner/lime{
 	dir = 6
 	},
@@ -13816,11 +13808,6 @@
 	icon_state = "corner_white";
 	dir = 9
 	},
-/obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Virology South";
-	dir = 8;
-	icon_state = "camera"
-	},
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_wing)
 "xB" = (
@@ -17391,14 +17378,14 @@
 /area/medical/patient_wing)
 "Dv" = (
 /obj/structure/disposalpipe/junction,
-/obj/machinery/camera/network/medbay{
-	c_tag = "Medbay Equipment Storage";
-	dir = 1
-	},
 /obj/machinery/light,
 /obj/structure/sign/nosmoking_1{
 	pixel_y = -32
 	},
+/obj/machinery/camera/network/medbay{
+	c_tag = "Medical - Patient Wing Hallway South";
+	dir = 1
+	},
 /turf/simulated/floor/tiled{
 	icon_state = "vault";
 	dir = 5
@@ -19476,13 +19463,13 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Operating Theatre One"
-	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/medbreak)
 "Ha" = (
 /obj/machinery/vending/cigarette,
+/obj/machinery/camera/network/medbay{
+	c_tag = "Medical - Staff Smoking Lounge"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/medbreak)
 "Hb" = (
@@ -20753,7 +20740,7 @@
 	dir = 8
 	},
 /obj/machinery/camera/network/medbay{
-	c_tag = "Virology Starboard";
+	c_tag = "Medical - Staff Dormitories";
 	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
@@ -20781,7 +20768,7 @@
 	pixel_y = -24
 	},
 /obj/machinery/camera/network/medbay{
-	c_tag = "Medbay Equipment Storage";
+	c_tag = "Medical - Staff Hygiene Facilities";
 	dir = 1
 	},
 /turf/simulated/floor/tiled/freezer,
@@ -22360,6 +22347,17 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/sublevel)
+"Mn" = (
+/obj/effect/floor_decal/corner/lime{
+	icon_state = "corner_white";
+	dir = 9
+	},
+/obj/machinery/camera/network/medbay{
+	c_tag = "Medical - Patient Ward Entrance";
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/patient_wing)
 
 (1,1,1) = {"
 aa
@@ -62086,7 +62084,7 @@ rm
 rm
 uf
 uP
-vQ
+Mn
 vQ
 xA
 ye
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 18583eb0f9d..82f83cc1371 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -4288,7 +4288,7 @@
 /obj/structure/table/standard,
 /obj/item/device/flashlight/lamp,
 /obj/item/device/taperecorder,
-/turf/simulated/wall/r_wall,
+/turf/simulated/floor/tiled,
 /area/security/brig)
 "aiJ" = (
 /obj/item/device/radio/intercom{
@@ -34844,9 +34844,8 @@
 	},
 /obj/structure/bed/roller,
 /obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Staff Area Hallway";
-	dir = 8;
-	icon_state = "camera"
+	c_tag = "Medical - Cloning Laboratory";
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/genetics_cloning)
@@ -38212,6 +38211,9 @@
 	icon_state = "corner_white_full";
 	dir = 1
 	},
+/obj/machinery/camera/network/medbay{
+	c_tag = "Medical - CMO's Office"
+	},
 /mob/living/simple_animal/cat/fluff/Runtime{
 	name = "Bones"
 	},
@@ -40557,11 +40559,6 @@
 	dir = 1
 	},
 /obj/structure/window/reinforced,
-/obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Virology South";
-	dir = 8;
-	icon_state = "camera"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -40575,6 +40572,10 @@
 /obj/effect/landmark/start{
 	name = "Medical Doctor"
 	},
+/obj/machinery/camera/network/medbay{
+	c_tag = "Medical - Briefing Room";
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay2)
 "bsf" = (
@@ -40669,11 +40670,6 @@
 	pixel_x = 30;
 	pixel_y = 0
 	},
-/obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Morgue";
-	dir = 8;
-	icon_state = "camera"
-	},
 /obj/machinery/light{
 	dir = 4;
 	icon_state = "tube1";
@@ -43494,9 +43490,6 @@
 /obj/machinery/light/small/emergency{
 	dir = 1
 	},
-/obj/machinery/camera/network/engineering{
-	c_tag = "Engineering - Engine Cooling EVA"
-	},
 /turf/simulated/floor/plating,
 /area/maintenance/research_port)
 "bwG" = (
@@ -43903,13 +43896,12 @@
 	icon_state = "corner_white";
 	dir = 6
 	},
-/obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Virology South";
-	dir = 8;
-	icon_state = "camera"
-	},
 /obj/item/weapon/packageWrap,
 /obj/item/weapon/hand_labeler,
+/obj/machinery/camera/network/medbay{
+	c_tag = "Medical - Medical Office";
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay)
 "bxq" = (
@@ -46136,9 +46128,8 @@
 	dir = 5
 	},
 /obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Patient Ward";
-	dir = 1;
-	icon_state = "camera"
+	c_tag = "Medical - Pre/Post Operatory Room";
+	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgerywing)
@@ -91195,7 +91186,7 @@ bMI
 bJa
 bIl
 ceF
-bRE
+bMI
 bJa
 bOf
 bSG
@@ -96258,7 +96249,7 @@ ahy
 cfn
 alC
 amn
-cfr
+cfq
 aoc
 cfu
 ard
diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm
index 20657ba03bb..40bed5255c3 100644
--- a/maps/aurora/aurora-5_interstitial.dmm
+++ b/maps/aurora/aurora-5_interstitial.dmm
@@ -1648,6 +1648,19 @@
 /obj/structure/lattice/catwalk,
 /turf/simulated/open,
 /area/maintenance/library)
+"da" = (
+/obj/machinery/door/airlock/maintenance{
+	req_access = list(50)
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2";
+	pixel_y = 0
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/library)
 
 (1,1,1) = {"
 aa
@@ -27020,7 +27033,7 @@ cw
 cw
 cw
 cK
-cN
+da
 cO
 cO
 cO