mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-09 16:07:40 +00:00
Ports improved and simplier fire alarms.
This commit is contained in:
Ghommie
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -2248,6 +2248,20 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/arena_source)
|
||||
"fR" = (
|
||||
/obj/machinery/firealarm{
|
||||
dir = 8;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/brown{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/brown,
|
||||
/obj/effect/turf_decal/tile/brown{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/centcom/supply)
|
||||
"fS" = (
|
||||
/obj/effect/turf_decal/tile/red{
|
||||
dir = 8
|
||||
@@ -2935,6 +2949,19 @@
|
||||
/obj/machinery/capture_the_flag/red,
|
||||
/turf/open/floor/circuit/green/anim,
|
||||
/area/ctf)
|
||||
"hH" = (
|
||||
/obj/machinery/firealarm{
|
||||
dir = 8;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/centcom/control)
|
||||
"hI" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 10
|
||||
@@ -3397,19 +3424,25 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/centcom/supply)
|
||||
"iS" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-22"
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = 24
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/brown{
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/brown,
|
||||
/obj/effect/turf_decal/tile/brown{
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/centcom/supply)
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/control)
|
||||
"iT" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 8
|
||||
@@ -3709,6 +3742,30 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/centcom/control)
|
||||
"jA" = (
|
||||
/obj/machinery/door/window/brigdoor{
|
||||
base_state = "rightsecure";
|
||||
dir = 2;
|
||||
icon_state = "leftsecure";
|
||||
name = "CentCom Stand";
|
||||
req_access_txt = "109"
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/control)
|
||||
"jB" = (
|
||||
/obj/structure/noticeboard{
|
||||
dir = 8;
|
||||
@@ -3882,17 +3939,28 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/centcom/control)
|
||||
"jV" = (
|
||||
/obj/machinery/door/window/brigdoor{
|
||||
base_state = "rightsecure";
|
||||
dir = 2;
|
||||
icon_state = "leftsecure";
|
||||
name = "CentCom Stand";
|
||||
req_access_txt = "109"
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
dir = 8;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/control)
|
||||
"jW" = (
|
||||
/obj/structure/closet/secure_closet/contraband/heads,
|
||||
@@ -4194,6 +4262,16 @@
|
||||
"ku" = (
|
||||
/turf/closed/indestructible/fakeglass,
|
||||
/area/syndicate_mothership)
|
||||
"kv" = (
|
||||
/obj/machinery/firealarm{
|
||||
dir = 8;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/centcom/ferry)
|
||||
"kw" = (
|
||||
/turf/open/floor/plasteel/yellowsiding,
|
||||
/area/centcom/supply)
|
||||
@@ -4227,25 +4305,29 @@
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/centcom/control)
|
||||
"kB" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-22"
|
||||
},
|
||||
/obj/structure/closet/secure_closet/personal/cabinet,
|
||||
/obj/item/clothing/under/rank/curator/treasure_hunter,
|
||||
/obj/item/clothing/under/skirt/black,
|
||||
/obj/item/clothing/under/shorts/black,
|
||||
/obj/item/clothing/under/pants/track,
|
||||
/obj/item/clothing/accessory/armband/deputy,
|
||||
/obj/item/clothing/accessory/waistcoat,
|
||||
/obj/item/clothing/shoes/jackboots,
|
||||
/obj/item/clothing/shoes/laceup,
|
||||
/obj/item/clothing/neck/stripedredscarf,
|
||||
/obj/item/clothing/neck/tie/red,
|
||||
/obj/item/clothing/head/helmet/space/beret,
|
||||
/obj/item/clothing/suit/curator,
|
||||
/obj/item/clothing/suit/space/officer,
|
||||
/obj/item/clothing/gloves/fingerless,
|
||||
/obj/item/clothing/gloves/color/black,
|
||||
/obj/item/clothing/glasses/eyepatch,
|
||||
/obj/machinery/firealarm{
|
||||
dir = 8;
|
||||
dir = 4;
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/control)
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/centcom/ferry)
|
||||
"kC" = (
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
@@ -4364,6 +4446,34 @@
|
||||
icon_state = "alien19"
|
||||
},
|
||||
/area/abductor_ship)
|
||||
"kR" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/dice/d20{
|
||||
pixel_x = 3;
|
||||
pixel_y = 3
|
||||
},
|
||||
/obj/item/dice/d10{
|
||||
pixel_x = -3
|
||||
},
|
||||
/obj/machinery/computer/security/telescreen/entertainment{
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
dir = 8;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/ferry)
|
||||
"kS" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 8
|
||||
@@ -4531,6 +4641,42 @@
|
||||
icon_state = "alien15"
|
||||
},
|
||||
/area/abductor_ship)
|
||||
"ll" = (
|
||||
/obj/machinery/computer/med_data{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
dir = 8;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/centcom/control)
|
||||
"lm" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/book/manual/wiki/security_space_law,
|
||||
/obj/item/taperecorder,
|
||||
/obj/machinery/firealarm{
|
||||
dir = 8;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/control)
|
||||
"ln" = (
|
||||
/obj/machinery/light,
|
||||
/obj/effect/turf_decal/tile/brown,
|
||||
@@ -4626,6 +4772,24 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/control)
|
||||
"ly" = (
|
||||
/obj/structure/filingcabinet/medical,
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/control)
|
||||
"lz" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/storage/briefcase,
|
||||
@@ -4792,6 +4956,13 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/control)
|
||||
"lS" = (
|
||||
/obj/machinery/firealarm{
|
||||
dir = 8;
|
||||
pixel_x = 24
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/tdome/tdomeobserve)
|
||||
"lT" = (
|
||||
/obj/machinery/door/airlock/centcom{
|
||||
name = "CentCom Security";
|
||||
@@ -4852,6 +5023,17 @@
|
||||
icon_state = "alien11"
|
||||
},
|
||||
/area/abductor_ship)
|
||||
"ma" = (
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/bar,
|
||||
/obj/effect/turf_decal/tile/bar{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/tdomeobserve)
|
||||
"mb" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
@@ -5104,6 +5286,26 @@
|
||||
/obj/effect/baseturf_helper/asteroid/snow,
|
||||
/turf/closed/indestructible/rock/snow,
|
||||
/area/syndicate_mothership)
|
||||
"mC" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21"
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/tdome/tdomeadmin)
|
||||
"mD" = (
|
||||
/turf/closed/indestructible/riveted,
|
||||
/area/centcom/ferry)
|
||||
@@ -5766,54 +5968,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/control)
|
||||
"nQ" = (
|
||||
/obj/machinery/door/window/brigdoor{
|
||||
base_state = "rightsecure";
|
||||
dir = 2;
|
||||
icon_state = "leftsecure";
|
||||
name = "CentCom Stand";
|
||||
req_access_txt = "109"
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
dir = 8;
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/control)
|
||||
"nR" = (
|
||||
/obj/machinery/door/window/brigdoor{
|
||||
base_state = "rightsecure";
|
||||
dir = 2;
|
||||
icon_state = "leftsecure";
|
||||
name = "CentCom Stand";
|
||||
req_access_txt = "109"
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/control)
|
||||
"nS" = (
|
||||
/obj/machinery/door/airlock/silver{
|
||||
name = "Bathroom"
|
||||
@@ -6864,40 +7018,6 @@
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/centcom/ferry)
|
||||
"pM" = (
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/centcom/ferry)
|
||||
"pN" = (
|
||||
/obj/structure/closet/secure_closet/personal/cabinet,
|
||||
/obj/item/clothing/under/rank/curator/treasure_hunter,
|
||||
/obj/item/clothing/under/skirt/black,
|
||||
/obj/item/clothing/under/shorts/black,
|
||||
/obj/item/clothing/under/pants/track,
|
||||
/obj/item/clothing/accessory/armband/deputy,
|
||||
/obj/item/clothing/accessory/waistcoat,
|
||||
/obj/item/clothing/shoes/jackboots,
|
||||
/obj/item/clothing/shoes/laceup,
|
||||
/obj/item/clothing/neck/stripedredscarf,
|
||||
/obj/item/clothing/neck/tie/red,
|
||||
/obj/item/clothing/head/helmet/space/beret,
|
||||
/obj/item/clothing/suit/curator,
|
||||
/obj/item/clothing/suit/space/officer,
|
||||
/obj/item/clothing/gloves/fingerless,
|
||||
/obj/item/clothing/gloves/color/black,
|
||||
/obj/item/clothing/glasses/eyepatch,
|
||||
/obj/machinery/firealarm{
|
||||
dir = 8;
|
||||
pixel_x = -24
|
||||
},
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/centcom/ferry)
|
||||
"pO" = (
|
||||
/obj/structure/destructible/cult/tome,
|
||||
/obj/item/book/codex_gigas,
|
||||
@@ -9201,34 +9321,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/ferry)
|
||||
"uX" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/dice/d20{
|
||||
pixel_x = 3;
|
||||
pixel_y = 3
|
||||
},
|
||||
/obj/item/dice/d10{
|
||||
pixel_x = -3
|
||||
},
|
||||
/obj/machinery/computer/security/telescreen/entertainment{
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/ferry)
|
||||
"uY" = (
|
||||
/obj/structure/flora/ausbushes/lavendergrass,
|
||||
/obj/structure/flora/ausbushes/sparsegrass,
|
||||
@@ -11012,22 +11104,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/centcom/control)
|
||||
"zK" = (
|
||||
/obj/machinery/computer/med_data{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/centcom/control)
|
||||
"zL" = (
|
||||
/obj/structure/flora/ausbushes/lavendergrass,
|
||||
/obj/structure/flora/ausbushes/fullgrass,
|
||||
@@ -12318,26 +12394,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/centcom/ferry)
|
||||
"CH" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/book/manual/wiki/security_space_law,
|
||||
/obj/item/taperecorder,
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/control)
|
||||
"CI" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/paper_bin,
|
||||
@@ -12387,24 +12443,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/centcom/control)
|
||||
"CM" = (
|
||||
/obj/structure/filingcabinet/medical,
|
||||
/obj/machinery/firealarm{
|
||||
dir = 8;
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/control)
|
||||
"CN" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/storage/firstaid/regular,
|
||||
@@ -14509,13 +14547,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/tdomeobserve)
|
||||
"Hq" = (
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = 24
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/tdome/tdomeobserve)
|
||||
"Hr" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/structure/sign/plaques/thunderdome{
|
||||
@@ -14552,17 +14583,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/tdome/tdomeobserve)
|
||||
"Hu" = (
|
||||
/obj/machinery/firealarm{
|
||||
dir = 8;
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/bar,
|
||||
/obj/effect/turf_decal/tile/bar{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/tdomeobserve)
|
||||
"Hv" = (
|
||||
/obj/machinery/light,
|
||||
/obj/effect/turf_decal/tile/bar,
|
||||
@@ -15830,26 +15850,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tdome/tdomeadmin)
|
||||
"JZ" = (
|
||||
/obj/item/twohanded/required/kirbyplants{
|
||||
icon_state = "plant-21"
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
dir = 8;
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/tdome/tdomeadmin)
|
||||
"Ka" = (
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/tdome/tdomeadmin)
|
||||
@@ -57355,14 +57355,14 @@ nU
|
||||
on
|
||||
oI
|
||||
pe
|
||||
pM
|
||||
kv
|
||||
qi
|
||||
mD
|
||||
ry
|
||||
sC
|
||||
tC
|
||||
oB
|
||||
uX
|
||||
kR
|
||||
mD
|
||||
su
|
||||
ws
|
||||
@@ -57869,7 +57869,7 @@ mD
|
||||
oo
|
||||
oI
|
||||
pf
|
||||
pN
|
||||
kB
|
||||
qj
|
||||
nU
|
||||
rr
|
||||
@@ -60215,7 +60215,7 @@ Gh
|
||||
Ep
|
||||
GJ
|
||||
Hd
|
||||
Hq
|
||||
lS
|
||||
Gx
|
||||
GM
|
||||
HW
|
||||
@@ -60231,7 +60231,7 @@ IE
|
||||
Is
|
||||
JI
|
||||
JP
|
||||
JZ
|
||||
mC
|
||||
JG
|
||||
Kn
|
||||
Iv
|
||||
@@ -60674,7 +60674,7 @@ aa
|
||||
aa
|
||||
aa
|
||||
iF
|
||||
iS
|
||||
fR
|
||||
iZ
|
||||
jf
|
||||
jq
|
||||
@@ -60972,7 +60972,7 @@ tL
|
||||
io
|
||||
iu
|
||||
io
|
||||
CH
|
||||
lm
|
||||
vM
|
||||
Ds
|
||||
DG
|
||||
@@ -63028,7 +63028,7 @@ tL
|
||||
io
|
||||
iu
|
||||
io
|
||||
CM
|
||||
ly
|
||||
Da
|
||||
Dv
|
||||
DJ
|
||||
@@ -63813,7 +63813,7 @@ Gp
|
||||
Ep
|
||||
GQ
|
||||
Hf
|
||||
Hu
|
||||
ma
|
||||
Gx
|
||||
GM
|
||||
HW
|
||||
@@ -65822,7 +65822,7 @@ iU
|
||||
jB
|
||||
iU
|
||||
iU
|
||||
jV
|
||||
hH
|
||||
iU
|
||||
iU
|
||||
kV
|
||||
@@ -66107,7 +66107,7 @@ xq
|
||||
wI
|
||||
yA
|
||||
iu
|
||||
zK
|
||||
ll
|
||||
As
|
||||
zJ
|
||||
BL
|
||||
@@ -67880,14 +67880,14 @@ aa
|
||||
io
|
||||
jZ
|
||||
iC
|
||||
kB
|
||||
iS
|
||||
in
|
||||
lx
|
||||
lR
|
||||
ml
|
||||
mW
|
||||
nv
|
||||
nQ
|
||||
jA
|
||||
iC
|
||||
iC
|
||||
iC
|
||||
@@ -70971,7 +70971,7 @@ lW
|
||||
mq
|
||||
na
|
||||
lW
|
||||
nR
|
||||
jV
|
||||
iC
|
||||
oz
|
||||
oR
|
||||
|
||||
@@ -58,8 +58,6 @@
|
||||
/obj/machinery/firealarm/update_icon()
|
||||
cut_overlays()
|
||||
SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
|
||||
var/area/A = src.loc
|
||||
A = A.loc
|
||||
|
||||
if(panel_open)
|
||||
icon_state = "fire_b[buildstage]"
|
||||
@@ -69,23 +67,32 @@
|
||||
icon_state = "firex"
|
||||
return
|
||||
|
||||
icon_state = "fire0"
|
||||
|
||||
if(stat & NOPOWER)
|
||||
icon_state = "fire0"
|
||||
return
|
||||
|
||||
if(is_station_level(z))
|
||||
add_overlay("overlay_[GLOB.security_level]")
|
||||
SSvis_overlays.add_vis_overlay(src, icon, "overlay_[GLOB.security_level]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
|
||||
else
|
||||
add_overlay("overlay_[SEC_LEVEL_GREEN]")
|
||||
SSvis_overlays.add_vis_overlay(src, icon, "overlay_[SEC_LEVEL_GREEN]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
|
||||
add_overlay("fire_overlay")
|
||||
|
||||
if(detecting)
|
||||
add_overlay("overlay_[A.fire ? "fire" : "clear"]")
|
||||
SSvis_overlays.add_vis_overlay(src, icon, "overlay_[A.fire ? "fire" : "clear"]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
|
||||
if(is_station_level(z))
|
||||
add_overlay("fire_[GLOB.security_level]")
|
||||
SSvis_overlays.add_vis_overlay(src, icon, "fire_[GLOB.security_level]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
|
||||
else
|
||||
add_overlay("overlay_fire")
|
||||
SSvis_overlays.add_vis_overlay(src, icon, "overlay_fire", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
|
||||
add_overlay("fire_[SEC_LEVEL_GREEN]")
|
||||
SSvis_overlays.add_vis_overlay(src, icon, "fire_[SEC_LEVEL_GREEN]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
|
||||
|
||||
var/area/A = src.loc
|
||||
A = A.loc
|
||||
|
||||
if(!detecting || !A.fire)
|
||||
add_overlay("fire_off")
|
||||
SSvis_overlays.add_vis_overlay(src, icon, "fire_off", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
|
||||
else if(obj_flags & EMAGGED)
|
||||
add_overlay("fire_emagged")
|
||||
SSvis_overlays.add_vis_overlay(src, icon, "fire_emagged", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
|
||||
else
|
||||
add_overlay("fire_on")
|
||||
SSvis_overlays.add_vis_overlay(src, icon, "fire_on", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
|
||||
|
||||
/obj/machinery/firealarm/emp_act(severity)
|
||||
. = ..()
|
||||
@@ -101,6 +108,7 @@
|
||||
if(obj_flags & EMAGGED)
|
||||
return
|
||||
obj_flags |= EMAGGED
|
||||
update_icon()
|
||||
if(user)
|
||||
user.visible_message("<span class='warning'>Sparks fly out of [src]!</span>",
|
||||
"<span class='notice'>You emag [src], disabling its thermal sensors.</span>")
|
||||
@@ -112,51 +120,39 @@
|
||||
alarm()
|
||||
..()
|
||||
|
||||
/obj/machinery/firealarm/proc/alarm()
|
||||
if(!is_operational() && (last_alarm+FIREALARM_COOLDOWN < world.time))
|
||||
/obj/machinery/firealarm/proc/alarm(mob/user)
|
||||
if(!is_operational() || (last_alarm+FIREALARM_COOLDOWN > world.time))
|
||||
return
|
||||
last_alarm = world.time
|
||||
var/area/A = get_area(src)
|
||||
A.firealert(src)
|
||||
playsound(src.loc, 'goon/sound/machinery/FireAlarm.ogg', 75)
|
||||
playsound(loc, 'goon/sound/machinery/FireAlarm.ogg', 75)
|
||||
if(user)
|
||||
log_game("[user] triggered a fire alarm at [COORD(src)]")
|
||||
|
||||
/obj/machinery/firealarm/proc/reset()
|
||||
/obj/machinery/firealarm/proc/reset(mob/user)
|
||||
if(!is_operational())
|
||||
return
|
||||
var/area/A = get_area(src)
|
||||
A.firereset(src)
|
||||
if(user)
|
||||
log_game("[user] reset a fire alarm at [COORD(src)]")
|
||||
|
||||
/obj/machinery/firealarm/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
|
||||
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
|
||||
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
|
||||
if(!ui)
|
||||
ui = new(user, src, ui_key, "firealarm", name, 300, 150, master_ui, state)
|
||||
ui.open()
|
||||
|
||||
/obj/machinery/firealarm/ui_data(mob/user)
|
||||
var/list/data = list()
|
||||
data["emagged"] = obj_flags & EMAGGED ? 1 : 0
|
||||
|
||||
if(is_station_level(z))
|
||||
data["seclevel"] = get_security_level()
|
||||
else
|
||||
data["seclevel"] = "green"
|
||||
|
||||
/obj/machinery/firealarm/attack_hand(mob/user)
|
||||
if(buildstage != 2)
|
||||
return ..()
|
||||
add_fingerprint(user)
|
||||
var/area/A = get_area(src)
|
||||
data["alarm"] = A.fire
|
||||
if(A.fire)
|
||||
reset(user)
|
||||
else
|
||||
alarm(user)
|
||||
|
||||
return data
|
||||
/obj/machinery/firealarm/attack_ai(mob/user)
|
||||
return attack_hand(user)
|
||||
|
||||
/obj/machinery/firealarm/ui_act(action, params)
|
||||
if(..() || buildstage != 2)
|
||||
return
|
||||
switch(action)
|
||||
if("reset")
|
||||
reset()
|
||||
. = TRUE
|
||||
if("alarm")
|
||||
alarm()
|
||||
. = TRUE
|
||||
/obj/machinery/firealarm/attack_robot(mob/user)
|
||||
return attack_hand(user)
|
||||
|
||||
/obj/machinery/firealarm/attackby(obj/item/W, mob/user, params)
|
||||
add_fingerprint(user)
|
||||
@@ -200,6 +196,12 @@
|
||||
to_chat(user, "<span class='notice'>You cut the wires from \the [src].</span>")
|
||||
update_icon()
|
||||
return
|
||||
else if(W.force) //hit and turn it on
|
||||
..()
|
||||
var/area/A = get_area(src)
|
||||
if(!A.fire)
|
||||
alarm()
|
||||
return
|
||||
if(1)
|
||||
if(istype(W, /obj/item/stack/cable_coil))
|
||||
var/obj/item/stack/cable_coil/coil = W
|
||||
@@ -322,8 +324,3 @@
|
||||
if (!party_overlay)
|
||||
party_overlay = iconstate2appearance('icons/turf/areas.dmi', "party")
|
||||
A.add_overlay(party_overlay)
|
||||
|
||||
/obj/machinery/firealarm/partyalarm/ui_data(mob/user)
|
||||
. = ..()
|
||||
var/area/A = get_area(src)
|
||||
.["alarm"] = A && A.party
|
||||
|
||||
@@ -505,6 +505,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
|
||||
if(!is_station_level(F.z))
|
||||
continue
|
||||
F.obj_flags |= EMAGGED
|
||||
F.update_icon()
|
||||
to_chat(owner, "<span class='notice'>All thermal sensors on the station have been disabled. Fire alerts will no longer be recognized.</span>")
|
||||
owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, 0)
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
@@ -1,10 +0,0 @@
|
||||
/obj/machinery/firealarm/alt_attack_hand(mob/user)
|
||||
if(can_interact(usr))
|
||||
var/area/A = get_area(src)
|
||||
if(istype(A))
|
||||
if(A.fire)
|
||||
reset()
|
||||
else
|
||||
alarm()
|
||||
return TRUE
|
||||
return FALSE
|
||||
@@ -3003,7 +3003,6 @@
|
||||
#include "modular_citadel\code\game\gamemodes\miniantags\bot_swarm\swarmer_event.dm"
|
||||
#include "modular_citadel\code\game\gamemodes\revolution\revolution.dm"
|
||||
#include "modular_citadel\code\game\machinery\displaycases.dm"
|
||||
#include "modular_citadel\code\game\machinery\firealarm.dm"
|
||||
#include "modular_citadel\code\game\machinery\Sleeper.dm"
|
||||
#include "modular_citadel\code\game\machinery\toylathe.dm"
|
||||
#include "modular_citadel\code\game\machinery\vending.dm"
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,29 +0,0 @@
|
||||
<script>
|
||||
component.exports = {
|
||||
computed: {
|
||||
seclevelState () {
|
||||
switch (this.get('data.seclevel')) {
|
||||
case 'blue': return 'average'
|
||||
case 'red': return 'bad'
|
||||
case 'delta': return 'bad bold'
|
||||
default: return 'good'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<ui-display>
|
||||
<ui-section label='Alert Level'>
|
||||
<span class='{{seclevelState}}'>{{text.titleCase(data.seclevel)}}</span>
|
||||
</ui-section>
|
||||
<ui-section label='Controls'>
|
||||
<ui-button icon='{{data.alarm ? "close" : "bell-o"}}' action='{{data.alarm ? "reset" : "alarm"}}'>
|
||||
{{data.alarm ? "Reset" : "Activate"}}</ui-button>
|
||||
</ui-section>
|
||||
{{#if data.emagged}}
|
||||
<ui-section label='Warning'>
|
||||
<span class='bad bold'>Safety measures offline. Device may exhibit abnormal behavior.</span>
|
||||
</ui-section>
|
||||
{{/if}}
|
||||
</ui-display>
|
||||
Reference in New Issue
Block a user