diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 4e67afbc46..befc35be26 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -12,7 +12,7 @@ /obj/structure/morgue name = "morgue" - desc = "Used to keep bodies in untill someone fetches them." + desc = "A refrigerated unit used to store bodies, or for surreptitious naps." icon = 'icons/obj/stationobjs.dmi' icon_state = "morgue1" dir = EAST diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index eafa4e05a0..2fe113908d 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -70,7 +70,7 @@ if(href_list["irc_msg"]) if(!holder && received_irc_pm < world.time - 6000) //Worse they can do is spam IRC for 10 minutes - to_chat(usr, "You are no longer able to use this, it's been more then 10 minutes since an admin on IRC has responded to you") + to_chat(usr, "You are no longer able to use this, it's been more than 10 minutes since an admin on IRC has responded to you") return if(mute_irc) to_chat(usr, "") @@ -566,6 +566,7 @@ else ip_reputation = score return TRUE +<<<<<<< HEAD /client/proc/disconnect_with_message(var/message = "You have been intentionally disconnected by the server.
This may be for security or administrative reasons.") message = "You Have Been Disconnected
[message]

If you feel this is in error, you can contact an administrator out-of-game (for example, on Discord)." @@ -617,3 +618,5 @@ else winset(usr, "input", "is-visible=false") */ +======= +>>>>>>> e2553d4fb15... Merge pull request #8907 from Cerebulon/grammargrabbag diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 8e18fd1be1..40daf2ce4b 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -213,6 +213,7 @@ projectile_type = /obj/item/projectile/bullet/shotgun // ToDo: Remove accuracy debuf in exchange for slightly injuring your hand every time you fire it. +<<<<<<< HEAD /* * Mako */ @@ -227,6 +228,15 @@ Bishamonten weapons tended to be form over function - despite their flashy looks, most were completely \ unremarkable one way or another as weapons and used very standard firing mechanisms - the Mako was a notable \ exception, and original examples are much sought after." +======= +/obj/item/gun/projectile/revolver/lemat + name = "Mako revolver" + desc = "The Bishamonten P100 Mako is a 9 shot revolver with a secondary firing barrel loading shotgun shells. For when you really need something dead. A rare yet deadly collector's item. Uses .38-Special and 12g rounds depending on the barrel." + description_fluff = "The Bishamonten Company operated from roughly 2150-2280 - the height of the first extrasolar colonisation boom - before filing for bankruptcy and selling off its assets to various companies that would go on to become today’s TSCs. \ + Focused on sleek ‘futurist’ designs which have largely fallen out of fashion but remain popular with collectors and people hoping to make some quick thalers from replica weapons. \ + Bishamonten weapons tended to be form over function - despite their flashy looks, most were completely unremarkable one way or another as weapons, and used very standard firing mechanisms - \ + the Mako was a notable exception, so original examples are much sought after." +>>>>>>> e2553d4fb15... Merge pull request #8907 from Cerebulon/grammargrabbag icon_state = "combatrevolver" item_state = "revolver" origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) diff --git a/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm b/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm index 426c4c67bf..acd89d82f3 100644 --- a/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm +++ b/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm @@ -1,3 +1,4 @@ +<<<<<<< HEAD "aa" = (/turf/template_noop,/area/template_noop) "ab" = (/turf/template_noop,/area/submap/Blackshuttledown) "ac" = (/obj/effect/decal/remains/human,/turf/template_noop,/area/submap/Blackshuttledown) @@ -121,6 +122,855 @@ "cq" = (/turf/template_noop,/turf/simulated/shuttle/wall/dark{icon_state = "dark9"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown) "cr" = (/obj/effect/floor_decal/borderfloor{dir = 4},/mob/living/simple_mob/humanoid/merc/melee/sword/poi,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "cs" = (/obj/effect/floor_decal/borderfloor{dir = 4},/mob/living/simple_mob/humanoid/merc/ranged/laser/poi,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +======= +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/template_noop, +/area/template_noop) +"ab" = ( +/turf/template_noop, +/area/submap/Blackshuttledown) +"ac" = ( +/obj/effect/decal/remains/human, +/turf/template_noop, +/area/submap/Blackshuttledown) +"ad" = ( +/turf/simulated/mineral/ignore_mapgen, +/area/submap/Blackshuttledown) +"ae" = ( +/obj/effect/decal/cleanable/blood, +/turf/template_noop, +/area/submap/Blackshuttledown) +"af" = ( +/obj/structure/flora/tree/sif, +/turf/template_noop, +/area/submap/Blackshuttledown) +"ag" = ( +/obj/structure/table/steel, +/turf/template_noop, +/area/submap/Blackshuttledown) +"ah" = ( +/obj/random/mob/merc/all, +/turf/template_noop, +/area/submap/Blackshuttledown) +"ai" = ( +/turf/template_noop, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark6"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"aj" = ( +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark0"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"ak" = ( +/turf/template_noop, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark10"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"al" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4; + icon_state = "heater" + }, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark0"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"am" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 4; + icon_state = "propulsion_l" + }, +/turf/template_noop, +/area/submap/Blackshuttledown) +"an" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/table/rack, +/obj/item/clothing/head/helmet/space, +/obj/item/clothing/head/helmet/space, +/obj/item/clothing/head/helmet/space, +/obj/item/clothing/head/helmet/space, +/obj/item/clothing/suit/space, +/obj/item/clothing/suit/space, +/obj/item/clothing/suit/space, +/obj/item/clothing/suit/space, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"ao" = ( +/obj/structure/dispenser/oxygen, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"ap" = ( +/obj/machinery/door/airlock/external{ + density = 1; + frequency = 1331; + id_tag = "merc_shuttle_outer"; + name = "Ship External Access"; + req_access = list(150) + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aq" = ( +/obj/effect/floor_decal/corner/green/border{ + dir = 9; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"ar" = ( +/obj/machinery/gibber, +/obj/effect/floor_decal/corner/green/border{ + dir = 1; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"as" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"at" = ( +/obj/machinery/bodyscanner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"au" = ( +/obj/machinery/body_scanconsole, +/obj/effect/floor_decal/corner/green/border{ + dir = 5; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"av" = ( +/turf/simulated/floor/tiled/steel, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark5"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"aw" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"ax" = ( +/obj/structure/table/rack/gun_rack/steel, +/obj/random/multiple/gun/projectile/smg, +/obj/random/multiple/gun/projectile/smg, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"ay" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"az" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aA" = ( +/obj/machinery/door/airlock/external, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aB" = ( +/obj/effect/floor_decal/corner/green/border{ + dir = 8; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aC" = ( +/obj/machinery/optable, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aD" = ( +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aE" = ( +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aF" = ( +/obj/machinery/organ_printer/flesh, +/obj/effect/floor_decal/corner/green/border{ + dir = 5; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aG" = ( +/turf/simulated/floor/tiled/steel, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark9"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"aH" = ( +/turf/simulated/floor/tiled/steel, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark6"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"aI" = ( +/mob/living/simple_mob/mechanical/viscerator, +/mob/living/simple_mob/mechanical/viscerator, +/mob/living/simple_mob/mechanical/viscerator, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"aJ" = ( +/obj/structure/table/rack/gun_rack/steel, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"aK" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aL" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aM" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aN" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aO" = ( +/mob/living/simple_mob/humanoid/merc/melee/sword/poi, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aP" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aQ" = ( +/obj/structure/prop/machine/tgmc_console3/starts_on, +/obj/effect/floor_decal/borderfloor/full, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aR" = ( +/obj/structure/table/rack/gun_rack/steel, +/obj/random/grenade/box, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"aS" = ( +/obj/effect/floor_decal/borderfloor/corner, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aT" = ( +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aU" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aV" = ( +/obj/structure/table/standard, +/obj/item/storage/firstaid/surgery, +/obj/effect/floor_decal/corner/green/border{ + dir = 10; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aW" = ( +/obj/structure/table/standard, +/obj/item/tank/anesthetic, +/obj/effect/floor_decal/corner/green/border, +/obj/random/medical, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aX" = ( +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aY" = ( +/obj/structure/table/standard, +/obj/item/clothing/gloves/sterile, +/obj/item/clothing/gloves/sterile, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aZ" = ( +/obj/structure/table/standard, +/obj/item/reagent_containers/spray/sterilizine, +/obj/item/reagent_containers/spray/sterilizine, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"ba" = ( +/obj/structure/table/standard, +/obj/item/storage/box/masks, +/obj/effect/floor_decal/corner/green/border{ + dir = 6; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"bb" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bc" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bd" = ( +/obj/machinery/door/airlock/security{ + locked = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"be" = ( +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"bf" = ( +/turf/simulated/floor/tiled/steel, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark10"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"bg" = ( +/obj/structure/prop/machine/tgmc_console1/starts_on, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bh" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bi" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bj" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bk" = ( +/obj/structure/table/steel, +/obj/item/material/knife, +/obj/random/drinkbottle, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bl" = ( +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bm" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bn" = ( +/obj/random/mob/merc/all, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bo" = ( +/obj/structure/table/rack/shelf/steel, +/obj/random/toolbox, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bp" = ( +/obj/structure/table/steel, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/random/projectile/scrapped_gun, +/obj/random/projectile/scrapped_gun, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bq" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/submap/Blackshuttledown) +"br" = ( +/obj/structure/table/steel, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bs" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bt" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bu" = ( +/obj/item/stool, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bv" = ( +/obj/structure/table/rack, +/obj/random/multiple/gun/projectile/smg, +/obj/random/multiple/gun/projectile, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bw" = ( +/obj/machinery/fusion_fuel_compressor, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bx" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/submap/Blackshuttledown) +"by" = ( +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bz" = ( +/obj/effect/floor_decal/corner/grey, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bA" = ( +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bB" = ( +/obj/structure/table/steel, +/obj/item/pizzabox, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bC" = ( +/obj/structure/table/steel, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bD" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bE" = ( +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bF" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bG" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/submap/Blackshuttledown) +"bH" = ( +/obj/machinery/power/apc{ + dir = 8; + name = "BSD APC"; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bI" = ( +/mob/living/simple_mob/humanoid/merc/melee/sword/poi, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bJ" = ( +/obj/machinery/computer/area_atmos{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bK" = ( +/obj/machinery/fusion_fuel_injector/mapped{ + dir = 4; + icon_state = "injector0" + }, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bL" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bM" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bN" = ( +/obj/structure/table/steel, +/obj/item/paper{ + info = "We need to take a short stop. The engine's are in need of minor repairs due to turbulence, should be a week's time. We've got reserve food supplies but pleanty of locale fauna to subsist on too if need be. PCRC is keeping most of there assets near New Reykjavik and locale authorities are more mindful then most to travel in this kind of weather. Our outfit should be at the rendezvous point in less than ten days assuming the upper ecehelon hasn't dropped ties with us yet."; + name = "Operation Progress/M-53" + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bO" = ( +/obj/structure/table/steel, +/obj/item/paper_bin, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bP" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bQ" = ( +/obj/structure/closet/toolcloset, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bR" = ( +/obj/machinery/portable_atmospherics/canister/empty/oxygen, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bS" = ( +/obj/machinery/atmospherics/pipe/tank/oxygen, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bT" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bU" = ( +/obj/structure/bed/chair/office/dark, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bV" = ( +/obj/structure/table/rack/gun_rack/steel, +/obj/item/clothing/accessory/armor/armorplate/merc, +/obj/item/clothing/accessory/armor/armorplate/merc, +/obj/item/clothing/suit/armor/pcarrier/merc, +/obj/item/clothing/suit/armor/pcarrier/merc, +/obj/item/clothing/head/helmet/space/void/hedberg, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"bW" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bX" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bY" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bZ" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled/hydro, +/area/submap/Blackshuttledown) +"ca" = ( +/turf/simulated/floor/tiled/hydro, +/area/submap/Blackshuttledown) +"cb" = ( +/mob/living/simple_mob/mechanical/viscerator, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"cc" = ( +/obj/structure/table/rack/gun_rack/steel, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/random/multiple/gun/projectile/handgun, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"cd" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"ce" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/structure/bed, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"cf" = ( +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/hydro, +/area/submap/Blackshuttledown) +"cg" = ( +/mob/living/simple_mob/mechanical/viscerator, +/mob/living/simple_mob/mechanical/viscerator, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"ch" = ( +/obj/structure/table/rack/gun_rack/steel, +/obj/random/energy/highend, +/obj/random/helmet/highend, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"ci" = ( +/obj/structure/toilet{ + dir = 1 + }, +/turf/simulated/floor/tiled/hydro, +/area/submap/Blackshuttledown) +"cj" = ( +/obj/machinery/light, +/obj/structure/table/rack, +/obj/item/clothing/head/helmet/space, +/obj/item/clothing/head/helmet/space, +/obj/item/clothing/head/helmet/space, +/obj/item/clothing/head/helmet/space, +/obj/item/clothing/suit/space, +/obj/item/clothing/suit/space, +/obj/item/clothing/suit/space, +/obj/item/clothing/suit/space, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"ck" = ( +/obj/structure/dispenser/oxygen, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"cl" = ( +/obj/structure/table/woodentable, +/obj/random/projectile, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"cm" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"cn" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"co" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/item/toy/plushie/spider, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"cp" = ( +/turf/template_noop, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark5"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"cq" = ( +/turf/template_noop, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark9"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"cr" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/mob/living/simple_mob/humanoid/merc/melee/sword/poi, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"cs" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/mob/living/simple_mob/humanoid/merc/ranged/laser/poi, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"kV" = ( +/obj/item/stool{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"uW" = ( +/obj/random/mob/merc/armored, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"Bi" = ( +/obj/structure/table/steel, +/obj/item/reagent_containers/food/drinks/glass2/coffeemug/black, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"CZ" = ( +/obj/structure/table/steel, +/obj/random/cigarettes, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"Fm" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/item/clothing/suit/storage/toggle/track/blue, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"Qz" = ( +/obj/machinery/computer/communications{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"ZE" = ( +/obj/structure/table/steel, +/obj/item/reagent_containers/food/drinks/glass2/coffeemug/metal, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +>>>>>>> e2553d4fb15... Merge pull request #8907 from Cerebulon/grammargrabbag (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm b/maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm index fb5eef1bee..6360f23906 100644 --- a/maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm +++ b/maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm @@ -1,3 +1,4 @@ +<<<<<<< HEAD "aa" = (/turf/template_noop,/area/template_noop) "ab" = (/turf/template_noop,/area/submap/Blackshuttledown) "ac" = (/obj/effect/decal/remains/human,/turf/template_noop,/area/submap/Blackshuttledown) @@ -120,6 +121,897 @@ "cr" = (/obj/effect/floor_decal/borderfloor{dir = 4},/mob/living/simple_mob/humanoid/merc/melee/sword/poi,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "cs" = (/obj/effect/floor_decal/borderfloor{dir = 4},/mob/living/simple_mob/humanoid/merc/ranged/laser/poi,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "ct" = (/mob/living/simple_mob/humanoid/merc/ranged/smg/sol,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +======= +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/template_noop, +/area/template_noop) +"ab" = ( +/turf/template_noop, +/area/submap/Blackshuttledown) +"ac" = ( +/obj/effect/decal/remains/human, +/turf/template_noop, +/area/submap/Blackshuttledown) +"ad" = ( +/turf/simulated/mineral/ignore_mapgen, +/area/submap/Blackshuttledown) +"ae" = ( +/obj/effect/decal/cleanable/blood, +/turf/template_noop, +/area/submap/Blackshuttledown) +"af" = ( +/obj/structure/flora/tree/sif, +/turf/template_noop, +/area/submap/Blackshuttledown) +"ag" = ( +/obj/structure/table/steel, +/turf/template_noop, +/area/submap/Blackshuttledown) +"ah" = ( +/mob/living/simple_mob/humanoid/merc/ranged/smg/sol, +/turf/template_noop, +/area/submap/Blackshuttledown) +"ai" = ( +/turf/template_noop, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark6"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"aj" = ( +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark0"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"ak" = ( +/turf/template_noop, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark10"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"al" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4; + icon_state = "heater" + }, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark0"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"am" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 4; + icon_state = "propulsion_l" + }, +/turf/template_noop, +/area/submap/Blackshuttledown) +"an" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/table/rack, +/obj/item/clothing/head/helmet/space, +/obj/item/clothing/head/helmet/space, +/obj/item/clothing/suit/space, +/obj/item/clothing/suit/space, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/item/clothing/suit/space/void/scg, +/obj/item/clothing/suit/space/void/scg, +/obj/item/clothing/head/helmet/space/void/scg, +/obj/item/clothing/head/helmet/space/void/scg, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"ao" = ( +/obj/structure/dispenser/oxygen, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"ap" = ( +/obj/machinery/door/airlock/external{ + density = 1; + frequency = 1331; + id_tag = "merc_shuttle_outer"; + name = "Ship External Access"; + req_access = list(150) + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aq" = ( +/obj/effect/floor_decal/corner/green/border{ + dir = 9; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"ar" = ( +/obj/effect/floor_decal/corner/green/border{ + dir = 1; + icon_state = "bordercolor" + }, +/obj/structure/morgue{ + dir = 8; + icon_state = "morgue1" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"as" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"at" = ( +/obj/machinery/bodyscanner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"au" = ( +/obj/machinery/body_scanconsole, +/obj/effect/floor_decal/corner/green/border{ + dir = 5; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"av" = ( +/turf/simulated/floor/tiled/steel, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark5"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"aw" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"ax" = ( +/obj/structure/table/steel, +/obj/random/energy/highend, +/obj/random/energy/highend, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"ay" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"az" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aA" = ( +/obj/machinery/door/airlock/external, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aB" = ( +/obj/effect/floor_decal/corner/green/border{ + dir = 8; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aC" = ( +/obj/machinery/optable, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aD" = ( +/obj/structure/janitorialcart, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"aE" = ( +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aF" = ( +/obj/machinery/organ_printer/flesh, +/obj/effect/floor_decal/corner/green/border{ + dir = 5; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aG" = ( +/turf/simulated/floor/tiled/steel, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark9"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"aH" = ( +/turf/simulated/floor/tiled/steel, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark6"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"aI" = ( +/mob/living/simple_mob/mechanical/viscerator/mercenary, +/mob/living/simple_mob/mechanical/viscerator/mercenary, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"aJ" = ( +/obj/structure/table/steel, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/random/energy/highend, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"aK" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aL" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aM" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aN" = ( +/obj/structure/ore_box, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"aO" = ( +/mob/living/simple_mob/humanoid/merc/melee/sword/poi, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aP" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aQ" = ( +/obj/structure/prop/machine/tgmc_console4/starts_on, +/obj/effect/floor_decal/borderfloor/full, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aR" = ( +/obj/structure/table/steel, +/obj/random/grenade/less_lethal, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"aS" = ( +/obj/effect/floor_decal/borderfloor/corner, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aT" = ( +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aU" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"aV" = ( +/obj/structure/table/standard, +/obj/item/storage/firstaid/surgery, +/obj/effect/floor_decal/corner/green/border{ + dir = 10; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aW" = ( +/obj/structure/table/standard, +/obj/item/tank/anesthetic, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aX" = ( +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aY" = ( +/obj/structure/table/standard, +/obj/item/clothing/gloves/sterile, +/obj/item/clothing/gloves/sterile, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"aZ" = ( +/obj/structure/table/standard, +/obj/item/reagent_containers/spray/sterilizine, +/obj/item/reagent_containers/spray/sterilizine, +/obj/effect/floor_decal/corner/green/border, +/obj/random/firstaid, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"ba" = ( +/obj/structure/table/standard, +/obj/item/storage/box/masks, +/obj/effect/floor_decal/corner/green/border{ + dir = 6; + icon_state = "bordercolor" + }, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"bb" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bc" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bd" = ( +/obj/machinery/door/airlock/security{ + locked = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"be" = ( +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/white, +/area/submap/Blackshuttledown) +"bf" = ( +/turf/simulated/floor/tiled/steel, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark10"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"bg" = ( +/obj/machinery/computer/communications{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bh" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bi" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bj" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bk" = ( +/obj/structure/table/steel, +/obj/item/material/knife, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bl" = ( +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bm" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bn" = ( +/obj/structure/curtain/open/shower/security, +/obj/structure/window/reinforced/tinted/frosted{ + dir = 1; + icon_state = "fwindow" + }, +/obj/structure/window/reinforced/tinted/frosted, +/turf/simulated/floor/tiled/hydro, +/area/submap/Blackshuttledown) +"bo" = ( +/obj/structure/table/rack/shelf/steel, +/obj/random/toolbox, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bp" = ( +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/structure/table/rack/shelf/steel, +/obj/random/tool/power, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bq" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/submap/Blackshuttledown) +"br" = ( +/obj/structure/table/steel, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bs" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bt" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bu" = ( +/obj/item/stool, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bv" = ( +/mob/living/simple_mob/humanoid/merc/melee/sword/poi, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"bw" = ( +/obj/structure/sink{ + dir = 8; + icon_state = "sink"; + pixel_x = -16 + }, +/turf/simulated/floor/tiled/hydro, +/area/submap/Blackshuttledown) +"bx" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/submap/Blackshuttledown) +"by" = ( +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bz" = ( +/obj/effect/floor_decal/corner/grey, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bA" = ( +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bB" = ( +/obj/structure/table/steel, +/obj/item/pizzabox, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bC" = ( +/obj/structure/table/steel, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bD" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bE" = ( +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bF" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bG" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/submap/Blackshuttledown) +"bH" = ( +/obj/machinery/power/apc{ + dir = 8; + name = "BSD APC"; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bI" = ( +/mob/living/simple_mob/humanoid/merc/melee/sword/poi, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bJ" = ( +/obj/machinery/computer/area_atmos{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bK" = ( +/mob/living/simple_mob/humanoid/merc/ranged/laser/poi, +/turf/template_noop, +/area/submap/Blackshuttledown) +"bL" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bM" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bN" = ( +/obj/structure/table/steel, +/obj/item/paper{ + info = "We need to take a short stop. The engine's are in need of minor repairs due to turbulence, should be a week's time. We've got reserve food supplies but pleanty of locale fauna to subsist on too if need be. PCRC is keeping most of there assets near New Reykjavik and locale authorities are more mindful then most to travel in this kind of weather. Our outfit should be at the rendezvous point in less than ten days assuming the upper ecehelon hasn't dropped ties with us yet."; + name = "Operation Progress/M-53" + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bO" = ( +/obj/structure/table/steel, +/obj/item/paper_bin, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bP" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bQ" = ( +/obj/structure/closet/toolcloset, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bR" = ( +/obj/machinery/portable_atmospherics/canister/empty/oxygen, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bS" = ( +/obj/machinery/atmospherics/pipe/tank/oxygen, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"bT" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bU" = ( +/obj/structure/bed/chair/office/dark, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bW" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bX" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bY" = ( +/obj/structure/bed, +/obj/item/bedsheet/blue, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"bZ" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled/hydro, +/area/submap/Blackshuttledown) +"ca" = ( +/turf/simulated/floor/tiled/hydro, +/area/submap/Blackshuttledown) +"cb" = ( +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/structure/curtain/open/shower/security, +/obj/structure/window/reinforced/tinted/frosted{ + dir = 1; + icon_state = "fwindow" + }, +/obj/structure/window/reinforced/tinted/frosted, +/turf/simulated/floor/tiled/hydro, +/area/submap/Blackshuttledown) +"cc" = ( +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/accessory/armor/armguards/blue, +/obj/item/clothing/accessory/armor/legguards/blue, +/obj/item/clothing/suit/armor/pcarrier/blue/sol, +/obj/item/clothing/head/helmet/solgov, +/obj/item/clothing/under/solgov/utility/fleet/combat, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"cd" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"ce" = ( +/obj/structure/bed, +/obj/item/bedsheet/blue, +/obj/structure/bed, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"cf" = ( +/obj/structure/urinal{ + dir = 4; + icon_state = "urinal"; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/hydro, +/area/submap/Blackshuttledown) +"cg" = ( +/obj/structure/toilet{ + dir = 4; + icon_state = "toilet00" + }, +/obj/structure/curtain, +/obj/structure/window/reinforced/tinted/frosted{ + dir = 1; + icon_state = "fwindow" + }, +/turf/simulated/floor/tiled/hydro, +/area/submap/Blackshuttledown) +"ch" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/accessory/armor/armguards/blue, +/obj/item/clothing/accessory/armor/legguards/blue, +/obj/item/clothing/suit/armor/pcarrier/blue/sol, +/obj/item/clothing/head/helmet/solgov, +/obj/item/clothing/under/solgov/utility/fleet/combat, +/turf/simulated/floor/tiled/steel_grid, +/area/submap/Blackshuttledown) +"ci" = ( +/turf/simulated/floor/tiled/yellow, +/area/submap/Blackshuttledown) +"cj" = ( +/obj/machinery/light, +/obj/structure/table/rack, +/obj/item/clothing/head/helmet/space, +/obj/item/clothing/head/helmet/space, +/obj/item/clothing/suit/space, +/obj/item/clothing/suit/space, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/item/clothing/suit/space/void/scg, +/obj/item/clothing/suit/space/void/scg, +/obj/item/clothing/head/helmet/space/void/scg/heavy, +/obj/item/clothing/head/helmet/space/void/scg/heavy, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"ck" = ( +/obj/structure/dispenser/oxygen, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"cl" = ( +/obj/structure/table/woodentable, +/obj/random/multiple/gun/projectile/handgun, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"cm" = ( +/obj/structure/bed, +/obj/item/bedsheet/blue, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"cp" = ( +/turf/template_noop, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark5"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"cq" = ( +/turf/template_noop, +/turf/simulated/shuttle/wall/dark{ + icon_state = "dark9"; + name = "Unknown Shuttle" + }, +/area/submap/Blackshuttledown) +"cr" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/mob/living/simple_mob/humanoid/merc/melee/sword/poi, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"cs" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/mob/living/simple_mob/humanoid/merc/ranged/laser/poi, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"ct" = ( +/mob/living/simple_mob/humanoid/merc/ranged/smg/sol, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"dr" = ( +/obj/structure/prop/machine/tgmc_console2/starts_on, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"dX" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/structure/prop/machine/tgmc_console1, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"fh" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"jx" = ( +/mob/living/simple_mob/mechanical/viscerator/mercenary, +/turf/simulated/floor/tiled/hydro, +/area/submap/Blackshuttledown) +"kN" = ( +/obj/structure/table/steel, +/obj/item/reagent_containers/food/drinks/glass2/coffeemug/fleet, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"ls" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/structure/prop/machine/tgmc_console2/starts_on, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"pK" = ( +/obj/structure/prop/machine/tgmc_console5/starts_on, +/obj/effect/floor_decal/borderfloor/full, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"xx" = ( +/obj/effect/floor_decal/borderfloor, +/obj/structure/table/rack, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"Ca" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"Rc" = ( +/obj/structure/table/steel, +/obj/item/reagent_containers/food/drinks/glass2/coffeemug/sol, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"Ug" = ( +/obj/effect/floor_decal/borderfloor, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table/rack, +/obj/item/rig/combat, +/obj/item/tank/jetpack/rig, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +>>>>>>> e2553d4fb15... Merge pull request #8907 from Cerebulon/grammargrabbag (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa