Merge pull request #451 from KittyNoodle/sisyphus

The great map proofreading

_maps/map_files/tramstation/tramstation.dmm

@@ -2236,11 +2236,7 @@
 "agx" = (
 /obj/structure/filingcabinet,
 /obj/structure/window/spawner/directional/north,
-/obj/item/paper/monitorkey,
-/obj/item/areaeditor/blueprints{
-	name = "Station Layout";
-	desc = "A crude mapping of the station layout based on leaked internal documents and orbital snapshots taken during construction. I'm not sure how up-to-date this is anymore..."
-	},
+/obj/item/paper/crumpled,
 /turf/open/floor/mineral/bananium,
 /area/ruin/powered/clownplanet)
 "agy" = (
@@ -8605,10 +8601,10 @@
 /turf/open/floor/iron/white,
 /area/station/science/lower)
 "bxd" = (
-/obj/machinery/computer/message_monitor{
+/obj/structure/sign/calendar/directional/south,
+/obj/machinery/computer/old{
 	dir = 1
 	},
-/obj/structure/sign/calendar/directional/south,
 /turf/open/floor/mineral/bananium,
 /area/ruin/powered/clownplanet)
 "bxr" = (
@@ -9647,6 +9643,7 @@
 /obj/machinery/door/firedoor,
 /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload,
 /obj/structure/cable,
+/obj/structure/cable/layer1,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/ai)
 "bNx" = (
@@ -10251,7 +10248,6 @@
 	pixel_x = 4;
 	pixel_y = -32
 	},
-/obj/item/stack/sheet/mineral/bananium/five,
 /turf/open/floor/plating,
 /area/station/engineering/main)
 "bXr" = (
@@ -18019,6 +18015,9 @@
 /obj/effect/turf_decal/siding/thinplating_new/dark/corner{
 	dir = 4
 	},
+/obj/machinery/camera/directional/west{
+	c_tag = "Cargo - Bitrunning Den"
+	},
 /turf/open/floor/iron/dark/textured_large,
 /area/station/bitrunning/den)
 "eyy" = (
@@ -20087,7 +20086,7 @@
 /obj/item/ammo_box/a357,
 /obj/effect/turf_decal/bot_white/left,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/gun/ballistic/revolver/mateba,
+/obj/item/gun/ballistic/revolver/russian,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/command/nuke_storage)
 "fkg" = (
@@ -25245,10 +25244,10 @@
 /area/station/medical/break_room)
 "gWk" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/storage/toolbox/syndicate,
 /obj/structure/table,
 /obj/effect/spawner/random/engineering/tool,
 /obj/effect/spawner/random/mod,
+/obj/item/storage/toolbox/emergency/old,
 /turf/open/floor/plating,
 /area/ruin/powered/clownplanet)
 "gWo" = (
@@ -25505,6 +25504,11 @@
 	},
 /turf/open/floor/iron,
 /area/station/commons/storage/art)
+"hbN" = (
+/obj/structure/cable,
+/obj/structure/cable/layer1,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai)
 "hbQ" = (
 /obj/machinery/camera/directional/north{
 	c_tag = "Civilian - Holodeck Controls"
@@ -29253,6 +29257,7 @@
 /obj/structure/showcase/cyborg/old{
 	pixel_y = 20
 	},
+/obj/structure/cable/layer1,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/ai)
 "iqZ" = (
@@ -31760,7 +31765,7 @@
 /turf/open/floor/iron/smooth,
 /area/station/maintenance/department/crew_quarters/dorms)
 "jfu" = (
-/obj/structure/cable,
+/obj/structure/cable/layer1,
 /turf/closed/wall/r_wall,
 /area/station/ai_monitored/turret_protected/aisat/hallway)
 "jfD" = (
@@ -33330,9 +33335,7 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/obj/machinery/suit_storage_unit/industrial,
-/obj/item/mod/control/pre_equipped/cosmohonk,
-/obj/item/mod/module/insignia/clown,
+/obj/machinery/suit_storage_unit/standard_unit,
 /turf/open/floor/mineral/bananium,
 /area/ruin/powered/clownplanet)
 "jFu" = (
@@ -39116,7 +39119,6 @@
 "lwy" = (
 /obj/machinery/porta_turret/ai,
 /obj/machinery/light/directional/north,
-/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/aisat/hallway)
 "lwB" = (
@@ -48998,8 +49000,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
 /obj/effect/spawner/random/decoration/ornament,
-/obj/item/stack/sheet/mineral/bananium/five,
 /obj/item/reagent_containers/cup/beaker,
+/obj/item/grown/bananapeel/bluespace,
 /turf/open/floor/plating,
 /area/ruin/powered/clownplanet)
 "oMZ" = (
@@ -61406,7 +61408,8 @@
 /area/station/commons/dorms)
 "sJp" = (
 /obj/structure/sign/clock/directional/south,
-/obj/machinery/computer/camera_advanced/syndie{
+/obj/item/paper/crumpled/bloody,
+/obj/structure/frame/computer{
 	dir = 1
 	},
 /turf/open/floor/mineral/bananium,
@@ -62173,6 +62176,7 @@
 	},
 /obj/machinery/holopad/secure,
 /obj/structure/cable,
+/obj/structure/cable/layer1,
 /turf/open/floor/glass/reinforced,
 /area/station/ai_monitored/turret_protected/aisat/hallway)
 "sVA" = (
@@ -63686,10 +63690,6 @@
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
 "tsR" = (
-/obj/item/paper{
-	default_raw_text = "Congradulations, agent 'INSERT NAME HERE'! You have been assigned reconnaissance duty among the orbiting rocks of Indecipheres! As this location was previously scouted as a potential build site for a Nanotrasen outpost, one of our benefactors has taken the oppertunity to pre-emptively construct a listening outpost within the region! You have been tasked with monitoring the potentially active future crew and logging all events onboard. If you are a Nanotrasen official who has stumbled upon this outpost before it could be properly established: Please ignore this entire paper.";
-	name = "initiation paperwork"
-	},
 /obj/machinery/computer/records/medical/syndie{
 	dir = 1;
 	req_access = list("syndicate")
@@ -63824,9 +63824,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "engi-entrance"
-	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "Engineering3"
 	},
@@ -64899,7 +64896,7 @@
 	c_tag = "Secure - AI Upper External North";
 	network = list("aicore")
 	},
-/obj/structure/cable,
+/obj/structure/cable/multilayer/connected,
 /turf/open/floor/engine/hull/reinforced,
 /area/station/ai_monitored/turret_protected/aisat/hallway)
 "tNJ" = (
@@ -78034,20 +78031,20 @@
 /obj/effect/turf_decal/trimline/yellow/filled/line{
 	dir = 6
 	},
-/mob/living/simple_animal/pet/cat/kitten{
-	name = "Blu";
-	gender = "female"
-	},
 /obj/structure/bed/dogbed{
 	desc = "A comfy-looking cat bed. You can even strap your pet in, in case the gravity turns off.";
-	name = "cat bed"
+	name = "slime bed"
 	},
 /obj/machinery/conveyor_switch/oneway{
 	id = "hydrodropoff";
 	name = "Shipment Delivery Chute Activator";
 	pixel_x = 10;
 	pixel_y = 20
 	},
+/mob/living/simple_animal/slime/pet{
+	colour = "orange";
+	name = "Happy Accident"
+	},
 /turf/open/floor/plastic,
 /area/station/engineering/break_room)
 "xYV" = (
@@ -193303,7 +193300,7 @@ jfu
 lwy
 sVz
 bNr
-aoh
+hbN
 fyX
 ffe
 mgi

monkestation/_maps/RandomBars/Icebox/BarSM.dmm

@@ -24,17 +24,6 @@
 	},
 /turf/open/floor/pod/dark,
 /area/station/commons/lounge)
-"aZ" = (
-/obj/structure/bed/dogbed{
-	name = "pet bed";
-	desc = "A comfy-looking pet bed. You can even strap your pet in, in case the gravity turns off."
-	},
-/mob/living/simple_animal/pet/cat/kitten{
-	gender = "female";
-	name = "Blu"
-	},
-/turf/open/floor/carpet/neon/simple/yellow/nodots,
-/area/station/service/bar/backroom)
 "bo" = (
 /obj/structure/cable,
 /obj/machinery/door/airlock/engineering/glass/critical{
@@ -591,8 +580,6 @@
 /obj/item/reagent_containers/cup/beaker/large,
 /obj/item/vending_refill/cigarette,
 /obj/structure/table/reinforced,
-/obj/item/storage/box/lethalshot,
-/obj/item/storage/box/beanbag,
 /turf/open/floor/carpet/neon/simple/yellow/nodots,
 /area/station/service/bar/backroom)
 "uo" = (
@@ -905,18 +892,6 @@
 "Ec" = (
 /obj/machinery/light/directional/south,
 /obj/effect/turf_decal/tile/yellow/opposingcorners,
-/obj/machinery/autolathe,
-/obj/item/stack/sheet/iron/ten,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
 /turf/open/floor/pod/light,
 /area/station/service/bar)
 "Eu" = (
@@ -1212,11 +1187,9 @@
 	pixel_x = 4;
 	pixel_y = -4
 	},
-/obj/item/clothing/gloves/color/yellow,
 /obj/item/stack/cable_coil,
-/obj/item/mod/control/pre_equipped/engineering{
-	name = "Barkeeper MODsuit"
-	},
+/obj/item/clothing/gloves/color/fyellow,
+/obj/item/mod/control/pre_equipped/empty,
 /turf/open/floor/carpet/neon/simple/yellow/nodots,
 /area/station/service/bar/backroom)
 "KG" = (
@@ -1233,6 +1206,7 @@
 	pixel_y = 6
 	},
 /obj/item/reagent_containers/cup/rag,
+/obj/item/holosign_creator/robot_seat/bar,
 /turf/open/floor/pod/light,
 /area/station/service/bar)
 "KL" = (
@@ -1873,7 +1847,7 @@ EK
 "}
 (17,1,1) = {"
 Kf
-aZ
+Ix
 Ix
 qu
 wG

monkestation/_maps/RandomBars/Icebox/Drunkopsbar.dmm

@@ -592,14 +592,16 @@
 /turf/open/floor/iron/dark,
 /area/station/service/bar)
 "Gc" = (
-/obj/structure/closet/gimmick/tacticool,
 /obj/structure/cable,
 /obj/item/clothing/under/syndicate/tacticool,
 /obj/item/clothing/under/syndicate/tacticool/skirt,
 /obj/item/toy/figure/syndie,
 /obj/item/toy/sword,
 /obj/structure/extinguisher_cabinet/directional/north,
 /obj/item/clothing/head/collectable/swat,
+/obj/structure/closet{
+	icon_state = "syndicate"
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/station/service/bar)
 "Gv" = (
@@ -726,12 +728,14 @@
 /obj/effect/turf_decal/siding/thinplating_new/dark,
 /obj/effect/turf_decal/stripes/red/line,
 /obj/structure/railing,
-/obj/structure/closet/gimmick/tacticool,
 /obj/item/clothing/under/syndicate/tacticool,
 /obj/item/clothing/under/syndicate/tacticool/skirt,
 /obj/item/toy/gun,
 /obj/item/toy/sword,
 /obj/item/clothing/mask/gas,
+/obj/structure/closet{
+	icon_state = "syndicate"
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/station/service/bar)
 "Pk" = (
@@ -785,6 +789,7 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/service/bar/backroom)
 "Qe" = (
@@ -849,7 +854,9 @@
 /obj/item/toy/mecha/mauler,
 /obj/item/toy/sword,
 /obj/item/clothing/mask/gas,
-/obj/structure/closet,
+/obj/structure/closet{
+	icon_state = "syndicate"
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/station/service/bar)
 "RX" = (
@@ -924,7 +931,9 @@
 /obj/item/clothing/under/syndicate/tacticool/skirt,
 /obj/item/toy/gun,
 /obj/item/toy/sword,
-/obj/structure/closet,
+/obj/structure/closet{
+	icon_state = "syndicate"
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/station/service/bar)
 "TO" = (