1

2
2019-11-04 10:43:48 +00:00
parent 87d3e12407
commit 4d0276a222
1 changed files with 128 additions and 0 deletions
@@ -3898,12 +3898,15 @@
 /area/security/brig)
 "aie" = (
 <<<<<<< HEAD
+<<<<<<< HEAD
 /obj/structure/closet/wardrobe/mixed,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/coin/silver,
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 =======
+=======
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 /obj/structure/table,
 /obj/item/folder/red,
 /obj/item/pen,
@@ -3914,6 +3917,9 @@
 /obj/item/book/manual/wiki/security_space_law,
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/warden)
+<<<<<<< HEAD
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 "aif" = (
 /obj/structure/disposalpipe/segment,
@@ -11944,6 +11950,7 @@
 /area/crew_quarters/fitness)
 "aAs" = (
 <<<<<<< HEAD
+<<<<<<< HEAD
 /obj/machinery/light/small{
 	dir = 4;
 	light_color = "#d8b1b1"
@@ -11971,6 +11978,27 @@
 /turf/open/floor/plasteel,
 /area/crew_quarters/theatre)
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/theatre)
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 "aAt" = (
 /obj/machinery/door/poddoor/preopen{
 	id = "maint2"
@@ -12829,16 +12857,22 @@
 /area/hallway/secondary/entry)
 "aCq" = (
 <<<<<<< HEAD
+<<<<<<< HEAD
 /obj/structure/closet/lasertag/red,
 /obj/item/clothing/under/pj/red,
 /obj/item/clothing/under/pj/red,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness)
 =======
+=======
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 /turf/open/floor/plasteel/white/side{
 	dir = 4
 	},
 /area/crew_quarters/theatre)
+<<<<<<< HEAD
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 "aCr" = (
 /turf/closed/wall,
@@ -13487,12 +13521,15 @@
 /area/crew_quarters/bar)
 "aDR" = (
 <<<<<<< HEAD
+<<<<<<< HEAD
 /obj/structure/closet/lasertag/blue,
 /obj/item/clothing/under/pj/blue,
 /obj/item/clothing/under/pj/blue,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness)
 =======
+=======
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 /obj/effect/landmark/event_spawn,
 /obj/effect/landmark/xmastree,
 /obj/effect/turf_decal/tile/bar,
@@ -13502,6 +13539,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/wood,
 /area/crew_quarters/bar)
+<<<<<<< HEAD
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 "aDS" = (
 /obj/machinery/light/small{
@@ -13574,6 +13614,7 @@
 /area/crew_quarters/bar)
 "aDY" = (
 <<<<<<< HEAD
+<<<<<<< HEAD
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -13595,6 +13636,14 @@
 /turf/open/floor/wood,
 /area/crew_quarters/bar)
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
+/obj/structure/chair/sofa/left{
+	dir = 1
+	},
+/obj/structure/window,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 "aDZ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -13624,6 +13673,7 @@
 /area/maintenance/starboard/fore)
 "aEb" = (
 <<<<<<< HEAD
+<<<<<<< HEAD
 /obj/structure/chair/wood/wings,
 /turf/open/floor/plating,
 /area/crew_quarters/locker)
@@ -13651,6 +13701,21 @@
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 "aEc" = (
+=======
+/obj/machinery/door/airlock/maintenance{
+	name = "Theatre Maintenance";
+	req_access_txt = "46"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"aEc" = (
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
@@ -13662,6 +13727,9 @@
 	dir = 4
 	},
 /area/crew_quarters/theatre)
+<<<<<<< HEAD
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 "aEd" = (
 /obj/structure/cable{
@@ -19904,10 +19972,13 @@
 /area/crew_quarters/bar)
 "aSG" = (
 <<<<<<< HEAD
+<<<<<<< HEAD
 /obj/item/chair/wood,
 /turf/open/floor/plating,
 /area/crew_quarters/locker)
 =======
+=======
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 /obj/machinery/recharge_station,
 /turf/open/floor/plating,
 /area/space)
@@ -44099,11 +44170,14 @@
 /area/engine/break_room)
 "bVL" = (
 <<<<<<< HEAD
+<<<<<<< HEAD
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on,
 /obj/structure/table/wood/fancy/purple,
 /turf/open/floor/plating,
 /area/crew_quarters/locker)
 =======
+=======
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 /obj/machinery/light{
 	dir = 8
 	},
@@ -50688,6 +50762,7 @@
 /turf/open/floor/plasteel,
 /area/quartermaster/warehouse)
 <<<<<<< HEAD
+<<<<<<< HEAD
 "ckR" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -50698,6 +50773,8 @@
 /area/maintenance/starboard/aft)
 =======
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 "ckS" = (
 /obj/structure/closet/cardboard,
 /turf/open/floor/plating,
@@ -85169,10 +85246,14 @@ bUw
 ccw
 chY
 <<<<<<< HEAD
+<<<<<<< HEAD
 clK
 =======
 aQb
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
+aQb
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 cjM
 ckB
 ckB
@@ -92301,6 +92382,7 @@ baa
 aKM
 aKP
 <<<<<<< HEAD
+<<<<<<< HEAD
 aFE
 aDY
 aLQ
@@ -92310,6 +92392,11 @@ aLS
 aMu
 aUC
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
+aLS
+aMu
+aUC
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 aop
 aMw
 aJq
@@ -94620,12 +94707,17 @@ awt
 aSo
 aCr
 <<<<<<< HEAD
+<<<<<<< HEAD
 aCr
 aVD
 =======
 aEb
 aCr
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
+aEb
+aCr
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 aGv
 aCr
 aCr
@@ -95404,10 +95496,14 @@ aCx
 awC
 awC
 <<<<<<< HEAD
+<<<<<<< HEAD
 bbs
 =======
 aDR
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
+aDR
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 aHW
 awC
 awC
@@ -98484,10 +98580,14 @@ aCu
 aCu
 aVx
 <<<<<<< HEAD
+<<<<<<< HEAD
 auR
 =======
 aAl
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
+aAl
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 alP
 aGL
 avI
@@ -98740,6 +98840,7 @@ azj
 avz
 ccH
 <<<<<<< HEAD
+<<<<<<< HEAD
 aAX
 aAp
 aAk
@@ -98747,12 +98848,17 @@ aAl
 aCq
 aDR
 =======
+=======
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 cek
 auR
 alP
 alP
 aaa
 aaa
+<<<<<<< HEAD
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 alP
 aGJ
@@ -99007,17 +99113,23 @@ ayb
 ayb
 atZ
 <<<<<<< HEAD
+<<<<<<< HEAD
 amN
 amN
 aAs
 amN
 amN
 =======
+=======
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 auR
 aBE
 alP
 aaa
 aaa
+<<<<<<< HEAD
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 alP
 aGJ
@@ -104660,10 +104772,14 @@ aaa
 gXs
 alP
 <<<<<<< HEAD
+<<<<<<< HEAD
 apD
 =======
 aqB
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
+aqB
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 ayf
 bev
 cil
@@ -107060,17 +107176,23 @@ cNW
 aaa
 cNW
 <<<<<<< HEAD
+<<<<<<< HEAD
 clt
 cQw
 cNW
 cNW
 cNW
 =======
+=======
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 cgr
 cms
 cNW
 cOe
 bNA
+<<<<<<< HEAD
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
+=======
 >>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 cNW
 aaf
@@ -107583,11 +107705,17 @@ aaa
 cOT
 clt
 cQw
+<<<<<<< HEAD
+=======
+cNW
+cNW
+>>>>>>> parent of 83b47d841... RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED
 cNW
 cNW
 cNW
 aaa
 aaa
+aaa
 aaS
 aaS
 aaS