Merge pull request #187 from honkpocket/tg-october-update-two

Tg Update October 20th

_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm

@@ -754,6 +754,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/blood,
+/obj/item/crusher_trophy/retool_kit/ashenskull,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
 "mo" = (

_maps/map_files/Birdshot/birdshot.dmm

@@ -29069,12 +29069,6 @@
 /turf/open/floor/iron,
 /area/station/security/prison/rec)
 "jUr" = (
-/obj/item/cigarette,
-/obj/item/storage/fancy/cigarettes/cigpack_robust{
-	pixel_y = 5;
-	pixel_x = 6
-	},
-/obj/item/lighter,
 /obj/structure/sign/poster/official/random/directional/east,
 /obj/structure/table,
 /obj/effect/turf_decal/tile/neutral/opposingcorners{
@@ -29083,6 +29077,7 @@
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 6
 	},
+/obj/item/aquarium_kit,
 /turf/open/floor/iron/small,
 /area/station/hallway/secondary/service)
 "jUx" = (
@@ -34214,10 +34209,7 @@
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 4
 	},
-/obj/machinery/computer/order_console/cook{
-	dir = 8
-	},
-/obj/effect/turf_decal/delivery,
+/obj/machinery/fishing_portal_generator,
 /turf/open/floor/iron/small,
 /area/station/hallway/secondary/service)
 "lEJ" = (
@@ -40837,6 +40829,9 @@
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 6
+	},
 /turf/open/floor/iron/small,
 /area/station/hallway/secondary/service)
 "nVx" = (
@@ -43165,7 +43160,6 @@
 "oPh" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
 /obj/structure/window/reinforced/spawner/directional/north,
 /obj/effect/turf_decal/tile/neutral/opposingcorners{
 	dir = 1
@@ -43174,6 +43168,9 @@
 	dir = 4
 	},
 /obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+	dir = 9
+	},
 /turf/open/floor/iron/small,
 /area/station/hallway/secondary/service)
 "oPj" = (
@@ -48423,9 +48420,6 @@
 /turf/open/floor/wood/parquet,
 /area/station/medical/psychology)
 "qDL" = (
-/obj/structure/disposalpipe/segment{
-	dir = 9
-	},
 /obj/machinery/firealarm/directional/east,
 /obj/effect/turf_decal/tile/neutral/opposingcorners{
 	dir = 1
@@ -48436,7 +48430,10 @@
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 4
 	},
-/obj/effect/landmark/start/botanist,
+/obj/machinery/computer/order_console/cook{
+	dir = 8
+	},
+/obj/effect/turf_decal/delivery,
 /turf/open/floor/iron/small,
 /area/station/hallway/secondary/service)
 "qDN" = (
@@ -49653,9 +49650,6 @@
 /area/station/maintenance/port/greater)
 "qYr" = (
 /obj/structure/cable,
-/obj/structure/disposalpipe/segment{
-	dir = 6
-	},
 /obj/effect/turf_decal/tile/neutral/opposingcorners{
 	dir = 1
 	},
@@ -49666,6 +49660,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/iron/small,
 /area/station/hallway/secondary/service)
 "qYv" = (
@@ -63696,6 +63691,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
+/obj/effect/landmark/start/botanist,
 /turf/open/floor/iron/small,
 /area/station/hallway/secondary/service)
 "vxM" = (

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -12653,6 +12653,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
+/obj/machinery/fishing_portal_generator,
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/service)
 "ddg" = (

_maps/map_files/IceBoxStation/IceBoxStation.dmm

@@ -44654,14 +44654,7 @@
 /turf/open/floor/engine,
 /area/station/engineering/atmos/hfr_room)
 "mYR" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen{
-	pixel_x = -5
-	},
-/obj/item/hand_labeler{
-	pixel_y = -3
-	},
+/obj/machinery/fishing_portal_generator,
 /turf/open/floor/wood,
 /area/station/hallway/secondary/service)
 "mZf" = (