Merge pull request #70 from gear-space/shiptest-sync-nov12

Shiptest sync nov12

_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm

@@ -186,9 +186,7 @@
 "dJ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/carpet/nanoweave/red,
 /area/ruin/unpowered/listening_post/commons)
 "dM" = (
@@ -298,9 +296,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
@@ -464,9 +460,7 @@
 /turf/open/floor/carpet/nanoweave/red,
 /area/ruin/unpowered/listening_post/commons)
 "hA" = (
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/machinery/power/terminal{
 	dir = 1
 	},
@@ -727,12 +721,12 @@
 /area/ruin/unpowered/listening_post/operations)
 "na" = (
 /obj/structure/table/reinforced,
-/obj/machinery/fax{
-	pixel_y = 7
-	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
+/obj/machinery/fax/ruin{
+	pixel_y = 6
+	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/listening_post/operations)
 "nc" = (
@@ -1763,9 +1757,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/listening_post/operations)
 "FW" = (
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/machinery/power/smes/engineering,
 /turf/open/floor/plating,
 /area/ruin/unpowered/listening_post/engineering)
@@ -2199,9 +2191,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
@@ -2471,9 +2461,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/dark,

_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm

@@ -766,9 +766,7 @@
 /turf/open/floor/wood,
 /area/ruin/rockplanet/distillery/office)
 "ir" = (
-/obj/structure/cable/yellow{
-	icon_state = "0-1"
-	},
+/obj/structure/cable/yellow,
 /obj/machinery/porta_turret/ship/weak,
 /turf/open/floor/plating/asteroid/rockplanet/cracked/lit,
 /area/ruin/rockplanet/distillery/office)
@@ -798,9 +796,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/machinery/power/smes/shuttle/micro/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/micro/precharged,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "pod_window"
 	},
@@ -1125,9 +1121,7 @@
 /turf/open/floor/pod/rockplanet,
 /area/ruin/rockplanet/distillery/shuttle)
 "mK" = (
-/turf/open/floor/plasteel/stairs/wood{
-	color = "#5B3E1D"
-	},
+/turf/open/floor/plasteel/stairs/wood,
 /area/ruin/rockplanet/distillery/saloon)
 "mX" = (
 /obj/effect/turf_decal/siding/wood{
@@ -2416,9 +2410,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/white{
 	dir = 9
 	},
-/obj/effect/turf_decal/trimline/opaque/neutral/filled/corner{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/opaque/neutral/filled/corner,
 /turf/open/floor/plasteel/patterned/rockplanet/lit,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "Bn" = (
@@ -2595,7 +2587,7 @@
 /turf/open/floor/plasteel/patterned/brushed/rockplanet,
 /area/ruin/rockplanet/distillery)
 "CW" = (
-/obj/machinery/fax/admin/frontiersmen,
+/obj/machinery/fax/ruin,
 /obj/structure/table/wood/reinforced,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 5
@@ -2631,9 +2623,7 @@
 /turf/open/floor/pod,
 /area/ruin/rockplanet/distillery/crew)
 "DX" = (
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/structure/cable/yellow{
 	icon_state = "1-10"
 	},
@@ -3581,9 +3571,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable/yellow{
-	icon_state = "0-1"
-	},
+/obj/structure/cable/yellow,
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/pod/rockplanet,
 /area/ruin/rockplanet/distillery)
@@ -3657,9 +3645,7 @@
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ruin/rockplanet/distillery/engineering)
 "PI" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric,
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
@@ -4544,9 +4530,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/obj/machinery/power/smes/shuttle/micro/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/micro/precharged,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "pod_window"
 	},

_maps/configs/syndicate_cybersun_kansatsu.json

@@ -39,5 +39,5 @@
 			"slots": 2
 		}
 	},
-	"enabled": true
+	"enabled": false
 }

_maps/configs/syndicate_ngr_kaliandhi.json

@@ -0,0 +1,58 @@
+{
+	"faction": "/datum/faction/syndicate/ngr",
+	"prefix": "NGRV",
+	"namelists": [
+		"GORLEX",
+		"NATURAL_AGGRESSIVE",
+		"BEASTS",
+		"WEAPONS"
+	],
+	"map_name": "Kali Andhi-class Destroyer",
+	"map_short_name": "Kali Andhi-class",
+	"description": "A post-ICW destroyer design commissioned by the New Gorlex Republic and outfitted for general patrol and reclamation duties. The Kali Andhi-class, despite its young age, has been instrumental in securing New Gorlex's modest territorial claims, making them a somewhat unwelcome sight for the PGF's frontier mission.",
+	"tags": [
+		"RP Focus",
+		"Combat"
+	],
+	"map_path": "_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm",
+	"map_id": "syndicate_gorlex_kaliandhi",
+	"limit": 1,
+	"job_slots": {
+		"Captain": {
+			"outfit": "/datum/outfit/job/syndicate/captain/ngr",
+			"officer": true,
+			"slots": 1
+		},
+		"Lieutenant": {
+			"outfit": "/datum/outfit/job/syndicate/hos/ngr",
+			"officer": true,
+			"slots": 1
+		},
+		"Ensign": {
+			"outfit": "/datum/outfit/job/syndicate/head_of_personnel/ngr",
+			"officer": true,
+			"slots": 1
+		},
+		"Medical Doctor": {
+			"outfit": "/datum/outfit/job/syndicate/doctor/ngr",
+			"slots": 1
+		},
+		"Mechanic": {
+			"outfit": "/datum/outfit/job/syndicate/engineer/ngr",
+			"slots": 1
+		},
+		"Wrecker": {
+			"outfit": "/datum/outfit/job/syndicate/miner/ngr",
+			"slots":1
+		},
+		"Operative": {
+			"outfit": "/datum/outfit/job/syndicate/security/ngr",
+			"slots": 3
+		},
+		"Initiate": {
+			"outfit": "/datum/outfit/job/syndicate/assistant/ngr",
+			"slots": 2
+		}
+	},
+	"enabled": true
+}

_maps/shuttles/independent/independent_kilo.dmm

@@ -662,12 +662,10 @@
 	dir = 8
 	},
 /obj/item/storage/box/ammo/a12g_rubbershot,
-/obj/item/gun/ballistic/shotgun/doublebarrel/presawn{
-	default_ammo_type = 0
-	},
 /obj/structure/cable/pink{
 	icon_state = "4-10"
 	},
+/obj/item/gun/ballistic/shotgun/doublebarrel/presawn/empty,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "gs" = (

_maps/shuttles/nanotrasen/nanotrasen_delta.dmm

@@ -983,9 +983,7 @@
 	dir = 8
 	},
 /obj/machinery/power/ship_gravity,
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "dE" = (
@@ -1039,13 +1037,18 @@
 /area/ship/crew)
 "dI" = (
 /obj/structure/table,
+/obj/item/spacecash/bundle/c1000{
+	pixel_x = -5;
+	pixel_y = 9
+	},
+/obj/item/spacecash/bundle/c1000,
 /obj/item/paper_bin{
 	pixel_x = 5;
 	pixel_y = 4
 	},
 /obj/item/folder/yellow{
 	pixel_x = 5;
-	pixel_y = 5
+	pixel_y = 7
 	},
 /obj/item/pen/fountain/captain,
 /obj/effect/turf_decal/corner/opaque/nsorange,
@@ -1123,9 +1126,7 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/science/robotics)
 "em" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/fueled/plasma,
 /turf/open/floor/plating/airless,
 /area/ship/engineering)
 "ev" = (
@@ -1851,9 +1852,7 @@
 	dir = 4;
 	name = "Engine Access"
 	},
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
-	},
+/obj/machinery/atmospherics/components/unary/shuttle/heater,
 /obj/machinery/door/poddoor{
 	dir = 4;
 	id = "whiteship_windows"
@@ -2068,12 +2067,12 @@
 	},
 /obj/structure/table,
 /obj/machinery/recharger,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/areaeditor/shuttle,
 /obj/machinery/turretid/ship{
 	pixel_y = -24
 	},
+/obj/machinery/fax/nanotrasen{
+	pixel_y = 6
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Aw" = (
@@ -2159,9 +2158,7 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "Bw" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
@@ -2388,9 +2385,7 @@
 	dir = 4;
 	name = "Engine Access"
 	},
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/precharged,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
@@ -2676,9 +2671,7 @@
 	dir = 4;
 	name = "Engine Access"
 	},
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/precharged,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
@@ -2839,9 +2832,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/science/robotics)
 "TO" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
@@ -2979,9 +2970,7 @@
 	dir = 4;
 	name = "Engine Access"
 	},
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
-	},
+/obj/machinery/atmospherics/components/unary/shuttle/heater,
 /obj/machinery/door/poddoor{
 	dir = 4;
 	id = "whiteship_windows"