shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

push

Browse Source
This commit is contained in:
SandPoot
2024-08-24 21:28:55 -03:00
parent 9604090014
commit c07e94be66
218 changed files with 1001 additions and 979 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+1 -1
View File
@@ -4159,7 +4159,7 @@
dir = 2;
dwidth = 11;
height = 22;
id = "whiteship_z4";
shuttle_id = "whiteship_z4";
name = "KSS13: Derelict";
width = 35
},
_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+4 -4
View File
@@ -51,7 +51,7 @@
dir = 2;
dwidth = 14;
height = 13;
id = "caravanpirate_ambush";
shuttle_id = "caravanpirate_ambush";
name = "Trade Route";
roundstart_template = /datum/map_template/shuttle/ruin/pirate_cutter;
width = 22
@@ -1260,7 +1260,7 @@
dir = 2;
dwidth = 6;
height = 7;
id = "caravansyndicate3_ambush";
shuttle_id = "caravansyndicate3_ambush";
name = "Trade Route";
roundstart_template = /datum/map_template/shuttle/ruin/syndicate_dropship;
width = 15
@@ -1272,7 +1272,7 @@
dir = 4;
dwidth = 4;
height = 5;
id = "caravansyndicate1_ambush";
shuttle_id = "caravansyndicate1_ambush";
name = "Trade Route";
roundstart_template = /datum/map_template/shuttle/ruin/syndicate_fighter_shiv;
width = 9
@@ -1284,7 +1284,7 @@
dir = 2;
dwidth = 11;
height = 11;
id = "caravantrade1_ambush";
shuttle_id = "caravantrade1_ambush";
name = "Trade Route";
roundstart_template = /datum/map_template/shuttle/ruin/caravan_victim;
width = 27
_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+2 -2
View File
@@ -1152,7 +1152,7 @@
dir = 4;
dwidth = 6;
height = 7;
id = "caravansyndicate3_listeningpost";
shuttle_id = "caravansyndicate3_listeningpost";
name = "Syndicate Listening Post";
width = 15
},
@@ -1160,7 +1160,7 @@
dir = 4;
dwidth = 4;
height = 5;
id = "caravansyndicate1_listeningpost";
shuttle_id = "caravansyndicate1_listeningpost";
name = "Syndicate Listening Post";
width = 9
},
_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm
+3 -3
View File
@@ -700,7 +700,7 @@
dir = 8;
dwidth = 2;
height = 5;
id = "laborcamp_away";
shuttle_id = "laborcamp_away";
name = "labor camp";
width = 9
},
@@ -1557,7 +1557,7 @@
dir = 8;
dwidth = 3;
height = 7;
id = "lavaland_common_away";
shuttle_id = "lavaland_common_away";
name = "Lavaland Mining Public Wing";
width = 7
},
@@ -2394,7 +2394,7 @@
dir = 8;
dwidth = 3;
height = 10;
id = "mining_away";
shuttle_id = "mining_away";
name = "lavaland mine";
width = 7
},
_maps/RandomZLevels/VR/snowdin_VR.dmm
+4 -4
View File
@@ -10371,7 +10371,7 @@
dir = 4;
dwidth = 3;
height = 6;
id = "snowdin_excavation_top";
shuttle_id = "snowdin_excavation_top";
name = "snowdin excavation top";
roundstart_template = /datum/map_template/shuttle/snowdin/excavation;
width = 6
@@ -10414,7 +10414,7 @@
dir = 4;
dwidth = 3;
height = 6;
id = "snowdin_excavation_down";
shuttle_id = "snowdin_excavation_down";
name = "snowdin excavation down";
width = 6
},
@@ -15303,7 +15303,7 @@
dir = 4;
dwidth = 2;
height = 5;
id = "snowdin_mining_top";
shuttle_id = "snowdin_mining_top";
name = "snowdin mining top";
roundstart_template = /datum/map_template/shuttle/snowdin/mining;
width = 5
@@ -15361,7 +15361,7 @@
dir = 4;
dwidth = 2;
height = 5;
id = "snowdin_mining_down";
shuttle_id = "snowdin_mining_down";
name = "snowdin mining bottom";
width = 5
},
_maps/RandomZLevels/away_mission/snowdin.dmm
+4 -4
View File
@@ -10374,7 +10374,7 @@
dir = 4;
dwidth = 3;
height = 6;
id = "snowdin_excavation_top";
shuttle_id = "snowdin_excavation_top";
name = "snowdin excavation top";
roundstart_template = /datum/map_template/shuttle/snowdin/excavation;
width = 6
@@ -10417,7 +10417,7 @@
dir = 4;
dwidth = 3;
height = 6;
id = "snowdin_excavation_down";
shuttle_id = "snowdin_excavation_down";
name = "snowdin excavation down";
width = 6
},
@@ -15304,7 +15304,7 @@
dir = 4;
dwidth = 2;
height = 5;
id = "snowdin_mining_top";
shuttle_id = "snowdin_mining_top";
name = "snowdin mining top";
roundstart_template = /datum/map_template/shuttle/snowdin/mining;
width = 5
@@ -15362,7 +15362,7 @@
dir = 4;
dwidth = 2;
height = 5;
id = "snowdin_mining_down";
shuttle_id = "snowdin_mining_down";
name = "snowdin mining bottom";
width = 5
},
_maps/map_files/BoxStation/BoxStation.dmm
+14 -14
View File
@@ -2345,7 +2345,7 @@
dir = 4;
dwidth = 12;
height = 18;
id = "emergency_home";
shuttle_id = "emergency_home";
name = "BoxStation emergency evac bay";
width = 32
},
@@ -7009,7 +7009,7 @@
dir = 8;
dwidth = 2;
height = 5;
id = "laborcamp_home";
shuttle_id = "laborcamp_home";
name = "fore bay 1";
roundstart_template = /datum/map_template/shuttle/labour/box;
width = 9
@@ -10174,7 +10174,7 @@
dir = 8;
dwidth = 12;
height = 17;
id = "syndicate_ne";
shuttle_id = "syndicate_ne";
name = "northeast of station";
width = 23
},
@@ -35960,7 +35960,7 @@
dir = 8;
dwidth = 3;
height = 5;
id = "mining_home";
shuttle_id = "mining_home";
name = "mining shuttle bay";
roundstart_template = /datum/map_template/shuttle/mining/box;
width = 7
@@ -47812,7 +47812,7 @@
"cpe" = (
/obj/docking_port/stationary/random{
dir = 8;
id = "pod_lavaland2";
shuttle_id = "pod_lavaland2";
name = "lavaland"
},
/turf/open/space,
@@ -50161,7 +50161,7 @@
"cwV" = (
/obj/docking_port/stationary/random{
dir = 8;
id = "pod_lavaland1";
shuttle_id = "pod_lavaland1";
name = "lavaland"
},
/turf/open/space,
@@ -50180,7 +50180,7 @@
dir = 8;
dwidth = 2;
height = 13;
id = "ferry_home";
shuttle_id = "ferry_home";
name = "port bay 2";
width = 5
},
@@ -50229,7 +50229,7 @@
dir = 2;
dwidth = 11;
height = 22;
id = "whiteship_home";
shuttle_id = "whiteship_home";
name = "SS13: Auxiliary Dock, Station-Port";
width = 35
},
@@ -50370,7 +50370,7 @@
dir = 8;
dwidth = 5;
height = 7;
id = "supply_home";
shuttle_id = "supply_home";
name = "Cargo Bay";
width = 12
},
@@ -50439,7 +50439,7 @@
"czN" = (
/obj/docking_port/stationary/random{
dir = 4;
id = "pod_lavaland4";
shuttle_id = "pod_lavaland4";
name = "lavaland"
},
/turf/open/space,
@@ -51694,7 +51694,7 @@
dir = 8;
dwidth = 3;
height = 15;
id = "arrivals_stationary";
shuttle_id = "arrivals_stationary";
name = "arrivals";
roundstart_template = /datum/map_template/shuttle/arrival/box;
width = 7
@@ -56574,7 +56574,7 @@
"jdj" = (
/obj/docking_port/stationary/random{
dir = 4;
id = "pod_lavaland3";
shuttle_id = "pod_lavaland3";
name = "lavaland"
},
/turf/open/space,
@@ -62989,7 +62989,7 @@
dir = 8;
dwidth = 3;
height = 5;
id = "commonmining_home";
shuttle_id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
@@ -65990,7 +65990,7 @@
dir = 8;
dwidth = 4;
height = 9;
id = "aux_base_zone";
shuttle_id = "aux_base_zone";
name = "aux base zone";
roundstart_template = /datum/map_template/shuttle/aux_base/default;
width = 9
_maps/map_files/CogStation/CogStation.dmm
+7 -7
View File
@@ -30,7 +30,7 @@
dir = 2;
dwidth = 4;
height = 12;
id = "arrivals_stationary";
shuttle_id = "arrivals_stationary";
name = "cog arrivals";
roundstart_template = /datum/map_template/shuttle/arrival/cog;
width = 9
@@ -25997,7 +25997,7 @@
dir = 8;
dwidth = 2;
height = 5;
id = "laborcamp_home";
shuttle_id = "laborcamp_home";
name = "fore bay 1";
roundstart_template = /datum/map_template/shuttle/labour/cog;
width = 9
@@ -50476,7 +50476,7 @@
dir = 8;
dwidth = 2;
height = 13;
id = "ferry_home";
shuttle_id = "ferry_home";
name = "port bay 2";
width = 5
},
@@ -51636,7 +51636,7 @@
dir = 4;
dwidth = 3;
height = 5;
id = "mining_home";
shuttle_id = "mining_home";
name = "mining shuttle bay";
roundstart_template = /datum/map_template/shuttle/mining/delta;
width = 7
@@ -54879,7 +54879,7 @@
dir = 2;
dwidth = 9;
height = 22;
id = "emergency_home";
shuttle_id = "emergency_home";
name = "CogStation Escape Dock";
width = 29
},
@@ -56668,7 +56668,7 @@
dir = 4;
dwidth = 5;
height = 7;
id = "supply_home";
shuttle_id = "supply_home";
name = "Cargo Shuttle";
width = 12
},
@@ -58570,7 +58570,7 @@
dir = 2;
dwidth = 7;
height = 9;
id = "whiteship_home";
shuttle_id = "whiteship_home";
name = "SS13: Merchant Dock";
width = 13
},
_maps/map_files/Deltastation/DeltaStation2.dmm
+13 -13
View File
@@ -27,14 +27,14 @@
/area/hallway/primary/central)
"aas" = (
/obj/docking_port/stationary/random{
id = "pod_lavaland1";
shuttle_id = "pod_lavaland1";
name = "lavaland"
},
/turf/open/space,
/area/space/nearstation)
"aat" = (
/obj/docking_port/stationary/random{
id = "pod_lavaland2";
shuttle_id = "pod_lavaland2";
name = "lavaland"
},
/turf/open/space,
@@ -585,7 +585,7 @@
dir = 2;
dwidth = 4;
height = 17;
id = "arrivals_stationary";
shuttle_id = "arrivals_stationary";
name = "delta arrivals";
roundstart_template = /datum/map_template/shuttle/arrival/delta;
width = 9
@@ -1698,7 +1698,7 @@
dir = 8;
dwidth = 12;
height = 17;
id = "syndicate_ne";
shuttle_id = "syndicate_ne";
name = "northeast of station";
width = 23
},
@@ -1709,7 +1709,7 @@
dir = 8;
dwidth = 11;
height = 15;
id = "whiteship_home";
shuttle_id = "whiteship_home";
name = "SS13: Auxiliary Dock, Station-Fore";
width = 32
},
@@ -2034,7 +2034,7 @@
/obj/docking_port/stationary{
dwidth = 2;
height = 13;
id = "ferry_home";
shuttle_id = "ferry_home";
name = "port bay 2";
width = 5
},
@@ -8402,7 +8402,7 @@
dir = 4;
dwidth = 4;
height = 7;
id = "supply_home";
shuttle_id = "supply_home";
name = "Cargo Bay";
width = 12
},
@@ -14066,7 +14066,7 @@
"bbz" = (
/obj/docking_port/stationary/random{
dir = 4;
id = "pod_lavaland4";
shuttle_id = "pod_lavaland4";
name = "lavaland"
},
/turf/open/space,
@@ -15017,7 +15017,7 @@
dir = 4;
dwidth = 3;
height = 5;
id = "mining_home";
shuttle_id = "mining_home";
name = "mining shuttle bay";
roundstart_template = /datum/map_template/shuttle/mining/delta;
width = 7
@@ -19263,7 +19263,7 @@
dir = 8;
dwidth = 2;
height = 5;
id = "laborcamp_home";
shuttle_id = "laborcamp_home";
name = "fore bay 1";
roundstart_template = /datum/map_template/shuttle/labour/delta;
width = 9
@@ -68930,7 +68930,7 @@
dir = 4;
dwidth = 11;
height = 18;
id = "emergency_home";
shuttle_id = "emergency_home";
name = "DeltaStation emergency evac bay";
width = 30
},
@@ -93972,7 +93972,7 @@
dir = 4;
dwidth = 4;
height = 9;
id = "aux_base_zone";
shuttle_id = "aux_base_zone";
name = "aux base zone";
roundstart_template = /datum/map_template/shuttle/aux_base/default;
width = 9
@@ -97343,7 +97343,7 @@
/obj/docking_port/stationary{
dwidth = 3;
height = 5;
id = "commonmining_home";
shuttle_id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
_maps/map_files/FestiveBall/FestiveStation.dmm
+4 -4
View File
@@ -34565,7 +34565,7 @@
dir = 8;
dwidth = 4;
height = 15;
id = "emergency_home";
shuttle_id = "emergency_home";
name = "PubbyStation emergency evac bay";
width = 20
},
@@ -35502,7 +35502,7 @@
dir = 4;
dwidth = 3;
height = 5;
id = "mining_home";
shuttle_id = "mining_home";
name = "mining shuttle bay";
roundstart_template = /datum/map_template/shuttle/mining/delta;
width = 7
@@ -40161,7 +40161,7 @@
dir = 4;
dwidth = 5;
height = 7;
id = "supply_home";
shuttle_id = "supply_home";
name = "Cargo Bay";
width = 12
},
@@ -54154,7 +54154,7 @@
dir = 4;
dwidth = 2;
height = 5;
id = "laborcamp_home";
shuttle_id = "laborcamp_home";
name = "fore bay 1";
roundstart_template = /datum/map_template/shuttle/labour/delta;
width = 9
_maps/map_files/KiloStation/KiloStation.dmm
+12 -12
View File
@@ -1324,7 +1324,7 @@
/area/security/detectives_office)
"acy" = (
/obj/docking_port/stationary/random{
id = "pod_lavaland3";
shuttle_id = "pod_lavaland3";
name = "lavaland"
},
/turf/open/space,
@@ -39365,7 +39365,7 @@
dir = 4;
dwidth = 3;
height = 10;
id = "mining_home";
shuttle_id = "mining_home";
name = "mining shuttle bay";
roundstart_template = /datum/map_template/shuttle/mining/kilo;
width = 7
@@ -40399,7 +40399,7 @@
dir = 4;
dwidth = 4;
height = 7;
id = "supply_home";
shuttle_id = "supply_home";
name = "Cargo Bay";
width = 12
},
@@ -41819,7 +41819,7 @@
dir = 8;
dwidth = 2;
height = 11;
id = "ferry_home";
shuttle_id = "ferry_home";
name = "port bay 2";
width = 5
},
@@ -57538,7 +57538,7 @@
dir = 2;
dwidth = 2;
height = 5;
id = "laborcamp_home";
shuttle_id = "laborcamp_home";
name = "fore bay 1";
roundstart_template = /datum/map_template/shuttle/labour/kilo;
width = 9
@@ -59792,7 +59792,7 @@
dir = 4;
dwidth = 11;
height = 18;
id = "emergency_home";
shuttle_id = "emergency_home";
name = "KiloStation emergency evac bay";
width = 30
},
@@ -66336,7 +66336,7 @@
"ccg" = (
/obj/docking_port/stationary/random{
dir = 8;
id = "pod_lavaland2";
shuttle_id = "pod_lavaland2";
name = "lavaland"
},
/turf/open/space,
@@ -79682,7 +79682,7 @@
dir = 8;
dwidth = 12;
height = 17;
id = "syndicate_nw";
shuttle_id = "syndicate_nw";
name = "northwest of station";
width = 23
},
@@ -81678,7 +81678,7 @@
"cGA" = (
/obj/docking_port/stationary/random{
dir = 2;
id = "pod_lavaland1";
shuttle_id = "pod_lavaland1";
name = "lavaland"
},
/turf/open/space,
@@ -82666,7 +82666,7 @@
dir = 8;
dwidth = 4;
height = 9;
id = "aux_base_zone";
shuttle_id = "aux_base_zone";
name = "aux base zone";
roundstart_template = /datum/map_template/shuttle/aux_base/default;
width = 9
@@ -84210,7 +84210,7 @@
"cOd" = (
/obj/docking_port/stationary/random{
dir = 4;
id = "pod_lavaland4";
shuttle_id = "pod_lavaland4";
name = "lavaland"
},
/turf/open/space,
@@ -85288,7 +85288,7 @@
dir = 4;
dwidth = 3;
height = 14;
id = "arrivals_stationary";
shuttle_id = "arrivals_stationary";
name = "kilo arrivals";
roundstart_template = /datum/map_template/shuttle/arrival/kilo;
width = 7
_maps/map_files/LambdaStation/dorms.dmm
+1 -1
View File
@@ -679,7 +679,7 @@
dheight = 4;
dwidth = 4;
height = 9;
id = "aux_base_zone";
shuttle_id = "aux_base_zone";
name = "aux base zone";
roundstart_template = /datum/map_template/shuttle/aux_base/default;
width = 9
_maps/map_files/LambdaStation/lambda.dmm
+12 -12
View File
@@ -242,7 +242,7 @@
/area/solars/port/fore)
"aaN" = (
/obj/docking_port/stationary/random{
id = "pod_lavaland2";
shuttle_id = "pod_lavaland2";
name = "lavaland"
},
/turf/open/space/basic,
@@ -448,7 +448,7 @@
/area/security/prison)
"abr" = (
/obj/docking_port/stationary/random{
id = "pod_lavaland2";
shuttle_id = "pod_lavaland2";
name = "lavaland"
},
/turf/open/space,
@@ -18828,7 +18828,7 @@
dwidth = 3;
height = 5;
icon_state = "pinonalert";
id = "mining_home";
shuttle_id = "mining_home";
name = "mining shuttle bay";
roundstart_template = /datum/map_template/shuttle/mining/box;
width = 7
@@ -19467,7 +19467,7 @@
/obj/docking_port/stationary{
dwidth = 5;
height = 7;
id = "supply_home";
shuttle_id = "supply_home";
name = "Cargo Bay";
width = 12
},
@@ -20209,7 +20209,7 @@
dir = 4;
dwidth = 2;
height = 5;
id = "laborcamp_home";
shuttle_id = "laborcamp_home";
name = "fore bay 1";
roundstart_template = /datum/map_template/shuttle/labour/box;
width = 9
@@ -63918,7 +63918,7 @@
dir = 2;
dwidth = 3;
height = 5;
id = "commonmining_home";
shuttle_id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
@@ -67458,7 +67458,7 @@
dir = 4;
dwidth = 9;
height = 25;
id = "emergency_home";
shuttle_id = "emergency_home";
name = "MetaStation emergency evac bay";
width = 29
},
@@ -68244,7 +68244,7 @@
dwidth = 3;
height = 15;
icon_state = "pinonalert";
id = "arrivals_stationary";
shuttle_id = "arrivals_stationary";
name = "arrivals";
roundstart_template = /datum/map_template/shuttle/arrival/box;
width = 7
@@ -75740,7 +75740,7 @@
dheight = 4;
dwidth = 4;
height = 9;
id = "aux_base_zone";
shuttle_id = "aux_base_zone";
name = "aux base zone";
roundstart_template = /datum/map_template/shuttle/aux_base/default;
width = 9
@@ -78517,7 +78517,7 @@
"mQo" = (
/obj/docking_port/stationary/random{
dir = 8;
id = "pod_lavaland1";
shuttle_id = "pod_lavaland1";
name = "lavaland"
},
/turf/open/space/basic,
@@ -81047,7 +81047,7 @@
dir = 2;
dwidth = 2;
height = 13;
id = "ferry_home";
shuttle_id = "ferry_home";
name = "port bay 2";
width = 5
},
@@ -81704,7 +81704,7 @@
dir = 2;
dwidth = 11;
height = 22;
id = "whiteship_home";
shuttle_id = "whiteship_home";
name = "SS13: Auxiliary Dock, Station-Port";
width = 35
},
_maps/map_files/MetaStation/MetaStation.dmm
+14 -14
View File
@@ -8642,7 +8642,7 @@
dir = 8;
dwidth = 3;
height = 5;
id = "mining_home";
shuttle_id = "mining_home";
name = "mining shuttle bay";
roundstart_template = /datum/map_template/shuttle/mining/box;
width = 7
@@ -8654,7 +8654,7 @@
dir = 8;
dwidth = 2;
height = 5;
id = "laborcamp_home";
shuttle_id = "laborcamp_home";
name = "fore bay 1";
roundstart_template = /datum/map_template/shuttle/labour/box;
width = 9
@@ -15547,7 +15547,7 @@
"bii" = (
/obj/docking_port/stationary/random{
dir = 4;
id = "pod_lavaland3";
shuttle_id = "pod_lavaland3";
name = "lavaland"
},
/turf/open/space,
@@ -44257,7 +44257,7 @@
/area/science/xenobiology)
"cSP" = (
/obj/docking_port/stationary/random{
id = "pod_lavaland1";
shuttle_id = "pod_lavaland1";
name = "lavaland"
},
/turf/open/space,
@@ -44640,7 +44640,7 @@
"cUL" = (
/obj/docking_port/stationary/random{
dir = 4;
id = "pod_lavaland4";
shuttle_id = "pod_lavaland4";
name = "lavaland"
},
/turf/open/space,
@@ -44706,7 +44706,7 @@
dir = 8;
dwidth = 5;
height = 7;
id = "supply_home";
shuttle_id = "supply_home";
name = "Cargo Bay";
width = 12
},
@@ -44766,7 +44766,7 @@
dir = 8;
dwidth = 2;
height = 13;
id = "ferry_home";
shuttle_id = "ferry_home";
name = "port bay 2";
width = 5
},
@@ -44990,7 +44990,7 @@
dir = 2;
dwidth = 9;
height = 25;
id = "emergency_home";
shuttle_id = "emergency_home";
name = "MetaStation emergency evac bay";
width = 29
},
@@ -47233,7 +47233,7 @@
dir = 8;
dwidth = 3;
height = 15;
id = "arrivals_stationary";
shuttle_id = "arrivals_stationary";
name = "arrivals";
roundstart_template = /datum/map_template/shuttle/arrival/box;
width = 7
@@ -63617,7 +63617,7 @@
/area/commons/fitness/pool)
"lSH" = (
/obj/docking_port/stationary/random{
id = "pod_2_lavaland";
shuttle_id = "pod_2_lavaland";
name = "lavaland"
},
/turf/open/space,
@@ -67393,7 +67393,7 @@
dheight = 4;
dwidth = 4;
height = 9;
id = "aux_base_zone";
shuttle_id = "aux_base_zone";
name = "aux base zone";
roundstart_template = /datum/map_template/shuttle/aux_base/default;
width = 9
@@ -68828,7 +68828,7 @@
dir = 2;
dwidth = 11;
height = 22;
id = "whiteship_home";
shuttle_id = "whiteship_home";
name = "SS13: Auxiliary Dock, Station-Port";
width = 35
},
@@ -70277,7 +70277,7 @@
dir = 8;
dwidth = 3;
height = 5;
id = "commonmining_home";
shuttle_id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
@@ -84401,7 +84401,7 @@
dir = 8;
dwidth = 12;
height = 17;
id = "syndicate_nw";
shuttle_id = "syndicate_nw";
name = "northwest of station";
width = 23
},
_maps/map_files/Mining/Lavaland.dmm
+1 -1
View File
@@ -2367,7 +2367,7 @@
dir = 2;
dwidth = 11;
height = 22;
id = "whiteship_lavaland";
shuttle_id = "whiteship_lavaland";
name = "lavaland wastes";
width = 35
},
_maps/map_files/OmegaStation/OmegaStation.dmm
+6 -6
View File
@@ -2620,7 +2620,7 @@
dir = 4;
dwidth = 9;
height = 7;
id = "supply_home";
shuttle_id = "supply_home";
name = "Cargo Bay";
width = 20
},
@@ -8408,7 +8408,7 @@
dir = 4;
dwidth = 3;
height = 5;
id = "mining_home";
shuttle_id = "mining_home";
name = "mining shuttle bay";
roundstart_template = /datum/map_template/shuttle/mining/delta;
width = 7
@@ -15922,7 +15922,7 @@
dir = 4;
dwidth = 11;
height = 18;
id = "emergency_home";
shuttle_id = "emergency_home";
name = "OmegaStation emergency evac bay";
width = 30
},
@@ -34312,7 +34312,7 @@
dir = 8;
dwidth = 2;
height = 13;
id = "ferry_home";
shuttle_id = "ferry_home";
name = "port bay 2";
width = 5
},
@@ -35489,7 +35489,7 @@
dir = 2;
dwidth = 2;
height = 16;
id = "arrivals_stationary";
shuttle_id = "arrivals_stationary";
name = "omega arrivals";
roundstart_template = /datum/map_template/shuttle/arrival/omega;
width = 5
@@ -38527,7 +38527,7 @@
dir = 8;
dwidth = 12;
height = 17;
id = "syndicate_sw";
shuttle_id = "syndicate_sw";
name = "southwest of station";
width = 23
},
_maps/map_files/PubbyStation/PubbyStation.dmm
+12 -12
View File
@@ -3618,7 +3618,7 @@
dir = 8;
dwidth = 12;
height = 17;
id = "syndicate_ne";
shuttle_id = "syndicate_ne";
name = "northeast of station";
width = 23
},
@@ -6452,7 +6452,7 @@
/obj/docking_port/stationary{
dwidth = 2;
height = 6;
id = "monastery_shuttle_station";
shuttle_id = "monastery_shuttle_station";
name = "Station";
roundstart_template = /datum/map_template/shuttle/escape_pod/large;
width = 5
@@ -18428,7 +18428,7 @@
dir = 8;
dwidth = 4;
height = 15;
id = "emergency_home";
shuttle_id = "emergency_home";
name = "PubbyStation emergency evac bay";
width = 20
},
@@ -18776,7 +18776,7 @@
dir = 4;
dwidth = 5;
height = 7;
id = "supply_home";
shuttle_id = "supply_home";
name = "Cargo Bay";
width = 12
},
@@ -23920,7 +23920,7 @@
dir = 4;
dwidth = 3;
height = 5;
id = "mining_home";
shuttle_id = "mining_home";
name = "mining shuttle bay";
roundstart_template = /datum/map_template/shuttle/mining/delta;
width = 7
@@ -24298,7 +24298,7 @@
dir = 8;
dwidth = 3;
height = 13;
id = "arrivals_stationary";
shuttle_id = "arrivals_stationary";
name = "pubby arrivals";
roundstart_template = /datum/map_template/shuttle/arrival/pubby;
width = 6
@@ -29918,7 +29918,7 @@
dir = 8;
dwidth = 2;
height = 13;
id = "ferry_home";
shuttle_id = "ferry_home";
name = "port bay 2";
width = 5
},
@@ -36275,7 +36275,7 @@
/obj/docking_port/stationary{
dwidth = 2;
height = 6;
id = "monastery_shuttle_asteroid";
shuttle_id = "monastery_shuttle_asteroid";
name = "monastery";
width = 5
},
@@ -47185,7 +47185,7 @@
dir = 8;
dwidth = 11;
height = 22;
id = "whiteship_home";
shuttle_id = "whiteship_home";
name = "monastery";
width = 35
},
@@ -56490,7 +56490,7 @@
dir = 8;
dwidth = 2;
height = 5;
id = "laborcamp_home";
shuttle_id = "laborcamp_home";
name = "fore bay 1";
roundstart_template = /datum/map_template/shuttle/labour/box;
width = 9
@@ -58660,7 +58660,7 @@
dir = 8;
dwidth = 3;
height = 5;
id = "commonmining_home";
shuttle_id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
@@ -60382,7 +60382,7 @@
dheight = 4;
dwidth = 4;
height = 9;
id = "aux_base_zone";
shuttle_id = "aux_base_zone";
name = "aux base zone";
roundstart_template = /datum/map_template/shuttle/aux_base/small;
width = 9
_maps/map_files/Snaxi/Snaxi.dmm
+10 -10
View File
@@ -10513,7 +10513,7 @@
/obj/docking_port/stationary{
dwidth = 3;
height = 4;
id = "snaxi_s";
shuttle_id = "snaxi_s";
name = "South Taxi Port";
roundstart_template = /datum/map_template/shuttle/snow_taxi;
width = 6
@@ -16573,7 +16573,7 @@
/obj/docking_port/stationary{
dwidth = 3;
height = 4;
id = "snaxi_ne";
shuttle_id = "snaxi_ne";
name = "Northeast Taxi Port";
width = 6
},
@@ -17972,7 +17972,7 @@
/area/security/checkpoint/supply)
"iEd" = (
/obj/docking_port/stationary/random{
id = "pod_lavaland2";
shuttle_id = "pod_lavaland2";
name = "lavaland"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
@@ -21351,7 +21351,7 @@
dir = 2;
dwidth = 5;
height = 7;
id = "supply_home";
shuttle_id = "supply_home";
name = "Cargo Bay";
width = 12
},
@@ -28746,7 +28746,7 @@
dir = 2;
dwidth = 2;
height = 13;
id = "ferry_home";
shuttle_id = "ferry_home";
name = "port bay 2";
width = 5
},
@@ -30844,7 +30844,7 @@
"oPv" = (
/obj/docking_port/stationary/random{
dir = 8;
id = "pod_lavaland2";
shuttle_id = "pod_lavaland2";
name = "lavaland"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
@@ -38720,7 +38720,7 @@
/obj/docking_port/stationary{
dwidth = 3;
height = 15;
id = "arrivals_stationary";
shuttle_id = "arrivals_stationary";
name = "arrivals";
roundstart_template = /datum/map_template/shuttle/arrival/snaxi;
width = 7
@@ -40334,7 +40334,7 @@
dir = 8;
dwidth = 12;
height = 17;
id = "syndicate_ne";
shuttle_id = "syndicate_ne";
name = "northeast of station";
width = 23
},
@@ -45663,7 +45663,7 @@
dir = 4;
dwidth = 12;
height = 18;
id = "emergency_home";
shuttle_id = "emergency_home";
name = "BoxStation emergency evac bay";
width = 32
},
@@ -48249,7 +48249,7 @@
/obj/docking_port/stationary{
dwidth = 3;
height = 4;
id = "snaxi_nw";
shuttle_id = "snaxi_nw";
name = "Northwest Taxi Port";
width = 6
},
_maps/map_files/SpookyStation/SpookyStation.dmm
+2 -2
View File
@@ -16117,7 +16117,7 @@
dir = 4;
dwidth = 8;
height = 7;
id = "supply_home";
shuttle_id = "supply_home";
name = "Cargo Bay";
width = 20
},
@@ -16600,7 +16600,7 @@
dir = 4;
dwidth = 3;
height = 5;
id = "mining_home";
shuttle_id = "mining_home";
name = "mining shuttle bay";
roundstart_template = /datum/map_template/shuttle/mining/delta;
width = 7
_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm
+14 -14
View File
@@ -2256,7 +2256,7 @@
dir = 4;
dwidth = 12;
height = 18;
id = "emergency_home";
shuttle_id = "emergency_home";
name = "BoxStation emergency evac bay";
width = 32
},
@@ -6857,7 +6857,7 @@
dir = 8;
dwidth = 2;
height = 5;
id = "laborcamp_home";
shuttle_id = "laborcamp_home";
name = "fore bay 1";
roundstart_template = /datum/map_template/shuttle/labour/box;
width = 9
@@ -9994,7 +9994,7 @@
dir = 8;
dwidth = 12;
height = 17;
id = "syndicate_ne";
shuttle_id = "syndicate_ne";
name = "northeast of station";
width = 23
},
@@ -35266,7 +35266,7 @@
dir = 8;
dwidth = 3;
height = 5;
id = "mining_home";
shuttle_id = "mining_home";
name = "mining shuttle bay";
roundstart_template = /datum/map_template/shuttle/mining/box;
width = 7
@@ -47024,7 +47024,7 @@
"cpe" = (
/obj/docking_port/stationary/random{
dir = 8;
id = "pod_lavaland2";
shuttle_id = "pod_lavaland2";
name = "lavaland"
},
/turf/open/space,
@@ -49358,7 +49358,7 @@
"cwV" = (
/obj/docking_port/stationary/random{
dir = 8;
id = "pod_lavaland1";
shuttle_id = "pod_lavaland1";
name = "lavaland"
},
/turf/open/space,
@@ -49373,7 +49373,7 @@
dir = 8;
dwidth = 2;
height = 13;
id = "ferry_home";
shuttle_id = "ferry_home";
name = "port bay 2";
width = 5
},
@@ -49422,7 +49422,7 @@
dir = 2;
dwidth = 11;
height = 22;
id = "whiteship_home";
shuttle_id = "whiteship_home";
name = "SS13: Auxiliary Dock, Station-Port";
width = 35
},
@@ -49560,7 +49560,7 @@
dir = 8;
dwidth = 5;
height = 7;
id = "supply_home";
shuttle_id = "supply_home";
name = "Cargo Bay";
width = 12
},
@@ -49629,7 +49629,7 @@
"czN" = (
/obj/docking_port/stationary/random{
dir = 4;
id = "pod_lavaland4";
shuttle_id = "pod_lavaland4";
name = "lavaland"
},
/turf/open/space,
@@ -50878,7 +50878,7 @@
dir = 8;
dwidth = 3;
height = 15;
id = "arrivals_stationary";
shuttle_id = "arrivals_stationary";
name = "arrivals";
roundstart_template = /datum/map_template/shuttle/arrival/box;
width = 7
@@ -55481,7 +55481,7 @@
"jdj" = (
/obj/docking_port/stationary/random{
dir = 4;
id = "pod_lavaland3";
shuttle_id = "pod_lavaland3";
name = "lavaland"
},
/turf/open/space,
@@ -61502,7 +61502,7 @@
dir = 8;
dwidth = 3;
height = 5;
id = "commonmining_home";
shuttle_id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
@@ -64288,7 +64288,7 @@
dir = 8;
dwidth = 4;
height = 9;
id = "aux_base_zone";
shuttle_id = "aux_base_zone";
name = "aux base zone";
roundstart_template = /datum/map_template/shuttle/aux_base/default;
width = 9
_maps/map_files/debug/runtimestation.dmm
+7 -7
View File
@@ -1422,7 +1422,7 @@
dir = 8;
dwidth = 2;
height = 5;
id = "laborcamp_home";
shuttle_id = "laborcamp_home";
name = "fore bay 1";
roundstart_template = /datum/map_template/shuttle/labour/box;
width = 9
@@ -1434,7 +1434,7 @@
dir = 8;
dwidth = 3;
height = 15;
id = "arrivals_stationary";
shuttle_id = "arrivals_stationary";
name = "arrivals";
roundstart_template = /datum/map_template/shuttle/arrival/box;
width = 7
@@ -1611,7 +1611,7 @@
dir = 8;
dwidth = 2;
height = 13;
id = "ferry_home";
shuttle_id = "ferry_home";
name = "port bay 2";
width = 5
},
@@ -1654,7 +1654,7 @@
dir = 4;
dwidth = 4;
height = 7;
id = "supply_home";
shuttle_id = "supply_home";
name = "Cargo Bay";
width = 12
},
@@ -1868,7 +1868,7 @@
dir = 2;
dwidth = 11;
height = 15;
id = "whiteship_home";
shuttle_id = "whiteship_home";
name = "SS13: Auxiliary Dock, Station-Port";
width = 28
},
@@ -1927,7 +1927,7 @@
dir = 2;
dwidth = 9;
height = 25;
id = "emergency_home";
shuttle_id = "emergency_home";
name = "Runtimestation emergency evac bay";
width = 29
},
@@ -3005,7 +3005,7 @@
dir = 8;
dwidth = 3;
height = 5;
id = "mining_home";
shuttle_id = "mining_home";
name = "mining shuttle bay";
roundstart_template = /datum/map_template/shuttle/mining/box;
width = 7
_maps/map_files/generic/CentCom.dmm
+10 -10
View File
@@ -3710,7 +3710,7 @@
dir = 8;
dwidth = 8;
height = 7;
id = "supply_away";
shuttle_id = "supply_away";
json_key = "cargo";
name = "CentCom";
width = 20
@@ -4079,7 +4079,7 @@
area_type = /area/syndicate_mothership;
dwidth = 25;
height = 50;
id = "emergency_syndicate";
shuttle_id = "emergency_syndicate";
name = "Syndicate Auxillary Shuttle Dock";
width = 50
},
@@ -9434,7 +9434,7 @@
dir = 4;
dwidth = 25;
height = 50;
id = "emergency_away";
shuttle_id = "emergency_away";
json_key = "emergency";
name = "CentCom Emergency Shuttle Dock";
width = 50
@@ -10187,7 +10187,7 @@
dir = 8;
dwidth = 2;
height = 13;
id = "ferry_away";
shuttle_id = "ferry_away";
json_key = "ferry";
name = "CentCom Ferry Dock";
width = 5
@@ -16099,7 +16099,7 @@
dir = 4;
dwidth = 2;
height = 8;
id = "backup_away";
shuttle_id = "backup_away";
name = "Backup Shuttle Dock";
roundstart_template = /datum/map_template/shuttle/emergency/backup;
width = 8
@@ -16398,7 +16398,7 @@
/obj/docking_port/stationary{
dwidth = 1;
height = 4;
id = "pod_4_away";
shuttle_id = "pod_4_away";
name = "recovery ship";
width = 3
},
@@ -16408,7 +16408,7 @@
/obj/docking_port/stationary{
dwidth = 1;
height = 4;
id = "pod_3_away";
shuttle_id = "pod_3_away";
name = "recovery ship";
width = 3
},
@@ -16577,7 +16577,7 @@
dir = 4;
dwidth = 1;
height = 4;
id = "pod_2_away";
shuttle_id = "pod_2_away";
name = "recovery ship";
width = 3
},
@@ -16919,7 +16919,7 @@
dir = 8;
dwidth = 12;
height = 17;
id = "syndicate_away";
shuttle_id = "syndicate_away";
name = "syndicate recon outpost";
roundstart_template = /datum/map_template/shuttle/infiltrator/basic;
width = 23
@@ -18582,7 +18582,7 @@
dir = 4;
dwidth = 2;
height = 7;
id = "pod_away";
shuttle_id = "pod_away";
name = "recovery ship";
width = 5
},
_maps/map_files/generic/SpaceDock.dmm
+1 -1
View File
@@ -8,7 +8,7 @@
dir = 2;
dwidth = 11;
height = 22;
id = "whiteship_away";
shuttle_id = "whiteship_away";
json_key = "whiteship";
name = "Deep Space";
width = 35
_maps/shuttles/ferry_base.dmm
+1 -1
View File
@@ -52,7 +52,7 @@
dir = 8;
dwidth = 2;
height = 12;
id = "ferry";
shuttle_id = "ferry";
name = "ferry shuttle";
port_direction = 2;
width = 5
_maps/shuttles/ferry_fancy.dmm
+1 -1
View File
@@ -69,7 +69,7 @@
dir = 8;
dwidth = 2;
height = 13;
id = "ferry";
shuttle_id = "ferry";
name = "ferry shuttle";
port_direction = 1;
preferred_direction = 4;
_maps/shuttles/ferry_kilo.dmm
+1 -1
View File
@@ -145,7 +145,7 @@
dir = 8;
dwidth = 2;
height = 11;
id = "ferry";
shuttle_id = "ferry";
name = "ferry shuttle";
preferred_direction = 4;
width = 5
_maps/shuttles/ferry_lighthouse.dmm
+1 -1
View File
@@ -158,7 +158,7 @@
dir = 8;
dwidth = 8;
height = 27;
id = "ferry";
shuttle_id = "ferry";
name = "The Lighthouse";
port_direction = 2;
width = 16
_maps/shuttles/ferry_meat.dmm
+1 -1
View File
@@ -108,7 +108,7 @@
dir = 8;
dwidth = 2;
height = 12;
id = "ferry";
shuttle_id = "ferry";
name = "ferry shuttle";
port_direction = 2;
width = 5
_maps/shuttles/hunter_bounty.dmm
+2 -2
View File
@@ -191,7 +191,7 @@
/obj/docking_port/stationary{
dwidth = 11;
height = 16;
id = "pirateship_home";
shuttle_id = "pirateship_home";
name = "Deep Space";
width = 17
},
@@ -199,7 +199,7 @@
dheight = 3;
dwidth = 3;
height = 13;
id = "huntership";
shuttle_id = "huntership";
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "hunter shuttle";
width = 15
_maps/shuttles/hunter_russian.dmm
+2 -2
View File
@@ -193,7 +193,7 @@
/obj/docking_port/stationary{
dwidth = 11;
height = 16;
id = "pirateship_home";
shuttle_id = "pirateship_home";
name = "Deep Space";
width = 17
},
@@ -201,7 +201,7 @@
dheight = 3;
dwidth = 3;
height = 13;
id = "huntership";
shuttle_id = "huntership";
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "hunter shuttle";
width = 15
_maps/shuttles/hunter_space_cop.dmm
+2 -2
View File
@@ -19,7 +19,7 @@
dir = 4;
dwidth = 3;
height = 12;
id = "huntership_home";
shuttle_id = "huntership_home";
name = "Deep Space";
width = 7
},
@@ -27,7 +27,7 @@
dir = 4;
dwidth = 3;
height = 12;
id = "huntership";
shuttle_id = "huntership";
name = "hunter shuttle";
width = 7
},
_maps/shuttles/infiltrator_basic.dmm
+1 -1
View File
@@ -449,7 +449,7 @@
dwidth = 12;
height = 17;
hidden = 1;
id = "syndicate";
shuttle_id = "syndicate";
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "syndicate infiltrator";
port_direction = 4;
_maps/shuttles/labour_box.dmm
+1 -1
View File
@@ -108,7 +108,7 @@
dir = 8;
dwidth = 2;
height = 5;
id = "laborcamp";
shuttle_id = "laborcamp";
name = "labor camp shuttle";
port_direction = 4;
width = 9
_maps/shuttles/labour_cog.dmm
+1 -1
View File
@@ -223,7 +223,7 @@
dir = 8;
dwidth = 2;
height = 5;
id = "laborcamp";
shuttle_id = "laborcamp";
name = "labor camp shuttle";
port_direction = 4;
width = 9
_maps/shuttles/labour_delta.dmm
+1 -1
View File
@@ -244,7 +244,7 @@
dir = 8;
dwidth = 2;
height = 5;
id = "laborcamp";
shuttle_id = "laborcamp";
name = "labor camp shuttle";
port_direction = 4;
width = 9
_maps/shuttles/labour_kilo.dmm
+1 -1
View File
@@ -175,7 +175,7 @@
dir = 8;
dwidth = 2;
height = 5;
id = "laborcamp";
shuttle_id = "laborcamp";
name = "labor camp shuttle";
port_direction = 4;
width = 9
_maps/shuttles/mining_box.dmm
+1 -1
View File
@@ -37,7 +37,7 @@
dir = 8;
dwidth = 3;
height = 5;
id = "mining";
shuttle_id = "mining";
name = "mining shuttle";
port_direction = 4;
width = 7
_maps/shuttles/mining_common_kilo.dmm
+1 -1
View File
@@ -88,7 +88,7 @@
dir = 8;
dwidth = 3;
height = 5;
id = "mining_shuttle_common";
shuttle_id = "mining_shuttle_common";
name = "lavaland shuttle";
port_direction = 4;
width = 7
_maps/shuttles/mining_common_meta.dmm
+1 -1
View File
@@ -37,7 +37,7 @@
dir = 8;
dwidth = 3;
height = 5;
id = "mining_shuttle_common";
shuttle_id = "mining_shuttle_common";
name = "lavaland shuttle";
port_direction = 4;
width = 7
_maps/shuttles/mining_delta.dmm
+1 -1
View File
@@ -84,7 +84,7 @@
dir = 4;
dwidth = 3;
height = 5;
id = "mining";
shuttle_id = "mining";
name = "mining shuttle";
port_direction = 8;
width = 7
_maps/shuttles/mining_kilo.dmm
+1 -1
View File
@@ -80,7 +80,7 @@
dir = 8;
dwidth = 3;
height = 5;
id = "mining";
shuttle_id = "mining";
name = "mining shuttle";
port_direction = 4;
width = 7
_maps/shuttles/pirate_default.dmm
+1 -1
View File
@@ -1830,7 +1830,7 @@
/obj/docking_port/stationary{
dwidth = 11;
height = 16;
id = "pirateship_home";
shuttle_id = "pirateship_home";
name = "Deep Space";
width = 17
},
_maps/shuttles/ruin_caravan_victim.dmm
+1 -1
View File
@@ -1053,7 +1053,7 @@
dir = 2;
dwidth = 5;
height = 11;
id = "caravantrade1";
shuttle_id = "caravantrade1";
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "Small Freighter";
port_direction = 8;
_maps/shuttles/ruin_pirate_cutter.dmm
+1 -1
View File
@@ -860,7 +860,7 @@
dir = 2;
dwidth = 14;
height = 13;
id = "caravanpirate";
shuttle_id = "caravanpirate";
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "Pirate Cutter";
port_direction = 8;
_maps/shuttles/ruin_syndicate_dropship.dmm
+1 -1
View File
@@ -73,7 +73,7 @@
dir = 2;
dwidth = 6;
height = 7;
id = "caravansyndicate3";
shuttle_id = "caravansyndicate3";
name = "Syndicate Drop Ship";
port_direction = 8;
preferred_direction = 4;
_maps/shuttles/ruin_syndicate_fighter_shiv.dmm
+1 -1
View File
@@ -93,7 +93,7 @@
dir = 4;
dwidth = 4;
height = 5;
id = "caravansyndicate1";
shuttle_id = "caravansyndicate1";
ignitionTime = 25;
name = "Syndicate Fighter";
port_direction = 2;
_maps/shuttles/snow_taxi.dmm
+1 -1
View File
@@ -42,7 +42,7 @@
callTime = 5;
dwidth = 3;
height = 4;
id = "snow_taxi";
shuttle_id = "snow_taxi";
name = "snow taxi";
port_direction = 8;
width = 6
_maps/shuttles/snowdin_excavation.dmm
+1 -1
View File
@@ -6,7 +6,7 @@
/obj/docking_port/mobile/elevator{
dir = 4;
height = 6;
id = "snowdin_excavation";
shuttle_id = "snowdin_excavation";
name = "excavation elevator";
width = 6
},
_maps/shuttles/snowdin_mining.dmm
+1 -1
View File
@@ -7,7 +7,7 @@
dir = 4;
dwidth = 2;
height = 5;
id = "snowdin_mining";
shuttle_id = "snowdin_mining";
name = "mining elevator";
width = 5
},
_maps/shuttles/whiteship_box.dmm
+1 -1
View File
@@ -22,7 +22,7 @@
dir = 2;
dwidth = 11;
height = 17;
id = "whiteship";
shuttle_id = "whiteship";
launch_status = 0;
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "Hospital Ship";
_maps/shuttles/whiteship_cere.dmm
+1 -1
View File
@@ -18,7 +18,7 @@
dir = 2;
dwidth = 8;
height = 16;
id = "whiteship";
shuttle_id = "whiteship";
launch_status = 0;
name = "NT Recovery White-Ship";
port_direction = 8;
_maps/shuttles/whiteship_cog.dmm
+1 -1
View File
@@ -270,7 +270,7 @@
dir = 2;
dwidth = 7;
height = 9;
id = "whiteship";
shuttle_id = "whiteship";
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "Prisoner Transport";
port_direction = 8;
_maps/shuttles/whiteship_delta.dmm
+1 -1
View File
@@ -27,7 +27,7 @@
dir = 2;
dwidth = 11;
height = 17;
id = "whiteship";
shuttle_id = "whiteship";
launch_status = 0;
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "NT Frigate";
_maps/shuttles/whiteship_meta.dmm
+1 -1
View File
@@ -43,7 +43,7 @@
dir = 2;
dwidth = 11;
height = 17;
id = "whiteship";
shuttle_id = "whiteship";
launch_status = 0;
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "Salvage Ship";
_maps/shuttles/whiteship_pubby.dmm
+1 -1
View File
@@ -90,7 +90,7 @@
dir = 8;
dwidth = 4;
height = 9;
id = "whiteship";
shuttle_id = "whiteship";
launch_status = 0;
name = "White Ship";
port_direction = 4;
code/_globalvars/bitfields.dm
+7
View File
@@ -253,6 +253,13 @@ DEFINE_BITFIELD(item_flags, list(
"SLOWS_WHILE_IN_HAND" = SLOWS_WHILE_IN_HAND,
))
DEFINE_BITFIELD(machine_stat, list(
"BROKEN" = BROKEN,
"EMPED" = EMPED,
"MAINT" = MAINT,
"NOPOWER" = NOPOWER,
))
DEFINE_BITFIELD(material_flags, list(
"MATERIAL_ADD_PREFIX" = MATERIAL_ADD_PREFIX,
"MATERIAL_AFFECT_STATISTICS" = MATERIAL_AFFECT_STATISTICS,
code/controllers/subsystem/communications.dm
+1 -1
View File
@@ -64,7 +64,7 @@ SUBSYSTEM_DEF(communications)
/datum/controller/subsystem/communications/proc/send_message(datum/comm_message/sending,print = TRUE,unique = FALSE)
for(var/obj/machinery/computer/communications/C in GLOB.machines)
if(!(C.stat & (BROKEN|NOPOWER)) && is_station_level(C.z))
if(!(C.machine_stat & (BROKEN|NOPOWER)) && is_station_level(C.z))
if(unique)
C.add_message(sending)
else //We copy the message for each console, answers and deletions won't be shared
code/controllers/subsystem/processing/nanites.dm
+1 -1
View File
@@ -9,7 +9,7 @@ PROCESSING_SUBSYSTEM_DEF(nanites)
var/neural_network_count = 0
/datum/controller/subsystem/processing/nanites/proc/check_hardware(datum/nanite_cloud_backup/backup)
if(QDELETED(backup.storage) || (backup.storage.stat & (NOPOWER|BROKEN)))
if(QDELETED(backup.storage) || (backup.storage.machine_stat & (NOPOWER|BROKEN)))
return FALSE
return TRUE
code/controllers/subsystem/shuttle.dm
+9 -9
View File
@@ -176,13 +176,13 @@ SUBSYSTEM_DEF(shuttle)
/datum/controller/subsystem/shuttle/proc/getShuttle(id)
for(var/obj/docking_port/mobile/M in mobile)
if(M.id == id)
if(M.shuttle_id == id)
return M
WARNING("couldn't find shuttle with id: [id]")
/datum/controller/subsystem/shuttle/proc/getDock(id)
for(var/obj/docking_port/stationary/S in stationary)
if(S.id == id)
if(S.shuttle_id == id)
return S
WARNING("couldn't find dock with id: [id]")
@@ -330,7 +330,7 @@ SUBSYSTEM_DEF(shuttle)
continue
else if(istype(thing, /obj/machinery/computer/communications))
var/obj/machinery/computer/communications/C = thing
if(C.stat & BROKEN)
if(C.machine_stat & BROKEN)
continue
var/turf/T = get_turf(thing)
@@ -403,7 +403,7 @@ SUBSYSTEM_DEF(shuttle)
return TRUE
var/obj/docking_port/stationary/dockedAt = M.get_docked()
var/destination = dockHome
if(dockedAt && dockedAt.id == dockHome)
if(dockedAt && dockedAt.shuttle_id == dockHome)
destination = dockAway
if(timed)
if(M.request(getDock(destination)))
@@ -519,7 +519,7 @@ SUBSYSTEM_DEF(shuttle)
A.contents = proposal.reserved_turfs
var/obj/docking_port/stationary/transit/new_transit_dock = new(midpoint)
new_transit_dock.reserved_area = proposal
new_transit_dock.name = "Transit for [M.id]/[M.name]"
new_transit_dock.name = "Transit for [M.shuttle_id]/[M.name]"
new_transit_dock.owner = M
new_transit_dock.assigned_area = A
@@ -836,7 +836,7 @@ SUBSYSTEM_DEF(shuttle)
var/timeleft = M.timeLeft(1)
var/list/L = list()
L["name"] = M.name
L["id"] = M.id
L["shuttle_id"] = M.shuttle_id
L["timer"] = M.timer
L["timeleft"] = M.getTimerStr()
if (timeleft > 1 HOURS)
@@ -878,7 +878,7 @@ SUBSYSTEM_DEF(shuttle)
if(params["type"] == "mobile")
for(var/i in mobile)
var/obj/docking_port/mobile/M = i
if(M.id == params["id"])
if(M.shuttle_id == params["shuttle_id"])
user.forceMove(get_turf(M))
. = TRUE
break
@@ -886,7 +886,7 @@ SUBSYSTEM_DEF(shuttle)
if("fly")
for(var/i in mobile)
var/obj/docking_port/mobile/M = i
if(M.id == params["id"])
if(M.shuttle_id == params["shuttle_id"])
. = TRUE
M.admin_fly_shuttle(user)
break
@@ -894,7 +894,7 @@ SUBSYSTEM_DEF(shuttle)
if("fast_travel")
for(var/i in mobile)
var/obj/docking_port/mobile/M = i
if(M.id == params["id"] && M.timer && M.timeLeft(1) >= 50)
if(M.shuttle_id == params["shuttle_id"] && M.timer && M.timeLeft(1) >= 50)
M.setTimer(50)
. = TRUE
message_admins("[key_name_admin(usr)] fast travelled [M]")
code/datums/components/butchering.dm
+1 -1
View File
@@ -129,7 +129,7 @@
if(!istype(L))
return
var/obj/machinery/recycler/eater = parent
if(eater.safety_mode || (eater.stat & (BROKEN|NOPOWER))) //I'm so sorry.
if(eater.safety_mode || (eater.machine_stat & (BROKEN|NOPOWER))) //I'm so sorry.
return
if(L.stat == DEAD && (L.butcher_results || L.guaranteed_butcher_results))
Butcher(parent, L)
code/game/machinery/PDApainter.dm
+7 -7
View File
@@ -11,7 +11,7 @@
/obj/machinery/pdapainter/update_icon_state()
if(stat & BROKEN)
if(machine_stat & BROKEN)
icon_state = "[initial(icon_state)]-broken"
return
@@ -25,7 +25,7 @@
/obj/machinery/pdapainter/update_overlays()
. = ..()
if(stat & BROKEN)
if(machine_stat & BROKEN)
return
if(storedpda)
@@ -83,17 +83,17 @@
update_icon()
else if(O.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM)
if(stat & BROKEN)
if(machine_stat & BROKEN)
if(!O.tool_start_check(user, amount=0))
return
user.visible_message("[user] is repairing [src].", \
"<span class='notice'>You begin repairing [src]...</span>", \
"<span class='italics'>You hear welding.</span>")
if(O.use_tool(src, user, 40, volume=50))
if(!(stat & BROKEN))
if(!(machine_stat & BROKEN))
return
to_chat(user, "<span class='notice'>You repair [src].</span>")
stat &= ~BROKEN
machine_stat &= ~BROKEN
obj_integrity = max_integrity
update_icon()
else
@@ -103,8 +103,8 @@
/obj/machinery/pdapainter/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
if(!(stat & BROKEN))
stat |= BROKEN
if(!(machine_stat & BROKEN))
machine_stat |= BROKEN
update_icon()
/obj/machinery/pdapainter/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
code/game/machinery/_machinery.dm
+11 -11
View File
@@ -108,7 +108,7 @@ Class Procs:
vocal_pitch = 0.6
vocal_volume = 40
var/stat = 0
var/machine_stat = 0
var/use_power = IDLE_POWER_USE
//0 = dont run the auto
//1 = run auto, use idle
@@ -191,18 +191,18 @@ Class Procs:
///Called when we want to change the value of the stat variable. Holds bitflags.
/obj/machinery/proc/set_machine_stat(new_value)
if(new_value == stat)
if(new_value == machine_stat)
return
. = stat
stat = new_value
on_machine_stat_update(stat)
. = machine_stat
machine_stat = new_value
on_machine_stat_update(machine_stat)
/obj/machinery/proc/on_machine_stat_update(stat)
return
/obj/machinery/emp_act(severity)
. = ..()
if(use_power && !stat && !(. & EMP_PROTECT_SELF))
if(use_power && !machine_stat && !(. & EMP_PROTECT_SELF))
use_power(1000 + severity*65)
new /obj/effect/temp_visual/emp(loc)
@@ -264,10 +264,10 @@ Class Procs:
return TRUE
/obj/machinery/proc/is_operational()
return !(stat & (NOPOWER|BROKEN|MAINT))
return !(machine_stat & (NOPOWER|BROKEN|MAINT))
/obj/machinery/can_interact(mob/user)
if((stat & (NOPOWER|BROKEN)) && !(interaction_flags_machine & INTERACT_MACHINE_OFFLINE)) // Check if the machine is broken, and if we can still interact with it if so
if((machine_stat & (NOPOWER|BROKEN)) && !(interaction_flags_machine & INTERACT_MACHINE_OFFLINE)) // Check if the machine is broken, and if we can still interact with it if so
return FALSE
if(IsAdminGhost(user))
@@ -471,8 +471,8 @@ Class Procs:
/obj/machinery/obj_break(damage_flag)
. = ..()
if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
stat |= BROKEN
if(!(machine_stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
machine_stat |= BROKEN
SEND_SIGNAL(src, COMSIG_MACHINERY_BROKEN, damage_flag)
update_appearance()
return TRUE
@@ -601,7 +601,7 @@ Class Procs:
/obj/machinery/examine(mob/user)
. = ..()
if(stat & BROKEN)
if(machine_stat & BROKEN)
. += "<span class='notice'>It looks broken and non-functional.</span>"
if(!(resistance_flags & INDESTRUCTIBLE))
if(resistance_flags & ON_FIRE)
code/game/machinery/ai_slipper.dm
+4 -4
View File
@@ -28,14 +28,14 @@
. += "<span class='notice'>It has <b>[uses]</b> uses of foam remaining.</span>"
/obj/machinery/ai_slipper/power_change()
if(stat & BROKEN)
if(machine_stat & BROKEN)
return
else
if(powered())
stat &= ~NOPOWER
machine_stat &= ~NOPOWER
else
stat |= NOPOWER
if((stat & (NOPOWER|BROKEN)) || cooldown_time > world.time || !uses)
machine_stat |= NOPOWER
if((machine_stat & (NOPOWER|BROKEN)) || cooldown_time > world.time || !uses)
icon_state = "ai-slipper0"
else
icon_state = "ai-slipper1"
code/game/machinery/announcement_system.dm
+6 -6
View File
@@ -47,7 +47,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
if(newheadToggle)
. += pinklight
if(stat & BROKEN)
if(machine_stat & BROKEN)
. += errorlight
/obj/machinery/announcement_system/Destroy()
@@ -63,9 +63,9 @@ GLOBAL_LIST_EMPTY(announcement_systems)
update_icon()
else if(default_deconstruction_crowbar(P))
return
else if(P.tool_behaviour == TOOL_MULTITOOL && panel_open && (stat & BROKEN))
else if(P.tool_behaviour == TOOL_MULTITOOL && panel_open && (machine_stat & BROKEN))
to_chat(user, "<span class='notice'>You reset [src]'s firmware.</span>")
stat &= ~BROKEN
machine_stat &= ~BROKEN
update_icon()
else
return ..()
@@ -116,7 +116,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
return
if(!usr.canUseTopic(src, !hasSiliconAccessInArea(usr)))
return
if(stat & BROKEN)
if(machine_stat & BROKEN)
visible_message("<span class='warning'>[src] buzzes.</span>", "<span class='hear'>You hear a faint buzz.</span>")
playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, TRUE)
return
@@ -149,7 +149,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
/obj/machinery/announcement_system/attack_ai(mob/user)
if(!user.canUseTopic(src, !hasSiliconAccessInArea(user)))
return
if(stat & BROKEN)
if(machine_stat & BROKEN)
to_chat(user, "<span class='warning'>[src]'s firmware appears to be malfunctioning!</span>")
return
interact(user)
@@ -163,7 +163,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
/obj/machinery/announcement_system/emp_act(severity)
. = ..()
if(!(stat & (NOPOWER|BROKEN)) && !(. & EMP_PROTECT_SELF) && severity >= 30)
if(!(machine_stat & (NOPOWER|BROKEN)) && !(. & EMP_PROTECT_SELF) && severity >= 30)
act_up()
/obj/machinery/announcement_system/emag_act()
code/game/machinery/aug_manipulator.dm
+5 -5
View File
@@ -32,7 +32,7 @@
return ..()
/obj/machinery/aug_manipulator/update_icon_state()
if(stat & BROKEN)
if(machine_stat & BROKEN)
icon_state = "[initial_icon_state]-broken"
return
@@ -95,10 +95,10 @@
"<span class='italics'>You hear welding.</span>")
if(O.use_tool(src, user, 40, volume=50))
if(!(stat & BROKEN))
if(!(machine_stat & BROKEN))
return
to_chat(user, "<span class='notice'>You repair [src].</span>")
stat &= ~BROKEN
machine_stat &= ~BROKEN
obj_integrity = max(obj_integrity, max_integrity)
update_icon()
else
@@ -108,8 +108,8 @@
/obj/machinery/aug_manipulator/obj_break(damage_flag)
if(!(flags_1 & NODECONSTRUCT_1))
if(!(stat & BROKEN))
stat |= BROKEN
if(!(machine_stat & BROKEN))
machine_stat |= BROKEN
update_icon()
/obj/machinery/aug_manipulator/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
code/game/machinery/autolathe.dm
+3 -3
View File
@@ -67,7 +67,7 @@
ui = new(user, src, "Autolathe", capitalize(src.name))
ui.open()
if(shocked && !(stat & NOPOWER))
if(shocked && !(machine_stat & NOPOWER))
if(shock(user,50))
ui.close() //close the window if they got zapped successfully as to prevent them from getting zapped infinitely.
@@ -242,7 +242,7 @@
if(user.a_intent == INTENT_HARM) //so we can hit the machine
return ..()
if(stat)
if(machine_stat)
return TRUE
if(istype(O, /obj/item/disk/design_disk))
@@ -404,7 +404,7 @@
disabled = FALSE
/obj/machinery/autolathe/proc/shock(mob/user, prb)
if(stat & (BROKEN|NOPOWER)) // unpowered, no shock
if(machine_stat & (BROKEN|NOPOWER)) // unpowered, no shock
return FALSE
if(!prob(prb))
return FALSE
code/game/machinery/autoloom.dm
+2 -2
View File
@@ -43,7 +43,7 @@
return ..()
/obj/machinery/autoloom/update_icon_state()
var/is_powered = !(stat & (BROKEN|NOPOWER))
var/is_powered = !(machine_stat & (BROKEN|NOPOWER))
icon_state = icon_name + "[is_powered]" // add the blood tag at the end
/obj/machinery/autoloom/CanPass(atom/movable/AM)
@@ -60,7 +60,7 @@
. = ..()
/obj/machinery/autoloom/proc/eat(atom/movable/AM0, sound=TRUE)
if(stat & (BROKEN|NOPOWER))
if(machine_stat & (BROKEN|NOPOWER))
return
if(!isturf(AM0.loc))
return //I don't know how you called Crossed() but stop it.
code/game/machinery/bank_machine.dm
+1 -1
View File
@@ -45,7 +45,7 @@
/obj/machinery/computer/bank_machine/process()
..()
if(siphoning)
if (stat & (BROKEN|NOPOWER))
if (machine_stat & (BROKEN|NOPOWER))
say("Insufficient power. Halting siphon.")
end_syphon()
var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
code/game/machinery/buttons.dm
+2 -2
View File
@@ -50,7 +50,7 @@
. = ..()
if(panel_open)
icon_state = "button-open"
else if(stat & (NOPOWER|BROKEN))
else if(machine_stat & (NOPOWER|BROKEN))
icon_state = "[skin]-p"
else
icon_state = skin
@@ -166,7 +166,7 @@
to_chat(user, "<span class='notice'>You change the button frame's front panel.</span>")
return
if((stat & (NOPOWER|BROKEN)))
if((machine_stat & (NOPOWER|BROKEN)))
return
if(device && device.next_activate > world.time)
code/game/machinery/camera/camera.dm
+5 -5
View File
@@ -107,7 +107,7 @@
var/list/previous_network = network
network = list()
GLOB.cameranet.removeCamera(src)
stat |= EMPED
machine_stat |= EMPED
set_light(0)
emped = emped+1 //Increase the number of consecutive EMP's
update_icon()
@@ -117,7 +117,7 @@
triggerCameraAlarm() //camera alarm triggers even if multiple EMPs are in effect.
if(emped == thisemp) //Only fix it if the camera hasn't been EMP'd again
network = previous_network
stat &= ~EMPED
machine_stat &= ~EMPED
update_icon()
if(can_use())
GLOB.cameranet.addCamera(src)
@@ -278,7 +278,7 @@
return ..()
/obj/machinery/camera/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
if(damage_flag == MELEE && damage_amount < 12 && !(stat & BROKEN))
if(damage_flag == MELEE && damage_amount < 12 && !(machine_stat & BROKEN))
return FALSE
. = ..()
@@ -305,7 +305,7 @@
/obj/machinery/camera/update_icon_state()
if(!status)
icon_state = "[initial(icon_state)]1"
else if (stat & EMPED)
else if (machine_stat & EMPED)
icon_state = "[initial(icon_state)]emp"
else
icon_state = "[initial(icon_state)][in_use_lights ? "_in_use" : ""]"
@@ -361,7 +361,7 @@
/obj/machinery/camera/proc/can_use()
if(!status)
return FALSE
if(stat & EMPED)
if(machine_stat & EMPED)
return FALSE
return TRUE
code/game/machinery/camera/motion.dm
+1 -1
View File
@@ -10,7 +10,7 @@
if(!isMotion())
. = PROCESS_KILL
return
if(stat & EMPED)
if(machine_stat & EMPED)
return
if (detectTime > 0)
var/elapsed = world.time - detectTime
code/game/machinery/cell_charger.dm
+4 -4
View File
@@ -20,7 +20,7 @@
. += mutable_appearance(charging.icon, charging.icon_state)
. += "ccharger-on"
if(!(stat & (BROKEN|NOPOWER)))
if(!(machine_stat & (BROKEN|NOPOWER)))
var/newlevel = round(charging.percent() * 4 / 100)
. += "ccharger-o[newlevel]"
@@ -35,7 +35,7 @@
/obj/machinery/cell_charger/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/stock_parts/cell) && !panel_open)
if(stat & BROKEN)
if(machine_stat & BROKEN)
to_chat(user, "<span class='warning'>[src] is broken!</span>")
return
if(!anchored)
@@ -116,7 +116,7 @@
/obj/machinery/cell_charger/emp_act(severity)
. = ..()
if(stat & (BROKEN|NOPOWER) || . & EMP_PROTECT_CONTENTS)
if(machine_stat & (BROKEN|NOPOWER) || . & EMP_PROTECT_CONTENTS)
return
if(charging)
@@ -127,7 +127,7 @@
recharge_coeff = C.rating
/obj/machinery/cell_charger/process()
if(!charging || !anchored || (stat & (BROKEN|NOPOWER)))
if(!charging || !anchored || (machine_stat & (BROKEN|NOPOWER)))
return
if(charging)
code/game/machinery/computer/_computer.dm
+10 -10
View File
@@ -20,7 +20,7 @@
power_change()
/obj/machinery/computer/process()
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
return FALSE
return TRUE
@@ -44,16 +44,16 @@
. = ..()
SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
if(icon_keyboard)
if(stat & NOPOWER)
if(machine_stat & NOPOWER)
. += "[icon_keyboard]_off"
else
. += icon_keyboard
if(stat & BROKEN)
if(machine_stat & BROKEN)
. += mutable_appearance(icon, "[icon_state]_broken")
return // If we don't do this broken computers glow in the dark.
if(stat & NOPOWER) // Your screen can't be on if you've got no damn charge
if(machine_stat & NOPOWER) // Your screen can't be on if you've got no damn charge
return
// This lets screens ignore lighting and be visible even in the darkest room
@@ -63,7 +63,7 @@
/obj/machinery/computer/power_change()
..()
if(stat & NOPOWER)
if(machine_stat & NOPOWER)
set_light(0)
else
set_light(brightness_on)
@@ -83,7 +83,7 @@
/obj/machinery/computer/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)
if(BRUTE)
if(stat & BROKEN)
if(machine_stat & BROKEN)
playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, TRUE)
else
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, TRUE)
@@ -94,8 +94,8 @@
if(!circuit) //no circuit, no breaking
return
. = ..()
if(. && !(stat & BROKEN))
stat |= BROKEN
if(. && !(machine_stat & BROKEN))
machine_stat |= BROKEN
playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE)
set_light(0)
update_icon()
@@ -124,7 +124,7 @@
circuit = null
component_parts -= circuit
A.set_anchored(TRUE)
if(stat & BROKEN)
if(machine_stat & BROKEN)
if(user)
to_chat(user, "<span class='notice'>The broken glass falls out.</span>")
else
@@ -144,5 +144,5 @@
/obj/machinery/computer/AltClick(mob/user)
. = ..()
if(!user.canUseTopic(src, !issilicon(user)) || !(stat & (NOPOWER|BROKEN)))
if(!user.canUseTopic(src, !issilicon(user)) || !(machine_stat & (NOPOWER|BROKEN)))
return
code/game/machinery/computer/aifixer.dm
+3 -3
View File
@@ -12,7 +12,7 @@
/obj/machinery/computer/aifixer/attackby(obj/item/I, mob/user, params)
if(occupier && I.tool_behaviour == TOOL_SCREWDRIVER)
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
to_chat(user, "<span class='warning'>The screws on [name]'s screen won't budge.</span>")
else
to_chat(user, "<span class='warning'>The screws on [name]'s screen won't budge and it emits a warning beep.</span>")
@@ -83,7 +83,7 @@
/obj/machinery/computer/aifixer/update_overlays()
. = ..()
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
return
if(active)
. += "ai-fixer-on"
@@ -101,7 +101,7 @@
return
//Downloading AI from card to terminal.
if(interaction == AI_TRANS_FROM_CARD)
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
to_chat(user, "[src] is offline and cannot take an AI at this time!")
return
AI.forceMove(src)
code/game/machinery/computer/apc_control.dm
+3 -3
View File
@@ -18,7 +18,7 @@
logs = list()
/obj/machinery/computer/apc_control/process()
if(operator && (!operator.Adjacent(src) || stat))
if(operator && (!operator.Adjacent(src) || machine_stat))
operator = null
if(active_apc)
if(!active_apc.locked)
@@ -37,7 +37,7 @@
..()
/obj/machinery/computer/apc_control/proc/check_apc(obj/machinery/power/apc/APC)
return APC.z == z && !APC.malfhack && !APC.aidisabled && !(APC.obj_flags & EMAGGED) && !APC.stat && !istype(APC.area, /area/ai_monitored) && !APC.area.outdoors
return APC.z == z && !APC.malfhack && !APC.aidisabled && !(APC.obj_flags & EMAGGED) && !APC.machine_stat && !istype(APC.area, /area/ai_monitored) && !APC.area.outdoors
/obj/machinery/computer/apc_control/ui_interact(mob/user, datum/tgui/ui)
operator = user
@@ -201,6 +201,6 @@
/mob/proc/using_power_flow_console()
for(var/obj/machinery/computer/apc_control/A in range(1, src))
if(A.operator && A.operator == src && !A.stat)
if(A.operator && A.operator == src && !A.machine_stat)
return TRUE
return
code/game/machinery/computer/arcade.dm
+1 -1
View File
@@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
if(prize_override)
override = TRUE
if(stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF)
if(machine_stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF)
return
var/empprize = null
code/game/machinery/computer/atmos_alert.dm
+1 -1
View File
@@ -81,7 +81,7 @@
. = ..()
SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
var/overlay_state = icon_screen
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
. |= "[icon_keyboard]_off"
return
. |= icon_keyboard
code/game/machinery/computer/camera.dm
+1 -1
View File
@@ -261,7 +261,7 @@
/obj/machinery/computer/security/telescreen/update_icon_state()
icon_state = initial(icon_state)
if(stat & BROKEN)
if(machine_stat & BROKEN)
icon_state += "b"
/obj/machinery/computer/security/telescreen/entertainment
code/game/machinery/computer/camera_advanced.dm
+2 -1
View File
@@ -83,7 +83,7 @@
playsound(src, 'sound/machines/terminal_off.ogg', 25, FALSE)
/obj/machinery/computer/camera_advanced/check_eye(mob/user)
if( (stat & (NOPOWER|BROKEN)) || (!Adjacent(user) && hasSiliconAccessInArea(user)) || user.eye_blind || user.incapacitated() )
if( (machine_stat & (NOPOWER|BROKEN)) || (!Adjacent(user) && hasSiliconAccessInArea(user)) || user.eye_blind || user.incapacitated() )
user.unset_machine()
/obj/machinery/computer/camera_advanced/Destroy()
@@ -91,6 +91,7 @@
current_user.unset_machine()
QDEL_NULL(eyeobj)
QDEL_LIST(actions)
current_user = null
return ..()
/obj/machinery/computer/camera_advanced/on_unset_machine(mob/M)
code/game/machinery/computer/launchpad_control.dm
+2 -2
View File
@@ -67,7 +67,7 @@
var/list/this_pad = list()
this_pad["name"] = pad.display_name
this_pad["id"] = i
if(pad.stat & NOPOWER)
if(pad.machine_stat & NOPOWER)
this_pad["inactive"] = TRUE
pad_list += list(this_pad)
else
@@ -81,7 +81,7 @@
data["pad_name"] = current_pad.display_name
data["range"] = current_pad.range
data["selected_pad"] = current_pad
if(QDELETED(current_pad) || (current_pad.stat & NOPOWER))
if(QDELETED(current_pad) || (current_pad.machine_stat & NOPOWER))
data["pad_active"] = FALSE
return data
data["pad_active"] = TRUE
code/game/machinery/computer/law.dm
+1 -1
View File
@@ -7,7 +7,7 @@
/obj/machinery/computer/upload/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/ai_module))
var/obj/item/ai_module/M = O
if(src.stat & (NOPOWER|BROKEN|MAINT))
if(src.machine_stat & (NOPOWER|BROKEN|MAINT))
return
if(!current)
to_chat(user, "<span class='caution'>You haven't selected anything to transmit laws to!</span>")
code/game/machinery/computer/medical.dm
+1 -1
View File
@@ -539,7 +539,7 @@
/obj/machinery/computer/med_data/emp_act(severity)
. = ..()
if(!(stat & (BROKEN|NOPOWER)) && !(. & EMP_PROTECT_SELF))
if(!(machine_stat & (BROKEN|NOPOWER)) && !(. & EMP_PROTECT_SELF))
for(var/datum/data/record/R in GLOB.data_core.medical)
if(prob(severity/10))
switch(rand(1,6))
code/game/machinery/computer/pod.dm
+1 -1
View File
@@ -35,7 +35,7 @@
*/
/obj/machinery/computer/pod/proc/alarm()
set waitfor = FALSE
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
return
if(!connected)
code/game/machinery/computer/security.dm
+1 -1
View File
@@ -767,7 +767,7 @@ What a mess.*/
/obj/machinery/computer/secure_data/emp_act(severity)
. = ..()
if(stat & (BROKEN|NOPOWER) || . & EMP_PROTECT_SELF)
if(machine_stat & (BROKEN|NOPOWER) || . & EMP_PROTECT_SELF)
return
for(var/datum/data/record/R in GLOB.data_core.security)
code/game/machinery/computer/station_alert.dm
+1 -1
View File
@@ -29,7 +29,7 @@
. = ..()
SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
var/overlay_state = icon_screen
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
. |= "[icon_keyboard]_off"
return
. |= icon_keyboard
code/game/machinery/computer/teleporter.dm
+3 -3
View File
@@ -177,12 +177,12 @@
log_game("[key_name(user)] has set the teleporter target to [target_station] at [AREACOORD(T)]")
target = target_station.teleporter_hub
target_station.linked_stations |= power_station
target_station.stat &= ~NOPOWER
target_station.machine_stat &= ~NOPOWER
if(target_station.teleporter_hub)
target_station.teleporter_hub.stat &= ~NOPOWER
target_station.teleporter_hub.machine_stat &= ~NOPOWER
target_station.teleporter_hub.update_icon()
if(target_station.teleporter_console)
target_station.teleporter_console.stat &= ~NOPOWER
target_station.teleporter_console.machine_stat &= ~NOPOWER
target_station.teleporter_console.update_icon()
/obj/machinery/computer/teleporter/proc/untarget_implant() //untargets from mob the racker was once implanted in to prevent issues.
code/game/machinery/cryopod.dm
+2 -2
View File
@@ -47,14 +47,14 @@ GLOBAL_LIST_EMPTY(cryopod_computers)
return ..()
/obj/machinery/computer/cryopod/update_icon_state()
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
icon_state = "cellconsole"
return ..()
icon_state = "cellconsole_1"
return ..()
/obj/machinery/computer/cryopod/ui_interact(mob/user, datum/tgui/ui)
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
return
add_fingerprint(user)
code/game/machinery/dish_drive.dm
+1 -1
View File
@@ -91,7 +91,7 @@
step_towards(I, src)
/obj/machinery/dish_drive/attack_ai(mob/living/user)
if(stat)
if(machine_stat)
return
to_chat(user, "<span class='notice'>You send a disposal transmission signal to [src].</span>")
do_the_dishes(TRUE)
code/game/machinery/dna_scanner.dm
+2 -2
View File
@@ -37,11 +37,11 @@
/obj/machinery/dna_scannernew/update_icon_state()
//no power or maintenance
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
icon_state = initial(icon_state)+ (state_open ? "_open" : "") + "_unpowered"
return
if((stat & MAINT) || panel_open)
if((machine_stat & MAINT) || panel_open)
icon_state = initial(icon_state)+ (state_open ? "_open" : "") + "_maintenance"
return
code/game/machinery/doors/airlock.dm
+7 -7
View File
@@ -361,7 +361,7 @@
return ((aiControlDisabled==1) && (!hackProof) && (!isAllPowerCut()));
/obj/machinery/door/airlock/hasPower()
return ((!secondsMainPowerLost || !secondsBackupPowerLost) && !(stat & NOPOWER))
return ((!secondsMainPowerLost || !secondsBackupPowerLost) && !(machine_stat & NOPOWER))
/obj/machinery/door/airlock/requiresID()
return !(wires.is_cut(WIRE_IDSCAN) || aiDisabledIdScanner)
@@ -648,7 +648,7 @@
if("closing")
update_icon(AIRLOCK_CLOSING)
if("deny")
if(!stat)
if(!machine_stat)
update_icon(AIRLOCK_DENY)
playsound(src,doorDeni,50,0,3)
sleep(6)
@@ -691,7 +691,7 @@
else
. += "It looks very robust."
if(hasSiliconAccessInArea(user) && !(stat & BROKEN))
if(hasSiliconAccessInArea(user) && !(machine_stat & BROKEN))
. += "<span class='notice'>Shift-click [src] to [ density ? "open" : "close"] it.</span>"
. += "<span class='notice'>Ctrl-click [src] to [ locked ? "raise" : "drop"] its bolts.</span>"
. += "<span class='notice'>Alt-click [src] to [ secondsElectrified ? "un-electrify" : "permanently electrify"] it.</span>"
@@ -1056,7 +1056,7 @@
"<span class='italics'>You hear welding.</span>")
if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), W, user)))
obj_integrity = max_integrity
stat &= ~BROKEN
machine_stat &= ~BROKEN
user.visible_message("[user.name] has repaired [src].", \
"<span class='notice'>You finish repairing the airlock.</span>")
update_icon()
@@ -1343,7 +1343,7 @@
/obj/machinery/door/airlock/hostile_lockdown(mob/origin, aicontrolneeded = TRUE)
// Must be powered and have working AI wire.
if((aicontrolneeded && canAIControl(src) && !stat) || !aicontrolneeded)
if((aicontrolneeded && canAIControl(src) && !machine_stat) || !aicontrolneeded)
locked = FALSE //For airlocks that were bolted open.
safe = FALSE //DOOR CRUSH
close()
@@ -1355,7 +1355,7 @@
/obj/machinery/door/airlock/disable_lockdown(aicontrolneeded = TRUE)
// Must be powered and have working AI wire.
if((aicontrolneeded && canAIControl(src) && !stat) || !aicontrolneeded)
if((aicontrolneeded && canAIControl(src) && !machine_stat) || !aicontrolneeded)
unbolt()
set_electrified(NOT_ELECTRIFIED)
open()
@@ -1364,7 +1364,7 @@
/obj/machinery/door/airlock/obj_break(damage_flag)
if(!(flags_1 & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
stat |= BROKEN
machine_stat |= BROKEN
if(!panel_open)
panel_open = TRUE
wires.cut_all()
code/game/machinery/doors/airlock_types.dm
+1 -1
View File
@@ -494,7 +494,7 @@
/obj/machinery/door/airlock/cult/obj_break(damage_flag)
if(!(flags_1 & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
stat |= BROKEN
machine_stat |= BROKEN
if(!panel_open)
panel_open = TRUE
update_icon()
code/game/machinery/doors/alarmlock.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/obj/machinery/door/airlock/alarmlock/receive_signal(datum/signal/signal)
..()
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
return
var/alarm_area = signal.data["zone"]
code/game/machinery/doors/brigdoors.dm
+6 -6
View File
@@ -56,7 +56,7 @@
targets += C
if(!targets.len)
stat |= BROKEN
machine_stat |= BROKEN
update_icon()
@@ -64,7 +64,7 @@
// if it's less than 0, open door, reset timer
// update the door_timer window and the icon
/obj/machinery/door_timer/process()
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
return
if(timing)
@@ -80,7 +80,7 @@
// open/closedoor checks if door_timer has power, if so it checks if the
// linked door is open/closed (by density) then opens it/closes it.
/obj/machinery/door_timer/proc/timer_start()
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
return FALSE
activation_time = REALTIMEOFDAY
@@ -102,7 +102,7 @@
/obj/machinery/door_timer/proc/timer_end(forced = FALSE)
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
return FALSE
if(!forced)
@@ -152,11 +152,11 @@
// if timing=true, run update display function
/obj/machinery/door_timer/update_icon()
. = ..()
if(stat & (NOPOWER))
if(machine_stat & (NOPOWER))
icon_state = "frame"
return
if(stat & (BROKEN))
if(machine_stat & (BROKEN))
set_picture("ai_bsod")
return
code/game/machinery/doors/door.dm
+4 -4
View File
@@ -278,7 +278,7 @@
else
flick("doorc1", src)
if("deny")
if(!stat)
if(!machine_stat)
flick("door_deny", src)
@@ -383,7 +383,7 @@
return TRUE
/obj/machinery/door/proc/hasPower()
return !(stat & NOPOWER)
return !(machine_stat & NOPOWER)
/obj/machinery/door/proc/update_freelook_sight()
if(!glass && GLOB.cameranet)
@@ -407,11 +407,11 @@
return
/obj/machinery/door/proc/hostile_lockdown(mob/origin)
if(!stat) //So that only powered doors are closed.
if(!machine_stat) //So that only powered doors are closed.
close() //Close ALL the doors!
/obj/machinery/door/proc/disable_lockdown()
if(!stat) //Opens only powered doors.
if(!machine_stat) //Opens only powered doors.
open() //Open everything!
/obj/machinery/door/ex_act(severity, target, origin)
code/game/machinery/doors/firedoor.dm
+4 -4
View File
@@ -127,10 +127,10 @@
/obj/machinery/door/firedoor/power_change()
if(powered(power_channel))
stat &= ~NOPOWER
machine_stat &= ~NOPOWER
INVOKE_ASYNC(src, PROC_REF(latetoggle))
else
stat |= NOPOWER
machine_stat |= NOPOWER
/obj/machinery/door/firedoor/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
if(operating || !density)
@@ -211,7 +211,7 @@
/obj/machinery/door/firedoor/attack_ai(mob/user)
add_fingerprint(user)
if(welded || operating || stat & NOPOWER)
if(welded || operating || machine_stat & NOPOWER)
return TRUE
if(density)
open()
@@ -323,7 +323,7 @@
/obj/machinery/door/firedoor/proc/latetoggle()
if(operating || stat & NOPOWER || !nextstate)
if(operating || machine_stat & NOPOWER || !nextstate)
return
switch(nextstate)
if(FIREDOOR_OPEN)
code/game/machinery/doors/poddoor.dm
+1 -1
View File
@@ -93,5 +93,5 @@
return
/obj/machinery/door/poddoor/try_to_crowbar(obj/item/I, mob/user)
if(stat & NOPOWER)
if(machine_stat & NOPOWER)
open(1)
code/game/machinery/doppler_array.dm
+6 -6
View File
@@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
/obj/machinery/doppler_array/ui_interact(mob/user)
. = ..()
if(stat)
if(machine_stat)
return FALSE
var/list/dat = list()
@@ -73,7 +73,7 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
/obj/machinery/doppler_array/proc/sense_explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range,
took, orig_dev_range, orig_heavy_range, orig_light_range)
if(stat & NOPOWER)
if(machine_stat & NOPOWER)
return FALSE
var/turf/zone = get_turf(src)
if(zone.z != epicenter.z)
@@ -115,7 +115,7 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
return TRUE
/obj/machinery/doppler_array/proc/sense_wave_explosion(turf/epicenter, power, speed)
if(stat & NOPOWER)
if(machine_stat & NOPOWER)
return FALSE
var/turf/zone = get_turf(src)
if(zone.z != epicenter.z)
@@ -160,15 +160,15 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
return PROCESS_KILL
/obj/machinery/doppler_array/power_change()
if(stat & BROKEN)
if(machine_stat & BROKEN)
icon_state = "[initial(icon_state)]-broken"
else
if(powered() && anchored)
icon_state = initial(icon_state)
stat &= ~NOPOWER
machine_stat &= ~NOPOWER
else
icon_state = "[initial(icon_state)]-off"
stat |= NOPOWER
machine_stat |= NOPOWER
//Portable version, built into EOD equipment. It simply provides an explosion's three damage levels.
/obj/machinery/doppler_array/integrated
code/game/machinery/droneDispenser.dm
+9 -9
View File
@@ -130,20 +130,20 @@
/obj/machinery/droneDispenser/examine(mob/user)
. = ..()
if((mode == DRONE_RECHARGING) && !stat && recharging_text)
if((mode == DRONE_RECHARGING) && !machine_stat && recharging_text)
. += "<span class='warning'>[recharging_text]</span>"
/obj/machinery/droneDispenser/power_change()
..()
if(powered())
stat &= ~NOPOWER
machine_stat &= ~NOPOWER
else
stat |= NOPOWER
machine_stat |= NOPOWER
update_icon()
/obj/machinery/droneDispenser/process()
..()
if((stat & (NOPOWER|BROKEN)) || !anchored)
if((machine_stat & (NOPOWER|BROKEN)) || !anchored)
return
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
@@ -200,7 +200,7 @@
.++
/obj/machinery/droneDispenser/update_icon_state()
if(stat & (BROKEN|NOPOWER))
if(machine_stat & (BROKEN|NOPOWER))
icon_state = icon_off
else if(mode == DRONE_RECHARGING)
icon_state = icon_recharging
@@ -217,7 +217,7 @@
to_chat(user, "<span class='notice'>You retrieve the materials from [src].</span>")
else if(I.tool_behaviour == TOOL_WELDER)
if(!(stat & BROKEN))
if(!(machine_stat & BROKEN))
to_chat(user, "<span class='warning'>[src] doesn't need repairs.</span>")
return
@@ -235,7 +235,7 @@
"<span class='notice'>[user] fixes [src]!</span>",
"<span class='notice'>You restore [src] to operation.</span>")
stat &= ~BROKEN
machine_stat &= ~BROKEN
obj_integrity = max_integrity
update_icon()
else
@@ -243,12 +243,12 @@
/obj/machinery/droneDispenser/obj_break(damage_flag)
if(!(flags_1 & NODECONSTRUCT_1))
if(!(stat & BROKEN))
if(!(machine_stat & BROKEN))
if(break_message)
audible_message("<span class='warning'>[src] [break_message]</span>")
if(break_sound)
playsound(src, break_sound, 50, 1)
stat |= BROKEN
machine_stat |= BROKEN
update_icon()
/obj/machinery/droneDispenser/deconstruct(disassembled = TRUE)
code/game/machinery/embedded_controller/access_controller.dm
+7 -7
View File
@@ -66,7 +66,7 @@
to_chat(user, "<span class='warning'>Access denied.</span>")
return
if(controller && !controller.busy && door)
if(controller.stat & NOPOWER)
if(controller.machine_stat & NOPOWER)
return
busy = TRUE
update_icon()
@@ -85,7 +85,7 @@
update_icon()
/obj/machinery/doorButtons/access_button/update_icon_state()
if(stat & NOPOWER)
if(machine_stat & NOPOWER)
icon_state = "access_button_off"
else
if(busy)
@@ -169,7 +169,7 @@
A.unbolt()
. = 1
if(A && A.close())
if(stat & NOPOWER || lostPower || !A || QDELETED(A))
if(machine_stat & NOPOWER || lostPower || !A || QDELETED(A))
goIdle(1)
return
A.bolt()
@@ -214,7 +214,7 @@
A.unbolt()
spawn()
if(A && A.open())
if(stat | (NOPOWER) && !lostPower && A && !QDELETED(A))
if(machine_stat | (NOPOWER) && !lostPower && A && !QDELETED(A))
A.bolt()
goIdle(1)
@@ -226,7 +226,7 @@
updateUsrDialog()
/obj/machinery/doorButtons/airlock_controller/process()
if(stat & NOPOWER)
if(machine_stat & NOPOWER)
return
if(busy == CYCLE_EXTERIOR)
cycleOpen(exteriorAirlock)
@@ -235,7 +235,7 @@
/obj/machinery/doorButtons/airlock_controller/power_change()
..()
if(stat & NOPOWER)
if(machine_stat & NOPOWER)
lostPower = 1
else
if(!busy)
@@ -250,7 +250,7 @@
exteriorAirlock = A
/obj/machinery/doorButtons/airlock_controller/update_icon_state()
if(stat & NOPOWER)
if(machine_stat & NOPOWER)
icon_state = "access_control_off"
return
if(busy || lostPower)
code/game/machinery/firealarm.dm
+11 -11
View File
@@ -75,13 +75,13 @@
icon_state = "fire_b[buildstage]"
return
if(stat & BROKEN)
if(machine_stat & BROKEN)
icon_state = "firex"
return
icon_state = "fire0"
if(stat & NOPOWER)
if(machine_stat & NOPOWER)
return
/obj/machinery/firealarm/update_overlays()
@@ -142,7 +142,7 @@
return TRUE
/obj/machinery/firealarm/temperature_expose(datum/gas_mixture/air, temperature, volume)
if((temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT) && COOLDOWN_FINISHED(src, last_alarm) && !(obj_flags & EMAGGED) && detecting && !stat)
if((temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT) && COOLDOWN_FINISHED(src, last_alarm) && !(obj_flags & EMAGGED) && detecting && !machine_stat)
alarm()
return ..()
@@ -243,9 +243,9 @@
"<span class='notice'>You start prying out the circuit...</span>")
if(W.use_tool(src, user, 20, volume=50))
if(buildstage == 1)
if(stat & BROKEN)
if(machine_stat & BROKEN)
to_chat(user, "<span class='notice'>You remove the destroyed circuit.</span>")
stat &= ~BROKEN
machine_stat &= ~BROKEN
else
to_chat(user, "<span class='notice'>You pry out the circuit.</span>")
new /obj/item/electronics/firealarm(user.loc)
@@ -298,7 +298,7 @@
/obj/machinery/firealarm/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
. = ..()
if(.) //damage received
if(obj_integrity > 0 && !(stat & BROKEN) && buildstage != 0)
if(obj_integrity > 0 && !(machine_stat & BROKEN) && buildstage != 0)
if(prob(33))
alarm()
@@ -308,15 +308,15 @@
..()
/obj/machinery/firealarm/obj_break(damage_flag)
if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1) && buildstage != 0) //can't break the electronics if there isn't any inside.
if(!(machine_stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1) && buildstage != 0) //can't break the electronics if there isn't any inside.
LAZYREMOVE(myarea.firealarms, src)
stat |= BROKEN
machine_stat |= BROKEN
update_icon()
/obj/machinery/firealarm/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
new /obj/item/stack/sheet/metal(loc, 1)
if(!(stat & BROKEN))
if(!(machine_stat & BROKEN))
var/obj/item/I = new /obj/item/electronics/firealarm(loc)
if(!disassembled)
I.obj_integrity = I.max_integrity * 0.5
@@ -344,7 +344,7 @@
var/static/party_overlay
/obj/machinery/firealarm/partyalarm/reset()
if (stat & (NOPOWER|BROKEN))
if (machine_stat & (NOPOWER|BROKEN))
return
var/area/A = get_base_area(src)
if (!A || !A.party)
@@ -353,7 +353,7 @@
A.cut_overlay(party_overlay)
/obj/machinery/firealarm/partyalarm/alarm()
if (stat & (NOPOWER|BROKEN))
if (machine_stat & (NOPOWER|BROKEN))
return
var/area/A = get_base_area(src)
if (!A || A.party || A.name == "Space")

Some files were not shown because too many files have changed in this diff Show More