mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-30 16:48:12 +01:00
Merge branch 'master' into master
This commit is contained in:
SplinterGP
@@ -11,9 +11,9 @@
|
||||
/datum/event/spider_migration/announce()
|
||||
var/announcement = ""
|
||||
if(severity == EVENT_LEVEL_MAJOR)
|
||||
announcement = "Massive breach of [station_name()] walls detected. Unknown biological entities has been detected near within perimeter. Heavily armed Security Patrol required."
|
||||
announcement = "Massive breach of [station_name()] walls detected. Unknown biological entities has been detected within the perimeter wall. Heavily armed Security Patrol required."
|
||||
else
|
||||
announcement = "Unknown biological [spawned_spider.len == 1 ? "entity has" : "entities have"] bypassed [station_name()]'s perimeter walls, Security Patrol."
|
||||
announcement = "Unknown biological [spawned_spider.len == 1 ? "entity has" : "entities have"] bypassed [station_name()]'s perimeter walls, Security Patrol recommended."
|
||||
command_announcement.Announce(announcement, "Lifesign Alert")
|
||||
|
||||
/datum/event/spider_migration/start()
|
||||
@@ -48,4 +48,4 @@
|
||||
if(istype(T, /turf/space))
|
||||
if(prob(75))
|
||||
qdel(SM)
|
||||
sleep(1)
|
||||
sleep(1)
|
||||
|
||||
@@ -21,9 +21,9 @@
|
||||
icon = 'icons/obj/gun_yw.dmi'
|
||||
icon_state = "gaussrifle"
|
||||
item_state = "gaussrifle"
|
||||
item_icons = list(slot_r_hand_str = 'icons/mob/items/righthand_guns_yw.dmi', slot_l_hand_str = 'icons/mob/items/lefthand_guns_yw.dmi', slot_back_str = 'icons/mob/back_yw.dmi')
|
||||
item_icons = list(slot_r_hand_str = 'icons/mob/items/righthand_guns_yw.dmi', slot_l_hand_str = 'icons/mob/items/lefthand_guns_yw.dmi', slot_back_str = 'icons/mob/back_yw.dmi')
|
||||
desc = "An older model of the experimental Gauss weapon series produced by Hephaestus industries. As it is unable to pass through glass, it was phased out during the mars-sol conflict due to the invention of laser carbines.Nevertheless, it still packs a punch and is easy to maintain, making it a favorite amongst sol privateers."
|
||||
force = 5
|
||||
force = 8
|
||||
fire_sound = 'sound/weapons/Gauss_shoot.ogg'
|
||||
slot_flags = SLOT_BELT|SLOT_BACK
|
||||
w_class = 4
|
||||
|
||||
+128
-136
@@ -1379,17 +1379,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/xenobiology)
|
||||
"dk" = (
|
||||
/obj/machinery/status_display{
|
||||
pixel_y = 30
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"dl" = (
|
||||
/obj/structure/sink{
|
||||
pixel_x = 0;
|
||||
@@ -1423,19 +1412,6 @@
|
||||
/obj/item/weapon/melee/baton/slime/loaded,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"do" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/device/radio/intercom{
|
||||
dir = 1;
|
||||
pixel_y = 24;
|
||||
req_access = list()
|
||||
},
|
||||
/obj/item/clothing/glasses/welding,
|
||||
/obj/item/clothing/glasses/welding,
|
||||
/obj/item/weapon/weldingtool,
|
||||
/obj/item/weapon/weldingtool,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"dp" = (
|
||||
/turf/simulated/wall,
|
||||
/area/rnd/xenobiology/hallway)
|
||||
@@ -1910,13 +1886,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"er" = (
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/reagent_dispensers/watertank,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"es" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/weapon/reagent_containers/spray/cleaner,
|
||||
@@ -2102,27 +2071,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"eM" = (
|
||||
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary,
|
||||
/obj/structure/cable/blue{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"eN" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/glass_jar,
|
||||
/obj/item/glass_jar,
|
||||
/obj/item/weapon/storage/box/syringes,
|
||||
/obj/structure/cable/blue{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"eO" = (
|
||||
/obj/machinery/processor,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
@@ -2331,22 +2279,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"fn" = (
|
||||
/obj/machinery/light{
|
||||
dir = 4;
|
||||
icon_state = "tube1"
|
||||
},
|
||||
/obj/structure/table/standard,
|
||||
/obj/machinery/reagentgrinder,
|
||||
/obj/item/stack/material/phoron,
|
||||
/obj/item/stack/material/phoron,
|
||||
/obj/structure/cable/blue{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"fo" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
@@ -2356,19 +2288,6 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/rnd/xenobiology)
|
||||
"fp" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/weapon/storage/box/beakers{
|
||||
pixel_x = 2;
|
||||
pixel_y = 2
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8;
|
||||
icon_state = "tube1";
|
||||
pixel_y = 0
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"fq" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
@@ -2624,16 +2543,15 @@
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/rnd/xenobiology)
|
||||
"fT" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/weapon/storage/box/monkeycubes,
|
||||
/obj/item/weapon/storage/box/monkeycubes,
|
||||
/obj/item/weapon/storage/box/monkeycubes,
|
||||
/obj/item/weapon/storage/box/monkeycubes,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped,
|
||||
/obj/structure/cable/blue{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
@@ -2934,6 +2852,7 @@
|
||||
pixel_x = 0;
|
||||
pixel_y = -27
|
||||
},
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"gz" = (
|
||||
@@ -21762,6 +21681,22 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/xenobiology/secure)
|
||||
"QR" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/device/radio/intercom{
|
||||
dir = 1;
|
||||
pixel_y = 24;
|
||||
req_access = list()
|
||||
},
|
||||
/obj/item/clothing/glasses/welding,
|
||||
/obj/item/clothing/glasses/welding,
|
||||
/obj/item/weapon/weldingtool,
|
||||
/obj/item/weapon/weldingtool,
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"RC" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 1
|
||||
@@ -21775,6 +21710,45 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/rnd/outpost/launch)
|
||||
"SX" = (
|
||||
/obj/machinery/light{
|
||||
dir = 8;
|
||||
icon_state = "tube1"
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"TM" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/weapon/storage/box/beakers{
|
||||
pixel_x = 2;
|
||||
pixel_y = 2
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"Un" = (
|
||||
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"UP" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/weapon/storage/box/monkeycubes,
|
||||
/obj/item/weapon/storage/box/monkeycubes,
|
||||
/obj/item/weapon/storage/box/monkeycubes,
|
||||
/obj/item/weapon/storage/box/monkeycubes,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"VD" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/glass_jar,
|
||||
/obj/item/glass_jar,
|
||||
/obj/item/weapon/storage/box/syringes,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"VP" = (
|
||||
/obj/structure/table/standard,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"Wr" = (
|
||||
/obj/machinery/camera/network/research_outpost{
|
||||
c_tag = "Toxins Testing Room";
|
||||
@@ -21782,6 +21756,20 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel,
|
||||
/area/rnd/outpost/launch)
|
||||
"WU" = (
|
||||
/obj/machinery/light{
|
||||
dir = 4;
|
||||
icon_state = "tube1";
|
||||
pixel_y = 0
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"Yw" = (
|
||||
/obj/machinery/status_display{
|
||||
pixel_y = 30
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
"Yz" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
@@ -21805,6 +21793,10 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/gateway)
|
||||
"ZH" = (
|
||||
/obj/structure/reagent_dispensers/watertank,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenobiology)
|
||||
|
||||
(1,1,1) = {"
|
||||
ab
|
||||
@@ -63955,9 +63947,9 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ad
|
||||
cS
|
||||
cS
|
||||
cS
|
||||
cS
|
||||
dj
|
||||
dJ
|
||||
@@ -64206,12 +64198,12 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ad
|
||||
cS
|
||||
dk
|
||||
cS
|
||||
Yw
|
||||
dN
|
||||
SX
|
||||
fm
|
||||
dK
|
||||
ep
|
||||
eL
|
||||
@@ -64458,16 +64450,16 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ad
|
||||
cS
|
||||
dl
|
||||
dN
|
||||
dN
|
||||
dN
|
||||
dN
|
||||
dL
|
||||
dN
|
||||
eM
|
||||
fn
|
||||
dN
|
||||
dN
|
||||
fT
|
||||
gv
|
||||
gW
|
||||
@@ -64710,17 +64702,17 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ad
|
||||
cS
|
||||
dm
|
||||
eq
|
||||
eq
|
||||
eq
|
||||
eq
|
||||
dM
|
||||
eq
|
||||
eN
|
||||
fo
|
||||
fU
|
||||
eq
|
||||
eq
|
||||
ep
|
||||
gw
|
||||
dN
|
||||
hx
|
||||
@@ -64962,17 +64954,17 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ad
|
||||
cS
|
||||
dn
|
||||
dN
|
||||
dN
|
||||
VP
|
||||
eO
|
||||
fp
|
||||
TM
|
||||
fV
|
||||
dN
|
||||
dN
|
||||
dN
|
||||
gx
|
||||
cS
|
||||
hy
|
||||
@@ -65214,14 +65206,14 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ad
|
||||
cS
|
||||
do
|
||||
jG
|
||||
QR
|
||||
dN
|
||||
dN
|
||||
VD
|
||||
fo
|
||||
fU
|
||||
UP
|
||||
eP
|
||||
fq
|
||||
fW
|
||||
@@ -65466,14 +65458,14 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ad
|
||||
cS
|
||||
cS
|
||||
dO
|
||||
er
|
||||
Un
|
||||
dN
|
||||
dN
|
||||
dN
|
||||
dN
|
||||
dN
|
||||
dN
|
||||
eQ
|
||||
fr
|
||||
fX
|
||||
@@ -65718,13 +65710,13 @@ ad
|
||||
ad
|
||||
ad
|
||||
ad
|
||||
ad
|
||||
ad
|
||||
ad
|
||||
ad
|
||||
cS
|
||||
ab
|
||||
dO
|
||||
dN
|
||||
dN
|
||||
dN
|
||||
WU
|
||||
jG
|
||||
ZH
|
||||
es
|
||||
eR
|
||||
fs
|
||||
@@ -65975,7 +65967,7 @@ ae
|
||||
ae
|
||||
ae
|
||||
ae
|
||||
ab
|
||||
cS
|
||||
dO
|
||||
et
|
||||
et
|
||||
|
||||
@@ -2522,6 +2522,9 @@
|
||||
pixel_x = 0;
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ai_monitored/storage/emergency/eva)
|
||||
"agh" = (
|
||||
@@ -4109,11 +4112,6 @@
|
||||
/turf/simulated/floor/carpet,
|
||||
/area/chapel/office)
|
||||
"ajM" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/simulated/floor,
|
||||
@@ -4661,11 +4659,6 @@
|
||||
/turf/simulated/floor/carpet,
|
||||
/area/chapel/office)
|
||||
"akQ" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
@@ -5038,7 +5031,7 @@
|
||||
/area/medical/pyschwarde)
|
||||
"alJ" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
req_access = list(12)
|
||||
req_access = list()
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
@@ -5067,6 +5060,7 @@
|
||||
dir = 2;
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ai_monitored/storage/emergency/eva)
|
||||
"alN" = (
|
||||
@@ -7549,16 +7543,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/chemistry)
|
||||
"arc" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/catwalk,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/hallway/lower/fore)
|
||||
"ard" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/catwalk,
|
||||
@@ -9114,16 +9098,6 @@
|
||||
},
|
||||
/turf/simulated/floor/bluegrid,
|
||||
/area/ai_upload)
|
||||
"auf" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2";
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/starboard)
|
||||
"aug" = (
|
||||
/obj/structure/table/standard{
|
||||
name = "plastic table frame"
|
||||
@@ -9895,12 +9869,6 @@
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/starboard)
|
||||
"avM" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2";
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/universal{
|
||||
dir = 4
|
||||
},
|
||||
@@ -10287,29 +10255,6 @@
|
||||
"awM" = (
|
||||
/turf/simulated/mineral/cave,
|
||||
/area/maintenance/starboard)
|
||||
"awN" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2";
|
||||
pixel_y = 0
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/starboard)
|
||||
"awO" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/starboard)
|
||||
"awP" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
|
||||
dir = 5;
|
||||
@@ -11004,7 +10949,7 @@
|
||||
/area/maintenance/starboard)
|
||||
"ayh" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-4"
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/starboard)
|
||||
@@ -14797,12 +14742,6 @@
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 5
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 1;
|
||||
icon_state = "pipe-c"
|
||||
@@ -15111,16 +15050,16 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/fish)
|
||||
"aHs" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 2;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/fish)
|
||||
"aHt" = (
|
||||
@@ -15676,9 +15615,6 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medical_lower)
|
||||
"aIK" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 6
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
@@ -15694,9 +15630,6 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
@@ -15992,9 +15925,6 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
@@ -16015,9 +15945,6 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
@@ -16027,9 +15954,6 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 8;
|
||||
icon_state = "pipe-c"
|
||||
@@ -16040,9 +15964,6 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/fish)
|
||||
"aJy" = (
|
||||
@@ -16214,7 +16135,6 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/fish)
|
||||
@@ -16236,18 +16156,6 @@
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/fish)
|
||||
"aKa" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2";
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/fish)
|
||||
"aKb" = (
|
||||
/obj/machinery/light/small{
|
||||
dir = 4;
|
||||
@@ -17592,17 +17500,6 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/fish)
|
||||
"aNp" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/fish)
|
||||
"aNq" = (
|
||||
/obj/machinery/floodlight,
|
||||
/turf/simulated/floor,
|
||||
@@ -20427,9 +20324,14 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/hallway/lower/central)
|
||||
"aTF" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
|
||||
/obj/structure/catwalk,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4;
|
||||
icon_state = "intact-scrubbers"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/hallway/lower/central)
|
||||
"aTG" = (
|
||||
@@ -21109,16 +21011,6 @@
|
||||
},
|
||||
/turf/simulated/floor/water/hotspring,
|
||||
/area/crew_quarters/sleep/Dorm_6)
|
||||
"aUZ" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/catwalk,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/crew_quarters/sleep/Dorm_6)
|
||||
"aVa" = (
|
||||
/obj/structure/catwalk,
|
||||
/turf/simulated/floor/plating,
|
||||
@@ -21127,16 +21019,6 @@
|
||||
/obj/structure/catwalk,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/crew_quarters/sleep/Dorm_10)
|
||||
"aVc" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/catwalk,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/crew_quarters/sleep/Dorm_10)
|
||||
"aVd" = (
|
||||
/turf/simulated/wall,
|
||||
/area/crew_quarters/sleep/Dorm_10)
|
||||
@@ -24588,7 +24470,7 @@
|
||||
"bbp" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Library Maintenance";
|
||||
req_one_access = list(12,37)
|
||||
req_one_access = list()
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
@@ -31121,7 +31003,7 @@
|
||||
/area/maintenance/dorm)
|
||||
"bol" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
req_access = list(12)
|
||||
req_access = list()
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
@@ -32063,6 +31945,9 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/supply,
|
||||
/obj/structure/cable{
|
||||
icon_state = "16-0"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/borealis2/elevator/dorms)
|
||||
"bqu" = (
|
||||
@@ -37341,7 +37226,7 @@
|
||||
/area/hallway/lower/dorms)
|
||||
"bBf" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
req_access = list(12)
|
||||
req_access = list()
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/structure/cable{
|
||||
@@ -38991,7 +38876,7 @@
|
||||
"bED" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Library Maintenance";
|
||||
req_one_access = list(12,37)
|
||||
req_one_access = list()
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
@@ -40649,6 +40534,16 @@
|
||||
/obj/structure/table/rack/shelf/steel,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/borealis2/outdoors/grounds/tower/southeast)
|
||||
"qgd" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/ai_monitored/storage/emergency/eva)
|
||||
"qgS" = (
|
||||
/obj/machinery/door/airlock/maintenance/sec{
|
||||
name = "Riot Control";
|
||||
@@ -40728,6 +40623,15 @@
|
||||
"rmX" = (
|
||||
/turf/simulated/wall/titanium,
|
||||
/area/borealis2/outdoors/grounds/tower/northeast)
|
||||
"rvD" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/ai_monitored/storage/emergency/eva)
|
||||
"rxR" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
@@ -40954,6 +40858,13 @@
|
||||
/obj/random/cutout,
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/chapel)
|
||||
"vXC" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable{
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/maintenance/starboard)
|
||||
"vZk" = (
|
||||
/obj/machinery/light/small{
|
||||
dir = 1;
|
||||
@@ -71863,14 +71774,14 @@ aGJ
|
||||
aGJ
|
||||
aIK
|
||||
aJW
|
||||
aKa
|
||||
aKa
|
||||
aKa
|
||||
aKa
|
||||
aKa
|
||||
aNp
|
||||
aNp
|
||||
aNp
|
||||
aJW
|
||||
aJW
|
||||
aJW
|
||||
aJW
|
||||
aJW
|
||||
aJW
|
||||
aJW
|
||||
aJW
|
||||
aGI
|
||||
aHA
|
||||
aPp
|
||||
@@ -78386,12 +78297,12 @@ aKc
|
||||
aKc
|
||||
aJA
|
||||
alN
|
||||
amH
|
||||
aie
|
||||
rvD
|
||||
qgd
|
||||
agg
|
||||
alk
|
||||
apV
|
||||
arc
|
||||
aqa
|
||||
aqa
|
||||
asW
|
||||
atM
|
||||
@@ -78429,7 +78340,7 @@ aPw
|
||||
aLe
|
||||
aRa
|
||||
aRF
|
||||
aSF
|
||||
aQk
|
||||
aTF
|
||||
aUI
|
||||
aVF
|
||||
@@ -78643,7 +78554,7 @@ aiI
|
||||
agh
|
||||
alk
|
||||
apW
|
||||
arc
|
||||
aqa
|
||||
aqa
|
||||
asX
|
||||
age
|
||||
@@ -89015,7 +88926,7 @@ aPQ
|
||||
aSg
|
||||
aSf
|
||||
aSf
|
||||
aUZ
|
||||
aVa
|
||||
aUW
|
||||
aWT
|
||||
aXG
|
||||
@@ -89468,14 +89379,14 @@ agM
|
||||
ahi
|
||||
ahS
|
||||
ahi
|
||||
ajb
|
||||
ahi
|
||||
ajM
|
||||
ajb
|
||||
ahi
|
||||
akQ
|
||||
ajb
|
||||
ajb
|
||||
ajb
|
||||
ajb
|
||||
ahi
|
||||
ahi
|
||||
ahi
|
||||
ahi
|
||||
aoD
|
||||
apf
|
||||
aqj
|
||||
@@ -89734,11 +89645,11 @@ ahS
|
||||
ahS
|
||||
ahS
|
||||
ahi
|
||||
auf
|
||||
auf
|
||||
ahi
|
||||
ahi
|
||||
avM
|
||||
awN
|
||||
ayg
|
||||
ahi
|
||||
vXC
|
||||
azs
|
||||
ajb
|
||||
ajb
|
||||
@@ -89771,7 +89682,7 @@ aeY
|
||||
aPQ
|
||||
aTb
|
||||
aSf
|
||||
aVc
|
||||
aVb
|
||||
aVd
|
||||
aWW
|
||||
aXJ
|
||||
@@ -89989,7 +89900,7 @@ awM
|
||||
awM
|
||||
aeq
|
||||
avN
|
||||
awO
|
||||
aeY
|
||||
ayh
|
||||
aeq
|
||||
aeq
|
||||
@@ -90023,7 +89934,7 @@ aRi
|
||||
aPQ
|
||||
aSf
|
||||
aSf
|
||||
aVc
|
||||
aVb
|
||||
aVd
|
||||
aWV
|
||||
aXI
|
||||
|
||||
+6822
-132276
File diff suppressed because it is too large
Load Diff
+1380
-72365
File diff suppressed because it is too large
Load Diff
@@ -326,7 +326,7 @@ var/global/list/latejoin_tram = list()
|
||||
//color = ""
|
||||
|
||||
/obj/machinery/door/airlock/multi_tile/metal/red/allowed(mob/user)
|
||||
if(get_security_level() in list("green","blue"))
|
||||
if(get_security_level() in list("green","blue","yellow","violet","orange"))
|
||||
return FALSE
|
||||
|
||||
return ..(user)
|
||||
|
||||
Reference in New Issue
Block a user