shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Oldstation edits/fixes (#33080)

Browse Source
This commit is contained in:
Mark9013100
2017-11-26 00:01:21 -06:00
committed by CitadelStationBot
parent d3b3c54e70
commit fb4787fbd1
2 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/oldstation.dmm
+30 -30
View File
@@ -1979,7 +1979,7 @@
"fI" = ( "fI" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/door/airlock/maintenance_hatch,
/obj/machinery/atmospherics/pipe/simple/supply/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/hydroponics) /area/ruin/space/has_grav/ancientstation/hydroponics)
"fJ" = ( "fJ" = (
@@ -2111,12 +2111,12 @@
/turf/open/floor/plasteel/airless/floorgrime, /turf/open/floor/plasteel/airless/floorgrime,
/area/ruin/space/has_grav/ancientstation/betanorth) /area/ruin/space/has_grav/ancientstation/betanorth)
"ga" = ( "ga" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
},
/obj/structure/cable{ /obj/structure/cable{
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plating/airless, /turf/open/floor/plating/airless,
/area/ruin/space/has_grav/ancientstation/betanorth) /area/ruin/space/has_grav/ancientstation/betanorth)
"gb" = ( "gb" = (
@@ -2124,7 +2124,7 @@
/obj/item/stack/cable_coil{ /obj/item/stack/cable_coil{
amount = 2 amount = 2
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/template_noop, /turf/template_noop,
@@ -2134,12 +2134,12 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "2-4" icon_state = "2-4"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
},
/obj/structure/cable{ /obj/structure/cable{
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/template_noop, /turf/template_noop,
/area/template_noop) /area/template_noop)
"gd" = ( "gd" = (
@@ -2147,7 +2147,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/template_noop, /turf/template_noop,
@@ -2163,7 +2163,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/template_noop, /turf/template_noop,
@@ -2176,7 +2176,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "2-4" icon_state = "2-4"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/template_noop, /turf/template_noop,
@@ -2192,7 +2192,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2202,7 +2202,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2216,7 +2216,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "2-8" icon_state = "2-8"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2230,7 +2230,7 @@
icon_state = "1-8" icon_state = "1-8"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2253,7 +2253,7 @@
/obj/item/stack/cable_coil{ /obj/item/stack/cable_coil{
amount = 2 amount = 2
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2318,7 +2318,7 @@
}, },
/obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/door/airlock/maintenance_hatch,
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2328,7 +2328,7 @@
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2347,7 +2347,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "0-8" icon_state = "0-8"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2358,7 +2358,7 @@
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/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 dir = 4
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2485,7 +2485,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "0-4" icon_state = "0-4"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2494,7 +2494,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/open/floor/plating/airless, /turf/open/floor/plating/airless,
@@ -2504,7 +2504,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2514,7 +2514,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2527,7 +2527,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-8" icon_state = "1-8"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2538,7 +2538,7 @@
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/door/airlock/maintenance_hatch,
/obj/machinery/atmospherics/pipe/simple/supply/visible{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -2670,7 +2670,7 @@
"gZ" = ( "gZ" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/door/airlock/maintenance_hatch,
/obj/machinery/atmospherics/pipe/simple/supply/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/kitchen) /area/ruin/space/has_grav/ancientstation/kitchen)
"ha" = ( "ha" = (
@@ -2687,7 +2687,7 @@
/area/ruin/space/has_grav/ancientstation/sec) /area/ruin/space/has_grav/ancientstation/sec)
"hc" = ( "hc" = (
/obj/effect/decal/cleanable/dirt, /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{ /turf/open/floor/plasteel/red/side{
dir = 4 dir = 4
}, },
@@ -2854,7 +2854,7 @@
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 4 dir = 4
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/red/side{ /turf/open/floor/plasteel/red/side{
dir = 4 dir = 4
}, },
@@ -4288,7 +4288,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/ancientstation/proto) /area/ruin/space/has_grav/ancientstation/proto)
"kV" = ( "kV" = (
/obj/machinery/atmospherics/pipe/manifold/supply/visible{ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8 dir = 8
}, },
/turf/open/floor/plating/airless, /turf/open/floor/plating/airless,
code/modules/reagents/reagent_containers/glass.dm
+25 -25
View File
@@ -315,101 +315,101 @@
list_reagents = list() list_reagents = list()
/obj/item/reagent_containers/glass/beaker/large/hydrogen /obj/item/reagent_containers/glass/beaker/large/hydrogen
name = "hydrogen" name = "hydrogen beaker"
list_reagents = list("hydrogen" = 50) list_reagents = list("hydrogen" = 50)
/obj/item/reagent_containers/glass/beaker/large/lithium /obj/item/reagent_containers/glass/beaker/large/lithium
name = "lithium" name = "lithium beaker"
list_reagents = list("lithium" = 50) list_reagents = list("lithium" = 50)
/obj/item/reagent_containers/glass/beaker/large/carbon /obj/item/reagent_containers/glass/beaker/large/carbon
name = "carbon" name = "carbon beaker"
list_reagents = list("carbon" = 50) list_reagents = list("carbon" = 50)
/obj/item/reagent_containers/glass/beaker/large/nitrogen /obj/item/reagent_containers/glass/beaker/large/nitrogen
name = "nitrogen" name = "nitrogen beaker"
list_reagents = list("nitrogen" = 50) list_reagents = list("nitrogen" = 50)
/obj/item/reagent_containers/glass/beaker/large/oxygen /obj/item/reagent_containers/glass/beaker/large/oxygen
name = "oxygen" name = "oxygen beaker"
list_reagents = list("oxygen" = 50) list_reagents = list("oxygen" = 50)
/obj/item/reagent_containers/glass/beaker/large/fluorine /obj/item/reagent_containers/glass/beaker/large/fluorine
name = "fluorine" name = "fluorine beaker"
list_reagents = list("fluorine" = 50) list_reagents = list("fluorine" = 50)
/obj/item/reagent_containers/glass/beaker/large/sodium /obj/item/reagent_containers/glass/beaker/large/sodium
name = "sodium" name = "sodium beaker"
list_reagents = list("sodium" = 50) list_reagents = list("sodium" = 50)
/obj/item/reagent_containers/glass/beaker/large/aluminium /obj/item/reagent_containers/glass/beaker/large/aluminium
name = "aluminium" name = "aluminium beaker"
list_reagents = list("aluminium" = 50) list_reagents = list("aluminium" = 50)
/obj/item/reagent_containers/glass/beaker/large/silicon /obj/item/reagent_containers/glass/beaker/large/silicon
name = "silicon" name = "silicon beaker"
list_reagents = list("silicon" = 50) list_reagents = list("silicon" = 50)
/obj/item/reagent_containers/glass/beaker/large/phosphorus /obj/item/reagent_containers/glass/beaker/large/phosphorus
name = "phosphorus" name = "phosphorus beaker"
list_reagents = list("phosphorus" = 50) list_reagents = list("phosphorus" = 50)
/obj/item/reagent_containers/glass/beaker/large/sulfur /obj/item/reagent_containers/glass/beaker/large/sulfur
name = "sulfur" name = "sulfur beaker"
list_reagents = list("sulfur" = 50) list_reagents = list("sulfur" = 50)
/obj/item/reagent_containers/glass/beaker/large/chlorine /obj/item/reagent_containers/glass/beaker/large/chlorine
name = "chlorine" name = "chlorine beaker"
list_reagents = list("chlorine" = 50) list_reagents = list("chlorine" = 50)
/obj/item/reagent_containers/glass/beaker/large/potassium /obj/item/reagent_containers/glass/beaker/large/potassium
name = "potassium" name = "potassium beaker"
list_reagents = list("potassium" = 50) list_reagents = list("potassium" = 50)
/obj/item/reagent_containers/glass/beaker/large/iron /obj/item/reagent_containers/glass/beaker/large/iron
name = "iron" name = "iron beaker"
list_reagents = list("iron" = 50) list_reagents = list("iron" = 50)
/obj/item/reagent_containers/glass/beaker/large/copper /obj/item/reagent_containers/glass/beaker/large/copper
name = "copper" name = "copper beaker"
list_reagents = list("copper" = 50) list_reagents = list("copper" = 50)
/obj/item/reagent_containers/glass/beaker/large/mercury /obj/item/reagent_containers/glass/beaker/large/mercury
name = "mercury" name = "mercury beaker"
list_reagents = list("mercury" = 50) list_reagents = list("mercury" = 50)
/obj/item/reagent_containers/glass/beaker/large/radium /obj/item/reagent_containers/glass/beaker/large/radium
name = "radium" name = "radium beaker"
list_reagents = list("radium" = 50) list_reagents = list("radium" = 50)
/obj/item/reagent_containers/glass/beaker/large/water /obj/item/reagent_containers/glass/beaker/large/water
name = "water" name = "water beaker"
list_reagents = list("water" = 50) list_reagents = list("water" = 50)
/obj/item/reagent_containers/glass/beaker/large/ethanol /obj/item/reagent_containers/glass/beaker/large/ethanol
name = "ethanol" name = "ethanol beaker"
list_reagents = list("ethanol" = 50) list_reagents = list("ethanol" = 50)
/obj/item/reagent_containers/glass/beaker/large/sugar /obj/item/reagent_containers/glass/beaker/large/sugar
name = "sugar" name = "sugar beaker"
list_reagents = list("sugar" = 50) list_reagents = list("sugar" = 50)
/obj/item/reagent_containers/glass/beaker/large/sacid /obj/item/reagent_containers/glass/beaker/large/sacid
name = "sacid" name = "sulphuric acid beaker"
list_reagents = list("sacid" = 50) list_reagents = list("sacid" = 50)
/obj/item/reagent_containers/glass/beaker/large/welding_fuel /obj/item/reagent_containers/glass/beaker/large/welding_fuel
name = "welding_fuel" name = "welding fuel beaker"
list_reagents = list("welding_fuel" = 50) list_reagents = list("welding_fuel" = 50)
/obj/item/reagent_containers/glass/beaker/large/silver /obj/item/reagent_containers/glass/beaker/large/silver
name = "silver" name = "silver beaker"
list_reagents = list("silver" = 50) list_reagents = list("silver" = 50)
/obj/item/reagent_containers/glass/beaker/large/iodine /obj/item/reagent_containers/glass/beaker/large/iodine
name = "iodine" name = "iodine beaker"
list_reagents = list("iodine" = 50) list_reagents = list("iodine" = 50)
/obj/item/reagent_containers/glass/beaker/large/bromine /obj/item/reagent_containers/glass/beaker/large/bromine
name = "bromine" name = "bromine beaker"
list_reagents = list("bromine" = 50) list_reagents = list("bromine" = 50)