Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into brigmedbayssaltpr

# Conflicts: # _maps/map_files/BoxStation/BoxStation.dmm
2020-03-15 01:11:19 -04:00
parent d81247e15e 2de1395e6b
commit 99b189844e
12 changed files with 42 additions and 21 deletions
@@ -261,6 +261,7 @@
 /turf/open/floor/plasteel,
 /area/security/prison)
 "aaK" = (
+<<<<<<< HEAD
 /obj/machinery/computer/arcade/battle{
 	dir = 4
 	},
@@ -292,6 +293,12 @@
 	},
 /turf/open/floor/plating,
 /area/crew_quarters/heads/hos)
+=======
+/obj/structure/table/wood,
+/mob/living/simple_animal/pet/fox/Renault,
+/turf/open/floor/carpet,
+/area/crew_quarters/heads/captain)
+>>>>>>> 2de1395e6bc9f920a9a445047f296be03e0ffb97
 "aaN" = (
 /obj/structure/chair/sofa/right,
 /turf/open/floor/plasteel,
@@ -23144,10 +23151,6 @@
 /obj/structure/table,
 /turf/open/floor/wood,
 /area/bridge/meeting_room)
-"bbZ" = (
-/obj/structure/table/wood,
-/turf/open/floor/carpet,
-/area/crew_quarters/heads/captain)
 "bca" = (
 /turf/open/floor/carpet,
 /area/bridge/meeting_room)
@@ -91727,7 +91730,7 @@ aYo
 aZV
 bao
 baP
-bbZ
+aaK
 bcP
 cBo
 bgS