Merge remote-tracking branch 'origin/master' into fix-problems-i-have…

…-made-2

_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm

@@ -2657,8 +2657,8 @@
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/firealarm/directional/east,
-/obj/item/storage/box/vials,
-/obj/item/storage/box/vials,
+/obj/item/storage/box/tube,
+/obj/item/storage/box/tube,
 /obj/item/device/antibody_scanner,
 /obj/item/device/antibody_scanner,
 /obj/item/clothing/gloves/latex,

_maps/RandomRuins/SpaceRuins/anomaly_research.dmm

@@ -146,7 +146,7 @@
 /obj/structure/fireplace{
 	pixel_x = -32
 	},
-/obj/item/kirbyplants/fullysynthetic{
+/obj/item/kirbyplants/random/fullysynthetic{
 	pixel_x = 10;
 	pixel_y = 19
 	},
@@ -1237,7 +1237,7 @@
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
 "Gi" = (
-/obj/item/kirbyplants/fullysynthetic{
+/obj/item/kirbyplants/random/fullysynthetic{
 	pixel_x = -8;
 	pixel_y = 21
 	},

_maps/RandomRuins/SpaceRuins/russian_derelict.dmm

@@ -839,7 +839,7 @@
 /turf/open/floor/plating/airless,
 /area/ruin/space/ks13/engineering/secure_storage)
 "kA" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/random/dead,
 /obj/effect/mapping_helpers/broken_floor,
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/plating/airless,
@@ -997,7 +997,7 @@
 /area/ruin/space/ks13/hallway/central)
 "mp" = (
 /obj/structure/sign/departments/medbay/alt/directional/west,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/random/dead,
 /turf/open/floor/iron/airless,
 /area/ruin/space/ks13/hallway/central)
 "mq" = (
@@ -3912,7 +3912,7 @@
 "Cn" = (
 /obj/structure/sign/departments/medbay/alt/directional/east,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/random/dead,
 /turf/open/floor/iron/airless,
 /area/ruin/space/ks13/hallway/central)
 "Co" = (
@@ -4285,7 +4285,7 @@
 /turf/open/floor/plating/airless,
 /area/ruin/space/ks13/tool_storage)
 "Eg" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/random/dead,
 /turf/open/floor/plating/airless,
 /area/ruin/space/ks13/hallway/central)
 "Ei" = (
@@ -4642,7 +4642,7 @@
 /turf/open/floor/plating/airless,
 /area/ruin/space/ks13/engineering/grav_gen)
 "Ge" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/random/dead,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/ruin/space/ks13/security/court)
@@ -6126,7 +6126,7 @@
 /turf/open/floor/iron/airless,
 /area/ruin/space/ks13/science/rnd)
 "Og" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/random/dead,
 /turf/open/floor/iron,
 /area/ruin/space/ks13/security/court)
 "Oh" = (
@@ -6519,7 +6519,7 @@
 /turf/open/floor/plating/airless,
 /area/ruin/space/ks13/engineering/singulo)
 "PT" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/random/dead,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/ruin/space/ks13/command/bridge)
@@ -7293,7 +7293,7 @@
 /turf/open/floor/plating/airless,
 /area/ruin/space/ks13/security/sec)
 "TA" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/random/dead,
 /turf/open/floor/iron,
 /area/ruin/space/ks13/command/bridge_hall)
 "TB" = (
@@ -8024,7 +8024,7 @@
 /area/ruin/space/ks13/science/genetics)
 "Xs" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/random/dead,
 /turf/open/floor/iron/airless,
 /area/ruin/space/ks13/service/cafe)
 "Xt" = (

_maps/blueshift.json

@@ -0,0 +1,31 @@
+{
+	"version": 1,
+	"map_name": "Blueshift",
+	"map_path": "map_files/Blueshift",
+	"map_file": "Blueshift.dmm",
+	"shuttles": {
+		"cargo": "cargo_nova",
+		"whiteship": "whiteship_blueshift",
+		"emergency": "emergency_nova"
+	},
+	"traits": [
+		{
+			"Up": true,
+			"Linkage": "Cross"
+		},
+		{
+			"Down": true,
+			"Baseturf": "/turf/open/openspace",
+			"Linkage": "Cross"
+		}
+	],
+	"orbit_shift_replacement": "Attention crew, it appears that someone has shifted your ship into more dangerous territory.",
+	"job_changes": {
+		"Cook": {
+			"additional_cqc_areas": ["/area/station/service/kitchen/diner"]
+		},
+		"Captain": {
+			"special_charter": "ship"
+		}
+	}
+}