From fb4787fbd1bef04e82ae257bdbdebfb27caf86c8 Mon Sep 17 00:00:00 2001 From: Mark9013100 Date: Sun, 26 Nov 2017 01:01:03 -0500 Subject: [PATCH] Oldstation edits/fixes (#33080) --- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 60 +++++++++---------- .../reagents/reagent_containers/glass.dm | 50 ++++++++-------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index bf9e23978e..d0c8abc18e 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -1979,7 +1979,7 @@ "fI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/hydroponics) "fJ" = ( @@ -2111,12 +2111,12 @@ /turf/open/floor/plasteel/airless/floorgrime, /area/ruin/space/has_grav/ancientstation/betanorth) "ga" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/ancientstation/betanorth) "gb" = ( @@ -2124,7 +2124,7 @@ /obj/item/stack/cable_coil{ amount = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/template_noop, @@ -2134,12 +2134,12 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/template_noop, /area/template_noop) "gd" = ( @@ -2147,7 +2147,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/template_noop, @@ -2163,7 +2163,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/template_noop, @@ -2176,7 +2176,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/template_noop, @@ -2192,7 +2192,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2202,7 +2202,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2216,7 +2216,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2230,7 +2230,7 @@ icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2253,7 +2253,7 @@ /obj/item/stack/cable_coil{ amount = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2318,7 +2318,7 @@ }, /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2328,7 +2328,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2347,7 +2347,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2358,7 +2358,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2485,7 +2485,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2494,7 +2494,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating/airless, @@ -2504,7 +2504,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2514,7 +2514,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2527,7 +2527,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2538,7 +2538,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2670,7 +2670,7 @@ "gZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/kitchen) "ha" = ( @@ -2687,7 +2687,7 @@ /area/ruin/space/has_grav/ancientstation/sec) "hc" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/red/side{ dir = 4 }, @@ -2854,7 +2854,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/red/side{ dir = 4 }, @@ -4288,7 +4288,7 @@ /turf/open/floor/plasteel/white, /area/ruin/space/has_grav/ancientstation/proto) "kV" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/plating/airless, diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 20c4ba6933..c27e2e9ea5 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -315,101 +315,101 @@ list_reagents = list() /obj/item/reagent_containers/glass/beaker/large/hydrogen - name = "hydrogen" + name = "hydrogen beaker" list_reagents = list("hydrogen" = 50) /obj/item/reagent_containers/glass/beaker/large/lithium - name = "lithium" + name = "lithium beaker" list_reagents = list("lithium" = 50) /obj/item/reagent_containers/glass/beaker/large/carbon - name = "carbon" + name = "carbon beaker" list_reagents = list("carbon" = 50) /obj/item/reagent_containers/glass/beaker/large/nitrogen - name = "nitrogen" + name = "nitrogen beaker" list_reagents = list("nitrogen" = 50) /obj/item/reagent_containers/glass/beaker/large/oxygen - name = "oxygen" + name = "oxygen beaker" list_reagents = list("oxygen" = 50) /obj/item/reagent_containers/glass/beaker/large/fluorine - name = "fluorine" + name = "fluorine beaker" list_reagents = list("fluorine" = 50) /obj/item/reagent_containers/glass/beaker/large/sodium - name = "sodium" + name = "sodium beaker" list_reagents = list("sodium" = 50) /obj/item/reagent_containers/glass/beaker/large/aluminium - name = "aluminium" + name = "aluminium beaker" list_reagents = list("aluminium" = 50) /obj/item/reagent_containers/glass/beaker/large/silicon - name = "silicon" + name = "silicon beaker" list_reagents = list("silicon" = 50) /obj/item/reagent_containers/glass/beaker/large/phosphorus - name = "phosphorus" + name = "phosphorus beaker" list_reagents = list("phosphorus" = 50) /obj/item/reagent_containers/glass/beaker/large/sulfur - name = "sulfur" + name = "sulfur beaker" list_reagents = list("sulfur" = 50) /obj/item/reagent_containers/glass/beaker/large/chlorine - name = "chlorine" + name = "chlorine beaker" list_reagents = list("chlorine" = 50) /obj/item/reagent_containers/glass/beaker/large/potassium - name = "potassium" + name = "potassium beaker" list_reagents = list("potassium" = 50) /obj/item/reagent_containers/glass/beaker/large/iron - name = "iron" + name = "iron beaker" list_reagents = list("iron" = 50) /obj/item/reagent_containers/glass/beaker/large/copper - name = "copper" + name = "copper beaker" list_reagents = list("copper" = 50) /obj/item/reagent_containers/glass/beaker/large/mercury - name = "mercury" + name = "mercury beaker" list_reagents = list("mercury" = 50) /obj/item/reagent_containers/glass/beaker/large/radium - name = "radium" + name = "radium beaker" list_reagents = list("radium" = 50) /obj/item/reagent_containers/glass/beaker/large/water - name = "water" + name = "water beaker" list_reagents = list("water" = 50) /obj/item/reagent_containers/glass/beaker/large/ethanol - name = "ethanol" + name = "ethanol beaker" list_reagents = list("ethanol" = 50) /obj/item/reagent_containers/glass/beaker/large/sugar - name = "sugar" + name = "sugar beaker" list_reagents = list("sugar" = 50) /obj/item/reagent_containers/glass/beaker/large/sacid - name = "sacid" + name = "sulphuric acid beaker" list_reagents = list("sacid" = 50) /obj/item/reagent_containers/glass/beaker/large/welding_fuel - name = "welding_fuel" + name = "welding fuel beaker" list_reagents = list("welding_fuel" = 50) /obj/item/reagent_containers/glass/beaker/large/silver - name = "silver" + name = "silver beaker" list_reagents = list("silver" = 50) /obj/item/reagent_containers/glass/beaker/large/iodine - name = "iodine" + name = "iodine beaker" list_reagents = list("iodine" = 50) /obj/item/reagent_containers/glass/beaker/large/bromine - name = "bromine" + name = "bromine beaker" list_reagents = list("bromine" = 50) \ No newline at end of file