Merge branch 'Monkestation:master' into Code-Bounties

_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm

@@ -33,6 +33,7 @@
 "i" = (
 /obj/structure/rack,
 /obj/item/clothing/gloves/color/yellow,
+/obj/item/skillchip/job/engineer,
 /turf/open/floor/plating/airless,
 /area/ruin/space/abandoned_tele)
 "j" = (
@@ -71,8 +72,7 @@
 /turf/open/floor/plating/airless,
 /area/ruin/space/abandoned_tele)
 "q" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/flashlight,
+/obj/item/flashlight/flashdark,
 /turf/open/floor/plating/airless,
 /area/ruin/space/abandoned_tele)
 "r" = (
@@ -208,7 +208,7 @@ a
 a
 b
 b
-h
+q
 h
 s
 b
@@ -223,7 +223,7 @@ b
 b
 g
 l
-q
+m
 u
 h
 b

_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm

@@ -93,6 +93,7 @@
 /obj/item/clothing/suit/space/eva,
 /obj/item/tank/internals/emergency_oxygen/double,
 /obj/item/clothing/head/helmet/space/eva,
+/obj/effect/spawner/random/medical/surgery_tool_advanced,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
 "aV" = (
@@ -102,6 +103,7 @@
 "aW" = (
 /obj/structure/table/reinforced,
 /obj/item/gun/syringe,
+/obj/item/food/egg/raptor,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
 "aY" = (
@@ -140,6 +142,7 @@
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/hypospray/medipen/stimpack,
 /obj/item/reagent_containers/cup/bottle/mutagen,
+/obj/item/food/egg/cockatrice,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
 "bk" = (
@@ -159,7 +162,7 @@
 /area/ruin/space/has_grav/abandonedzoo)
 "bn" = (
 /obj/structure/table/reinforced,
-/obj/item/food/carrotfries,
+/obj/item/food/grown/eggplant,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
 "bp" = (
@@ -235,11 +238,11 @@
 /turf/open/floor/plating/airless,
 /area/template_noop)
 "bN" = (
-/obj/structure/grille/broken,
 /obj/item/stack/cable_coil/cut,
 /obj/item/shard{
 	icon_state = "small"
 	},
+/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/abandonedzoo)
 "bO" = (
@@ -274,21 +277,23 @@
 /turf/open/floor/plating/airless,
 /area/template_noop)
 "bT" = (
-/obj/structure/grille,
 /obj/item/shard{
 	icon_state = "medium"
 	},
+/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/abandonedzoo)
 "bU" = (
-/obj/structure/grille/broken,
+/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/abandonedzoo)
 "bW" = (
 /obj/item/shard,
 /turf/template_noop,
 /area/template_noop)
 "bX" = (
+/obj/structure/alien/weeds,
+/obj/structure/alien/egg/fake,
 /turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/abandonedzoo)
 "eY" = (
@@ -381,8 +386,15 @@
 /obj/item/crowbar,
 /obj/item/shield/riot,
 /obj/machinery/light/directional/north,
+/obj/effect/spawner/random/medical/surgery_tool_advanced,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
+"vy" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/green/fourcorners,
+/mob/living/basic/trooper/russian/ranged/lootless,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/abandonedzoo)
 "vU" = (
 /mob/living/basic/mining/goldgrub,
 /turf/open/misc/asteroid,
@@ -433,15 +445,11 @@
 	},
 /obj/item/melee/baton/security/cattleprod,
 /obj/effect/mapping_helpers/apc/unlocked,
+/obj/effect/spawner/random/medical/surgery_tool_advanced,
+/obj/effect/spawner/random/engineering/tool_advanced,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
 "Mb" = (
-/mob/living/basic/bee,
-/mob/living/basic/bee,
-/mob/living/basic/bee,
-/mob/living/basic/bee,
-/mob/living/basic/bee,
-/mob/living/basic/bee,
 /turf/open/floor/grass,
 /area/ruin/space/has_grav/abandonedzoo)
 "Ng" = (
@@ -464,7 +472,6 @@
 "PF" = (
 /obj/machinery/light/directional/south,
 /mob/living/basic/bee,
-/mob/living/basic/bee,
 /turf/open/floor/grass,
 /area/ruin/space/has_grav/abandonedzoo)
 "Rh" = (
@@ -724,7 +731,7 @@ Ni
 Ni
 Ni
 Ni
-oS
+vy
 Ni
 Ni
 Ni
@@ -802,8 +809,8 @@ aa
 (14,1,1) = {"
 ac
 al
-gE
-gE
+Mb
+Mb
 aA
 ac
 at
@@ -822,8 +829,8 @@ aa
 "}
 (15,1,1) = {"
 ac
-Mb
-Mb
+gE
+gE
 ao
 PF
 ac
@@ -837,7 +844,7 @@ ac
 mY
 bH
 bH
-bB
+bX
 bT
 aa
 "}
@@ -846,7 +853,7 @@ ac
 gE
 aq
 nY
-Mb
+gE
 aD
 aL
 kp
@@ -876,10 +883,10 @@ aQ
 aQ
 aQ
 ac
+bX
 bB
 bB
-bB
-bX
+bH
 bP
 aa
 "}

_maps/RandomRuins/SpaceRuins/allamericandiner.dmm

@@ -344,6 +344,7 @@
 "pg" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/urinal/directional/north,
+/obj/item/reagent_containers/syringe/morphine,
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/allamericandiner)
 "qp" = (
@@ -372,6 +373,7 @@
 /obj/structure/sink/directional/east,
 /obj/structure/mirror/directional/west,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/syringe/morphine,
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/allamericandiner)
 "rb" = (
@@ -483,6 +485,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/kitchen/small,
 /area/ruin/space/has_grav/allamericandiner)
+"wb" = (
+/obj/structure/table/reinforced,
+/obj/item/food/pie/applepie,
+/turf/open/floor/iron/kitchen/small,
+/area/ruin/space/has_grav/allamericandiner)
 "wC" = (
 /obj/structure/closet{
 	desc = "Why leave the chairs in a locker?";
@@ -618,9 +625,6 @@
 /obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 3
 	},
-/obj/item/reagent_containers/condiment/saltshaker{
-	pixel_x = -3
-	},
 /turf/open/floor/iron/kitchen/small,
 /area/ruin/space/has_grav/allamericandiner)
 "Dv" = (
@@ -787,6 +791,7 @@
 	pixel_x = 7;
 	pixel_y = 4
 	},
+/obj/item/gun/ballistic/automatic/pistol/m1911,
 /turf/open/floor/iron/grimy,
 /area/ruin/space/has_grav/allamericandiner)
 "HF" = (
@@ -1153,6 +1158,7 @@
 	pixel_x = 6
 	},
 /obj/effect/turf_decal/bot,
+/obj/item/reagent_containers/cocaine,
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/allamericandiner)
 "UR" = (
@@ -1251,12 +1257,17 @@
 	pixel_x = 9;
 	pixel_y = 1
 	},
+/obj/item/implanter/freedom,
 /turf/open/floor/iron/grimy,
 /area/ruin/space/has_grav/allamericandiner)
 "Yr" = (
 /obj/effect/spawner/structure/electrified_grille,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/allamericandiner)
+"YE" = (
+/obj/item/reagent_containers/cocainebrick,
+/turf/open/floor/iron/freezer,
+/area/ruin/space/has_grav/allamericandiner)
 "YK" = (
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/condiment/saltshaker{
@@ -1299,6 +1310,14 @@
 /obj/effect/turf_decal/trimline/dark_green/filled/line,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/allamericandiner)
+"ZP" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cocaine,
+/obj/item/reagent_containers/condiment/saltshaker{
+	pixel_x = -3
+	},
+/turf/open/floor/iron/kitchen/small,
+/area/ruin/space/has_grav/allamericandiner)
 "ZS" = (
 /obj/item/storage/box/ingredients/american,
 /obj/item/storage/box/ingredients/american,
@@ -1624,7 +1643,7 @@ dl
 jZ
 jZ
 jZ
-Xw
+ZP
 FB
 PW
 Ap
@@ -1772,7 +1791,7 @@ TN
 jZ
 Uc
 jZ
-Xw
+wb
 rG
 rd
 gB
@@ -1876,7 +1895,7 @@ oN
 EK
 uP
 Al
-Kp
+YE
 WC
 EK
 HF