From 1d48674ba106341d68e44f70e6aba5ec0aefdd15 Mon Sep 17 00:00:00 2001 From: 81Denton <32391752+81Denton@users.noreply.github.com> Date: Sun, 22 Jul 2018 17:04:03 +0200 Subject: [PATCH] Improves Oldstation/Charlie Station (#39248) * Improves Oldstation/Charlie Station * Actually adds titanium * Removes dvars --- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 787 +++++++++++++----- code/game/objects/items/cards_ids.dm | 26 +- .../objects/structures/ghost_role_spawners.dm | 9 +- .../reagents/reagent_containers/bottle.dm | 102 +++ .../reagents/reagent_containers/glass.dm | 100 --- .../ruins/spaceruin_code/oldstation.dm | 4 + 6 files changed, 690 insertions(+), 338 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 612d6d8f148..79611ff7d7f 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -14,11 +14,16 @@ /area/ruin/space/has_grav/ancientstation/hivebot) "ae" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/plasteel/twenty, /obj/item/stack/sheet/glass/fifty{ pixel_x = 3; pixel_y = 3 }, +/obj/item/stack/sheet/plasteel{ + amount = 30 + }, +/obj/item/stack/sheet/mineral/titanium{ + amount = 30 + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/ancientstation/hivebot) "af" = ( @@ -38,10 +43,10 @@ "aj" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/mineral/silver{ - amount = 15 + amount = 25 }, /obj/item/stack/sheet/mineral/gold{ - amount = 15 + amount = 25 }, /obj/item/stack/ore/bluespace_crystal, /obj/item/stack/ore/bluespace_crystal, @@ -251,11 +256,11 @@ /area/ruin/space/has_grav/ancientstation/comm) "aS" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, /obj/item/solar_assembly, /obj/item/solar_assembly, /obj/item/solar_assembly, /obj/item/solar_assembly, +/obj/structure/closet/crate/engineering/electrical, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) "aT" = ( @@ -326,9 +331,7 @@ /area/ruin/space/has_grav/ancientstation/comm) "bc" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/item/storage/backpack/old, -/turf/open/floor/plating, +/turf/closed/wall/rust, /area/ruin/space/has_grav/ancientstation) "bd" = ( /obj/structure/transit_tube{ @@ -353,11 +356,11 @@ /area/ruin/unpowered) "bi" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, /obj/item/electronics/airlock, /obj/item/electronics/airlock, /obj/item/electronics/apc, /obj/item/electronics/apc, +/obj/structure/closet/crate/engineering/electrical, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) "bj" = ( @@ -365,6 +368,10 @@ /obj/structure/chair{ dir = 1 }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/open/floor/plasteel/blue/side{ dir = 10 }, @@ -406,10 +413,10 @@ "bp" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/mineral/plasma{ - amount = 15 + amount = 25 }, /obj/item/stack/sheet/mineral/uranium{ - amount = 10 + amount = 25 }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/ancientstation/hivebot) @@ -521,11 +528,11 @@ /area/ruin/space/has_grav/ancientstation) "bM" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, /obj/item/solar_assembly, /obj/item/solar_assembly, /obj/item/solar_assembly, /obj/item/solar_assembly, +/obj/structure/closet/crate/engineering/electrical, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation) "bN" = ( @@ -632,12 +639,12 @@ /area/ruin/space/has_grav/ancientstation/betanorth) "cf" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/transit_tube/station/reverse/flipped{ - dir = 1 - }, /obj/structure/transit_tube_pod{ dir = 4 }, +/obj/structure/transit_tube/station/reverse{ + dir = 1 + }, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation/betanorth) "cg" = ( @@ -856,13 +863,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) -"cJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/ancientstation/deltacorridor) "cK" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ dir = 4 @@ -1074,6 +1074,10 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/open/floor/plasteel/green/side{ dir = 9 }, @@ -1095,6 +1099,7 @@ tank_volume = 1000 }, /obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation/hydroponics) "dr" = ( @@ -1162,6 +1167,7 @@ name = "Research and Development" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation/rnd) "dA" = ( @@ -1169,6 +1175,7 @@ /obj/machinery/door/airlock/research{ name = "Research and Development" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation/rnd) "dB" = ( @@ -1205,12 +1212,12 @@ /area/template_noop) "dK" = ( /obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/template_noop, /area/template_noop) "dL" = ( @@ -1336,7 +1343,9 @@ "ec" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/hivebot/strong, -/turf/open/floor/plasteel/white/corner, +/turf/open/floor/plasteel/whitepurple/side{ + dir = 9 + }, /area/ruin/space/has_grav/ancientstation/rnd) "ed" = ( /obj/effect/decal/cleanable/dirt, @@ -1364,7 +1373,7 @@ /area/ruin/space/has_grav/ancientstation/betanorth) "ei" = ( /obj/structure/lattice/catwalk, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/template_noop, @@ -1422,6 +1431,7 @@ }, /obj/item/cultivator, /obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/item/shovel/spade, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation/hydroponics) "eq" = ( @@ -1542,7 +1552,7 @@ /turf/open/floor/plating/airless, /area/template_noop) "eJ" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-8" }, /turf/open/floor/plating/airless, @@ -1693,10 +1703,10 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "fe" = ( @@ -1776,6 +1786,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation) +"fo" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/whitepurple/side{ + dir = 5 + }, +/area/ruin/space/has_grav/ancientstation/rnd) "fp" = ( /obj/structure/sign/poster/official/here_for_your_safety, /turf/closed/wall/rust, @@ -1888,6 +1904,7 @@ /obj/machinery/door/poddoor{ id = "ancient" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation/powered) "fH" = ( @@ -1987,8 +2004,9 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel/white/corner{ - dir = 4 +/turf/open/floor/plasteel/whitepurple/side{ + icon_state = "whitepurple"; + dir = 10 }, /area/ruin/space/has_grav/ancientstation/rnd) "fU" = ( @@ -2008,8 +2026,8 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel/white/corner{ - dir = 1 +/turf/open/floor/plasteel/whitepurple/side{ + dir = 6 }, /area/ruin/space/has_grav/ancientstation/rnd) "fX" = ( @@ -2054,54 +2072,41 @@ /area/template_noop) "gc" = ( /obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/template_noop, /area/template_noop) "gd" = ( /obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/template_noop, /area/template_noop) "ge" = ( /obj/structure/lattice/catwalk, -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/template_noop, -/area/template_noop) -"gf" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/template_noop, /area/template_noop) "gg" = ( @@ -2110,53 +2115,50 @@ req_access_txt = "200" }, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "gh" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "gi" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "gj" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "gk" = ( @@ -2167,9 +2169,6 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation/engi) "gl" = ( @@ -2177,9 +2176,6 @@ /obj/item/stack/cable_coil{ amount = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "gm" = ( @@ -2576,7 +2572,7 @@ /area/ruin/space/has_grav/ancientstation/engi) "gW" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/plasteel/floorgrime, @@ -2667,7 +2663,7 @@ /area/ruin/space/has_grav/ancientstation/engi) "hl" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/plasteel/yellow/corner{ @@ -2679,8 +2675,8 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "hn" = ( @@ -2778,6 +2774,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, /turf/open/floor/plasteel/red/side{ dir = 4 }, @@ -2806,10 +2806,10 @@ /area/ruin/space/has_grav/ancientstation/rnd) "hF" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large/aluminium{ +/obj/item/reagent_containers/glass/bottle/aluminium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/beaker/large/bromine{ +/obj/item/reagent_containers/glass/bottle/bromine{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -2819,10 +2819,10 @@ /area/ruin/space/has_grav/ancientstation/rnd) "hG" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large/carbon{ +/obj/item/reagent_containers/glass/bottle/carbon{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/beaker/large/chlorine{ +/obj/item/reagent_containers/glass/bottle/chlorine{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -2832,10 +2832,10 @@ /area/ruin/space/has_grav/ancientstation/rnd) "hH" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large/copper{ +/obj/item/reagent_containers/glass/bottle/copper{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/beaker/large/ethanol{ +/obj/item/reagent_containers/glass/bottle/ethanol{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -2868,28 +2868,32 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/ancientstation/betanorth) "hM" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-4" }, /turf/open/floor/plating/airless, /area/template_noop) "hN" = ( /obj/structure/lattice/catwalk, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-8" }, /turf/template_noop, /area/template_noop) "hO" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/light/small{ brightness = 3; dir = 8 }, /obj/effect/decal/cleanable/oil, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/open/floor/plasteel/yellow/side{ dir = 8 }, @@ -2973,13 +2977,13 @@ /area/ruin/space/has_grav/ancientstation/rnd) "hZ" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large/fluorine{ +/obj/item/reagent_containers/glass/bottle/fluorine{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/beaker/large/hydrogen{ +/obj/item/reagent_containers/glass/bottle/hydrogen{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/beaker/large/water{ +/obj/item/reagent_containers/glass/bottle/water{ pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, @@ -2989,7 +2993,7 @@ /area/ruin/space/has_grav/ancientstation/rnd) "ib" = ( /obj/structure/lattice/catwalk, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-4" }, /turf/template_noop, @@ -3000,7 +3004,7 @@ name = "Station Solar Control Computer" }, /obj/item/paper/guides/jobs/engi/solars, -/obj/structure/cable, +/obj/structure/cable/yellow, /turf/open/floor/plasteel/yellow/side{ dir = 10 }, @@ -3105,9 +3109,7 @@ /area/ruin/space/has_grav/ancientstation/rnd) "ir" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/open/floor/plasteel/orange/side{ dir = 4 }, @@ -3118,22 +3120,26 @@ req_access_txt = "200" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation/rnd) "it" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large/mercury{ +/obj/item/reagent_containers/glass/bottle/mercury{ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/beaker/large/nitrogen{ +/obj/item/reagent_containers/glass/bottle/nitrogen{ pixel_x = -6; pixel_y = 8 }, -/obj/item/reagent_containers/glass/beaker/large/oxygen{ +/obj/item/reagent_containers/glass/bottle/oxygen{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/beaker/large/phosphorus{ +/obj/item/reagent_containers/glass/bottle/phosphorus{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -3141,23 +3147,19 @@ /area/ruin/space/has_grav/ancientstation/rnd) "iu" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large/iodine{ +/obj/item/reagent_containers/glass/bottle/iodine{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/beaker/large/iron{ +/obj/item/reagent_containers/glass/bottle/iron{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/beaker/large/lithium{ +/obj/item/reagent_containers/glass/bottle/lithium{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = 24 - }, /turf/open/floor/plasteel/orange/side{ dir = 4 }, @@ -3262,13 +3264,13 @@ /area/ruin/space/has_grav/ancientstation/rnd) "iG" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large/potassium{ +/obj/item/reagent_containers/glass/bottle/potassium{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/beaker/large/radium{ +/obj/item/reagent_containers/glass/bottle/radium{ pixel_x = -6 }, -/obj/item/reagent_containers/glass/beaker/large/welding_fuel{ +/obj/item/reagent_containers/glass/bottle/welding_fuel{ pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, @@ -3285,6 +3287,10 @@ brightness = 3; dir = 8 }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/ancientstation/kitchen) "iI" = ( @@ -3353,10 +3359,10 @@ /area/ruin/space/has_grav/ancientstation/rnd) "iQ" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large/sugar{ +/obj/item/reagent_containers/glass/bottle/sugar{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/beaker/large/sulfur{ +/obj/item/reagent_containers/glass/bottle/sulfur{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -3366,10 +3372,10 @@ /area/ruin/space/has_grav/ancientstation/rnd) "iR" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large/silver{ +/obj/item/reagent_containers/glass/bottle/silver{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/beaker/large/sodium{ +/obj/item/reagent_containers/glass/bottle/sodium{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -3377,10 +3383,10 @@ /area/ruin/space/has_grav/ancientstation/rnd) "iS" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large/sacid{ +/obj/item/reagent_containers/glass/bottle/sacid{ pixel_x = 6 }, -/obj/item/reagent_containers/glass/beaker/large/silicon{ +/obj/item/reagent_containers/glass/bottle/silicon{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -3389,7 +3395,8 @@ }, /area/ruin/space/has_grav/ancientstation/rnd) "iT" = ( -/obj/structure/closet/crate, +/obj/item/defibrillator, +/obj/structure/closet/crate/medical, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/ancientstation/atmo) "iU" = ( @@ -3398,6 +3405,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "iV" = ( @@ -3451,6 +3461,7 @@ /obj/machinery/door/airlock/research{ name = "Research and Development" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation/rnd) "jd" = ( @@ -3458,6 +3469,7 @@ /obj/machinery/door/airlock/research{ name = "Research and Development" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation/rnd) "je" = ( @@ -3490,6 +3502,11 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/structure/cable/yellow, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "jj" = ( @@ -3500,12 +3517,16 @@ /obj/machinery/door/airlock/engineering{ name = "Backup Generator Room" }, +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "jl" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation) @@ -3541,12 +3562,12 @@ /area/ruin/space/has_grav/ancientstation) "jq" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/transit_tube/station/reverse/flipped{ - dir = 1 - }, /obj/structure/transit_tube_pod{ dir = 4 }, +/obj/structure/transit_tube/station/reverse{ + dir = 1 + }, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation) "jr" = ( @@ -3617,10 +3638,12 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/closet/crate, /obj/item/assembly/flash/handheld, /obj/item/assembly/flash/handheld, /obj/item/storage/box/firingpins, +/obj/structure/closet/crate/secure/weapon{ + req_access_txt = "203" + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) "jB" = ( @@ -3643,8 +3666,8 @@ /obj/item/stack/cable_coil{ amount = 15 }, -/obj/item/paper, /obj/effect/decal/cleanable/dirt, +/obj/item/paper/fluff/ruins/oldstation/generator_manual, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) "jE" = ( @@ -3662,6 +3685,7 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation) "jG" = ( @@ -3713,12 +3737,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation/deltacorridor) -"jN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/item/disk/tech_disk, -/turf/open/floor/plating, -/area/ruin/space/has_grav/ancientstation/deltacorridor) "jO" = ( /turf/open/floor/plating/airless, /area/ruin/space/has_grav/ancientstation/atmo) @@ -3734,7 +3752,7 @@ /turf/template_noop, /area/space/nearstation) "jR" = ( -/obj/structure/cable, +/obj/structure/cable/yellow, /turf/open/floor/plating/airless, /area/template_noop) "jS" = ( @@ -3755,6 +3773,7 @@ name = "Cryogenics Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation) "jV" = ( @@ -3793,6 +3812,10 @@ "jZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/machinery/meter, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) "ka" = ( @@ -3800,11 +3823,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation) -"kb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/turf/open/floor/plating, -/area/ruin/space/has_grav/ancientstation) "kc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb{ @@ -4000,9 +4018,8 @@ /area/ruin/space/has_grav/ancientstation/atmo) "kC" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/solar_assembly, -/obj/item/stack/sheet/glass{ - amount = 30 +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 1 }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) @@ -4032,6 +4049,7 @@ /obj/structure/closet/crate, /obj/item/reagent_containers/spray/weedspray, /obj/item/reagent_containers/spray/pestspray, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) "kH" = ( @@ -4042,6 +4060,7 @@ /obj/item/solar_assembly, /obj/item/solar_assembly, /obj/item/solar_assembly, +/obj/structure/closet/crate/engineering/electrical, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) "kI" = ( @@ -4052,6 +4071,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/open/floor/plasteel/white, /area/ruin/space/has_grav/ancientstation/proto) "kJ" = ( @@ -4160,9 +4183,8 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/ancientstation/atmo) "kW" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Air Outlet Pump" +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 }, /turf/open/floor/plasteel/airless/floorgrime, /area/ruin/space/has_grav/ancientstation/atmo) @@ -4173,7 +4195,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon{ dir = 8; id_tag = "oldstation_air_out"; name = "air output" @@ -4191,6 +4213,7 @@ }, /obj/structure/cable, /obj/item/storage/backpack/old, +/obj/item/storage/backpack/old, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) "kZ" = ( @@ -4305,6 +4328,7 @@ /obj/machinery/door/airlock/science{ name = "Artificial Program Core Room" }, +/obj/machinery/door/firedoor, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/hivebot) "lz" = ( @@ -4313,6 +4337,10 @@ "lL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/airalarm/all_access{ + dir = 8; + pixel_x = 24 + }, /turf/open/floor/plasteel/orange/corner, /area/ruin/space/has_grav/ancientstation/rnd) "lM" = ( @@ -4354,34 +4382,207 @@ }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/hivebot) +"nM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/plasteel/orange/side{ + dir = 8 + }, +/area/ruin/space/has_grav/ancientstation/rnd) "oM" = ( /obj/machinery/door/airlock/external{ name = "Engineering External Access"; - req_access = null; req_access_txt = "200" }, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/engi) +"py" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/mob/living/simple_animal/hostile/hivebot, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/space/has_grav/ancientstation/deltacorridor) +"qB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/space/has_grav/ancientstation/deltacorridor) +"rv" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/space/has_grav/ancientstation) +"sC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock, +/turf/open/floor/plasteel/white, +/area/ruin/space/has_grav/ancientstation) +"sD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/toilet, +/turf/open/floor/plasteel/white, +/area/ruin/space/has_grav/ancientstation) +"td" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/particle_accelerator/particle_emitter/center, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation/deltacorridor) +"tT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/particle_accelerator/end_cap, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation/deltacorridor) +"vG" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/whitepurple/side{ + dir = 9 + }, +/area/ruin/space/has_grav/ancientstation/rnd) +"wC" = ( +/obj/structure/particle_accelerator/power_box, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation/deltacorridor) +"yk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation) +"zh" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/whitepurple/side{ + dir = 6 + }, +/area/ruin/space/has_grav/ancientstation/rnd) +"Af" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation) +"BH" = ( +/obj/structure/particle_accelerator/particle_emitter/left, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation/deltacorridor) "Dj" = ( /obj/structure/transit_tube{ dir = 4 }, /turf/template_noop, /area/space/nearstation) +"FH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/mirror{ + name = "dusty mirror"; + pixel_x = -26 + }, +/obj/machinery/light/small{ + dir = 8; + pixel_y = -10 + }, +/turf/open/floor/plasteel/white, +/area/ruin/space/has_grav/ancientstation) "Ga" = ( /obj/structure/transit_tube/crossing/horizontal, /turf/template_noop, /area/space/nearstation) +"It" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + name = "dusty mirror"; + pixel_x = 26 + }, +/turf/open/floor/plasteel/white, +/area/ruin/space/has_grav/ancientstation) +"Ka" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/space/has_grav/ancientstation) +"Ku" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/particle_accelerator/control_box, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation/deltacorridor) +"KR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, +/obj/structure/closet/crate/secure/engineering{ + name = "plasma tank crate"; + req_access_txt = "204" + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation/deltacorridor) +"Ll" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/particle_accelerator/particle_emitter/right, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation/deltacorridor) +"LY" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/space/has_grav/ancientstation) +"MS" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/space/has_grav/ancientstation/deltacorridor) "MZ" = ( /obj/machinery/door/airlock/highsecurity, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -4389,6 +4590,146 @@ }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/hivebot) +"NF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/plasteel/white, +/area/ruin/space/has_grav/ancientstation/rnd) +"NK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/urinal{ + pixel_y = 32 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ruin/space/has_grav/ancientstation) +"OA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/space/has_grav/ancientstation/rnd) +"OC" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white, +/area/ruin/space/has_grav/ancientstation) +"OY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 4 + }, +/mob/living/simple_animal/hostile/hivebot, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation/deltacorridor) +"Pl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/item/solar_assembly, +/obj/item/stack/sheet/glass{ + amount = 30 + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation) +"PV" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-25" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/departments/restroom{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/space/has_grav/ancientstation) +"Ql" = ( +/obj/machinery/door/airlock, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation) +"Qp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/window/westright, +/obj/machinery/shower{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ruin/space/has_grav/ancientstation) +"Sf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/particle_accelerator/fuel_chamber, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation/deltacorridor) +"SJ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/whitepurple/side{ + dir = 10 + }, +/area/ruin/space/has_grav/ancientstation/rnd) +"SP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/mirror{ + name = "dusty mirror"; + pixel_x = -26 + }, +/turf/open/floor/plasteel/white, +/area/ruin/space/has_grav/ancientstation) +"Vs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/space/has_grav/ancientstation/deltacorridor) +"XJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation/engi) +"Yc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation) +"Yi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation/engi) +"Ym" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/window/westleft, +/obj/machinery/shower{ + dir = 8 + }, +/obj/item/soap/nanotrasen, +/turf/open/floor/plasteel/white, +/area/ruin/space/has_grav/ancientstation) +"ZE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/space/has_grav/ancientstation) (1,1,1) = {" aa @@ -5277,7 +5618,7 @@ ei dH dH dH -gf +gc ei ei ei @@ -5564,9 +5905,9 @@ dl ek em fd -fE +Yi gj -fE +Yi hm em ie @@ -5669,7 +6010,7 @@ em iw dl iV -jj +XJ jC dl aa @@ -5801,7 +6142,7 @@ cl cO dm cl -cl +rv eO fg cl @@ -5810,14 +6151,14 @@ cl hq eO ih -cl +rv dm cO -cl +LY jE aG jZ -aY +yk kC aG aG @@ -5863,11 +6204,11 @@ bT cP jl jF -bx -aU -aU +Yc +Af aU aU +Pl kY aG aa @@ -5961,7 +6302,7 @@ co bR aG aG -bN +ZE kD kN kD @@ -6414,12 +6755,12 @@ aa aa aa aG -aS -aY -aY -aY -aY -bC +NK +OC +sC +FH +SP +Ql bN bN cU @@ -6440,10 +6781,10 @@ jb jp bN bC -kb +aY aY kG -aY +aS aY aG aa @@ -6462,25 +6803,25 @@ aa aa aa aG -aG -aG +sD +It bc -aY -aY +Qp +Ym aG -bW +PV bN cV du bN -bN +Ka bN bR bN gz bN bR -bN +Ka bN bN iO @@ -6509,7 +6850,7 @@ aa aa aa aa -aa +aG aG aG aG @@ -7241,7 +7582,7 @@ cz cY dw dW -ey +MS eW ft fR @@ -7249,7 +7590,7 @@ gK ey hC ey -ey +MS iC dw ey @@ -7384,9 +7725,9 @@ bD cC db dy -dY +vG ez -dZ +NF dZ fT eb @@ -7528,11 +7869,11 @@ lx cE dc dy -ea +fo eC dZ dZ -fU +zh gO hh eb @@ -7676,7 +8017,7 @@ ec dZ dZ eC -fV +SJ eb dy dy @@ -7729,12 +8070,12 @@ gQ dy hF lM -eb -lM +OA +nM iQ dy jx -ed +py jV kk kx @@ -7816,7 +8157,7 @@ bD cF db dy -ea +fo eF dZ dZ @@ -7961,7 +8302,7 @@ cH dg dC ee -ca +qB eY cX ed @@ -7971,7 +8312,7 @@ hJ ed ca ee -cX +Vs jf ca cH @@ -8054,19 +8395,19 @@ ac bD cc cc -cc +dh bD aa bD eZ eZ -dh -dh -dh eZ -hK -bD -aa +dh +dh +dh +dh +td +tT bD cc cc @@ -8101,24 +8442,24 @@ ac ac bD cd -cJ -dh +OY +KR bD aa bD eZ fz -dh -dh +fz dh hK hK -bD -aa +Ku +Ll +Sf bD jg jz -jN +dh bD aa aa @@ -8158,12 +8499,12 @@ bD fz fz fz -fz hK +hK +BH +wC bD bD -aa -bD bD bD bD @@ -8209,8 +8550,8 @@ bD bD bD bD -aa -aa +bD +bD aa aa aa diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 2ff9d1e850f..e4967b494d0 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -384,25 +384,27 @@ update_label("John Doe", "Clowny") /obj/item/card/id/away/old name = "a perfectly generic identification card" desc = "A perfectly generic identification card. Looks like it could use some flavor." - access = list(ACCESS_AWAY_GENERAL) + icon_state = "centcom" /obj/item/card/id/away/old/sec - name = "Security Officer ID" - desc = "Security officers ID card." - icon_state = "centcom" + name = "Charlie Station Security Officer's ID card" + desc = "A faded Charlie Station ID card. You can make out the rank \"Security Officer\"." + assignment = "Charlie Station Security Officer" + access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_SEC) /obj/item/card/id/away/old/sci - name = "Scientist ID" - desc = "Scientists ID card." - icon_state = "centcom" + name = "Charlie Station Scientist's ID card" + desc = "A faded Charlie Station ID card. You can make out the rank \"Scientist\"." + assignment = "Charlie Station Scientist" + access = list(ACCESS_AWAY_GENERAL) /obj/item/card/id/away/old/eng - name = "Engineer ID" - desc = "Engineers ID card." - icon_state = "centcom" + name = "Charlie Station Engineer's ID card" + desc = "A faded Charlie Station ID card. You can make out the rank \"Station Engineer\"." + assignment = "Charlie Station Engineer" + access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_ENGINE) /obj/item/card/id/away/old/apc name = "APC Access ID" - desc = "Special ID card to allow access to APCs." - icon_state = "centcom" + desc = "A special ID card that allows access to APC terminals." access = list(ACCESS_ENGINE_EQUIP) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 6c5ecf149e9..6290139bb45 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -477,7 +477,8 @@ mob_species = /datum/species/human flavour_text = "You are a security officer working for Nanotrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \ cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \ - your eyes, everything seems rusted and broken, a dark feeling sweels in your gut as you climb out of your pod." + your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod. \ + Work as a team with your fellow survivors and do not abandon them." uniform = /obj/item/clothing/under/rank/security shoes = /obj/item/clothing/shoes/jackboots id = /obj/item/card/id/away/old/sec @@ -501,7 +502,8 @@ mob_species = /datum/species/human flavour_text = "You are an engineer working for Nanotrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \ cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \ - your eyes, everything seems rusted and broken, a dark feeling sweels in your gut as you climb out of your pod." + your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod. \ + Work as a team with your fellow survivors and do not abandon them." uniform = /obj/item/clothing/under/rank/engineer shoes = /obj/item/clothing/shoes/workboots id = /obj/item/card/id/away/old/eng @@ -525,7 +527,8 @@ mob_species = /datum/species/human flavour_text = "You are a scientist working for Nanotrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \ cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \ - your eyes, everything seems rusted and broken, a dark feeling sweels in your gut as you climb out of your pod." + your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod. \ + Work as a team with your fellow survivors and do not abandon them." uniform = /obj/item/clothing/under/rank/scientist shoes = /obj/item/clothing/shoes/laceup id = /obj/item/card/id/away/old/sci diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 4d737657f8d..66befb1bb6f 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -302,3 +302,105 @@ name = "BVAK bottle" desc = "A small bottle containing Bio Virus Antidote Kit." list_reagents = list("atropine" = 5, "epinephrine" = 5, "salbutamol" = 10, "spaceacillin" = 10) + +//Oldstation.dmm chemical storage bottles + +/obj/item/reagent_containers/glass/bottle/hydrogen + name = "hydrogen bottle" + list_reagents = list("hydrogen" = 30) + +/obj/item/reagent_containers/glass/bottle/lithium + name = "lithium bottle" + list_reagents = list("lithium" = 30) + +/obj/item/reagent_containers/glass/bottle/carbon + name = "carbon bottle" + list_reagents = list("carbon" = 30) + +/obj/item/reagent_containers/glass/bottle/nitrogen + name = "nitrogen bottle" + list_reagents = list("nitrogen" = 30) + +/obj/item/reagent_containers/glass/bottle/oxygen + name = "oxygen bottle" + list_reagents = list("oxygen" = 30) + +/obj/item/reagent_containers/glass/bottle/fluorine + name = "fluorine bottle" + list_reagents = list("fluorine" = 30) + +/obj/item/reagent_containers/glass/bottle/sodium + name = "sodium bottle" + list_reagents = list("sodium" = 30) + +/obj/item/reagent_containers/glass/bottle/aluminium + name = "aluminium bottle" + list_reagents = list("aluminium" = 30) + +/obj/item/reagent_containers/glass/bottle/silicon + name = "silicon bottle" + list_reagents = list("silicon" = 30) + +/obj/item/reagent_containers/glass/bottle/phosphorus + name = "phosphorus bottle" + list_reagents = list("phosphorus" = 30) + +/obj/item/reagent_containers/glass/bottle/sulfur + name = "sulfur bottle" + list_reagents = list("sulfur" = 30) + +/obj/item/reagent_containers/glass/bottle/chlorine + name = "chlorine bottle" + list_reagents = list("chlorine" = 30) + +/obj/item/reagent_containers/glass/bottle/potassium + name = "potassium bottle" + list_reagents = list("potassium" = 30) + +/obj/item/reagent_containers/glass/bottle/iron + name = "iron bottle" + list_reagents = list("iron" = 30) + +/obj/item/reagent_containers/glass/bottle/copper + name = "copper bottle" + list_reagents = list("copper" = 30) + +/obj/item/reagent_containers/glass/bottle/mercury + name = "mercury bottle" + list_reagents = list("mercury" = 30) + +/obj/item/reagent_containers/glass/bottle/radium + name = "radium bottle" + list_reagents = list("radium" = 30) + +/obj/item/reagent_containers/glass/bottle/water + name = "water bottle" + list_reagents = list("water" = 30) + +/obj/item/reagent_containers/glass/bottle/ethanol + name = "ethanol bottle" + list_reagents = list("ethanol" = 30) + +/obj/item/reagent_containers/glass/bottle/sugar + name = "sugar bottle" + list_reagents = list("sugar" = 30) + +/obj/item/reagent_containers/glass/bottle/sacid + name = "sulphuric acid bottle" + list_reagents = list("sacid" = 30) + +/obj/item/reagent_containers/glass/bottle/welding_fuel + name = "welding fuel bottle" + list_reagents = list("welding_fuel" = 30) + +/obj/item/reagent_containers/glass/bottle/silver + name = "silver bottle" + list_reagents = list("silver" = 30) + +/obj/item/reagent_containers/glass/bottle/iodine + name = "iodine bottle" + list_reagents = list("iodine" = 30) + +/obj/item/reagent_containers/glass/bottle/bromine + name = "bromine bottle" + list_reagents = list("bromine" = 30) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 8da31a7ba1a..3b978889043 100755 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -331,103 +331,3 @@ /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty list_reagents = list() - -/obj/item/reagent_containers/glass/beaker/large/hydrogen - name = "hydrogen beaker" - list_reagents = list("hydrogen" = 50) - -/obj/item/reagent_containers/glass/beaker/large/lithium - name = "lithium beaker" - list_reagents = list("lithium" = 50) - -/obj/item/reagent_containers/glass/beaker/large/carbon - name = "carbon beaker" - list_reagents = list("carbon" = 50) - -/obj/item/reagent_containers/glass/beaker/large/nitrogen - name = "nitrogen beaker" - list_reagents = list("nitrogen" = 50) - -/obj/item/reagent_containers/glass/beaker/large/oxygen - name = "oxygen beaker" - list_reagents = list("oxygen" = 50) - -/obj/item/reagent_containers/glass/beaker/large/fluorine - name = "fluorine beaker" - list_reagents = list("fluorine" = 50) - -/obj/item/reagent_containers/glass/beaker/large/sodium - name = "sodium beaker" - list_reagents = list("sodium" = 50) - -/obj/item/reagent_containers/glass/beaker/large/aluminium - name = "aluminium beaker" - list_reagents = list("aluminium" = 50) - -/obj/item/reagent_containers/glass/beaker/large/silicon - name = "silicon beaker" - list_reagents = list("silicon" = 50) - -/obj/item/reagent_containers/glass/beaker/large/phosphorus - name = "phosphorus beaker" - list_reagents = list("phosphorus" = 50) - -/obj/item/reagent_containers/glass/beaker/large/sulfur - name = "sulfur beaker" - list_reagents = list("sulfur" = 50) - -/obj/item/reagent_containers/glass/beaker/large/chlorine - name = "chlorine beaker" - list_reagents = list("chlorine" = 50) - -/obj/item/reagent_containers/glass/beaker/large/potassium - name = "potassium beaker" - list_reagents = list("potassium" = 50) - -/obj/item/reagent_containers/glass/beaker/large/iron - name = "iron beaker" - list_reagents = list("iron" = 50) - -/obj/item/reagent_containers/glass/beaker/large/copper - name = "copper beaker" - list_reagents = list("copper" = 50) - -/obj/item/reagent_containers/glass/beaker/large/mercury - name = "mercury beaker" - list_reagents = list("mercury" = 50) - -/obj/item/reagent_containers/glass/beaker/large/radium - name = "radium beaker" - list_reagents = list("radium" = 50) - -/obj/item/reagent_containers/glass/beaker/large/water - name = "water beaker" - list_reagents = list("water" = 50) - -/obj/item/reagent_containers/glass/beaker/large/ethanol - name = "ethanol beaker" - list_reagents = list("ethanol" = 50) - -/obj/item/reagent_containers/glass/beaker/large/sugar - name = "sugar beaker" - list_reagents = list("sugar" = 50) - -/obj/item/reagent_containers/glass/beaker/large/sacid - name = "sulphuric acid beaker" - list_reagents = list("sacid" = 50) - -/obj/item/reagent_containers/glass/beaker/large/welding_fuel - name = "welding fuel beaker" - list_reagents = list("welding_fuel" = 50) - -/obj/item/reagent_containers/glass/beaker/large/silver - name = "silver beaker" - list_reagents = list("silver" = 50) - -/obj/item/reagent_containers/glass/beaker/large/iodine - name = "iodine beaker" - list_reagents = list("iodine" = 50) - -/obj/item/reagent_containers/glass/beaker/large/bromine - name = "bromine beaker" - list_reagents = list("bromine" = 50) diff --git a/code/modules/ruins/spaceruin_code/oldstation.dm b/code/modules/ruins/spaceruin_code/oldstation.dm index b2161450237..e72dbea044c 100644 --- a/code/modules/ruins/spaceruin_code/oldstation.dm +++ b/code/modules/ruins/spaceruin_code/oldstation.dm @@ -47,3 +47,7 @@ SIGNIFICANT EVENTS OF NOTE
1: The primary radiation detectors were taken offline after 112 years due to power failure, secondary radiation detectors showed no residual \ radiation on station. Deduction, primarily detector was malfunctioning and was producing a radiation signal when there was none.

2: A data burst from a nearby Nanotrasen Space \ Station was received, this data burst contained research data that has been uploaded to our RnD labs.

3: Unknown invasion force has occupied Delta station." + +/obj/item/paper/fluff/ruins/oldstation/generator_manual + name = "S.U.P.E.R.P.A.C.M.A.N.-type portable generator manual" + info = "You can barely make out a faded sentence...

Wrench down the generator on top of a wire node connected to either a SMES input terminal or the power grid."