From 1d316f44f7236c96b979a7edd7d6ee286e52ffbc Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Mon, 10 Jun 2024 08:09:46 -0400 Subject: [PATCH] Ouerea NT Ruins Locker Loot (#19325) NT ruins at Ouerea no longer has certain loot that was acquirable from the RD locker (esp the radios....) Minor refactor of locker code to allow this --------- Co-authored-by: Ben10083 --- .../structures/crates_lockers/closets.dm | 51 +- .../closets/secure/scientist.dm | 8 + html/changelogs/Ben10083 - NT Ruins.yml | 58 +++ .../exoplanets/ouerea/ouerea_nt_ruin.dm | 4 + .../exoplanets/ouerea/ouerea_nt_ruin.dmm | 439 +++++++++++++----- 5 files changed, 413 insertions(+), 147 deletions(-) create mode 100644 html/changelogs/Ben10083 - NT Ruins.yml diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index ff7776c5653..438789e7faa 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -8,28 +8,37 @@ slowdown = 5 var/icon_door = null - var/icon_door_override = FALSE //override to have open overlay use icon different to its base's - var/icon_door_overlay = "" //handles secure locker overlays like the locking lights + /// Override to have open overlay use icon different to its base's + var/icon_door_override = FALSE + /// Handles secure locker overlays like the locking lights + var/icon_door_overlay = "" - var/secure = FALSE //secure locker or not. typically it shouldn't need lights if it's insecure - var/secure_lights = FALSE // whether to display secure lights when open. + /// Secure locker or not. typically it shouldn't need lights if it's insecure + var/secure = FALSE + /// Whether to display secure lights when open. + var/secure_lights = FALSE var/opened = FALSE var/welded = FALSE var/locked = FALSE var/broken = FALSE - var/large = TRUE // if you can shove people in it - var/canbemoved = FALSE // if it can be moved by people using the right tools. basically means if you can change the anchored var. - var/screwed = TRUE // if its screwed in place - var/wrenched = TRUE // if its wrenched down + /// If you can shove people in it. + var/large = TRUE + /// If it can be moved by people using the right tools. basically means if you can change the anchored var. + var/canbemoved = FALSE + /// If its screwed in place + var/screwed = TRUE + /// If its wrenched down + var/wrenched = TRUE - var/wall_mounted = FALSE //never solid (You can always pass over it) + /// Never solid (You can always pass over it) + var/wall_mounted = FALSE var/health = 100 - var/breakout = 0 //if someone is currently breaking out. mutex + /// If someone is currently breaking out. mutex + var/breakout = 0 + /// This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients. var/storage_capacity = 45 //Tying this to mob sizes was dumb - //This is so that someone can't pack hundreds of items in a locker/crate - //then open it in a populated area to crash clients. var/open_sound = 'sound/effects/closet_open.ogg' var/close_sound = 'sound/effects/closet_close.ogg' @@ -51,12 +60,18 @@ var/obj/effect/overlay/closet_door/door_obj var/obj/effect/overlay/closet_door/door_obj_alt var/is_animating_door = FALSE - var/door_underlay = FALSE //used if you want to have an overlay below the door. used for guncabinets. - var/door_anim_squish = 0.12 // Multiplier on proc/get_door_transform. basically, how far you want this to swing out. value of 1 means the length of the door is unchanged (and will swing out of the tile), 0 means it will just slide back and forth. + + /// Used if you want to have an overlay below the door. used for guncabinets. + var/door_underlay = FALSE + /// Multiplier on proc/get_door_transform. basically, how far you want this to swing out. value of 1 means the length of the door is unchanged (and will swing out of the tile), 0 means it will just slide back and forth. + var/door_anim_squish = 0.12 var/door_anim_angle = 147 - var/door_hinge = -6.5 // for closets, x away from the centre of the closet. typically good to add a 0.5 so it's centered on the edge of the closet. - var/door_hinge_alt = 6.5 // for closets with two doors. why a seperate var? because some closets may be weirdly shaped or something. - var/door_anim_time = 2.5 // set to 0 to make the door not animate at all + /// For closets, x away from the centre of the closet. typically good to add a 0.5 so it's centered on the edge of the closet. + var/door_hinge = -6.5 + /// For closets with two doors. why a seperate var? because some closets may be weirdly shaped or something. + var/door_hinge_alt = 6.5 + /// Set to 0 to make the door not animate at all + var/door_anim_time = 2.5 /obj/structure/closet/LateInitialize() @@ -85,7 +100,7 @@ verbs += /obj/structure/closet/proc/verb_togglelock return mapload ? INITIALIZE_HINT_LATELOAD : INITIALIZE_HINT_NORMAL -// Fill lockers with this. +/// Fill lockers with this. /obj/structure/closet/proc/fill() /obj/structure/closet/proc/content_info(mob/user, content_size) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 40d3a16f09d..66067f5bd59 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -40,6 +40,14 @@ new /obj/item/clothing/accessory/holster/waist(src) new /obj/item/device/memorywiper(src) +/// Used for when we want to populate the contents of this locker ourself. Good for away sites +/obj/structure/closet/secure_closet/RD/empty + name = "research director's locker" + req_access = list(ACCESS_RD) + icon_state = "rd" + +/obj/structure/closet/secure_closet/RD/empty/fill() + /obj/structure/closet/secure_closet/RD2 name = "research director's attire" req_access = list(ACCESS_RD) diff --git a/html/changelogs/Ben10083 - NT Ruins.yml b/html/changelogs/Ben10083 - NT Ruins.yml new file mode 100644 index 00000000000..eb151612253 --- /dev/null +++ b/html/changelogs/Ben10083 - NT Ruins.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Ben10083 + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscdel: "Nanotrasen Abandoned facility in Ouerea no longer has certain items in RD locker (No radios for you). A different, special item has been placed there instead" diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_nt_ruin.dm b/maps/random_ruins/exoplanets/ouerea/ouerea_nt_ruin.dm index 383f6f0e858..82460f7ffe1 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_nt_ruin.dm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_nt_ruin.dm @@ -22,3 +22,7 @@ name = "Research Director's Log" info = "I fucking hate this place. The other day, one of my scientists somehow managed to wind up, in the process of a standard dissection, cutting his own fucking arm off. \ I thought NanoTrasen was supposed to hire the best and brightest of the Spur? At least I have you, Special Reserve..." + +/obj/item/research_slip/nt_ouerea + desc = "A small slip of plastic with an embedded chip. It is commonly used to store small amounts of research data. This one appears worn down from age. Why did they leave this behind?" + origin_tech = list(TECH_BLUESPACE = 6, TECH_MAGNET = 3, TECH_ARCANE = 1) diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_nt_ruin.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_nt_ruin.dmm index e63c4cd969e..16b32479a78 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_nt_ruin.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_nt_ruin.dmm @@ -1,13 +1,22 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"av" = ( +/obj/effect/decal/cleanable/cobweb2, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/carpet/lightblue{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) "ca" = ( /obj/machinery/mining/drill, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, /area/ouerea_nt_ruin) "cO" = ( /obj/structure/anomaly_container, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -15,10 +24,19 @@ "df" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/carpet/lightblue{ temperature = 298.15 }, /area/ouerea_nt_ruin) +"do" = ( +/obj/structure/ore_box, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/tiled{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) "dq" = ( /obj/machinery/light, /turf/simulated/floor/exoplanet/tiled/white{ @@ -50,6 +68,7 @@ /obj/machinery/door/airlock/research{ name = "Equipment Storage" }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -63,6 +82,7 @@ /obj/machinery/door/airlock/service{ name = "Employee Habitation" }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, @@ -71,12 +91,14 @@ /obj/machinery/light{ dir = 1 }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, /area/ouerea_nt_ruin) "gT" = ( /obj/machinery/suspension_gen, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -85,6 +107,7 @@ /obj/machinery/mech_recharger, /obj/effect/floor_decal/industrial/hatch/yellow, /mob/living/heavy_vehicle/premade/miner, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, @@ -93,6 +116,7 @@ /obj/machinery/door/airlock/medical{ name = "Surgical Suite" }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -103,12 +127,14 @@ /obj/item/clothing/suit/hazmat/anomaly, /obj/item/clothing/head/hazmat/anomaly, /obj/item/clothing/head/hazmat/anomaly, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, /area/ouerea_nt_ruin) "iW" = ( /obj/structure/closet/excavation, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -131,6 +157,7 @@ /obj/machinery/body_scanconsole{ dir = 1 }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -148,6 +175,7 @@ "mu" = ( /obj/machinery/floodlight/randomcharge, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, @@ -155,24 +183,34 @@ "mH" = ( /obj/structure/window/reinforced, /obj/effect/decal/cleanable/blood/gibs, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, /area/ouerea_nt_ruin) "os" = ( /obj/structure/window/reinforced, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, /area/ouerea_nt_ruin) +"ov" = ( +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/carpet/lightblue{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) "pW" = ( /obj/effect/decal/cleanable/blood, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, /area/ouerea_nt_ruin) "qm" = ( /obj/machinery/chemical_dispenser, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -182,6 +220,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, @@ -190,6 +229,7 @@ /obj/structure/bed, /obj/item/bedsheet/nanotrasen, /obj/structure/curtain/open/bed, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, @@ -199,6 +239,7 @@ dir = 8 }, /obj/machinery/artifact_harvester, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -214,11 +255,19 @@ temperature = 298.15 }, /area/ouerea_nt_ruin) +"uw" = ( +/obj/structure/bed/stool, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/tiled{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) "uB" = ( /obj/structure/window/reinforced{ dir = 8 }, /obj/structure/window/reinforced, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -242,12 +291,14 @@ /obj/machinery/light{ dir = 1 }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, /area/ouerea_nt_ruin) "xR" = ( /obj/machinery/computer/rdconsole, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -255,6 +306,11 @@ "yH" = ( /obj/structure/table/wood, /obj/item/stamp/rd, +/obj/item/paper/nt_ouerea{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/carpet/lightblue{ temperature = 298.15 }, @@ -264,6 +320,13 @@ dir = 4; status = 2 }, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/tiled{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) +"zd" = ( +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, @@ -274,10 +337,31 @@ temperature = 298.15 }, /area/ouerea_nt_ruin) +"zI" = ( +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/tiled{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) +"Aq" = ( +/obj/machinery/light, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/tiled{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) "Be" = ( /obj/machinery/light{ dir = 8 }, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/tiled{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) +"BF" = ( +/obj/structure/bed/stool, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, @@ -285,6 +369,7 @@ "Cc" = ( /obj/structure/table/wood, /obj/item/modular_computer/laptop/preset/research/rd, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/carpet/lightblue{ temperature = 298.15 }, @@ -297,6 +382,7 @@ /area/ouerea_nt_ruin) "Cf" = ( /obj/machinery/bodyscanner, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -309,6 +395,7 @@ dir = 4; status = 2 }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -324,6 +411,7 @@ /obj/item/reagent_containers/food/drinks/waterbottle, /obj/item/reagent_containers/food/drinks/waterbottle, /obj/item/reagent_containers/food/drinks/waterbottle, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, @@ -334,6 +422,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, @@ -352,12 +441,23 @@ desc = "A server which used to house a back-up of all ship research. It can be used to restore lost data, or to act as another point of retrieval. Looks like it's too far gone for that though."; density = 1 }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, /area/ouerea_nt_ruin) +"Hl" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/tiled{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) "HQ" = ( /obj/machinery/chem_master, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -366,6 +466,7 @@ /obj/machinery/mech_recharger, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/mech_wreckage/powerloader, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, @@ -373,18 +474,21 @@ "Ix" = ( /obj/structure/table/standard, /obj/item/reagent_containers/glass/beaker, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, /area/ouerea_nt_ruin) "IB" = ( /obj/structure/table/standard, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, /area/ouerea_nt_ruin) "IL" = ( /obj/structure/curtain/medical, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -394,21 +498,31 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, /area/ouerea_nt_ruin) +"IP" = ( +/obj/machinery/light, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/tiled/white{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) "IZ" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/effect/decal/cleanable/blood/gibs, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, /area/ouerea_nt_ruin) "Kp" = ( /obj/structure/closet/crate/miningcart, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, @@ -419,20 +533,30 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, /area/ouerea_nt_ruin) +"KD" = ( +/obj/effect/decal/cleanable/cobweb2, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/tiled/white{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) "Mk" = ( /obj/machinery/door/airlock/research{ name = "Xenoarchaeology" }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, /area/ouerea_nt_ruin) "Ni" = ( /obj/machinery/door/window, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -448,13 +572,22 @@ "NO" = ( /obj/structure/ore_box, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/decal/cleanable/cobweb2, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, /area/ouerea_nt_ruin) +"Od" = ( +/mob/living/simple_animal/aquatic/fish/moghes, +/turf/simulated/floor/exoplanet/water/shallow{ + temperature = 298.15 + }, +/area/exoplanet/ouerea) "On" = ( /obj/structure/table/standard, /obj/item/storage/box/fancy/tray, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -463,6 +596,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -475,20 +609,54 @@ temperature = 298.15 }, /area/exoplanet/ouerea) +"RA" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/exoplanet/carpet/lightblue{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) "RP" = ( /turf/simulated/floor/exoplanet/concrete{ temperature = 298.15 }, /area/exoplanet/ouerea) +"RT" = ( +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/tiled/white{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) +"Si" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/tiled/white{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) "Sl" = ( /obj/structure/table/standard, /obj/machinery/artifact_analyser, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, /area/ouerea_nt_ruin) "SQ" = ( -/obj/structure/closet/secure_closet/RD, +/obj/structure/closet/secure_closet/RD/empty, +/obj/item/clothing/suit/storage/toggle/labcoat/nt, +/obj/item/clothing/gloves/latex/nitrile/unathi, +/obj/item/storage/briefcase/nt, +/obj/item/research_slip/nt_ouerea, +/obj/item/clothing/suit/hazmat/research, +/obj/item/clothing/head/hazmat/research, +/obj/item/clothing/under/rank/research_director, +/obj/item/clothing/shoes/workboots/all_species, +/obj/item/device/flash, +/obj/item/storage/box/firingpins, +/obj/item/device/pin_extractor, +/obj/item/taperoll/science, +/obj/item/storage/box/tethers, +/obj/item/toy/plushie/pennyplush, /turf/simulated/floor/exoplanet/carpet/lightblue{ temperature = 298.15 }, @@ -497,15 +665,24 @@ /obj/machinery/door/airlock/medical{ name = "Biological Research" }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, /area/ouerea_nt_ruin) +"TU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb2, +/turf/simulated/floor/exoplanet/tiled{ + temperature = 298.15 + }, +/area/ouerea_nt_ruin) "Uv" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4 }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, @@ -530,18 +707,22 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 298.15 }, /area/ouerea_nt_ruin) "XG" = ( /obj/structure/bed/stool/chair/office/dark, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/exoplanet/carpet/lightblue{ temperature = 298.15 }, /area/ouerea_nt_ruin) "XJ" = ( /obj/machinery/vending/snack, +/obj/effect/decal/cleanable/cobweb, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 298.15 }, @@ -651,9 +832,9 @@ Be Ck XJ ui +zI ui -ui -ui +zI Ck fs "} @@ -684,10 +865,10 @@ Ck ui Ck DG -ui -Ce -Ce -jN +zd +uw +uw +Aq Ck fs "} @@ -715,13 +896,13 @@ dA fs Ck sK -ui +zI Ck -XZ -Ce +Hl +BF IB IB -Ce +uw Ck fs "} @@ -742,16 +923,16 @@ fs fs dA dA -dA +Od dA dA fs fs Ck Ck -ui +zI fW -ui +zd Ce IB IB @@ -783,13 +964,13 @@ fs fs Ck sK -ui +zI Ck Ve -Ce +uw IB IB -Ce +uw Ck fs "} @@ -820,10 +1001,10 @@ Ck ui Ck XZ -ui -Ce -Ce -jN +zI +uw +uw +Aq Ck fs "} @@ -831,14 +1012,14 @@ fs fs fs Ck -ky -ky +Si +RT mH Qy -ky +RT zz qm -ky +RT ky Ck fs @@ -853,11 +1034,11 @@ Ck sK yP Ck +TU +zI +zI ui -ui -ui -ui -ui +zI Ck fs "} @@ -868,12 +1049,12 @@ Ck gb pW Ni -ky +RT ky zz HQ -ky -dq +RT +IP Ck fs fs @@ -903,11 +1084,11 @@ IZ XE Uv ky -ky +RT Ck Ix ky -ky +RT Ck fs fs @@ -933,15 +1114,15 @@ fs fs fs Ck -ky -ky +RT +RT os -ky -ky +RT +RT hF -ky -ky -ky +RT +RT +RT Ck fs fs @@ -970,7 +1151,7 @@ Ck gb ky Ni -ky +RT ky Ck IL @@ -1001,15 +1182,15 @@ fs fs fs Ck -ky -ky +KD +RT os -ky +RT ky zz ky -ky -dq +RT +IP Ck fs fs @@ -1039,7 +1220,7 @@ Ck Ck Ck Ck -ky +RT zz On vL @@ -1071,7 +1252,7 @@ fs Ck SQ ka -ka +ov Ck SV Ck @@ -1103,14 +1284,14 @@ fs fs fs Ck -ka +RA yH -ka +ov Ey -ky +RT ky Qy -ky +RT ky tb fs @@ -1123,7 +1304,7 @@ fs fs Ck hn -ui +zI ui Be sk @@ -1141,11 +1322,11 @@ XG Cc ka UI -ky -ky -ky -ky -ky +RT +RT +RT +RT +RT ji RP RP @@ -1157,9 +1338,9 @@ fs fs Ck HZ -ui -ui -ui +zI +zI +zI ca ca ca @@ -1173,13 +1354,13 @@ fs Ck ka df -ka +ov Ey +RT +RT +RT ky -ky -ky -ky -ky +RT tb fs fs @@ -1191,9 +1372,9 @@ fs fs Ck HZ -ui -ui -ui +zI +zI +zI IO IO IO @@ -1205,8 +1386,8 @@ fs fs fs Ck -ka -ka +av +ov ka Ck Mk @@ -1225,9 +1406,9 @@ fs fs Ck mu +zI ui -ui -ui +zI sk sk sk @@ -1243,7 +1424,7 @@ Ck Ck Ck Ck -ky +RT Ck gT gT @@ -1259,9 +1440,9 @@ fs ev Ck mu -ui -ui -ui +zI +zI +zI ca ca ca @@ -1275,9 +1456,9 @@ fs Ck xR ky +RT ky -ky -ky +RT Ck cO cO @@ -1293,9 +1474,9 @@ fs fs Ck DZ +zI ui -ui -ui +zI IO IO Ks @@ -1308,13 +1489,13 @@ fs fs Ck GW -ky -ky -ky +RT +RT +RT ky Ck ky -ky +RT dq Ck fs @@ -1326,13 +1507,13 @@ RP RP RP uZ +zd ui +zI +zI +zI ui -ui -ui -ui -ui -ui +zI Ck fs fs @@ -1342,14 +1523,14 @@ fs fs Ck Sl +RT ky -ky -ky -ky +RT +RT eX +RT ky -ky -ky +RT Ck fs fs @@ -1360,13 +1541,13 @@ RP RP RP uZ -ui -ui -ui -ui -ui -ui -ui +zd +zI +zI +zI +zI +zI +zI Ck fs fs @@ -1377,13 +1558,13 @@ fs Ck sL uB +RT ky -ky -ky +RT Ck io -ky -ky +RT +RT Ck fs fs @@ -1394,12 +1575,12 @@ fs fs ev Ck -XZ -ui -ui -ui -ui -ui +Hl +zI +zI +zI +zI +zI jN Ck fs @@ -1428,13 +1609,13 @@ fs fs fs Ck +zI +zI +zI ui -ui -ui -ui -ui -ui -ui +zI +zI +zI Ck fs fs @@ -1462,10 +1643,10 @@ fs fs fs Ck -NO -NO -NO -ui +do +do +do +zI Kp Kp Kp @@ -1496,10 +1677,10 @@ fs fs fs Ck -NO -NO -NO -ui +do +do +do +zI Kp Kp Kp @@ -1531,8 +1712,8 @@ fs fs Ck NO -NO -NO +do +do yP Kp Kp