mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-01-02 05:23:31 +00:00
Merge pull request #11000 from KillianKirilenko/kk-fixes
Wall-Mounted Geiger Tweaks
This commit is contained in:
Aronai Sieyes
committed by
Chompstation Bot
Chompstation Bot
parent
e70d9f291c
commit
3ec6f04f09
Binary file not shown.
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 93 KiB |
@@ -47,7 +47,6 @@
|
||||
/area/space)
|
||||
"aj" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/black{
|
||||
icon_state = "map";
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/lattice,
|
||||
@@ -55,7 +54,6 @@
|
||||
/area/space)
|
||||
"ak" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
|
||||
icon_state = "intact";
|
||||
dir = 4
|
||||
},
|
||||
/turf/space,
|
||||
@@ -107,9 +105,7 @@
|
||||
/obj/structure/sign/securearea{
|
||||
desc = "A warning sign which reads 'RADIOACTIVE AREA'";
|
||||
icon_state = "radiation";
|
||||
name = "RADIOACTIVE AREA";
|
||||
pixel_x = 0;
|
||||
pixel_y = 0
|
||||
name = "RADIOACTIVE AREA"
|
||||
},
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/engineering/engine_room)
|
||||
@@ -136,7 +132,6 @@
|
||||
/area/engineering/engine_room)
|
||||
"ay" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/black{
|
||||
icon_state = "map";
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
@@ -176,10 +171,8 @@
|
||||
"aF" = (
|
||||
/obj/machinery/door/blast/regular{
|
||||
dir = 4;
|
||||
icon_state = "pdoor1";
|
||||
id = "EngineVent";
|
||||
name = "Reactor Vent";
|
||||
p_open = 0
|
||||
name = "Reactor Vent"
|
||||
},
|
||||
/turf/simulated/floor/reinforced/nitrogen{
|
||||
nitrogen = 82.1472
|
||||
@@ -237,7 +230,6 @@
|
||||
/area/engineering/engine_room)
|
||||
"aN" = (
|
||||
/obj/effect/floor_decal/industrial/warning/cee{
|
||||
icon_state = "warningcee";
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/engine{
|
||||
@@ -248,8 +240,6 @@
|
||||
icon_state = "map_vent_in";
|
||||
id_tag = "cooling_out";
|
||||
initialize_directions = 4;
|
||||
pressure_checks = 1;
|
||||
pressure_checks_default = 1;
|
||||
pump_direction = 0;
|
||||
use_power = 1
|
||||
},
|
||||
@@ -259,20 +249,16 @@
|
||||
/area/engineering/engine_room)
|
||||
"aO" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/red{
|
||||
icon_state = "intact";
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/phoronreinforced{
|
||||
icon_state = "phoronrwindow";
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/window/phoronreinforced{
|
||||
icon_state = "phoronrwindow";
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/window/phoronreinforced{
|
||||
icon_state = "phoronrwindow";
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/blast/regular{
|
||||
@@ -285,7 +271,6 @@
|
||||
/area/engineering/engine_room)
|
||||
"aP" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/red{
|
||||
icon_state = "intact";
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
@@ -295,7 +280,6 @@
|
||||
/area/engineering/engine_room)
|
||||
"aQ" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/red{
|
||||
icon_state = "intact";
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
@@ -307,21 +291,18 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/black,
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/red{
|
||||
icon_state = "intact";
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/engineering/engine_room)
|
||||
"aS" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/red{
|
||||
icon_state = "intact";
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/engineering/engine_room)
|
||||
"aT" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/red{
|
||||
icon_state = "intact";
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/meter,
|
||||
@@ -345,11 +326,9 @@
|
||||
/area/template_noop)
|
||||
"aW" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/camera/network/engine{
|
||||
@@ -371,11 +350,9 @@
|
||||
/area/engineering/engine_room)
|
||||
"aY" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/reinforced/nitrogen{
|
||||
@@ -385,11 +362,9 @@
|
||||
"aZ" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/phoronreinforced{
|
||||
icon_state = "phoronrwindow";
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/window/phoronreinforced{
|
||||
icon_state = "phoronrwindow";
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/blast/regular{
|
||||
@@ -415,7 +390,6 @@
|
||||
state = 2
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
d1 = 0;
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
@@ -470,7 +444,6 @@
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
d1 = 0;
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
@@ -495,16 +468,13 @@
|
||||
/area/engineering/engine_room)
|
||||
"bh" = (
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
icon_state = "warningcorner";
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/outlet_injector{
|
||||
dir = 2;
|
||||
frequency = 1438;
|
||||
icon_state = "map_injector";
|
||||
id = "cooling_in";
|
||||
name = "Coolant Injector";
|
||||
pixel_y = 1;
|
||||
@@ -518,7 +488,6 @@
|
||||
/area/engineering/engine_room)
|
||||
"bi" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
@@ -546,11 +515,9 @@
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/phoronreinforced,
|
||||
/obj/structure/window/phoronreinforced{
|
||||
icon_state = "phoronrwindow";
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/window/phoronreinforced{
|
||||
icon_state = "phoronrwindow";
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/blast/regular{
|
||||
@@ -563,7 +530,6 @@
|
||||
/area/engineering/engine_room)
|
||||
"bl" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
@@ -585,7 +551,6 @@
|
||||
/area/engineering/engine_room)
|
||||
"bo" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/black{
|
||||
icon_state = "intact";
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
@@ -601,8 +566,7 @@
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 4;
|
||||
icon_state = "tube1"
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/engineering/engine_room)
|
||||
@@ -611,15 +575,12 @@
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/phoronreinforced,
|
||||
/obj/structure/window/phoronreinforced{
|
||||
icon_state = "phoronrwindow";
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/window/phoronreinforced{
|
||||
icon_state = "phoronrwindow";
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/window/phoronreinforced{
|
||||
icon_state = "phoronrwindow";
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/blast/regular{
|
||||
@@ -643,15 +604,12 @@
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/phoronreinforced,
|
||||
/obj/structure/window/phoronreinforced{
|
||||
icon_state = "phoronrwindow";
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/window/phoronreinforced{
|
||||
icon_state = "phoronrwindow";
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/window/phoronreinforced{
|
||||
icon_state = "phoronrwindow";
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/blast/regular{
|
||||
@@ -686,9 +644,10 @@
|
||||
req_access = list(10)
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8;
|
||||
icon_state = "tube1";
|
||||
pixel_y = 0
|
||||
dir = 8
|
||||
},
|
||||
/obj/item/device/geiger/wall/west{
|
||||
pixel_x = -36
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/engineering/engine_room)
|
||||
@@ -728,12 +687,9 @@
|
||||
/area/template_noop)
|
||||
"bB" = (
|
||||
/obj/machinery/computer/general_air_control/supermatter_core{
|
||||
dir = 2;
|
||||
frequency = 1438;
|
||||
input_tag = "cooling_in";
|
||||
name = "Engine Cooling Control";
|
||||
output_tag = "cooling_out";
|
||||
pressure_setting = 100;
|
||||
sensors = list("engine_sensor" = "Engine Core");
|
||||
throwpass = 1
|
||||
},
|
||||
@@ -751,7 +707,6 @@
|
||||
id = "EngineRadiatorViewport";
|
||||
name = "Engine Radiator Viewport Shutters";
|
||||
pixel_x = -25;
|
||||
pixel_y = 0;
|
||||
req_access = list(10)
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
@@ -801,7 +756,6 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/valve/digital{
|
||||
dir = 2;
|
||||
name = "Emergency Cooling Valve 1"
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
@@ -856,7 +810,6 @@
|
||||
desc = "A remote control-switch for the engine control room blast doors.";
|
||||
id = "EngineBlast";
|
||||
name = "Engine Monitoring Room Blast Doors";
|
||||
pixel_x = 0;
|
||||
pixel_y = -3;
|
||||
req_access = list(10)
|
||||
},
|
||||
@@ -944,8 +897,7 @@
|
||||
/area/engineering/engine_room)
|
||||
"bX" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/green{
|
||||
dir = 10;
|
||||
icon_state = "intact"
|
||||
dir = 10
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
/turf/simulated/floor,
|
||||
@@ -956,7 +908,6 @@
|
||||
/area/engineering/engine_room)
|
||||
"bZ" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/red{
|
||||
icon_state = "intact";
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
@@ -964,7 +915,6 @@
|
||||
/area/engineering/engine_room)
|
||||
"ca" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/red{
|
||||
icon_state = "map";
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
@@ -1043,7 +993,6 @@
|
||||
"ci" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/green,
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
@@ -1254,7 +1203,6 @@
|
||||
/area/engineering/engine_room)
|
||||
"cF" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/green{
|
||||
icon_state = "intact";
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning/corner,
|
||||
@@ -1262,7 +1210,6 @@
|
||||
/area/engineering/engine_room)
|
||||
"cG" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/red{
|
||||
icon_state = "map";
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/meter,
|
||||
@@ -1301,7 +1248,6 @@
|
||||
desc = "A remote control-switch for the engine control room blast doors.";
|
||||
id = "EngineEmitterPortWest";
|
||||
name = "Engine Room Blast Doors";
|
||||
pixel_x = 0;
|
||||
pixel_y = -25;
|
||||
req_access = null;
|
||||
req_one_access = list(11,24)
|
||||
@@ -1331,7 +1277,6 @@
|
||||
/area/engineering/engine_room)
|
||||
"cP" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
@@ -1346,7 +1291,6 @@
|
||||
id_tag = "eng_al_int_snsr";
|
||||
master_tag = "engine_room_airlock";
|
||||
pixel_x = 22;
|
||||
pixel_y = 0;
|
||||
req_access = list(10)
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
@@ -1354,7 +1298,6 @@
|
||||
"cR" = (
|
||||
/obj/machinery/door/blast/regular{
|
||||
dir = 4;
|
||||
icon_state = "pdoor1";
|
||||
id = "EngineEmitterPortWest";
|
||||
layer = 3.3;
|
||||
name = "Engine Gas Storage"
|
||||
@@ -1420,7 +1363,6 @@
|
||||
desc = "A remote control-switch for the engine control room blast doors.";
|
||||
id = "EngineEmitterPortWest";
|
||||
name = "Engine Room Blast Doors";
|
||||
pixel_x = 0;
|
||||
pixel_y = 25;
|
||||
req_access = null;
|
||||
req_one_access = list(11,24)
|
||||
@@ -1432,7 +1374,6 @@
|
||||
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
|
||||
/obj/structure/extinguisher_cabinet{
|
||||
dir = 1;
|
||||
icon_state = "extinguisher_closed";
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
@@ -1445,7 +1386,6 @@
|
||||
/obj/machinery/button/remote/blast_door{
|
||||
id = "EngineVent";
|
||||
name = "Reactor Ventillatory Control";
|
||||
pixel_x = 0;
|
||||
pixel_y = -25;
|
||||
req_access = list(10)
|
||||
},
|
||||
@@ -1471,7 +1411,6 @@
|
||||
/area/engineering/engine_room)
|
||||
"df" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/red{
|
||||
icon_state = "intact";
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/alarm{
|
||||
@@ -1483,14 +1422,12 @@
|
||||
/area/engineering/engine_room)
|
||||
"dg" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/red{
|
||||
icon_state = "intact";
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/engineering/engine_room)
|
||||
"dh" = (
|
||||
/obj/item/device/radio/intercom{
|
||||
dir = 2;
|
||||
pixel_y = -24
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
@@ -1518,13 +1455,11 @@
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
|
||||
/obj/machinery/light/small{
|
||||
dir = 4;
|
||||
pixel_y = 0
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/alarm{
|
||||
dir = 8;
|
||||
pixel_x = 25;
|
||||
pixel_y = 0
|
||||
pixel_x = 25
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/engineering/engine_gas)
|
||||
@@ -1532,8 +1467,7 @@
|
||||
/obj/structure/sign/securearea{
|
||||
desc = "A warning sign which reads 'HIGH VOLTAGE'";
|
||||
icon_state = "shock";
|
||||
name = "HIGH VOLTAGE";
|
||||
pixel_y = 0
|
||||
name = "HIGH VOLTAGE"
|
||||
},
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/engineering/engine_room)
|
||||
@@ -1541,8 +1475,7 @@
|
||||
/obj/effect/floor_decal/industrial/outline/blue,
|
||||
/obj/machinery/portable_atmospherics/canister/phoron,
|
||||
/obj/machinery/light/small{
|
||||
dir = 8;
|
||||
pixel_x = 0
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/engineering/engine_gas)
|
||||
@@ -1617,7 +1550,6 @@
|
||||
id = "EngineEmitterPortWest2";
|
||||
name = "Engine Room Blast Doors";
|
||||
pixel_x = 25;
|
||||
pixel_y = 0;
|
||||
req_access = null;
|
||||
req_one_access = list(11,24)
|
||||
},
|
||||
@@ -1627,9 +1559,7 @@
|
||||
/obj/structure/sign/securearea{
|
||||
desc = "A warning sign which reads 'RADIOACTIVE AREA'";
|
||||
icon_state = "radiation";
|
||||
name = "RADIOACTIVE AREA";
|
||||
pixel_x = 0;
|
||||
pixel_y = 0
|
||||
name = "RADIOACTIVE AREA"
|
||||
},
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/template_noop)
|
||||
@@ -1637,7 +1567,6 @@
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/machinery/door/blast/regular{
|
||||
dir = 4;
|
||||
icon_state = "pdoor1";
|
||||
id = "EngineEmitterPortWest2";
|
||||
layer = 3.3;
|
||||
name = "Engine Gas Storage"
|
||||
@@ -1655,13 +1584,16 @@
|
||||
},
|
||||
/obj/machinery/door/blast/regular{
|
||||
dir = 4;
|
||||
icon_state = "pdoor1";
|
||||
id = "EngineEmitterPortWest2";
|
||||
layer = 3.3;
|
||||
name = "Engine Gas Storage"
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/template_noop)
|
||||
"vA" = (
|
||||
/obj/item/device/geiger/wall/south,
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
|
||||
(1,1,1) = {"
|
||||
aa
|
||||
@@ -2515,7 +2447,7 @@ bA
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
vA
|
||||
av
|
||||
aa
|
||||
aa
|
||||
|
||||
Reference in New Issue
Block a user