Merge pull request #2024 from yogstation13/upstream-merge-39472

[MIRROR] Lavaland Syndie base tweaks
This commit is contained in:
1fbff5f83b23d39d38b1dfcb4cac8d9b
2018-08-05 20:34:57 +02:00
committed by GitHub
6 changed files with 275 additions and 230 deletions

View File

@@ -51,7 +51,7 @@
/area/ruin/unpowered/syndicate_lava_base/main) /area/ruin/unpowered/syndicate_lava_base/main)
"ah" = ( "ah" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer{ /obj/machinery/chem_dispenser/drinks/beer/fullupgrade{
dir = 1 dir = 1
}, },
/obj/structure/sign/barsign{ /obj/structure/sign/barsign{
@@ -63,7 +63,7 @@
/area/ruin/unpowered/syndicate_lava_base/bar) /area/ruin/unpowered/syndicate_lava_base/bar)
"ai" = ( "ai" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks{ /obj/machinery/chem_dispenser/drinks/fullupgrade{
dir = 1 dir = 1
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -162,6 +162,12 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/circuits) /area/ruin/unpowered/syndicate_lava_base/circuits)
"aF" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
},
/turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"aL" = ( "aL" = (
/turf/closed/wall/mineral/plastitanium/explosive, /turf/closed/wall/mineral/plastitanium/explosive,
/area/ruin/unpowered/syndicate_lava_base/testlab) /area/ruin/unpowered/syndicate_lava_base/testlab)
@@ -339,7 +345,8 @@
req_access_txt = "150" req_access_txt = "150"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/storage/box/beakers, /obj/item/storage/box/beakers/bluespace,
/obj/item/storage/box/beakers/bluespace,
/turf/open/floor/plasteel/white/side{ /turf/open/floor/plasteel/white/side{
dir = 9 dir = 9
}, },
@@ -547,6 +554,7 @@
"dR" = ( "dR" = (
/obj/machinery/door/firedoor, /obj/machinery/door/firedoor,
/obj/machinery/door/airlock/hatch{ /obj/machinery/door/airlock/hatch{
heat_proof = 1;
name = "Experimentation Room"; name = "Experimentation Room";
req_access_txt = "150" req_access_txt = "150"
}, },
@@ -628,6 +636,9 @@
pixel_x = 24 pixel_x = 24
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/screwdriver/nuke{
pixel_y = 18
},
/turf/open/floor/plasteel/white/side{ /turf/open/floor/plasteel/white/side{
dir = 4 dir = 4
}, },
@@ -789,71 +800,26 @@
/area/ruin/unpowered/syndicate_lava_base/testlab) /area/ruin/unpowered/syndicate_lava_base/testlab)
"eo" = ( "eo" = (
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/item/stack/sheet/metal/fifty, /obj/item/storage/toolbox/syndicate,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade/adv_release{
pixel_x = 8
},
/obj/item/grenade/chem_grenade/adv_release{
pixel_x = 8
},
/obj/item/grenade/chem_grenade/pyro{
pixel_x = 4;
pixel_y = 6
},
/obj/item/grenade/chem_grenade/pyro{
pixel_x = 4;
pixel_y = 6
},
/obj/item/grenade/chem_grenade/cryo{
pixel_x = -6;
pixel_y = 4
},
/obj/item/grenade/chem_grenade/cryo{
pixel_x = -6;
pixel_y = 4
},
/turf/open/floor/plasteel/vault{ /turf/open/floor/plasteel/vault{
dir = 8 dir = 8
}, },
/area/ruin/unpowered/syndicate_lava_base/testlab) /area/ruin/unpowered/syndicate_lava_base/testlab)
"ep" = ( "ep" = (
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/item/storage/toolbox/syndicate,
/obj/item/stack/cable_coil/yellow,
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/paper_bin,
/obj/item/pen,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/vault{ /turf/open/floor/plasteel/vault{
dir = 8 dir = 8
}, },
/area/ruin/unpowered/syndicate_lava_base/testlab) /area/ruin/unpowered/syndicate_lava_base/testlab)
"eq" = ( "eq" = (
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/item/assembly/timer{ /obj/item/restraints/handcuffs,
pixel_x = 3; /obj/item/taperecorder,
pixel_y = 3
},
/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
/obj/item/assembly/igniter,
/obj/item/assembly/igniter,
/obj/item/assembly/igniter,
/obj/item/assembly/voice,
/obj/item/assembly/voice,
/obj/item/assembly/voice,
/obj/item/assembly/signaler,
/obj/item/assembly/signaler,
/obj/item/assembly/signaler,
/obj/item/screwdriver/nuke,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{ /turf/open/floor/plasteel/vault{
dir = 8 dir = 8
@@ -902,43 +868,8 @@
/turf/open/floor/plasteel/white/corner, /turf/open/floor/plasteel/white/corner,
/area/ruin/unpowered/syndicate_lava_base/chemistry) /area/ruin/unpowered/syndicate_lava_base/chemistry)
"ew" = ( "ew" = (
/obj/structure/table/glass,
/obj/item/stack/cable_coil/white{
pixel_x = 3;
pixel_y = 3
},
/obj/item/stack/cable_coil/white,
/obj/item/assembly/igniter{
pixel_x = -3;
pixel_y = -3
},
/obj/item/assembly/igniter{
pixel_x = -3;
pixel_y = -3
},
/obj/item/assembly/igniter{
pixel_x = -3;
pixel_y = -3
},
/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/screwdriver{
pixel_y = 20
},
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/machinery/vending/syndichem,
/turf/open/floor/plasteel/white/side{ /turf/open/floor/plasteel/white/side{
dir = 6 dir = 6
}, },
@@ -1150,11 +1081,11 @@
/obj/structure/chair{ /obj/structure/chair{
dir = 1 dir = 1
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
dir = 10 dir = 4
}, },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 10 dir = 4
}, },
/turf/open/floor/plasteel/vault{ /turf/open/floor/plasteel/vault{
dir = 8 dir = 8
@@ -1163,17 +1094,8 @@
"eQ" = ( "eQ" = (
/obj/machinery/light/small, /obj/machinery/light/small,
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/item/restraints/handcuffs, /obj/item/storage/box/monkeycubes,
/obj/item/taperecorder, /obj/item/storage/box/monkeycubes,
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/box/monkeycubes{
pixel_x = 4;
pixel_y = 4
},
/obj/item/storage/box/monkeycubes{
pixel_x = 4;
pixel_y = 4
},
/turf/open/floor/plasteel/vault{ /turf/open/floor/plasteel/vault{
dir = 8 dir = 8
}, },
@@ -1445,9 +1367,9 @@
/turf/open/floor/plasteel/floorgrime, /turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/chemistry) /area/ruin/unpowered/syndicate_lava_base/chemistry)
"fq" = ( "fq" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/vending/assist, /obj/machinery/vending/assist,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{ /turf/open/floor/plasteel/vault{
dir = 5 dir = 5
}, },
@@ -1469,12 +1391,14 @@
}, },
/obj/structure/closet/crate, /obj/structure/closet/crate,
/obj/item/storage/box/stockparts/deluxe, /obj/item/storage/box/stockparts/deluxe,
/obj/item/storage/box/stockparts/deluxe,
/obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/glass/fifty,
/obj/item/circuitboard/machine/processor, /obj/item/circuitboard/machine/processor,
/obj/item/circuitboard/machine/gibber, /obj/item/circuitboard/machine/gibber,
/obj/item/circuitboard/machine/deep_fryer, /obj/item/circuitboard/machine/deep_fryer,
/obj/item/circuitboard/machine/cell_charger, /obj/item/circuitboard/machine/cell_charger,
/obj/item/circuitboard/machine/smoke_machine,
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/ruin/unpowered/syndicate_lava_base/cargo) /area/ruin/unpowered/syndicate_lava_base/cargo)
"ft" = ( "ft" = (
@@ -1742,6 +1666,12 @@
"gj" = ( "gj" = (
/turf/closed/wall/mineral/plastitanium/explosive, /turf/closed/wall/mineral/plastitanium/explosive,
/area/ruin/unpowered/syndicate_lava_base/virology) /area/ruin/unpowered/syndicate_lava_base/virology)
"gn" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 6
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"gp" = ( "gp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5 dir = 5
@@ -2720,6 +2650,8 @@
/obj/effect/turf_decal/stripes/red/line{ /obj/effect/turf_decal/stripes/red/line{
dir = 5 dir = 5
}, },
/obj/structure/filingcabinet,
/obj/item/folder/syndicate/mining,
/turf/open/floor/plasteel/vault{ /turf/open/floor/plasteel/vault{
dir = 8 dir = 8
}, },
@@ -2861,13 +2793,6 @@
}, },
/turf/open/floor/circuit/red, /turf/open/floor/circuit/red,
/area/ruin/unpowered/syndicate_lava_base/main) /area/ruin/unpowered/syndicate_lava_base/main)
"iL" = (
/obj/machinery/airalarm/syndicate{
dir = 8;
pixel_x = 24
},
/turf/open/floor/circuit/red,
/area/ruin/unpowered/syndicate_lava_base/main)
"iM" = ( "iM" = (
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 4 dir = 4
@@ -3361,7 +3286,8 @@
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"jK" = ( "jK" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer3{ /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer3{
dir = 8 dir = 8;
volume_rate = 200
}, },
/turf/open/floor/plating/asteroid/basalt/lava_land_surface, /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
@@ -3729,6 +3655,9 @@
icon_state = "2-4" icon_state = "2-4"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
},
/turf/open/floor/plating, /turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"ky" = ( "ky" = (
@@ -3742,6 +3671,9 @@
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
},
/turf/open/floor/plating, /turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"kz" = ( "kz" = (
@@ -3752,9 +3684,7 @@
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible, /obj/machinery/atmospherics/pipe/simple/supply/visible,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer3{ /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/visible/layer3,
dir = 8
},
/turf/open/floor/plasteel/floorgrime, /turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"kA" = ( "kA" = (
@@ -3775,6 +3705,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{
dir = 9 dir = 9
}, },
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/floorgrime, /turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"kB" = ( "kB" = (
@@ -3923,6 +3854,9 @@
/turf/closed/wall/mineral/plastitanium/nodiagonal, /turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/medbay) /area/ruin/unpowered/syndicate_lava_base/medbay)
"kU" = ( "kU" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 1
},
/turf/closed/wall/mineral/plastitanium/explosive, /turf/closed/wall/mineral/plastitanium/explosive,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"kV" = ( "kV" = (
@@ -3955,9 +3889,7 @@
/turf/open/floor/plasteel/floorgrime, /turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"kY" = ( "kY" = (
/obj/machinery/atmospherics/pipe/manifold/supply/visible{ /obj/machinery/atmospherics/pipe/manifold4w/supply/visible,
dir = 1
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"kZ" = ( "kZ" = (
@@ -4144,9 +4076,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"ls" = ( "ls" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{ /obj/machinery/atmospherics/pipe/simple/supply/visible,
dir = 1
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"lt" = ( "lt" = (
@@ -4319,6 +4249,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"lO" = ( "lO" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible,
/turf/open/floor/plasteel/floorgrime, /turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"lP" = ( "lP" = (
@@ -4523,6 +4454,7 @@
name = "O2 to Incinerator"; name = "O2 to Incinerator";
target_pressure = 4500 target_pressure = 4500
}, },
/obj/machinery/atmospherics/pipe/simple/supply/visible,
/turf/open/floor/plasteel/floorgrime, /turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"mk" = ( "mk" = (
@@ -4715,6 +4647,7 @@
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/clothing/head/welding, /obj/item/clothing/head/welding,
/obj/item/weldingtool/largetank, /obj/item/weldingtool/largetank,
/obj/machinery/atmospherics/pipe/simple/supply/visible,
/turf/open/floor/plasteel/floorgrime, /turf/open/floor/plasteel/floorgrime,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"mJ" = ( "mJ" = (
@@ -4835,19 +4768,13 @@
dir = 1; dir = 1;
id = "syndie_lavaland_incineratorturbine" id = "syndie_lavaland_incineratorturbine"
}, },
/obj/machinery/button/door{ /obj/machinery/button/door/incinerator_vent_syndicatelava_main{
id = "syndie_lavaland_turbinevent";
name = "Turbine Vent Control";
pixel_x = 6; pixel_x = 6;
pixel_y = -24; pixel_y = -24
req_access_txt = "150"
}, },
/obj/machinery/button/door{ /obj/machinery/button/door/incinerator_vent_syndicatelava_aux{
id = "syndie_lavaland_auxincineratorvent";
name = "Auxiliary Vent Control";
pixel_x = -6; pixel_x = -6;
pixel_y = -24; pixel_y = -24
req_access_txt = "150"
}, },
/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
@@ -4863,17 +4790,11 @@
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"ne" = ( "ne" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/machinery/atmospherics/pipe/simple/orange/visible,
/obj/machinery/doorButtons/airlock_controller{ /obj/machinery/embedded_controller/radio/airlock_controller/incinerator_syndicatelava{
idExterior = "syndie_lavaland_incinerator_exterior";
idInterior = "syndie_lavaland_incinerator_interior";
idSelf = "syndie_lavaland_incinerator_access";
name = "Incinerator Access Console";
pixel_x = -8; pixel_x = -8;
pixel_y = -26; pixel_y = -26
req_access_txt = "150"
}, },
/obj/machinery/button/ignition{ /obj/machinery/button/ignition/incinerator/syndicatelava{
id = "syndie_lavaland_Incinerator";
pixel_x = 6; pixel_x = 6;
pixel_y = -24 pixel_y = -24
}, },
@@ -5134,14 +5055,7 @@
icon_state = "1-2" icon_state = "1-2"
}, },
/obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/glass{ /obj/machinery/door/airlock/glass/incinerator/syndicatelava_interior,
autoclose = 0;
frequency = 1449;
heat_proof = 1;
id_tag = "syndie_lavaland_incinerator_interior";
name = "Turbine Interior Airlock";
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/engine, /turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
@@ -5422,13 +5336,8 @@
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 8 dir = 8
}, },
/obj/machinery/doorButtons/access_button{ /obj/machinery/atmospherics/pipe/layer_manifold{
idDoor = "syndie_lavaland_incinerator_exterior"; dir = 4
idSelf = "syndie_lavaland_incinerator_access";
layer = 3.1;
name = "Incinerator airlock control";
pixel_x = 8;
pixel_y = -24
}, },
/turf/open/floor/engine, /turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
@@ -5436,22 +5345,24 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-2" icon_state = "1-2"
}, },
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_syndicatelava{
dir = 8
},
/turf/open/floor/engine, /turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"of" = ( "of" = (
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 4 dir = 4
}, },
/obj/machinery/doorButtons/access_button{
idDoor = "syndie_lavaland_incinerator_interior";
idSelf = "syndie_lavaland_incinerator_access";
name = "Incinerator airlock control";
pixel_x = -8;
pixel_y = 24
},
/obj/machinery/atmospherics/components/binary/pump/on{ /obj/machinery/atmospherics/components/binary/pump/on{
target_pressure = 4500 target_pressure = 4500
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 8
},
/obj/machinery/airlock_sensor/incinerator_syndicatelava{
pixel_x = 22
},
/turf/open/floor/engine, /turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"og" = ( "og" = (
@@ -5562,14 +5473,7 @@
icon_state = "1-2" icon_state = "1-2"
}, },
/obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/glass{ /obj/machinery/door/airlock/glass/incinerator/syndicatelava_exterior,
autoclose = 0;
frequency = 1449;
heat_proof = 1;
id_tag = "syndie_lavaland_incinerator_exterior";
name = "Turbine Exterior Airlock";
req_access_txt = "150"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{ /obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1 dir = 1
}, },
@@ -5598,20 +5502,14 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/arrivals) /area/ruin/unpowered/syndicate_lava_base/arrivals)
"oz" = ( "oz" = (
/turf/open/floor/engine{ /turf/open/floor/engine/vacuum,
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"oA" = ( "oA" = (
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-2" icon_state = "1-2"
}, },
/obj/machinery/igniter{ /obj/machinery/igniter/incinerator_syndicatelava,
id = "syndie_lavaland_Incinerator" /turf/open/floor/engine/vacuum,
},
/turf/open/floor/engine{
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"oB" = ( "oB" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{ /obj/machinery/atmospherics/components/unary/outlet_injector/atmos{
@@ -5621,18 +5519,11 @@
/obj/structure/sign/warning/vacuum/external{ /obj/structure/sign/warning/vacuum/external{
pixel_y = -32 pixel_y = -32
}, },
/turf/open/floor/engine{ /turf/open/floor/engine/vacuum,
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"oC" = ( "oC" = (
/obj/machinery/door/poddoor{ /obj/machinery/door/poddoor/incinerator_syndicatelava_aux,
id = "syndie_lavaland_auxincineratorvent"; /turf/open/floor/engine/vacuum,
name = "Auxiliary Incinerator Vent"
},
/turf/open/floor/engine{
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"oD" = ( "oD" = (
/obj/structure/sign/warning/xeno_mining{ /obj/structure/sign/warning/xeno_mining{
@@ -5654,9 +5545,7 @@
dir = 1; dir = 1;
luminosity = 2 luminosity = 2
}, },
/turf/open/floor/engine{ /turf/open/floor/engine/vacuum,
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"oF" = ( "oF" = (
/obj/structure/sign/warning/securearea, /obj/structure/sign/warning/securearea,
@@ -5668,18 +5557,11 @@
dir = 2; dir = 2;
luminosity = 2 luminosity = 2
}, },
/turf/open/floor/engine{ /turf/open/floor/engine/vacuum,
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"oH" = ( "oH" = (
/obj/machinery/door/poddoor{ /obj/machinery/door/poddoor/incinerator_syndicatelava_main,
id = "syndie_lavaland_turbinevent"; /turf/open/floor/engine/vacuum,
name = "Turbine Vent"
},
/turf/open/floor/engine{
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered/syndicate_lava_base/engineering) /area/ruin/unpowered/syndicate_lava_base/engineering)
"oI" = ( "oI" = (
/obj/structure/sign/warning/vacuum{ /obj/structure/sign/warning/vacuum{
@@ -5694,6 +5576,51 @@
/obj/structure/sign/departments/chemistry, /obj/structure/sign/departments/chemistry,
/turf/closed/wall/mineral/plastitanium/nodiagonal, /turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/testlab) /area/ruin/unpowered/syndicate_lava_base/testlab)
"tW" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"uB" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 5
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"vu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"BF" = (
/obj/structure/grille,
/obj/structure/window/plastitanium,
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/preopen{
id = "lavalandsyndi";
name = "Syndicate Research Experimentation Shutters"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"Cg" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
},
/turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"CG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 10
},
/turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"EZ" = ( "EZ" = (
/obj/machinery/door/airlock/external{ /obj/machinery/door/airlock/external{
req_access_txt = "150" req_access_txt = "150"
@@ -5702,6 +5629,23 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/arrivals) /area/ruin/unpowered/syndicate_lava_base/arrivals)
"IJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 1
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"Lg" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
dir = 4
},
/turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"LQ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"MP" = ( "MP" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/turf/closed/wall/mineral/plastitanium/nodiagonal, /turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -5709,6 +5653,17 @@
"Pa" = ( "Pa" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal, /turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/circuits) /area/ruin/unpowered/syndicate_lava_base/circuits)
"RE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"RV" = (
/obj/structure/sign/warning/fire,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"St" = ( "St" = (
/obj/structure/fans/tiny, /obj/structure/fans/tiny,
/obj/machinery/door/airlock/external{ /obj/machinery/door/airlock/external{
@@ -5719,6 +5674,24 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/arrivals) /area/ruin/unpowered/syndicate_lava_base/arrivals)
"Tp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"TC" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/testlab)
(1,1,1) = {" (1,1,1) = {"
aa aa
@@ -6628,9 +6601,9 @@ ab
ae ae
ap ap
aq aq
Lg
aq aq
aq Lg
aq
aq aq
dR dR
el el
@@ -6678,9 +6651,9 @@ ab
ae ae
aq aq
aq aq
aF
aq aq
aq aF
aq
aq aq
ae ae
em em
@@ -6728,9 +6701,9 @@ ab
ae ae
aq aq
aq aq
Tp
aq aq
aq Cg
aq
aq aq
dS dS
eo eo
@@ -6778,11 +6751,11 @@ ab
ae ae
ap ap
aq aq
aq CG
aq vu
aq TC
aq LQ
dS BF
ep ep
eP eP
fl fl
@@ -7450,15 +7423,15 @@ jt
jF jF
jT jT
ju ju
ju gn
ju IJ
ju IJ
ju IJ
kU kU
ju IJ
ju IJ
ju IJ
ju uB
ju ju
ju ju
ju ju
@@ -7593,7 +7566,7 @@ hl
hU hU
ha ha
it it
iL iJ
jd jd
ha ha
jw jw
@@ -7656,9 +7629,9 @@ ls
lO lO
mj mj
mI mI
nf RV
ju tW
ju RE
ju ju
oC oC
nf nf

View File

@@ -189,6 +189,14 @@
for(var/i in 1 to 7) for(var/i in 1 to 7)
new /obj/item/reagent_containers/glass/beaker( src ) new /obj/item/reagent_containers/glass/beaker( src )
/obj/item/storage/box/beakers/bluespace
name = "box of bluespace beakers"
illustration = "beaker"
/obj/item/storage/box/beakers/bluespace/PopulateContents()
for(var/i in 1 to 7)
new /obj/item/reagent_containers/glass/beaker/bluespace(src)
/obj/item/storage/box/medsprays /obj/item/storage/box/medsprays
name = "box of medical sprayers" name = "box of medical sprayers"
desc = "A box full of medical sprayers, with unscrewable caps and precision spray heads." desc = "A box full of medical sprayers, with unscrewable caps and precision spray heads."
@@ -991,6 +999,7 @@
/obj/item/storage/box/stockparts/deluxe /obj/item/storage/box/stockparts/deluxe
name = "box of deluxe stock parts" name = "box of deluxe stock parts"
desc = "Contains a variety of deluxe stock parts." desc = "Contains a variety of deluxe stock parts."
icon_state = "syndiebox"
/obj/item/storage/box/stockparts/deluxe/PopulateContents() /obj/item/storage/box/stockparts/deluxe/PopulateContents()
new /obj/item/stock_parts/capacitor/quadratic(src) new /obj/item/stock_parts/capacitor/quadratic(src)

View File

@@ -455,6 +455,24 @@
"tirizene" "tirizene"
) )
/obj/machinery/chem_dispenser/drinks/fullupgrade //fully ugpraded stock parts, emagged
desc = "Contains a large reservoir of soft drinks. This model has had its safeties shorted out."
obj_flags = CAN_BE_HIT | EMAGGED
flags_1 = NODECONSTRUCT_1
/obj/machinery/chem_dispenser/drinks/fullupgrade/Initialize()
. = ..()
dispensable_reagents |= emagged_reagents //adds emagged reagents
component_parts = list()
component_parts += new /obj/item/circuitboard/machine/chem_dispenser/drinks(null)
component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)
component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)
component_parts += new /obj/item/stock_parts/capacitor/quadratic(null)
component_parts += new /obj/item/stock_parts/manipulator/femto(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stock_parts/cell/bluespace(null)
RefreshParts()
/obj/machinery/chem_dispenser/drinks/beer /obj/machinery/chem_dispenser/drinks/beer
name = "booze dispenser" name = "booze dispenser"
desc = "Contains a large reservoir of the good stuff." desc = "Contains a large reservoir of the good stuff."
@@ -488,6 +506,23 @@
"fernet" "fernet"
) )
/obj/machinery/chem_dispenser/drinks/beer/fullupgrade //fully ugpraded stock parts, emagged
desc = "Contains a large reservoir of the good stuff. This model has had its safeties shorted out."
obj_flags = CAN_BE_HIT | EMAGGED
flags_1 = NODECONSTRUCT_1
/obj/machinery/chem_dispenser/drinks/beer/fullupgrade/Initialize()
. = ..()
dispensable_reagents |= emagged_reagents //adds emagged reagents
component_parts = list()
component_parts += new /obj/item/circuitboard/machine/chem_dispenser/drinks/beer(null)
component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)
component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)
component_parts += new /obj/item/stock_parts/capacitor/quadratic(null)
component_parts += new /obj/item/stock_parts/manipulator/femto(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stock_parts/cell/bluespace(null)
RefreshParts()
/obj/machinery/chem_dispenser/mutagen /obj/machinery/chem_dispenser/mutagen
name = "mutagen dispenser" name = "mutagen dispenser"
@@ -528,10 +563,14 @@
component_parts += new /obj/item/stock_parts/cell/bluespace(null) component_parts += new /obj/item/stock_parts/cell/bluespace(null)
RefreshParts() RefreshParts()
/obj/machinery/chem_dispenser/fullupgrade //fully upgraded stock parts /obj/machinery/chem_dispenser/fullupgrade //fully ugpraded stock parts, emagged
desc = "Creates and dispenses chemicals. This model has had its safeties shorted out."
obj_flags = CAN_BE_HIT | EMAGGED
flags_1 = NODECONSTRUCT_1
/obj/machinery/chem_dispenser/fullupgrade/Initialize() /obj/machinery/chem_dispenser/fullupgrade/Initialize()
. = ..() . = ..()
dispensable_reagents |= emagged_reagents //adds emagged reagents
component_parts = list() component_parts = list()
component_parts += new /obj/item/circuitboard/machine/chem_dispenser(null) component_parts += new /obj/item/circuitboard/machine/chem_dispenser(null)
component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)

View File

@@ -0,0 +1,22 @@
//lavaland_surface_syndicate_base1.dmm
/obj/machinery/vending/syndichem
name = "\improper SyndiChem"
desc = "A vending machine full of grenades and grenade accessories. Sponsored by DonkCo(tm)."
req_access = list(ACCESS_SYNDICATE)
products = list(/obj/item/stack/cable_coil/random = 5,
/obj/item/assembly/igniter = 20,
/obj/item/assembly/prox_sensor = 5,
/obj/item/assembly/signaler = 5,
/obj/item/assembly/timer = 5,
/obj/item/assembly/voice = 5,
/obj/item/assembly/health = 5,
/obj/item/assembly/infra = 5,
/obj/item/grenade/chem_grenade = 5,
/obj/item/grenade/chem_grenade/large = 5,
/obj/item/grenade/chem_grenade/pyro = 5,
/obj/item/grenade/chem_grenade/cryo = 5,
/obj/item/grenade/chem_grenade/adv_release = 5,
/obj/item/reagent_containers/food/drinks/bottle/holywater = 1)
product_slogans = "It's not pyromania if you're getting paid!;You smell that? Plasma, son. Nothing else in the world smells like that.;I love the smell of Plasma in the morning."
resistance_flags = FIRE_PROOF

View File

@@ -2442,6 +2442,7 @@
#include "code\modules\ruins\lavalandruin_code\puzzle.dm" #include "code\modules\ruins\lavalandruin_code\puzzle.dm"
#include "code\modules\ruins\lavalandruin_code\sloth.dm" #include "code\modules\ruins\lavalandruin_code\sloth.dm"
#include "code\modules\ruins\lavalandruin_code\surface.dm" #include "code\modules\ruins\lavalandruin_code\surface.dm"
#include "code\modules\ruins\lavalandruin_code\syndicate_base.dm"
#include "code\modules\ruins\objects_and_mobs\ash_walker_den.dm" #include "code\modules\ruins\objects_and_mobs\ash_walker_den.dm"
#include "code\modules\ruins\objects_and_mobs\necropolis_gate.dm" #include "code\modules\ruins\objects_and_mobs\necropolis_gate.dm"
#include "code\modules\ruins\objects_and_mobs\sin_ruins.dm" #include "code\modules\ruins\objects_and_mobs\sin_ruins.dm"

View File

@@ -2433,6 +2433,7 @@
#include "code\modules\ruins\lavalandruin_code\puzzle.dm" #include "code\modules\ruins\lavalandruin_code\puzzle.dm"
#include "code\modules\ruins\lavalandruin_code\sloth.dm" #include "code\modules\ruins\lavalandruin_code\sloth.dm"
#include "code\modules\ruins\lavalandruin_code\surface.dm" #include "code\modules\ruins\lavalandruin_code\surface.dm"
#include "code\modules\ruins\lavalandruin_code\syndicate_base.dm"
#include "code\modules\ruins\objects_and_mobs\ash_walker_den.dm" #include "code\modules\ruins\objects_and_mobs\ash_walker_den.dm"
#include "code\modules\ruins\objects_and_mobs\necropolis_gate.dm" #include "code\modules\ruins\objects_and_mobs\necropolis_gate.dm"
#include "code\modules\ruins\objects_and_mobs\sin_ruins.dm" #include "code\modules\ruins\objects_and_mobs\sin_ruins.dm"