Deletes random NT jetpacks (suits have integrated jetpacks) and gives…

… the Thunderbird a much needed facelift (#124)

_maps/shuttles/shiptest/heron.dmm

@@ -808,10 +808,7 @@
 	dir = 4;
 	layer = 3.1
 	},
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/ert/sec{
-	name = "quick response force hardsuit"
-	},
+/obj/machinery/suit_storage_unit/ert/security,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "dx" = (
@@ -1020,17 +1017,12 @@
 /turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/maintenance/fore)
 "ek" = (
-/obj/item/gun/energy/e_gun/smg{
-	pixel_y = 9
-	},
-/obj/item/gun/energy/e_gun/smg{
-	pixel_y = 2
-	},
-/obj/item/gun/ballistic/shotgun/automatic/combat{
-	pixel_y = -3
-	},
 /obj/structure/rack,
 /obj/machinery/airalarm/directional/east,
+/obj/item/gun_voucher,
+/obj/item/gun_voucher,
+/obj/item/gun_voucher,
+/obj/item/gun_voucher,
 /turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
 "en" = (
@@ -3139,12 +3131,11 @@
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen/kitchen)
 "md" = (
-/obj/machinery/suit_storage_unit/standard_unit,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
 /obj/structure/window/reinforced,
-/obj/effect/decal/cleanable/robot_debris,
+/obj/machinery/suit_storage_unit/ert/engineer,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/hallway/aft)
 "me" = (
@@ -3747,12 +3738,11 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/atmospherics)
 "oo" = (
-/obj/machinery/suit_storage_unit/inherit,
 /obj/structure/railing{
 	dir = 8;
 	layer = 3.1
 	},
-/obj/item/clothing/suit/space/hardsuit/ert/med,
+/obj/machinery/suit_storage_unit/ert/command,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "oq" = (
@@ -3930,15 +3920,14 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/atmospherics)
 "oX" = (
-/obj/machinery/suit_storage_unit/inherit,
 /obj/structure/railing{
 	dir = 8;
 	layer = 3.1
 	},
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -28
 	},
-/obj/item/clothing/suit/space/hardsuit/ert/engi,
+/obj/machinery/suit_storage_unit/ert/medical,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "pb" = (
@@ -5796,10 +5785,10 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/electrical)
 "wx" = (
-/obj/machinery/suit_storage_unit/standard_unit,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
+/obj/machinery/suit_storage_unit/ert/engineer,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/hallway/aft)
 "wz" = (
@@ -12037,11 +12026,8 @@
 	dir = 8;
 	layer = 3.1
 	},
-/obj/machinery/suit_storage_unit/inherit,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/suit/space/hardsuit/ert/sec{
-	name = "quick response force hardsuit"
-	},
+/obj/machinery/suit_storage_unit/ert/security,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "VH" = (
@@ -12084,10 +12070,7 @@
 	dir = 4;
 	layer = 3.1
 	},
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/ert/sec{
-	name = "quick response force hardsuit"
-	},
+/obj/machinery/suit_storage_unit/ert/security,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "VN" = (

_maps/shuttles/shiptest/scrapper.dmm

@@ -384,7 +384,7 @@
 /area/ship/engineering/atmospherics)
 "dN" = (
 /obj/structure/catwalk,
-/turf/template_noop,
+/turf/open/floor/plating,
 /area/ship/external)
 "dP" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -510,10 +510,13 @@
 /area/ship/hallway/aft)
 "ft" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/fancy/donut_box,
+/obj/item/storage/fancy/donut_box{
+	pixel_y = 8
+	},
 /obj/effect/turf_decal/siding/red{
 	dir = 9
 	},
+/obj/item/storage/fancy/donut_box,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
 "fw" = (
@@ -799,12 +802,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
-"jy" = (
-/obj/effect/turf_decal/siding/yellow/corner{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/ship/external)
 "jC" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -1099,6 +1096,7 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew/hydroponics)
 "mN" = (
+/obj/structure/catwalk,
 /turf/open/floor/plating/airless,
 /area/ship/external)
 "mR" = (
@@ -1249,6 +1247,7 @@
 /obj/effect/turf_decal/siding/yellow{
 	dir = 8
 	},
+/obj/structure/catwalk,
 /turf/open/floor/plating/airless,
 /area/ship/external)
 "ot" = (
@@ -1570,17 +1569,9 @@
 /turf/open/floor/pod/light,
 /area/ship/hallway/aft)
 "sW" = (
-/obj/structure/closet/wall{
-	dir = 4;
-	name = "armory locker";
-	pixel_x = -32
-	},
 /obj/effect/turf_decal/siding/red{
 	dir = 9
 	},
-/obj/item/gun/energy/laser/terra,
-/obj/item/gun/energy/laser/terra,
-/obj/item/gun/energy/laser/terra,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
 "tb" = (
@@ -2298,14 +2289,12 @@
 /obj/effect/turf_decal/siding/red{
 	dir = 10
 	},
-/obj/structure/closet/wall{
-	dir = 4;
-	name = "armory locker";
-	pixel_x = -32
-	},
 /obj/machinery/light/dim,
-/obj/item/storage/box/handcuffs,
-/obj/item/storage/box/handcuffs,
+/obj/structure/rack,
+/obj/item/gun_voucher/syndicate,
+/obj/item/gun_voucher/syndicate,
+/obj/item/gun_voucher/syndicate,
+/obj/item/gun_voucher/syndicate,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
 "AP" = (
@@ -2353,12 +2342,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
+/obj/machinery/door/firedoor,
 /turf/open/floor/pod/light,
 /area/ship/cargo)
 "Bh" = (
@@ -2431,12 +2415,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
+/obj/machinery/door/firedoor,
 /turf/open/floor/pod/light,
 /area/ship/cargo)
 "Ch" = (
@@ -2946,6 +2925,7 @@
 /obj/effect/turf_decal/siding/yellow{
 	dir = 8
 	},
+/obj/structure/catwalk,
 /turf/open/floor/plating/airless,
 /area/ship/external)
 "IC" = (
@@ -2974,12 +2954,6 @@
 	id = "scrapdoorext";
 	name = "cargo bay blast door"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
 /turf/open/floor/pod/light,
 /area/ship/hallway/aft)
 "IX" = (
@@ -3274,12 +3248,6 @@
 "Md" = (
 /turf/open/floor/engine/hull,
 /area/ship/external)
-"Me" = (
-/obj/effect/turf_decal/siding/yellow/corner{
-	dir = 1
-	},
-/turf/open/floor/plating/airless,
-/area/ship/external)
 "Mg" = (
 /obj/structure/ore_box,
 /obj/effect/turf_decal/box,
@@ -5518,11 +5486,11 @@ MX
 qU
 qU
 qU
-jy
+MX
 oo
 oo
 Iw
-Me
+MX
 qU
 qU
 qU
@@ -5767,40 +5735,3 @@ mN
 dN
 qU
 "}
-(31,1,1) = {"
-qU
-qU
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-dN
-qU
-"}

_maps/shuttles/shiptest/voidcrew/bead.dmm

@@ -14,6 +14,10 @@
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/aft)
+"ce" = (
+/obj/structure/sign/poster/official/nanotrasen_logo,
+/turf/closed/wall/mineral/titanium,
+/area/ship/security)
 "ct" = (
 /obj/machinery/atmospherics/pipe/simple/orange/visible,
 /obj/machinery/light{
@@ -686,6 +690,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/ship/bridge)
+"Ix" = (
+/obj/structure/sign/poster/official/nanotrasen_logo,
+/turf/closed/wall/mineral/titanium,
+/area/ship/cargo)
 "IA" = (
 /obj/machinery/door/airlock/maintenance_hatch,
 /obj/effect/turf_decal/siding/thinplating{
@@ -856,6 +864,7 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/maintenance/aft)
 "Oo" = (
+/obj/structure/sign/poster/official/nanotrasen_logo,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/engineering)
 "OD" = (
@@ -1422,7 +1431,7 @@ VB
 (10,1,1) = {"
 VB
 gl
-VQ
+ce
 VQ
 VQ
 VQ
@@ -1498,7 +1507,7 @@ Oo
 (14,1,1) = {"
 VB
 VB
-mV
+Ix
 mV
 mV
 oI