diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index a1663c5e44c..8f71215e1c5 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -70,6 +70,7 @@ /obj/item/stack/sheet/plasteel{ amount = 30 }, +/obj/item/stack/sheet/mineral/diamond, /turf/open/floor/iron/dark, /area/ruin/space/ancientstation/delta/ai) "as" = ( @@ -226,7 +227,7 @@ /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/bridge) "bh" = ( -/obj/machinery/computer/old{ +/obj/machinery/modular_computer/preset/research/away{ dir = 4 }, /obj/structure/window/reinforced/spawner/directional/south, @@ -961,8 +962,11 @@ /area/ruin/space/ancientstation/charlie/bridge) "ek" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/structure/closet/crate/bin, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/trash/garbage, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/engie) "el" = ( @@ -1088,6 +1092,10 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/item/chair{ + pixel_y = -8; + pixel_x = 13 + }, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/engie) "eL" = ( @@ -1539,7 +1547,6 @@ "gM" = ( /obj/machinery/rnd/production/circuit_imprinter/offstation, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/dropper, /turf/open/floor/iron/white, /area/ruin/space/ancientstation/delta/rnd) "gP" = ( @@ -1910,6 +1917,7 @@ /obj/item/folder/white, /obj/item/reagent_containers/cup/beaker, /obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/dropper, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/rnd) "ip" = ( @@ -2173,6 +2181,15 @@ "jE" = ( /turf/closed/wall/rust, /area/ruin/space/ancientstation/beta/hall) +"jF" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/table, +/obj/machinery/door/window/brigdoor/right/directional/east, +/obj/item/computer_disk, +/turf/open/floor/iron/dark, +/area/ruin/space/ancientstation/delta/ai) "jH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/south, @@ -2251,9 +2268,8 @@ "jP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/storage/backpack/duffelbag, /obj/structure/closet, -/obj/effect/spawner/random/clothing/backpack, +/obj/item/storage/backpack/duffelbag/sec, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/dorms) "jU" = ( @@ -2286,6 +2302,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/hydro) +"jZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/pipedispenser, +/turf/open/floor/iron/airless, +/area/ruin/space/ancientstation/beta/hall) "kb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -2672,13 +2693,10 @@ /area/ruin/space/ancientstation/charlie/kitchen) "lz" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/bin, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, -/obj/effect/spawner/random/trash/garbage, -/obj/effect/spawner/random/trash/garbage, -/obj/effect/spawner/random/trash/garbage, +/obj/machinery/computer/apc_control/away, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/engie) "lB" = ( @@ -2898,9 +2916,9 @@ "mz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/storage/backpack/old, /obj/structure/closet, -/obj/effect/spawner/random/clothing/backpack, +/obj/item/storage/backpack/industrial, +/obj/item/storage/backpack/messenger/eng, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/dorms) "mA" = ( @@ -2938,7 +2956,7 @@ /obj/machinery/shower/directional/west{ has_water_reclaimer = 0 }, -/turf/open/floor/vault, +/turf/open/floor/pod/dark, /area/ruin/space/ancientstation/delta/biolab) "mG" = ( /obj/effect/decal/cleanable/dirt, @@ -3115,11 +3133,14 @@ /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/hall) "ng" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/pipedispenser/disposal/transit_tube, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/structure/fluff/broken_canister_frame, +/obj/effect/decal/cleanable/plasma, /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/atmos) "nk" = ( @@ -3192,6 +3213,7 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, +/obj/item/tank/internals/anesthetic/pure, /turf/open/floor/iron/airless, /area/ruin/space/ancientstation/beta/medbay) "nD" = ( @@ -3623,7 +3645,6 @@ /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/mining) "qk" = ( -/obj/machinery/pipedispenser, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -3869,6 +3890,10 @@ layer = 2.9 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/decal/cleanable/dirt, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/engie) "si" = ( @@ -4418,7 +4443,7 @@ /obj/structure/closet/crate/secure/weapon{ req_access = list("away_sec") }, -/obj/item/knife/combat, +/obj/item/spess_knife, /obj/item/clothing/suit/armor/vest/old, /obj/item/gun/ballistic/rifle/boltaction, /obj/item/ammo_box/strilka310, @@ -5208,6 +5233,17 @@ }, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/hall) +"Cm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/item/tank/internals/oxygen{ + pixel_x = 1 + }, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/beta/atmos) "Cq" = ( /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/hall) @@ -5378,6 +5414,7 @@ dir = 1 }, /obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/components/binary/tank_compressor, /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/atmos) "DI" = ( @@ -5710,9 +5747,9 @@ /area/ruin/space/ancientstation/charlie/hall) "Gb" = ( /obj/effect/decal/cleanable/glass, -/obj/item/stack/rods, /obj/effect/mapping_helpers/broken_floor, /obj/effect/turf_decal/stripes/line, +/obj/structure/tank_dispenser/plasma, /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/atmos) "Gd" = ( @@ -5796,10 +5833,13 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/ancientstation/charlie/kitchen) "GP" = ( -/obj/machinery/pipedispenser/disposal, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/atmos) "GX" = ( @@ -8184,6 +8224,14 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/item/tank/internals/oxygen{ + pixel_y = -8; + pixel_x = 8 + }, +/obj/item/tank/internals/oxygen{ + pixel_x = -4; + pixel_y = 4 + }, /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/atmos) "XD" = ( @@ -8324,6 +8372,14 @@ /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron/dark, /area/ruin/space/ancientstation/delta/ai) +"Yo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet, +/obj/item/storage/backpack/science, +/obj/item/storage/backpack/messenger/science, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/dorms) "Yp" = ( /turf/closed/mineral/plasma, /area/ruin/space/ancientstation/beta/atmos) @@ -9963,7 +10019,7 @@ Uu Yp Gb XB -Ln +Cm kK Ln ny @@ -10159,7 +10215,7 @@ gJ Ax Ax kQ -Cj +jZ Sf Cj VF @@ -12209,7 +12265,7 @@ wb bR aG nk -mz +Yo gZ kN Mt @@ -14227,7 +14283,7 @@ ag aM NS bh -cz +jF cz cz ad diff --git a/code/datums/id_trim/ruins.dm b/code/datums/id_trim/ruins.dm index de58590ba8a..36284e06b72 100644 --- a/code/datums/id_trim/ruins.dm +++ b/code/datums/id_trim/ruins.dm @@ -27,7 +27,7 @@ /// Trim for the oldstation ruin/Charlie station to access APCs and other equipment /datum/id_trim/away/old/equipment - access = list(ACCESS_AWAY_GENERAL, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP) + access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_ENGINEERING, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP) assignment = "Engine Equipment Access" /// Trim for the oldstation ruin/Charlie station to access robots, and downloading of paper publishing software for experiments diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index 2b5cfa14c7c..97bf368d3e2 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -205,3 +205,6 @@ . = ..() if(active_apc) disconnect_apc() + +/obj/machinery/computer/apc_control/away + req_access = list(ACCESS_AWAY_ENGINEERING) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 530e9691755..182556b5189 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -32,10 +32,6 @@ * Backpack Types */ -/obj/item/storage/backpack/old/Initialize(mapload) - . = ..() - atom_storage.max_total_storage = 12 - /obj/item/bag_of_holding_inert name = "inert bag of holding" desc = "What is currently a just an unwieldly block of metal with a slot ready to accept a bluespace anomaly core." diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm index 70c0ea0822a..40989915a68 100644 --- a/code/game/objects/items/tanks/tank_types.dm +++ b/code/game/objects/items/tanks/tank_types.dm @@ -77,6 +77,14 @@ . += span_notice("A warning is etched into [src]...") . += span_warning("There is no process in the body that uses N2O, so patients will exhale the N2O... exposing you to it. Make sure to work in a well-ventilated space to avoid sleepy mishaps.") +/obj/item/tank/internals/anesthetic/pure + desc = "A tank with pure N2O. There is a warning sticker crudely slapped onto the tank." + icon_state = "anesthetic_warning" + +/obj/item/tank/internals/anesthetic/pure/populate_gas() + air_contents.assert_gases(/datum/gas/nitrous_oxide) + air_contents.gases[/datum/gas/nitrous_oxide][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + /* * Plasma */ diff --git a/code/modules/modular_computers/computers/machinery/console_presets.dm b/code/modules/modular_computers/computers/machinery/console_presets.dm index ad87960603c..94ff9439e3b 100644 --- a/code/modules/modular_computers/computers/machinery/console_presets.dm +++ b/code/modules/modular_computers/computers/machinery/console_presets.dm @@ -33,6 +33,17 @@ /datum/computer_file/program/scipaper_program, ) +/obj/machinery/modular_computer/preset/research/away + name = "old research console" + desc = "An old computer used for writing research papers." + starting_programs = list( + /datum/computer_file/program/scipaper_program, + ) + +/obj/machinery/modular_computer/preset/research/away/Initialize(mapload) + . = ..() + cpu.device_theme = PDA_THEME_RETRO + // ===== COMMAND CONSOLE ===== /obj/machinery/modular_computer/preset/command name = "command console" diff --git a/code/modules/research/techweb/nodes/atmos_nodes.dm b/code/modules/research/techweb/nodes/atmos_nodes.dm index e2f29171d9d..a35c5f4c185 100644 --- a/code/modules/research/techweb/nodes/atmos_nodes.dm +++ b/code/modules/research/techweb/nodes/atmos_nodes.dm @@ -68,6 +68,7 @@ "HFR_interface", "HFR_moderator_input", "HFR_waste_output", + "adv_fire_extinguisher", "bolter_wrench", "rpd_loaded", "engine_goggles", @@ -92,14 +93,13 @@ "rcd_ammo", "weldingmask", "magboots", - "adv_fire_extinguisher", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS) discount_experiments = list(/datum/experiment/ordnance/gaseous/noblium = TECHWEB_TIER_4_POINTS) /datum/techweb_node/rcd_upgrade id = TECHWEB_NODE_RCD_UPGRADE - display_name = "Rapid Device Upgrade Designs" + display_name = "Rapid Construction Device Upgrades" description = "New designs and enhancements for RCD and RPD." prereq_ids = list(TECHWEB_NODE_EXP_TOOLS, TECHWEB_NODE_PARTS_BLUESPACE) design_ids = list( diff --git a/code/modules/research/techweb/nodes/engi_nodes.dm b/code/modules/research/techweb/nodes/engi_nodes.dm index f932f042afc..626dd6981d0 100644 --- a/code/modules/research/techweb/nodes/engi_nodes.dm +++ b/code/modules/research/techweb/nodes/engi_nodes.dm @@ -88,6 +88,7 @@ "comm_monitor", "comm_server", "message_monitor", + "ntnet_relay", "s_hub", "s_messaging", "s_server", diff --git a/code/modules/research/techweb/nodes/medbay_nodes.dm b/code/modules/research/techweb/nodes/medbay_nodes.dm index 3f2239ced22..51bc5f15049 100644 --- a/code/modules/research/techweb/nodes/medbay_nodes.dm +++ b/code/modules/research/techweb/nodes/medbay_nodes.dm @@ -23,6 +23,8 @@ "stethoscope", "beaker", "large_beaker", + "chem_pack", + "blood_pack", "syringe", "dropper", "pillbottle", @@ -40,8 +42,6 @@ prereq_ids = list(TECHWEB_NODE_MEDBAY_EQUIP) design_ids = list( "xlarge_beaker", - "blood_pack", - "chem_pack", "med_spray_bottle", "medigel", "medipen_refiller", diff --git a/code/modules/research/techweb/nodes/research_nodes.dm b/code/modules/research/techweb/nodes/research_nodes.dm index 82a64f8c823..0cdbdb6548b 100644 --- a/code/modules/research/techweb/nodes/research_nodes.dm +++ b/code/modules/research/techweb/nodes/research_nodes.dm @@ -13,7 +13,6 @@ "destructive_analyzer", "destructive_scanner", "experi_scanner", - "ntnet_relay", "laptop", "portadrive_basic", "portadrive_advanced", diff --git a/code/modules/surgery/experimental_dissection.dm b/code/modules/surgery/experimental_dissection.dm index 69c246d9e8d..95c952e7724 100644 --- a/code/modules/surgery/experimental_dissection.dm +++ b/code/modules/surgery/experimental_dissection.dm @@ -1,5 +1,5 @@ ///How many research points you gain from dissecting a Human. -#define BASE_HUMAN_REWARD 500 +#define BASE_HUMAN_REWARD 10 /datum/surgery/advanced/experimental_dissection name = "Experimental Dissection" diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index eb3f87d9c71..be83d83d422 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/obj/canisters.dmi b/icons/obj/canisters.dmi index 43646764888..1555cf0a478 100644 Binary files a/icons/obj/canisters.dmi and b/icons/obj/canisters.dmi differ