diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 73fda84a26..50a38941c4 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -4159,7 +4159,7 @@ dir = 2; dwidth = 11; height = 22; - id = "whiteship_z4"; + shuttle_id = "whiteship_z4"; name = "KSS13: Derelict"; width = 35 }, diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm index 0dd669aafc..c0a33ae6a9 100644 --- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm +++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm @@ -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 diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 49646fbd71..bc441f9a3d 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -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 }, diff --git a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm index f7be60c4b3..e54640cf08 100644 --- a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm +++ b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm @@ -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 }, diff --git a/_maps/RandomZLevels/VR/snowdin_VR.dmm b/_maps/RandomZLevels/VR/snowdin_VR.dmm index d1e3373633..2441ec4098 100644 --- a/_maps/RandomZLevels/VR/snowdin_VR.dmm +++ b/_maps/RandomZLevels/VR/snowdin_VR.dmm @@ -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 }, diff --git a/_maps/RandomZLevels/away_mission/snowdin.dmm b/_maps/RandomZLevels/away_mission/snowdin.dmm index dae17bd259..a4984b7968 100644 --- a/_maps/RandomZLevels/away_mission/snowdin.dmm +++ b/_maps/RandomZLevels/away_mission/snowdin.dmm @@ -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 }, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 6c72770978..310f7d8356 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -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 diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index b526729dce..5fbbc1d401 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -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 }, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 386e69fd4b..8745b67385 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -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 diff --git a/_maps/map_files/FestiveBall/FestiveStation.dmm b/_maps/map_files/FestiveBall/FestiveStation.dmm index af368051d9..d8be191446 100644 --- a/_maps/map_files/FestiveBall/FestiveStation.dmm +++ b/_maps/map_files/FestiveBall/FestiveStation.dmm @@ -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 diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index f32d1cb413..58634e3fb0 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -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 diff --git a/_maps/map_files/LambdaStation/dorms.dmm b/_maps/map_files/LambdaStation/dorms.dmm index 2e4c545a9d..968a10a080 100644 --- a/_maps/map_files/LambdaStation/dorms.dmm +++ b/_maps/map_files/LambdaStation/dorms.dmm @@ -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 diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm index 3bcd573334..53625bac25 100644 --- a/_maps/map_files/LambdaStation/lambda.dmm +++ b/_maps/map_files/LambdaStation/lambda.dmm @@ -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 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 87d825c938..cd48e318bf 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -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 }, diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 84339218c3..d26d0173b4 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -2367,7 +2367,7 @@ dir = 2; dwidth = 11; height = 22; - id = "whiteship_lavaland"; + shuttle_id = "whiteship_lavaland"; name = "lavaland wastes"; width = 35 }, diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 3ebb28e9d5..a09bb84986 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -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 }, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 04e936cd7e..7164641f24 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -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 diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm index 6f14387c36..9e531885c1 100644 --- a/_maps/map_files/Snaxi/Snaxi.dmm +++ b/_maps/map_files/Snaxi/Snaxi.dmm @@ -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 }, diff --git a/_maps/map_files/SpookyStation/SpookyStation.dmm b/_maps/map_files/SpookyStation/SpookyStation.dmm index 586c4a0e27..8d5368f1fb 100644 --- a/_maps/map_files/SpookyStation/SpookyStation.dmm +++ b/_maps/map_files/SpookyStation/SpookyStation.dmm @@ -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 diff --git a/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm b/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm index f2352e5bdb..d95857e688 100644 --- a/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm +++ b/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm @@ -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 diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index ccbeabc4b7..b59e4b609e 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -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 diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 7f73180daa..e5f5a9c6b7 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -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 }, diff --git a/_maps/map_files/generic/SpaceDock.dmm b/_maps/map_files/generic/SpaceDock.dmm index 1188aa25fb..c061d3ec84 100644 --- a/_maps/map_files/generic/SpaceDock.dmm +++ b/_maps/map_files/generic/SpaceDock.dmm @@ -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 diff --git a/_maps/shuttles/ferry_base.dmm b/_maps/shuttles/ferry_base.dmm index 36a54e54bc..2dff3a9722 100644 --- a/_maps/shuttles/ferry_base.dmm +++ b/_maps/shuttles/ferry_base.dmm @@ -52,7 +52,7 @@ dir = 8; dwidth = 2; height = 12; - id = "ferry"; + shuttle_id = "ferry"; name = "ferry shuttle"; port_direction = 2; width = 5 diff --git a/_maps/shuttles/ferry_fancy.dmm b/_maps/shuttles/ferry_fancy.dmm index a5705ad37f..f687572d9c 100644 --- a/_maps/shuttles/ferry_fancy.dmm +++ b/_maps/shuttles/ferry_fancy.dmm @@ -69,7 +69,7 @@ dir = 8; dwidth = 2; height = 13; - id = "ferry"; + shuttle_id = "ferry"; name = "ferry shuttle"; port_direction = 1; preferred_direction = 4; diff --git a/_maps/shuttles/ferry_kilo.dmm b/_maps/shuttles/ferry_kilo.dmm index a905f8a0de..acf3164e76 100644 --- a/_maps/shuttles/ferry_kilo.dmm +++ b/_maps/shuttles/ferry_kilo.dmm @@ -145,7 +145,7 @@ dir = 8; dwidth = 2; height = 11; - id = "ferry"; + shuttle_id = "ferry"; name = "ferry shuttle"; preferred_direction = 4; width = 5 diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm index 1b4e685bd0..29662a5dbb 100644 --- a/_maps/shuttles/ferry_lighthouse.dmm +++ b/_maps/shuttles/ferry_lighthouse.dmm @@ -158,7 +158,7 @@ dir = 8; dwidth = 8; height = 27; - id = "ferry"; + shuttle_id = "ferry"; name = "The Lighthouse"; port_direction = 2; width = 16 diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm index 334df92b55..5d90968154 100644 --- a/_maps/shuttles/ferry_meat.dmm +++ b/_maps/shuttles/ferry_meat.dmm @@ -108,7 +108,7 @@ dir = 8; dwidth = 2; height = 12; - id = "ferry"; + shuttle_id = "ferry"; name = "ferry shuttle"; port_direction = 2; width = 5 diff --git a/_maps/shuttles/hunter_bounty.dmm b/_maps/shuttles/hunter_bounty.dmm index 034747f85d..cc9485a114 100644 --- a/_maps/shuttles/hunter_bounty.dmm +++ b/_maps/shuttles/hunter_bounty.dmm @@ -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 diff --git a/_maps/shuttles/hunter_russian.dmm b/_maps/shuttles/hunter_russian.dmm index a053d952ef..7a05ea5ed4 100644 --- a/_maps/shuttles/hunter_russian.dmm +++ b/_maps/shuttles/hunter_russian.dmm @@ -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 diff --git a/_maps/shuttles/hunter_space_cop.dmm b/_maps/shuttles/hunter_space_cop.dmm index 44eb5052b2..f1c40b60a7 100644 --- a/_maps/shuttles/hunter_space_cop.dmm +++ b/_maps/shuttles/hunter_space_cop.dmm @@ -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 }, diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index 42fe684e05..e506e30bb4 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -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; diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour_box.dmm index 7e754ea02f..b4798c82bc 100644 --- a/_maps/shuttles/labour_box.dmm +++ b/_maps/shuttles/labour_box.dmm @@ -108,7 +108,7 @@ dir = 8; dwidth = 2; height = 5; - id = "laborcamp"; + shuttle_id = "laborcamp"; name = "labor camp shuttle"; port_direction = 4; width = 9 diff --git a/_maps/shuttles/labour_cog.dmm b/_maps/shuttles/labour_cog.dmm index b98d52f10f..e79f7b754c 100644 --- a/_maps/shuttles/labour_cog.dmm +++ b/_maps/shuttles/labour_cog.dmm @@ -223,7 +223,7 @@ dir = 8; dwidth = 2; height = 5; - id = "laborcamp"; + shuttle_id = "laborcamp"; name = "labor camp shuttle"; port_direction = 4; width = 9 diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm index b5b7faa26d..da6b4a5a3b 100644 --- a/_maps/shuttles/labour_delta.dmm +++ b/_maps/shuttles/labour_delta.dmm @@ -244,7 +244,7 @@ dir = 8; dwidth = 2; height = 5; - id = "laborcamp"; + shuttle_id = "laborcamp"; name = "labor camp shuttle"; port_direction = 4; width = 9 diff --git a/_maps/shuttles/labour_kilo.dmm b/_maps/shuttles/labour_kilo.dmm index 6b70922475..a1f5735383 100644 --- a/_maps/shuttles/labour_kilo.dmm +++ b/_maps/shuttles/labour_kilo.dmm @@ -175,7 +175,7 @@ dir = 8; dwidth = 2; height = 5; - id = "laborcamp"; + shuttle_id = "laborcamp"; name = "labor camp shuttle"; port_direction = 4; width = 9 diff --git a/_maps/shuttles/mining_box.dmm b/_maps/shuttles/mining_box.dmm index e18f0f30d3..d8d50b8b2d 100644 --- a/_maps/shuttles/mining_box.dmm +++ b/_maps/shuttles/mining_box.dmm @@ -37,7 +37,7 @@ dir = 8; dwidth = 3; height = 5; - id = "mining"; + shuttle_id = "mining"; name = "mining shuttle"; port_direction = 4; width = 7 diff --git a/_maps/shuttles/mining_common_kilo.dmm b/_maps/shuttles/mining_common_kilo.dmm index 111944d08c..35b0c96f44 100644 --- a/_maps/shuttles/mining_common_kilo.dmm +++ b/_maps/shuttles/mining_common_kilo.dmm @@ -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 diff --git a/_maps/shuttles/mining_common_meta.dmm b/_maps/shuttles/mining_common_meta.dmm index c47d3b806f..2c7dd25cb4 100644 --- a/_maps/shuttles/mining_common_meta.dmm +++ b/_maps/shuttles/mining_common_meta.dmm @@ -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 diff --git a/_maps/shuttles/mining_delta.dmm b/_maps/shuttles/mining_delta.dmm index 57651ccebc..2911d936ae 100644 --- a/_maps/shuttles/mining_delta.dmm +++ b/_maps/shuttles/mining_delta.dmm @@ -84,7 +84,7 @@ dir = 4; dwidth = 3; height = 5; - id = "mining"; + shuttle_id = "mining"; name = "mining shuttle"; port_direction = 8; width = 7 diff --git a/_maps/shuttles/mining_kilo.dmm b/_maps/shuttles/mining_kilo.dmm index 404c9a3666..afb5b32a4c 100644 --- a/_maps/shuttles/mining_kilo.dmm +++ b/_maps/shuttles/mining_kilo.dmm @@ -80,7 +80,7 @@ dir = 8; dwidth = 3; height = 5; - id = "mining"; + shuttle_id = "mining"; name = "mining shuttle"; port_direction = 4; width = 7 diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index 56d0ca606f..202d23051e 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -1830,7 +1830,7 @@ /obj/docking_port/stationary{ dwidth = 11; height = 16; - id = "pirateship_home"; + shuttle_id = "pirateship_home"; name = "Deep Space"; width = 17 }, diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm index 8ca68a73bb..1ae7b59c4b 100644 --- a/_maps/shuttles/ruin_caravan_victim.dmm +++ b/_maps/shuttles/ruin_caravan_victim.dmm @@ -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; diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm index c83637b314..ab36d7d896 100644 --- a/_maps/shuttles/ruin_pirate_cutter.dmm +++ b/_maps/shuttles/ruin_pirate_cutter.dmm @@ -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; diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index 4ddcc53fb0..3c7babe092 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -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; diff --git a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm index c1c57680d5..e0ed023edc 100644 --- a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm +++ b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm @@ -93,7 +93,7 @@ dir = 4; dwidth = 4; height = 5; - id = "caravansyndicate1"; + shuttle_id = "caravansyndicate1"; ignitionTime = 25; name = "Syndicate Fighter"; port_direction = 2; diff --git a/_maps/shuttles/snow_taxi.dmm b/_maps/shuttles/snow_taxi.dmm index bc6b8761e0..aad6780d4b 100644 --- a/_maps/shuttles/snow_taxi.dmm +++ b/_maps/shuttles/snow_taxi.dmm @@ -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 diff --git a/_maps/shuttles/snowdin_excavation.dmm b/_maps/shuttles/snowdin_excavation.dmm index 7f7b120bbe..e39726b48c 100644 --- a/_maps/shuttles/snowdin_excavation.dmm +++ b/_maps/shuttles/snowdin_excavation.dmm @@ -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 }, diff --git a/_maps/shuttles/snowdin_mining.dmm b/_maps/shuttles/snowdin_mining.dmm index 9e89edf3d9..9a70b372b5 100644 --- a/_maps/shuttles/snowdin_mining.dmm +++ b/_maps/shuttles/snowdin_mining.dmm @@ -7,7 +7,7 @@ dir = 4; dwidth = 2; height = 5; - id = "snowdin_mining"; + shuttle_id = "snowdin_mining"; name = "mining elevator"; width = 5 }, diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index ae1e272f41..50d6e6dec5 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -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"; diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm index b7e11d33a5..55aec03563 100644 --- a/_maps/shuttles/whiteship_cere.dmm +++ b/_maps/shuttles/whiteship_cere.dmm @@ -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; diff --git a/_maps/shuttles/whiteship_cog.dmm b/_maps/shuttles/whiteship_cog.dmm index 9e4463df6b..9fb2d20987 100644 --- a/_maps/shuttles/whiteship_cog.dmm +++ b/_maps/shuttles/whiteship_cog.dmm @@ -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; diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 1bd8250720..bf0b154326 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -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"; diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index 9d96cd1475..dcaf500ce2 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -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"; diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm index fef3918e1d..b253c94426 100644 --- a/_maps/shuttles/whiteship_pubby.dmm +++ b/_maps/shuttles/whiteship_pubby.dmm @@ -90,7 +90,7 @@ dir = 8; dwidth = 4; height = 9; - id = "whiteship"; + shuttle_id = "whiteship"; launch_status = 0; name = "White Ship"; port_direction = 4; diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 381ddc7d4a..c66823050b 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -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, diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm index 58a88890dd..84bc5216a6 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -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 diff --git a/code/controllers/subsystem/processing/nanites.dm b/code/controllers/subsystem/processing/nanites.dm index 8a55491f5f..b8109a904a 100644 --- a/code/controllers/subsystem/processing/nanites.dm +++ b/code/controllers/subsystem/processing/nanites.dm @@ -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 diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 7857cd6222..a130962bab 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -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]") diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index feeae722d0..8e7d46a7e7 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -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) diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index f6eebb8544..872712559e 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -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].", \ "You begin repairing [src]...", \ "You hear welding.") if(O.use_tool(src, user, 40, volume=50)) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) return to_chat(user, "You repair [src].") - 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) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 035f18f2d4..dc77cf542d 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -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) . += "It looks broken and non-functional." if(!(resistance_flags & INDESTRUCTIBLE)) if(resistance_flags & ON_FIRE) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index b5fdb5af8d..ec98f1ac22 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -28,14 +28,14 @@ . += "It has [uses] uses of foam remaining." /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" diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index a565f679bb..d06366c021 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -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, "You reset [src]'s firmware.") - 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("[src] buzzes.", "You hear a faint buzz.") 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, "[src]'s firmware appears to be malfunctioning!") 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() diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index c34e0a2d4f..6cf0bbe24a 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -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 @@ "You hear welding.") if(O.use_tool(src, user, 40, volume=50)) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) return to_chat(user, "You repair [src].") - 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) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 05cb3202d2..4744920ddf 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -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 diff --git a/code/game/machinery/autoloom.dm b/code/game/machinery/autoloom.dm index f290ac1a96..fe490b3f74 100644 --- a/code/game/machinery/autoloom.dm +++ b/code/game/machinery/autoloom.dm @@ -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. diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index 54d302910d..86fcab36b0 100644 --- a/code/game/machinery/bank_machine.dm +++ b/code/game/machinery/bank_machine.dm @@ -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) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index b0483d325a..8c9caaf8c8 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -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, "You change the button frame's front panel.") return - if((stat & (NOPOWER|BROKEN))) + if((machine_stat & (NOPOWER|BROKEN))) return if(device && device.next_activate > world.time) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index ce9ab30f2f..65b0e50486 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -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 diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm index 21d40d7b8e..c33fb4c4d2 100644 --- a/code/game/machinery/camera/motion.dm +++ b/code/game/machinery/camera/motion.dm @@ -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 diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 25445f0d1c..271d36c140 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -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, "[src] is broken!") 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) diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index 19d6688ee8..e66977381a 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -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, "The broken glass falls out.") 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 diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 92040e3647..5e1bc42fc7 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -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, "The screws on [name]'s screen won't budge.") else to_chat(user, "The screws on [name]'s screen won't budge and it emits a warning beep.") @@ -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) diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index f091b77916..19b03a4c74 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -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 diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 625886611a..73ef1b1f90 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -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 diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index f4851fc33c..c490bec525 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -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 diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 97d2f3bab4..dcb9ee9eb0 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -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 diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index a34a0ed500..5395dd6fee 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -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) diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm index 4ec80b5bb4..6d97ba8588 100644 --- a/code/game/machinery/computer/launchpad_control.dm +++ b/code/game/machinery/computer/launchpad_control.dm @@ -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 diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 397446b0a7..7dcc9feae5 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -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, "You haven't selected anything to transmit laws to!") diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index e2bc508e55..805ce0c50b 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -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)) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 54b515f74c..a5a0356552 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -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) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 4d1bea7b1a..f8faa5a60a 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -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) diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index ccac91d39a..b8709acf1a 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -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 diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index dcda7a33f2..158c81d28a 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -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. diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 05da7a7919..0a037513f6 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -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) diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm index 148069b103..877f88f96d 100644 --- a/code/game/machinery/dish_drive.dm +++ b/code/game/machinery/dish_drive.dm @@ -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, "You send a disposal transmission signal to [src].") do_the_dishes(TRUE) diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index c032e57ef3..8db280d960 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -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 diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 523593e451..f6979452ed 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -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)) . += "Shift-click [src] to [ density ? "open" : "close"] it." . += "Ctrl-click [src] to [ locked ? "raise" : "drop"] its bolts." . += "Alt-click [src] to [ secondsElectrified ? "un-electrify" : "permanently electrify"] it." @@ -1056,7 +1056,7 @@ "You hear welding.") 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].", \ "You finish repairing the airlock.") 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() diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 11167a3cd9..8cca3790e6 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -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() diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index 71c3ad6306..cdd3bc7e5f 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -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"] diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 7317998fa9..98fe6c63af 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -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 diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 1a932f7c88..ba3ca6b9ef 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -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) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 0ed7bd771d..46a4063c77 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -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) diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 25016a90f4..63ead98b61 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -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) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 6dfff281d5..3d2e8b4f3a 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -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 diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index 4d2d5d3d7a..92be817d13 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -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) . += "[recharging_text]" /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, "You retrieve the materials from [src].") else if(I.tool_behaviour == TOOL_WELDER) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) to_chat(user, "[src] doesn't need repairs.") return @@ -235,7 +235,7 @@ "[user] fixes [src]!", "You restore [src] to operation.") - 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("[src] [break_message]") if(break_sound) playsound(src, break_sound, 50, 1) - stat |= BROKEN + machine_stat |= BROKEN update_icon() /obj/machinery/droneDispenser/deconstruct(disassembled = TRUE) diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index badec7ef38..dcfdeca502 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -66,7 +66,7 @@ to_chat(user, "Access denied.") 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) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 0a0bed491b..7959982ed0 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -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 @@ "You start prying out the circuit...") if(W.use_tool(src, user, 20, volume=50)) if(buildstage == 1) - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "You remove the destroyed circuit.") - stat &= ~BROKEN + machine_stat &= ~BROKEN else to_chat(user, "You pry out the circuit.") 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") diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index b67a9817aa..99bb9dde33 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -45,13 +45,13 @@ /obj/machinery/flasher/power_change() if (powered() && anchored && bulb) - stat &= ~NOPOWER + machine_stat &= ~NOPOWER if(bulb.crit_fail) icon_state = "[base_state]1-p" else icon_state = "[base_state]1" else - stat |= NOPOWER + machine_stat |= NOPOWER icon_state = "[base_state]1-p" //Don't want to render prison breaks impossible @@ -131,7 +131,7 @@ /obj/machinery/flasher/emp_act(severity) . = ..() - if(!(stat & (BROKEN|NOPOWER)) && !(. & EMP_PROTECT_SELF)) + if(!(machine_stat & (BROKEN|NOPOWER)) && !(. & EMP_PROTECT_SELF)) if(bulb && prob(75/severity)) flash() bulb.burn_out() @@ -139,8 +139,8 @@ /obj/machinery/flasher/obj_break(damage_flag) if(!(flags_1 & NODECONSTRUCT_1)) - if(!(stat & BROKEN)) - stat |= BROKEN + if(!(machine_stat & BROKEN)) + machine_stat |= BROKEN if(bulb) bulb.burn_out() power_change() diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index f595829890..9c4c71bced 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -71,13 +71,13 @@ The console is located at computer/gulag_teleporter.dm /obj/machinery/gulag_teleporter/update_icon_state() icon_state = initial(icon_state) + (state_open ? "_open" : "") //no power or maintenance - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) icon_state += "_unpowered" - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) icon_state += "_maintenance" return - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) icon_state += "_maintenance" return diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm index ae8df91959..6a7d699341 100644 --- a/code/game/machinery/harvester.dm +++ b/code/game/machinery/harvester.dm @@ -195,7 +195,7 @@ /obj/machinery/harvester/examine(mob/user) . = ..() - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(state_open) . += "[src] must be closed before harvesting." diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index b7e5f49620..a1674f43d4 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -34,7 +34,7 @@ icon_state = "igniter[on]" /obj/machinery/igniter/process() //ugh why is this even in process()? - if (src.on && !(stat & NOPOWER) ) + if (src.on && !(machine_stat & NOPOWER) ) var/turf/location = src.loc if (isturf(location)) location.hotspot_expose(700,10,1) @@ -45,7 +45,7 @@ icon_state = "igniter[on]" /obj/machinery/igniter/power_change() - if(!( stat & NOPOWER) ) + if(!( machine_stat & NOPOWER) ) icon_state = "igniter[src.on]" else icon_state = "igniter0" @@ -82,11 +82,11 @@ /obj/machinery/sparker/power_change() if ( powered() && disable == 0 ) - stat &= ~NOPOWER + machine_stat &= ~NOPOWER icon_state = "[base_state]" // src.sd_SetLuminosity(2) else - stat |= ~NOPOWER + machine_stat |= ~NOPOWER icon_state = "[base_state]-p" // src.sd_SetLuminosity(0) @@ -133,5 +133,5 @@ . = ..() if (. & EMP_PROTECT_SELF) return - if(!(stat & (BROKEN|NOPOWER))) + if(!(machine_stat & (BROKEN|NOPOWER))) ignite() diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index 14a90ff3bf..d113aa0fad 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -78,7 +78,7 @@ ghost.forceMove(target) /obj/machinery/launchpad/proc/isAvailable(silent = FALSE) - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return FALSE if(panel_open) return FALSE diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 0473a1333a..1b7781abb8 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -40,10 +40,10 @@ /obj/machinery/light_switch/update_appearance(updates=ALL) . = ..() - luminosity = (stat & NOPOWER) ? 0 : 1 + luminosity = (machine_stat & NOPOWER) ? 0 : 1 /obj/machinery/light_switch/update_icon_state() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) icon_state = "[base_icon_state]-p" return ..() icon_state = "[base_icon_state][area.lightswitch ? 1 : 0]" @@ -51,7 +51,7 @@ /obj/machinery/light_switch/update_overlays() . = ..() - if(!(stat & NOPOWER)) + if(!(machine_stat & NOPOWER)) . += emissive_appearance(icon, "[base_icon_state]-glow", alpha = src.alpha) /obj/machinery/light_switch/examine(mob/user) @@ -72,9 +72,9 @@ if(!otherarea) if(powered(LIGHT)) - stat &= ~NOPOWER + machine_stat &= ~NOPOWER else - stat |= NOPOWER + machine_stat |= NOPOWER update_appearance() @@ -82,5 +82,5 @@ . = ..() if (. & EMP_PROTECT_SELF) return - if(!(stat & (BROKEN|NOPOWER))) + if(!(machine_stat & (BROKEN|NOPOWER))) power_change() diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 20c496de5d..ed621ae39f 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -134,7 +134,7 @@ /obj/machinery/magnetic_module/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) on = FALSE // Sanity checks: @@ -327,7 +327,7 @@ while(moving && length(rpath) >= 1) - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) break looping = 1 diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 5a40abaf6e..8cde5d0770 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -28,10 +28,10 @@ // return ..() /obj/machinery/mass_driver/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) - id = "[port.id]_[id]" + id = "[port.shuttle_id]_[id]" /obj/machinery/mass_driver/proc/drive(amount) - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) return use_power(500) var/O_limit @@ -52,7 +52,7 @@ . = ..() if (. & EMP_PROTECT_SELF) return - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) return drive() diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 0f9cf89d24..2536c9078f 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -142,11 +142,11 @@ DEFINE_BITFIELD(turret_flags, list( /obj/machinery/porta_turret/proc/check_should_process() if (datum_flags & DF_ISPROCESSING) - if (!on || !anchored || (stat & BROKEN) || !powered()) + if (!on || !anchored || (machine_stat & BROKEN) || !powered()) //end_processing() STOP_PROCESSING(SSmachines, src) else - if (on && anchored && !(stat & BROKEN) && powered()) + if (on && anchored && !(machine_stat & BROKEN) && powered()) START_PROCESSING(SSmachines, src) //begin_processing() @@ -154,7 +154,7 @@ DEFINE_BITFIELD(turret_flags, list( if(!anchored) icon_state = "turretCover" return - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "[base_icon_state]_broken" else if(powered()) @@ -287,13 +287,13 @@ DEFINE_BITFIELD(turret_flags, list( /obj/machinery/porta_turret/power_change() . = ..() - if(!anchored || (stat & BROKEN) || !powered()) + if(!anchored || (machine_stat & BROKEN) || !powered()) update_icon() remove_control() check_should_process() /obj/machinery/porta_turret/attackby(obj/item/I, mob/user, params) - if(stat & BROKEN) + if(machine_stat & BROKEN) if(I.tool_behaviour == TOOL_CROWBAR) //If the turret is destroyed, you can remove it with something //that acts like a crowbar to try and salvage its components @@ -427,14 +427,14 @@ DEFINE_BITFIELD(turret_flags, list( /obj/machinery/porta_turret/process() //the main machinery process if(cover == null && anchored) //if it has no cover and is anchored - if(stat & BROKEN) //if the turret is borked + if(machine_stat & BROKEN) //if the turret is borked qdel(cover) //delete its cover, assuming it has one. Workaround for a pesky little bug else if(has_cover) cover = new /obj/machinery/porta_turret_cover(loc) //if the turret has no cover and is anchored, give it a cover cover.parent_turret = src //assign the cover its parent_turret, which would be this (src) - if(!on || (stat & (NOPOWER|BROKEN)) || manual_control) + if(!on || (machine_stat & (NOPOWER|BROKEN)) || manual_control) return PROCESS_KILL var/list/targets = list() @@ -521,7 +521,7 @@ DEFINE_BITFIELD(turret_flags, list( return if(raising || raised) return - if(stat & BROKEN) + if(machine_stat & BROKEN) return invisibility = 0 raising = 1 @@ -538,7 +538,7 @@ DEFINE_BITFIELD(turret_flags, list( set waitfor = FALSE if(raising || !raised) return - if(stat & BROKEN) + if(machine_stat & BROKEN) return layer = OBJ_LAYER raising = 1 @@ -934,7 +934,7 @@ DEFINE_BITFIELD(turret_flags, list( /obj/machinery/turretid/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) . = ..() - if(issilicon(user) && !(stat & BROKEN)) + if(issilicon(user) && !(machine_stat & BROKEN)) LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, enabled ? "Disable" : "Enable") LAZYSET(context[SCREENTIP_CONTEXT_ALT_LMB], INTENT_ANY, lethal ? "Set to stun" : "Set to kill") return CONTEXTUAL_SCREENTIP_SET @@ -962,12 +962,12 @@ DEFINE_BITFIELD(turret_flags, list( /obj/machinery/turretid/examine(mob/user) . += ..() - if(issilicon(user) && !(stat & BROKEN)) + if(issilicon(user) && !(machine_stat & BROKEN)) . += {"Ctrl-click [src] to [ enabled ? "disable" : "enable"] turrets. Alt-click [src] to set turrets to [ lethal ? "stun" : "kill"]."} /obj/machinery/turretid/attackby(obj/item/I, mob/user, params) - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(I.tool_behaviour == TOOL_MULTITOOL) @@ -1029,7 +1029,7 @@ DEFINE_BITFIELD(turret_flags, list( if("lock") if(!hasSiliconAccessInArea(usr) || IsAdminGhost(usr)) return - if((obj_flags & EMAGGED) || (stat & BROKEN)) + if((obj_flags & EMAGGED) || (machine_stat & BROKEN)) to_chat(usr, "The turret control is unresponsive!") return locked = !locked @@ -1068,7 +1068,7 @@ DEFINE_BITFIELD(turret_flags, list( update_icon() /obj/machinery/turretid/update_icon_state() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) icon_state = "control_off" else if (enabled) if (lethal) diff --git a/code/game/machinery/poweredfans/fan_assembly.dm b/code/game/machinery/poweredfans/fan_assembly.dm index 59dbe84def..4b14832c56 100644 --- a/code/game/machinery/poweredfans/fan_assembly.dm +++ b/code/game/machinery/poweredfans/fan_assembly.dm @@ -12,7 +12,7 @@ anchored = FALSE density = FALSE CanAtmosPass = ATMOS_PASS_YES - stat = 1 + machine_stat = 1 var/buildstacktype = /obj/item/stack/sheet/plasteel var/buildstackamount = 5 /* @@ -22,14 +22,14 @@ */ /obj/machinery/fan_assembly/attackby(obj/item/W, mob/living/user, params) - switch(stat) + switch(machine_stat) if(1) // Stat 1 if(W.tool_behaviour == TOOL_WELDER) if(weld(W, user)) to_chat(user, "You weld the fan assembly securely into place.") setAnchored(TRUE) - stat = 2 + machine_stat = 2 update_icon_state() return if(2) @@ -41,7 +41,7 @@ to_chat(user, "You start to add wires to the assembly...") if(W.use_tool(src, user, 30, volume=50, amount=2)) to_chat(user, "You add wires to the fan assembly.") - stat = 3 + machine_stat = 3 var/obj/machinery/poweredfans/F = new(loc, src) forceMove(F) F.setDir(src.dir) @@ -49,14 +49,14 @@ else if(W.tool_behaviour == TOOL_WELDER) if(weld(W, user)) to_chat(user, "You unweld the fan assembly from its place.") - stat = 1 + machine_stat = 1 update_icon_state() setAnchored(FALSE) return return ..() /obj/machinery/fan_assembly/wrench_act(mob/user, obj/item/I) - if(stat != 1) + if(machine_stat != 1) return FALSE user.visible_message("[user] disassembles [src].", "You start to disassemble [src]...", "You hear wrenching noises.") @@ -69,7 +69,7 @@ return if(!W.tool_start_check(user, amount=0)) return FALSE - switch(stat) + switch(machine_stat) if(1) to_chat(user, "You start to weld \the [src]...") if(2) @@ -85,7 +85,7 @@ /obj/machinery/fan_assembly/examine(mob/user) . = ..() - switch(stat) + switch(machine_stat) if(1) to_chat(user, "The fan assembly seems to be unwelded and loose.") if(2) @@ -95,7 +95,7 @@ /obj/machinery/fan_assembly/update_icon_state() . = ..() - switch(stat) + switch(machine_stat) if(1) icon_state = "mfan_assembly" if(2) diff --git a/code/game/machinery/poweredfans/poweredfans.dm b/code/game/machinery/poweredfans/poweredfans.dm index 3349a6894e..a47a5d47cc 100644 --- a/code/game/machinery/poweredfans/poweredfans.dm +++ b/code/game/machinery/poweredfans/poweredfans.dm @@ -19,7 +19,7 @@ if(!assembly) assembly = new() assembly.forceMove(drop_location()) - assembly.stat = 2 + assembly.machine_stat = 2 assembly.setAnchored(TRUE) assembly.setDir(dir) assembly = null @@ -39,7 +39,7 @@ assembly = FA else assembly = new(src) - assembly.stat = 3 + assembly.machine_stat = 3 air_update_turf(1) /obj/machinery/poweredfans/power_change() diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index 389dd0f2ab..6529237a3e 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -106,7 +106,7 @@ to_chat(user, "Target pad is busy. Please wait.") return - if(target_pad.stat & NOPOWER) + if(target_pad.machine_stat & NOPOWER) to_chat(user, "Target pad is not responding to ping.") return add_fingerprint(user) @@ -135,11 +135,11 @@ if(!src || QDELETED(src)) teleporting = FALSE return - if(stat & NOPOWER) + if(machine_stat & NOPOWER) to_chat(user, "[src] is unpowered!") teleporting = FALSE return - if(!target_pad || QDELETED(target_pad) || target_pad.stat & NOPOWER) + if(!target_pad || QDELETED(target_pad) || target_pad.machine_stat & NOPOWER) to_chat(user, "Linked pad is not responding to ping. Teleport aborted.") teleporting = FALSE return diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index dc506ee9b2..57db84ff0b 100755 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -39,7 +39,7 @@ . += {"\The [src] contains: - \A [charging]."} - if(!(stat & (NOPOWER|BROKEN))) + if(!(machine_stat & (NOPOWER|BROKEN))) . += "The status display reads:" . += "- Recharging [recharge_coeff*10]% cell charge per cycle." if(charging) @@ -126,7 +126,7 @@ charging.forceMove(drop_location()) /obj/machinery/recharger/process() - if(stat & (NOPOWER|BROKEN) || !anchored) + if(machine_stat & (NOPOWER|BROKEN) || !anchored) return PROCESS_KILL using_power = FALSE @@ -186,7 +186,7 @@ . = ..() if (. & EMP_PROTECT_CONTENTS) return - if(!(stat & (NOPOWER|BROKEN)) && anchored) + if(!(machine_stat & (NOPOWER|BROKEN)) && anchored) if(istype(charging, /obj/item/gun/energy)) var/obj/item/gun/energy/E = charging if(E.cell) @@ -199,14 +199,14 @@ /obj/machinery/recharger/update_appearance(updates) . = ..() - if((stat & (NOPOWER|BROKEN)) || panel_open || !anchored) + if((machine_stat & (NOPOWER|BROKEN)) || panel_open || !anchored) luminosity = 0 return luminosity = 1 /obj/machinery/recharger/update_overlays() . = ..() - if(stat & (NOPOWER|BROKEN) || !anchored) + if(machine_stat & (NOPOWER|BROKEN) || !anchored) return if(panel_open) . += mutable_appearance(icon, "[base_icon_state]-open", alpha = src.alpha) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 41d00f23e6..39b62a84db 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -72,7 +72,7 @@ /obj/machinery/recharge_station/emp_act(severity) . = ..() - if(!(stat & (BROKEN|NOPOWER))) + if(!(machine_stat & (BROKEN|NOPOWER))) if(occupant && !(. & EMP_PROTECT_CONTENTS)) occupant.emp_act(severity) if (!(. & EMP_PROTECT_SELF)) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index f8a23456c0..86c881085a 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -46,7 +46,7 @@ /obj/machinery/recycler/examine(mob/user) . = ..() . += "Reclaiming [amount_produced]% of materials salvaged." - . += {"The power light is [(stat & NOPOWER) ? "off" : "on"]. + . += {"The power light is [(machine_stat & NOPOWER) ? "off" : "on"]. The safety-mode light is [safety_mode ? "on" : "off"]. The safety-sensors status light is [obj_flags & EMAGGED ? "off" : "on"]."} @@ -82,7 +82,7 @@ return TRUE /obj/machinery/recycler/update_icon_state() - var/is_powered = !(stat & (BROKEN|NOPOWER)) + var/is_powered = !(machine_stat & (BROKEN|NOPOWER)) if(safety_mode) is_powered = FALSE icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end @@ -101,7 +101,7 @@ . = ..() /obj/machinery/recycler/proc/eat(atom/movable/AM0, sound=TRUE) - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) return if(safety_mode) return diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 1fe552745d..56942bdb67 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -62,7 +62,7 @@ GLOBAL_LIST_EMPTY(allConsoles) update_icon() /obj/machinery/requests_console/update_icon_state() - if((stat & NOPOWER)) + if((machine_stat & NOPOWER)) set_light(0) else set_light(1.4, 0.7, "#34D352")//green light @@ -72,7 +72,7 @@ GLOBAL_LIST_EMPTY(allConsoles) icon_state="req_comp_open" else icon_state="req_comp_rewired" - else if((stat & NOPOWER)) + else if((machine_stat & NOPOWER)) if(icon_state != "req_comp_off") icon_state = "req_comp_off" else diff --git a/code/game/machinery/sheetifier.dm b/code/game/machinery/sheetifier.dm index 3bca8f8f43..e5a6b27ad6 100644 --- a/code/game/machinery/sheetifier.dm +++ b/code/game/machinery/sheetifier.dm @@ -17,7 +17,7 @@ /obj/machinery/sheetifier/update_overlays() . = ..() - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) return var/mutable_appearance/on_overlay = mutable_appearance(icon, "buttons_on") . += on_overlay diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 836fcad8e8..374db19edb 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -97,7 +97,7 @@ for(var/turf/target_tile in range(shield_range, src)) if(isspaceturf(target_tile) && !(locate(/obj/structure/emergency_shield) in target_tile)) - if(!(stat & BROKEN) || prob(33)) + if(!(machine_stat & BROKEN) || prob(33)) deployed_shields += new /obj/structure/emergency_shield(target_tile) /obj/machinery/shieldgen/proc/shields_down() @@ -107,15 +107,15 @@ QDEL_LIST(deployed_shields) /obj/machinery/shieldgen/process() - if((stat & BROKEN) && active) + if((machine_stat & BROKEN) && active) if(deployed_shields.len && prob(5)) qdel(pick(deployed_shields)) /obj/machinery/shieldgen/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - if(!(stat && BROKEN)) - stat |= BROKEN + if(!(machine_stat && BROKEN)) + machine_stat |= BROKEN locked = pick(0,1) update_icon() @@ -153,7 +153,7 @@ to_chat(user, "You open the panel and expose the wiring.") else to_chat(user, "You close the panel.") - else if(istype(W, /obj/item/stack/cable_coil) && (stat & BROKEN) && panel_open) + else if(istype(W, /obj/item/stack/cable_coil) && (machine_stat & BROKEN) && panel_open) var/obj/item/stack/cable_coil/coil = W if (coil.get_amount() < 1) to_chat(user, "You need one length of cable to repair [src]!") @@ -161,7 +161,7 @@ to_chat(user, "You begin to replace the wires...") if(W.use_tool(src, user, 30, 1)) obj_integrity = max_integrity - stat &= ~BROKEN + machine_stat &= ~BROKEN to_chat(user, "You repair \the [src].") update_icon() @@ -206,9 +206,9 @@ /obj/machinery/shieldgen/update_icon_state() if(active) - icon_state = (stat & BROKEN) ? "shieldonbr":"shieldon" + icon_state = (machine_stat & BROKEN) ? "shieldonbr":"shieldon" else - icon_state = (stat & BROKEN) ? "shieldoffbr":"shieldoff" + icon_state = (machine_stat & BROKEN) ? "shieldoffbr":"shieldoff" #define ACTIVE_SETUPFIELDS 1 #define ACTIVE_HASFIELDS 2 diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 1c78345338..92af42a326 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -62,10 +62,10 @@ money += round(delta_time / 2) //SPESSH MAJICKS /obj/machinery/computer/slot_machine/update_icon_state() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) icon_state = "slots0" - else if(stat & BROKEN) + else if(machine_stat & BROKEN) icon_state = "slotsb" else if(working) @@ -173,7 +173,7 @@ /obj/machinery/computer/slot_machine/emp_act(severity) . = ..() - if(stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF) + if(machine_stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF) return if(prob(15 * severity)) return @@ -223,10 +223,10 @@ updateDialog() /obj/machinery/computer/slot_machine/proc/can_spin(mob/user) - if(stat & NOPOWER) + if(machine_stat & NOPOWER) to_chat(user, "The slot machine has no power!") return FALSE - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "The slot machine is broken!") return FALSE if(working) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index d90f4f8bc9..2d2274894b 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -144,7 +144,7 @@ /obj/machinery/space_heater/emp_act(severity) . = ..() - if(stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_CONTENTS) + if(machine_stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_CONTENTS) return if(cell) cell.emp_act(severity) diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm index 406da6c3b5..114372c3e3 100644 --- a/code/game/machinery/stasis.dm +++ b/code/game/machinery/stasis.dm @@ -59,10 +59,10 @@ return stasis_enabled && is_operational() /obj/machinery/stasis/update_icon_state() - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "[base_icon_state]_broken" return ..() - if(panel_open || stat & MAINT) + if(panel_open || machine_stat & MAINT) icon_state = "[base_icon_state]_maintenance" return ..() icon_state = base_icon_state diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index c550f72946..0ebd66f80f 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -65,7 +65,7 @@ return TRUE balloon_alert(user, "repaired") obj_integrity = max_integrity - set_machine_stat(stat & ~BROKEN) + set_machine_stat(machine_stat & ~BROKEN) update_appearance() return TRUE @@ -138,7 +138,7 @@ /obj/machinery/status_display/update_appearance(updates=ALL) . = ..() if( \ - (stat & (NOPOWER|BROKEN)) || \ + (machine_stat & (NOPOWER|BROKEN)) || \ (current_mode == SD_BLANK) || \ (current_mode != SD_PICTURE && message1 == "" && message2 == "") \ ) @@ -149,7 +149,7 @@ /obj/machinery/status_display/update_overlays() . = ..() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) remove_messages() return @@ -181,7 +181,7 @@ // Timed process - performs nothing in the base class /obj/machinery/status_display/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) // No power, no processing. update_appearance() @@ -198,7 +198,7 @@ /obj/machinery/status_display/emp_act(severity) . = ..() - if(stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF) + if(machine_stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF) return current_mode = SD_PICTURE set_picture("ai_bsod") @@ -323,7 +323,7 @@ return ..() /obj/machinery/status_display/evac/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) // No power, no processing. update_appearance() return PROCESS_KILL @@ -380,7 +380,7 @@ current_mode = SD_MESSAGE /obj/machinery/status_display/supply/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) // No power, no processing. update_appearance() return PROCESS_KILL @@ -428,7 +428,7 @@ var/shuttle_id /obj/machinery/status_display/shuttle/process() - if(!shuttle_id || (stat & NOPOWER)) + if(!shuttle_id || (machine_stat & NOPOWER)) // No power, no processing. update_appearance() return PROCESS_KILL @@ -452,7 +452,7 @@ /obj/machinery/status_display/shuttle/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override) if(port && (shuttle_id == initial(shuttle_id) || override)) - shuttle_id = port.id + shuttle_id = port.shuttle_id update() @@ -547,7 +547,7 @@ master.relay_speech(message, speaker, message_language, raw_message, radio_freq, spans, message_mods) /obj/machinery/status_display/ai/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) update_appearance() return PROCESS_KILL diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 64b89b4980..23ade69eb6 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -217,7 +217,7 @@ else . += "uv" else if(state_open) - if(stat & BROKEN) + if(machine_stat & BROKEN) . += "broken" else . += "open" diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index fc5af59dcb..42ca8c0374 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -14,7 +14,7 @@ GLOBAL_VAR_INIT(singularity_counter, 0) anchored = FALSE density = TRUE layer = BELOW_MOB_LAYER //so people can't hide it and it's REALLY OBVIOUS - stat = 0 + machine_stat = 0 verb_say = "states" var/cooldown = 0 var/active = FALSE diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index 5cf563b9da..2e89b820d9 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -113,7 +113,7 @@ return newKey /obj/machinery/telecomms/message_server/process() - if(toggled && (stat & (BROKEN|NOPOWER))) + if(toggled && (machine_stat & (BROKEN|NOPOWER))) toggled = FALSE update_icon() @@ -132,7 +132,7 @@ relay_information(signal, /obj/machinery/telecomms/broadcaster) /obj/machinery/telecomms/message_server/update_icon_state() - if((stat & (BROKEN|NOPOWER))) + if((machine_stat & (BROKEN|NOPOWER))) icon_state = "server-nopower" else if (!toggled) icon_state = "server-off" diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index a49fb32538..8735f6d008 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -119,7 +119,7 @@ GLOBAL_LIST_EMPTY(telecomms_list) /obj/machinery/telecomms/proc/update_power() if(toggled) // if powered, on. if not powered, off. if too damaged, off - if(stat &(BROKEN | NOPOWER | EMPED)) + if(machine_stat &(BROKEN | NOPOWER | EMPED)) on = FALSE else on = TRUE @@ -140,8 +140,8 @@ GLOBAL_LIST_EMPTY(telecomms_list) if((. & EMP_PROTECT_SELF)) return if(prob(severity)) - if(!(stat & EMPED)) - stat |= EMPED + if(!(machine_stat & EMPED)) + machine_stat |= EMPED var/duration = severity * 35 spawn(rand(duration - 20, duration + 20)) // Takes a long time for the machines to reboot. - stat &= ~(EMPED) + machine_stat &= ~(EMPED) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 6284c93ca5..ebe172d2d7 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -98,7 +98,7 @@ update_icon() /obj/machinery/teleport/hub/proc/is_ready() - . = !panel_open && !(stat & (BROKEN|NOPOWER)) && power_station && power_station.engaged && !(power_station.stat & (BROKEN|NOPOWER)) + . = !panel_open && !(machine_stat & (BROKEN|NOPOWER)) && power_station && power_station.engaged && !(power_station.machine_stat & (BROKEN|NOPOWER)) /obj/machinery/teleport/hub/syndicate/Initialize(mapload) . = ..() @@ -196,10 +196,10 @@ toggle(user) /obj/machinery/teleport/station/proc/toggle(mob/user) - if(stat & (BROKEN|NOPOWER) || !teleporter_hub || !teleporter_console ) + if(machine_stat & (BROKEN|NOPOWER) || !teleporter_hub || !teleporter_console ) return if (teleporter_console.target) - if(teleporter_hub.panel_open || teleporter_hub.stat & (BROKEN|NOPOWER)) + if(teleporter_hub.panel_open || teleporter_hub.machine_stat & (BROKEN|NOPOWER)) to_chat(user, "The teleporter hub isn't responding.") else engaged = !engaged @@ -220,7 +220,7 @@ /obj/machinery/teleport/station/update_icon_state() if(panel_open) icon_state = "controller-o" - else if(stat & (BROKEN|NOPOWER)) + else if(machine_stat & (BROKEN|NOPOWER)) icon_state = "controller-p" else if(teleporter_console && teleporter_console.calibrating) icon_state = "controller-c" diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 2ce3a5ea2e..9b80d95d21 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -39,7 +39,7 @@ update_icon() /obj/machinery/transformer/update_icon_state() - if(stat & (BROKEN|NOPOWER) || cooldown == 1) + if(machine_stat & (BROKEN|NOPOWER) || cooldown == 1) icon_state = "separator-AO0" else icon_state = initial(icon_state) @@ -72,7 +72,7 @@ update_icon() /obj/machinery/transformer/proc/do_transform(mob/living/carbon/human/H) - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) return if(cooldown == 1) return diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 0a3d635218..e9c02ebc90 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -274,7 +274,7 @@ Code: var/turf/pda_turf = get_turf(src) for(var/obj/machinery/computer/monitor/pMon in GLOB.machines) - if(pMon.stat & (NOPOWER | BROKEN)) //check to make sure the computer is functional + if(pMon.machine_stat & (NOPOWER | BROKEN)) //check to make sure the computer is functional continue if(pda_turf.z != pMon.z) //and that we're on the same zlevel as the computer (lore: limited signal strength) continue diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 2804582e89..bc45e8b80c 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -78,7 +78,7 @@ if( world.time > (last_net_update + 100)) bugged_cameras = list() for(var/obj/machinery/camera/camera in GLOB.cameranet.cameras) - if(camera.stat || !camera.can_use()) + if(camera.machine_stat || !camera.can_use()) continue if(length(list("ss13","mine", "rd", "labor", "toxins", "minisat")&camera.network)) bugged_cameras[camera.c_tag] = camera diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 23c7bc9ee0..8eaf95e0b2 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -169,7 +169,7 @@ if(mode == "draw") if(is_type_in_list(target, charge_machines)) var/obj/machinery/M = target - if((M.stat & (NOPOWER|BROKEN)) || !M.anchored) + if((M.machine_stat & (NOPOWER|BROKEN)) || !M.anchored) to_chat(user, "[M] is unpowered!") return @@ -178,7 +178,7 @@ if(!user || !user.cell || mode != "draw") return - if((M.stat & (NOPOWER|BROKEN)) || !M.anchored) + if((M.machine_stat & (NOPOWER|BROKEN)) || !M.anchored) break if(!user.cell.give(150)) diff --git a/code/modules/NTNet/relays.dm b/code/modules/NTNet/relays.dm index 9a39b80356..cc4880f8b5 100644 --- a/code/modules/NTNet/relays.dm +++ b/code/modules/NTNet/relays.dm @@ -25,7 +25,7 @@ // TODO: Implement more logic here. For now it's only a placeholder. /obj/machinery/ntnet_relay/is_operational() - if(stat & (BROKEN | NOPOWER | EMPED)) + if(machine_stat & (BROKEN | NOPOWER | EMPED)) return FALSE if(dos_failure) return FALSE diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm index bfbb5e7dbb..34c44b21d6 100644 --- a/code/modules/admin/fun_balloon.dm +++ b/code/modules/admin/fun_balloon.dm @@ -95,7 +95,7 @@ /obj/effect/station_crash/New() for(var/S in SSshuttle.stationary) var/obj/docking_port/stationary/SM = S - if(SM.id == "emergency_home") + if(SM.shuttle_id == "emergency_home") var/new_dir = turn(SM.dir, 180) SM.forceMove(get_ranged_target_turf(SM, new_dir, rand(3,15))) break diff --git a/code/modules/admin/verbs/shuttlepanel.dm b/code/modules/admin/verbs/shuttlepanel.dm index 7552936136..802192dde1 100644 --- a/code/modules/admin/verbs/shuttlepanel.dm +++ b/code/modules/admin/verbs/shuttlepanel.dm @@ -17,14 +17,14 @@ continue // please don't do this var/obj/docking_port/stationary/S = port if (canDock(S) == SHUTTLE_CAN_DOCK) - options[S.name || S.id] = S + options[S.name || S.shuttle_id] = S options += "--------" options += "Infinite Transit" options += "Delete Shuttle" options += "Into The Sunset (delete & greentext 'escape')" - var/selection = input(user, "Select where to fly [name || id]:", "Fly Shuttle") as null|anything in options + var/selection = input(user, "Select where to fly [name || shuttle_id]:", "Fly Shuttle") as null|anything in options if(!selection) return @@ -35,12 +35,12 @@ setTimer(ignitionTime) if("Delete Shuttle") - if(alert(user, "Really delete [name || id]?", "Delete Shuttle", "Cancel", "Really!") != "Really!") + if(alert(user, "Really delete [name || shuttle_id]?", "Delete Shuttle", "Cancel", "Really!") != "Really!") return jumpToNullSpace() if("Into The Sunset (delete & greentext 'escape')") - if(alert(user, "Really delete [name || id] and greentext escape objectives?", "Delete Shuttle", "Cancel", "Really!") != "Really!") + if(alert(user, "Really delete [name || shuttle_id] and greentext escape objectives?", "Delete Shuttle", "Cancel", "Really!") != "Really!") return intoTheSunset() @@ -65,7 +65,7 @@ continue // please don't do this var/obj/docking_port/stationary/S = port if (canDock(S) == SHUTTLE_CAN_DOCK) - options[S.name || S.id] = S + options[S.name || S.shuttle_id] = S var/selection = input(user, "Select the new arrivals destination:", "Fly Shuttle") as null|anything in options if(!selection) diff --git a/code/modules/antagonists/abductor/machinery/camera.dm b/code/modules/antagonists/abductor/machinery/camera.dm index 29404eb24e..4fb6bf5645 100644 --- a/code/modules/antagonists/abductor/machinery/camera.dm +++ b/code/modules/antagonists/abductor/machinery/camera.dm @@ -2,12 +2,12 @@ name = "Human Observation Console" var/team_number = 0 networks = list("ss13", "abductor") - var/datum/action/innate/teleport_in/tele_in_action = new - var/datum/action/innate/teleport_out/tele_out_action = new - var/datum/action/innate/teleport_self/tele_self_action = new - var/datum/action/innate/vest_mode_swap/vest_mode_action = new - var/datum/action/innate/vest_disguise_swap/vest_disguise_action = new - var/datum/action/innate/set_droppoint/set_droppoint_action = new + var/datum/action/innate/teleport_in/tele_in_action = /datum/action/innate/teleport_in + var/datum/action/innate/teleport_out/tele_out_action = /datum/action/innate/teleport_out + var/datum/action/innate/teleport_self/tele_self_action = /datum/action/innate/teleport_self + var/datum/action/innate/vest_mode_swap/vest_mode_action = /datum/action/innate/vest_mode_swap + var/datum/action/innate/vest_disguise_swap/vest_disguise_action = /datum/action/innate/vest_disguise_swap + var/datum/action/innate/set_droppoint/set_droppoint_action = /datum/action/innate/set_droppoint var/obj/machinery/abductor/console/console lock_override = TRUE @@ -22,38 +22,21 @@ eyeobj.icon = 'icons/mob/cameramob.dmi' eyeobj.icon_state = "generic_camera" -/obj/machinery/computer/camera_advanced/abductor/GrantActions(mob/living/carbon/user) - ..() - +/obj/machinery/computer/camera_advanced/abductor/Initialize(mapload) + . = ..() + if(tele_in_action) - tele_in_action.target = console.pad - tele_in_action.Grant(user) - actions += tele_in_action - + actions += new tele_in_action(src) if(tele_out_action) - tele_out_action.target = console - tele_out_action.Grant(user) - actions += tele_out_action - + actions += new tele_out_action(src) if(tele_self_action) - tele_self_action.target = console.pad - tele_self_action.Grant(user) - actions += tele_self_action - + actions += new tele_self_action(src) if(vest_mode_action) - vest_mode_action.target = console - vest_mode_action.Grant(user) - actions += vest_mode_action - + actions += new vest_mode_action(src) if(vest_disguise_action) - vest_disguise_action.target = console - vest_disguise_action.Grant(user) - actions += vest_disguise_action - + actions += new vest_disguise_action(src) if(set_droppoint_action) - set_droppoint_action.target = console - set_droppoint_action.Grant(user) - actions += set_droppoint_action + actions += new set_droppoint_action(src) /obj/machinery/computer/camera_advanced/abductor/proc/IsScientist(mob/living/carbon/human/H) return HAS_TRAIT(H, TRAIT_ABDUCTOR_SCIENTIST_TRAINING) @@ -64,10 +47,9 @@ button_icon_state = "beam_down" /datum/action/innate/teleport_in/Activate() - if(!target || !iscarbon(owner)) + if(QDELETED(owner) || !iscarbon(owner)) return - var/mob/living/carbon/human/C = owner - var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/mob/camera/aiEye/remote/remote_eye = owner.remote_control var/obj/machinery/abductor/pad/P = target if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) @@ -79,7 +61,7 @@ button_icon_state = "beam_up" /datum/action/innate/teleport_out/Activate() - if(!target || !iscarbon(owner)) + if(QDELETED(owner) || !iscarbon(owner)) return var/obj/machinery/abductor/console/console = target @@ -91,14 +73,13 @@ button_icon_state = "beam_down" /datum/action/innate/teleport_self/Activate() - if(!target || !iscarbon(owner)) + if(QDELETED(owner) || !iscarbon(owner)) return - var/mob/living/carbon/human/C = owner - var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/mob/camera/aiEye/remote/remote_eye = owner.remote_control var/obj/machinery/abductor/pad/P = target if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) - P.MobToLoc(remote_eye.loc,C) + P.MobToLoc(remote_eye.loc, owner) /datum/action/innate/vest_mode_swap name = "Switch Vest Mode" @@ -106,7 +87,7 @@ button_icon_state = "vest_mode" /datum/action/innate/vest_mode_swap/Activate() - if(!target || !iscarbon(owner)) + if(QDELETED(owner) || !iscarbon(owner)) return var/obj/machinery/abductor/console/console = target console.FlipVest() @@ -118,7 +99,7 @@ button_icon_state = "vest_disguise" /datum/action/innate/vest_disguise_swap/Activate() - if(!target || !iscarbon(owner)) + if(QDELETED(owner) || !iscarbon(owner)) return var/obj/machinery/abductor/console/console = target console.SelectDisguise(remote=1) @@ -129,11 +110,10 @@ button_icon_state = "set_drop" /datum/action/innate/set_droppoint/Activate() - if(!target || !iscarbon(owner)) + if(QDELETED(owner) || !iscarbon(owner)) return - var/mob/living/carbon/human/C = owner - var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/mob/camera/aiEye/remote/remote_eye = owner.remote_control var/obj/machinery/abductor/console/console = target console.SetDroppoint(remote_eye.loc,owner) diff --git a/code/modules/antagonists/fugitive/fugitive_ship.dm b/code/modules/antagonists/fugitive/fugitive_ship.dm index 674b40503b..5ffc8a7508 100644 --- a/code/modules/antagonists/fugitive/fugitive_ship.dm +++ b/code/modules/antagonists/fugitive/fugitive_ship.dm @@ -44,7 +44,7 @@ lock_override = CAMERA_LOCK_STATION shuttlePortId = "huntership_custom" see_hidden = FALSE - jumpto_ports = list("huntership_home" = 1, "whiteship_home" = 1, "syndicate_nw" = 1) + jump_to_ports = list("huntership_home" = 1, "whiteship_home" = 1, "syndicate_nw" = 1) view_range = 4.5 /obj/structure/closet/crate/eva diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 0e36d8dfdd..0c1dcd22be 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -487,7 +487,7 @@ /obj/machinery/airalarm/proc/shock(mob/user, prb) - if((stat & (NOPOWER))) // unpowered, no shock + if((machine_stat & (NOPOWER))) // unpowered, no shock return FALSE if(!prob(prb)) return FALSE //you lucked out, no shock for you @@ -682,11 +682,11 @@ )) /obj/machinery/airalarm/update_icon_state() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) icon_state = "alarm0" return - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "alarmx" return @@ -729,7 +729,7 @@ update_light() /obj/machinery/airalarm/process() - if((stat & (NOPOWER|BROKEN)) || shorted) + if((machine_stat & (NOPOWER|BROKEN)) || shorted) return var/turf/location = get_turf(src) @@ -790,7 +790,7 @@ var/area/A = get_base_area(src) var/new_area_danger_level = 0 for(var/obj/machinery/airalarm/AA in A) - if (!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted) + if (!(AA.machine_stat & (NOPOWER|BROKEN)) && !AA.shorted) new_area_danger_level = clamp(max(new_area_danger_level, AA.danger_level), 0, 1) var/did_anything_happen @@ -908,7 +908,7 @@ return TRUE /obj/machinery/airalarm/proc/togglelock(mob/living/user) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) to_chat(user, "It does nothing!") else if(src.allowed(usr) && !wires.is_cut(WIRE_IDSCAN)) @@ -921,7 +921,7 @@ /obj/machinery/airalarm/power_change() ..() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) set_light(0) update_icon() diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index fd89e26792..5f618d8775 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -66,9 +66,9 @@ icon_state = "filter_[on_state ? "on" : "off"][flipped ? "_f" : ""]" /obj/machinery/atmospherics/components/trinary/filter/power_change() - var/old_stat = stat + var/old_stat = machine_stat ..() - if(stat != old_stat) + if(machine_stat != old_stat) update_icon() /obj/machinery/atmospherics/components/trinary/filter/process_atmos() diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index b4a71fecb1..ef7b889511 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -51,9 +51,9 @@ icon_state = "inje_on" /obj/machinery/atmospherics/components/unary/outlet_injector/power_change() - var/old_stat = stat + var/old_stat = machine_stat ..() - if(old_stat != stat) + if(old_stat != machine_stat) update_icon() diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index 26f16d329d..624bfb0e53 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -59,7 +59,7 @@ icon_state = "meterX" return FALSE - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) icon_state = "meter0" return FALSE @@ -129,7 +129,7 @@ qdel(src) /obj/machinery/meter/interact(mob/user) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return else to_chat(user, status()) diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index bcd8d381fe..4432b497d0 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -226,7 +226,7 @@ air_contents.set_moles(GAS_N2, (N2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature())) /obj/machinery/portable_atmospherics/canister/update_icon_state() - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "[icon_state]-1" /obj/machinery/portable_atmospherics/canister/update_overlays() @@ -252,7 +252,7 @@ /obj/machinery/portable_atmospherics/canister/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) canister_break() if(disassembled) new /obj/item/stack/sheet/metal (loc, 10) @@ -280,9 +280,9 @@ return TRUE /obj/machinery/portable_atmospherics/canister/obj_break(damage_flag) - if((stat & BROKEN) || (flags_1 & NODECONSTRUCT_1)) + if((machine_stat & BROKEN) || (flags_1 & NODECONSTRUCT_1)) return - stat |= BROKEN + machine_stat |= BROKEN canister_break() /obj/machinery/portable_atmospherics/canister/proc/canister_break() @@ -313,7 +313,7 @@ /obj/machinery/portable_atmospherics/canister/process_atmos() ..() - if(stat & BROKEN) + if(machine_stat & BROKEN) return PROCESS_KILL if(timing && valve_timer < world.time) valve_open = !valve_open diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 56ad873f85..eb900b953a 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -107,7 +107,7 @@ /obj/machinery/portable_atmospherics/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/tank)) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) var/obj/item/tank/T = W if(!user.transferItemToLoc(T, src)) return @@ -115,7 +115,7 @@ replace_tank(user, FALSE, T) update_icon() else if(W.tool_behaviour == TOOL_WRENCH) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) if(connected_port) disconnect() W.play_tool_sound(src) @@ -147,7 +147,7 @@ return TRUE /obj/machinery/portable_atmospherics/attacked_by(obj/item/I, mob/user, attackchain_flags = NONE, damage_multiplier = 1) - if(I.force < 10 && !(stat & BROKEN)) + if(I.force < 10 && !(machine_stat & BROKEN)) take_damage(0) else investigate_log("was smacked with \a [I] by [key_name(user)].", INVESTIGATE_ATMOS) diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 12598b99d9..8824ed5625 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -19,7 +19,7 @@ . = ..() pump = new(src, FALSE) pump.on = TRUE - pump.stat = 0 + pump.machine_stat = 0 SSair.add_to_rebuild_queue(pump) /obj/machinery/portable_atmospherics/pump/Destroy() diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 2a812e53d8..2b5460d58f 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -204,7 +204,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations) portal_visuals.reset_visuals() /obj/machinery/gateway/process() - if((stat & (NOPOWER)) && use_power) + if((machine_stat & (NOPOWER)) && use_power) if(target) deactivate() return diff --git a/code/modules/cargo/blackmarket/blackmarket_telepad.dm b/code/modules/cargo/blackmarket/blackmarket_telepad.dm index 1ad1496e60..c1211fa731 100644 --- a/code/modules/cargo/blackmarket/blackmarket_telepad.dm +++ b/code/modules/cargo/blackmarket/blackmarket_telepad.dm @@ -54,7 +54,7 @@ queue += purchase /obj/machinery/ltsrbt/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return if(recharge_cooldown) recharge_cooldown-- diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm index e7854d47cf..c59b825252 100644 --- a/code/modules/cargo/console.dm +++ b/code/modules/cargo/console.dm @@ -156,13 +156,13 @@ return if(SSshuttle.supply.getDockedId() == "supply_home") SSshuttle.supply.export_categories = get_export_categories() - SSshuttle.moveShuttle(SSshuttle.supply.id, "supply_away", TRUE) + SSshuttle.moveShuttle(SSshuttle.supply.shuttle_id, "supply_away", TRUE) say("The supply shuttle is departing.") investigate_log("[key_name(usr)] sent the supply shuttle away.", INVESTIGATE_CARGO) else investigate_log("[key_name(usr)] called the supply shuttle.", INVESTIGATE_CARGO) say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minutes.") - SSshuttle.moveShuttle(SSshuttle.supply.id, "supply_home", TRUE) + SSshuttle.moveShuttle(SSshuttle.supply.shuttle_id, "supply_home", TRUE) . = TRUE if("loan") if(!SSshuttle.shuttle_loan) diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 86cdbaeba0..266cb3f0ac 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -160,7 +160,7 @@ //interrupt_research /obj/machinery/shuttle_scrambler/proc/interrupt_research() for(var/obj/machinery/rnd/server/S in GLOB.machines) - if(S.stat & (NOPOWER|BROKEN)) + if(S.machine_stat & (NOPOWER|BROKEN)) continue S.emp_act(80) new /obj/effect/temp_visual/emp(get_turf(S)) @@ -210,7 +210,7 @@ /obj/docking_port/mobile/pirate name = "pirate shuttle" - id = "pirateship" + shuttle_id = "pirateship" rechargeTime = 3 MINUTES /obj/machinery/suit_storage_unit/pirate diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 1a28845414..517025c80d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -45,7 +45,7 @@ . = ..() if (dirty) . += "grbloody" - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return if (!occupant) . += "grjam" @@ -64,7 +64,7 @@ go_out() /obj/machinery/gibber/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return if(operating) to_chat(user, "It's locked and running.") diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 676a91591d..b6318b1a9d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -88,7 +88,7 @@ else . += "\The [src] is empty." - if(!(stat & (NOPOWER|BROKEN))) + if(!(machine_stat & (NOPOWER|BROKEN))) . += "The status display reads:" . += "- Capacity: [max_n_of_items] items." . += "- Cook time reduced by [(productivity - 1) * 25]%." @@ -207,7 +207,7 @@ if(operating || panel_open || !anchored || !user.canUseTopic(src, !hasSiliconAccessInArea(user))) return - if(isAI(user) && (stat & NOPOWER)) + if(isAI(user) && (machine_stat & NOPOWER)) return if(!length(ingredients)) @@ -222,7 +222,7 @@ // post choice verification if(operating || panel_open || !anchored || !user.canUseTopic(src, !hasSiliconAccessInArea(user))) return - if(isAI(user) && (stat & NOPOWER)) + if(isAI(user) && (machine_stat & NOPOWER)) return usr.set_machine(src) @@ -241,7 +241,7 @@ ingredients.Cut() /obj/machinery/microwave/proc/cook(mob/user) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return if(operating || broken > 0 || panel_open || !anchored || dirty == 100) return @@ -297,7 +297,7 @@ loop(MICROWAVE_MUCK, 4) /obj/machinery/microwave/proc/loop(type, time, wait = max(12 - 2 * productivity, 2), mob/user) // standard wait is 10 - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) if(type == MICROWAVE_PRE) pre_fail() return diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index d092b273e2..58dac36d98 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -42,7 +42,7 @@ if(default_deconstruction_crowbar(O)) return - if(stat) //NOPOWER etc + if(machine_stat) //NOPOWER etc return else return ..() diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 854c88401e..15b0d3452f 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -42,7 +42,7 @@ /obj/machinery/smartfridge/update_icon_state() SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays) - if(!stat) + if(!machine_stat) SSvis_overlays.add_vis_overlay(src, icon, "smartfridge-light-mask", EMISSIVE_LAYER, EMISSIVE_PLANE, dir, alpha) if (visible_contents) switch(contents.len) @@ -61,7 +61,7 @@ /obj/machinery/smartfridge/update_overlays() . = ..() - if(!stat) + if(!machine_stat) . += emissive_appearance(icon, "smartfridge-light-mask", alpha = src.alpha) @@ -88,7 +88,7 @@ updateUsrDialog() return - if(!stat) + if(!machine_stat) if(contents.len >= max_n_of_items) to_chat(user, "\The [src] is full!") diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index d48e4b4393..a9717ed0ac 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -84,7 +84,7 @@ /obj/machinery/computer/holodeck/power_change() . = ..() - toggle_power(!stat) + toggle_power(!machine_stat) /obj/machinery/computer/holodeck/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) @@ -308,7 +308,7 @@ /obj/machinery/computer/holodeck/proc/derez(obj/O, silent = TRUE, forced = FALSE) // Emagging a machine creates an anomaly in the derez systems. - if(O && (obj_flags & EMAGGED) && !stat && !forced) + if(O && (obj_flags & EMAGGED) && !machine_stat && !forced) if((ismob(O) || ismob(O.loc)) && prob(50)) addtimer(CALLBACK(src, PROC_REF(derez), O, silent), 50) // may last a disturbingly long time return diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index a88b8ab905..73e55487bf 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -165,7 +165,7 @@ . = ..() if(.) return - if(user.stat || stat & (NOPOWER|BROKEN)) + if(user.stat || machine_stat & (NOPOWER|BROKEN)) to_chat(user, "This device is not powered!") return diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 71513ccfdf..09a6e48c67 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -163,7 +163,7 @@ /obj/machinery/biogenerator/proc/activate(mob/user) if(user.stat != CONSCIOUS) return - if(stat != NONE) + if(machine_stat != NONE) return if(processing) to_chat(user, "The biogenerator is in the process of working.") @@ -249,7 +249,7 @@ update_icon() /obj/machinery/biogenerator/ui_status(mob/user) - if(stat & BROKEN || panel_open) + if(machine_stat & BROKEN || panel_open) return UI_CLOSE return ..() diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm index 3b1c4eb163..875d18f1a4 100644 --- a/code/modules/hydroponics/gene_modder.dm +++ b/code/modules/hydroponics/gene_modder.dm @@ -54,7 +54,7 @@ min_wrate = 0 /obj/machinery/plantgenes/update_icon_state() - if((stat & (BROKEN|NOPOWER))) + if((machine_stat & (BROKEN|NOPOWER))) icon_state = "dnamod-off" else icon_state = "dnamod" diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index bd488230c4..f760cfb490 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -579,7 +579,7 @@ return ..() /obj/machinery/bookbinder/proc/bind_book(mob/user, obj/item/paper/P) - if(stat) + if(machine_stat) return if(busy) to_chat(user, "The book binder is busy. Please wait for completion of previous operation.") @@ -592,7 +592,7 @@ sleep(rand(200,400)) busy = FALSE if(P) - if(!stat) + if(!machine_stat) visible_message("[src] whirs as it prints and binds a new book.") var/obj/item/book/B = new(src.loc) B.dat = P.info diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 78314ee6b6..882f4b6a2f 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -40,12 +40,12 @@ interface with the mining shuttle at the landing site if a mobile beacon is also if(M) var/destination_found for(var/obj/docking_port/stationary/S in SSshuttle.stationary) - if(!options.Find(S.id)) + if(!options.Find(S.shuttle_id)) continue if(!M.check_dock(S, silent=TRUE)) continue destination_found = 1 - dat += "Send to [S.name]
" + dat += "Send to [S.name]
" if(!destination_found && is_station_level(z)) //Only available if miners are lazy and did not set an LZ using the remote. dat += "Prepare for blind drop? (Dangerous)
" if(LAZYLEN(turrets)) @@ -56,7 +56,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also var/obj/machinery/porta_turret/aux_base/T = PDT var/integrity = max((T.obj_integrity-T.integrity_failure * T.max_integrity)/(T.max_integrity-T.integrity_failure * max_integrity)*100, 0) var/status - if(T.stat & BROKEN) + if(T.machine_stat & BROKEN) status = "ERROR" else if(!T.on) status = "Disabled" @@ -167,7 +167,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also var/area/A = get_area(T) var/obj/docking_port/stationary/landing_zone = new /obj/docking_port/stationary(T) - landing_zone.id = "colony_drop([REF(src)])" + landing_zone.shuttle_id = "colony_drop([REF(src)])" landing_zone.name = "Landing Zone ([T.x], [T.y])" landing_zone.dwidth = base_dock.dwidth landing_zone.dheight = base_dock.dheight @@ -176,7 +176,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also landing_zone.setDir(base_dock.dir) landing_zone.area_type = A.type - possible_destinations += "[landing_zone.id];" + possible_destinations += "[landing_zone.shuttle_id];" //Serves as a nice mechanic to people get ready for the launch. minor_announce("Auxiliary base landing zone coordinates locked in for [A]. Launch command now available!") @@ -238,7 +238,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also /obj/docking_port/mobile/auxillary_base name = "auxillary base" - id = "colony_drop" + shuttle_id = "colony_drop" //Reminder to map-makers to set these values equal to the size of your base. dheight = 4 dwidth = 4 @@ -254,7 +254,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also /obj/docking_port/stationary/public_mining_dock name = "public mining base dock" - id = "disabled" //The Aux Base has to leave before this can be used as a dock. + shuttle_id = "disabled" //The Aux Base has to leave before this can be used as a dock. //Should be checked on the map to ensure it matchs the mining shuttle dimensions. dwidth = 3 width = 7 @@ -303,12 +303,12 @@ interface with the mining shuttle at the landing site if a mobile beacon is also //Mining shuttles may not be created equal, so we find the map's shuttle dock and size accordingly. for(var/S in SSshuttle.stationary) var/obj/docking_port/stationary/SM = S //SM is declared outside so it can be checked for null - if(SM.id == "mining_home" || SM.id == "mining_away") + if(SM.shuttle_id == "mining_home" || SM.shuttle_id == "mining_away") var/area/A = get_area(landing_spot) Mport = new(landing_spot) - Mport.id = "landing_zone_dock" + Mport.shuttle_id = "landing_zone_dock" Mport.name = "auxillary base landing site" Mport.dwidth = SM.dwidth Mport.dheight = SM.dheight @@ -326,7 +326,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also var/list/landing_turfs = list() //List of turfs where the mining shuttle may land. for(var/S in SSshuttle.mobile) var/obj/docking_port/mobile/MS = S - if(MS.id != "mining") + if(MS.shuttle_id != "mining") continue mining_shuttle = MS landing_turfs = mining_shuttle.return_ordered_turfs(x,y,z,dir) diff --git a/code/modules/mining/aux_base_camera.dm b/code/modules/mining/aux_base_camera.dm index 0224ff2769..f4f91fe139 100644 --- a/code/modules/mining/aux_base_camera.dm +++ b/code/modules/mining/aux_base_camera.dm @@ -120,15 +120,13 @@ /datum/action/innate/aux_base //Parent aux base action icon_icon = 'icons/mob/actions/actions_construction.dmi' - var/mob/living/C //Mob using the action var/mob/camera/aiEye/remote/base_construction/remote_eye //Console's eye mob var/obj/machinery/computer/camera_advanced/base_construction/B //Console itself /datum/action/innate/aux_base/Activate() if(!target) return TRUE - C = owner - remote_eye = C.remote_control + remote_eye = owner.remote_control B = target if(!B.RCD) //The console must always have an RCD. B.RCD = new /obj/item/construction/rcd/internal(B) //If the RCD is lost somehow, make a new (empty) one! diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index f5cf7e1d37..b4f9b4a8ee 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -914,7 +914,7 @@ malfhacking = 0 clear_alert("hackingapc") - if(!istype(apc) || QDELETED(apc) || apc.stat & BROKEN) + if(!istype(apc) || QDELETED(apc) || apc.machine_stat & BROKEN) to_chat(src, "Hack aborted. The designated APC no longer exists on the power network.") playsound(get_turf(src), 'sound/machines/buzz-two.ogg', 50, TRUE, ignore_walls = FALSE) else if(apc.aidisabled) diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index c87c1da0b8..7c856fa7ae 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -127,7 +127,7 @@ AIarea = get_base_area(src) if(AIarea) for (var/obj/machinery/power/apc/APC in AIarea) - if (!(APC.stat & BROKEN)) + if (!(APC.machine_stat & BROKEN)) theAPC = APC break if (!theAPC) diff --git a/code/modules/mob/living/simple_animal/gremlin/gremlin.dm b/code/modules/mob/living/simple_animal/gremlin/gremlin.dm index 371ff612a6..cc12f4c567 100644 --- a/code/modules/mob/living/simple_animal/gremlin/gremlin.dm +++ b/code/modules/mob/living/simple_animal/gremlin/gremlin.dm @@ -136,7 +136,7 @@ GLOBAL_LIST(bad_gremlin_items) return FALSE if(istype(new_target, /obj/machinery)) var/obj/machinery/M = new_target - if(M.stat) //Unpowered or broken + if(M.machine_stat) //Unpowered or broken return FALSE else if(istype(new_target, /obj/machinery/door/firedoor)) var/obj/machinery/door/firedoor/F = new_target diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index a1ad787bc7..5311307738 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -247,7 +247,7 @@ return FALSE if(P.has_cover &&!P.raised) //Don't attack invincible turrets return FALSE - if(P.stat & BROKEN) //Or turrets that are already broken + if(P.machine_stat & BROKEN) //Or turrets that are already broken return FALSE return TRUE diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm index 5fb771cb85..f8eb96f3f1 100644 --- a/code/modules/modular_computers/computers/machinery/modular_computer.dm +++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm @@ -71,13 +71,13 @@ set_light(cpu?.enabled ? light_strength : 0) /obj/machinery/modular_computer/update_icon_state() - icon_state = (cpu?.enabled || (!(stat & NOPOWER) && cpu?.use_power())) ? icon_state_powered : icon_state_unpowered + icon_state = (cpu?.enabled || (!(machine_stat & NOPOWER) && cpu?.use_power())) ? icon_state_powered : icon_state_unpowered return ..() /obj/machinery/modular_computer/update_overlays() . = ..() if(!cpu?.enabled) - if (!(stat & NOPOWER) && (cpu?.use_power())) + if (!(machine_stat & NOPOWER) && (cpu?.use_power())) . += screen_icon_screensaver else . += cpu.active_program?.program_icon_state || screen_icon_state_menu @@ -117,13 +117,13 @@ visible_message(span_danger("\The [src]'s screen flickers [battery_module ? "\"BATTERY [malfunction ? "MALFUNCTION" : "CRITICAL"]\"" : "\"EXTERNAL POWER LOSS\""] warning as it shuts down unexpectedly.")) if(cpu) cpu.shutdown_computer(0) - set_machine_stat(stat | NOPOWER) + set_machine_stat(machine_stat | NOPOWER) update_appearance() // Modular computers can have battery in them, we handle power in previous proc, so prevent this from messing it up for us. /obj/machinery/modular_computer/power_change() if(cpu?.use_power()) // If MC_CPU still has a power source, PC wouldn't go offline. - set_machine_stat(stat & ~NOPOWER) + set_machine_stat(machine_stat & ~NOPOWER) update_appearance() return . = ..() diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index ed48c36ad4..30b1c21d19 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -225,7 +225,7 @@ return FALSE /obj/machinery/lapvend/ui_interact(mob/user, datum/tgui/ui) - if(stat & (BROKEN | NOPOWER | MAINT)) + if(machine_stat & (BROKEN | NOPOWER | MAINT)) if(ui) ui.close() return FALSE diff --git a/code/modules/newscaster/newscaster_machine.dm b/code/modules/newscaster/newscaster_machine.dm index c2c826a26e..2f0f557ea8 100644 --- a/code/modules/newscaster/newscaster_machine.dm +++ b/code/modules/newscaster/newscaster_machine.dm @@ -55,7 +55,7 @@ GLOBAL_LIST_EMPTY(allCasters) return ..() /obj/machinery/newscaster/update_icon_state() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) icon_state = "newscaster_off" else if(GLOB.news_network.wanted_issue.active) @@ -66,7 +66,7 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster/update_overlays() . = ..() - if(!(stat & (NOPOWER|BROKEN)) && !GLOB.news_network.wanted_issue.active && alert) + if(!(machine_stat & (NOPOWER|BROKEN)) && !GLOB.news_network.wanted_issue.active && alert) . += "newscaster_alert" var/hp_percent = obj_integrity * 100 /max_integrity @@ -81,14 +81,14 @@ GLOBAL_LIST_EMPTY(allCasters) . += "crack3" /obj/machinery/newscaster/power_change() - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(powered()) - stat &= ~NOPOWER + machine_stat &= ~NOPOWER update_icon() else spawn(rand(0, 15)) - stat |= NOPOWER + machine_stat |= NOPOWER update_icon() /obj/machinery/newscaster/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) @@ -557,7 +557,7 @@ GLOBAL_LIST_EMPTY(allCasters) I.play_tool_sound(src) if(I.use_tool(src, user, 60)) playsound(loc, 'sound/items/deconstruct.ogg', 50, 1) - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "The broken remains of [src] fall on the ground.") new /obj/item/stack/sheet/metal(loc, 5) new /obj/item/shard(loc) @@ -567,18 +567,18 @@ GLOBAL_LIST_EMPTY(allCasters) new /obj/item/wallframe/newscaster(loc) qdel(src) else if(I.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM) - if(stat & BROKEN) + if(machine_stat & BROKEN) if(!I.tool_start_check(user, amount=0)) return user.visible_message("[user] is repairing [src].", \ "You begin repairing [src]...", \ "You hear welding.") if(I.use_tool(src, user, 40, volume=50)) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) return to_chat(user, "You repair [src].") obj_integrity = max_integrity - stat &= ~BROKEN + machine_stat &= ~BROKEN update_icon() else to_chat(user, "[src] does not need repairs.") @@ -588,7 +588,7 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster/play_attack_sound(damage, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BRUTE) - if(stat & BROKEN) + if(machine_stat & BROKEN) playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1) else playsound(loc, 'sound/effects/glasshit.ogg', 90, 1) @@ -604,8 +604,8 @@ GLOBAL_LIST_EMPTY(allCasters) qdel(src) /obj/machinery/newscaster/obj_break() - if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) - stat |= BROKEN + if(!(machine_stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) + machine_stat |= BROKEN playsound(loc, 'sound/effects/glassbr3.ogg', 100, 1) update_icon() diff --git a/code/modules/plumbing/plumbers/acclimator.dm b/code/modules/plumbing/plumbers/acclimator.dm index d7fbc5a8e1..ca7e34dd6b 100644 --- a/code/modules/plumbing/plumbers/acclimator.dm +++ b/code/modules/plumbing/plumbers/acclimator.dm @@ -33,7 +33,7 @@ AddComponent(/datum/component/plumbing/acclimator, bolt) /obj/machinery/plumbing/acclimator/process() - if(stat & NOPOWER || !enabled || !reagents.total_volume || reagents.chem_temp == target_temperature) + if(machine_stat & NOPOWER || !enabled || !reagents.total_volume || reagents.chem_temp == target_temperature) if(acclimate_state != NEUTRAL) acclimate_state = NEUTRAL update_icon() diff --git a/code/modules/plumbing/plumbers/bottler.dm b/code/modules/plumbing/plumbers/bottler.dm index 396c7cac22..d6abd48f6b 100644 --- a/code/modules/plumbing/plumbers/bottler.dm +++ b/code/modules/plumbing/plumbers/bottler.dm @@ -56,7 +56,7 @@ to_chat(user, " The [src] will now fill for [wanted_amount]u.") /obj/machinery/plumbing/bottler/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return ///see if machine has enough to fill if(reagents.total_volume >= wanted_amount && anchored) diff --git a/code/modules/plumbing/plumbers/destroyer.dm b/code/modules/plumbing/plumbers/destroyer.dm index b61383ea4a..a1f2cd750a 100644 --- a/code/modules/plumbing/plumbers/destroyer.dm +++ b/code/modules/plumbing/plumbers/destroyer.dm @@ -10,7 +10,7 @@ AddComponent(/datum/component/plumbing/simple_demand, bolt) /obj/machinery/plumbing/disposer/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return if(reagents.total_volume) if(icon_state != initial(icon_state) + "_working") //threw it here instead of update icon since it only has two states diff --git a/code/modules/plumbing/plumbers/fermenter.dm b/code/modules/plumbing/plumbers/fermenter.dm index b1e1e4b676..771662f61d 100644 --- a/code/modules/plumbing/plumbers/fermenter.dm +++ b/code/modules/plumbing/plumbers/fermenter.dm @@ -45,7 +45,7 @@ ferment(AM) /obj/machinery/plumbing/fermenter/proc/ferment(atom/AM) - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return if(reagents.holder_full()) return diff --git a/code/modules/plumbing/plumbers/grinder_chemical.dm b/code/modules/plumbing/plumbers/grinder_chemical.dm index 1d216046e4..1907fb91fa 100644 --- a/code/modules/plumbing/plumbers/grinder_chemical.dm +++ b/code/modules/plumbing/plumbers/grinder_chemical.dm @@ -44,7 +44,7 @@ grind(AM) /obj/machinery/plumbing/grinder_chemical/proc/grind(atom/AM) - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return if(reagents.holder_full()) return diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm index 88f56f111d..6811897307 100644 --- a/code/modules/plumbing/plumbers/pill_press.dm +++ b/code/modules/plumbing/plumbers/pill_press.dm @@ -47,7 +47,7 @@ /obj/machinery/plumbing/pill_press/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return if(reagents.total_volume >= current_volume) if (product == "pill") diff --git a/code/modules/plumbing/plumbers/synthesizer.dm b/code/modules/plumbing/plumbers/synthesizer.dm index c2bc3439ff..f6173e3ab5 100644 --- a/code/modules/plumbing/plumbers/synthesizer.dm +++ b/code/modules/plumbing/plumbers/synthesizer.dm @@ -51,7 +51,7 @@ AddComponent(/datum/component/plumbing/simple_supply, bolt) /obj/machinery/plumbing/synthesizer/process() - if(stat & NOPOWER || !reagent_id || !amount) + if(machine_stat & NOPOWER || !reagent_id || !amount) return if(reagents.total_volume >= amount) //otherwise we get leftovers, and we need this to be precise return diff --git a/code/modules/pool/pool_controller.dm b/code/modules/pool/pool_controller.dm index f2a3b23e57..f97f4acf13 100644 --- a/code/modules/pool/pool_controller.dm +++ b/code/modules/pool/pool_controller.dm @@ -129,9 +129,9 @@ return TRUE /obj/machinery/pool/controller/attackby(obj/item/W, mob/user) - if(shocked && !(stat & NOPOWER)) + if(shocked && !(machine_stat & NOPOWER)) shock(user,50) - if(stat & (BROKEN)) + if(machine_stat & (BROKEN)) return if(istype(W,/obj/item/reagent_containers)) if(W.reagents.total_volume) //check if there's reagent @@ -188,7 +188,7 @@ //procs /obj/machinery/pool/controller/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 @@ -220,7 +220,7 @@ /obj/machinery/pool/controller/process() updateUsrDialog() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return if(drained) return @@ -372,11 +372,11 @@ . = ..() if(.) return - if(shocked && !(stat & NOPOWER)) + if(shocked && !(machine_stat & NOPOWER)) shock(user,50) if(panel_open && !isAI(user)) return wires.interact(user) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return var/datum/browser/popup = new(user, "Pool Controller", name, 300, 450) var/dat = "" diff --git a/code/modules/pool/pool_wires.dm b/code/modules/pool/pool_wires.dm index 730381ca2b..ff06e96a13 100644 --- a/code/modules/pool/pool_wires.dm +++ b/code/modules/pool/pool_wires.dm @@ -54,6 +54,6 @@ P.shock(usr, 50) if(WIRE_SHOCK) if(mend) - P.stat &= ~NOPOWER + P.machine_stat &= ~NOPOWER else - P.stat |= NOPOWER + P.machine_stat |= NOPOWER diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index a48a5bf07a..5edfc03392 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -53,7 +53,7 @@ check_shield_icons() update_shield_icons = 0 - if(stat & (NOPOWER|BROKEN) || !active)//can update the icons even without power + if(machine_stat & (NOPOWER|BROKEN) || !active)//can update the icons even without power return if(!fueljar)//No fuel but we are on, shutdown @@ -127,13 +127,13 @@ /obj/machinery/power/am_control_unit/power_change() ..() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) if(active) toggle_power(1) else use_power = NO_POWER_USE - else if(!stat && anchored) + else if(!machine_stat && anchored) use_power = IDLE_POWER_USE return @@ -265,7 +265,7 @@ /obj/machinery/power/am_control_unit/ui_interact(mob/user) . = ..() - if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER))) + if((get_dist(src, user) > 1) || (machine_stat & (BROKEN|NOPOWER))) if(!isAI(user)) user.unset_machine() user << browse(null, "window=AMcontrol") diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 41e8941eb5..5b0ba1b610 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -254,7 +254,7 @@ opened = APC_COVER_OPENED operating = FALSE name = "\improper [A.name] APC" - set_machine_stat(stat | MAINT) + set_machine_stat(machine_stat | MAINT) update_appearance() addtimer(CALLBACK(src, PROC_REF(update)), 5) @@ -291,7 +291,7 @@ opened = APC_COVER_OPENED operating = FALSE name = "\improper [get_area_name(area, TRUE)] APC" - set_machine_stat(stat | MAINT) + set_machine_stat(machine_stat | MAINT) update_appearance() addtimer(CALLBACK(src, PROC_REF(update)), 5) register_context() @@ -337,7 +337,7 @@ /obj/machinery/power/apc/examine(mob/user) . = ..() - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(opened) if(has_electronics && terminal) @@ -349,7 +349,7 @@ . += "[src]'s innards have been replaced by strange brass machinery!" else - if (stat & MAINT) + if (machine_stat & MAINT) . += "The cover is closed. Something is wrong with it. It doesn't work." else if (malfhack) . += "The cover is broken. It may be hard to force it open." @@ -419,7 +419,7 @@ /obj/machinery/power/apc/update_overlays() . = ..() - if((stat & (BROKEN|MAINT)) || update_state) + if((machine_stat & (BROKEN|MAINT)) || update_state) return . += mutable_appearance(icon, "apcox-[locked]") @@ -443,9 +443,9 @@ // Handle icon status: var/new_update_state = NONE - if(stat & BROKEN) + if(machine_stat & BROKEN) new_update_state |= UPSTATE_BROKE - if(stat & MAINT) + if(machine_stat & MAINT) new_update_state |= UPSTATE_MAINT if(opened) @@ -504,7 +504,7 @@ if(W.use_tool(src, user, 50)) if (has_electronics == APC_ELECTRONICS_INSTALLED) has_electronics = APC_ELECTRONICS_MISSING - if (stat & BROKEN) + if (machine_stat & BROKEN) user.visible_message(\ "[user.name] has broken the power control board inside [src.name]!",\ "You break the charred power control board and remove the remains.", @@ -544,8 +544,8 @@ coverlocked = TRUE //closing cover relocks it update_appearance() return - else if (!(stat & BROKEN)) - if(coverlocked && !(stat & MAINT)) // locked... + else if (!(machine_stat & BROKEN)) + if(coverlocked && !(machine_stat & MAINT)) // locked... to_chat(user, "The cover is locked and cannot be opened!") return else if (panel_open) @@ -575,12 +575,12 @@ switch (has_electronics) if (APC_ELECTRONICS_INSTALLED) has_electronics = APC_ELECTRONICS_SECURED - stat &= ~MAINT + machine_stat &= ~MAINT W.play_tool_sound(src) to_chat(user, "You screw the circuit electronics into place.") if (APC_ELECTRONICS_SECURED) has_electronics = APC_ELECTRONICS_INSTALLED - set_machine_stat(stat | MAINT) + set_machine_stat(machine_stat | MAINT) W.play_tool_sound(src) to_chat(user, "You unfasten the electronics.") else @@ -611,7 +611,7 @@ "You start welding the APC frame...", \ "You hear welding.") if(W.use_tool(src, user, 50, volume=50, amount=3)) - if ((stat & BROKEN) || opened==APC_COVER_REMOVED) + if ((machine_stat & BROKEN) || opened==APC_COVER_REMOVED) new /obj/item/stack/sheet/metal(loc) user.visible_message(\ "[user.name] has cut [src] apart with [W].",\ @@ -634,7 +634,7 @@ to_chat(user, "There is a power cell already installed!") return else - if(stat & MAINT) + if(machine_stat & MAINT) to_chat(user, "There is no connector for your power cell!") return if(!user.transferItemToLoc(W, src)) @@ -685,7 +685,7 @@ if (has_electronics) to_chat(user, "There is already a board inside the [src]!") return - else if (stat & BROKEN) + else if (machine_stat & BROKEN) to_chat(user, "You cannot put the board inside, the frame is damaged!") return @@ -701,7 +701,7 @@ else if(istype(W, /obj/item/electroadaptive_pseudocircuit) && opened) var/obj/item/electroadaptive_pseudocircuit/P = W if(!has_electronics) - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "[src]'s frame is too damaged to support a circuit.") return if(!P.adapt_circuit(user, 50)) @@ -711,7 +711,7 @@ has_electronics = APC_ELECTRONICS_INSTALLED locked = FALSE else if(!cell) - if(stat & MAINT) + if(machine_stat & MAINT) to_chat(user, "There's no connector for a power cell.") return if(!P.adapt_circuit(user, 500)) @@ -727,10 +727,10 @@ to_chat(user, "[src] has both electronics and a cell.") return else if (istype(W, /obj/item/wallframe/apc) && opened) - if (!(stat & BROKEN || opened==APC_COVER_REMOVED || obj_integrity < max_integrity)) // There is nothing to repair + if (!(machine_stat & BROKEN || opened==APC_COVER_REMOVED || obj_integrity < max_integrity)) // There is nothing to repair to_chat(user, "You found no reason for repairing this APC") return - if (!(stat & BROKEN) && opened==APC_COVER_REMOVED) // Cover is the only thing broken, we do not need to remove elctronicks to replace cover + if (!(machine_stat & BROKEN) && opened==APC_COVER_REMOVED) // Cover is the only thing broken, we do not need to remove elctronicks to replace cover user.visible_message("[user.name] replaces missing APC's cover.",\ "You begin to replace APC's cover...") if(do_after(user, 20, target = src)) // replacing cover is quicker than replacing whole frame @@ -747,7 +747,7 @@ if(do_after(user, 50, target = src)) to_chat(user, "You replace the damaged APC frame with a new one.") qdel(W) - stat &= ~BROKEN + machine_stat &= ~BROKEN obj_integrity = max_integrity if (opened==APC_COVER_REMOVED) opened = APC_COVER_OPENED @@ -787,12 +787,12 @@ /obj/machinery/power/apc/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) if(the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS) if(!has_electronics) - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "[src]'s frame is too damaged to support a circuit.") return FALSE return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1) else if(!cell) - if(stat & MAINT) + if(machine_stat & MAINT) to_chat(user, "There's no connector for a power cell.") return FALSE return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 50, "cost" = 10) //16 for a wall @@ -805,7 +805,7 @@ switch(passed_mode) if(RCD_UPGRADE_SIMPLE_CIRCUITS) if(!has_electronics) - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "[src]'s frame is too damaged to support a circuit.") return user.visible_message("[user] fabricates a circuit and places it into [src].", \ @@ -814,7 +814,7 @@ locked = TRUE return TRUE else if(!cell) - if(stat & MAINT) + if(machine_stat & MAINT) to_chat(user, span_warning("There's no connector for a power cell.")) return FALSE var/obj/item/stock_parts/cell/crap/empty/C = new(src) @@ -844,7 +844,7 @@ to_chat(user, "You must close the cover to swipe an ID card!") else if(panel_open) to_chat(user, "You must close the panel!") - else if(stat & (BROKEN|MAINT)) + else if(machine_stat & (BROKEN|MAINT)) to_chat(user, "Nothing happens!") else if(allowed(usr) && !wires.is_cut(WIRE_IDSCAN) && !malfhack) @@ -863,7 +863,7 @@ set_nightshift(!nightshift_lights) /obj/machinery/power/apc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) - if(damage_flag == MELEE && damage_amount < 10 && (!(stat & BROKEN) || malfai)) + if(damage_flag == MELEE && damage_amount < 10 && (!(machine_stat & BROKEN) || malfai)) return FALSE . = ..() @@ -875,7 +875,7 @@ /obj/machinery/power/apc/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) set_broken() if(opened != APC_COVER_REMOVED) opened = APC_COVER_REMOVED @@ -891,7 +891,7 @@ to_chat(user, "You must close the cover to swipe an ID card!") else if(panel_open) to_chat(user, "You must close the panel first!") - else if(stat & (BROKEN|MAINT)) + else if(machine_stat & (BROKEN|MAINT)) to_chat(user, "Nothing happens!") else flick("apc-spark", src) @@ -954,7 +954,7 @@ charging = APC_NOT_CHARGING src.update_appearance() return - if((stat & MAINT) && !opened) //no board; no interface + if((machine_stat & MAINT) && !opened) //no board; no interface return /obj/machinery/power/apc/ui_interact(mob/user, datum/tgui/ui) @@ -1090,7 +1090,7 @@ switch(action) if("lock") if(area.hasSiliconAccessInArea(usr)) - if((obj_flags & EMAGGED) || (stat & (BROKEN|MAINT))) + if((obj_flags & EMAGGED) || (machine_stat & (BROKEN|MAINT))) to_chat(usr, "The APC does not respond to the command!") else locked = !locked @@ -1362,7 +1362,7 @@ /obj/machinery/power/apc/process() if(icon_update_needed) update_appearance() - if(stat & (BROKEN|MAINT)) + if(machine_stat & (BROKEN|MAINT)) return if(!area || !area.requires_power) return diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index af427f1c40..ae1498b521 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -34,7 +34,7 @@ /obj/machinery/power/generator/update_overlays() . = ..() - if(!(stat & (NOPOWER|BROKEN))) + if(!(machine_stat & (NOPOWER|BROKEN))) var/L = min(round(lastgenlev/100000),11) if(L != 0) . += image('icons/obj/power.dmi', "teg-op[L]") diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index ba5e6a83a0..79abb07a77 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -60,7 +60,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne obj_break() /obj/machinery/gravity_generator/proc/set_fix() - stat &= ~BROKEN + machine_stat &= ~BROKEN /obj/machinery/gravity_generator/part/Destroy() if(main_part) @@ -86,7 +86,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne /obj/machinery/gravity_generator/part/set_broken() ..() - if(main_part && !(main_part.stat & BROKEN)) + if(main_part && !(main_part.machine_stat & BROKEN)) main_part.set_broken() /// Used to eat args @@ -169,7 +169,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne /obj/machinery/gravity_generator/main/set_broken() ..() for(var/obj/machinery/gravity_generator/M in parts) - if(!(M.stat & BROKEN)) + if(!(M.machine_stat & BROKEN)) M.set_broken() middle.cut_overlays() charge_count = 0 @@ -181,7 +181,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne /obj/machinery/gravity_generator/main/set_fix() ..() for(var/obj/machinery/gravity_generator/M in parts) - if(M.stat & BROKEN) + if(M.machine_stat & BROKEN) M.set_fix() broken_state = FALSE update_appearance() @@ -239,7 +239,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne data["charge_count"] = charge_count data["charging_state"] = charging_state data["on"] = on - data["operational"] = (stat & BROKEN) ? FALSE : TRUE + data["operational"] = (machine_stat & BROKEN) ? FALSE : TRUE return data @@ -259,18 +259,18 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne /obj/machinery/gravity_generator/main/power_change() . = ..() - investigate_log("has [stat & NOPOWER ? "lost" : "regained"] power.", INVESTIGATE_GRAVITY) + investigate_log("has [machine_stat & NOPOWER ? "lost" : "regained"] power.", INVESTIGATE_GRAVITY) set_power() /obj/machinery/gravity_generator/main/get_status() - if(stat & BROKEN) + if(machine_stat & BROKEN) return "fix[min(broken_state, 3)]" return on || charging_state != POWER_IDLE ? "on" : "off" // Set the charging state based on power/breaker. /obj/machinery/gravity_generator/main/proc/set_power() var/new_state = FALSE - if(stat & (NOPOWER|BROKEN) || !breaker) + if(machine_stat & (NOPOWER|BROKEN) || !breaker) new_state = FALSE else if(breaker) new_state = TRUE @@ -307,7 +307,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne // Charge/Discharge and turn on/off gravity when you reach 0/100 percent. // Also emit radiation and handle the overlays. /obj/machinery/gravity_generator/main/process() - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(charging_state != POWER_IDLE) if(charging_state == POWER_UP && charge_count >= 100) diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 24e7581966..dc92b7f78d 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -108,18 +108,18 @@ SHOULD_NOT_SLEEP(TRUE) //SHOULD_CALL_PARENT(TRUE) - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(powered(power_channel)) - if(stat & NOPOWER) + if(machine_stat & NOPOWER) SEND_SIGNAL(src, COMSIG_MACHINERY_POWER_RESTORED) . = TRUE - set_machine_stat(stat & ~NOPOWER) + set_machine_stat(machine_stat & ~NOPOWER) else - if(!(stat & NOPOWER)) + if(!(machine_stat & NOPOWER)) SEND_SIGNAL(src, COMSIG_MACHINERY_POWER_LOST) . = TRUE - set_machine_stat(stat | NOPOWER) + set_machine_stat(machine_stat | NOPOWER) update_appearance() // connect the machine to a powernet if a node cable is present on the turf diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 1052752c82..5e384bc62f 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -192,9 +192,9 @@ . += "[src]'s display displays the words: \"Research point production mode. Please insert Tritium and Oxygen. Use a multitool to change production modes.\"" /obj/machinery/power/rad_collector/obj_break(damage_flag) - if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) + if(!(machine_stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) eject() - stat |= BROKEN + machine_stat |= BROKEN /obj/machinery/power/rad_collector/proc/eject() locked = FALSE @@ -219,7 +219,7 @@ . = ..() if(loaded_tank) . += "ptank" - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return if(active) . += "on" diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 65dfbf7a85..24b6cf71c1 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -158,7 +158,7 @@ step(src, get_dir(M, src)) /obj/machinery/power/emitter/process() - if(stat & (BROKEN)) + if(machine_stat & (BROKEN)) return if(state != EMITTER_WELDED || (!powernet && active_power_usage)) active = FALSE diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 3a592a4f98..c2fdbd1a1c 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -101,10 +101,10 @@ /obj/machinery/particle_accelerator/control_box/power_change() . = ..() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) active = FALSE use_power = NO_POWER_USE - else if(!stat && construction_state == PA_CONSTRUCTION_COMPLETE) + else if(!machine_stat && construction_state == PA_CONSTRUCTION_COMPLETE) use_power = IDLE_POWER_USE /obj/machinery/particle_accelerator/control_box/process() diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index fff91df1b9..7a8e67aa81 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -94,7 +94,7 @@ if(!terminal) to_chat(user, "No power terminal found.") return - stat &= ~BROKEN + machine_stat &= ~BROKEN update_icon() return @@ -189,7 +189,7 @@ terminal = new/obj/machinery/power/terminal(T) terminal.setDir(get_dir(T,src)) terminal.master = src - stat &= ~BROKEN + machine_stat &= ~BROKEN /obj/machinery/power/smes/disconnect_terminal() if(terminal) @@ -200,7 +200,7 @@ /obj/machinery/power/smes/update_overlays() . = ..() - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(panel_open) @@ -225,7 +225,7 @@ return clamp(round(5.5*charge/capacity),0,5) /obj/machinery/power/smes/process() - if(stat & BROKEN) + if(machine_stat & BROKEN) return //store machine state to see if we need to update the icon overlays @@ -289,7 +289,7 @@ // called after all power processes are finished // restores charge level to smes if there was excess this ptick /obj/machinery/power/smes/proc/restore() - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(!outputting) diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index ef5d331402..878b8f2a89 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -78,7 +78,7 @@ /obj/machinery/power/solar/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BRUTE) - if(stat & BROKEN) + if(machine_stat & BROKEN) playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 60, TRUE) else playsound(loc, 'sound/effects/glasshit.ogg', 90, TRUE) @@ -97,7 +97,7 @@ if(disassembled) if(assembly) assembly.forceMove(loc) - assembly.give_glass(stat & BROKEN) + assembly.give_glass(machine_stat & BROKEN) else playsound(src, "shatter", 70, TRUE) var/shard = assembly?.glass_type ? assembly.glass_type.shard_type : /obj/item/shard @@ -110,7 +110,7 @@ var/matrix/turner = matrix() turner.Turn(azimuth_current) panel.transform = turner - panel.icon_state = "solar_panel[(stat & BROKEN) ? "-b" : null]" + panel.icon_state = "solar_panel[(machine_stat & BROKEN) ? "-b" : null]" /obj/machinery/power/solar/proc/queue_turn(azimuth) needs_to_turn = TRUE @@ -155,7 +155,7 @@ total_flux += cur_pow /obj/machinery/power/solar/process() - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(control && (!powernet || control.powernet != powernet)) unset_control() @@ -331,12 +331,12 @@ /obj/machinery/power/solar_control/update_overlays() . = ..() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) . += mutable_appearance(icon, "[icon_keyboard]_off") return . += mutable_appearance(icon, icon_keyboard) - if(stat & BROKEN) + if(machine_stat & BROKEN) . += mutable_appearance(icon, "[icon_state]_broken") return . += mutable_appearance(icon, icon_screen) @@ -398,7 +398,7 @@ /obj/machinery/power/solar_control/attackby(obj/item/I, mob/living/user, params) if(I.tool_behaviour == TOOL_SCREWDRIVER) if(I.use_tool(src, user, 20, volume=50)) - if (src.stat & BROKEN) + if (src.machine_stat & BROKEN) to_chat(user, "The broken glass falls out.") var/obj/structure/frame/computer/A = new /obj/structure/frame/computer( src.loc ) new /obj/item/shard( src.loc ) @@ -429,7 +429,7 @@ /obj/machinery/power/solar_control/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) diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 8345da01a2..d312b85c67 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -67,7 +67,7 @@ return TRUE /obj/machinery/power/tracker/obj_break(damage_flag) - if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) + if(!(machine_stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE) unset_control() @@ -76,7 +76,7 @@ if(disassembled) if(assembly) assembly.forceMove(loc) - assembly.give_glass(stat & BROKEN) + assembly.give_glass(machine_stat & BROKEN) else playsound(src, "shatter", 70, TRUE) var/shard = assembly?.glass_type ? assembly.glass_type.shard_type : /obj/item/shard diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index c01e3f3dcc..af862e12cc 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -109,7 +109,7 @@ locate_machinery() if(turbine) to_chat(user, "Turbine connected.") - stat &= ~BROKEN + machine_stat &= ~BROKEN else to_chat(user, "Turbine not connected.") obj_break() @@ -120,9 +120,9 @@ /obj/machinery/power/compressor/process() if(!starter) return - if(!turbine || (turbine.stat & BROKEN)) + if(!turbine || (turbine.machine_stat & BROKEN)) starter = FALSE - if(stat & BROKEN || panel_open) + if(machine_stat & BROKEN || panel_open) starter = FALSE return cut_overlays() @@ -138,7 +138,7 @@ rpm = min(rpm, (COMPFRICTION*efficiency)/2) rpm = max(0, rpm - (rpm*rpm)/(COMPFRICTION*efficiency)) - if(starter && !(stat & NOPOWER)) + if(starter && !(machine_stat & NOPOWER)) use_power(2800) if(rpm<1000) rpmtarget = 1000 @@ -192,9 +192,9 @@ /obj/machinery/power/turbine/process() if(!compressor) - stat = BROKEN + machine_stat = BROKEN - if((stat & BROKEN) || panel_open) + if((machine_stat & BROKEN) || panel_open) return if(!compressor.starter) return @@ -235,7 +235,7 @@ locate_machinery() if(compressor) to_chat(user, "Compressor connected.") - stat &= ~BROKEN + machine_stat &= ~BROKEN else to_chat(user, "Compressor not connected.") obj_break() @@ -252,9 +252,9 @@ /obj/machinery/power/turbine/ui_data(mob/user) var/list/data = list() data["compressor"] = compressor ? TRUE : FALSE - data["compressor_broke"] = (!compressor || (compressor.stat & BROKEN)) ? TRUE : FALSE + data["compressor_broke"] = (!compressor || (compressor.machine_stat & BROKEN)) ? TRUE : FALSE data["turbine"] = compressor?.turbine ? TRUE : FALSE - data["turbine_broke"] = (!compressor || !compressor.turbine || (compressor.turbine.stat & BROKEN)) ? TRUE : FALSE + data["turbine_broke"] = (!compressor || !compressor.turbine || (compressor.turbine.machine_stat & BROKEN)) ? TRUE : FALSE data["online"] = compressor?.starter data["power"] = DisplayPower(compressor?.turbine?.lastgen) data["rpm"] = compressor?.rpm @@ -313,9 +313,9 @@ /obj/machinery/computer/turbine_computer/ui_data(mob/user) var/list/data = list() data["compressor"] = compressor ? TRUE : FALSE - data["compressor_broke"] = (!compressor || (compressor.stat & BROKEN)) ? TRUE : FALSE + data["compressor_broke"] = (!compressor || (compressor.machine_stat & BROKEN)) ? TRUE : FALSE data["turbine"] = compressor?.turbine ? TRUE : FALSE - data["turbine_broke"] = (!compressor || !compressor.turbine || (compressor.turbine.stat & BROKEN)) ? TRUE : FALSE + data["turbine_broke"] = (!compressor || !compressor.turbine || (compressor.turbine.machine_stat & BROKEN)) ? TRUE : FALSE data["online"] = compressor?.starter data["power"] = DisplayPower(compressor?.turbine?.lastgen) data["rpm"] = compressor?.rpm diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index cd8ee2d986..fb616d3712 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -58,7 +58,7 @@ /obj/machinery/chem_heater/process() ..() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return if(on) if(beaker && beaker.reagents.total_volume) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 8986d39008..5f666ae69e 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -74,7 +74,7 @@ /obj/machinery/chem_master/update_overlays() . = ..() - if (stat & BROKEN) + if (machine_stat & BROKEN) . += "waitlight" /obj/machinery/chem_master/blob_act(obj/structure/blob/B) diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index 7ae4aae5fc..47eca1daef 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -128,7 +128,7 @@ playsound(src, 'sound/machines/ping.ogg', 30, TRUE) /obj/machinery/computer/pandemic/update_icon_state() - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = (beaker ? "mixer1_b" : "mixer0_b") else icon_state = "mixer[(beaker) ? "1" : "0"][powered() ? "" : "_nopower"]" @@ -239,7 +239,7 @@ /obj/machinery/computer/pandemic/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container()) . = TRUE //no afterattack - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return var/obj/item/reagent_containers/B if(beaker) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 84a44db3e5..f1098eecce 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -151,7 +151,7 @@ options["eject"] = radial_eject if(isAI(user)) - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return options["examine"] = radial_examine @@ -173,7 +173,7 @@ choice = show_radial_menu(user, src, options, require_near = !hasSiliconAccessInArea(user)) // post choice verification - if(operating || (isAI(user) && stat & NOPOWER) || !user.canUseTopic(src, !hasSiliconAccessInArea(user))) + if(operating || (isAI(user) && machine_stat & NOPOWER) || !user.canUseTopic(src, !hasSiliconAccessInArea(user))) return switch(choice) @@ -206,7 +206,7 @@ var/obj/item/O = i . += "- \A [O.name]." - if(!(stat & (NOPOWER|BROKEN))) + if(!(machine_stat & (NOPOWER|BROKEN))) . += "The status display reads:" . += "- Grinding reagents at [speed*100]%." if(beaker) @@ -255,7 +255,7 @@ /obj/machinery/reagentgrinder/proc/juice() power_change() - if(!beaker || stat & (NOPOWER|BROKEN) || beaker.reagents.total_volume >= beaker.reagents.maximum_volume) + if(!beaker || machine_stat & (NOPOWER|BROKEN) || beaker.reagents.total_volume >= beaker.reagents.maximum_volume) return operate_for(50, juicing = TRUE) for(var/obj/item/i in holdingitems) @@ -274,7 +274,7 @@ /obj/machinery/reagentgrinder/proc/grind() power_change() - if(!beaker || stat & (NOPOWER|BROKEN) || beaker.reagents.total_volume >= beaker.reagents.maximum_volume) + if(!beaker || machine_stat & (NOPOWER|BROKEN) || beaker.reagents.total_volume >= beaker.reagents.maximum_volume) return operate_for(60) for(var/i in holdingitems) @@ -296,7 +296,7 @@ /obj/machinery/reagentgrinder/proc/mix(mob/user) //For butter and other things that would change upon shaking or mixing power_change() - if(!beaker || stat & (NOPOWER|BROKEN)) + if(!beaker || machine_stat & (NOPOWER|BROKEN)) return operate_for(50, juicing = TRUE) addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/reagentgrinder, mix_complete)), 50) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 3f45c6cce9..f68aa4829e 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -41,13 +41,13 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) update_move_direction() /obj/machinery/conveyor/auto/update() - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "conveyor-broken" operating = FALSE return else if(!operable) operating = FALSE - else if(stat & NOPOWER) + else if(machine_stat & NOPOWER) operating = FALSE else operating = TRUE @@ -113,20 +113,20 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) update() /obj/machinery/conveyor/proc/update() - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "conveyor-broken" operating = FALSE return if(!operable) operating = FALSE - if(stat & NOPOWER) + if(machine_stat & NOPOWER) operating = FALSE icon_state = "conveyor[operating * verted]" // machine process // move items to the target location /obj/machinery/conveyor/process() - if(stat & (BROKEN | NOPOWER)) + if(machine_stat & (BROKEN | NOPOWER)) return if(!operating) return @@ -149,21 +149,21 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) user.visible_message("[user] struggles to pry up \the [src] with \the [I].", \ "You struggle to pry up \the [src] with \the [I].") if(I.use_tool(src, user, 40, volume=40)) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) var/obj/item/stack/conveyor/C = new /obj/item/stack/conveyor(loc, 1, TRUE, id) transfer_fingerprints_to(C) to_chat(user, "You remove the conveyor belt.") qdel(src) else if(I.tool_behaviour == TOOL_WRENCH) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) I.play_tool_sound(src) setDir(turn(dir,-45)) update_move_direction() to_chat(user, "You rotate [src].") else if(I.tool_behaviour == TOOL_SCREWDRIVER) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) verted = verted * -1 update_move_direction() to_chat(user, "You reverse [src]'s direction.") @@ -180,7 +180,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) // make the conveyor broken // also propagate inoperability to any connected conveyor with the same ID /obj/machinery/conveyor/proc/broken() - stat |= BROKEN + machine_stat |= BROKEN update() var/obj/machinery/conveyor/C = locate() in get_step(src, dir) diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index e8c4b0d3d3..605690dddf 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -177,7 +177,7 @@ // monkeys and xenos can only pull the flush lever /obj/machinery/disposal/attack_paw(mob/user) - if(stat & BROKEN) + if(machine_stat & BROKEN) return flush = !flush update_icon() @@ -303,7 +303,7 @@ return GLOB.notcontained_state /obj/machinery/disposal/bin/ui_interact(mob/user, datum/tgui/ui) - if(stat & BROKEN) + if(machine_stat & BROKEN) return ui = SStgui.try_update_ui(user, src, ui) if(!ui) @@ -385,7 +385,7 @@ /obj/machinery/disposal/bin/update_overlays() . = ..() - if(stat & BROKEN) + if(machine_stat & BROKEN) pressure_charging = FALSE flush = FALSE return @@ -395,7 +395,7 @@ . += "dispover-handle" //only handle is shown if no power - if(stat & NOPOWER || panel_open) + if(machine_stat & NOPOWER || panel_open) return //check for items in disposal - occupied light @@ -418,7 +418,7 @@ //timed process //charge the gas reservoir and perform flush if ready /obj/machinery/disposal/bin/process() - if(stat & BROKEN) //nothing can happen if broken + if(machine_stat & BROKEN) //nothing can happen if broken return flush_count++ @@ -431,7 +431,7 @@ if(flush && air_contents.return_pressure() >= SEND_PRESSURE) // flush can happen even without power do_flush() - if(stat & NOPOWER) // won't charge if no power + if(machine_stat & NOPOWER) // won't charge if no power return use_power(100) // base power usage diff --git a/code/modules/research/nanites/nanite_chamber.dm b/code/modules/research/nanites/nanite_chamber.dm index 21879973e7..a8cfefb2af 100644 --- a/code/modules/research/nanites/nanite_chamber.dm +++ b/code/modules/research/nanites/nanite_chamber.dm @@ -51,9 +51,9 @@ SEND_SIGNAL(occupant, COMSIG_NANITE_SET_CLOUD, cloud_id) /obj/machinery/nanite_chamber/proc/inject_nanites() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) return if(!occupant || busy) return @@ -78,9 +78,9 @@ occupant.AddComponent(/datum/component/nanites, 100) /obj/machinery/nanite_chamber/proc/remove_nanites(datum/nanite_program/NP) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) return if(!occupant || busy || SEND_SIGNAL(occupant, COMSIG_NANITE_CHECK_CONSOLE_LOCK)) return @@ -118,10 +118,10 @@ /obj/machinery/nanite_chamber/update_overlays() . = ..() - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) . += "maint" - else if(!(stat & (NOPOWER|BROKEN))) + else if(!(machine_stat & (NOPOWER|BROKEN))) if(busy || locked) . += "red" if(locked) diff --git a/code/modules/research/nanites/nanite_program_hub.dm b/code/modules/research/nanites/nanite_program_hub.dm index a097a08532..092296ef9f 100644 --- a/code/modules/research/nanites/nanite_program_hub.dm +++ b/code/modules/research/nanites/nanite_program_hub.dm @@ -28,7 +28,7 @@ /obj/machinery/nanite_program_hub/update_overlays() . = ..() - if((stat & (NOPOWER|MAINT|BROKEN)) || panel_open) + if((machine_stat & (NOPOWER|MAINT|BROKEN)) || panel_open) return . += mutable_appearance(icon, "nanite_program_hub_on") . += emissive_appearance(icon, "nanite_program_hub_on") diff --git a/code/modules/research/nanites/nanite_programmer.dm b/code/modules/research/nanites/nanite_programmer.dm index d858063cb1..60bc586660 100644 --- a/code/modules/research/nanites/nanite_programmer.dm +++ b/code/modules/research/nanites/nanite_programmer.dm @@ -13,7 +13,7 @@ /obj/machinery/nanite_programmer/update_overlays() . = ..() - if((stat & (NOPOWER|MAINT|BROKEN)) || panel_open) + if((machine_stat & (NOPOWER|MAINT|BROKEN)) || panel_open) return . += mutable_appearance(icon, "nanite_programmer_on") . += emissive_appearance(icon, "nanite_programmer_on") diff --git a/code/modules/research/nanites/public_chamber.dm b/code/modules/research/nanites/public_chamber.dm index 9d3f663949..dc86663dee 100644 --- a/code/modules/research/nanites/public_chamber.dm +++ b/code/modules/research/nanites/public_chamber.dm @@ -33,9 +33,9 @@ update_icon() /obj/machinery/public_nanite_chamber/proc/inject_nanites(mob/living/attacker) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) return if(!occupant || busy) return @@ -61,9 +61,9 @@ occupant.AddComponent(/datum/component/nanites, 75, cloud_id) /obj/machinery/public_nanite_chamber/proc/change_cloud(mob/living/attacker) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) return if(!occupant || busy) return @@ -98,10 +98,10 @@ /obj/machinery/public_nanite_chamber/update_overlays() . = ..() - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) . += "maint" - else if(!(stat & (NOPOWER|BROKEN))) + else if(!(machine_stat & (NOPOWER|BROKEN))) if(busy || locked) . += "red" if(locked) diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index cfdab46f57..bca2d3035c 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -27,7 +27,7 @@ return ..() /obj/machinery/rnd/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 @@ -76,10 +76,10 @@ if(busy) to_chat(user, "[src] is busy right now.") return FALSE - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "[src] is broken.") return FALSE - if(stat & NOPOWER) + if(machine_stat & NOPOWER) to_chat(user, "[src] has no power.") return FALSE if(loaded_item) diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 92f3b760f5..ef02598445 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -34,7 +34,7 @@ heat_gen = initial(src.heat_gen) / max(1, tot_rating) /obj/machinery/rnd/server/proc/refresh_working() - if(stat & EMPED) + if(machine_stat & EMPED) working = FALSE else working = TRUE @@ -43,12 +43,12 @@ . = ..() if(. & EMP_PROTECT_SELF) return - stat |= EMPED + machine_stat |= EMPED addtimer(CALLBACK(src, PROC_REF(unemp)), severity*9) refresh_working() /obj/machinery/rnd/server/proc/unemp() - stat &= ~EMPED + machine_stat &= ~EMPED refresh_working() /obj/machinery/rnd/server/proc/mine() @@ -62,7 +62,7 @@ return environment.return_temperature() /obj/machinery/rnd/server/proc/produce_heat(perc) - if(!(stat & (NOPOWER|BROKEN))) //Blatently stolen from space heater. + if(!(machine_stat & (NOPOWER|BROKEN))) //Blatently stolen from space heater. var/turf/L = loc if(istype(L)) var/datum/gas_mixture/env = L.return_air() diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 8f8508c412..88877f611e 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -10,8 +10,8 @@ allowed_area = A.name . = ..() -/mob/camera/aiEye/remote/xenobio/setLoc(var/t) - var/area/new_area = get_area(t) +/mob/camera/aiEye/remote/xenobio/setLoc(turf/destination) + var/area/new_area = get_area(destination) if(new_area && new_area.name == allowed_area || new_area && new_area.xenobiology_compatible) return ..() else @@ -62,6 +62,16 @@ S.forceMove(drop_location()) return ..() +/obj/machinery/computer/camera_advanced/xenobio/examine(mob/user) + . = ..() + if(monkeys) + . += span_notice("There [monkeys == 1 ? "is" : "are"] [monkeys] monkey\s stored.") + var/slime_amount = length(stored_slimes) + if(slime_amount) + . += span_notice("There [slime_amount == 1 ? "is" : "are"] [slime_amount] slime\s stored.") + if(current_potion) + . += span_notice("[current_potion] is currently loaded, press Alt-click to eject.") + /obj/machinery/computer/camera_advanced/xenobio/CreateEye() eyeobj = new /mob/camera/aiEye/remote/xenobio(get_turf(src)) eyeobj.origin = src @@ -114,17 +124,17 @@ actions += new feed_slime_action(src) actions += new monkey_recycle_action(src) if(successfulupgrade) - to_chat(user, "You have successfully upgraded [src] with [O].") + to_chat(user, span_notice("You have successfully upgraded [src] with [O].")) for(var/datum/action/actions_removed as anything in actions) actions_removed.Remove(current_user) GrantActions(current_user) else - to_chat(user, "[src] already has the contents of [O] installed!") + to_chat(user, span_warning("[src] already has the contents of [O] installed!")) return if(istype(O, /obj/item/reagent_containers/food/snacks/cube/monkey) && (upgradetier & XENOBIO_UPGRADE_MONKEYS)) //CIT CHANGE - makes monkey-related actions require XENOBIO_UPGRADE_MONKEYS monkeys++ - to_chat(user, "You feed [O] to [src]. It now has [monkeys] monkey cubes stored.") + to_chat(user, span_notice("You feed [O] to [src]. It now has [monkeys] monkey cubes stored.")) qdel(O) return else if(istype(O, /obj/item/storage/bag) && (upgradetier & XENOBIO_UPGRADE_MONKEYS)) //CIT CHANGE - makes monkey-related actions require XENOBIO_UPGRADE_MONKEYS @@ -136,7 +146,7 @@ monkeys++ qdel(G) if(loaded) - to_chat(user, "You fill [src] with the monkey cubes stored in [O]. [src] now has [monkeys] monkey cubes stored.") + to_chat(user, span_notice("You fill [src] with the monkey cubes stored in [O]. [src] now has [monkeys] monkey cubes stored.")) return else if(istype(O, /obj/item/slimepotion/slime) && (upgradetier & XENOBIO_UPGRADE_SLIMEADV)) // CIT CHANGE - makes giving slimes potions via console require XENOBIO_UPGRADE_SLIMEADV var/replaced = FALSE @@ -146,7 +156,7 @@ current_potion.forceMove(drop_location()) replaced = TRUE current_potion = O - to_chat(user, "You load [O] in the console's potion slot[replaced ? ", replacing the one that was there before" : ""].") + to_chat(user, span_notice("You load [O] in the console's potion slot[replaced ? ", replacing the one that was there before" : ""].")) return ..() @@ -156,10 +166,9 @@ button_icon_state = "slime_down" /datum/action/innate/slime_place/Activate() - if(!target || !isliving(owner)) + if(QDELETED(owner) || !isliving(owner)) return - var/mob/living/C = owner - var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control + var/mob/camera/aiEye/remote/xenobio/remote_eye = owner.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = target if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) @@ -168,7 +177,7 @@ S.visible_message("[S] warps in!") X.stored_slimes -= S else - to_chat(owner, "Target is not near a camera. Cannot proceed.") + to_chat(owner, span_warning("Target is not near a camera. Cannot proceed.")) /datum/action/innate/slime_pick_up name = "Pick up Slime" @@ -176,10 +185,9 @@ button_icon_state = "slime_up" /datum/action/innate/slime_pick_up/Activate() - if(!target || !isliving(owner)) + if(QDELETED(owner) || !isliving(owner)) return - var/mob/living/C = owner - var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control + var/mob/camera/aiEye/remote/xenobio/remote_eye = owner.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = target if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) @@ -193,7 +201,7 @@ S.forceMove(X) X.stored_slimes += S else - to_chat(owner, "Target is not near a camera. Cannot proceed.") + to_chat(owner, span_warning("Target is not near a camera. Cannot proceed.")) /datum/action/innate/feed_slime @@ -202,23 +210,22 @@ button_icon_state = "monkey_down" /datum/action/innate/feed_slime/Activate() - if(!target || !isliving(owner)) + if(QDELETED(owner) || !isliving(owner)) return - var/mob/living/C = owner - var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control + var/mob/camera/aiEye/remote/xenobio/remote_eye = owner.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = target if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) if(X.monkeys >= 1) var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(remote_eye.loc, TRUE, owner) if (!QDELETED(food)) - food.LAssailant = WEAKREF(C) - X.monkeys -- - to_chat(owner, "[X] now has [X.monkeys] monkey(s) left.") + food.LAssailant = WEAKREF(owner) + X.monkeys-- + to_chat(owner, span_notice("[X] now has [X.monkeys] monkey(s) left.")) else - to_chat(owner, "[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.") + to_chat(owner, span_warning("[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.")) else - to_chat(owner, "Target is not near a camera. Cannot proceed.") + to_chat(owner, span_warning("Target is not near a camera. Cannot proceed.")) /datum/action/innate/monkey_recycle @@ -227,10 +234,9 @@ button_icon_state = "monkey_up" /datum/action/innate/monkey_recycle/Activate() - if(!target || !isliving(owner)) + if(QDELETED(owner) || !isliving(owner)) return - var/mob/living/C = owner - var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control + var/mob/camera/aiEye/remote/xenobio/remote_eye = owner.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = target if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) @@ -240,7 +246,7 @@ X.monkeys = round(X.monkeys + 0.2,0.1) qdel(M) else - to_chat(owner, "Target is not near a camera. Cannot proceed.") + to_chat(owner, span_warning("Target is not near a camera. Cannot proceed.")) /datum/action/innate/slime_scan name = "Scan Slime" @@ -248,16 +254,15 @@ button_icon_state = "slime_scan" /datum/action/innate/slime_scan/Activate() - if(!target || !isliving(owner)) + if(QDELETED(owner) || !isliving(owner)) return - var/mob/living/C = owner - var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control + var/mob/camera/aiEye/remote/xenobio/remote_eye = owner.remote_control if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) for(var/mob/living/simple_animal/slime/S in remote_eye.loc) - slime_scan(S, C) + slime_scan(S, owner) else - to_chat(owner, "Target is not near a camera. Cannot proceed.") + to_chat(owner, span_warning("Target is not near a camera. Cannot proceed.")) /datum/action/innate/feed_potion name = "Apply Potion" @@ -265,23 +270,22 @@ button_icon_state = "slime_potion" /datum/action/innate/feed_potion/Activate() - if(!target || !isliving(owner)) + if(QDELETED(owner) || !isliving(owner)) return - var/mob/living/C = owner - var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control + var/mob/camera/aiEye/remote/xenobio/remote_eye = owner.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = target if(QDELETED(X.current_potion)) - to_chat(owner, "No potion loaded.") + to_chat(owner, span_notice("No potion loaded.")) return if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) for(var/mob/living/simple_animal/slime/S in remote_eye.loc) - X.current_potion.attack(S, C) + X.current_potion.attack(S, owner) break else - to_chat(owner, "Target is not near a camera. Cannot proceed.") + to_chat(owner, span_warning("Target is not near a camera. Cannot proceed.")) //Demodularized Code @@ -323,11 +327,14 @@ /datum/action/innate/hotkey_help/Activate() if(!target || !isliving(owner)) return - to_chat(owner, "Click shortcuts:") - to_chat(owner, "Shift-click a slime to pick it up, or the floor to drop all held slimes. (Requires Basic Slime Console upgrade)") - to_chat(owner, "Ctrl-click a slime to scan it.") - to_chat(owner, "Alt-click a slime to feed it a potion. (Requires Advanced Slime Console upgrade)") - to_chat(owner, "Ctrl-click on a dead monkey to recycle it, or the floor to place a new monkey. (Requires Monkey Console upgrade)") + var/static/list/help = list( + "Click shortcuts:", + "Shift-click a slime to pick it up, or the floor to drop all held slimes. (Requires Basic Slime Console upgrade)", + "Ctrl-click a slime to scan it.", + "Alt-click a slime to feed it a potion. (Requires Advanced Slime Console upgrade)", + "Ctrl-click on a dead monkey to recycle it, or the floor to place a new monkey. (Requires Monkey Console upgrade)", + ) + to_chat(owner, "
[help.Join("\n")]
") // // Alternate clicks for slime, monkey and open turf if using a xenobio console @@ -365,67 +372,67 @@ // Scans slime /obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickCtrl(mob/living/user, mob/living/simple_animal/slime/S) if(!GLOB.cameranet.checkTurfVis(S.loc)) - to_chat(user, "Target is not near a camera. Cannot proceed.") + to_chat(user, span_warning("Target is not near a camera. Cannot proceed.")) return - var/mob/living/C = user - var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/mob/camera/aiEye/remote/xenobio/E = user.remote_control var/area/mobarea = get_area(S.loc) if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible) - slime_scan(S, C) + slime_scan(S, user) //Feeds a potion to slime /obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickAlt(mob/living/user, mob/living/simple_animal/slime/S) if(!(upgradetier & XENOBIO_UPGRADE_SLIMEADV)) //CIT CHANGE - makes slime-related actions require XENOBIO_UPGRADE_SLIMEADV - to_chat(user, "This console does not have the advanced slime upgrade.") + to_chat(user, span_warning("This console does not have the advanced slime upgrade.")) return if(!GLOB.cameranet.checkTurfVis(S.loc)) - to_chat(user, "Target is not near a camera. Cannot proceed.") + to_chat(user, span_warning("Target is not near a camera. Cannot proceed.")) return - var/mob/living/C = user - var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/turf/slime_location = S.loc + var/mob/camera/aiEye/remote/xenobio/E = user.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin - var/area/mobarea = get_area(S.loc) + var/area/mobarea = get_area(slime_location) if(QDELETED(X.current_potion)) - to_chat(C, "No potion loaded.") + to_chat(user, span_warning("No potion loaded.")) return if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible) - X.current_potion.attack(S, C) + slime_location.balloon_alert(user, "applying [current_potion]") + X.current_potion.attack(S, user) //Picks up slime /obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickShift(mob/living/user, mob/living/simple_animal/slime/S) if(!(upgradetier & XENOBIO_UPGRADE_SLIMEBASIC)) //CIT CHANGE - makes slime-related actions require XENOBIO_UPGRADE_SLIMEBASIC - to_chat(user, "This console does not have the basic slime upgrade.") + to_chat(user, span_warning("This console does not have the basic slime upgrade.")) return if(!GLOB.cameranet.checkTurfVis(S.loc)) - to_chat(user, "Target is not near a camera. Cannot proceed.") + to_chat(user, span_warning("Target is not near a camera. Cannot proceed.")) return - var/mob/living/C = user - var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/turf/slime_location = S.loc + var/mob/camera/aiEye/remote/xenobio/E = user.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin - var/area/mobarea = get_area(S.loc) + var/area/mobarea = get_area(slime_location) if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible) if(X.stored_slimes.len >= X.max_slimes) - to_chat(C, "Slime storage is full.") + to_chat(user, span_warning("Slime storage is full.")) return if(S.ckey) - to_chat(C, "The slime wiggled free!") + to_chat(user, span_warning("The slime wiggled free!")) return if(S.buckled) S.Feedstop(silent = TRUE) S.visible_message("[S] vanishes in a flash of light!") S.forceMove(X) X.stored_slimes += S + slime_location.balloon_alert(user, "[length(X.stored_slimes)]/[max_slimes] in storage") //Place slimes /obj/machinery/computer/camera_advanced/xenobio/proc/XenoTurfClickShift(mob/living/user, turf/open/T) if(!(upgradetier & XENOBIO_UPGRADE_SLIMEBASIC)) //CIT CHANGE - makes slime-related actions require XENOBIO_UPGRADE_SLIMEBASIC - to_chat(user, "This console does not have the basic slime upgrade.") + to_chat(user, span_warning("This console does not have the basic slime upgrade.")) return if(!GLOB.cameranet.checkTurfVis(T)) - to_chat(user, "Target is not near a camera. Cannot proceed.") + to_chat(user, span_warning("Target is not near a camera. Cannot proceed.")) return - var/mob/living/C = user - var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/mob/camera/aiEye/remote/xenobio/E = user.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin var/area/turfarea = get_area(T) if(turfarea.name == E.allowed_area || turfarea.xenobiology_compatible) @@ -437,38 +444,39 @@ //Place monkey /obj/machinery/computer/camera_advanced/xenobio/proc/XenoTurfClickCtrl(mob/living/user, turf/open/T) if(!(upgradetier & XENOBIO_UPGRADE_MONKEYS)) // CIT CHANGE - makes monkey-related actions require XENOBIO_UPGRADE_MONKEYS - to_chat(user, "This console does not have the monkey upgrade.") + to_chat(user, span_warning("This console does not have the monkey upgrade.")) return if(!GLOB.cameranet.checkTurfVis(T)) - to_chat(user, "Target is not near a camera. Cannot proceed.") + to_chat(user, span_warning("Target is not near a camera. Cannot proceed.")) return - var/mob/living/C = user - var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/mob/camera/aiEye/remote/xenobio/E = user.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin var/area/turfarea = get_area(T) if(turfarea.name == E.allowed_area || turfarea.xenobiology_compatible) if(X.monkeys >= 1) - var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(T, TRUE, C) + var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(T, TRUE, user) if (!QDELETED(food)) - food.LAssailant = WEAKREF(C) + food.LAssailant = WEAKREF(user) X.monkeys-- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors - to_chat(C, "[X] now has [X.monkeys] monkey(s) stored.") + to_chat(user, span_notice("[X] now has [X.monkeys] monkey(s) stored.")) + T.balloon_alert(user, "[X.monkeys] left") else - to_chat(C, "[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.") + to_chat(user, span_warning("[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.")) + T.balloon_alert(user, "no monkeys available") //Pick up monkey /obj/machinery/computer/camera_advanced/xenobio/proc/XenoMonkeyClickCtrl(mob/living/user, mob/living/carbon/monkey/M) if(!(upgradetier & XENOBIO_UPGRADE_MONKEYS)) // CIT CHANGE - makes monkey-related actions require XENOBIO_UPGRADE_MONKEYS - to_chat(user, "This console does not have the monkey upgrade.") + to_chat(user, span_warning("This console does not have the monkey upgrade.")) return if(!isturf(M.loc) || !GLOB.cameranet.checkTurfVis(M.loc)) - to_chat(user, "Target is not near a camera. Cannot proceed.") + to_chat(user, span_warning("Target is not near a camera. Cannot proceed.")) return - var/mob/living/C = user - var/mob/camera/aiEye/remote/xenobio/E = C.remote_control + var/turf/monkey_location = M.loc + var/mob/camera/aiEye/remote/xenobio/E = user.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin - var/area/mobarea = get_area(M.loc) + var/area/mobarea = get_area(monkey_location) if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible) if(!M.stat) return @@ -476,4 +484,13 @@ X.monkeys = round(X.monkeys + 0.2,0.1) qdel(M) if (X.monkeys == (round(X.monkeys,1))) - to_chat(C, "[X] now has [X.monkeys] monkey(s) available.") + to_chat(user, span_notice("[X] now has [X.monkeys] monkey(s) available.")) + monkey_location.balloon_alert(user, "[X.monkeys] available") + +/obj/machinery/computer/camera_advanced/xenobio/AltClick(mob/user) + . = ..() + if(!QDELETED(current_potion) && user.canUseTopic(src, BE_CLOSE, no_tk = NO_TK)) + to_chat(user, span_notice("You eject [current_potion] from [src].")) + if(!user.put_in_hands(current_potion)) + current_potion.forceMove(drop_location()) + current_potion = null \ No newline at end of file diff --git a/code/modules/ruins/spaceruin_code/caravanambush.dm b/code/modules/ruins/spaceruin_code/caravanambush.dm index b347c66dbe..e3ab8cc7c9 100644 --- a/code/modules/ruins/spaceruin_code/caravanambush.dm +++ b/code/modules/ruins/spaceruin_code/caravanambush.dm @@ -67,7 +67,7 @@ shuttleId = "caravantrade1" lock_override = NONE shuttlePortId = "caravantrade1_custom" - jumpto_ports = list("whiteship_away" = 1, "whiteship_home" = 1, "whiteship_z4" = 1, "caravantrade1_ambush" = 1) + jump_to_ports = list("whiteship_away" = 1, "whiteship_home" = 1, "whiteship_z4" = 1, "caravantrade1_ambush" = 1) view_range = 6.5 x_offset = -5 y_offset = -5 @@ -91,7 +91,7 @@ shuttleId = "caravanpirate" lock_override = NONE shuttlePortId = "caravanpirate_custom" - jumpto_ports = list("caravanpirate_ambush" = 1) + jump_to_ports = list("caravanpirate_ambush" = 1) view_range = 6.5 x_offset = 3 y_offset = -6 @@ -115,7 +115,7 @@ shuttleId = "caravansyndicate1" lock_override = NONE shuttlePortId = "caravansyndicate1_custom" - jumpto_ports = list("caravansyndicate1_ambush" = 1, "caravansyndicate1_listeningpost" = 1) + jump_to_ports = list("caravansyndicate1_ambush" = 1, "caravansyndicate1_listeningpost" = 1) view_range = 0 x_offset = 2 y_offset = 0 @@ -139,7 +139,7 @@ shuttleId = "caravansyndicate2" lock_override = NONE shuttlePortId = "caravansyndicate2_custom" - jumpto_ports = list("caravansyndicate2_ambush" = 1, "caravansyndicate1_listeningpost" = 1) + jump_to_ports = list("caravansyndicate2_ambush" = 1, "caravansyndicate1_listeningpost" = 1) view_range = 0 x_offset = 0 y_offset = 2 @@ -163,7 +163,7 @@ shuttleId = "caravansyndicate3" lock_override = NONE shuttlePortId = "caravansyndicate3_custom" - jumpto_ports = list("caravansyndicate3_ambush" = 1, "caravansyndicate3_listeningpost" = 1) + jump_to_ports = list("caravansyndicate3_ambush" = 1, "caravansyndicate3_listeningpost" = 1) view_range = 2.5 x_offset = -1 y_offset = -3 diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index bd8fe83338..09e490362e 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -1,6 +1,6 @@ /obj/docking_port/mobile/arrivals name = "arrivals shuttle" - id = "arrivals" + shuttle_id = "arrivals" dwidth = 3 width = 7 diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm index 1258b9f4b8..9357fa9811 100644 --- a/code/modules/shuttle/assault_pod.dm +++ b/code/modules/shuttle/assault_pod.dm @@ -1,6 +1,6 @@ /obj/docking_port/mobile/assault_pod name = "assault pod" - id = "steel_rain" + shuttle_id = "steel_rain" dwidth = 3 width = 7 height = 7 @@ -46,7 +46,7 @@ if(!T) return var/obj/docking_port/stationary/landing_zone = new /obj/docking_port/stationary(T) - landing_zone.id = "assault_pod([REF(src)])" + landing_zone.shuttle_id = "assault_pod([REF(src)])" landing_zone.name = "Landing Zone" landing_zone.dwidth = dwidth landing_zone.dheight = dheight @@ -56,7 +56,7 @@ for(var/obj/machinery/computer/shuttle/S in GLOB.machines) if(S.shuttleId == shuttle_id) - S.possible_destinations = "[landing_zone.id]" + S.possible_destinations = "[landing_zone.shuttle_id]" to_chat(user, "Landing zone set.") diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index 4b7e65c0f3..e0c9d69ace 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -42,12 +42,12 @@ else data["status"] = M.mode == SHUTTLE_IGNITING ? "Igniting" : M.mode != SHUTTLE_IDLE ? "In Transit" : "Idle" for(var/obj/docking_port/stationary/S in SSshuttle.stationary) - if(!options.Find(S.id)) + if(!options.Find(S.shuttle_id)) continue if(!M.check_dock(S, silent = TRUE)) continue var/list/location_data = list( - id = S.id, + id = S.shuttle_id, name = S.name ) data["locations"] += list(location_data) @@ -120,4 +120,4 @@ /obj/machinery/computer/shuttle/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE) if(port && (shuttleId == initial(shuttleId) || override)) - shuttleId = port.id + shuttleId = port.shuttle_id diff --git a/code/modules/shuttle/custom_shuttle.dm b/code/modules/shuttle/custom_shuttle.dm index e8e5fe8d4d..f8b39cf6eb 100644 --- a/code/modules/shuttle/custom_shuttle.dm +++ b/code/modules/shuttle/custom_shuttle.dm @@ -58,12 +58,12 @@ data["calculated_cooldown"] = calculated_cooldown data["locations"] = list() for(var/obj/docking_port/stationary/S in SSshuttle.stationary) - if(!options.Find(S.id)) + if(!options.Find(S.shuttle_id)) continue if(!M.check_dock(S, silent = TRUE)) continue var/list/location_data = list( - id = S.id, + id = S.shuttle_id, name = S.name, dist = round(calculateDistance(S)) ) @@ -217,7 +217,7 @@ /obj/machinery/computer/custom_shuttle/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE) if(port && (shuttleId == initial(shuttleId) || override)) - linkShuttle(port.id) + linkShuttle(port.shuttle_id) //Custom shuttle docker locations /obj/machinery/computer/camera_advanced/shuttle_docker/custom @@ -230,7 +230,7 @@ /turf/open/floor/plating/ashplanet, /turf/open/floor/plating/asteroid, /turf/open/floor/plating/lavaland_baseturf) - jumpto_ports = list("whiteship_home" = 1) + jump_to_ports = list("whiteship_home" = 1) view_range = 12 designate_time = 100 circuit = /obj/item/circuitboard/computer/shuttle/docker diff --git a/code/modules/shuttle/elevator.dm b/code/modules/shuttle/elevator.dm index de5d88ee17..73d16d1170 100644 --- a/code/modules/shuttle/elevator.dm +++ b/code/modules/shuttle/elevator.dm @@ -1,6 +1,6 @@ /obj/docking_port/mobile/elevator name = "elevator" - id = "elevator" + shuttle_id = "elevator" dwidth = 3 width = 7 height = 7 diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index d51007ab3d..e5f35eec68 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -284,7 +284,7 @@ /obj/docking_port/mobile/emergency name = "emergency shuttle" - id = "emergency" + shuttle_id = "emergency" dwidth = 9 width = 22 @@ -507,7 +507,7 @@ /obj/docking_port/mobile/pod name = "escape pod" - id = "pod" + shuttle_id = "pod" dwidth = 1 width = 3 height = 4 @@ -576,7 +576,7 @@ /obj/docking_port/stationary/random name = "escape pod" - id = "pod" + shuttle_id = "pod" dwidth = 1 width = 3 height = 4 @@ -601,7 +601,7 @@ return // Fallback: couldn't find anything - WARNING("docking port '[id]' could not be randomly placed in [target_area]: of [original_len] turfs, none were suitable") + WARNING("docking port '[shuttle_id]' could not be randomly placed in [target_area]: of [original_len] turfs, none were suitable") return INITIALIZE_HINT_QDEL /obj/docking_port/stationary/random/icemoon @@ -650,7 +650,7 @@ /obj/docking_port/mobile/emergency/backup name = "backup shuttle" - id = "backup" + shuttle_id = "backup" dwidth = 2 width = 8 height = 8 diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm index d455fd80d5..0cb38a43d5 100644 --- a/code/modules/shuttle/navigation_computer.dm +++ b/code/modules/shuttle/navigation_computer.dm @@ -3,19 +3,22 @@ desc = "Used to designate a precise transit location for a spacecraft." jump_action = null should_supress_view_changes = FALSE - var/datum/action/innate/shuttledocker_rotate/rotate_action = new - var/datum/action/innate/shuttledocker_place/place_action = new + var/shuttleId = "" var/shuttlePortId = "" var/shuttlePortName = "custom location" - var/list/jumpto_ports = list() //hashset of ports to jump to and ignore for collision purposes - var/obj/docking_port/stationary/my_port //the custom docking port placed by this console - var/obj/docking_port/mobile/shuttle_port //the mobile docking port of the connected shuttle + /// Hashset of ports to jump to and ignore for collision purposes + var/list/jump_to_ports = list() + /// The custom docking port placed by this console + var/obj/docking_port/stationary/my_port + /// The mobile docking port of the connected shuttle + var/obj/docking_port/mobile/shuttle_port + // Traits forbided for custom docking var/list/locked_traits = list(ZTRAIT_RESERVED, ZTRAIT_CENTCOM, ZTRAIT_AWAY, ZTRAIT_REEBE) //traits forbided for custom docking var/view_range = 0 var/x_offset = 0 var/y_offset = 0 - var/list/whitelist_turfs = list(/turf/open/space, /turf/open/floor/plating, /turf/open/lava) + var/list/whitelist_turfs = list(/turf/open/space, /turf/open/floor/plating, /turf/open/lava, /turf/open/openspace) var/space_turfs_only = TRUE var/see_hidden = FALSE var/designate_time = 0 @@ -24,37 +27,52 @@ /obj/machinery/computer/camera_advanced/shuttle_docker/Initialize(mapload) . = ..() + actions += new /datum/action/innate/shuttledocker_rotate(src) + actions += new /datum/action/innate/shuttledocker_place(src) + GLOB.navigation_computers += src whitelist_turfs = typecacheof(whitelist_turfs) /obj/machinery/computer/camera_advanced/shuttle_docker/Destroy() . = ..() + if(my_port?.get_docked()) + my_port.delete_after = TRUE + my_port.shuttle_id = null + my_port.name = "Old [my_port.name]" + my_port = null + else + QDEL_NULL(my_port) + GLOB.navigation_computers -= src +/// "Initializes" any default port ids we have, done so add_jumpable_port can be a proper setter +/obj/machinery/computer/camera_advanced/shuttle_docker/proc/set_init_ports() + var/list/init_ports = jump_to_ports.Copy() + jump_to_ports = list() //Reset it so we don't get dupes + for(var/port_id in init_ports) + add_jumpable_port(port_id) + +/obj/machinery/computer/camera_advanced/shuttle_docker/proc/add_jumpable_port(port_id) + if(!length(jump_to_ports)) + actions += new /datum/action/innate/camera_jump/shuttle_docker(src) + jump_to_ports[port_id] = TRUE + +/obj/machinery/computer/camera_advanced/shuttle_docker/proc/remove_jumpable_port(port_id) + jump_to_ports -= port_id + if(!length(jump_to_ports)) + var/datum/action/to_remove = locate(/datum/action/innate/camera_jump/shuttle_docker) in actions + actions -= to_remove + qdel(to_remove) + /obj/machinery/computer/camera_advanced/shuttle_docker/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) if(jammed) - to_chat(user, "The Syndicate is jamming the console!") + to_chat(user, span_warning("The Syndicate is jamming the console!")) return if(!shuttle_port && !SSshuttle.getShuttle(shuttleId)) - to_chat(user,"Warning: Shuttle connection severed!") + to_chat(user, span_warning("Warning: Shuttle connection severed!")) return return ..() -/obj/machinery/computer/camera_advanced/shuttle_docker/GrantActions(mob/living/user) - if(jumpto_ports.len) - jump_action = new /datum/action/innate/camera_jump/shuttle_docker - ..() - - if(rotate_action) - rotate_action.target = user - rotate_action.Grant(user) - actions += rotate_action - - if(place_action) - place_action.target = user - place_action.Grant(user) - actions += place_action - /obj/machinery/computer/camera_advanced/shuttle_docker/CreateEye() shuttle_port = SSshuttle.getShuttle(shuttleId) if(QDELETED(shuttle_port)) @@ -65,14 +83,13 @@ var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj the_eye.setDir(shuttle_port.dir) var/turf/origin = locate(shuttle_port.x + x_offset, shuttle_port.y + y_offset, shuttle_port.z) - for(var/V in shuttle_port.shuttle_areas) - var/area/A = V - for(var/turf/T in A) - if(T.z != origin.z) + for(var/area/shuttle_area as anything in shuttle_port.shuttle_areas) + for(var/turf/shuttle_turf as anything in shuttle_area) + if(shuttle_turf.z != origin.z) continue var/image/I = image('icons/effects/alphacolors.dmi', origin, "red") - var/x_off = T.x - origin.x - var/y_off = T.y - origin.y + var/x_off = shuttle_turf.x - origin.x + var/y_off = shuttle_turf.y - origin.y I.loc = locate(origin.x + x_off, origin.y + y_off, origin.z) //we have to set this after creating the image because it might be null, and images created in nullspace are immutable. I.layer = ABOVE_NORMAL_TURF_LAYER I.plane = 0 @@ -112,45 +129,55 @@ var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj var/landing_clear = checkLandingSpot() if(designate_time && (landing_clear != SHUTTLE_DOCKER_BLOCKED)) - to_chat(current_user, "Targeting transit location, please wait [DisplayTimeText(designate_time)]...") + to_chat(current_user, span_warning("Targeting transit location, please wait [DisplayTimeText(designate_time)]...")) designating_target_loc = the_eye.loc var/wait_completed = do_after(current_user, designate_time, designating_target_loc, timed_action_flags = IGNORE_HELD_ITEM, extra_checks = CALLBACK(src, TYPE_PROC_REF(/obj/machinery/computer/camera_advanced/shuttle_docker, canDesignateTarget))) designating_target_loc = null if(!current_user) return if(!wait_completed) - to_chat(current_user, "Operation aborted.") + to_chat(current_user, span_warning("Operation aborted.")) return landing_clear = checkLandingSpot() if(landing_clear != SHUTTLE_DOCKER_LANDING_CLEAR) switch(landing_clear) if(SHUTTLE_DOCKER_BLOCKED) - to_chat(current_user, "Invalid transit location") + to_chat(current_user, span_warning("Invalid transit location.")) if(SHUTTLE_DOCKER_BLOCKED_BY_HIDDEN_PORT) - to_chat(current_user, "Unknown object detected in landing zone. Please designate another location.") + to_chat(current_user, span_warning("Unknown object detected in landing zone. Please designate another location.")) return + ///Make one use port that deleted after fly off, to don't lose info that need on to properly fly off. + if(my_port?.get_docked()) + my_port.unregister() + my_port.delete_after = TRUE + my_port.shuttle_id = null + my_port.name = "Old [my_port.name]" + my_port = null + if(!my_port) my_port = new() + my_port.unregister() my_port.name = shuttlePortName - my_port.id = shuttlePortId + my_port.shuttle_id = shuttlePortId my_port.height = shuttle_port.height my_port.width = shuttle_port.width my_port.dheight = shuttle_port.dheight my_port.dwidth = shuttle_port.dwidth my_port.hidden = shuttle_port.hidden + my_port.register(TRUE) my_port.setDir(the_eye.dir) my_port.forceMove(locate(eyeobj.x - x_offset, eyeobj.y - y_offset, eyeobj.z)) + if(current_user.client) current_user.client.images -= the_eye.placed_images - QDEL_LIST(the_eye.placed_images) + LAZYCLEARLIST(the_eye.placed_images) - for(var/V in the_eye.placement_images) - var/image/I = V + for(var/image/place_spots as anything in the_eye.placement_images) var/image/newI = image('icons/effects/alphacolors.dmi', the_eye.loc, "blue") - newI.loc = I.loc //It is highly unlikely that any landing spot including a null tile will get this far, but better safe than sorry. + newI.loc = place_spots.loc //It is highly unlikely that any landing spot including a null tile will get this far, but better safe than sorry. newI.layer = ABOVE_OPEN_TURF_LAYER newI.plane = 0 newI.mouse_opacity = 0 @@ -158,11 +185,11 @@ if(current_user.client) current_user.client.images += the_eye.placed_images - to_chat(current_user, "Transit location designated") - return + to_chat(current_user, span_notice("Transit location designated.")) + return TRUE /obj/machinery/computer/camera_advanced/shuttle_docker/proc/canDesignateTarget() - if(!designating_target_loc || !current_user || (eyeobj.loc != designating_target_loc) || (stat & (NOPOWER|BROKEN)) ) + if(!designating_target_loc || !current_user || (eyeobj.loc != designating_target_loc) || (machine_stat & (NOPOWER|BROKEN)) ) return FALSE return TRUE @@ -230,11 +257,6 @@ if(!is_type_in_typecache(turf_type, whitelist_turfs)) return SHUTTLE_DOCKER_BLOCKED - if(length(whitelist_turfs)) - var/turf_type = hidden_turf_info ? hidden_turf_info[2] : T.type - if(!is_type_in_typecache(turf_type, whitelist_turfs)) - return SHUTTLE_DOCKER_BLOCKED - // Checking for overlapping dock boundaries for(var/i in 1 to overlappers.len) var/obj/docking_port/port = overlappers[i] @@ -251,29 +273,30 @@ return SHUTTLE_DOCKER_BLOCKED /obj/machinery/computer/camera_advanced/shuttle_docker/proc/update_hidden_docking_ports(list/remove_images, list/add_images) - if(!see_hidden && current_user && current_user.client) + if(!see_hidden && current_user?.client) current_user.client.images -= remove_images current_user.client.images += add_images /obj/machinery/computer/camera_advanced/shuttle_docker/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE) if(port && (shuttleId == initial(shuttleId) || override)) - shuttleId = port.id - shuttlePortId = "[port.id]_custom" + shuttleId = port.shuttle_id + shuttlePortId = "[port.shuttle_id]_custom" if(dock) - jumpto_ports += dock.id + add_jumpable_port(dock.shuttle_id) + return TRUE /mob/camera/aiEye/remote/shuttle_docker visible_icon = FALSE - use_static = USE_STATIC_NONE - var/list/placement_images = list() - var/list/placed_images = list() + use_static = FALSE + var/list/image/placement_images = list() + var/list/image/placed_images = list() /mob/camera/aiEye/remote/shuttle_docker/Initialize(mapload, obj/machinery/computer/camera_advanced/origin) src.origin = origin return ..() -/mob/camera/aiEye/remote/shuttle_docker/setLoc(T) - ..() +/mob/camera/aiEye/remote/shuttle_docker/setLoc(turf/destination, force_update = FALSE) + . = ..() var/obj/machinery/computer/camera_advanced/shuttle_docker/console = origin console.checkLandingSpot() @@ -289,10 +312,9 @@ button_icon_state = "mech_cycle_equip_off" /datum/action/innate/shuttledocker_rotate/Activate() - if(QDELETED(target) || !isliving(target)) + if(QDELETED(owner) || !isliving(owner)) return - var/mob/living/C = target - var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/mob/camera/aiEye/remote/remote_eye = owner.remote_control var/obj/machinery/computer/camera_advanced/shuttle_docker/origin = remote_eye.origin origin.rotateLandingSpot() @@ -302,25 +324,23 @@ button_icon_state = "mech_zoom_off" /datum/action/innate/shuttledocker_place/Activate() - if(QDELETED(target) || !isliving(target)) + if(QDELETED(owner) || !isliving(owner)) return - var/mob/living/C = target - var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/mob/camera/aiEye/remote/remote_eye = owner.remote_control var/obj/machinery/computer/camera_advanced/shuttle_docker/origin = remote_eye.origin - origin.placeLandingSpot(target) + origin.placeLandingSpot(owner) /datum/action/innate/camera_jump/shuttle_docker name = "Jump to Location" button_icon_state = "camera_jump" /datum/action/innate/camera_jump/shuttle_docker/Activate() - if(QDELETED(target) || !isliving(target)) + if(QDELETED(owner) || !isliving(owner)) return - var/mob/living/C = target - var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/mob/camera/aiEye/remote/remote_eye = owner.remote_control var/obj/machinery/computer/camera_advanced/shuttle_docker/console = remote_eye.origin - playsound(console, 'sound/machines/terminal_prompt_deny.ogg', 25, 0) + playsound(console, 'sound/machines/terminal_prompt_deny.ogg', 25, FALSE) var/list/L = list() for(var/V in SSshuttle.stationary) @@ -330,7 +350,7 @@ var/obj/docking_port/stationary/S = V if(console.z_lock.len && !(S.z in console.z_lock)) continue - if(console.jumpto_ports[S.id]) + if(console.jump_to_ports[S.shuttle_id]) L["([L.len])[S.name]"] = S for(var/V in SSshuttle.beacons) @@ -345,18 +365,19 @@ else L["([L.len]) [nav_beacon.name] locked"] = null - playsound(console, 'sound/machines/terminal_prompt.ogg', 25, 0) - var/selected = input("Choose location to jump to", "Locations", null) as null|anything in L - if(QDELETED(src) || QDELETED(target) || !isliving(target)) + playsound(console, 'sound/machines/terminal_prompt.ogg', 25, FALSE) + var/selected = tgui_input_list(usr, "Choose location to jump to", "Locations", sort_list(L)) + if(isnull(selected)) + playsound(console, 'sound/machines/terminal_prompt_deny.ogg', 25, FALSE) return - playsound(src, "terminal_type", 25, 0) - if(selected) - var/turf/T = get_turf(L[selected]) - if(T) - playsound(console, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0) - remote_eye.setLoc(T) - to_chat(target, "Jumped to [selected]") - C.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/tiled/flash/static) - C.clear_fullscreen("flash", 3) - else - playsound(console, 'sound/machines/terminal_prompt_deny.ogg', 25, 0) + if(QDELETED(src) || QDELETED(owner) || !isliving(owner)) + return + playsound(src, "terminal_type", 25, FALSE) + var/turf/T = get_turf(L[selected]) + if(isnull(T)) + return + playsound(console, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE) + remote_eye.setLoc(T) + to_chat(owner, span_notice("Jumped to [selected].")) + owner.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/tiled/flash/static) + owner.clear_fullscreen("flash", 3) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 1a5d67edea..032687bd25 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -388,7 +388,7 @@ All ShuttleMove procs go here . = ..() /obj/docking_port/stationary/public_mining_dock/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock) - id = "mining_public" //It will not move with the base, but will become enabled as a docking point. + shuttle_id = "mining_public" //It will not move with the base, but will become enabled as a docking point. /obj/effect/abstract/proximity_checker/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock) //timer so it only happens once diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 73dcd4c6e9..e97136559b 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -15,7 +15,7 @@ /// This will be used in numerous other places like the console, /// stationary ports and whatnot to tell them your ship's mobile /// port can be used in these places, or the docking port is compatible, etc. - var/id + var/shuttle_id /// Possible destinations var/port_destinations ///Common standard is for this to point -away- from the dockingport door, ie towards the ship @@ -171,7 +171,7 @@ /obj/docking_port/proc/getDockedId() var/obj/docking_port/P = get_docked() if(P) - return P.id + return P.shuttle_id // Say that A in the absolute (rectangular) bounds of this shuttle or no. /obj/docking_port/proc/is_in_shuttle_bounds(atom/A) @@ -199,28 +199,28 @@ /obj/docking_port/stationary/register(replace = FALSE) . = ..() - if(!id) - id = "dock" + if(!shuttle_id) + shuttle_id = "dock" else - port_destinations = id + port_destinations = shuttle_id if(!name) name = "dock" // how? // It registers the initial shuttle (no changes) // and if another one comes in with the same name (id) it adds the count on it - var/counter = SSshuttle.assoc_stationary[id] + var/counter = SSshuttle.assoc_stationary[shuttle_id] if(!replace || !counter) if(counter) counter++ - SSshuttle.assoc_stationary[id] = counter - id = "[id]_[counter]" + SSshuttle.assoc_stationary[shuttle_id] = counter + shuttle_id = "[shuttle_id]_[counter]" name = "[name] [counter]" else - SSshuttle.assoc_stationary[id] = 1 + SSshuttle.assoc_stationary[shuttle_id] = 1 if(!port_destinations) - port_destinations = id + port_destinations = shuttle_id SSshuttle.stationary += src @@ -301,7 +301,7 @@ /obj/docking_port/stationary/picked/whiteship name = "Deep Space" - id = "whiteship_away" + shuttle_id = "whiteship_away" dheight = 0 dir = 2 dwidth = 11 @@ -316,14 +316,14 @@ /obj/docking_port/stationary/picked/Initialize(mapload) . = ..() if(!LAZYLEN(shuttlekeys)) - WARNING("Random docking port [id] loaded with no shuttle keys") + WARNING("Random docking port [shuttle_id] loaded with no shuttle keys") return var/selectedid = pick(shuttlekeys) roundstart_template = SSmapping.shuttle_templates[selectedid] /obj/docking_port/stationary/picked/whiteship name = "Deep Space" - id = "whiteship_away" + shuttle_id = "whiteship_away" dheight = 0 dir = 2 dwidth = 11 @@ -382,23 +382,23 @@ /obj/docking_port/mobile/register(replace = FALSE) . = ..() - if(!id) - id = "shuttle" + if(!shuttle_id) + shuttle_id = "shuttle" if(!name) name = "shuttle" - var/counter = SSshuttle.assoc_mobile[id] + var/counter = SSshuttle.assoc_mobile[shuttle_id] if(!replace || !counter) if(counter) counter++ - SSshuttle.assoc_mobile[id] = counter - id = "[id]_[counter]" + SSshuttle.assoc_mobile[shuttle_id] = counter + shuttle_id = "[shuttle_id]_[counter]" name = "[name] [counter]" //Re link machinery to new shuttle id linkup() else - SSshuttle.assoc_mobile[id] = 1 + SSshuttle.assoc_mobile[shuttle_id] = 1 SSshuttle.mobile += src @@ -419,16 +419,16 @@ /obj/docking_port/mobile/Initialize(mapload) . = ..() - if(!id) - id = "shuttle" + if(!shuttle_id) + shuttle_id = "shuttle" if(!name) name = "shuttle" var/counter = 1 - var/tmp_id = id + var/tmp_id = shuttle_id var/tmp_name = name - while(Check_id(id)) + while(Check_id(shuttle_id)) counter++ - id = "[tmp_id]_[counter]" + shuttle_id = "[tmp_id]_[counter]" name = "[tmp_name] [counter]" shuttle_areas = list() @@ -559,14 +559,14 @@ var/obj/docking_port/stationary/S1 = assigned_transit if(S1) if(initiate_docking(S1) != DOCKING_SUCCESS) - WARNING("shuttle \"[id]\" could not enter transit space. Docked at [S0 ? S0.id : "null"]. Transit dock [S1 ? S1.id : "null"].") + WARNING("shuttle \"[shuttle_id]\" could not enter transit space. Docked at [S0 ? S0.shuttle_id : "null"]. Transit dock [S1 ? S1.shuttle_id : "null"].") else if(S0) if(S0.delete_after) qdel(S0, TRUE) else previous = S0 else - WARNING("shuttle \"[id]\" could not enter transit space. S0=[S0 ? S0.id : "null"] S1=[S1 ? S1.id : "null"]") + WARNING("shuttle \"[shuttle_id]\" could not enter transit space. S0=[S0 ? S0.shuttle_id : "null"] S1=[S1 ? S1.shuttle_id : "null"]") /obj/docking_port/mobile/proc/jumpToNullSpace() @@ -866,11 +866,11 @@ else dst = destination if(dst) - . = "(transit to) [dst.name || dst.id]" + . = "(transit to) [dst.name || dst.shuttle_id]" else . = "(transit to) nowhere" else if(dockedAt) - . = dockedAt.name || dockedAt.id + . = dockedAt.name || dockedAt.shuttle_id else . = "unknown" @@ -880,7 +880,7 @@ for(var/place in shuttle_areas) var/area/shuttle/shuttle_area = place for(var/obj/machinery/computer/shuttle/S in shuttle_area) - if(S.shuttleId == id) + if(S.shuttleId == shuttle_id) return S return null @@ -1011,7 +1011,7 @@ /obj/docking_port/mobile/pod/on_emergency_dock() if(launch_status == ENDGAME_LAUNCHED) - initiate_docking(SSshuttle.getDock("[id]_away")) //Escape pods dock at centcom + initiate_docking(SSshuttle.getDock("[shuttle_id]_away")) //Escape pods dock at centcom mode = SHUTTLE_ENDGAME /obj/docking_port/mobile/emergency/on_emergency_dock() diff --git a/code/modules/shuttle/shuttle_creation/shuttle_creator.dm b/code/modules/shuttle/shuttle_creation/shuttle_creator.dm index 222cbd2ed7..81ec072909 100644 --- a/code/modules/shuttle/shuttle_creation/shuttle_creator.dm +++ b/code/modules/shuttle/shuttle_creation/shuttle_creator.dm @@ -184,8 +184,8 @@ GLOBAL_LIST_EMPTY(custom_shuttle_machines) //Machines that require updating (He var/obj/docking_port/stationary/stationary_port = new /obj/docking_port/stationary(get_turf(target)) port.callTime = 50 port.dir = NORTH //Point away from space. - port.id = "custom_[GLOB.custom_shuttle_count]" - linkedShuttleId = port.id + port.shuttle_id = "custom_[GLOB.custom_shuttle_count]" + linkedShuttleId = port.shuttle_id port.ignitionTime = 25 port.name = "Custom Shuttle" port.port_direction = 2 diff --git a/code/modules/shuttle/shuttle_creation/shuttle_creator_actions.dm b/code/modules/shuttle/shuttle_creation/shuttle_creator_actions.dm index f50b3bf59f..486e45d250 100644 --- a/code/modules/shuttle/shuttle_creation/shuttle_creator_actions.dm +++ b/code/modules/shuttle/shuttle_creation/shuttle_creator_actions.dm @@ -1,15 +1,13 @@ //============ Actions ============ /datum/action/innate/shuttle_creator icon_icon = 'icons/mob/actions/actions_shuttle.dmi' - var/mob/living/C var/mob/camera/aiEye/remote/shuttle_creation/remote_eye var/obj/item/shuttle_creator/shuttle_creator /datum/action/innate/shuttle_creator/Activate() - if(!target) - return TRUE - C = owner - remote_eye = C.remote_control + if(QDELETED(owner) || !isliving(owner)) + return + remote_eye = owner.remote_control var/obj/machinery/computer/camera_advanced/shuttle_creator/internal_console = target shuttle_creator = internal_console.owner_rsd @@ -77,23 +75,23 @@ var/turf/T = get_turf(remote_eye) for(var/obj/machinery/door/airlock/A in T) if(get_area(A) != shuttle_creator.loggedOldArea) - to_chat(C, "Caution, airlock must be on the shuttle to function as a dock.") + to_chat(owner, "Caution, airlock must be on the shuttle to function as a dock.") return if(shuttle_creator.linkedShuttleId) return if(GLOB.custom_shuttle_count > CUSTOM_SHUTTLE_LIMIT) - to_chat(C, "Shuttle limit reached, sorry.") + to_chat(owner, "Shuttle limit reached, sorry.") return if(shuttle_creator.loggedTurfs.len > SHUTTLE_CREATOR_MAX_SIZE) - to_chat(C, "This shuttle is too large!") + to_chat(owner, "This shuttle is too large!") return if(!shuttle_creator.getNonShuttleDirection(T)) - to_chat(C, "Docking port must be on an external wall, with only 1 side exposed to space.") + to_chat(owner, "Docking port must be on an external wall, with only 1 side exposed to space.") return - if(!shuttle_creator.create_shuttle_area(C)) + if(!shuttle_creator.create_shuttle_area(owner)) return - if(shuttle_creator.shuttle_create_docking_port(A, C)) - to_chat(C, "Shuttle created!") + if(shuttle_creator.shuttle_create_docking_port(A, owner)) + to_chat(owner, "Shuttle created!") //Remove eye control var/obj/machinery/computer/camera_advanced/shuttle_creator/internal_console = target internal_console.remove_eye_control() diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index ea5b4aed0d..3e9da7026d 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -48,7 +48,7 @@ GLOBAL_LIST_INIT(cargo_shuttle_leave_behind_typecache, typecacheof(list( /obj/docking_port/mobile/supply name = "supply shuttle" - id = "supply" + shuttle_id = "supply" callTime = 600 dir = WEST diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm index d6d934530c..7eec60a683 100644 --- a/code/modules/shuttle/syndicate.dm +++ b/code/modules/shuttle/syndicate.dm @@ -60,7 +60,7 @@ shuttleId = "syndicate" lock_override = CAMERA_LOCK_STATION shuttlePortId = "syndicate_custom" - jumpto_ports = list("syndicate_ne" = 1, "syndicate_nw" = 1, "syndicate_n" = 1, "syndicate_se" = 1, "syndicate_sw" = 1, "syndicate_s" = 1) + jump_to_ports = list("syndicate_ne" = 1, "syndicate_nw" = 1, "syndicate_n" = 1, "syndicate_se" = 1, "syndicate_sw" = 1, "syndicate_s" = 1) view_range = 5.5 x_offset = -7 y_offset = -1 diff --git a/code/modules/shuttle/white_ship.dm b/code/modules/shuttle/white_ship.dm index 6d8b2446f7..3d478b452c 100644 --- a/code/modules/shuttle/white_ship.dm +++ b/code/modules/shuttle/white_ship.dm @@ -24,7 +24,7 @@ shuttleId = "whiteship" lock_override = NONE shuttlePortId = "whiteship_custom" - jumpto_ports = list("whiteship_away" = 1, "whiteship_home" = 1, "whiteship_z4" = 1) + jump_to_ports = list("whiteship_away" = 1, "whiteship_home" = 1, "whiteship_z4" = 1) view_range = 10 x_offset = -6 y_offset = -10 @@ -35,7 +35,7 @@ desc = "Used to designate a precise transit location for the Salvage Pod." shuttleId = "whiteship_pod" shuttlePortId = "whiteship_pod_custom" - jumpto_ports = list("whiteship_pod_home" = 1) + jump_to_ports = list("whiteship_pod_home" = 1) view_range = 0 x_offset = -2 y_offset = 0 diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 1bd719e9c8..424fd29635 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -21,7 +21,7 @@ if(..()) return TRUE var/obj/machinery/bsa/full/B = locate() - if(B && !B.stat) + if(B && !B.machine_stat) return TRUE return FALSE @@ -306,7 +306,7 @@ return get_turf(G.parent) /obj/machinery/computer/bsa_control/proc/fire(mob/user) - if(cannon.stat) + if(cannon.machine_stat) notice = "Cannon unpowered!" return notice = null diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 4c04ec35dd..911dade0e6 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -80,7 +80,7 @@ var/turf/T = get_turf(patient) var/obj/structure/table/optable/table = locate(/obj/structure/table/optable, T) - if(table?.computer && !(table.computer.stat & (NOPOWER|BROKEN))) + if(table?.computer && !(table.computer.machine_stat & (NOPOWER|BROKEN))) advanced_surgeries |= table.computer.advanced_surgeries if(istype(tool, /obj/item/surgical_drapes/advanced)) diff --git a/code/modules/vehicles/mecha/mech_bay.dm b/code/modules/vehicles/mecha/mech_bay.dm index 70fd27efef..22b268c849 100644 --- a/code/modules/vehicles/mecha/mech_bay.dm +++ b/code/modules/vehicles/mecha/mech_bay.dm @@ -50,7 +50,7 @@ . += "The status display reads: Base recharge rate at [max_charge]J per cycle." /obj/machinery/mech_bay_recharge_port/process() - if(stat & NOPOWER || !recharge_console) + if(machine_stat & NOPOWER || !recharge_console) return if(!recharging_mech) recharging_mech = locate(/obj/vehicle/sealed/mecha) in recharging_turf @@ -137,7 +137,7 @@ /obj/machinery/computer/mech_bay_power_console/update_overlays() . = ..() - if(!recharge_port || !recharge_port.recharging_mech || !recharge_port.recharging_mech.cell || !(recharge_port.recharging_mech.cell.charge < recharge_port.recharging_mech.cell.maxcharge) || stat & (NOPOWER|BROKEN)) + if(!recharge_port || !recharge_port.recharging_mech || !recharge_port.recharging_mech.cell || !(recharge_port.recharging_mech.cell.charge < recharge_port.recharging_mech.cell.maxcharge) || machine_stat & (NOPOWER|BROKEN)) return . += "recharge_comp_on" diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index c114cace63..7af2aca81b 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -246,14 +246,14 @@ /obj/machinery/vending/update_appearance(updates=ALL) . = ..() - if(stat & BROKEN) + if(machine_stat & BROKEN) set_light(0) return set_light(powered() ? MINIMUM_USEFUL_LIGHT_RANGE : 0) /obj/machinery/vending/update_icon_state() - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "[initial(icon_state)]-broken" return ..() icon_state = "[initial(icon_state)][powered() ? null : "-off"]" @@ -264,7 +264,7 @@ . = ..() if(!light_mask) return - if(!(stat & BROKEN) && powered()) + if(!(machine_stat & BROKEN) && powered()) . += emissive_appearance(icon, light_mask) /obj/machinery/vending/obj_break(damage_flag) @@ -421,7 +421,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(refill_canister && istype(I, refill_canister)) if (!panel_open) to_chat(user, span_warning("You should probably unscrew the service panel first!")) - else if (stat & (BROKEN|NOPOWER)) + else if (machine_stat & (BROKEN|NOPOWER)) to_chat(user, span_notice("[src] does not respond.")) else //if the panel is open we attempt to refill the machine @@ -689,7 +689,7 @@ GLOBAL_LIST_EMPTY(vending_products) to_chat(user, span_notice("You short out the product lock on [src].")) /obj/machinery/vending/_try_interact(mob/user) - if(seconds_electrified && !(stat & NOPOWER)) + if(seconds_electrified && !(machine_stat & NOPOWER)) if(shock(user, 100)) return @@ -918,7 +918,7 @@ GLOBAL_LIST_EMPTY(vending_products) vend_ready = TRUE /obj/machinery/vending/process(delta_time) - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) return PROCESS_KILL if(!active) return @@ -943,7 +943,7 @@ GLOBAL_LIST_EMPTY(vending_products) * * message - the message to speak */ /obj/machinery/vending/proc/speak(message) - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) return if(!message) return @@ -1007,7 +1007,7 @@ GLOBAL_LIST_EMPTY(vending_products) * * prb - probability the shock happens */ /obj/machinery/vending/proc/shock(mob/living/user, prb) - if(!istype(user) || stat & (BROKEN|NOPOWER)) // unpowered, no shock + if(!istype(user) || machine_stat & (BROKEN|NOPOWER)) // unpowered, no shock return FALSE if(!prob(prb)) return FALSE