cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 13:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Turbine Fixes (#20341)

Browse Source
This commit is contained in:
Dafrek
2023-02-24 23:36:06 -06:00
committed by GitHub
parent 201bb2bb3b
commit 820735487c
1 changed files with 95 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/cyberiad/cyberiad.dmm
+95 -75
View File
@@ -58,10 +58,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/ai_slipper,
/mob/living/simple_animal/bot/secbot/pingsky,
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 9
},
/mob/living/simple_animal/bot/secbot/pingsky,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -7534,9 +7534,9 @@
},
/area/hallway/secondary/exit)
"avE" = (
/mob/living/simple_animal/mouse/white,
/obj/effect/decal/cleanable/dirt,
/obj/item/stack/cable_coil/random,
/mob/living/simple_animal/mouse/white,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint)
"avF" = (
@@ -37942,10 +37942,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/mob/living/simple_animal/pet/dog/corgi/borgi,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/mob/living/simple_animal/pet/dog/corgi/borgi,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -52357,10 +52357,10 @@
/area/maintenance/apmaint2)
"cEJ" = (
/obj/structure/chair/stool/bar,
/mob/living/simple_animal/mouse,
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
},
/mob/living/simple_animal/mouse,
/turf/simulated/floor/wood{
icon_state = "wood-broken"
},
@@ -54734,7 +54734,6 @@
/area/assembly/assembly_line)
"cLy" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/mouse,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
@@ -54742,6 +54741,7 @@
d2 = 4;
icon_state = "1-4"
},
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/maintenance/apmaint2)
"cLz" = (
@@ -58311,19 +58311,14 @@
/turf/simulated/floor/plasteel,
/area/engine/hardsuitstorage)
"cVH" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/light_switch{
name = "north bump";
pixel_y = 24
},
/obj/structure/cable{
d1 = 2;
d1 = 4;
d2 = 8;
icon_state = "2-8"
icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
@@ -59103,7 +59098,7 @@
},
/area/hallway/secondary/exit)
"cYg" = (
/obj/machinery/atmospherics/binary/valve/open{
/obj/machinery/atmospherics/binary/valve{
dir = 4
},
/turf/simulated/floor/plasteel,
@@ -60250,17 +60245,12 @@
/turf/simulated/floor/plasteel,
/area/atmos)
"dcu" = (
/obj/structure/cable{
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"dcv" = (
@@ -60289,7 +60279,7 @@
/obj/machinery/power/terminal{
dir = 1
},
/obj/structure/cable{
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
@@ -60358,6 +60348,11 @@
icon_state = "pipe-c"
},
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"dcH" = (
@@ -60406,6 +60401,11 @@
/area/storage/secure)
"dcQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"dcR" = (
@@ -60472,18 +60472,23 @@
/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 1
},
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"ddk" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"ddk" = (
/obj/machinery/atmospherics/binary/valve{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"ddl" = (
@@ -60574,6 +60579,11 @@
req_access_txt = "32"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"ddw" = (
@@ -60593,15 +60603,15 @@
/area/atmos)
"ddy" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"ddB" = (
@@ -60861,6 +60871,11 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"dev" = (
@@ -60869,7 +60884,7 @@
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"dew" = (
/obj/structure/cable{
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -60894,6 +60909,11 @@
/area/engine/engine_smes)
"dey" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"deA" = (
@@ -63378,7 +63398,7 @@
},
/area/aisat/hall)
"dlX" = (
/obj/structure/cable{
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -63546,11 +63566,6 @@
/turf/simulated/floor/engine,
/area/maintenance/turbine)
"dmA" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/igniter{
id = "gasturbine"
},
@@ -63558,6 +63573,11 @@
dir = 6;
level = 1
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/engine,
/area/maintenance/turbine)
"dmB" = (
@@ -63627,13 +63647,13 @@
},
/area/aisat/hall)
"dmO" = (
/obj/structure/cable,
/obj/machinery/power/compressor{
comp_id = "incineratorturbine";
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/structure/cable{
/obj/structure/cable/yellow,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -63788,9 +63808,9 @@
/turf/space,
/area/maintenance/turbine)
"dne" = (
/obj/structure/cable,
/obj/machinery/power/turbine,
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/structure/cable/yellow,
/turf/simulated/floor/engine,
/area/maintenance/turbine)
"dnf" = (
@@ -64582,7 +64602,7 @@
/turf/simulated/floor/plating,
/area/aisat/atmos)
"dpO" = (
/obj/machinery/atmospherics/binary/pump/on{
/obj/machinery/atmospherics/binary/pump{
dir = 1;
name = "Mix to MiniSat"
},
@@ -66296,7 +66316,7 @@
inlet_injector_autolink_id = "o2_in";
name = "Oxygen Supply Control";
outlet_vent_autolink_id = "o2_out";
autolink_sensors = list("o2_sensor"="Tank")
autolink_sensors = list("o2_sensor" = "Tank")
},
/turf/simulated/floor/plasteel{
dir = 0;
@@ -67162,11 +67182,6 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"eJo" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/door/airlock/public/glass{
autoclose = 0;
heat_proof = 1;
@@ -67175,6 +67190,11 @@
name = "Turbine Interior Airlock";
req_access_txt = "32"
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/engine,
/area/maintenance/turbine)
"eJr" = (
@@ -67431,7 +67451,7 @@
inlet_injector_autolink_id = "n2_in";
name = "Nitrogen Supply Control";
outlet_vent_autolink_id = "n2_out";
autolink_sensors = list("n2_sensor"="Tank")
autolink_sensors = list("n2_sensor" = "Tank")
},
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/turf/simulated/floor/plasteel{
@@ -68302,7 +68322,7 @@
/obj/machinery/computer/general_air_control{
dir = 4;
name = "Tank Monitor";
autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank")
autolink_sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank")
},
/turf/simulated/floor/plasteel,
/area/atmos/control)
@@ -70875,10 +70895,10 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/mob/living/simple_animal/mouse/brown,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/mob/living/simple_animal/mouse/brown,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"hjX" = (
@@ -71276,7 +71296,6 @@
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"hxx" = (
/mob/living/carbon/human/monkey,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
@@ -71284,6 +71303,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/mob/living/carbon/human/monkey,
/turf/simulated/floor/plasteel{
dir = 1
},
@@ -72539,13 +72559,13 @@
/turf/simulated/wall/r_wall,
/area/toxins/xenobiology)
"inV" = (
/obj/structure/cable{
/obj/effect/decal/cleanable/dirt,
/obj/machinery/hologram/holopad,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"iot" = (
@@ -73396,10 +73416,10 @@
/turf/simulated/floor/plating,
/area/maintenance/asmaint)
"jcY" = (
/mob/living/carbon/human/monkey,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
/mob/living/carbon/human/monkey,
/turf/simulated/floor/plasteel{
dir = 1
},
@@ -75350,8 +75370,8 @@
/area/medical/medbay2)
"kGB" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/carbon/human/monkey,
/obj/effect/decal/cleanable/blood,
/mob/living/carbon/human/monkey,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"kGM" = (
@@ -75391,7 +75411,7 @@
inlet_injector_autolink_id = "co2_in";
name = "Carbon Dioxide Supply Control";
outlet_vent_autolink_id = "co2_out";
autolink_sensors = list("co2_sensor"="Tank")
autolink_sensors = list("co2_sensor" = "Tank")
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -77123,7 +77143,7 @@
dir = 1;
level = 3;
name = "Distribution and Waste Monitor";
autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop")
autolink_sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop")
},
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
@@ -79373,7 +79393,6 @@
/turf/simulated/floor/grass,
/area/hallway/secondary/exit)
"nPD" = (
/mob/living/simple_animal/pet/cat/Runtime,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -79382,6 +79401,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/mob/living/simple_animal/pet/cat/Runtime,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "darkbluefull"
@@ -79784,10 +79804,10 @@
/turf/space,
/area/space/nearstation)
"oiS" = (
/mob/living/carbon/human/monkey,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/mob/living/carbon/human/monkey,
/turf/simulated/floor/plasteel{
dir = 1
},
@@ -80247,8 +80267,8 @@
/obj/structure/bed,
/obj/effect/decal/cleanable/dirt,
/obj/effect/mob_spawn/human/skeleton,
/mob/living/simple_animal/hostile/scarybat,
/obj/effect/landmark/spawner/nukedisc_respawn,
/mob/living/simple_animal/hostile/scarybat,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"oBJ" = (
@@ -80659,7 +80679,7 @@
inlet_injector_autolink_id = "tox_in";
name = "Toxin Supply Control";
outlet_vent_autolink_id = "tox_out";
autolink_sensors = list("tox_sensor"="Tank")
autolink_sensors = list("tox_sensor" = "Tank")
},
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
@@ -80879,7 +80899,7 @@
dir = 8;
level = 3;
name = "Distribution and Waste Monitor";
autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop")
autolink_sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop")
},
/turf/simulated/floor/plasteel,
/area/atmos/control)
@@ -81995,11 +82015,6 @@
},
/area/security/permabrig)
"pMX" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/door/airlock/public/glass{
autoclose = 0;
heat_proof = 1;
@@ -82008,6 +82023,11 @@
name = "Turbine Exterior Airlock";
req_access_txt = "32"
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/engine,
/area/maintenance/turbine)
"pNj" = (
@@ -82229,7 +82249,6 @@
},
/area/engine/break_room)
"pUR" = (
/mob/living/simple_animal/mouse,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
@@ -82244,6 +82263,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
"pUX" = (
@@ -82680,7 +82700,7 @@
},
/obj/machinery/computer/general_air_control{
name = "Bomb Mix Monitor";
autolink_sensors = list("burn_sensor"="Burn Mix")
autolink_sensors = list("burn_sensor" = "Burn Mix")
},
/obj/machinery/door_control{
id = "ToxinsVenting";
@@ -83833,7 +83853,7 @@
},
/obj/machinery/computer/general_air_control{
name = "Tank Monitor";
autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank")
autolink_sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank")
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -84451,7 +84471,7 @@
name = "Mixed Air Supply Control";
outlet_vent_autolink_id = "air_out";
outlet_setting = 2000;
autolink_sensors = list("air_sensor"="Tank")
autolink_sensors = list("air_sensor" = "Tank")
},
/turf/simulated/floor/plasteel{
icon_state = "arrival"
@@ -88445,7 +88465,7 @@
inlet_injector_autolink_id = "waste_in";
name = "Gas Mix Tank Control";
outlet_vent_autolink_id = "waste_out";
autolink_sensors = list("waste_sensor"="Tank")
autolink_sensors = list("waste_sensor" = "Tank")
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -90305,7 +90325,7 @@
},
/area/toxins/xenobiology)
"vTp" = (
/obj/machinery/atmospherics/binary/pump/on{
/obj/machinery/atmospherics/binary/pump{
dir = 8;
name = "Mix to MiniSat"
},
@@ -92106,7 +92126,7 @@
inlet_injector_autolink_id = "n2o_in";
name = "Nitrous Oxide Supply Control";
outlet_vent_autolink_id = "n2o_out";
autolink_sensors = list("n2o_sensor"="Tank")
autolink_sensors = list("n2o_sensor" = "Tank")
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -92930,12 +92950,12 @@
/turf/simulated/floor/plasteel,
/area/toxins/hallway)
"ygu" = (
/mob/living/carbon/human/monkey,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/mob/living/carbon/human/monkey,
/turf/simulated/floor/engine,
/area/toxins/test_chamber)
"ygw" = (