diff --git a/code/modules/background/space_sectors/badlands.dm b/code/modules/background/space_sectors/badlands.dm index 5a10e75ad0a..04b40ab6bdd 100644 --- a/code/modules/background/space_sectors/badlands.dm +++ b/code/modules/background/space_sectors/badlands.dm @@ -65,7 +65,7 @@ return "[rand(6, 12)] hours" /datum/space_sector/srandmarr/generate_system_name() - return "S'rand'marr, and nearby points of interest" + return "S'rand'marr, and nearby points of interest" /datum/space_sector/nrrahrahul name = SECTOR_NRRAHRAHUL @@ -93,4 +93,4 @@ Moghes is currently experiencing immense environmental degradation following a global nuclear war in the 2430's." starlight_color = COLOR_WHITE starlight_power = 5 - starlight_range = 1 \ No newline at end of file + starlight_range = 1 diff --git a/code/modules/maps/planet_types/lore/srandmarr.dm b/code/modules/maps/planet_types/lore/srandmarr.dm index e8591fad63b..dfc5d92274b 100644 --- a/code/modules/maps/planet_types/lore/srandmarr.dm +++ b/code/modules/maps/planet_types/lore/srandmarr.dm @@ -125,7 +125,7 @@ plant_colors = null possible_themes = list(/datum/exoplanet_theme/mountains/adhomai) map_generators = list(/datum/random_map/noise/exoplanet/snow/adhomai, /datum/random_map/noise/ore/rich) - features_budget = 4 + features_budget = 8 surface_color = "#e8faff" water_color = "#b5dfeb" generated_name = FALSE diff --git a/html/changelogs/connorjg1.yml b/html/changelogs/connorjg1.yml new file mode 100644 index 00000000000..bd1cc64ac3c --- /dev/null +++ b/html/changelogs/connorjg1.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Connorjg1 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - maptweak: "Tweaks several of the Adhomai maps and Headmaster vessel primarily to include medical supplies and extra fluff." + diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dmm b/maps/away/ships/pra/headmaster/headmaster_ship.dmm index c1ac2028a78..e64705eac67 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ship.dmm +++ b/maps/away/ships/pra/headmaster/headmaster_ship.dmm @@ -26,8 +26,7 @@ /area/headmaster_ship/commissar_quarters) "ae" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -952,15 +951,6 @@ temperature = 278.15 }, /area/headmaster_ship/mess_hall) -"cP" = ( -/obj/effect/floor_decal/corner/red{ - dir = 5; - icon_state = "corner_white" - }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, -/area/headmaster_ship) "cQ" = ( /obj/effect/landmark/entry_point/port{ name = "port, barracks" @@ -1009,8 +999,7 @@ req_access = list(209) }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -1021,8 +1010,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/structure/cable/green{ d1 = 1; @@ -1084,8 +1072,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/cable/green{ d1 = 4; @@ -1161,8 +1148,7 @@ icon_state = "1-8" }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -1179,9 +1165,7 @@ }, /area/headmaster_ship/hangar) "dn" = ( -/obj/machinery/computer/ship/helm{ - req_access = null - }, +/obj/machinery/computer/ship/helm, /turf/simulated/floor/shuttle/black{ temperature = 278.15 }, @@ -1205,18 +1189,26 @@ /area/headmaster_ship/gun_deck) "ds" = ( /obj/structure/table/wood, -/obj/item/pen/fountain, /obj/structure/sign/painting_frame/hadii{ pixel_x = -32 }, +/obj/item/stamp{ + name = "people's republic of adhomai stamp"; + icon_state = "stamp-zavod"; + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/stamp/denied{ + pixel_x = -6; + pixel_y = 10 + }, /turf/simulated/floor/wood{ temperature = 278.15 }, /area/headmaster_ship/commissar_quarters) "du" = ( /obj/effect/floor_decal/corner/red{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/light{ dir = 1 @@ -1269,8 +1261,7 @@ /area/headmaster_ship) "dE" = ( /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/machinery/light, /turf/simulated/floor/tiled/dark{ @@ -1282,8 +1273,7 @@ /area/headmaster_ship/hangar) "dG" = ( /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -1291,8 +1281,7 @@ /area/headmaster_ship) "dH" = ( /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -1512,8 +1501,7 @@ }, /obj/structure/filingcabinet/chestdrawer, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -1629,8 +1617,7 @@ /area/headmaster_ship/hangar) "eQ" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/structure/sign/flag/pra{ pixel_x = -32 @@ -1639,15 +1626,6 @@ temperature = 278.15 }, /area/headmaster_ship) -"eU" = ( -/obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" - }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, -/area/headmaster_ship) "eZ" = ( /obj/machinery/iff_beacon, /obj/structure/railing/mapped{ @@ -1712,8 +1690,7 @@ "ff" = ( /obj/structure/bed/stool/chair/office/bridge/generic, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -1735,8 +1712,7 @@ /area/headmaster_ship/barracks) "fo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -1791,8 +1767,7 @@ /area/headmaster_ship/barracks) "fy" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark{ @@ -1823,8 +1798,7 @@ /area/headmaster_ship/captain_quarters) "fD" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor{ temperature = 278.15 @@ -1908,8 +1882,7 @@ /area/headmaster_ship/mess_hall) "fL" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -2026,8 +1999,7 @@ /area/headmaster_ship/mess_hall) "gg" = ( /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/structure/sign/flag/pra{ pixel_x = 32 @@ -2282,8 +2254,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -2302,8 +2273,7 @@ "hk" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/visible/red, /turf/simulated/floor/plating{ @@ -2408,8 +2378,7 @@ /area/headmaster_ship/armory) "hI" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -2549,8 +2518,7 @@ }, /obj/item/device/flashlight/lamp, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark{ @@ -2632,8 +2600,7 @@ /area/headmaster_ship/mess_hall) "ii" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -2744,8 +2711,7 @@ /obj/item/pen/fountain, /obj/item/device/hand_labeler, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark{ @@ -2793,8 +2759,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -2822,8 +2787,7 @@ /area/headmaster_ship/gun_deck) "iO" = ( /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark{ @@ -3005,8 +2969,7 @@ req_one_access = "112" }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -3016,18 +2979,6 @@ temperature = 278.15 }, /area/headmaster_ship/hangar) -"jo" = ( -/obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, -/area/headmaster_ship) "jt" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -3131,8 +3082,7 @@ /obj/machinery/light, /obj/structure/closet/emcloset, /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/structure/cable/green{ d1 = 1; @@ -3378,8 +3328,7 @@ dir = 1 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/sign/nosmoking_1{ pixel_y = 32 @@ -3412,8 +3361,7 @@ /area/headmaster_ship/hangar) "kE" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/machinery/light{ dir = 8 @@ -3507,8 +3455,7 @@ /area/headmaster_ship/barracks) "kV" = ( /obj/machinery/computer/ship/helm{ - dir = 1; - req_access = null + dir = 1 }, /obj/effect/floor_decal/corner/red{ dir = 10 @@ -3595,8 +3542,7 @@ /area/space) "lp" = ( /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -3641,8 +3587,7 @@ /area/headmaster_ship/commissar_quarters) "lu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/cable/green{ d1 = 4; @@ -3815,8 +3760,7 @@ /area/headmaster_ship/engineering) "lZ" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable/green{ d2 = 8; @@ -3835,8 +3779,7 @@ }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -3850,6 +3793,7 @@ dir = 4; pixel_x = -32 }, +/obj/item/pen/fountain, /turf/simulated/floor/wood{ temperature = 278.15 }, @@ -4028,8 +3972,7 @@ /area/shuttle/headmaster_shuttle) "mU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -4077,8 +4020,7 @@ /obj/item/paper_bin, /obj/item/pen/fountain, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -4176,8 +4118,7 @@ }, /obj/item/device/flashlight/lamp, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark{ @@ -4240,8 +4181,7 @@ "ou" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/structure/cable/green{ d1 = 1; @@ -4371,8 +4311,7 @@ req_access = list(209) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green, @@ -4550,8 +4489,7 @@ /area/headmaster_ship/engineering) "sC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -4571,8 +4509,7 @@ /area/headmaster_ship/hangar) "sW" = ( /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/machinery/alarm/cold{ req_one_access = list(209); @@ -4626,8 +4563,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -4643,8 +4579,7 @@ name = "accepted stamp" }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark{ @@ -4653,8 +4588,7 @@ /area/headmaster_ship/bridge) "ty" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -4874,8 +4808,7 @@ /area/headmaster_ship/engineering) "xB" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/red, /turf/simulated/floor/plating{ @@ -4903,8 +4836,7 @@ /area/headmaster_ship/bridge) "xM" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/item/clothing/head/cone, /turf/simulated/floor{ @@ -5073,8 +5005,7 @@ /area/headmaster_ship/bridge) "Aa" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /turf/simulated/floor{ temperature = 278.15 @@ -5244,8 +5175,7 @@ /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/item/device/multitool, /obj/item/device/multitool, @@ -5271,8 +5201,7 @@ /area/space) "Ea" = ( /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -5382,8 +5311,7 @@ /area/shuttle/headmaster_shuttle) "Fy" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/machinery/alarm/cold{ req_one_access = list(209); @@ -5408,8 +5336,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -5417,8 +5344,7 @@ /area/headmaster_ship) "FU" = ( /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/machinery/power/apc/high{ name = "south bump"; @@ -5440,12 +5366,10 @@ dir = 5 }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/item/ship_ammunition/grauwolf_bundle, /obj/item/ship_ammunition/grauwolf_bundle, @@ -5560,8 +5484,7 @@ /area/headmaster_ship/engine) "HS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -5747,8 +5670,7 @@ icon_state = "1-2" }, /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -5886,8 +5808,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -6046,8 +5967,7 @@ /area/headmaster_ship/mess_hall) "OJ" = ( /obj/effect/floor_decal/corner/red{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark{ @@ -6102,8 +6022,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -6122,8 +6041,7 @@ /area/shuttle/headmaster_shuttle) "Pg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -6158,8 +6076,7 @@ /area/headmaster_ship/engineering) "PO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -6200,8 +6117,7 @@ /area/headmaster_ship/mess_hall) "QA" = ( /obj/effect/floor_decal/corner/red{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/alarm/cold{ req_one_access = list(209); @@ -6280,8 +6196,7 @@ /area/headmaster_ship/captain_quarters) "RS" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/shuttle_landmark/headmaster_shuttle/hangar, /turf/simulated/floor{ @@ -6357,8 +6272,7 @@ dir = 9 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -17880,34 +17794,34 @@ Up Up Up UM -jo +Af gg -eU -eU +ME +ME lp cx dh dD iO -eU -eU -eU -eU +ME +ME +ME +ME gg -jo -eU -eU +Af +ME +ME sW OU -jo -eU -eU -eU +Af +ME +ME +ME iO -jo -eU +Af +ME Ea -eU +ME OU Af ME @@ -18209,7 +18123,7 @@ lh Xf cW xP -cP +cs ea KT hZ @@ -18371,7 +18285,7 @@ cq cq uy xP -cP +cs dh dG Fm @@ -18695,7 +18609,7 @@ cq cg co xP -cP +cs dh dG Fm @@ -19019,7 +18933,7 @@ xP ch cq xP -cP +cs dh dG Fm @@ -19181,7 +19095,7 @@ xP kw cq xP -cP +cs df dH Fm @@ -19343,7 +19257,7 @@ xP lW JX xP -cP +cs dh dG Fm @@ -19505,7 +19419,7 @@ tY tY tY tY -cP +cs dh dG Fm @@ -19829,7 +19743,7 @@ ek GY lt tY -cP +cs dh dG tB diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm index 48aa72a7c42..96904c9103e 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm @@ -136,6 +136,9 @@ /obj/item/storage/toolbox/mechanical, /obj/item/storage/toolbox/mechanical, /obj/item/storage/toolbox/mechanical, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/stack/medical/splint/full, /turf/simulated/floor/carpet/rubber{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm index fe6d057adc7..2704ecf7d8b 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm @@ -940,6 +940,7 @@ /obj/item/flame/lighter/adhomai, /obj/item/material/knife/trench, /obj/item/storage/box/fancy/candle_box, +/obj/item/storage/box/fancy/candle_box, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -1255,6 +1256,14 @@ dir = 9 }, /obj/structure/table/wood, +/obj/structure/closet/walllocker/medical{ + pixel_y = 30 + }, +/obj/item/stack/medical/bruise_pack/full, +/obj/item/stack/medical/bruise_pack/full, +/obj/item/stack/medical/splint/full, +/obj/item/stack/medical/ointment/full, +/obj/item/stack/medical/ointment/full, /turf/simulated/floor/lino/grey{ temperature = 268.15 }, @@ -1820,7 +1829,7 @@ eS eS zA Zm -Zc +WR zA eS eS @@ -2030,7 +2039,7 @@ nR nR Xv sv -eS +mH Dn Xv pr @@ -2209,7 +2218,7 @@ yR zA eS zA -Zc +WR yR zA eS @@ -2243,7 +2252,7 @@ Xv zA eS zA -Zc +WR Zc zA eS diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm index 60f00409d24..6c59ee9bb81 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm @@ -1,20 +1,193 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"af" = ( +"bp" = ( +/obj/structure/railing/fence{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"bP" = ( +/obj/structure/flora/bush/adhomai, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"bR" = ( +/obj/structure/flora/grass/adhomai, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"ey" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/tiled/ramp, +/area/adhomai_hunting) +"eB" = ( /obj/structure/bed/padded, /obj/item/bedsheet/yellow, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/adhomai_hunting) -"cS" = ( +"eV" = ( +/obj/structure/closet/crate/drop, +/obj/item/trap, +/obj/item/trap, +/obj/item/trap, +/obj/item/trap, +/obj/item/trap, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"he" = ( +/obj/structure/window/basic{ + dir = 4 + }, +/obj/structure/curtain/black, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"hD" = ( +/obj/structure/table/wood, +/obj/item/toy/plushie/farwa, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"jh" = ( +/obj/machinery/light/small, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"jk" = ( +/obj/structure/flora/tree/adhomai, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"jy" = ( +/obj/structure/railing/mapped, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"jU" = ( /obj/structure/closet/secure_closet/freezer, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/adhomai_hunting) -"dK" = ( -/obj/structure/railing/fence, +"kH" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/mob/living/simple_animal/hostile/commanded/dog/harron{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"kO" = ( +/obj/structure/table/wood, +/obj/item/storage/chewables/tobacco/bad, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"kX" = ( +/obj/structure/table/wood/gamblingtable, +/obj/item/storage/pill_bottle/dice/tajara, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"le" = ( +/obj/structure/window/basic{ + dir = 8 + }, +/obj/structure/curtain/black, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"lh" = ( +/obj/structure/bed/stool/chair/sofa/right/brown{ + dir = 1 + }, +/turf/simulated/floor/carpet/art{ + temperature = 278.15 + }, +/area/adhomai_hunting) +"lk" = ( +/obj/structure/bed/stool/wood, +/obj/effect/ghostspawpoint{ + identifier = "adhomai_hunter"; + name = "igs - adhomai_hunter" + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"lz" = ( +/obj/structure/closet/crate/medical, +/obj/item/stack/medical/bruise_pack/full, +/obj/item/stack/medical/bruise_pack/full, +/obj/item/storage/firstaid, +/obj/item/stack/medical/splint/full, +/obj/item/stack/medical/splint/full, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"lT" = ( +/obj/structure/table/wood/gamblingtable, +/obj/item/reagent_containers/food/snacks/hardbread, +/obj/item/reagent_containers/food/drinks/cans/adhomai_milk, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"lX" = ( +/obj/structure/table/wood, +/obj/item/material/ashtray/bronze, +/obj/item/flame/lighter/adhomai{ + pixel_x = 7 + }, +/obj/item/clothing/mask/smokable/cigarette/adhomai{ + pixel_x = -5 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"pI" = ( +/obj/structure/closet/crate/drop, +/obj/item/device/binoculars, +/obj/item/device/binoculars, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"rg" = ( +/turf/simulated/wall/wood, +/area/adhomai_hunting) +"rO" = ( +/obj/structure/bed/stool/chair/sofa/brown{ + dir = 1 + }, +/turf/simulated/floor/carpet/art{ + temperature = 278.15 + }, +/area/adhomai_hunting) +"rT" = ( /obj/structure/railing/fence{ dir = 4 }, @@ -22,7 +195,27 @@ temperature = 268.15 }, /area/exoplanet/adhomai) -"dN" = ( +"sU" = ( +/obj/structure/table/wood/gamblingtable, +/obj/item/material/knife/bayonet, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"uc" = ( +/obj/structure/table/wood/gamblingtable, +/obj/item/deck/tarot/adhomai, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"vq" = ( +/obj/structure/sink/puddle, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"wa" = ( /obj/effect/decal/fake_object{ density = 1; desc = "An Adhomian television. Due to bad reception, there is nothing to watch."; @@ -34,110 +227,29 @@ temperature = 268.15 }, /area/adhomai_hunting) -"gt" = ( -/obj/machinery/light/small, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"gQ" = ( -/obj/structure/table/wood/gamblingtable, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"gT" = ( -/mob/living/simple_animal/hostile/commanded/dog/harron{ - dir = 1 - }, +"wj" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/seeds/mtearseed, +/obj/item/seeds/nifberries, +/obj/item/seeds/sugartree, +/obj/item/seeds/earthenroot, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/exoplanet/adhomai) -"ih" = ( -/obj/structure/sink/puddle, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) -"iA" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/turf/simulated/floor/tiled/ramp, -/area/adhomai_hunting) -"jN" = ( +"xH" = ( /obj/structure/flora/rock/ice, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/exoplanet/adhomai) -"ol" = ( -/turf/simulated/floor/exoplanet/ice, -/area/exoplanet/adhomai) -"pk" = ( -/obj/structure/bed/stool/chair/sofa/right/brown{ - dir = 1 - }, -/turf/simulated/floor/carpet/art{ - temperature = 278.15 - }, -/area/adhomai_hunting) -"pn" = ( -/obj/structure/table/wood, -/obj/item/flame/candle/waxcandles{ - pixel_y = 7; - pixel_x = -5 - }, +"zC" = ( +/obj/effect/decal/cleanable/blood/splatter, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/adhomai_hunting) -"pR" = ( -/obj/structure/bed/padded, -/obj/item/bedsheet/brown, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"qH" = ( -/obj/structure/closet/crate/drop, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"qL" = ( -/obj/structure/table/wood, -/obj/item/device/flashlight/lamp, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"sx" = ( -/obj/structure/closet/crate/drop, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"sK" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) -"sR" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"tZ" = ( +"Av" = ( /obj/item/reagent_containers/glass/bucket/wood{ pixel_x = -9; pixel_y = 5 @@ -146,107 +258,34 @@ temperature = 268.15 }, /area/exoplanet/adhomai) -"uD" = ( +"Cy" = ( /obj/structure/railing/fence{ dir = 4 }, +/obj/structure/railing/fence{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"CX" = ( /mob/living/simple_animal/hostile/commanded/dog/harron{ - dir = 8 + dir = 1 }, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/exoplanet/adhomai) -"vh" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/wood{ - temperature = 268.15 +"Dt" = ( +/obj/machinery/light/small{ + dir = 1 }, -/area/adhomai_hunting) -"wZ" = ( -/obj/structure/table/wood/gamblingtable, -/obj/item/material/knife/bayonet, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"xA" = ( -/obj/structure/closet/crate/drop, -/obj/item/trap, -/obj/item/trap, -/obj/item/trap, -/obj/item/trap, -/obj/item/trap, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"yf" = ( -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/curtain/black, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"zG" = ( -/obj/machinery/portable_atmospherics/hydroponics/soil, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, -/area/exoplanet/adhomai) -"zT" = ( -/obj/structure/bed/stool/chair/sofa/left/brown{ - dir = 1 - }, -/turf/simulated/floor/carpet/art{ - temperature = 278.15 - }, /area/adhomai_hunting) -"Ar" = ( -/obj/structure/table/wood, -/obj/item/storage/chewables/tobacco/bad, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"AF" = ( -/obj/structure/bed/stool/chair/sofa/brown{ - dir = 1 - }, -/turf/simulated/floor/carpet/art{ - temperature = 278.15 - }, -/area/adhomai_hunting) -"Bg" = ( -/obj/machinery/light/small, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"BE" = ( -/obj/structure/table/wood/gamblingtable, -/obj/item/storage/pill_bottle/dice/tajara, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"Cj" = ( -/obj/structure/table/wood/gamblingtable, -/obj/item/reagent_containers/food/snacks/hardbread, -/obj/item/reagent_containers/food/drinks/cans/adhomai_milk, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"Cp" = ( -/obj/machinery/appliance/cooker/oven/adhomai, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"EY" = ( +"Dx" = ( /obj/structure/closet/cabinet, /obj/item/ammo_magazine/boltaction, /obj/item/ammo_magazine/boltaction, @@ -256,57 +295,7 @@ temperature = 268.15 }, /area/adhomai_hunting) -"GY" = ( -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"Ha" = ( -/obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) -"HP" = ( -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/curtain/black, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"Ii" = ( -/obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) -"IF" = ( -/obj/structure/bed/stool/wood, -/obj/effect/ghostspawpoint{ - identifier = "adhomai_hunter"; - name = "igs - adhomai_hunter" - }, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"IT" = ( -/obj/structure/railing/fence{ - dir = 4 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) -"IU" = ( -/obj/structure/simple_door/wood, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"Ju" = ( +"DP" = ( /obj/structure/cult/tome{ desc = "A stone altar dedicated to Ma'take, the god of hunting."; icon_state = "churchaltar"; @@ -320,7 +309,93 @@ temperature = 268.15 }, /area/adhomai_hunting) -"Lm" = ( +"DY" = ( +/obj/machinery/light/small, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"EB" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"Hj" = ( +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"HC" = ( +/obj/machinery/appliance/cooker/oven/adhomai, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"Im" = ( +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"IE" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"KI" = ( +/mob/living/simple_animal/hostile/commanded/dog/harron{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"Lc" = ( +/turf/simulated/floor/carpet/art{ + temperature = 278.15 + }, +/area/adhomai_hunting) +"Nd" = ( +/obj/structure/table/wood/gamblingtable, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"Ne" = ( +/obj/effect/ghostspawpoint{ + identifier = "matake_hunter"; + name = "igs - matake_hunter" + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"Sm" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"TL" = ( +/obj/structure/table/wood, +/obj/item/device/flashlight/lamp, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"Vg" = ( +/obj/structure/table/wood/gamblingtable, +/obj/item/deck/cards, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"Vo" = ( /obj/structure/table/wood, /obj/item/material/hatchet/butch, /obj/item/material/kitchen/utensil/knife, @@ -340,123 +415,59 @@ temperature = 268.15 }, /area/adhomai_hunting) -"Lo" = ( -/obj/structure/railing/mapped, +"VA" = ( +/turf/simulated/floor/exoplanet/ice, +/area/exoplanet/adhomai) +"VL" = ( +/obj/structure/simple_door/wood, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/adhomai_hunting) -"LO" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/seeds/mtearseed, -/obj/item/seeds/nifberries, -/obj/item/seeds/sugartree, -/obj/item/seeds/earthenroot, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) -"MU" = ( +"VU" = ( /obj/structure/railing/mapped{ - dir = 8 + dir = 4 }, /turf/simulated/floor/tiled/ramp, /area/adhomai_hunting) -"QL" = ( -/turf/simulated/wall/wood, -/area/adhomai_hunting) -"Rf" = ( -/obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) -"Sg" = ( -/obj/structure/table/wood/gamblingtable, -/obj/item/deck/tarot/adhomai, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"Tu" = ( -/mob/living/simple_animal/hostile/commanded/dog/harron{ - dir = 4 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) -"UG" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"UI" = ( -/obj/structure/table/wood, -/obj/item/toy/plushie/farwa, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"Vd" = ( -/obj/structure/railing/fence{ - dir = 4 - }, -/obj/structure/railing/fence{ +"Xy" = ( +/obj/structure/bed/stool/chair/sofa/left/brown{ dir = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 +/turf/simulated/floor/carpet/art{ + temperature = 278.15 }, -/area/exoplanet/adhomai) -"Vi" = ( +/area/adhomai_hunting) +"XA" = ( /obj/structure/table/wood, -/obj/item/material/ashtray/bronze, -/obj/item/flame/lighter/adhomai{ - pixel_x = 7 - }, -/obj/item/clothing/mask/smokable/cigarette/adhomai{ +/obj/item/flame/candle/waxcandles{ + pixel_y = 7; pixel_x = -5 }, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/adhomai_hunting) -"WR" = ( -/obj/structure/table/wood/gamblingtable, -/obj/item/deck/cards, +"Yx" = ( +/obj/structure/bed/padded, +/obj/item/bedsheet/brown, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/adhomai_hunting) -"Xz" = ( -/obj/effect/ghostspawpoint{ - identifier = "matake_hunter"; - name = "igs - matake_hunter" - }, +"YA" = ( +/obj/structure/closet/crate/drop, +/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/boltaction, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/adhomai_hunting) -"XR" = ( -/turf/simulated/floor/carpet/art{ - temperature = 278.15 - }, -/area/adhomai_hunting) -"YR" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"ZD" = ( +"YT" = ( +/obj/structure/railing/fence, /obj/structure/railing/fence{ - dir = 1 + dir = 4 }, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 @@ -464,1090 +475,1090 @@ /area/exoplanet/adhomai) (1,1,1) = {" -sK -sK -sK -sK -Ha -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +bP +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (2,1,1) = {" -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -Ii -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +jk +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (3,1,1) = {" -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (4,1,1) = {" -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -Ii -sK -sK -sK -Rf -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +jk +Hj +Hj +Hj +bR +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (5,1,1) = {" -sK -sK -sK -sK -sK -sK -sK -Ii -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -jN -sK -sK -sK -sK -sK -sK -Rf -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +Hj +jk +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +xH +Hj +Hj +Hj +Hj +Hj +Hj +bR +Hj +Hj +Hj +Hj "} (6,1,1) = {" -sK -sK -Rf -sK -sK -jN -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -Rf -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +bR +Hj +Hj +xH +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +bR +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (7,1,1) = {" -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (8,1,1) = {" -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -Rf -sK -sK -sK -sK -sK -sK -sK -sK -Rf -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -Rf +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +bR +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +bR +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +bR "} (9,1,1) = {" -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -QL -QL -HP -QL -zG -zG -zG -sK -ih -sK -sK -sK -Ii -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +rg +rg +le +rg +EB +EB +EB +Hj +vq +Hj +Hj +Hj +jk +Hj +Hj +Hj +Hj +Hj "} (10,1,1) = {" -sK -sK -sK -sK -sK -sK -sK -Rf -sK -sK -sK -sK -sK -sK -QL -af -GY -QL -YR -sK -sK -sK -tZ -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +Hj +bR +Hj +Hj +Hj +Hj +Hj +Hj +rg +eB +Im +rg +Dt +Hj +Hj +Hj +Av +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (11,1,1) = {" -sK -sK -sK -sK -sK -sK -sK -sK -sK -QL -QL -HP -QL -QL -QL -qL -GY -QL -zG -zG -zG -sK -sK -sK -Rf -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +rg +rg +le +rg +rg +rg +TL +Im +rg +EB +EB +EB +Hj +Hj +Hj +bR +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (12,1,1) = {" -sK -sK -sK -sK -sK -sK -sK -sK -sK -QL -cS -GY -sR -vh -QL -EY -GY -QL -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +rg +jU +Im +Sm +zC +rg +Dx +Im +rg +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (13,1,1) = {" -sK -sK -sK -sK -sK -sK -QL -QL -QL -QL -Cp -GY -GY -Lm -QL -QL -IU -QL -LO -sK -sK -sK -sK -Ha -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +rg +rg +rg +rg +HC +Im +Im +Vo +rg +rg +VL +rg +wj +Hj +Hj +Hj +Hj +bP +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (14,1,1) = {" -sK -sK -sK -sK -sK -QL -QL -GY -sR -iA -GY -GY -GY -GY -GY -sR -GY -QL -QL -QL -QL -QL -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +rg +rg +Im +Sm +VU +Im +Im +Im +Im +Im +Sm +Im +rg +rg +rg +rg +rg +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (15,1,1) = {" -sK -sK -sK -Ha -sK -QL -pn -GY -Lo -GY -GY -IF -WR -gQ -IF -GY -GY -IU -GY -GY -qL -QL -sK -sK -sK -sK -sK -sK -sK -sK -Rf -sK +Hj +Hj +Hj +bP +Hj +rg +XA +Im +jy +Im +Im +lk +Vg +Nd +lk +Im +Im +VL +Im +Im +TL +rg +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +bR +Hj "} (16,1,1) = {" -sK -Rf -sK -sK -sK -QL -Ju -Xz -Lo -GY -GY -IF -wZ -BE -IF -GY -GY -QL -EY -GY -pR -QL -sK -sK -sK -sK -sK -Ii -sK -sK -sK -sK +Hj +bR +Hj +Hj +Hj +rg +DP +Ne +jy +Im +Im +lk +sU +kX +lk +Im +Im +rg +Dx +Im +Yx +rg +Hj +Hj +Hj +Hj +Hj +jk +Hj +Hj +Hj +Hj "} (17,1,1) = {" -sK -sK -sK -sK -sK -QL -pn -GY -Lo -GY -GY -IF -Sg -Cj -IF -GY -Bg -QL -QL -yf -QL -QL -sK -sK -Ha -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +rg +XA +Im +jy +lz +Im +lk +uc +lT +lk +Im +DY +rg +rg +he +rg +rg +Hj +Hj +bP +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (18,1,1) = {" -sK -sK -sK -sK -sK -QL -QL -GY -UG -MU -GY -GY -GY -GY -GY -GY -GY -IU -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +rg +rg +Im +IE +ey +Im +Im +Im +Im +Im +Im +Im +VL +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (19,1,1) = {" -sK -sK -sK -sK -sK -sK -QL -QL -QL -QL -qH -xA -sx -GY -GY -GY -Vi -QL -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +rg +rg +rg +rg +pI +eV +YA +Im +Im +Im +lX +rg +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (20,1,1) = {" -sK -Rf -sK -sK -sK -sK -sK -sK -ZD -QL -QL -QL -QL -UI -GY -XR -pk -QL -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +bR +Hj +Hj +Hj +Hj +Hj +Hj +bp +rg +rg +rg +rg +hD +Im +Lc +lh +rg +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (21,1,1) = {" -sK -sK -sK -sK -sK -sK -Rf -sK -ZD -sK -Tu -sK -QL -dN -GY -XR -AF -QL -sK -sK -sK -sK -Rf -sK -Rf -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +bR +Hj +bp +Hj +Hj +KI +rg +wa +Im +Lc +rO +rg +Hj +Hj +Hj +Hj +bR +Hj +bR +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (22,1,1) = {" -sK -sK -sK -sK -sK -sK -sK -sK -sK -Tu -sK -gt -QL -Ar -UG -XR -zT -QL -sK -sK -sK -sK -sK -sK -sK -sK -Rf -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +KI +Hj +jh +rg +kO +IE +Lc +Xy +rg +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +bR +Hj +Hj +Hj +Hj +Hj "} (23,1,1) = {" -sK -sK -sK -sK -ol -sK -sK -sK -ZD -sK -sK -gT -QL -QL -QL -yf -QL -QL -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +VA +Hj +Hj +Hj +bp +Hj +Hj +CX +rg +rg +rg +he +rg +rg +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (24,1,1) = {" -sK -sK -sK -ol -ol -ol -sK -sK -Vd -uD -IT -IT -dK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +VA +VA +VA +Hj +Hj +Cy +kH +rT +rT +YT +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (25,1,1) = {" -sK -sK -sK -ol -ol -ol -ol -sK -sK -sK -sK -sK -Rf -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +VA +VA +VA +VA +Hj +Hj +Hj +Hj +Hj +bR +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (26,1,1) = {" -sK -sK -ol -ol -ol -ol -sK -sK -sK -jN -sK -sK -sK -sK -sK -sK -sK -sK -Rf -sK -sK -sK -Rf -sK -sK -sK -Ii -sK -sK -sK -sK -sK +Hj +Hj +VA +VA +VA +VA +Hj +Hj +Hj +xH +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +bR +Hj +Hj +Hj +bR +Hj +Hj +Hj +jk +Hj +Hj +Hj +Hj +Hj "} (27,1,1) = {" -sK -Rf -sK -ol -ol -ol -ol -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +bR +Hj +VA +VA +VA +VA +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (28,1,1) = {" -sK -sK -sK -sK -sK -ol -ol -ol -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -Rf -sK +Hj +Hj +Hj +Hj +Hj +VA +VA +VA +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +bR +Hj "} (29,1,1) = {" -sK -sK -sK -sK -sK -ol -ol -sK -sK -sK -sK -sK -sK -Rf -sK -sK -sK -sK -sK -sK -sK -sK -Ii -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +VA +VA +Hj +Hj +Hj +Hj +Hj +Hj +bR +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +jk +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (30,1,1) = {" -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -Ha -sK -sK -sK -sK -sK -Ha -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +bP +Hj +Hj +Hj +Hj +Hj +bP +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (31,1,1) = {" -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} (32,1,1) = {" -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK -sK +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj +Hj "} diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm index 8cba6af8ac1..dfeb94247ee 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm @@ -16,6 +16,15 @@ temperature = 268.15 }, /area/exoplanet/adhomai) +"bE" = ( +/obj/structure/closet/crate/bin, +/obj/item/clothing/accessory/tajaran/charm/steel, +/obj/item/trash/plate, +/obj/item/trash/plate, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_raskariim_hideout) "ch" = ( /obj/structure/table/wood, /obj/item/pocketwatch/adhomai, @@ -31,6 +40,13 @@ /area/adhomai_raskariim_hideout) "cy" = ( /obj/structure/closet/cabinet, +/obj/item/clothing/suit/storage/toggle/tajaran/wool, +/obj/item/clothing/under/tajaran, +/obj/item/clothing/under/tajaran, +/obj/item/clothing/under/tajaran/nka_noble{ + name = "tattered noble adhomian clothes"; + desc = "Clothes frequently worn by the New Kingdom's nobles. Whilst most are hand-me-downs this one clearly is, dotted by large holes and torn fabric." + }, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -63,6 +79,14 @@ temperature = 268.15 }, /area/exoplanet/adhomai) +"dg" = ( +/obj/item/stack/material/woodlog, +/obj/item/stack/material/woodlog, +/obj/item/stack/material/woodlog, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) "ds" = ( /obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ @@ -127,6 +151,22 @@ temperature = 278.15 }, /area/adhomai_raskariim_hideout) +"kM" = ( +/obj/structure/bookcase, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_raskariim_hideout) +"kX" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/reagent_dispensers/keg/mead{ + reagents_to_add = list(/singleton/reagent/water=1000); + name = "water barrel" + }, +/turf/simulated/floor/tiled/white{ + temperature = 278.15 + }, +/area/adhomai_raskariim_hideout) "lj" = ( /obj/structure/mirror{ pixel_y = 32 @@ -151,6 +191,16 @@ temperature = 278.15 }, /area/adhomai_raskariim_hideout) +"nm" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/light/small{ + brightness_color = "#FA8282"; + dir = 1 + }, +/turf/simulated/floor/tiled/white{ + temperature = 278.15 + }, +/area/adhomai_raskariim_hideout) "or" = ( /obj/item/reagent_containers/pill/happy{ pixel_y = -5; @@ -183,6 +233,10 @@ pixel_y = 1 }, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/item/reagent_containers/glass/rag{ + pixel_x = -7; + pixel_y = 4 + }, /turf/simulated/floor/tiled/white{ temperature = 278.15 }, @@ -200,7 +254,7 @@ }, /area/adhomai_raskariim_hideout) "rw" = ( -/obj/structure/bed/stool/chair/sofa/left/beige{ +/obj/structure/bed/stool/chair/sofa/left/black{ dir = 1 }, /turf/simulated/floor/wood{ @@ -290,6 +344,13 @@ "vA" = ( /obj/item/surgery/scalpel, /obj/structure/table/wood, +/obj/item/reagent_containers/glass/bucket/wood{ + pixel_x = -4; + pixel_y = 9 + }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -304,10 +365,20 @@ /area/adhomai_raskariim_hideout) "vI" = ( /obj/item/clothing/shoes/tajara/footwraps{ - pixel_x = 9 + pixel_x = 9; + pixel_y = 14 }, /obj/item/clothing/shoes/tajara/footwraps{ - pixel_x = -5 + pixel_x = -5; + pixel_y = 13 + }, +/obj/item/clothing/shoes/tajara/winter{ + pixel_x = -11; + pixel_y = -7 + }, +/obj/item/clothing/shoes/tajara/winter{ + pixel_x = 7; + pixel_y = -7 }, /turf/simulated/floor/wood{ temperature = 268.15 @@ -315,6 +386,29 @@ /area/adhomai_raskariim_hideout) "wq" = ( /obj/structure/table/wood, +/obj/item/gun/projectile/revolver/adhomian{ + pixel_y = -2 + }, +/obj/item/ammo_casing/c38{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/ammo_casing/c38{ + pixel_x = 7; + pixel_y = 5 + }, +/obj/item/ammo_casing/c38{ + pixel_x = 1; + pixel_y = 7 + }, +/obj/item/ammo_casing/c38{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_x = -5; + pixel_y = 12 + }, /turf/simulated/floor/carpet/art{ temperature = 278.15 }, @@ -327,6 +421,47 @@ temperature = 268.15 }, /area/adhomai_raskariim_hideout) +"xe" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/stone/marble, +/obj/item/reagent_containers/cooking_container/pot{ + pixel_y = 11; + pixel_x = 9 + }, +/obj/item/reagent_containers/cooking_container/saucepan{ + pixel_y = -2; + pixel_x = -11 + }, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + pixel_y = 20; + pixel_x = -15 + }, +/obj/item/reagent_containers/glass/bucket/wood{ + pixel_x = 11 + }, +/turf/simulated/floor/tiled/white{ + temperature = 278.15 + }, +/area/adhomai_raskariim_hideout) +"xo" = ( +/obj/structure/table/wood, +/obj/item/flame/candle/waxcandles{ + pixel_x = -4; + pixel_y = 16 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_raskariim_hideout) +"xs" = ( +/obj/structure/bonfire/fireplace{ + density = 0 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_raskariim_hideout) "xK" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/stone/marble, @@ -337,10 +472,29 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_y = 9; + pixel_x = -7 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_y = 3; + pixel_x = -7 + }, +/obj/item/material/kitchen/utensil/knife, /turf/simulated/floor/tiled/white{ temperature = 278.15 }, /area/adhomai_raskariim_hideout) +"zd" = ( +/obj/structure/table/wood, +/obj/item/device/flashlight/lamp{ + pixel_y = 6; + pixel_x = 5 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_raskariim_hideout) "zn" = ( /turf/simulated/floor/carpet/art{ temperature = 278.15 @@ -393,8 +547,13 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = -5 }, -/obj/item/flame/lighter/adhomai, /obj/structure/table/wood, +/obj/item/storage/firstaid, +/obj/item/storage/box/fancy/candle_box, +/obj/item/storage/box/fancy/candle_box, +/obj/item/storage/box/fancy/candle_box, +/obj/item/storage/box/fancy/candle_box, +/obj/item/flame/lighter/adhomai, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -437,7 +596,8 @@ /area/adhomai_raskariim_hideout) "HE" = ( /obj/item/handcuffs/cable/random, -/obj/machinery/light/small/red, +/obj/item/handcuffs/cable/random, +/obj/machinery/light/small, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -446,6 +606,13 @@ /obj/structure/table/wood, /obj/item/material/ashtray/bronze, /obj/item/trash/cigbutt, +/obj/item/storage/box/fancy/cigarettes/dpra{ + pixel_y = -2; + pixel_x = -7 + }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -458,6 +625,18 @@ temperature = 278.15 }, /area/adhomai_raskariim_hideout) +"Io" = ( +/obj/structure/closet/crate/bin, +/obj/item/paper/crumpled/bloody, +/obj/item/paper/crumpled/bloody, +/obj/item/trash/candle, +/obj/item/trash/plate, +/obj/item/trash/plate, +/obj/item/trash/plate, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_raskariim_hideout) "IW" = ( /obj/structure/closet/cabinet, /obj/item/clothing/suit/storage/tajaran/raskara, @@ -495,6 +674,9 @@ pixel_x = 7 }, /obj/item/material/kitchen/utensil/knife, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -571,6 +753,10 @@ /area/adhomai_raskariim_hideout) "Ol" = ( /obj/structure/coatrack, +/obj/item/clothing/accessory/poncho/tajarancloak/winter, +/obj/item/clothing/accessory/poncho/tajarancloak/winter, +/obj/item/clothing/head/tajaran/fur, +/obj/item/clothing/head/tajaran/fur, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -591,6 +777,8 @@ /obj/structure/noose, /obj/structure/bed/stool/bar/padded/red, /obj/effect/decal/cleanable/blood/splatter, +/obj/item/poppet, +/obj/machinery/light/small, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -654,11 +842,18 @@ "WO" = ( /turf/simulated/wall/wood, /area/adhomai_raskariim_hideout) +"XF" = ( +/obj/item/storage/box/fancy/candle_box, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_raskariim_hideout) "Yu" = ( /obj/effect/ghostspawpoint{ identifier = "raskariim_hideout"; name = "igs - raskariim_hideout" }, +/obj/item/flame/candle, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -785,7 +980,7 @@ SE SE SE WO -SE +kM zn zn vD @@ -881,7 +1076,7 @@ jX ez ka WO -SE +xs zn zn rw @@ -943,7 +1138,7 @@ CS WM WO Jq -SE +XF SE Ew SE @@ -972,15 +1167,15 @@ ri WO WO WO -SE +Io SE SE SE WO +bE SE SE -SE -ez +zd WO WO WO @@ -988,7 +1183,7 @@ WO "} (14,1,1) = {" CS -WM +dg WO ch SE @@ -1027,7 +1222,7 @@ Hn Hn Hn Hn -Hn +kX WO WM WM @@ -1038,7 +1233,7 @@ MZ CS WM WO -ez +xo zn zn zn @@ -1046,12 +1241,12 @@ zn SE DD WO +nm Hn Hn Hn Hn -Hn -Hn +xe WO WM WM diff --git a/maps/random_ruins/exoplanets/adhomai/ala_base.dmm b/maps/random_ruins/exoplanets/adhomai/ala_base.dmm index c1b624de0cf..280365f8dac 100644 --- a/maps/random_ruins/exoplanets/adhomai/ala_base.dmm +++ b/maps/random_ruins/exoplanets/adhomai/ala_base.dmm @@ -1,26 +1,34 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"az" = ( -/obj/structure/bed/stool/padded/black, -/obj/machinery/button/remote/blast_door{ - id = "ala_camp_entry"; - name = "Entry"; - req_access = list(214); - pixel_y = 32 +"ah" = ( +/obj/structure/barricade/metal/wired{ + pixel_y = 16 }, -/obj/machinery/light/small{ +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/ala_base) +"ak" = ( +/obj/structure/railing/fence{ + dir = 1 + }, +/obj/structure/railing/fence{ dir = 4 }, +/obj/structure/table/steel, +/obj/item/reagent_containers/cooking_container/pot{ + pixel_y = 5; + pixel_x = 4 + }, +/obj/item/reagent_containers/cooking_container/saucepan{ + pixel_y = -2; + pixel_x = -11 + }, +/obj/item/tray, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/ala_base) -"cn" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/simulated/floor/tiled/dark{ - temperature = 268.15 - }, -/area/ala_base) -"dg" = ( +"az" = ( /obj/structure/table/steel, /obj/machinery/door/window/brigdoor/northright{ dir = 8; @@ -36,6 +44,68 @@ temperature = 268.15 }, /area/ala_base) +"aA" = ( +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/closet/secure_closet/guncabinet{ + req_access = list(214); + name = "gun cabinet (automatic rifle)" + }, +/obj/item/gun/projectile/automatic/rifle/dpra, +/obj/item/gun/projectile/automatic/rifle/dpra, +/obj/item/clothing/accessory/storage/bayonet, +/obj/item/clothing/accessory/storage/bayonet, +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/ala_base) +"bD" = ( +/obj/item/storage/secure/safe, +/turf/simulated/wall/iron, +/area/ala_base) +"bR" = ( +/obj/structure/closet/crate/medical, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/storage/box/syringes, +/obj/item/storage/box/gloves, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"cn" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/ala_base) +"cA" = ( +/obj/structure/table/steel, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/handcuffs, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"dg" = ( +/obj/structure/sign/flag/dpra/left{ + dir = 4 + }, +/turf/simulated/wall/iron, +/area/ala_base) +"dF" = ( +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/closet/secure_closet/guncabinet{ + req_access = list(214); + name = "gun cabinet (marksman)" + }, +/obj/item/gun/projectile/dragunov, +/obj/item/clothing/accessory/storage/bayonet, +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/ala_base) "eh" = ( /obj/machinery/door/blast/shutters{ id = "ala_garage"; @@ -45,6 +115,50 @@ temperature = 268.15 }, /area/ala_base) +"eo" = ( +/obj/structure/table/standard, +/obj/item/reagent_containers/glass/rag/handkerchief, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/syringe, +/obj/effect/decal/cleanable/blood/drip, +/obj/item/clothing/gloves/latex/nitrile/tajara, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"fb" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/obj/machinery/appliance/cooker/oven/adhomai, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"fi" = ( +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/closet/secure_closet/guncabinet{ + req_access = list(214); + name = "gun cabinet (rifle)" + }, +/obj/item/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/projectile/shotgun/pump/rifle, +/obj/machinery/light/small, +/obj/item/clothing/accessory/storage/bayonet, +/obj/item/clothing/accessory/storage/bayonet, +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/ala_base) +"fY" = ( +/obj/structure/railing/fence{ + dir = 1 + }, +/obj/machinery/appliance/cooker/stove, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "gU" = ( /obj/structure/railing/fence{ dir = 4 @@ -80,6 +194,12 @@ temperature = 268.15 }, /area/exoplanet/adhomai) +"iM" = ( +/obj/structure/closet/crate/bin, +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/ala_base) "iP" = ( /obj/structure/sign/flag/dpra{ pixel_x = -32 @@ -97,8 +217,50 @@ }, /area/ala_base) "jH" = ( +/obj/structure/flora/grass/adhomai, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/ala_base) +"lr" = ( +/obj/structure/bed/stool/chair/wood{ + dir = 8 + }, +/obj/effect/ghostspawpoint{ + identifier = "ala_base_officer"; + name = "igs - ala_base_officer" + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"lI" = ( +/obj/structure/table/wood, +/obj/item/device/binoculars{ + pixel_y = 8 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/dpra{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/paper_bin, +/obj/item/pen/black, +/obj/structure/filingcabinet{ + pixel_x = 12; + pixel_y = 23; + density = 0 + }, +/obj/structure/sign/flag/dpra{ + pixel_y = 32 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"lX" = ( /obj/structure/bed/padded, -/obj/structure/curtain/open/bed, +/obj/effect/decal/cleanable/blood/drip, +/obj/item/bedsheet/medical, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -111,41 +273,51 @@ }, /area/ala_base) "mC" = ( -/obj/structure/trash_pile, -/turf/simulated/floor/tiled/dark{ +/obj/structure/table/wood/gamblingtable, +/obj/item/material/knife/bayonet, +/turf/simulated/floor/wood{ temperature = 268.15 }, /area/ala_base) "nc" = ( -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/closet/secure_closet/guncabinet{ - req_access = list(214); - name = "gun cabinet (rifle)" +/obj/structure/blocker/steel/fence{ + dir = 4 }, -/obj/item/gun/projectile/shotgun/pump/rifle, -/obj/item/gun/projectile/shotgun/pump/rifle, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/dark{ +/obj/structure/railing/fence, +/turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/ala_base) "ne" = ( /obj/structure/bed/padded, /obj/structure/curtain/open/bed, -/obj/effect/ghostspawpoint{ - identifier = "ala_base_officer"; - name = "igs - ala_base_officer" - }, +/obj/item/bedsheet/black, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/ala_base) +"nu" = ( +/obj/structure/curtain/black{ + pixel_y = 32 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/ala_base) "nE" = ( /obj/structure/simple_door/wood, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/ala_base) +"nR" = ( +/obj/structure/closet/crate/bin{ + pixel_y = 24 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/ala_base) "om" = ( /turf/simulated/floor/tiled/dark{ temperature = 268.15 @@ -156,6 +328,13 @@ temperature = 268.15 }, /area/ala_base) +"pc" = ( +/obj/structure/table/wood/gamblingtable, +/obj/item/flame/lighter/adhomai, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "pB" = ( /obj/structure/railing/fence{ dir = 1 @@ -163,6 +342,15 @@ /obj/structure/railing/fence{ dir = 8 }, +/obj/machinery/floodlight, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"pU" = ( +/obj/structure/closet/secure_closet/brig{ + req_access = null + }, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -174,6 +362,23 @@ temperature = 268.15 }, /area/ala_base) +"qd" = ( +/obj/effect/decal/fake_object{ + icon = 'icons/obj/cooking_machines.dmi'; + icon_state = "adhomai_stove_on"; + name = "water heater"; + desc = "A rustic Adhomian heater typically filled with firewood This one is connected to a nearby water tank. Warm enough to gather around the winter." + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/ala_base) +"qm" = ( +/obj/structure/bed, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "qA" = ( /turf/simulated/floor/exoplanet/barren{ temperature = 268.15 @@ -199,6 +404,12 @@ temperature = 268.15 }, /area/ala_base) +"ra" = ( +/obj/machinery/space_heater, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "rp" = ( /obj/machinery/light{ dir = 8 @@ -207,6 +418,12 @@ temperature = 268.15 }, /area/ala_base) +"sD" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "th" = ( /obj/structure/trash_pile, /obj/machinery/light, @@ -254,6 +471,18 @@ temperature = 268.15 }, /area/ala_base) +"uk" = ( +/obj/structure/simple_door/iron, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"ut" = ( +/obj/machinery/light, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) "uw" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/structure/closet/secure_closet/guncabinet{ @@ -269,25 +498,49 @@ }, /area/ala_base) "uI" = ( -/obj/structure/table/steel, -/obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" +/obj/machinery/light/small{ + dir = 1 }, -/obj/item/handcuffs, +/obj/structure/closet/cabinet, +/obj/item/storage/backpack/satchel/leather, +/obj/item/clothing/accessory/holster/hip, +/obj/item/ammo_magazine/c45m, +/obj/item/ammo_magazine/c45m, +/obj/item/reagent_containers/food/drinks/bottle/veterans_choice, +/obj/item/reagent_containers/food/drinks/bottle/veterans_choice, +/obj/item/clothing/accessory/dpra_badge, +/obj/item/storage/box/dpra_manifesto, +/obj/item/storage/field_ration/dpra, +/obj/item/flame/lighter/adhomai, +/obj/item/pocketwatch/adhomai, +/obj/item/clothing/under/tajaran/ala/black/officer, +/obj/item/clothing/head/tajaran/ala_officer, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"uK" = ( +/obj/structure/sign/flag/dpra/right{ + dir = 4 + }, +/turf/simulated/wall/iron, +/area/ala_base) +"uM" = ( +/obj/structure/table/wood, +/obj/machinery/photocopier/faxmachine{ + anchored = 0; + department = "ALA Outpost"; + pixel_y = 4; + req_one_access = null + }, +/obj/machinery/light/small, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/ala_base) "uO" = ( -/obj/structure/railing/fence{ - dir = 1 - }, -/obj/structure/railing/fence{ - dir = 4 - }, -/obj/structure/reagent_dispensers/keg/mead, -/turf/simulated/floor/wood{ +/obj/machinery/space_heater, +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/ala_base) @@ -296,6 +549,22 @@ temperature = 268.15 }, /area/exoplanet/adhomai) +"vy" = ( +/obj/structure/railing/fence{ + dir = 1 + }, +/obj/item/reagent_containers/glass/bucket/wood{ + pixel_x = 11; + pixel_y = 4 + }, +/obj/item/extinguisher{ + pixel_y = 11; + pixel_x = -11 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "vH" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/structure/closet/secure_closet/guncabinet{ @@ -313,24 +582,23 @@ }, /area/ala_base) "vJ" = ( -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/closet/secure_closet/guncabinet{ - req_access = list(214); - name = "gun cabinet (automatic rifle)" +/obj/structure/table/wood, +/obj/item/device/flashlight/lamp{ + pixel_y = 9 }, -/obj/item/gun/projectile/automatic/rifle/dpra, -/obj/item/gun/projectile/automatic/rifle/dpra, -/turf/simulated/floor/tiled/dark{ +/obj/item/book/manual/dpra_manifesto{ + pixel_y = 1; + pixel_x = 4 + }, +/turf/simulated/floor/wood{ temperature = 268.15 }, /area/ala_base) "vP" = ( -/obj/machinery/door/blast/shutters{ - id = "ala_camp_entry" - }, -/turf/simulated/floor/exoplanet/barren{ - temperature = 268.15 +/obj/structure/barricade/metal/wired{ + pixel_y = 16 }, +/turf/simulated/wall/iron, /area/ala_base) "vT" = ( /obj/machinery/light{ @@ -342,6 +610,9 @@ /area/ala_base) "wf" = ( /obj/machinery/light, +/obj/structure/sign/flag/dpra{ + pixel_y = -33 + }, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -356,6 +627,7 @@ identifier = "ala_base_soldier"; name = "igs - ala_base_soldier" }, +/obj/item/bedsheet/black, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -367,13 +639,37 @@ }, /area/ala_base) "wH" = ( -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/closet/secure_closet/guncabinet{ - req_access = list(214); - name = "gun cabinet (marksman)" +/obj/effect/map_effect/window_spawner/full/reinforced, +/turf/simulated/floor/wood{ + temperature = 268.15 }, -/obj/item/gun/projectile/dragunov, -/turf/simulated/floor/tiled/dark{ +/area/ala_base) +"wU" = ( +/obj/item/stack/material/woodlog/full, +/obj/item/stack/material/woodlog/full, +/obj/item/stack/material/woodlog/full, +/obj/structure/closet/crate/bin{ + name = "fire wood bin" + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/ala_base) +"xp" = ( +/obj/structure/railing/fence, +/obj/structure/closet/crate/freezer, +/obj/item/storage/field_ration/dpra, +/obj/item/storage/field_ration/dpra, +/obj/item/storage/field_ration/dpra, +/obj/item/storage/field_ration/dpra, +/obj/item/storage/field_ration/dpra, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/knife, +/obj/item/material/kitchen/utensil/knife, +/obj/item/material/kitchen/utensil/knife, +/turf/simulated/floor/wood{ temperature = 268.15 }, /area/ala_base) @@ -392,12 +688,29 @@ temperature = 268.15 }, /area/ala_base) +"xW" = ( +/obj/structure/table/wood/gamblingtable, +/obj/item/storage/box/fancy/cigarettes/dpra, +/obj/item/clothing/mask/smokable/cigarette/adhomai{ + pixel_x = 8; + pixel_y = 12 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "yB" = ( /obj/structure/blocker/steel/fence, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/ala_base) +"yE" = ( +/obj/machinery/washing_machine, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "yO" = ( /obj/structure/closet/crate, /obj/item/storage/box/fancy/cigarettes/dpra, @@ -416,6 +729,9 @@ temperature = 268.15 }, /area/ala_base) +"yS" = ( +/turf/simulated/wall/wood, +/area/ala_base) "zp" = ( /obj/structure/bed/padded, /obj/structure/curtain/open/bed, @@ -423,6 +739,19 @@ identifier = "ala_base_soldier"; name = "igs - ala_base_soldier" }, +/obj/item/bedsheet/black, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"zz" = ( +/obj/structure/railing/fence{ + dir = 1 + }, +/obj/structure/reagent_dispensers/keg/mead{ + reagents_to_add = list(/singleton/reagent/water=1000); + name = "water barrel" + }, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -440,13 +769,10 @@ }, /area/ala_base) "zC" = ( -/obj/structure/railing/fence, -/obj/structure/closet/crate/freezer, -/obj/item/storage/field_ration/dpra, -/obj/item/storage/field_ration/dpra, -/obj/item/storage/field_ration/dpra, -/obj/item/storage/field_ration/dpra, -/obj/item/storage/field_ration/dpra, +/obj/item/reagent_containers/glass/bucket/wood{ + pixel_x = -8; + pixel_y = -3 + }, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -458,17 +784,37 @@ temperature = 268.15 }, /area/ala_base) -"Am" = ( -/obj/structure/table/steel, -/obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" +"zQ" = ( +/obj/structure/table/standard, +/obj/item/device/flashlight/lamp/green{ + pixel_y = 12; + pixel_x = 5 + }, +/obj/item/reagent_containers/food/drinks/bottle/veterans_choice{ + pixel_y = 21; + pixel_x = -6 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot{ + pixel_y = 10; + pixel_x = -7 + }, +/obj/item/stack/medical/bruise_pack/full, +/obj/item/clothing/mask/smokable/cigarette/adhomai{ + pixel_x = 5; + pixel_y = 3 }, -/obj/item/handcuffs, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/ala_base) +"Am" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/ala_base) "Av" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/structure/closet/secure_closet/guncabinet{ @@ -488,11 +834,28 @@ }, /area/ala_base) "AW" = ( -/obj/structure/closet/outhouse, +/obj/structure/reagent_dispensers/coolanttank{ + reagents_to_add = list(/singleton/reagent/water=1000); + name = "heated water tank"; + desc = "A tank of water filed by melting local snow." + }, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/ala_base) +"Bg" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/bed/stool/chair/wood{ + dir = 8 + }, +/obj/item/handcuffs, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "Bi" = ( /obj/structure/table/standard, /obj/item/storage/belt/utility, @@ -506,6 +869,26 @@ temperature = 268.15 }, /area/ala_base) +"BV" = ( +/obj/structure/noticeboard{ + icon_state = "nboard03"; + pixel_x = 32 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"Ci" = ( +/obj/structure/table/wood/gamblingtable, +/obj/item/reagent_containers/food/drinks/bottle/veterans_choice{ + pixel_y = 21; + pixel_x = -6 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "Cj" = ( /obj/machinery/light{ dir = 4; @@ -515,6 +898,12 @@ temperature = 268.15 }, /area/ala_base) +"Cs" = ( +/obj/structure/closet/crate/bin, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/ala_base) "CW" = ( /obj/structure/railing/fence{ dir = 8 @@ -544,12 +933,40 @@ temperature = 268.15 }, /area/ala_base) +"DU" = ( +/obj/structure/bed/stool/padded/black, +/obj/machinery/button/remote/blast_door{ + id = "ala_camp_entry"; + name = "Entry"; + req_access = list(214); + pixel_y = 32 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "Ec" = ( /obj/structure/railing/fence, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/ala_base) +"Ed" = ( +/obj/structure/table/standard, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/storage/box/fancy/tray/machinist{ + name = "ALA operation tray"; + desc = "A tray of various mundane surgical instruments for fixing someone up when they've been shot." + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "Ex" = ( /obj/structure/table/standard, /obj/machinery/cell_charger, @@ -560,6 +977,18 @@ temperature = 268.15 }, /area/ala_base) +"Ez" = ( +/obj/structure/railing/fence{ + dir = 8 + }, +/obj/structure/curtain/open/shower, +/obj/machinery/shower{ + dir = 1 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "EK" = ( /obj/structure/table/wood/gamblingtable, /obj/item/deck/cards, @@ -584,7 +1013,9 @@ }, /area/ala_base) "ES" = ( -/obj/structure/simple_door/iron, +/obj/structure/bed/padded, +/obj/item/bedsheet/black, +/obj/structure/curtain/open/bed, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -625,6 +1056,25 @@ "Hq" = ( /turf/simulated/wall/iron, /area/ala_base) +"HA" = ( +/obj/machinery/light, +/obj/structure/curtain/open/shower, +/obj/machinery/shower{ + dir = 1 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"In" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Cell"; + req_access = list(214) + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "IO" = ( /obj/structure/table/standard, /obj/item/storage/toolbox/mechanical{ @@ -637,10 +1087,34 @@ /area/ala_base) "JT" = ( /obj/structure/closet/crate, +/obj/item/storage/box/lights, /turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/ala_base) +"Kf" = ( +/obj/item/pipe{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/ala_base) +"KB" = ( +/obj/structure/bedsheetbin{ + pixel_y = 8; + pixel_x = 5 + }, +/obj/structure/table/steel, +/obj/item/clothing/head/beret/tajaran/dpra/alt{ + pixel_y = 12; + pixel_x = 5 + }, +/obj/structure/railing/fence, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "KV" = ( /obj/structure/bed/padded, /obj/structure/curtain/open/bed, @@ -651,6 +1125,7 @@ identifier = "ala_base_soldier"; name = "igs - ala_base_soldier" }, +/obj/item/bedsheet/black, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -664,6 +1139,53 @@ temperature = 268.15 }, /area/ala_base) +"LP" = ( +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/obj/structure/extinguisher_cabinet{ + pixel_y = 31 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/ala_base) +"LV" = ( +/obj/structure/table/wood, +/obj/structure/sign/painting_frame/nated{ + pixel_x = -31 + }, +/obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water{ + pixel_x = -4; + pixel_y = 18 + }, +/obj/item/stamp{ + name = "adhomai liberation army stamp"; + icon_state = "stamp-investigator"; + pixel_x = 7; + pixel_y = 19 + }, +/obj/item/stamp/denied{ + pixel_y = 19; + pixel_x = -4 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"LW" = ( +/obj/structure/bed/stool/padded/black, +/obj/machinery/button/remote/blast_door{ + id = "ala_camp_entry"; + name = "Entry"; + req_access = list(214); + pixel_y = 32 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "Ma" = ( /obj/structure/sign/flag/dpra/right{ pixel_y = 32 @@ -674,17 +1196,121 @@ /area/ala_base) "Md" = ( /obj/structure/table/standard, -/obj/item/device/binoculars, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/ala_base) +"MX" = ( +/obj/structure/closet/walllocker/medical{ + pixel_y = 31 + }, +/obj/item/stack/medical/bruise_pack/full, +/obj/item/stack/medical/bruise_pack/full, +/obj/item/stack/medical/bruise_pack/full, +/obj/item/stack/medical/splint/full, +/obj/item/stack/medical/splint/full, +/obj/item/stack/medical/ointment/full, +/obj/item/tank/anesthetic, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/suit/storage/hooded/tajaran/surgery, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"Nl" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/obj/structure/curtain/open/shower, +/obj/machinery/shower{ + dir = 1 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"Oc" = ( +/obj/structure/railing/fence, +/obj/machinery/space_heater, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"Od" = ( +/obj/structure/sign/emergency/meetingpoint{ + name = "\improper AID STATION sign"; + desc = "A green sign which showcases the location of a medical aid station."; + pixel_x = 32 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/ala_base) +"Ol" = ( +/obj/structure/table/rack, +/obj/item/shovel, +/obj/item/shovel, +/obj/item/shovel, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/ala_base) "OG" = ( /obj/machinery/light, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/ala_base) +"OK" = ( +/obj/structure/table/steel, +/obj/machinery/door/window/brigdoor/northright{ + dir = 4; + req_access = list(214) + }, +/obj/item/paper_bin, +/obj/item/pen/black, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/dpra{ + pixel_x = 5; + pixel_y = 8 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"Pd" = ( +/obj/structure/sign/painting_frame/nated{ + pixel_y = 32 + }, +/obj/item/trash/tray, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"Pi" = ( +/obj/structure/closet/outhouse, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/ala_base) +"PC" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/closet/crate/bin, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/ala_base) +"PY" = ( +/obj/structure/table/steel, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/handcuffs, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) "Rg" = ( /obj/structure/table/standard, /obj/item/device/flashlight/lamp, @@ -696,18 +1322,19 @@ }, /area/ala_base) "RD" = ( -/obj/structure/table/steel, -/obj/machinery/door/window/brigdoor/northright{ - dir = 4; - req_access = list(214) +/obj/structure/sign/flag/dpra{ + pixel_y = -32 }, -/obj/item/paper_bin, -/obj/item/pen/black, -/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/dpra{ - pixel_x = 5; - pixel_y = 8 +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 }, -/turf/simulated/floor/wood{ +/area/exoplanet/adhomai) +"Sc" = ( +/obj/item/reagent_containers/glass/bucket/wood{ + pixel_x = 11; + pixel_y = -11 + }, +/turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/ala_base) @@ -741,18 +1368,19 @@ temperature = 268.15 }, /area/ala_base) -"SY" = ( -/obj/structure/bed/stool/padded/black, -/obj/machinery/button/remote/blast_door{ - id = "ala_camp_entry"; - name = "Entry"; - req_access = list(214); - pixel_y = 32 +"Ty" = ( +/obj/machinery/floodlight{ + dir = 1 }, -/obj/machinery/light/small{ - dir = 8 +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 }, -/turf/simulated/floor/wood{ +/area/exoplanet/adhomai) +"TB" = ( +/obj/structure/light_pole/r{ + density = 0 + }, +/turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/ala_base) @@ -765,7 +1393,10 @@ }, /area/ala_base) "VN" = ( -/obj/structure/table/wood/gamblingtable, +/obj/structure/noticeboard{ + icon_state = "nboard04"; + pixel_x = -32 + }, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -778,14 +1409,32 @@ temperature = 268.15 }, /area/ala_base) -"XN" = ( -/obj/structure/sign/flag/dpra{ - pixel_y = -32 +"Xe" = ( +/obj/item/stack/material/woodlog/full, +/obj/item/crowbar/rescue_axe/red{ + name = "woodcutting axe"; + desc = "A short lightweight tool meant to chop, pry and pierce wood." }, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/exoplanet/adhomai) +"XN" = ( +/obj/structure/curtain/black{ + pixel_y = 32 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/ala_base) +"XT" = ( +/obj/machinery/door/blast/shutters{ + id = "ala_camp_entry" + }, +/turf/simulated/floor/exoplanet/barren{ + temperature = 268.15 + }, +/area/ala_base) "Yr" = ( /obj/structure/railing/fence{ dir = 1 @@ -845,6 +1494,11 @@ vi vi vi vi +vi +vi +vi +vi +vi "} (2,1,1) = {" vi @@ -879,6 +1533,11 @@ vi ZQ vi vi +vi +vi +hT +vi +vi "} (3,1,1) = {" vi @@ -913,6 +1572,11 @@ vi vi vi vi +vi +vi +vi +vi +vi "} (4,1,1) = {" vi @@ -944,9 +1608,14 @@ yB yB yB yB +yB +yB +Hq +yB +yB +yB +yB Hq -hT -vi "} (5,1,1) = {" vi @@ -954,6 +1623,7 @@ vi vi EP DB +Sc DB DB DB @@ -978,9 +1648,13 @@ DB DB DB DB -EP -vi -vi +DB +rp +DB +DB +DB +DB +yB "} (6,1,1) = {" hT @@ -988,12 +1662,12 @@ vi vi EP DB +Pi DB DB DB DB -DB -DB +AW Hq Hq Hq @@ -1012,9 +1686,14 @@ Hq Hq Hq DB -EP -vi -vi +DB +DB +DB +DB +DB +DB +DB +yB "} (7,1,1) = {" vi @@ -1027,7 +1706,7 @@ DB DB DB DB -DB +Kf Hq KV Rg @@ -1045,23 +1724,28 @@ Av Wl Fg Hq +ah DB -EP -vi -vi +DB +DB +DB +DB +DB +DB +yB "} (8,1,1) = {" vi vi vi -EP -DB -DB -DB -DB +nc +yE +yE +KB DB DB DB +qd Hq Ma oA @@ -1077,17 +1761,22 @@ DB Hq qF om -nc +fi Hq +ah DB -EP -vi -vi +DB +DB +DB +DB +DB +DB +yB "} (9,1,1) = {" vi vi -vi +Ty Hq Hq Hq @@ -1095,7 +1784,7 @@ Hq DB DB DB -DB +wU Hq SQ oA @@ -1105,27 +1794,32 @@ oA oA oA oA -oA +ra Hq DB Hq vH om -vJ +aA Hq +ah DB -EP -vi -vi +DB +DB +DB +DB +DB +DB +yB "} (10,1,1) = {" vi vi -wf +ut Hq -SY -oA -ES +DU +VN +uk DB DB DB @@ -1147,18 +1841,23 @@ tO om uw Hq +ah DB -EP -vi -hT +DB +DB +DB +DB +DB +DB +yB "} (11,1,1) = {" vi vi -XN -Hq RD -Am +Hq +OK +PY Hq Vc DB @@ -1169,7 +1868,7 @@ wB YI zp zJ -jH +ne yO Fc xy @@ -1179,21 +1878,26 @@ DB Hq zA om -wH -Hq +dF +vP +ah DB -EP -vi -vi +DB +DB +DB +DB +DB +DB +yB "} (12,1,1) = {" Fo Fo Fo -vP +XT qA qA -vP +XT qA qA qA @@ -1216,18 +1920,23 @@ Lg Hq Hq DB -EP -vi -vi +DB +Hq +Hq +Hq +Hq +Hq +DB +yB "} (13,1,1) = {" Fo Fo Fo -vP +XT qA qA -vP +XT qA qA qA @@ -1240,7 +1949,7 @@ DB DB DB DB -rp +PC qA DB DB @@ -1250,17 +1959,22 @@ qA iP rp DB -EP -vi -vi +DB +Hq +lI +LV +uM +Hq +DB +yB "} (14,1,1) = {" vi vi -XN +RD Hq -dg -uI +az +cA Hq Vc qA @@ -1284,48 +1998,58 @@ qA qA DB DB -EP -vi -vi +DB +wH +XN +lr +oA +Hq +DB +yB "} (15,1,1) = {" vi vi -wf +ut Hq -az +LW +BV +uk +DB +qA +qA +qA +qA +qA +qA +qA +qA +qA +qA +qA +qA +qA +qA +qA +qA +qA +qA +qA +qA +qA +qA +nE oA -ES +oA +oA +Hq DB -qA -qA -qA -qA -qA -qA -qA -qA -qA -qA -qA -qA -qA -qA -qA -qA -qA -qA -qA -DB -DB -EP -vi -vi +yB "} (16,1,1) = {" vi vi -vi +Ty Hq Hq Hq @@ -1333,28 +2057,33 @@ Hq DB DB DB -DB -DB -DB -DB -DB -DB -DB -DB -Cj -DB -DB -Cj -DB -DB -DB +qA qA DB DB DB -EP -vi -vi +DB +DB +DB +Cj +DB +DB +Cj +DB +DB +TB +qA +DB +Cs +DB +wf +bD +oA +oA +vJ +Hq +DB +yB "} (17,1,1) = {" vi @@ -1367,10 +2096,10 @@ DB DB DB DB +qA +qA DB -DB -DB -DB +Ol Hq Hq Hq @@ -1386,9 +2115,14 @@ oA CW xN DB -EP -vi -vi +DB +Hq +uI +oA +ES +Hq +DB +yB "} (18,1,1) = {" vi @@ -1396,33 +2130,38 @@ vi vi EP DB -DB -DB -DB -DB -DB -DB -DB +Hq +Hq +Hq +Hq +nR +qA +qA DB DB Hq -om +LP ui -om +uO ui om om Hq Vc -St +zz oA oA oA Ec DB -EP -vi -vi +DB +Hq +Hq +dg +uK +Hq +DB +yB "} (19,1,1) = {" vi @@ -1430,15 +2169,15 @@ hT vi EP DB -DB -DB -DB -DB -AW -DB -DB -DB -DB +Hq +qm +zC +wH +nu +qA +qA +qA +Ez Hq vT om @@ -1448,15 +2187,20 @@ om DG Hq DB -St +Yr oA wC wC Ec -wf -Hq -vi -vi +DB +DB +DB +DB +DB +DB +DB +DB +yB "} (20,1,1) = {" vi @@ -1464,15 +2208,15 @@ vi vi EP DB -DB -DB -DB -DB -DB -DB -DB -DB -wf +Hq +Pd +oA +In +qA +qA +qA +qA +HA Hq Bi om @@ -1482,15 +2226,20 @@ om JT Hq DB -St +Yr wC mB -VN +xW qa DB -EP -vi -vi +DB +DB +DB +DB +DB +DB +DB +yB "} (21,1,1) = {" vi @@ -1498,15 +2247,15 @@ vi vi EP DB -DB -DB -DB -DB -DB -DB -DB -DB -DB +Hq +pU +Bg +Hq +Vc +qA +qA +qA +Nl Hq Ex om @@ -1518,27 +2267,32 @@ Hq DB St wC -VN -VN +Ci +pc qa DB -EP -vi -vi +DB +DB +DB +DB +DB +DB +DB +yB "} (22,1,1) = {" vi -vi +Xe vi EP DB +Hq +Hq +Hq +Hq DB -DB -DB -DB -DB -DB -DB +qA +qA DB DB Hq @@ -1547,34 +2301,39 @@ iY iY iY tT -mC +iM Hq DB St wC -VN +mC EK qa DB -EP -vi -vi +DB +DB +DB +DB +DB +DB +DB +yB "} (23,1,1) = {" vi vi vi Hq -yB -yB -yB -yB -yB -yB -yB -yB -yB -yB +DB +DB +DB +DB +DB +Od +qA +Cj +nR +DB Hq Hq eh @@ -1590,134 +2349,154 @@ wC wC Ec DB -EP -vi -vi +DB +DB +DB +DB +DB +DB +DB +yB "} (24,1,1) = {" vi vi vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi +yB +DB +DB +DB +DB +yS +yS +nE +yS +yS +DB +yB rp EN EN EN rp -vi -EP -DB -St -oA -oA -oA -Ec DB EP -vi -vi +DB +vy +oA +oA +oA +Oc +DB +DB +DB +DB +DB +DB +DB +DB +yB "} (25,1,1) = {" vi vi ZQ -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi +yB +DB +DB +DB +DB +yS +zQ +oA +Ed +yS +DB +yB +DB +DB +DB +DB +DB +DB EP DB -Yr +fY oA oA oA -zC -wf -Hq -vi -vi +xp +DB +DB +DB +DB +DB +DB +DB +DB +yB "} (26,1,1) = {" vi vi vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi +yB +DB +DB +DB +DB +yS +lX +oA +eo +yS +DB +yB +DB +DB +DB +DB +DB +DB EP DB -uO -gU +ak +fb oA gU Sr DB -EP -vi -vi +DB +DB +DB +DB +DB +DB +DB +yB "} (27,1,1) = {" vi vi vi -vi -vi -vi -ZQ -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi +yB +DB +DB +jH +DB +yS +MX +sD +bR +yS +DB +yB +DB +DB +DB +DB +DB +DB EP DB DB @@ -1726,32 +2505,37 @@ DB DB DB DB -EP -vi -vi +DB +DB +DB +DB +DB +DB +DB +yB "} (28,1,1) = {" vi vi vi -vi -vi -vi -vi -vi -vi -vi -vi -ZQ -vi -vi -vi -vi -vi -vi -vi -vi -vi +yB +DB +DB +DB +DB +yS +yS +yS +yS +yS +DB +yB +DB +DB +DB +DB +DB +DB EP DB DB @@ -1760,77 +2544,92 @@ DB DB DB DB -EP -vi -hT +DB +DB +DB +DB +DB +DB +DB +yB "} (29,1,1) = {" vi hT vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -Hq yB +DB +DB +DB +DB +DB +DB +DB +DB +DB +DB yB +DB +DB +DB +DB +DB +DB +EP +DB +DB +DB +DB +DB +DB +DB +DB +DB +Am +DB +DB +DB +DB yB -yB -yB -yB -yB -Hq -vi -vi "} (30,1,1) = {" vi vi vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -hT -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi +Hq +yB +yB +yB +yB +yB +yB +yB +yB +yB +yB +Hq +DB +DB +DB +DB +DB +DB +Hq +yB +yB +yB +yB +yB +yB +yB +yB +yB +Hq +yB +yB +yB +yB +Hq "} (31,1,1) = {" vi @@ -1865,6 +2664,11 @@ vi vi vi vi +vi +vi +vi +vi +vi "} (32,1,1) = {" vi @@ -1899,4 +2703,9 @@ vi vi vi vi +vi +vi +ZQ +vi +vi "} diff --git a/maps/random_ruins/exoplanets/adhomai/nka_base.dm b/maps/random_ruins/exoplanets/adhomai/nka_base.dm index 10350920e34..52a7799f9c4 100644 --- a/maps/random_ruins/exoplanets/adhomai/nka_base.dm +++ b/maps/random_ruins/exoplanets/adhomai/nka_base.dm @@ -32,7 +32,7 @@ max_count = 3 extra_languages = list(LANGUAGE_SIIK_MAAS) - outfit = /datum/outfit/admin/ + outfit = /datum/outfit/admin/nka_base possible_species = list(SPECIES_TAJARA,SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN) allow_appearance_change = APPEARANCE_PLASTICSURGERY diff --git a/maps/random_ruins/exoplanets/adhomai/nka_base.dmm b/maps/random_ruins/exoplanets/adhomai/nka_base.dmm index bcad7beb909..c97dcdbd3cc 100644 --- a/maps/random_ruins/exoplanets/adhomai/nka_base.dmm +++ b/maps/random_ruins/exoplanets/adhomai/nka_base.dmm @@ -12,6 +12,23 @@ temperature = 268.15 }, /area/nka_base) +"ak" = ( +/obj/structure/sign/painting_frame/shumaila{ + pixel_y = 31 + }, +/turf/simulated/floor/tiled{ + temperature = 268.15 + }, +/area/nka_base) +"bK" = ( +/obj/item/reagent_containers/glass/bucket/wood{ + pixel_x = 11; + pixel_y = -11 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/nka_base) "bR" = ( /obj/machinery/light/small{ dir = 8 @@ -28,6 +45,25 @@ temperature = 268.15 }, /area/nka_base) +"cM" = ( +/obj/structure/simple_door/iron{ + initial_lock_value = "nka_cell"; + name = "cell" + }, +/turf/simulated/floor/tiled{ + temperature = 268.15 + }, +/area/nka_base) +"eF" = ( +/obj/structure/sign/emergency/meetingpoint{ + name = "\improper AID STATION sign"; + desc = "A green sign which showcases the location of a medical aid station."; + pixel_y = -32 + }, +/turf/simulated/floor/exoplanet/barren{ + temperature = 268.15 + }, +/area/nka_base) "fq" = ( /obj/structure/bed/padded, /obj/structure/curtain/open/bed, @@ -47,6 +83,15 @@ temperature = 268.15 }, /area/nka_base) +"gF" = ( +/obj/structure/bed/stool/chair/wood, +/obj/item/handcuffs, +/obj/item/handcuffs/legcuffs, +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/tiled{ + temperature = 268.15 + }, +/area/nka_base) "gU" = ( /obj/structure/blocker/steel/fence{ dir = 4 @@ -55,12 +100,38 @@ temperature = 268.15 }, /area/nka_base) +"hK" = ( +/obj/item/stack/material/woodlog/full, +/obj/item/stack/material/woodlog/full, +/obj/item/stack/material/woodlog/full, +/obj/structure/closet/crate/bin{ + name = "fire wood bin" + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/nka_base) "hT" = ( /obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/exoplanet/adhomai) +"jN" = ( +/obj/structure/table/rack, +/obj/item/shovel, +/obj/item/shovel, +/obj/item/shovel, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/nka_base) +"ka" = ( +/obj/structure/bed/padded, +/turf/simulated/floor/tiled{ + temperature = 268.15 + }, +/area/nka_base) "kO" = ( /obj/structure/bed/stool/chair/wood{ dir = 8 @@ -80,7 +151,6 @@ }, /area/nka_base) "mb" = ( -/obj/structure/bed/stool/bar/padded/brown, /obj/structure/sign/flag/nka/right{ pixel_y = 32 }, @@ -104,8 +174,7 @@ /area/nka_base) "mj" = ( /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/table/wood, /obj/item/key{ @@ -145,6 +214,14 @@ temperature = 268.15 }, /area/nka_base) +"pb" = ( +/obj/structure/table/rack, +/obj/item/wrench, +/obj/item/screwdriver, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/nka_base) "pB" = ( /obj/structure/closet/cabinet, /obj/item/clothing/shoes/tajara/jackboots, @@ -155,6 +232,12 @@ temperature = 268.15 }, /area/nka_base) +"pV" = ( +/obj/structure/flora/bush/adhomai, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/nka_base) "qa" = ( /obj/structure/reagent_dispensers/keg/mead, /obj/machinery/light/small{ @@ -164,6 +247,32 @@ temperature = 268.15 }, /area/nka_base) +"rV" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/nka_base) +"tI" = ( +/obj/structure/closet/walllocker/medical{ + pixel_y = 31 + }, +/obj/item/stack/medical/bruise_pack/full, +/obj/item/stack/medical/bruise_pack/full, +/obj/item/stack/medical/bruise_pack/full, +/obj/item/stack/medical/splint/full, +/obj/item/stack/medical/splint/full, +/obj/item/stack/medical/ointment/full, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/suit/storage/hooded/tajaran/surgery, +/obj/item/reagent_containers/blood/OMinus, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/nka_base) "tT" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/structure/closet/secure_closet/cabinet{ @@ -189,6 +298,17 @@ temperature = 268.15 }, /area/nka_base) +"vd" = ( +/obj/structure/table/standard, +/obj/item/surgery/scalpel, +/obj/item/surgery/retractor, +/obj/item/flame/lighter/adhomai, +/obj/effect/decal/cleanable/blood/drip, +/obj/item/surgery/circular_saw, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/nka_base) "vi" = ( /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 @@ -210,6 +330,12 @@ temperature = 268.15 }, /area/nka_base) +"wy" = ( +/obj/structure/bonfire, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/nka_base) "wB" = ( /obj/machinery/light/small{ dir = 4 @@ -310,6 +436,30 @@ temperature = 268.15 }, /area/nka_base) +"Ab" = ( +/obj/structure/bonfire/fireplace{ + density = 0 + }, +/obj/structure/bedsheetbin{ + pixel_y = -4; + pixel_x = 9 + }, +/obj/item/clothing/under/tajaran/nka_uniform{ + pixel_x = 10 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/nka_base) +"AC" = ( +/obj/item/reagent_containers/glass/bucket/wood{ + pixel_y = 6; + pixel_x = 10 + }, +/turf/simulated/floor/tiled{ + temperature = 268.15 + }, +/area/nka_base) "BZ" = ( /obj/structure/closet/secure_closet/cabinet{ req_access = list(213); @@ -363,6 +513,25 @@ temperature = 268.15 }, /area/nka_base) +"Em" = ( +/obj/structure/table/standard, +/obj/item/device/flashlight/lamp/green{ + pixel_y = 12; + pixel_x = 5 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot{ + pixel_y = 10; + pixel_x = -7 + }, +/obj/item/stack/medical/bruise_pack/full, +/obj/item/reagent_containers/food/drinks/bottle/treebark_firewater{ + pixel_y = -16; + pixel_x = 9 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/nka_base) "Et" = ( /obj/structure/closet/cabinet, /obj/item/clothing/shoes/tajara/jackboots, @@ -388,10 +557,13 @@ }, /area/nka_base) "Fo" = ( +/obj/structure/curtain/black{ + pixel_y = -33 + }, /turf/simulated/floor/exoplanet/barren{ temperature = 268.15 }, -/area/exoplanet/adhomai) +/area/nka_base) "IG" = ( /obj/structure/closet/outhouse, /turf/simulated/floor/exoplanet/snow{ @@ -453,6 +625,21 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/item/key{ + key_data = "nka_armory"; + name = "armory key"; + pixel_x = 5 + }, +/obj/item/key{ + key_data = "nka_cell"; + name = "cell key"; + pixel_x = -5 + }, +/obj/item/key{ + key_data = "nka_commander"; + name = "officer room key"; + pixel_x = -5 + }, /turf/simulated/floor/wood{ temperature = 268.15 }, @@ -471,10 +658,8 @@ }, /area/nka_base) "Rg" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/wood{ +/obj/effect/map_effect/window_spawner/basic, +/turf/simulated/floor/tiled{ temperature = 268.15 }, /area/nka_base) @@ -495,6 +680,24 @@ temperature = 268.15 }, /area/nka_base) +"SZ" = ( +/obj/structure/table/standard, +/obj/item/reagent_containers/glass/rag/handkerchief, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/syringe, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/nka_base) +"TH" = ( +/obj/structure/bed/padded, +/obj/effect/decal/cleanable/blood/drip, +/obj/item/bedsheet/medical, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/nka_base) "Up" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, @@ -505,6 +708,13 @@ temperature = 268.15 }, /area/nka_base) +"Uz" = ( +/obj/item/torch, +/obj/effect/decal/cleanable/ash, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/nka_base) "UX" = ( /obj/structure/bed/stool/bar/padded/brown, /turf/simulated/floor/wood{ @@ -574,28 +784,31 @@ temperature = 268.15 }, /area/nka_base) +"YC" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/item/trash/tray, +/turf/simulated/floor/tiled{ + temperature = 268.15 + }, +/area/nka_base) "YD" = ( /obj/structure/table/wood, -/obj/item/key{ - key_data = "nka_armory"; - name = "armory key"; - pixel_x = 5 - }, -/obj/item/key{ - key_data = "nka_commander"; - name = "officer room key"; - pixel_x = -5 - }, /obj/machinery/light/small, +/obj/machinery/photocopier/faxmachine{ + department = "NKA Outpost"; + req_one_access = null + }, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/nka_base) (1,1,1) = {" -vi -vi -vi +DL +DL +DL vi vi vi @@ -627,9 +840,9 @@ vi vi "} (2,1,1) = {" -vi -vi -vi +DL +DL +DL vi vi vi @@ -661,9 +874,9 @@ vi vi "} (3,1,1) = {" -vi -vi -hT +DL +DL +pV vi vi vi @@ -695,9 +908,12 @@ vi vi "} (4,1,1) = {" -vi -vi -vi +DL +DL +DL +EK +EK +EK EK EK EK @@ -724,14 +940,11 @@ EK EK EK EK -vi -hT -vi "} (5,1,1) = {" -vi -vi -vi +DL +DL +DL CO CO CO @@ -757,14 +970,14 @@ DL DL DL DL +DL +DL +DL gU -vi -vi -vi "} (6,1,1) = {" -hT -vi +pV +DL lX CO St @@ -775,6 +988,9 @@ DL DL DL DL +hK +wy +Uz DL DL DL @@ -792,14 +1008,11 @@ DL DL DL gU -vi -vi -vi "} (7,1,1) = {" -vi -vi -vi +DL +DL +DL CO Xb mj @@ -825,21 +1038,20 @@ DL DL DL DL +DL +DL +DL gU -vi -vi -vi "} (8,1,1) = {" -Fo -Fo -Fo -oA +EP EP EP oA EP EP +oA +EP EP EP EP @@ -859,15 +1071,16 @@ EP EP EP DL +DL +DL +DL +DL gU -vi -vi -vi "} (9,1,1) = {" -Fo -Fo -Fo +EP +EP +EP gU DL DL @@ -891,23 +1104,22 @@ EP EP EP EP -EP +DL +DL +DL +DL DL gU -vi -vi -vi "} (10,1,1) = {" -Fo -Fo -Fo -oA +EP EP EP oA EP EP +oA +EP EP EP EP @@ -927,15 +1139,16 @@ EP EP EP DL +DL +DL +DL +DL gU -vi -vi -hT "} (11,1,1) = {" -vi -vi -vi +DL +DL +DL gU EK EK @@ -954,22 +1167,22 @@ DL DL DL DL -DL -DL +pb +jN DL EP EP -EP +DL +DL +DL +DL DL gU -vi -vi -vi "} (12,1,1) = {" -vi -vi -vi +DL +DL +DL gU DL DL @@ -993,17 +1206,17 @@ yB DL EP EP -EP -DL +yB +yB +yB +yB +yB gU -vi -vi -vi "} (13,1,1) = {" -vi -vi -vi +DL +DL +DL gU DL DL @@ -1027,24 +1240,24 @@ yB DL EP EP -EP -DL +yB +tI +mB +rV +yB gU -vi -vi -vi "} (14,1,1) = {" -vi -vi -vi +DL +DL +DL gU DL DL DL DL DL -DL +bK DL DL yB @@ -1061,17 +1274,17 @@ yB DL EP EP -EP -DL +WG +mB +mB +vd +yB gU -vi -vi -vi "} (15,1,1) = {" vi vi -vi +DL gU DL DL @@ -1083,7 +1296,7 @@ DL DL yB mb -mB +UX mB mB mB @@ -1094,18 +1307,18 @@ aa yB DL EP -EP -EP -DL +eF +yB +Em +TH +SZ +yB gU -vi -vi -vi "} (16,1,1) = {" -vi -vi -vi +DL +DL +DL gU DL DL @@ -1116,9 +1329,9 @@ DL DL DL yB +Ab Vy UX -Rg pB nc Et @@ -1129,17 +1342,17 @@ yB DL EP EP -EP -DL +yB +yB +yB +yB +yB gU -vi -vi -vi "} (17,1,1) = {" +DL vi -vi -vi +DL gU DL DL @@ -1163,85 +1376,85 @@ yB DL EP EP -EP +DL +DL +DL +DL DL gU -vi -vi -vi "} (18,1,1) = {" vi vi -vi -gU -DL -DL -DL -DL -DL -DL -DL -DL -DL -DL -DL -DL -DL -DL -DL -DL -DL -DL -DL -DL -EP -EP -EP DL gU -vi -vi -vi +DL +DL +DL +DL +DL +DL +DL +DL +DL +DL +DL +DL +DL +DL +DL +DL +DL +DL +DL +DL +EP +EP +DL +DL +DL +DL +DL +gU "} (19,1,1) = {" -vi -hT -vi -gU DL -DL -CO -CO -CO -CO -CO -CO -CO -DL -DL -CO -CO -CO -CO -CO -CO -CO -DL -DL -EP -EP -EP +pV +DL +gU +DL +DL +CO +CO +CO +CO +CO +CO +CO +DL +DL +CO +CO +CO +CO +CO +CO +CO +DL +DL +EP +EP +DL +DL +DL +DL DL gU -vi -vi -vi "} (20,1,1) = {" vi vi -vi +DL gU DL DL @@ -1265,17 +1478,17 @@ DL DL EP EP -EP +DL +DL +DL +pV DL gU -hT -vi -vi "} (21,1,1) = {" +DL vi -vi -vi +DL gU DL DL @@ -1299,17 +1512,17 @@ DL DL EP EP -EP +DL +DL +DL +DL DL gU -vi -vi -vi "} (22,1,1) = {" -vi -vi -vi +DL +DL +DL gU DL DL @@ -1333,17 +1546,17 @@ DL DL EP EP -EP +DL +DL +DL +DL DL gU -vi -vi -vi "} (23,1,1) = {" +DL vi -vi -vi +DL gU DL DL @@ -1367,17 +1580,17 @@ DL DL EP EP -EP +yB +yB +yB +yB DL gU -vi -vi -vi "} (24,1,1) = {" -vi -vi -vi +DL +DL +DL gU DL DL @@ -1400,18 +1613,18 @@ DL DL DL EP -EP -EP +Fo +Rg +gF +YC +yB DL gU -vi -vi -vi "} (25,1,1) = {" -vi -vi -vi +DL +DL +DL gU DL DL @@ -1435,17 +1648,17 @@ EP EP EP EP -EP +cM +Rb +AC +yB DL gU -vi -vi -vi "} (26,1,1) = {" -vi -vi -vi +DL +DL +DL gU DL DL @@ -1469,17 +1682,17 @@ EP EP EP EP -EP +yB +ak +ka +yB DL gU -vi -vi -vi "} (27,1,1) = {" -vi -vi -vi +DL +DL +DL gU DL DL @@ -1503,17 +1716,17 @@ EP EP EP EP -EP +yB +yB +yB +yB DL gU -vi -vi -vi "} (28,1,1) = {" -vi -vi -vi +DL +DL +DL gU DL DL @@ -1539,15 +1752,18 @@ DL DL DL DL +DL +DL +DL gU -vi -vi -hT "} (29,1,1) = {" -vi -hT -vi +DL +pV +DL +EK +EK +EK EK EK EK @@ -1574,14 +1790,11 @@ EK EK EK EK -vi -vi -vi "} (30,1,1) = {" -vi -vi -vi +DL +DL +DL vi vi vi @@ -1613,9 +1826,9 @@ vi vi "} (31,1,1) = {" -vi -vi -vi +DL +DL +DL vi vi vi @@ -1647,9 +1860,9 @@ vi vi "} (32,1,1) = {" -vi -vi -vi +DL +DL +DL vi hT vi diff --git a/maps/random_ruins/exoplanets/adhomai/pra_base.dmm b/maps/random_ruins/exoplanets/adhomai/pra_base.dmm index 8e4d2b8a8b7..f74ebbba4a5 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_base.dmm +++ b/maps/random_ruins/exoplanets/adhomai/pra_base.dmm @@ -20,10 +20,29 @@ /obj/effect/floor_decal/concrete{ dir = 6 }, +/obj/structure/sign/flag/pra{ + pixel_x = 32 + }, /turf/simulated/floor/concrete{ temperature = 268.15 }, /area/pra_base) +"bk" = ( +/obj/effect/floor_decal/concrete/large, +/obj/structure/bed/stool/bar/padded/red, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) +"bz" = ( +/obj/item/bedsheet/brown, +/obj/structure/bed/padded, +/obj/structure/curtain/open/bed, +/obj/machinery/light/small, +/turf/simulated/floor/carpet/art{ + temperature = 278.15 + }, +/area/pra_base) "bR" = ( /obj/structure/bed/stool/chair/office/dark{ dir = 4 @@ -55,6 +74,19 @@ temperature = 268.15 }, /area/pra_base) +"dy" = ( +/obj/structure/sign/flag/pra/right{ + pixel_x = 31; + dir = 4 + }, +/obj/structure/table/wood, +/obj/machinery/photocopier/faxmachine{ + req_access = list(209); + department = "PRA Outpost"; + req_one_access = null + }, +/turf/simulated/floor/wood, +/area/pra_base) "dH" = ( /obj/effect/floor_decal/concrete{ dir = 10 @@ -63,6 +95,22 @@ temperature = 268.15 }, /area/pra_base) +"dJ" = ( +/obj/structure/table/wood, +/obj/effect/floor_decal/concrete{ + dir = 9 + }, +/obj/item/storage/box/fancy/cigarettes/pra, +/obj/item/flame/lighter/adhomai{ + pixel_x = 17 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) "fq" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/light{ @@ -81,6 +129,20 @@ temperature = 268.15 }, /area/pra_base) +"fx" = ( +/obj/structure/table/wood, +/obj/effect/floor_decal/concrete/large, +/obj/item/spacecash/c10{ + pixel_y = 13; + pixel_x = -10 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pra{ + pixel_x = -16 + }, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) "fY" = ( /obj/structure/sign/flag/pra/left{ pixel_y = 32 @@ -89,6 +151,34 @@ temperature = 268.15 }, /area/pra_base) +"gh" = ( +/obj/effect/map_effect/window_spawner/reinforced/polarized{ + id = "pra_base" + }, +/turf/simulated/floor/wood, +/area/pra_base) +"gi" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/fountain/black, +/turf/simulated/floor/wood, +/area/pra_base) +"gP" = ( +/obj/effect/floor_decal/concrete{ + dir = 6 + }, +/obj/machinery/space_heater, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) +"gS" = ( +/obj/structure/bed/roller, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/pra_base) "gU" = ( /turf/simulated/wall/concrete, /area/pra_base) @@ -98,6 +188,15 @@ temperature = 268.15 }, /area/exoplanet/adhomai) +"jE" = ( +/obj/effect/floor_decal/concrete/large{ + dir = 8 + }, +/obj/structure/bed/stool/bar/padded/red, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) "jF" = ( /obj/effect/floor_decal/concrete/large/cee{ dir = 8 @@ -128,10 +227,25 @@ identifier = "pra_base_soldier"; name = "igs - pra_base_soldier" }, +/obj/item/bedsheet/brown, /turf/simulated/floor/concrete/square{ temperature = 268.15 }, /area/pra_base) +"ly" = ( +/obj/structure/sign/flag/pra/left{ + pixel_x = 31; + dir = 4 + }, +/obj/structure/bed/stool/chair/wood{ + dir = 8 + }, +/obj/effect/ghostspawpoint{ + identifier = "pra_base_commissar"; + name = "igs - pra_base_commissar" + }, +/turf/simulated/floor/wood, +/area/pra_base) "lC" = ( /obj/machinery/light{ dir = 1 @@ -215,6 +329,15 @@ temperature = 268.15 }, /area/exoplanet/adhomai) +"na" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/machinery/light, +/turf/simulated/floor/tiled/white, +/area/pra_base) "nc" = ( /obj/structure/table/standard, /obj/structure/sign/flag/pra{ @@ -238,6 +361,30 @@ temperature = 268.15 }, /area/pra_base) +"oE" = ( +/obj/structure/barricade/metal/wired{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/pra_base) +"oO" = ( +/obj/structure/closet/walllocker/medical{ + pixel_y = 30 + }, +/obj/item/stack/medical/splint/full, +/obj/item/stack/medical/splint/full, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/box/syringes, +/obj/item/clothing/suit/storage/hooded/tajaran/surgery, +/obj/item/clothing/mask/breath/medical, +/obj/item/tank/anesthetic, +/obj/item/storage/box/bodybags, +/turf/simulated/floor/tiled/white, +/area/pra_base) "pB" = ( /obj/structure/sign/painting_frame/hadii{ pixel_x = 32 @@ -246,6 +393,13 @@ temperature = 268.15 }, /area/pra_base) +"pN" = ( +/obj/machinery/door/airlock/command{ + req_access = list(209); + name = "Commissar's Office" + }, +/turf/simulated/floor/wood, +/area/pra_base) "pS" = ( /obj/effect/floor_decal/concrete{ dir = 8 @@ -281,6 +435,9 @@ /obj/effect/floor_decal/concrete/large{ dir = 1 }, +/obj/item/storage/box/folders{ + pixel_y = 13 + }, /turf/simulated/floor/concrete{ temperature = 268.15 }, @@ -305,6 +462,15 @@ temperature = 268.15 }, /area/pra_base) +"rN" = ( +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/obj/structure/extinguisher_cabinet{ + pixel_y = 31 + }, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) "tc" = ( /obj/effect/floor_decal/concrete/large{ dir = 4 @@ -313,6 +479,16 @@ temperature = 268.15 }, /area/pra_base) +"tn" = ( +/obj/structure/table/steel, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/fire{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/storage/pill_bottle/dylovene, +/turf/simulated/floor/tiled/white, +/area/pra_base) "tT" = ( /obj/machinery/door/airlock/security{ name = "Meeting Room"; @@ -323,6 +499,18 @@ temperature = 268.15 }, /area/pra_base) +"um" = ( +/obj/machinery/washing_machine, +/obj/effect/floor_decal/concrete{ + dir = 6 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) "uO" = ( /obj/machinery/light, /obj/structure/sign/flag/pra{ @@ -337,12 +525,31 @@ temperature = 268.15 }, /area/exoplanet/adhomai) -"vQ" = ( -/obj/effect/ghostspawpoint{ - identifier = "pra_base_commissar"; - name = "igs - pra_base_commissar" +"vD" = ( +/obj/structure/table/steel, +/obj/item/storage/box/fancy/tray/machinist{ + name = "PRA operation tray"; + desc = "A tray of various mundane surgical instruments for fixing someone up when they've been shot." }, -/turf/simulated/floor/concrete/square{ +/turf/simulated/floor/tiled/white, +/area/pra_base) +"vF" = ( +/obj/structure/sign/emergency/meetingpoint{ + name = "\improper AID STATION sign"; + desc = "A green sign which showcases the location of a medical aid station."; + pixel_y = -29 + }, +/obj/machinery/light, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/pra_base) +"vQ" = ( +/obj/effect/floor_decal/concrete{ + dir = 5 + }, +/obj/structure/bed/stool/bar/padded/red, +/turf/simulated/floor/concrete{ temperature = 268.15 }, /area/pra_base) @@ -356,6 +563,9 @@ /obj/effect/floor_decal/concrete/large{ dir = 4 }, +/obj/item/storage/box/lights{ + pixel_y = 18 + }, /turf/simulated/floor/concrete{ temperature = 268.15 }, @@ -370,11 +580,14 @@ }, /area/pra_base) "wK" = ( -/obj/structure/bed/stool/bar/padded/red, +/obj/machinery/space_heater, /turf/simulated/floor/concrete/square{ temperature = 268.15 }, /area/pra_base) +"xi" = ( +/turf/simulated/floor/wood, +/area/pra_base) "xj" = ( /obj/item/ammo_magazine/mc9mm, /obj/item/ammo_magazine/mc9mm, @@ -405,6 +618,11 @@ temperature = 268.15 }, /area/pra_base) +"yi" = ( +/turf/simulated/floor/carpet/art{ + temperature = 278.15 + }, +/area/pra_base) "yB" = ( /obj/structure/closet/secure_closet/guncabinet{ req_access = list(209); @@ -421,6 +639,15 @@ temperature = 268.15 }, /area/pra_base) +"zb" = ( +/obj/structure/table/wood, +/obj/item/spacecash/c1{ + pixel_y = -4 + }, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) "zC" = ( /obj/item/storage/field_ration/army, /obj/item/storage/field_ration/army, @@ -454,15 +681,36 @@ temperature = 268.15 }, /area/pra_base) +"Bq" = ( +/obj/structure/table/standard, +/obj/structure/bedsheetbin{ + pixel_y = 10 + }, +/obj/effect/floor_decal/concrete{ + dir = 9 + }, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) "BZ" = ( /obj/machinery/light{ dir = 4; status = 2 }, +/obj/structure/barricade/metal/wired{ + dir = 4 + }, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/pra_base) +"CG" = ( +/obj/structure/sign/flag/pra{ + pixel_y = 30 + }, +/turf/simulated/floor/wood, +/area/pra_base) "CO" = ( /obj/machinery/light{ dir = 8 @@ -482,6 +730,12 @@ temperature = 268.15 }, /area/pra_base) +"Dp" = ( +/obj/machinery/door/airlock/medical{ + name = "Medical Center" + }, +/turf/simulated/floor/tiled/white, +/area/pra_base) "DB" = ( /obj/machinery/light{ dir = 8 @@ -547,8 +801,7 @@ /area/pra_base) "EK" = ( /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /obj/structure/table/steel, /obj/item/material/ashtray/bronze, @@ -563,6 +816,15 @@ temperature = 268.15 }, /area/pra_base) +"EM" = ( +/obj/effect/floor_decal/concrete{ + dir = 10 + }, +/obj/structure/bed/stool/bar/padded/red, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) "EP" = ( /obj/machinery/light{ dir = 4; @@ -572,6 +834,16 @@ temperature = 268.15 }, /area/pra_base) +"Fk" = ( +/obj/structure/table/wood, +/obj/item/device/binoculars{ + pixel_y = 8 + }, +/obj/item/device/flashlight/lamp/green, +/turf/simulated/floor/carpet/art{ + temperature = 278.15 + }, +/area/pra_base) "Fo" = ( /turf/simulated/floor/concrete{ temperature = 268.15 @@ -601,6 +873,16 @@ temperature = 268.15 }, /area/pra_base) +"GV" = ( +/obj/structure/table/wood, +/obj/item/spacecash/c10{ + pixel_x = -6; + pixel_y = -10 + }, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) "HY" = ( /obj/effect/floor_decal/concrete{ dir = 6 @@ -609,6 +891,12 @@ temperature = 268.15 }, /area/exoplanet/adhomai) +"If" = ( +/obj/item/pipe, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/pra_base) "Iq" = ( /obj/structure/sign/flag/pra/left{ pixel_y = 32 @@ -618,6 +906,10 @@ temperature = 268.15 }, /area/pra_base) +"IL" = ( +/obj/machinery/iv_drip, +/turf/simulated/floor/tiled/white, +/area/pra_base) "Jc" = ( /obj/machinery/light, /turf/simulated/floor/exoplanet/snow{ @@ -647,11 +939,47 @@ temperature = 268.15 }, /area/pra_base) +"JI" = ( +/obj/structure/table/wood, +/obj/effect/floor_decal/concrete{ + dir = 9 + }, +/obj/item/reagent_containers/food/drinks/bottle/victorygin{ + pixel_y = 10 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) +"JK" = ( +/obj/structure/table/wood, +/obj/machinery/button/switch/windowtint{ + dir = 4; + pixel_x = -4; + pixel_y = 7; + id = "pra_base" + }, +/obj/item/stamp{ + name = "people's republic of adhomai stamp"; + icon_state = "stamp-zavod"; + pixel_x = 6 + }, +/obj/item/stamp/denied{ + pixel_x = -4 + }, +/turf/simulated/floor/wood, +/area/pra_base) "Lb" = ( /obj/machinery/light, /obj/structure/sign/flag/pra{ pixel_y = -32 }, +/obj/machinery/floodlight{ + dir = 1 + }, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -665,6 +993,16 @@ temperature = 268.15 }, /area/pra_base) +"Lp" = ( +/obj/structure/reagent_dispensers/coolanttank{ + reagents_to_add = list(/singleton/reagent/water=1000); + name = "heated water tank"; + desc = "A tank of water filed by melting local snow." + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/pra_base) "Lu" = ( /obj/effect/floor_decal/concrete{ dir = 9 @@ -688,6 +1026,16 @@ temperature = 268.15 }, /area/pra_base) +"Ns" = ( +/obj/structure/table/wood, +/obj/effect/floor_decal/concrete{ + dir = 10 + }, +/obj/item/storage/pill_bottle/dice/tajara, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) "NP" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/structure/closet/secure_closet/guncabinet{ @@ -711,6 +1059,12 @@ temperature = 268.15 }, /area/pra_base) +"Oc" = ( +/obj/structure/sign/painting_frame/hadii{ + pixel_y = 32 + }, +/turf/simulated/floor/wood, +/area/pra_base) "Or" = ( /obj/structure/sign/flag/pra/right{ pixel_y = 32 @@ -720,6 +1074,39 @@ temperature = 268.15 }, /area/pra_base) +"OF" = ( +/obj/structure/table/steel, +/obj/item/storage/box/masks{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/box/gloves, +/obj/item/reagent_containers/hypospray{ + pixel_y = 4; + pixel_x = -5 + }, +/turf/simulated/floor/tiled/white, +/area/pra_base) +"PS" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/shoes/tajara/jackboots, +/obj/item/clothing/accessory/holster/hip, +/obj/item/storage/backpack/satchel/leather, +/obj/item/device/radio/headset/ship, +/obj/item/clothing/accessory/badge/pra_passport, +/obj/item/ammo_magazine/a50, +/obj/item/ammo_magazine/a50, +/obj/item/storage/box/hadii_manifesto, +/obj/item/storage/box/hadii_card, +/obj/item/device/megaphone, +/obj/item/clothing/accessory/hadii_pin, +/obj/item/flame/lighter/adhomai, +/obj/item/clothing/under/tajaran/army_commissar, +/obj/item/clothing/head/tajaran/army_commissar, +/turf/simulated/floor/carpet/art{ + temperature = 278.15 + }, +/area/pra_base) "Qx" = ( /obj/structure/bed/stool/bar/padded/red, /turf/simulated/floor/concrete{ @@ -764,6 +1151,18 @@ temperature = 268.15 }, /area/pra_base) +"Sc" = ( +/obj/machinery/floodlight{ + dir = 8; + pixel_x = 10 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/pra_base) +"Se" = ( +/turf/simulated/floor/tiled/white, +/area/pra_base) "Sr" = ( /turf/simulated/floor/concrete{ temperature = 268.15 @@ -802,6 +1201,17 @@ temperature = 268.15 }, /area/pra_base) +"Uc" = ( +/obj/effect/decal/fake_object{ + icon = 'icons/obj/cooking_machines.dmi'; + icon_state = "adhomai_stove_on"; + name = "water heater"; + desc = "A rustic Adhomian heater typically filled with firewood This one is connected to a nearby water tank. Warm enough to gather around the winter." + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/pra_base) "Up" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/structure/closet/secure_closet/guncabinet{ @@ -809,10 +1219,45 @@ name = "gun cabinet (icelance)" }, /obj/item/gun/energy/rifle/icelance, +/obj/item/clothing/accessory/storage/bayonet, /turf/simulated/floor/concrete/square{ temperature = 268.15 }, /area/pra_base) +"UF" = ( +/obj/machinery/button/remote/blast_door{ + id = "pra_camp_entry"; + name = "Entry"; + req_access = list(209); + pixel_y = 32 + }, +/obj/effect/floor_decal/concrete{ + dir = 5 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 8 + }, +/obj/item/storage/toolbox/electrical, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) +"UU" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/filingcabinet{ + pixel_x = -9; + pixel_y = 14; + density = 0 + }, +/obj/structure/filingcabinet{ + pixel_x = 5; + pixel_y = 14; + density = 0 + }, +/turf/simulated/floor/wood, +/area/pra_base) "UX" = ( /obj/structure/table/standard, /obj/structure/sign/painting_frame/hadii{ @@ -823,6 +1268,12 @@ temperature = 268.15 }, /area/pra_base) +"Vj" = ( +/obj/machinery/papershredder, +/turf/simulated/floor/carpet/art{ + temperature = 278.15 + }, +/area/pra_base) "Vy" = ( /obj/structure/closet/secure_closet/guncabinet{ req_access = list(209); @@ -857,6 +1308,10 @@ /obj/effect/floor_decal/industrial/outline/blue, /obj/item/gun/projectile/automatic/rifle/adhomian, /obj/item/gun/projectile/automatic/rifle/adhomian, +/obj/item/clothing/accessory/storage/bayonet, +/obj/item/clothing/accessory/storage/bayonet, +/obj/item/clothing/accessory/storage/bayonet, +/obj/item/clothing/accessory/storage/bayonet, /turf/simulated/floor/concrete/square{ temperature = 268.15 }, @@ -872,6 +1327,7 @@ "WG" = ( /obj/structure/bed/padded, /obj/structure/curtain/open/bed, +/obj/item/bedsheet/brown, /turf/simulated/floor/concrete/square{ temperature = 268.15 }, @@ -884,24 +1340,27 @@ /obj/effect/floor_decal/industrial/outline/blue, /obj/item/gun/projectile/shotgun/pump/rifle, /obj/item/gun/projectile/shotgun/pump/rifle, +/obj/item/clothing/accessory/storage/bayonet, +/obj/item/clothing/accessory/storage/bayonet, /turf/simulated/floor/concrete/square{ temperature = 268.15 }, /area/pra_base) "Xb" = ( /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/table/steel, /obj/item/material/ashtray/bronze, /obj/structure/sign/painting_frame/hadii{ pixel_y = 32 }, -/obj/item/handcuffs, /obj/effect/floor_decal/concrete/large{ dir = 1 }, +/obj/item/folder/yellow, +/obj/item/folder/yellow, +/obj/item/handcuffs, /turf/simulated/floor/concrete{ temperature = 268.15 }, @@ -938,6 +1397,30 @@ temperature = 268.15 }, /area/pra_base) +"YL" = ( +/obj/effect/floor_decal/concrete{ + dir = 6 + }, +/obj/effect/floor_decal/concrete/large{ + dir = 4 + }, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) +"YU" = ( +/obj/structure/bed/roller, +/turf/simulated/floor/tiled/white, +/area/pra_base) +"YY" = ( +/obj/item/storage/secure/safe{ + pixel_y = 36 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/pra_base) "ZR" = ( /obj/effect/floor_decal/concrete/large{ dir = 1 @@ -1104,10 +1587,10 @@ wB wB wB wB -wB -wB -wB -wB +jE +dJ +JI +bk wB wB wB @@ -1138,10 +1621,10 @@ wB wB wB wB -wB -wB -wB -wB +vQ +zb +fx +EM wB wB wB @@ -1151,8 +1634,8 @@ wB gU gU gU -wB -wB +Bq +Go wB gU vi @@ -1172,10 +1655,10 @@ wB wB wB wB -wB -wB -wB -wB +vQ +GV +Ns +EM wB wB wB @@ -1185,8 +1668,8 @@ wB gU Rd gU -wB -wB +um +tc wB gU vi @@ -1306,12 +1789,12 @@ gU bU wB wB -wB -wB -wB +oE +oE +oE BZ -wB -wB +Sc +Sc wB wB Wc @@ -1334,7 +1817,7 @@ vi vi vi gU -St +UF DL gU lC @@ -1584,7 +2067,7 @@ CO Lu kq gU -wB +rN wB Wc Sr @@ -1679,7 +2162,7 @@ wB wB gU UX -vQ +NW Wc Qx Qx @@ -1756,9 +2239,9 @@ ca gU gU wB -ZR -EJ -tc +Wc +Sr +dH wB gU gU @@ -1785,20 +2268,20 @@ EP ZR EJ aJ -EJ +gP wC gU wB wB +Wc +Sr +dH wB wB wB -wB -wB -wB -wB -wB -wB +Lp +If +Uc wB gU vi @@ -1816,23 +2299,23 @@ wB gU gU gU +pN +gh +gU +gU +gU +gU +wB +wB +Wc +Sr +dH +wB gU gU gU gU gU -gU -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB wB gU vi @@ -1848,25 +2331,25 @@ wB wB wB wB +gU +UU +xi +xi +Vj +PS +gU wB wB wB +Wc +Sr +dH wB -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB +gU +gS +Se +tn +gU wB gU vi @@ -1882,25 +2365,25 @@ wB wB wB wB +gU +CG +xi +xi +yi +yi +gU wB wB wB -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB -wB +Wc +Sr +dH +vF +gU +vD +Se +OF +gU wB gU vi @@ -1912,30 +2395,30 @@ vi hT vi gU +wB +wB +wB +wB gU +Oc +JK +gi +yi +Fk gU +wB +wB +wB +Wc +Sr +Sr +nw +Dp +Se +Se +na gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU +wB gU vi vi @@ -1945,32 +2428,32 @@ vi vi vi vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -hT -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi +gU +wB +wB +wB +wB +gU +YY +ly +dy +yi +bz +gh +wB +wB +wB +ZR +EJ +YL +Jc +gU +oO +Se +Se +gU +wB +gU vi vi vi @@ -1979,32 +2462,32 @@ vi vi vi vi -vi -vi -vi -vi -vi -vi -hT -vi -vi -vi -vi -vi -vi -vi -vi -vi -hT -vi -vi -vi -vi -vi -vi -vi -hT -vi +gU +wB +wB +wB +wB +gU +gU +gU +gU +gU +gU +gU +wB +wB +wB +wB +wB +wB +wB +gU +gS +IL +YU +gU +wB +gU vi vi vi @@ -2013,6 +2496,124 @@ vi vi vi vi +gU +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +gU +gU +gU +gU +gU +wB +gU +vi +vi +vi +"} +(33,1,1) = {" +vi +vi +vi +gU +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +wB +gU +vi +vi +vi +"} +(34,1,1) = {" +vi +vi +vi +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +gU +vi +vi +vi +"} +(35,1,1) = {" +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi vi hT vi @@ -2026,20 +2627,4 @@ vi vi vi vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi -vi "} diff --git a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm index e64093df672..2d2aaf126f4 100644 --- a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm +++ b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm @@ -63,4 +63,4 @@ l_pocket = /obj/item/device/radio /datum/outfit/admin/psis_outpost/get_id_access() - return list(access_pra) \ No newline at end of file + return list(access_pra) diff --git a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm index f5ff9b468ef..619618a41a9 100644 --- a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm +++ b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm @@ -16,6 +16,17 @@ temperature = 268.15 }, /area/psis_outpost) +"bE" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -24 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/psis_outpost) "ch" = ( /obj/machinery/door/airlock{ req_access = list(209); @@ -46,6 +57,16 @@ temperature = 268.15 }, /area/psis_outpost) +"dw" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/structure/table/standard, +/obj/machinery/chemical_dispenser/coffeemaster, +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/psis_outpost) "dO" = ( /obj/structure/table/standard, /obj/item/melee/baton/stunrod, @@ -108,6 +129,30 @@ temperature = 268.15 }, /area/psis_outpost) +"fF" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/structure/sign/flag/pra{ + pixel_x = 32 + }, +/obj/structure/closet/crate/bin, +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/psis_outpost) +"fL" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/structure/sign/flag/pra{ + pixel_x = -32 + }, +/obj/machinery/papershredder, +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/psis_outpost) "gi" = ( /obj/structure/bed/stool/chair/office/dark{ dir = 4 @@ -152,11 +197,17 @@ dir = 6 }, /obj/item/stamp{ - pixel_y = 7 + pixel_y = 7; + name = "people's secret intelligence service stamp"; + icon_state = "stamp-zavod" }, /obj/item/stamp/denied{ pixel_y = -2 }, +/obj/item/flame/lighter/adhomai{ + pixel_y = 10; + pixel_x = 9 + }, /turf/simulated/floor/tiled/dark{ temperature = 268.15 }, @@ -173,13 +224,13 @@ }, /area/psis_outpost) "jx" = ( -/obj/structure/blocker/steel/fence{ - dir = 4 +/obj/structure/sign/securearea{ + pixel_y = 32 }, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, -/area/exoplanet/adhomai) +/area/psis_outpost) "jO" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/red/full, @@ -189,6 +240,7 @@ /obj/structure/sign/flag/pra/left{ pixel_y = -32 }, +/obj/item/folder/red, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pra{ pixel_y = 5; pixel_x = 8 @@ -260,7 +312,7 @@ /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, -/area/exoplanet/adhomai) +/area/psis_outpost) "oR" = ( /obj/structure/table/standard, /obj/item/device/flashlight/lamp, @@ -289,13 +341,13 @@ }, /area/psis_outpost) "qB" = ( -/obj/structure/sign/securearea{ - pixel_y = 32 +/obj/structure/blocker/steel/fence{ + dir = 4 }, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, -/area/exoplanet/adhomai) +/area/psis_outpost) "qO" = ( /obj/effect/floor_decal/corner/black{ dir = 8 @@ -331,6 +383,16 @@ temperature = 268.15 }, /area/psis_outpost) +"tu" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12; + pixel_y = 8 + }, +/turf/simulated/floor/reinforced{ + temperature = 268.15 + }, +/area/psis_outpost) "up" = ( /obj/machinery/button/remote/blast_door{ id = "psis_outpost_shutter"; @@ -409,6 +471,9 @@ dir = 10 }, /obj/machinery/light, +/obj/item/storage/box/lights{ + pixel_y = 14 + }, /turf/simulated/floor/tiled/dark{ temperature = 268.15 }, @@ -510,9 +575,6 @@ temperature = 268.15 }, /area/exoplanet/adhomai) -"Hq" = ( -/turf/simulated/wall/r_wall, -/area/exoplanet/adhomai) "Iy" = ( /obj/machinery/door/window/brigdoor{ dir = 8; @@ -557,7 +619,8 @@ /obj/structure/table/standard, /obj/machinery/photocopier/faxmachine{ req_one_access = null; - req_access = list(209) + req_access = list(209); + department = "Unknown Signal" }, /obj/effect/floor_decal/corner/red{ dir = 9 @@ -573,36 +636,21 @@ /obj/effect/floor_decal/corner/red{ dir = 5 }, -/mob/living/simple_animal/hostile/commanded/dog/harron/cybernetic, -/turf/simulated/floor/tiled/dark{ +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/radiation, +/obj/machinery/vending/medical{ + req_access = null; + pixel_y = 31 + }, +/turf/simulated/floor/holofloor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) "Kl" = ( -/obj/effect/floor_decal/corner/red{ - dir = 5 - }, -/obj/structure/closet/secure_closet/guncabinet{ - req_access = list(209) - }, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/gun/projectile/shotgun/pump/rifle, -/obj/item/gun/projectile/shotgun/pump/rifle, -/obj/item/gun/projectile/shotgun/pump/rifle, -/obj/item/gun/projectile/automatic/tommygun, -/obj/item/ammo_magazine/submachinedrum, -/obj/structure/sign/painting_frame/hadii{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/dark{ +/turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/psis_outpost) @@ -637,9 +685,40 @@ temperature = 268.15 }, /area/psis_outpost) +"Mm" = ( +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/obj/machinery/light, +/obj/item/storage/box/folders, +/obj/structure/closet/crate, +/obj/item/storage/box/folders, +/obj/item/storage/box/folders, +/obj/item/storage/field_ration, +/obj/item/storage/field_ration, +/obj/item/storage/field_ration, +/obj/item/storage/field_ration, +/obj/item/storage/field_ration, +/obj/item/storage/field_ration, +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/psis_outpost) "Mq" = ( /turf/simulated/wall/r_wall, /area/psis_outpost) +"MW" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/structure/sign/flag/pra{ + pixel_y = 32 + }, +/mob/living/simple_animal/hostile/commanded/dog/harron/cybernetic, +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/psis_outpost) "Nf" = ( /obj/effect/floor_decal/corner/black{ dir = 5 @@ -749,6 +828,14 @@ temperature = 268.15 }, /area/psis_outpost) +"Ss" = ( +/obj/structure/sign/securearea{ + pixel_y = -32 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/psis_outpost) "Tn" = ( /turf/simulated/floor/tiled/dark{ temperature = 268.15 @@ -914,10 +1001,22 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/bedsheetbin, /turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) +"Ys" = ( +/obj/item/storage/toolbox/mechanical{ + pixel_y = -7 + }, +/obj/item/storage/toolbox/electrical{ + pixel_y = 10 + }, +/turf/simulated/floor/reinforced{ + temperature = 268.15 + }, +/area/psis_outpost) "YB" = ( /obj/effect/floor_decal/corner/black{ dir = 4 @@ -941,6 +1040,36 @@ temperature = 268.15 }, /area/psis_outpost) +"ZP" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/structure/closet/secure_closet/guncabinet{ + req_access = list(209) + }, +/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/boltaction, +/obj/item/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/projectile/automatic/tommygun, +/obj/item/ammo_magazine/submachinedrum, +/obj/structure/sign/painting_frame/hadii{ + pixel_y = 32 + }, +/obj/item/gun/energy/rifle/icelance, +/obj/item/gun/energy/pistol, +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/psis_outpost) (1,1,1) = {" Hg @@ -1014,7 +1143,7 @@ Hg Hg Hg Hg -Hq +Mq on on on @@ -1039,7 +1168,7 @@ on on on on -Hq +Mq Hg Hg Hg @@ -1048,32 +1177,32 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1082,32 +1211,32 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1116,32 +1245,32 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1150,32 +1279,32 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -lg -Mq -Mq -Mq -Mq -Mq -Mq -Mq qB -Hg -Hg -Hg -Hg -Hg -Hg -Hg +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Ss +Mq +Mq +Mq +Mq +Mq +Mq +Mq jx +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg CC Hg @@ -1184,16 +1313,16 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl Mq Tx RO @@ -1201,15 +1330,15 @@ RM JZ jO Mq -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1218,16 +1347,16 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl Mq Xc eJ @@ -1235,15 +1364,15 @@ Tn eJ Fc Mq -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1252,32 +1381,32 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Mq +qB Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Mq +ZP Tn Tn Tn Bh Mq -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1286,16 +1415,16 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl Mq lH gi @@ -1303,15 +1432,15 @@ Tn gi VE Mq -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg hQ Hg @@ -1320,16 +1449,16 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl Mq ft iI @@ -1337,15 +1466,15 @@ WA WP ml Mq -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1354,15 +1483,15 @@ Hg WW Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl Mq Mq Mq @@ -1372,14 +1501,14 @@ Mq Mq Mq Mq -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1388,10 +1517,10 @@ Hg Hg Hg Hg -jx -Hg -Hg -lg +qB +Kl +Kl +Ss Mq Mq Mq @@ -1399,11 +1528,11 @@ Mq Mq Mq Gq -el -KR -el +bE KR el +fL +dw Qx Mq Mq @@ -1411,9 +1540,9 @@ Mq Mq Mq Mq -qB -Hg jx +Kl +qB Hg WW Hg @@ -1422,10 +1551,10 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg +qB +Kl +Kl +Kl Mq lf wW @@ -1445,9 +1574,9 @@ zx uN PT Mq -Hg -Hg -jx +Kl +Kl +qB Hg Hg Hg @@ -1456,9 +1585,9 @@ Hg Hg Hg lg -Hq -Hg -Hg +Mq +Kl +Kl om Mq Tn @@ -1477,11 +1606,11 @@ Mq BW ZG ZG -ZG +Ys Mq -Hg -Hg -jx +Kl +Kl +qB Hg Hg Hg @@ -1490,10 +1619,10 @@ Hg Hg Hg Hg -Hg -Hg -Hg -Hg +Kl +Kl +Kl +Kl Cz Qq Tn @@ -1513,9 +1642,9 @@ ZG ZG Cg Mq -Hg -Hg -jx +Kl +Kl +qB Hg Hg Hg @@ -1524,9 +1653,9 @@ Hg Hg Hg lg -Hq -Hg -Hg +Mq +Kl +Kl om Mq up @@ -1534,7 +1663,7 @@ Tn Tn Tn Mq -Pk +MW qO KF Mq @@ -1547,9 +1676,9 @@ ZG ZG ZG Mq -Hg -Hg -jx +Kl +Kl +qB Hg Hg Hg @@ -1558,10 +1687,10 @@ Hg CC Hg Hg -jx -Hg -Hg -Hg +qB +Kl +Kl +Kl Mq lf Hc @@ -1574,16 +1703,16 @@ qO Gu Vr Tn -WD +Mm Mq TS dO JG oR Mq -Hg -Hg -jx +Kl +Kl +qB Hg Hg hQ @@ -1592,10 +1721,10 @@ hQ Hg Hg Hg -jx -Hg -Hg -lg +qB +Kl +Kl +Ss Mq Mq Mq @@ -1606,7 +1735,7 @@ Xm vL Lo WA -Lo +fF WA wx Mq @@ -1615,9 +1744,9 @@ Mq Mq Mq Mq -qB -Hg jx +Kl +qB Hg Hg Hg @@ -1626,15 +1755,15 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl Mq Mq Mq @@ -1644,14 +1773,14 @@ Mq Mq Mq Mq -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1660,16 +1789,16 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl Mq XU yD @@ -1677,15 +1806,15 @@ Tn yD jt Mq -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1694,16 +1823,16 @@ Hg WW Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl Mq gq Tn @@ -1711,15 +1840,15 @@ Tn Tn YO Mq -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1728,16 +1857,16 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl Mq Iy NA @@ -1745,15 +1874,15 @@ NA NA NA Mq -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg WW @@ -1762,16 +1891,16 @@ WW Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl Mq OX ZG @@ -1779,15 +1908,15 @@ qx ZG ZG Mq -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1796,32 +1925,32 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl Mq as -ZG +tu to qx ah Mq -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB CC Hg Hg @@ -1830,32 +1959,32 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -lg -Mq -Mq -Mq -Mq -Mq -Mq -Mq qB -Hg -Hg -Hg -Hg -Hg -Hg -Hg +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Ss +Mq +Mq +Mq +Mq +Mq +Mq +Mq jx +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1864,32 +1993,32 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1898,32 +2027,32 @@ Hg Hg Hg Hg -jx -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -Hg -jx +qB +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +qB Hg Hg Hg @@ -1932,7 +2061,7 @@ Hg Hg Hg Hg -Hq +Mq on on on @@ -1957,7 +2086,7 @@ on on on on -Hq +Mq Hg hQ Hg diff --git a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm index 2b67a064af7..c30be62e87f 100644 --- a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm +++ b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm @@ -551,15 +551,13 @@ /area/raskara_okon/observatory) "ht" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/structure/cable/green{ d1 = 1; @@ -611,6 +609,16 @@ temperature = 278.15 }, /area/raskara_okon/eva) +"is" = ( +/obj/structure/table/stone/marble, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/reagentgrinder{ + pixel_y = 6 + }, +/turf/simulated/floor/tiled/white{ + temperature = 278.15 + }, +/area/raskara_okon/mess_hall) "ix" = ( /obj/effect/floor_decal/corner/red{ dir = 5 @@ -645,6 +653,13 @@ temperature = 278.15 }, /area/raskara_okon/eva) +"iP" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/appliance/cooker/oven, +/turf/simulated/floor/tiled/white{ + temperature = 278.15 + }, +/area/raskara_okon/mess_hall) "iS" = ( /turf/simulated/floor{ temperature = 278.15 @@ -944,8 +959,7 @@ "lr" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/cable/green{ d1 = 4; @@ -1192,8 +1206,7 @@ /area/raskara_okon/eva) "pD" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/machinery/light{ dir = 8 @@ -1286,8 +1299,7 @@ /area/raskara_okon/laboratory) "qm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1467,8 +1479,7 @@ /area/raskara_okon/mess_hall) "td" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/meter, /obj/structure/cable/green{ @@ -1548,6 +1559,7 @@ /obj/structure/toilet{ dir = 4 }, +/obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/freezer{ temperature = 278.15 }, @@ -1711,8 +1723,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1948,8 +1959,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/structure/plasticflaps/mining, /obj/machinery/conveyor{ @@ -2149,8 +2159,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -2636,6 +2645,8 @@ /obj/item/reagent_containers/food/drinks/carton/fatshouters, /obj/item/reagent_containers/food/drinks/carton/fatshouters, /obj/item/reagent_containers/food/drinks/carton/fatshouters, +/obj/item/storage/box/fancy/egg_box, +/obj/item/storage/box/fancy/egg_box, /turf/simulated/floor/tiled/white{ temperature = 278.15 }, @@ -2697,8 +2708,7 @@ /area/raskara_okon/observatory) "JM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -3625,8 +3635,7 @@ /area/raskara_okon/observatory) "Wh" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3674,8 +3683,7 @@ /area/raskara_okon/laboratory) "WE" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -3692,8 +3700,7 @@ /area/raskara_okon/entry) "WG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/tiled/steel{ temperature = 278.15 @@ -4075,12 +4082,12 @@ HX HX HX Ag -XM +iP Lk Cc Ze Ic -wx +is fq ef Ag @@ -4147,7 +4154,7 @@ Oa Oa Oa Oa -Oa +XM wx eS Ql