Merge branch 'beta-dev' of https://github.com/MysticalFaceLesS/Shiptest…

… into beta-dev

_maps/_mod_celadon/map_files/generic/blank.dmm

@@ -534,15 +534,6 @@
 /obj/item/staff/broom,
 /turf/open/floor/engine/cult,
 /area/wizard_station)
-"bR" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/directions/engineering{
-	desc = "A sign that shows there are doors here. There are doors everywhere!";
-	icon_state = "doors";
-	name = "WARNING: BLAST DOORS"
-	},
-/turf/open/floor/plating,
-/area/centcom/control)
 "bS" = (
 /obj/structure/flora/ausbushes/ywflowers,
 /obj/structure/flora/ausbushes/lavendergrass,
@@ -2682,15 +2673,6 @@
 /obj/item/seeds/cherry/bomb,
 /turf/open/floor/wood,
 /area/centcom/holding)
-"ja" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/directions/engineering{
-	desc = "A sign that shows there are doors here. There are doors everywhere!";
-	icon_state = "doors";
-	name = "WARNING: BLAST DOORS"
-	},
-/turf/open/floor/plating,
-/area/centcom/evac)
 "jc" = (
 /obj/machinery/light/directional/east,
 /obj/effect/turf_decal/corner/opaque/green{
@@ -7427,7 +7409,6 @@
 /turf/open/floor/plasteel,
 /area/centcom/ferry)
 "Ak" = (
-/obj/item/gun/energy/pulse/carbine/loyalpin,
 /obj/item/flashlight/seclite,
 /obj/structure/table/reinforced,
 /obj/machinery/airalarm/directional/south,
@@ -8082,7 +8063,9 @@
 /area/centcom/ferry)
 "CB" = (
 /obj/structure/table/reinforced,
-/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite{
+	pixel_x = 1
+	},
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 1
 	},
@@ -13767,15 +13750,6 @@
 /obj/machinery/fax/admin/roumain,
 /turf/open/floor/wood/mahogany,
 /area/centcom)
-"Wn" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/directions/engineering{
-	desc = "A sign that shows there are doors here. There are doors everywhere!";
-	icon_state = "doors";
-	name = "WARNING: BLAST DOORS"
-	},
-/turf/open/floor/plating,
-/area/centcom/ferry)
 "Wo" = (
 /obj/structure/closet/secure_closet/freezer/kitchen,
 /obj/item/reagent_containers/food/snacks/grown/banana,
@@ -14129,9 +14103,6 @@
 /area/wizard_station)
 "Xn" = (
 /obj/structure/closet/secure_closet/ertEngi,
-/obj/structure/sign/directions/engineering{
-	pixel_y = 25
-	},
 /obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plasteel,
 /area/centcom/ferry)
@@ -14904,15 +14875,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/tdome/tdomeobserve)
-"ZV" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/directions/engineering{
-	desc = "A sign that shows there are doors here. There are doors everywhere!";
-	icon_state = "doors";
-	name = "WARNING: EXTERNAL AIRLOCK"
-	},
-/turf/open/floor/plating,
-/area/centcom/ferry)
 "ZX" = (
 /obj/machinery/abductor/console{
 	team_number = 1
@@ -18763,7 +18725,7 @@ Wd
 ce
 mc
 Kx
-ZV
+YW
 YW
 KW
 YW
@@ -19410,7 +19372,7 @@ Kx
 Kx
 Kx
 ox
-Wn
+YW
 ox
 Kx
 Kx
@@ -19668,7 +19630,7 @@ io
 cw
 Kx
 ti
-Wn
+YW
 ti
 Kx
 KO
@@ -21861,7 +21823,7 @@ Kx
 Kx
 Kx
 ox
-Wn
+YW
 ox
 Kx
 lm
@@ -22119,7 +22081,7 @@ Es
 me
 hi
 oq
-bR
+Es
 oq
 hi
 me
@@ -22875,7 +22837,7 @@ gd
 gd
 me
 JG
-bR
+Es
 DX
 lK
 lK
@@ -22887,7 +22849,7 @@ lK
 Pw
 Es
 Lo
-bR
+Es
 Iq
 lK
 Es
@@ -22901,7 +22863,7 @@ lK
 mE
 Es
 vA
-bR
+Es
 Tj
 lK
 lK
@@ -23143,7 +23105,7 @@ lK
 lK
 lK
 Pw
-bR
+Es
 Lo
 Es
 kF
@@ -23157,7 +23119,7 @@ Dc
 hi
 lK
 Bo
-bR
+Es
 vA
 Es
 sl
@@ -23525,7 +23487,7 @@ Es
 me
 Es
 Bv
-bR
+Es
 Bv
 Es
 me
@@ -23783,7 +23745,7 @@ tR
 hi
 Es
 oq
-bR
+Es
 oq
 Es
 me
@@ -23925,7 +23887,7 @@ Vi
 me
 hi
 Bv
-bR
+Es
 Bv
 hi
 me
@@ -24183,7 +24145,7 @@ ju
 me
 hi
 oq
-bR
+Es
 oq
 hi
 me
@@ -25073,7 +25035,7 @@ tR
 hi
 Es
 Qe
-bR
+Es
 Qe
 Es
 me
@@ -25215,7 +25177,7 @@ hq
 me
 hi
 Bv
-bR
+Es
 Bv
 hi
 me
@@ -25473,7 +25435,7 @@ hq
 hq
 JD
 Yr
-ja
+MB
 Yr
 JD
 hq

_maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm

@@ -218,8 +218,6 @@
 /area/ship/maintenance/port)
 "fT" = (
 /obj/structure/closet/secure_closet/security,
-/obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
-/obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
 /obj/item/gun/ballistic/automatic/hmg/l6_saw,
 /obj/item/gun/ballistic/automatic/hmg/l6_saw,
 /obj/item/ammo_box/magazine/m12g/slug,
@@ -1195,6 +1193,19 @@
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
+"Fj" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{
+	dir = 4;
+	name = "warningr"
+	},
+/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{
+	dir = 8;
+	name = "warningr"
+	},
+/obj/item/gun/ballistic/automatic/smg/c20r/toy,
+/turf/open/floor/plasteel/tech,
+/area/ship/security/range)
 "Fx" = (
 /obj/structure/sign/poster/contraband/c20r,
 /turf/closed/wall/r_wall,
@@ -1282,6 +1293,10 @@
 	dir = 8;
 	name = "warningr"
 	},
+/obj/item/gun/ballistic/automatic/smg/c20r/toy,
+/obj/item/gun/ballistic/automatic/hmg/l6_saw/toy{
+	pixel_y = 11
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/security/range)
 "Hl" = (
@@ -1600,18 +1615,14 @@
 	pixel_x = 28;
 	name = "foam gun cabinet"
 	},
-/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted,
-/obj/item/gun/ballistic/automatic/hmg/l6_saw/toy/unrestricted,
 /obj/item/ammo_box/magazine/toy/m762,
 /obj/item/ammo_box/magazine/toy/m762,
 /obj/item/ammo_box/magazine/toy/m762,
-/obj/item/gun/ballistic/automatic/smg/c20r/toy/unrestricted,
 /obj/item/ammo_box/magazine/toy/smg,
 /obj/item/ammo_box/magazine/toy/smg,
 /obj/item/ammo_box/magazine/toy/smg,
 /obj/item/ammo_box/foambox,
 /obj/item/ammo_box/foambox,
-/obj/item/gun/ballistic/shotgun/toy/unrestricted,
 /turf/open/floor/plasteel/dark,
 /area/ship/security/range)
 "Ob" = (
@@ -1690,6 +1701,7 @@
 	dir = 8;
 	name = "warningr"
 	},
+/obj/item/gun/ballistic/automatic/smg/c20r/toy,
 /turf/open/floor/plasteel/tech,
 /area/ship/security/range)
 "PH" = (
@@ -2392,7 +2404,7 @@ UJ
 nu
 Qe
 oX
-Hk
+Fj
 Hk
 PG
 aT

_maps/_mod_celadon/shuttles/independent/independent_nemo.dmm

@@ -551,7 +551,9 @@
 /obj/machinery/light/directional/north,
 /obj/machinery/firealarm/directional/north,
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/snacks/fishfingers,
+/obj/item/reagent_containers/food/snacks/fishfingers{
+	pixel_y = 1
+	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
@@ -2191,7 +2193,6 @@
 	pixel_x = -32;
 	req_access = list(30)
 	},
-/obj/item/firing_pin,
 /obj/item/kitchen/knife/hunting,
 /obj/item/gun/ballistic/shotgun/doublebarrel/beacon,
 /obj/item/ammo_box/a4570,