diff --git a/code/datums/autolathe/autolathe.dm b/code/datums/autolathe/autolathe.dm index 03d1ca0fddb..bf36f2bfabb 100644 --- a/code/datums/autolathe/autolathe.dm +++ b/code/datums/autolathe/autolathe.dm @@ -5,7 +5,7 @@ I = new path() if(!I) // Something has gone horribly wrong, or right. - log_debug("[name] created an Autolathe design without an assigned path. This is expected for only the Material Sheet generation.") + log_debug("[name] created an Autolathe design without an assigned path.") return if(I.matter && !resources) @@ -80,22 +80,12 @@ if(istype(M, /datum/material/alienalloy)) continue - var/obj/item/stack/material/Mat = new M.stack_type() - - if(Mat.name in items_by_name) - qdel(Mat) + var/obj/item/stack/material/S = M.stack_type + if(initial(S.name) in items_by_name) continue - var/datum/category_item/autolathe/materials/WorkDat = new(src) + var/datum/category_item/autolathe/materials/WorkDat = new(src, M) - WorkDat.name = "[Mat.name]" - WorkDat.resources = Mat.matter.Copy() - WorkDat.is_stack = TRUE - WorkDat.no_scale = TRUE - WorkDat.max_stack = Mat.max_amount - WorkDat.path = M.stack_type - - qdel(Mat) items |= WorkDat items_by_name[WorkDat.name] = WorkDat diff --git a/code/datums/autolathe/materials.dm b/code/datums/autolathe/materials.dm index 653fca8222e..eb97d73b65c 100644 --- a/code/datums/autolathe/materials.dm +++ b/code/datums/autolathe/materials.dm @@ -1,38 +1,23 @@ - -/datum/category_item/autolathe/materials/metal - name = "steel sheets" - path =/obj/item/stack/material/steel +/datum/category_item/autolathe/materials is_stack = TRUE - no_scale = TRUE //prevents material duplication exploits + no_scale = TRUE // Prevents material duplaction exploits -/datum/category_item/autolathe/materials/glass - name = "glass sheets" - path =/obj/item/stack/material/glass - is_stack = TRUE - no_scale = TRUE //prevents material duplication exploits +/datum/category_item/autolathe/materials/New(var/loc, var/mat) + if(istype(mat, /obj/item/stack/material)) + var/obj/item/stack/material/M = mat + name = M.name + resources = M.matter.Copy() + max_stack = M.max_amount + path = M.type + else if(istype(mat, /datum/material)) + var/datum/material/M = mat + var/obj/item/stack/material/S = M.stack_type + name = initial(S.name) + resources = M.get_matter() + max_stack = initial(S.max_amount) + path = S + . = ..() -/datum/category_item/autolathe/materials/rglass - name = "reinforced glass sheets" - path =/obj/item/stack/material/glass/reinforced - is_stack = TRUE - no_scale = TRUE //prevents material duplication exploits - -/datum/category_item/autolathe/materials/rods +/datum/category_item/autolathe/materials/rods // Not strictly a material, so they need their own define name = "metal rods" - path =/obj/item/stack/rods - is_stack = TRUE - no_scale = TRUE //prevents material duplication exploits - -/datum/category_item/autolathe/materials/plasteel - name = "plasteel sheets" - path =/obj/item/stack/material/plasteel - is_stack = TRUE - no_scale = TRUE //prevents material duplication exploits - resources = list(MAT_PLASTEEL = 2000) - -/datum/category_item/autolathe/materials/plastic - name = "plastic sheets" - path =/obj/item/stack/material/plastic - is_stack = TRUE - no_scale = TRUE //prevents material duplication exploits - resources = list(MAT_PLASTIC = 2000) + path =/obj/item/stack/rods \ No newline at end of file diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 18d58a33ae8..a1df0327933 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -310,26 +310,27 @@ var/global/list/additional_antag_types = list() for(var/mob/M in player_list) if(M.client) clients++ + var/M_area_type = (get_turf(M))?.loc?.type if(ishuman(M)) if(M.stat != DEAD) surviving_humans++ - if(M.loc && M.loc.loc && M.loc.loc.type in escape_locations) + if(M_area_type in escape_locations) escaped_humans++ if(M.stat != DEAD) surviving_total++ - if(M.loc && M.loc.loc && M.loc.loc.type in escape_locations) + if(M_area_type in escape_locations) escaped_total++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape/centcom) + if(M_area_type == /area/shuttle/escape/centcom) escaped_on_shuttle++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod1/centcom) + if(M_area_type == /area/shuttle/escape_pod1/centcom) escaped_on_pod_1++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod2/centcom) + if(M_area_type == /area/shuttle/escape_pod2/centcom) escaped_on_pod_2++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod3/centcom) + if(M_area_type == /area/shuttle/escape_pod3/centcom) escaped_on_pod_3++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod5/centcom) + if(M_area_type == /area/shuttle/escape_pod5/centcom) escaped_on_pod_5++ if(isobserver(M)) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 87d2ca9b446..8175ee91dae 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -632,7 +632,7 @@ /obj/machinery/suit_cycler/exploration name = "Explorer suit cycler" model_text = "Exploration" - departments = list("Exploration","Old Exploration","No Change") + departments = list("Exploration","Expedition Medic","Old Exploration","No Change") /obj/machinery/suit_cycler/exploration/Initialize() species -= SPECIES_TESHARI @@ -1113,6 +1113,9 @@ if("Exploration") parent_helmet = /obj/item/clothing/head/helmet/space/void/exploration parent_suit = /obj/item/clothing/suit/space/void/exploration + if("Expedition Medic") + parent_helmet = /obj/item/clothing/head/helmet/space/void/expedition_medical + parent_suit = /obj/item/clothing/suit/space/void/expedition_medical if("Old Exploration") parent_helmet = /obj/item/clothing/head/helmet/space/void/exploration/alt parent_suit = /obj/item/clothing/suit/space/void/exploration/alt diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index 168114844d8..f373f20a9d7 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -4,8 +4,9 @@ // Old Exploration is too WIP to use right now /obj/machinery/suit_cycler/exploration - req_access = list(access_explorer) - departments = list("Exploration","No Change") + req_access = null + req_one_access = list(access_explorer,access_medical_equip) + departments = list("Exploration","Expedition Medic","No Change") /obj/machinery/suit_cycler/pilot req_access = list(access_pilot) diff --git a/code/game/machinery/vending_machines.dm b/code/game/machinery/vending_machines.dm index a007904776c..ea4c7497e35 100644 --- a/code/game/machinery/vending_machines.dm +++ b/code/game/machinery/vending_machines.dm @@ -590,8 +590,9 @@ desc = "An old sweet water vending machine,how did this end up here?" icon_state = "sovietsoda" product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem." - products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 30) // TODO Russian soda can - contraband = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 20) // TODO Russian cola can + products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/boda = 30, //ADDITION 04/03/2021 + /obj/item/weapon/reagent_containers/food/drinks/cans/kompot = 20) //ADDITION 04/03/2021 + contraband = list(/obj/item/weapon/reagent_containers/food/drinks/cans/kvass = 20) //ADDITION 04/03/2021 idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. vending_sound = "machines/vending/vending_cans.ogg" diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index 7b4cf74057d..973b0e5309a 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -329,13 +329,33 @@ /obj/item/clothing/suit/space/void/exploration name = "exploration voidsuit" - desc = "A lightweight, radiation-resistant voidsuit, featuring the Explorer emblem on its chest plate. Designed for exploring unknown planetary environments." + desc = "A hazard and radiation resistant voidsuit, featuring the Explorer emblem on its chest plate. Designed for exploring unknown planetary environments." icon_state = "void_explorer" item_state_slots = list(slot_r_hand_str = "skrell_suit_black", slot_l_hand_str = "skrell_suit_black") armor = list(melee = 40, bullet = 15, laser = 25,energy = 35, bomb = 30, bio = 100, rad = 70) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/device/healthanalyzer,/obj/item/device/gps,/obj/item/device/radio/beacon, \ /obj/item/weapon/shovel,/obj/item/ammo_magazine,/obj/item/weapon/gun) +//SAR +/obj/item/clothing/head/helmet/space/void/expedition_medical + name = "exploration medic\'s voidsuit helmet" + desc = "A radiation-resistant helmet made especially for exploring unknown planetary environments. Has a reinforced high-vis bubble style visor." + icon_state = "helm_exp_medic" + item_state = "helm_exp_medic" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 25, bullet = 10, laser = 20,energy = 30, bomb = 25, bio = 100, rad = 70) + light_overlay = "helmet_light_dual" //explorer_light + +/obj/item/clothing/suit/space/void/expedition_medical + name = "exploration medic\'s voidsuit" + desc = "A hazard and radiation resistant voidsuit, featuring the Explorer emblem and a green cross on its chest plate. Seems to be a little lighter and more flexible than the regular explorer issue." + icon_state = "void_exp_medic" + slowdown = 0.75 + item_state_slots = list(slot_r_hand_str = "skrell_suit_black", slot_l_hand_str = "skrell_suit_black") + armor = list(melee = 25, bullet = 10, laser = 20,energy = 30, bomb = 25, bio = 100, rad = 70) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/device/healthanalyzer,/obj/item/device/gps,/obj/item/device/radio/beacon, \ + /obj/item/weapon/shovel,/obj/item/ammo_magazine,/obj/item/weapon/gun,/obj/item/weapon/storage/firstaid,/obj/item/stack/medical) + /obj/item/clothing/head/helmet/space/void/exploration/alt desc = "A radiation-resistant helmet retrofitted for exploring unknown planetary environments." icon_state = "helm_explorer2" diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index 8f2e135d73a..6b53a966ddc 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -171,3 +171,36 @@ . = ..() reagents.add_reagent("rootbeer", 30) +//ADDITIONS BELOW THIS LINE MADE ON 04/03/2021 + +/obj/item/weapon/reagent_containers/food/drinks/cans/kvass + name = "\improper Kvass" + desc = "A true Slavic soda." + description_fluff = "A classic slavic beverage which many Space Russians still enjoy to this day. Fun fact, it is actually considered a weak beer by non-russians." + icon_state = "kvass" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/kvass/Initialize() + . = ..() + reagents.add_reagent("kvass", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/kompot + name = "\improper Kompot" + desc = "A taste of russia in the summertime - canned for you consumption." + description_fluff = "A sweet and fruity beverage that was traditionally used to preserve frutis in harsh Russian winters that is now available for widespread comsumption." + icon_state = "kompot" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/kompot/Initialize() + . = ..() + reagents.add_reagent("kompot", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/boda + name = "\improper Boda" + desc = "State regulated soda beverage. Enjoy comrades." + icon_state = "boda" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/boda/Initialize() + . = ..() + reagents.add_reagent("sodawater", 30) \ No newline at end of file diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index e71857cacae..b591ee26c54 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -53,9 +53,10 @@ var/list/name_to_material /proc/populate_material_list(force_remake=0) if(name_to_material && !force_remake) return // Already set up! name_to_material = list() - for(var/type in typesof(/datum/material) - /datum/material) + for(var/type in subtypesof(/datum/material)) var/datum/material/new_mineral = new type if(!new_mineral.name) + qdel(new_mineral) continue name_to_material[lowertext(new_mineral.name)] = new_mineral return 1 diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 50b3c9b0537..e024b5bd7ee 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -492,6 +492,7 @@ This function restores all organs. switch(damagetype) if(BRUTE) damageoverlaytemp = 20 + if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){damage *= 0.7} damage = damage*species.brute_mod for(var/datum/modifier/M in modifiers) @@ -504,6 +505,7 @@ This function restores all organs. UpdateDamageIcon() if(BURN) damageoverlaytemp = 20 + if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){damage *= 0.7} damage = damage*species.burn_mod for(var/datum/modifier/M in modifiers) diff --git a/code/modules/nifsoft/software/10_combat.dm b/code/modules/nifsoft/software/10_combat.dm index a63e323792d..d44b4bc3b2c 100644 --- a/code/modules/nifsoft/software/10_combat.dm +++ b/code/modules/nifsoft/software/10_combat.dm @@ -7,7 +7,6 @@ illegal = TRUE wear = 3 access = 999 //Prevents anyone from buying it without an emag. - activates = FALSE //It's armor. combat_flags = (NIF_C_BRUTEARMOR) // Default on when installed, clear when uninstalled /datum/nifsoft/burn_armor @@ -19,7 +18,6 @@ illegal = TRUE wear = 3 access = 999 //Prevents anyone from buying it without an emag. - activates = FALSE //It's armor. combat_flags = (NIF_C_BURNARMOR) // Default on when installed, clear when uninstalled /datum/nifsoft/painkillers diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index a3a1af83fed..a921f410640 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1700,7 +1700,7 @@ glass_name = "Rewriter" glass_desc = "The secret of the sanctuary of the Libarian..." - allergen_type = FRUIT|COFFEE //Made with space mountain wind (Fruit) + allergen_type = FRUIT|COFFEE //Made with space mountain wind (Fruit) /datum/reagent/drink/rewriter/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -2720,7 +2720,7 @@ glass_name = "Banana Honk" glass_desc = "A drink from Banana Heaven." - allergen_type = FRUIT|DAIRY //Made from banana juice(fruit) and cream(dairy) + allergen_type = FRUIT|DAIRY //Made from banana juice(fruit) and cream(dairy) /datum/reagent/ethanol/barefoot name = "Barefoot" @@ -4156,3 +4156,28 @@ reagent_state = LIQUID nutriment_factor = 40 //very filling color = "#d169b2" + +//ADDITIONS BELOW THIS LINE MADE ON 04/03/2021 + +/datum/reagent/drink/soda/kompot + name = "Kompot" + id = "kompot" + description = "A traditional Eastern European beverage once used to preserve fruit in the 1980s" + taste_description = "refreshuingly sweet and fruity" + color = "#ed9415" // rgb: 237, 148, 21 + adj_drowsy = -1 + adj_temp = -6 + glass_name = "kompot" + glass_desc = "A glass of refreshing kompot." + glass_special = list(DRINK_FIZZ) + +/datum/reagent/ethanol/kvass + name = "Kvass" + id = "kvass" + description = "A traditional fermented Slavic and Baltic beverage commonly made from rye bread." + taste_description = "a warm summer day at babushka's cabin" + color = "#b78315" // rgb: 183, 131, 21 + strength = 95 //It's just soda to Russians + nutriment_factor = 2 + glass_name = "kvass" + glass_desc = "A hearty glass of Slavic brew." diff --git a/icons/_nanomaps/tether_nanomap_z6.png b/icons/_nanomaps/tether_nanomap_z6.png index 283c20c90c9..f64e2192646 100644 Binary files a/icons/_nanomaps/tether_nanomap_z6.png and b/icons/_nanomaps/tether_nanomap_z6.png differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 4a5e549c7de..d89dafc9093 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/spacesuit.dmi b/icons/mob/spacesuit.dmi index aa6d753ef88..7d7c0c61cf1 100644 Binary files a/icons/mob/spacesuit.dmi and b/icons/mob/spacesuit.dmi differ diff --git a/icons/mob/species/akula/helmet_vr.dmi b/icons/mob/species/akula/helmet_vr.dmi index 5d9d848ff26..5f74f6930cd 100644 Binary files a/icons/mob/species/akula/helmet_vr.dmi and b/icons/mob/species/akula/helmet_vr.dmi differ diff --git a/icons/mob/species/akula/suit_vr.dmi b/icons/mob/species/akula/suit_vr.dmi index 9fb0807138b..98767384b31 100644 Binary files a/icons/mob/species/akula/suit_vr.dmi and b/icons/mob/species/akula/suit_vr.dmi differ diff --git a/icons/mob/species/sergal/helmet_vr.dmi b/icons/mob/species/sergal/helmet_vr.dmi index 900f1adfd9c..a890d2bb7d3 100644 Binary files a/icons/mob/species/sergal/helmet_vr.dmi and b/icons/mob/species/sergal/helmet_vr.dmi differ diff --git a/icons/mob/species/sergal/suit_vr.dmi b/icons/mob/species/sergal/suit_vr.dmi index dc770a2fef9..8cdc3c2da07 100644 Binary files a/icons/mob/species/sergal/suit_vr.dmi and b/icons/mob/species/sergal/suit_vr.dmi differ diff --git a/icons/mob/species/skrell/helmet.dmi b/icons/mob/species/skrell/helmet.dmi index 8cda9900851..f518f8fb704 100644 Binary files a/icons/mob/species/skrell/helmet.dmi and b/icons/mob/species/skrell/helmet.dmi differ diff --git a/icons/mob/species/skrell/suit.dmi b/icons/mob/species/skrell/suit.dmi index 1185d99d7f2..45b47bb1df9 100644 Binary files a/icons/mob/species/skrell/suit.dmi and b/icons/mob/species/skrell/suit.dmi differ diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi index 4003c1b508d..24901a33b37 100644 Binary files a/icons/mob/species/tajaran/helmet.dmi and b/icons/mob/species/tajaran/helmet.dmi differ diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/species/tajaran/suit.dmi index 2453efcbaf4..22afb1bd853 100644 Binary files a/icons/mob/species/tajaran/suit.dmi and b/icons/mob/species/tajaran/suit.dmi differ diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/species/unathi/helmet.dmi index dc98094bb55..2a113796d72 100644 Binary files a/icons/mob/species/unathi/helmet.dmi and b/icons/mob/species/unathi/helmet.dmi differ diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/species/unathi/suit.dmi index 08f1ed49387..1fd3aaba970 100644 Binary files a/icons/mob/species/unathi/suit.dmi and b/icons/mob/species/unathi/suit.dmi differ diff --git a/icons/mob/species/vulpkanin/helmet.dmi b/icons/mob/species/vulpkanin/helmet.dmi index 180942e678e..a800f5f951c 100644 Binary files a/icons/mob/species/vulpkanin/helmet.dmi and b/icons/mob/species/vulpkanin/helmet.dmi differ diff --git a/icons/mob/species/vulpkanin/suit.dmi b/icons/mob/species/vulpkanin/suit.dmi index 1a18c3dbfa1..10604dc0b3a 100644 Binary files a/icons/mob/species/vulpkanin/suit.dmi and b/icons/mob/species/vulpkanin/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index ea1d7579d8e..e1c5517021d 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/spacesuits.dmi b/icons/obj/clothing/spacesuits.dmi index 71bd5463f78..ae9cc5764f1 100644 Binary files a/icons/obj/clothing/spacesuits.dmi and b/icons/obj/clothing/spacesuits.dmi differ diff --git a/icons/obj/clothing/species/akula/hats.dmi b/icons/obj/clothing/species/akula/hats.dmi index 53ef19b53f5..729050c5f5d 100644 Binary files a/icons/obj/clothing/species/akula/hats.dmi and b/icons/obj/clothing/species/akula/hats.dmi differ diff --git a/icons/obj/clothing/species/akula/suits.dmi b/icons/obj/clothing/species/akula/suits.dmi index 193650e5ab9..60fb367009e 100644 Binary files a/icons/obj/clothing/species/akula/suits.dmi and b/icons/obj/clothing/species/akula/suits.dmi differ diff --git a/icons/obj/clothing/species/sergal/hats.dmi b/icons/obj/clothing/species/sergal/hats.dmi index 0af7d29863f..9a412ee16a3 100644 Binary files a/icons/obj/clothing/species/sergal/hats.dmi and b/icons/obj/clothing/species/sergal/hats.dmi differ diff --git a/icons/obj/clothing/species/sergal/suits.dmi b/icons/obj/clothing/species/sergal/suits.dmi index 1c44cd7002c..589c5a4a96d 100644 Binary files a/icons/obj/clothing/species/sergal/suits.dmi and b/icons/obj/clothing/species/sergal/suits.dmi differ diff --git a/icons/obj/clothing/species/skrell/hats.dmi b/icons/obj/clothing/species/skrell/hats.dmi index a69a4e51dd1..def79846d36 100644 Binary files a/icons/obj/clothing/species/skrell/hats.dmi and b/icons/obj/clothing/species/skrell/hats.dmi differ diff --git a/icons/obj/clothing/species/skrell/suits.dmi b/icons/obj/clothing/species/skrell/suits.dmi index 01ccf8f8d01..d0ac340426f 100644 Binary files a/icons/obj/clothing/species/skrell/suits.dmi and b/icons/obj/clothing/species/skrell/suits.dmi differ diff --git a/icons/obj/clothing/species/tajaran/hats.dmi b/icons/obj/clothing/species/tajaran/hats.dmi index 362fae9f46b..b4fd4241e0e 100644 Binary files a/icons/obj/clothing/species/tajaran/hats.dmi and b/icons/obj/clothing/species/tajaran/hats.dmi differ diff --git a/icons/obj/clothing/species/tajaran/suits.dmi b/icons/obj/clothing/species/tajaran/suits.dmi index d935a4096cf..6b12d49204e 100644 Binary files a/icons/obj/clothing/species/tajaran/suits.dmi and b/icons/obj/clothing/species/tajaran/suits.dmi differ diff --git a/icons/obj/clothing/species/unathi/hats.dmi b/icons/obj/clothing/species/unathi/hats.dmi index 28c8700a39d..a3a6bf1fff9 100644 Binary files a/icons/obj/clothing/species/unathi/hats.dmi and b/icons/obj/clothing/species/unathi/hats.dmi differ diff --git a/icons/obj/clothing/species/unathi/suits.dmi b/icons/obj/clothing/species/unathi/suits.dmi index 08abbe309a6..e9870c4f97b 100644 Binary files a/icons/obj/clothing/species/unathi/suits.dmi and b/icons/obj/clothing/species/unathi/suits.dmi differ diff --git a/icons/obj/clothing/species/vulpkanin/hats.dmi b/icons/obj/clothing/species/vulpkanin/hats.dmi index eec5b5ca3c9..f2dc0386289 100644 Binary files a/icons/obj/clothing/species/vulpkanin/hats.dmi and b/icons/obj/clothing/species/vulpkanin/hats.dmi differ diff --git a/icons/obj/clothing/species/vulpkanin/suits.dmi b/icons/obj/clothing/species/vulpkanin/suits.dmi index b87b02edfed..3df33763a0c 100644 Binary files a/icons/obj/clothing/species/vulpkanin/suits.dmi and b/icons/obj/clothing/species/vulpkanin/suits.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 68188dd88a8..250c191c730 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 4b015e675d2..8883a9e18e2 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -15,7 +15,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /obj/vehicle/train/trolley, @@ -23,16 +22,13 @@ /area/engineering/hallway) "aae" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4; - icon_state = "intact-supply" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled, @@ -44,9 +40,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/space) @@ -63,7 +57,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/cable/green{ @@ -120,23 +113,20 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 4; - pixel_x = -35; - pixel_y = 0 + pixel_x = -35 }, /turf/simulated/floor, /area/maintenance/station/eng_lower) "aam" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -144,9 +134,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/engineering/engine_room) @@ -217,8 +205,7 @@ }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/simulated/floor/tiled/dark, /area/tether/station/burial) @@ -227,8 +214,7 @@ dir = 6 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/tether/station/burial) @@ -279,8 +265,7 @@ /area/engineering/engine_smes) "aaA" = ( /obj/machinery/power/terminal{ - dir = 8; - icon_state = "term" + dir = 8 }, /obj/structure/cable/yellow{ d2 = 2; @@ -292,8 +277,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance_hatch{ name = "SMES Access"; @@ -457,7 +441,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /turf/simulated/floor/tiled, @@ -475,10 +458,8 @@ "aaQ" = ( /obj/machinery/door/blast/regular{ dir = 4; - icon_state = "pdoor1"; id = "EngineVent"; - name = "Reactor Vent"; - p_open = 0 + name = "Reactor Vent" }, /turf/simulated/floor/reinforced/nitrogen{ nitrogen = 82.1472 @@ -497,7 +478,6 @@ id = "engine_electrical_maintenance"; name = "Door Bolt Control"; pixel_x = -25; - pixel_y = 0; req_access = list(10); specialfunctions = 4 }, @@ -562,8 +542,7 @@ /area/maintenance/station/eng_lower) "aaZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -625,8 +604,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/engineering/engine_smes) @@ -637,8 +615,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) @@ -670,9 +647,7 @@ /area/engineering/engine_room) "abl" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 1 @@ -708,7 +683,6 @@ "abp" = ( /obj/machinery/mass_driver{ dir = 4; - icon_state = "mass_driver"; id = "chapelgun" }, /obj/machinery/door/window{ @@ -721,9 +695,7 @@ "abq" = ( /obj/machinery/door/airlock/maintenance_hatch{ frequency = 1379; - icon_state = "door_closed"; id_tag = "engine_airlock_interior"; - locked = 0; name = "Engine Airlock Interior"; req_access = list(11) }, @@ -741,9 +713,7 @@ "abs" = ( /obj/machinery/door/airlock/maintenance_hatch{ frequency = 1379; - icon_state = "door_closed"; id_tag = "engine_airlock_exterior"; - locked = 0; name = "Engine Airlock Exterior"; req_access = list(11) }, @@ -800,9 +770,7 @@ dir = 6 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -832,7 +800,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/floor_decal/industrial/warning{ @@ -892,7 +859,6 @@ id = "EngineEmitterPortWest2"; name = "Engine Room Blast Doors"; pixel_x = 25; - pixel_y = 0; req_access = null; req_one_access = list(11,24) }, @@ -925,7 +891,6 @@ }, /obj/machinery/light/small, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -953,7 +918,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled/techmaint, @@ -988,7 +952,6 @@ dir = 4 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -1001,7 +964,6 @@ "abN" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor, @@ -1018,8 +980,7 @@ /area/engineering/gravity_gen) "abP" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/random/trash, /turf/simulated/floor, @@ -1048,7 +1009,6 @@ /area/maintenance/station/eng_lower) "abU" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28; req_access = list(67) @@ -1076,8 +1036,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/engineering/engine_monitoring) @@ -1134,9 +1093,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/engineering/engine_monitoring) @@ -1201,8 +1158,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -1251,8 +1207,7 @@ "acu" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -1369,8 +1324,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1391,9 +1345,7 @@ "acO" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Engineering"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green{ d2 = 4; @@ -1451,8 +1403,7 @@ dir = 9 }, /obj/effect/floor_decal/industrial/danger{ - dir = 9; - icon_state = "danger" + dir = 9 }, /obj/machinery/status_display{ pixel_y = 32 @@ -1530,8 +1481,7 @@ }, /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 0 + icon_state = "0-2" }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -1623,8 +1573,7 @@ "ado" = ( /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -1672,8 +1621,7 @@ dir = 8 }, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary) @@ -1809,15 +1757,13 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0 }, /obj/machinery/door/airlock/maintenance/engi{ - name = "Engineering Substation"; - req_one_access = list(10) + name = "Engineering Substation" }, /turf/simulated/floor, /area/maintenance/substation/engineering) @@ -1842,8 +1788,7 @@ /area/hallway/station/atrium) "adF" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable{ d2 = 4; @@ -1871,12 +1816,10 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/engi{ - name = "Engineering Substation"; - req_one_access = list(10) + name = "Engineering Substation" }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -1937,8 +1880,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/danger{ - dir = 8; - icon_state = "danger" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) @@ -2006,7 +1948,6 @@ "adW" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -2062,15 +2003,10 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "aec" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/random/junk, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "aed" = ( /obj/machinery/computer/supplycomp, /turf/simulated/floor/tiled/dark, @@ -2087,8 +2023,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -2140,8 +2075,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -2160,8 +2094,7 @@ /area/engineering/workshop) "aeo" = ( /obj/machinery/computer/station_alert/all{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/machinery/ai_status_display{ pixel_x = -32 @@ -2191,8 +2124,7 @@ /area/crew_quarters/sleep/cryo) "aer" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -2206,7 +2138,6 @@ dir = 1 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -2250,8 +2181,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/danger{ - dir = 8; - icon_state = "danger" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) @@ -2325,8 +2255,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/effect/floor_decal/steeldecal/steel_decals_central5{ - dir = 8; - icon_state = "steel_decals_central5" + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/engineering/engine_monitoring) @@ -2392,8 +2321,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -2436,8 +2364,7 @@ department = "Secondary Bridge"; departmentType = 5; name = "Secondary Bridge RC"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/table/reinforced, /obj/item/weapon/book/codex, @@ -2482,7 +2409,6 @@ "aeN" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/table/reinforced, @@ -2510,8 +2436,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/danger{ - dir = 8; - icon_state = "danger" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) @@ -2579,8 +2504,7 @@ /area/bridge/secondary) "aeZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -2679,8 +2603,7 @@ dir = 10 }, /obj/effect/floor_decal/industrial/danger{ - dir = 10; - icon_state = "danger" + dir = 10 }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) @@ -2724,7 +2647,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/floor_decal/borderfloor, @@ -2735,7 +2657,6 @@ /obj/machinery/light, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = 0; pixel_y = -32 }, /obj/effect/floor_decal/borderfloor, @@ -2750,7 +2671,6 @@ /area/engineering/engine_monitoring) "afk" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -2772,8 +2692,7 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ dir = 1 @@ -2813,9 +2732,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -2829,9 +2746,7 @@ /area/hallway/station/atrium) "afp" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor, @@ -2844,9 +2759,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -2860,8 +2773,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/camera/network/engineering, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -2870,9 +2782,7 @@ "afs" = ( /obj/effect/floor_decal/rust, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/structure/closet/crate/solar, /obj/effect/floor_decal/industrial/outline/yellow, @@ -2880,8 +2790,7 @@ /area/engineering/storage) "aft" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2913,8 +2822,7 @@ /area/engineering/hallway) "afu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -2927,7 +2835,6 @@ /obj/machinery/light, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled, @@ -2988,8 +2895,7 @@ /area/hallway/station/atrium) "afB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -3010,8 +2916,7 @@ "afD" = ( /obj/structure/table/reinforced, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) @@ -3037,8 +2942,7 @@ /area/hallway/station/atrium) "afG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -3194,8 +3098,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance_hatch{ - icon_state = "door_closed"; - locked = 0; name = "Engine Access"; req_one_access = list(11) }, @@ -3375,7 +3277,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -3522,8 +3423,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled, /area/bridge/secondary) @@ -3623,7 +3523,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/floor_decal/industrial/warning, @@ -3635,7 +3534,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/effect/landmark{ @@ -3676,8 +3574,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -3687,8 +3584,7 @@ "agC" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -3731,17 +3627,14 @@ /area/bridge/secondary) "agF" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /obj/machinery/light/small{ dir = 1 }, /obj/machinery/airlock_sensor{ - frequency = 1379; id_tag = "eng_al_c_snsr"; - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; @@ -3753,7 +3646,6 @@ "agG" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/papershredder, @@ -3779,12 +3671,10 @@ /area/engineering/break_room) "agI" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 5; - icon_state = "warning" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -3811,8 +3701,7 @@ dir = 4 }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) @@ -4090,8 +3979,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -4100,8 +3988,7 @@ RCon_tag = "Secondary Command Substation Bypass" }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor, /area/maintenance/substation/spacecommand) @@ -4131,8 +4018,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/camera/network/engineering{ dir = 8 @@ -4154,9 +4040,7 @@ dir = 5 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 4 @@ -4267,8 +4151,7 @@ /area/hallway/station/atrium) "ahs" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/plating, /area/engineering/engine_airlock) @@ -4288,8 +4171,7 @@ dir = 8 }, /obj/machinery/status_display{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary) @@ -4307,13 +4189,10 @@ dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 4 @@ -4335,12 +4214,10 @@ /area/gateway) "ahy" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/plating, /area/engineering/engine_airlock) @@ -4358,19 +4235,16 @@ /area/gateway) "ahB" = ( /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) "ahC" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -4385,8 +4259,6 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance_hatch{ - icon_state = "door_closed"; - locked = 0; name = "Engine Access"; req_one_access = list(11) }, @@ -4398,12 +4270,10 @@ "ahE" = ( /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -4526,8 +4396,7 @@ }, /obj/effect/floor_decal/rust, /obj/structure/disposalpipe/broken{ - dir = 4; - icon_state = "pipe-b" + dir = 4 }, /turf/simulated/floor, /area/vacant/vacant_restaurant_lower) @@ -4571,9 +4440,7 @@ /area/engineering/storage) "ahU" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -4619,9 +4486,7 @@ "aia" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Secondary Command"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green, /obj/structure/cable/green{ @@ -4717,7 +4582,6 @@ /obj/effect/floor_decal/industrial/warning, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled/dark, @@ -4804,8 +4668,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4834,7 +4697,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor, @@ -4918,8 +4780,7 @@ "aiB" = ( /obj/machinery/light_switch{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -4952,12 +4813,10 @@ layer = 3.3; master_tag = "engine_room_airlock"; pixel_x = -22; - pixel_y = 0; req_access = list(10) }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/portables_connector{ @@ -4982,7 +4841,6 @@ /obj/structure/cable/green, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/closet/radiation, @@ -5076,8 +4934,7 @@ /area/engineering/engine_monitoring) "aiR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/meter{ frequency = 1443; @@ -5086,9 +4943,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor, /area/hallway/station/docks) @@ -5197,9 +5052,7 @@ /area/gateway) "ajd" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 30 }, /obj/effect/floor_decal/industrial/warning{ @@ -5217,8 +5070,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) @@ -5231,8 +5083,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -5274,8 +5125,7 @@ /area/gateway/prep_room) "ajj" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5284,15 +5134,13 @@ /area/gateway/prep_room) "ajk" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor, /area/hallway/station/docks) "ajl" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -5308,8 +5156,7 @@ }, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) @@ -5330,8 +5177,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/engineering/engine_room) @@ -5349,9 +5195,7 @@ icon_state = "4-8" }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5396,8 +5240,7 @@ }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -5505,9 +5348,7 @@ "ajG" = ( /obj/effect/floor_decal/rust, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/shield_gen/external, /obj/effect/floor_decal/industrial/outline/yellow, @@ -5515,8 +5356,7 @@ /area/engineering/storage) "ajH" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5527,9 +5367,7 @@ /area/gateway/prep_room) "ajI" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/structure/closet/crate/radiation, /obj/item/clothing/glasses/meson, @@ -5559,8 +5397,7 @@ /area/hallway/station/atrium) "ajL" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/gateway/prep_room) @@ -5571,12 +5408,10 @@ /area/gateway/prep_room) "ajN" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5622,8 +5457,7 @@ "ajV" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled, /area/gateway/prep_room) @@ -5633,8 +5467,7 @@ /area/hallway/station/docks) "ajX" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark, @@ -5662,8 +5495,7 @@ req_access = null }, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) @@ -5734,7 +5566,6 @@ /area/maintenance/abandonedlibrary) "akj" = ( /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/machinery/shield_capacitor, @@ -5743,7 +5574,6 @@ /area/engineering/storage) "akk" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -5788,7 +5618,6 @@ "akp" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/light_switch{ @@ -5915,12 +5744,10 @@ "akA" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/gateway/prep_room) @@ -5941,7 +5768,6 @@ "akE" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/dark, @@ -5957,8 +5783,7 @@ "akH" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/dark, /area/gateway) @@ -5982,12 +5807,10 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/gateway) @@ -6003,8 +5826,7 @@ }, /obj/machinery/light, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/gateway) @@ -6013,7 +5835,6 @@ /obj/machinery/recharger, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /turf/simulated/floor/tiled/dark, @@ -6081,13 +5902,10 @@ pixel_y = 3 }, /obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = -3; - pixel_y = 0 + pixel_x = -3 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -6203,8 +6021,7 @@ "ale" = ( /obj/structure/closet/crate, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/gateway) @@ -6248,8 +6065,7 @@ icon_state = "2-4" }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/gateway/prep_room) @@ -6304,8 +6120,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/bridge/secondary) @@ -6314,8 +6129,7 @@ /area/maintenance/station/abandonedholodeck) "alp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/meter{ frequency = 1443; @@ -6394,7 +6208,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ dir = 4; - icon_state = "pdoor1"; id = "EngineEmitterPortWest2"; layer = 3.3; name = "Engine Gas Storage" @@ -6407,9 +6220,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/engineering/atmos/backup) @@ -6426,7 +6237,6 @@ }, /obj/machinery/door/blast/regular{ dir = 4; - icon_state = "pdoor1"; id = "EngineEmitterPortWest2"; layer = 3.3; name = "Engine Gas Storage" @@ -6511,12 +6321,10 @@ "alL" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/corner/yellow/bordercorner, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -6540,8 +6348,7 @@ /area/engineering/hallway) "alM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6607,9 +6414,7 @@ "alR" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/vehicle/train/trolley, @@ -6644,8 +6449,7 @@ "alW" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/steeldecal/steel_decals_central6{ - dir = 8; - icon_state = "steel_decals_central6" + dir = 8 }, /obj/machinery/alarm{ pixel_y = 22 @@ -6703,7 +6507,6 @@ name = "Cafe Shutters"; pixel_x = -10; pixel_y = 36; - req_access = list(); req_one_access = list(25) }, /obj/item/weapon/hand_labeler, @@ -6730,8 +6533,7 @@ }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -6742,8 +6544,7 @@ /obj/structure/table/reinforced, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/item/device/gps/engineering{ pixel_x = 3; @@ -6765,8 +6566,7 @@ /area/bridge/secondary) "amf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -6900,8 +6700,7 @@ dir = 1 }, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/water/pool, /area/hallway/station/atrium) @@ -6910,7 +6709,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's set to the science channel, the show is talking about modern aliens. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/carpet, @@ -6918,7 +6716,6 @@ "amt" = ( /obj/machinery/door/window{ dir = 1; - icon_state = "left"; name = "Cafe"; req_one_access = list(25) }, @@ -6938,8 +6735,7 @@ "amw" = ( /obj/structure/railing, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/water/pool, /area/hallway/station/atrium) @@ -7110,9 +6906,7 @@ dir = 5 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -7250,8 +7044,7 @@ "anc" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/engineering/shaft) @@ -7318,8 +7111,7 @@ icon_state = "cobweb2" }, /obj/machinery/light_construct{ - dir = 1; - icon_state = "tube-construct-stage1" + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) @@ -7403,7 +7195,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /obj/machinery/door/firedoor/glass/hidden/steel{ @@ -7569,7 +7360,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -7696,7 +7486,6 @@ "anT" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/wood/broken, @@ -7718,7 +7507,6 @@ "anW" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -7726,8 +7514,7 @@ "anX" = ( /obj/structure/bookcase, /obj/machinery/light_construct/small{ - dir = 8; - icon_state = "bulb-construct-stage1" + dir = 8 }, /obj/effect/decal/cleanable/cobweb{ icon_state = "cobweb2" @@ -7764,8 +7551,7 @@ /area/maintenance/abandonedlibrary) "aoc" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/bookcase, /obj/effect/decal/cleanable/cobweb{ @@ -7804,7 +7590,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -7826,15 +7611,13 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "aok" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4; - icon_state = "intact-supply" + dir = 4 }, /obj/machinery/light{ dir = 1 @@ -7846,8 +7629,7 @@ /area/engineering/atmos/backup) "aol" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4; - icon_state = "intact-supply" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -7855,8 +7637,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -7876,17 +7657,14 @@ /area/bridge/secondary) "aon" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4; - icon_state = "intact-supply" + dir = 4 }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -7942,8 +7720,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance/engi{ - name = "Engineering Electrical Shaft"; - req_one_access = list(10) + name = "Engineering Electrical Shaft" }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor, @@ -7976,8 +7753,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/engineering/hallway) @@ -8040,8 +7816,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -8204,8 +7979,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8233,12 +8007,10 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -8256,8 +8028,7 @@ /area/engineering/atmos/backup) "apv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -8289,8 +8060,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8309,8 +8079,7 @@ /area/engineering/hallway) "apx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -8329,9 +8098,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/green{ @@ -8377,8 +8144,7 @@ /area/maintenance/abandonedlibrary) "apB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8436,8 +8202,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/table/woodentable, /obj/random/junk, @@ -8450,8 +8215,7 @@ /area/maintenance/abandonedlibrary) "apG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -8466,8 +8230,7 @@ /area/maintenance/abandonedlibrary) "apI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -8479,8 +8242,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 @@ -8497,8 +8259,7 @@ /area/engineering/hallway) "apJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8515,8 +8276,7 @@ /area/engineering/hallway) "apK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8558,8 +8318,7 @@ /area/engineering/hallway) "apM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -8614,9 +8373,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -8625,8 +8382,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -8692,7 +8448,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -8704,16 +8459,14 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor, /area/engineering/atmos/backup) "aqf" = ( /obj/machinery/pipedispenser/disposal, /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 10; - icon_state = "intact" + dir = 10 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -8739,8 +8492,7 @@ /area/tether/station/visitorhallway) "aqh" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 6; - icon_state = "intact" + dir = 6 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -8748,19 +8500,16 @@ /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/engineering/atmos/backup) "aqj" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -8788,15 +8537,13 @@ dir = 10 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) "aql" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -8808,8 +8555,7 @@ /area/engineering/hallway) "aqm" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -8823,8 +8569,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) @@ -8881,8 +8626,7 @@ /area/maintenance/abandonedlibraryconference) "aqq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 @@ -9011,15 +8755,13 @@ /obj/machinery/light, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled, /area/engineering/hallway) "aqD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -9039,8 +8781,7 @@ /area/engineering/hallway) "aqE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -9058,8 +8799,7 @@ /area/engineering/hallway) "aqF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -9119,8 +8859,7 @@ /area/engineering/workshop) "aqO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -9129,8 +8868,7 @@ /area/engineering/hallway) "aqQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -9211,9 +8949,7 @@ /area/engineering/hallway) "aqU" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -9231,8 +8967,7 @@ /area/maintenance/abandonedlibraryconference) "aqW" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/abandonedlibraryconference) @@ -9260,8 +8995,7 @@ }, /obj/structure/reagent_dispensers/watertank, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -9295,8 +9029,7 @@ dir = 8 }, /obj/machinery/light_construct/small{ - dir = 4; - icon_state = "bulb-construct-stage1" + dir = 4 }, /obj/effect/decal/cleanable/cobweb{ icon_state = "cobweb2" @@ -9411,23 +9144,20 @@ /area/engineering/workshop) "ary" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "arz" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "arB" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/meter, /turf/simulated/floor/tiled, @@ -9523,12 +9253,10 @@ /area/engineering/break_room) "arO" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 10; - icon_state = "intact-supply" + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 10; - icon_state = "intact-scrubbers" + dir = 10 }, /obj/machinery/camera/network/engineering{ dir = 8 @@ -9548,8 +9276,7 @@ /area/engineering/atmos/backup) "arT" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/red{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -9722,7 +9449,6 @@ /obj/effect/floor_decal/techfloor/hole, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled/techfloor, @@ -9799,8 +9525,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -9947,7 +9672,6 @@ /area/crew_quarters/sleep/cryo) "asM" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28; req_access = list(67) @@ -10037,8 +9761,7 @@ name_tag = "Secondary Command Subgrid" }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor, /area/maintenance/substation/spacecommand) @@ -10054,8 +9777,7 @@ }, /obj/random/junk, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/structure/cable/green{ d1 = 2; @@ -10185,8 +9907,7 @@ /obj/structure/table/reinforced, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/item/device/radio/off{ pixel_y = 6 @@ -10325,9 +10046,7 @@ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -10357,8 +10076,7 @@ /area/maintenance/station/spacecommandmaint) "atA" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/workshop) @@ -10566,15 +10284,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/random/junk, /turf/simulated/floor, @@ -10703,8 +10419,7 @@ icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -10774,13 +10489,11 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; - dir = 1; icon_state = "pdoor0"; id = "secondary_bridge_blast"; layer = 1; @@ -10792,8 +10505,7 @@ /area/bridge/secondary/hallway) "auq" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -10928,7 +10640,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/borderfloor{ @@ -10947,8 +10658,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -10997,20 +10707,16 @@ icon_state = "2-4" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "auG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11029,20 +10735,16 @@ icon_state = "1-4" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "auH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11056,9 +10758,7 @@ icon_state = "4-8" }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/green{ @@ -11067,20 +10767,16 @@ icon_state = "2-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "auI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11094,13 +10790,10 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) @@ -11113,7 +10806,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/random/tech_supply, @@ -11147,13 +10839,10 @@ icon_state = "2-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) @@ -11171,8 +10860,7 @@ /area/tether/station/visitorhallway/office) "auM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11186,13 +10874,10 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -11221,8 +10906,7 @@ /area/hallway/station/docks) "auR" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -11240,16 +10924,14 @@ dir = 4 }, /obj/machinery/ai_status_display{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/tiled, /area/storage/tools) "auT" = ( /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/machinery/computer/communications, /obj/structure/cable/green{ @@ -11465,15 +11147,13 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/workshop) "avr" = ( /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, @@ -11526,7 +11206,6 @@ /area/tether/station/visitorhallway/office) "avv" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -11537,8 +11216,7 @@ /area/bridge/secondary/hallway) "avw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/red{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/meter, /turf/simulated/floor/tiled, @@ -11687,16 +11365,13 @@ icon_state = "pipe-c" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 4 @@ -11712,8 +11387,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -11732,7 +11406,6 @@ /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /turf/simulated/floor/tiled, @@ -11744,8 +11417,7 @@ sortType = "Visitor Office" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -11787,16 +11459,13 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 4 @@ -12050,8 +11719,7 @@ /area/tether/station/visitorhallway) "awk" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -12204,13 +11872,10 @@ dir = 1 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /turf/simulated/floor/tiled/techmaint, @@ -12220,8 +11885,7 @@ /area/bridge/secondary/teleporter) "awD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -12230,9 +11894,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -12269,9 +11931,7 @@ "awH" = ( /obj/structure/flora/pottedplant, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -12320,9 +11980,7 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/tiled{ @@ -12370,9 +12028,7 @@ dir = 10 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -12414,15 +12070,13 @@ /obj/effect/floor_decal/corner/white/diagonal, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled, /area/engineering/break_room) "awU" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -12431,8 +12085,7 @@ dir = 10 }, /obj/machinery/vending/fitness{ - dir = 4; - icon_state = "fitness" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/office) @@ -12449,7 +12102,6 @@ icon_state = "1-4" }, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; pixel_x = 20; pixel_y = 30 @@ -12464,13 +12116,11 @@ /area/bridge/secondary/teleporter) "awX" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -12508,7 +12158,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -12552,9 +12201,7 @@ /area/bridge/meeting_room) "axe" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 30 }, /turf/simulated/floor/wood, @@ -12597,7 +12244,6 @@ "axj" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/wood, @@ -12605,8 +12251,7 @@ "axk" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary/teleporter) @@ -12618,15 +12263,13 @@ "axm" = ( /obj/item/weapon/stool/padded, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/bridge/secondary/teleporter) "axn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -12651,7 +12294,6 @@ /obj/structure/table/woodentable, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -12672,8 +12314,7 @@ pixel_y = 5 }, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -12717,8 +12358,7 @@ /area/storage/tools) "axA" = ( /obj/machinery/atmospherics/pipe/tank/oxygen{ - dir = 1; - icon_state = "o2_map" + dir = 1 }, /obj/machinery/light, /turf/simulated/floor/tiled, @@ -12726,7 +12366,6 @@ "axB" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -12781,15 +12420,13 @@ "axG" = ( /obj/machinery/atmospherics/pipe/tank{ dir = 1; - icon_state = "air_map"; name = "Waste Tank" }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "axH" = ( /obj/machinery/atmospherics/pipe/tank/nitrogen{ - dir = 1; - icon_state = "n2_map" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -12829,8 +12466,7 @@ dir = 8 }, /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -12861,7 +12497,6 @@ /obj/fiftyspawner/glass, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/light, @@ -12889,8 +12524,7 @@ /area/tether/station/stairs_one) "axS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /obj/structure/cable/green{ d1 = 1; @@ -12910,8 +12544,7 @@ /area/crew_quarters/sleep/spacedorm1) "axU" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/workshop) @@ -12920,8 +12553,7 @@ phorontanks = 0 }, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -12950,8 +12582,7 @@ /area/crew_quarters/sleep/spacedorm2) "axY" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, @@ -12963,9 +12594,7 @@ /area/hallway/station/docks) "aya" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -13069,8 +12698,7 @@ icon_state = "2-8" }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/spacedorm3) @@ -13106,8 +12734,7 @@ /area/bridge/secondary/teleporter) "aym" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/bridge/secondary/teleporter) @@ -13121,8 +12748,7 @@ icon_state = "2-4" }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/spacedorm4) @@ -13262,9 +12888,7 @@ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -13317,15 +12941,13 @@ /obj/structure/table/woodentable, /obj/item/weapon/storage/box/cups, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) "ayG" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled, @@ -13338,7 +12960,6 @@ "ayI" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/wood, @@ -13370,7 +12991,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13394,9 +13014,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -13425,7 +13043,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -13456,12 +13073,10 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -13493,8 +13108,7 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -13542,16 +13156,13 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 4 @@ -13578,8 +13189,7 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -13608,8 +13218,7 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -13654,9 +13263,7 @@ dir = 5 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 4 @@ -13686,8 +13293,7 @@ /area/tether/station/visitorhallway) "aza" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /turf/simulated/floor/tiled, /area/bridge/secondary/teleporter) @@ -13741,8 +13347,7 @@ /area/bridge/secondary) "aze" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central5{ - dir = 4; - icon_state = "steel_decals_central5" + dir = 4 }, /mob/living/simple_mob/animal/passive/opossum/poppy, /turf/simulated/floor/tiled/monotile, @@ -13791,8 +13396,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/engineering{ - name = "Engineering Washroom"; - req_one_access = list(10) + name = "Engineering Washroom" }, /turf/simulated/floor/tiled/white, /area/engineering/break_room) @@ -13961,8 +13565,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary/teleporter) @@ -13992,9 +13595,7 @@ /area/maintenance/station/spacecommandmaint) "azA" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -14015,7 +13616,6 @@ dir = 4 }, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; pixel_x = 6; pixel_y = 32 @@ -14057,7 +13657,6 @@ "azG" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/vending/cigarette, @@ -14103,7 +13702,6 @@ /area/tether/station/visitorhallway/laundry) "azL" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; pixel_x = -6; pixel_y = 32 @@ -14119,8 +13717,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/station/stairs_one) @@ -14169,8 +13766,7 @@ "azT" = ( /obj/machinery/washing_machine, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/laundry) @@ -14259,8 +13855,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -14314,8 +13909,7 @@ dir = 4 }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) @@ -14383,8 +13977,7 @@ icon_state = "pipe-c" }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) @@ -14402,15 +13995,13 @@ /area/bridge/meeting_room) "aAp" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) "aAr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -14430,8 +14021,7 @@ /area/bridge/meeting_room) "aAu" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/bridge/secondary/teleporter) @@ -14485,7 +14075,6 @@ }, /obj/machinery/computer/id_restorer{ dir = 1; - icon_state = "restorer"; pixel_y = -32 }, /obj/effect/floor_decal/corner/lightgrey/border, @@ -14649,14 +14238,11 @@ "aAM" = ( /obj/structure/mirror{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/effect/landmark{ name = "morphspawn" @@ -14690,7 +14276,6 @@ frequency = 1379; master_tag = "eng_starboard_airlock"; name = "exterior access button"; - pixel_x = 0; pixel_y = -25; req_one_access = list(11,24) }, @@ -14800,7 +14385,6 @@ /obj/structure/table/bench/standard, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled, @@ -14869,7 +14453,6 @@ "aBn" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/wood, @@ -14890,7 +14473,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -14906,8 +14488,7 @@ pixel_y = 3 }, /obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = -3; - pixel_y = 0 + pixel_x = -3 }, /turf/simulated/floor/tiled, /area/engineering/engine_eva) @@ -15030,8 +14611,7 @@ /area/engineering/hallway) "aBB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -15043,8 +14623,7 @@ dir = 4 }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/effect/landmark{ name = "xeno_spawn"; @@ -15072,7 +14651,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -15106,8 +14684,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/maintenance/substation/civilian) @@ -15359,9 +14936,7 @@ /area/engineering/atmos/backup) "aCk" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -15382,7 +14957,6 @@ "aCm" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/landmark{ @@ -15399,8 +14973,7 @@ "aCo" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) @@ -15469,9 +15042,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -15599,7 +15170,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /obj/machinery/camera/network/tether{ @@ -15668,9 +15238,7 @@ /obj/structure/table/reinforced, /obj/machinery/recharger, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 1 @@ -15685,8 +15253,7 @@ /area/engineering/workshop) "aCR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/structure/cable{ d1 = 1; @@ -15714,9 +15281,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/powered/pump/filled, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled{ icon_state = "monotile" @@ -15754,9 +15319,7 @@ dir = 10 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -15772,7 +15335,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -15789,8 +15351,7 @@ /obj/item/weapon/storage/box/lights/mixed, /obj/item/weapon/storage/box/lights/mixed, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/station/stairs_one) @@ -15819,8 +15380,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -15833,8 +15393,7 @@ }, /obj/machinery/status_display{ layer = 4; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -15877,8 +15436,7 @@ "aDi" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/window/reinforced{ dir = 1 @@ -15890,9 +15448,7 @@ dir = 9 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) @@ -15910,7 +15466,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -15991,8 +15546,7 @@ /area/tether/station/visitorhallway) "aDy" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -16065,8 +15619,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/maintenance/substation/civilian) @@ -16098,7 +15651,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/random/junk, @@ -16169,7 +15721,6 @@ /area/hallway/station/atrium) "aEa" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; frequency = 1379; id_tag = "eng_starboard_pump" }, @@ -16179,8 +15730,7 @@ "aEb" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/tiled, /area/engineering/engine_eva) @@ -16190,7 +15740,6 @@ /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; - dir = 1; icon_state = "pdoor0"; id = "secondary_bridge_blast"; layer = 1; @@ -16280,8 +15829,7 @@ /area/tether/station/dock_one) "aEp" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) @@ -16375,8 +15923,7 @@ /area/engineering/foyer) "aEv" = ( /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -16389,8 +15936,7 @@ /area/bridge/meeting_room) "aEx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/meter, /obj/structure/cable{ @@ -16404,8 +15950,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16447,22 +15992,18 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled, /area/engineering/hallway) "aEB" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/effect/landmark{ name = "morphspawn" @@ -16484,8 +16025,7 @@ "aED" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 22; - pixel_y = 0 + pixel_x = 22 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -16494,8 +16034,7 @@ dir = 4 }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) @@ -16525,8 +16064,7 @@ "aEI" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -16577,12 +16115,10 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Damn, looks like it's on the clown world channel. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -16606,8 +16142,7 @@ dir = 8 }, /obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() + name = "Shower" }, /obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/tiled, @@ -16616,8 +16151,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like its Fawkes News, I wonder what else is on?"; icon_state = "frame"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) @@ -16638,8 +16172,7 @@ dir = 4 }, /obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() + name = "Shower" }, /obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/tiled, @@ -16647,9 +16180,7 @@ "aEX" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Civilian"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green{ d2 = 2; @@ -16661,8 +16192,7 @@ "aFc" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor, /area/storage/emergency_storage/emergency4) @@ -16685,7 +16215,6 @@ id_tag = "eng_starboard_pump" }, /obj/machinery/airlock_sensor{ - frequency = 1379; id_tag = "eng_starboard_sensor"; pixel_x = 24; pixel_y = 10 @@ -16815,8 +16344,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -16919,8 +16447,7 @@ /area/engineering/workshop) "aIi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/structure/cable{ d1 = 1; @@ -16949,7 +16476,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /turf/simulated/floor/tiled, @@ -16960,14 +16486,11 @@ }, /obj/structure/mirror{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) @@ -16975,7 +16498,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable{ @@ -17034,8 +16556,7 @@ /area/tether/station/dock_two) "aJk" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) @@ -17044,12 +16565,10 @@ dir = 4 }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ dir = 4 @@ -17067,7 +16586,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -17139,8 +16657,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_engineering{ - name = "Engineering Hallway"; - req_one_access = list(10) + name = "Engineering Hallway" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -17193,9 +16710,7 @@ /obj/structure/bedsheetbin, /obj/random/soap, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) @@ -17210,8 +16725,7 @@ /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, /obj/machinery/atmospherics/pipe/zpipe/up/supply, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/cable{ icon_state = "16-0" @@ -17287,7 +16801,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -17504,7 +17017,6 @@ dir = 4 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -17660,8 +17172,7 @@ /area/engineering/hallway) "aMl" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/machinery/recharge_station, /turf/simulated/floor/tiled/white, @@ -17669,7 +17180,6 @@ "aMp" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/washing_machine, @@ -17701,8 +17211,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -17757,26 +17266,22 @@ /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, /obj/structure/cable/green, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) "aNe" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -17788,8 +17293,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) @@ -17851,9 +17355,7 @@ /area/crew_quarters/heads/chief) "aOU" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 1 @@ -17883,8 +17385,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/weapon/storage/toolbox/emergency, /obj/item/weapon/storage/toolbox/electrical, @@ -17912,9 +17413,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/carpet, @@ -18017,9 +17516,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) @@ -18141,13 +17638,10 @@ /area/crew_quarters/sleep/engi_wash) "aSa" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/computer/station_alert/all{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/structure/window/reinforced{ dir = 1 @@ -18209,9 +17703,7 @@ "aSu" = ( /obj/structure/table/reinforced, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/machinery/firealarm{ dir = 4; @@ -18263,7 +17755,6 @@ "aSL" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/item/device/radio/intercom{ @@ -18281,8 +17772,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -18306,8 +17796,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18450,8 +17939,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -18473,7 +17961,6 @@ department = "Chief Engineer's Desk"; departmentType = 6; name = "Chief Engineer RC"; - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -18486,15 +17973,13 @@ /area/crew_quarters/heads/chief) "aVH" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -18502,7 +17987,6 @@ "aVK" = ( /obj/structure/table/reinforced, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/random/tech_supply, @@ -18516,8 +18000,7 @@ }, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/random/tech_supply, /obj/random/tech_supply, @@ -18525,16 +18008,14 @@ /area/engineering/engineering_monitoring) "aVP" = ( /obj/machinery/computer/power_monitor{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/machinery/light, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) "aVW" = ( /obj/machinery/computer/rcon{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/machinery/requests_console/preset/engineering{ pixel_y = -30 @@ -18546,8 +18027,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -18565,9 +18045,7 @@ dir = 6 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -18625,7 +18103,6 @@ /obj/machinery/button/remote/driver{ id = "enginecore"; name = "Emergency Core Eject"; - pixel_x = 0; pixel_y = -21 }, /turf/simulated/floor/tiled/freezer, @@ -18711,9 +18188,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/door/firedoor/glass, @@ -18775,8 +18250,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -18822,8 +18296,7 @@ /area/hallway/station/atrium) "baQ" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/techfloor{ dir = 4 @@ -18869,8 +18342,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -18891,8 +18363,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -18992,7 +18463,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/effect/floor_decal/techfloor{ @@ -19030,8 +18500,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19071,8 +18540,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19116,8 +18584,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19135,7 +18602,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -19298,7 +18764,6 @@ "beY" = ( /obj/machinery/door/airlock/multi_tile/metal{ dir = 2; - icon_state = "door_closed"; name = "Cryogenic Storage" }, /obj/machinery/door/firedoor/glass, @@ -19388,7 +18853,6 @@ "bhc" = ( /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /obj/effect/floor_decal/borderfloor{ @@ -19426,8 +18890,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) @@ -19499,8 +18962,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -19516,8 +18978,7 @@ /obj/random/tech_supply, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/tech_supply, @@ -19529,8 +18990,7 @@ dir = 4 }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/storage/tools) @@ -19597,12 +19057,10 @@ /area/tether/station/dock_two) "bnl" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/table/rack{ dir = 8; @@ -19615,8 +19073,7 @@ /area/hallway/station/docks) "bno" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -19641,7 +19098,6 @@ "boc" = ( /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /obj/effect/floor_decal/borderfloor{ @@ -19809,8 +19265,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable/green{ d1 = 4; @@ -19834,8 +19289,7 @@ "bqT" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -19861,17 +19315,14 @@ "brX" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/light{ dir = 1 }, /obj/structure/mirror{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) @@ -19892,8 +19343,7 @@ "btr" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -19903,22 +19353,18 @@ "btt" = ( /obj/machinery/computer/guestpass{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/simulated/floor/tiled, /area/hallway/station/docks) "bvs" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) @@ -19935,27 +19381,17 @@ "byy" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "byA" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) -"byP" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "bzn" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -20039,8 +19475,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /obj/structure/window/reinforced{ dir = 1 @@ -20058,8 +19493,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /obj/structure/window/reinforced{ dir = 1 @@ -20102,7 +19536,6 @@ /obj/machinery/airlock_sensor{ frequency = 1380; id_tag = "dock_d1a2_sensor"; - pixel_x = 0; pixel_y = -25 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ @@ -20151,7 +19584,6 @@ /obj/machinery/airlock_sensor{ frequency = 1380; id_tag = "dock_d2a2_sensor"; - pixel_x = 0; pixel_y = -25 }, /obj/effect/map_helper/airlock/atmos/chamber_pump, @@ -20179,8 +19611,7 @@ /area/tether/station/dock_two) "bKo" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 8 @@ -20202,8 +19633,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -20219,7 +19649,6 @@ "bPl" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -20256,7 +19685,6 @@ /obj/machinery/airlock_sensor{ frequency = 1380; id_tag = "dock_d1a1_sensor"; - pixel_x = 0; pixel_y = -25 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -20300,7 +19728,6 @@ /obj/machinery/airlock_sensor{ frequency = 1380; id_tag = "dock_d2a1_sensor"; - pixel_x = 0; pixel_y = -25 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ @@ -20334,8 +19761,7 @@ /area/tether/station/dock_two) "bPO" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) @@ -20382,15 +19808,13 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_two) "bQl" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/machinery/light/small{ dir = 4 @@ -20457,8 +19881,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -20512,8 +19935,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/simulated/floor/plating, /area/tether/station/dock_two) @@ -20754,8 +20176,7 @@ "ceq" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_engineering{ - name = "Engineering Hallway"; - req_one_access = list(10) + name = "Engineering Hallway" }, /obj/structure/cable{ d1 = 1; @@ -20773,8 +20194,7 @@ }, /obj/structure/closet/radiation, /obj/effect/floor_decal/corner_steel_grid{ - dir = 1; - icon_state = "steel_grid" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) @@ -20885,8 +20305,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -20978,8 +20397,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/simulated/floor/plating, /area/tether/station/dock_one) @@ -21065,7 +20483,6 @@ /obj/effect/floor_decal/corner/purple/bordercorner2, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -21131,8 +20548,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 @@ -21179,17 +20595,13 @@ /area/hallway/station/atrium) "eMS" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) "eYw" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -21222,9 +20634,7 @@ /area/hallway/station/atrium) "fgA" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 1 @@ -21234,7 +20644,6 @@ "fil" = ( /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /turf/simulated/floor/tiled, @@ -21247,13 +20656,10 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -21287,7 +20693,6 @@ /area/hallway/station/docks) "fqP" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -21343,7 +20748,6 @@ alarm_id = null; breach_detection = 0; dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled, @@ -21377,9 +20781,7 @@ dir = 5 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 4 @@ -21426,9 +20828,7 @@ /area/engineering/hallway) "fUR" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 1 @@ -21463,17 +20863,14 @@ /area/engineering/hallway) "ghJ" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, /obj/machinery/alarm{ dir = 4; - pixel_x = -35; - pixel_y = 0 + pixel_x = -35 }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) @@ -21531,8 +20928,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) @@ -21540,9 +20936,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/engineering/gravity_lobby) @@ -21566,9 +20960,7 @@ /area/tether/station/dock_two) "gOT" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -21619,8 +21011,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/station/docks) @@ -21708,8 +21099,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/firedoor/glass/hidden/steel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21746,8 +21136,7 @@ dir = 10 }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 4; - icon_state = "steel_grid" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) @@ -21825,8 +21214,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -21849,21 +21237,17 @@ pixel_x = 28 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "iIr" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -21901,14 +21285,12 @@ }, /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -22012,8 +21394,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/cable/green{ @@ -22023,9 +21404,7 @@ /area/engineering/gravity_gen) "jNX" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -22040,8 +21419,7 @@ /area/engineering/gravity_lobby) "jOe" = ( /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -22089,8 +21467,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -22127,8 +21504,7 @@ "jXa" = ( /obj/effect/floor_decal/sign/dock/two, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) @@ -22176,8 +21552,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) @@ -22230,7 +21605,6 @@ /obj/machinery/airlock_sensor{ frequency = 1380; id_tag = "dock_d1a3_sensor"; - pixel_x = 0; pixel_y = -25 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ @@ -22245,7 +21619,6 @@ "kRp" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -22337,8 +21710,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -22448,8 +21820,7 @@ }, /obj/structure/closet/emcloset, /obj/effect/floor_decal/corner_steel_grid{ - dir = 1; - icon_state = "steel_grid" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) @@ -22467,12 +21838,10 @@ dir = 4 }, /obj/effect/floor_decal/industrial/danger{ - dir = 4; - icon_state = "danger" + dir = 4 }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) @@ -22545,9 +21914,7 @@ /area/tether/station/dock_one) "mPs" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -22647,8 +22014,7 @@ "nYL" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) @@ -22689,8 +22055,7 @@ }, /obj/structure/closet/radiation, /obj/effect/floor_decal/corner_steel_grid{ - dir = 8; - icon_state = "steel_grid" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) @@ -22725,9 +22090,7 @@ /area/tether/station/dock_two) "ort" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -22760,9 +22123,7 @@ dir = 6 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -22819,8 +22180,7 @@ "oOm" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -22876,8 +22236,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -22892,9 +22251,7 @@ /area/engineering/hallway) "pbR" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -22912,8 +22269,7 @@ /area/engineering/gravity_gen) "pny" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) @@ -22960,7 +22316,6 @@ "pSI" = ( /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /obj/effect/floor_decal/borderfloor{ @@ -22985,8 +22340,7 @@ dir = 6 }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 6; - icon_state = "steel_grid" + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23026,8 +22380,7 @@ }, /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/effect/floor_decal/corner_steel_grid{ - dir = 8; - icon_state = "steel_grid" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) @@ -23051,8 +22404,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/computer/guestpass{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -23062,8 +22414,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -23189,9 +22540,7 @@ /area/engineering/gravity_lobby) "rys" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -23268,8 +22617,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -23347,12 +22695,10 @@ dir = 4 }, /obj/effect/floor_decal/industrial/danger{ - dir = 4; - icon_state = "danger" + dir = 4 }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23364,8 +22710,7 @@ /area/engineering/gravity_gen) "scB" = ( /obj/machinery/computer/shuttle_control/tether_backup{ - dir = 8; - icon_state = "computer" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) @@ -23414,8 +22759,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) @@ -23493,8 +22837,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23511,9 +22854,7 @@ /area/hallway/station/atrium) "sTb" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -23658,12 +22999,10 @@ /area/tether/station/dock_one) "tAQ" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 @@ -23724,8 +23063,7 @@ /area/tether/station/dock_one) "tOr" = ( /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -23871,8 +23209,7 @@ dir = 10 }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 4; - icon_state = "steel_grid" + dir = 4 }, /obj/item/device/geiger, /obj/structure/table/standard, @@ -23923,7 +23260,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's set to GNN, I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -23967,8 +23303,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -24112,7 +23447,6 @@ dir = 4 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24125,9 +23459,7 @@ /area/hallway/station/docks) "vYM" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -24158,9 +23490,7 @@ dir = 6 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -24192,8 +23522,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) @@ -24254,8 +23583,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) @@ -24314,9 +23642,7 @@ pixel_z = -8 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -32943,7 +32269,7 @@ aBi aBi aDu aCN -byP +bPO aDL jbc fil @@ -33061,7 +32387,7 @@ aDj aER aaV aIo -aec +aeh aMr aqt amB @@ -37586,7 +36912,7 @@ aac aac aac adO -ajx +aec ajS alJ ali diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 8d0015ec8f9..5b3b9de6584 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -99,17 +99,14 @@ /area/maintenance/station/sec_lower) "an" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -126,16 +123,13 @@ /area/security/brig/visitation) "ao" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 4; - icon_state = "borderfloor_shifted" + dir = 4 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 4; - icon_state = "bordercolor_shifted" + dir = 4 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/structure/table/reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -151,16 +145,13 @@ /area/security/brig/visitation) "ap" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 4; - icon_state = "borderfloor_shifted" + dir = 4 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 4; - icon_state = "bordercolor_shifted" + dir = 4 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -188,8 +179,7 @@ /obj/structure/bed/chair, /obj/effect/floor_decal/borderfloor/corner, /obj/machinery/atmospherics/pipe/manifold/hidden/green{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/bordercorner, /turf/simulated/floor/tiled, @@ -210,12 +200,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/corner/lightorange/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/brig) @@ -250,7 +238,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/freezer, @@ -274,8 +261,7 @@ dir = 1 }, /obj/structure/holohoop{ - dir = 4; - icon_state = "hoop" + dir = 4 }, /turf/simulated/floor/tiled/monotile, /area/security/brig) @@ -305,8 +291,7 @@ }, /obj/effect/floor_decal/corner/white/border, /obj/structure/holohoop{ - dir = 8; - icon_state = "hoop" + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/security/brig) @@ -387,8 +372,7 @@ dir = 10 }, /obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 8; - icon_state = "borderfloorcorner2_black" + dir = 8 }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -436,9 +420,7 @@ "aT" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/simulated/floor/tiled/freezer, /area/security/brig/bathroom) @@ -489,9 +471,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -519,16 +499,13 @@ /area/security/security_cell_hallway) "aY" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/structure/table/steel, /obj/machinery/alarm{ @@ -562,8 +539,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/lightorange/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled/steel_dirty, /area/security/brig) @@ -576,8 +552,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/lightorange/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /turf/simulated/floor/tiled/steel_dirty, /area/security/brig) @@ -589,9 +564,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -620,8 +593,7 @@ req_access = list(1,2) }, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, @@ -675,9 +647,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -685,9 +655,7 @@ "bj" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor, /area/maintenance/station/sec_lower) @@ -719,8 +687,7 @@ "bm" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/spline/plain{ - dir = 8; - icon_state = "spline_plain" + dir = 8 }, /obj/structure/railing{ dir = 8 @@ -730,8 +697,7 @@ /area/security/brig) "bn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/machinery/power/apc{ dir = 8; @@ -758,8 +724,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -787,7 +752,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -846,8 +810,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/green, /obj/effect/floor_decal/corner/lightorange/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/security/brig) @@ -862,8 +825,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/lightorange/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /turf/simulated/floor/tiled/steel_dirty, /area/security/brig) @@ -881,12 +843,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/corner/lightorange/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/brig) @@ -905,8 +865,7 @@ /area/maintenance/station/exploration) "bz" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor, /area/maintenance/station/exploration) @@ -928,8 +887,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/lightorange/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled/steel_dirty, /area/security/brig) @@ -966,8 +924,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/lightorange/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/brig) @@ -1007,8 +964,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/lightorange/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /turf/simulated/floor/tiled, /area/security/brig) @@ -1041,8 +997,6 @@ icon_state = "1-2" }, /obj/machinery/door_timer/cell_3{ - id = "Cell 3"; - name = "Cell 3"; pixel_x = -32 }, /turf/simulated/floor/tiled, @@ -1062,7 +1016,6 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -1110,7 +1063,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -1141,8 +1093,7 @@ /area/security/security_cell_hallway) "bN" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -1232,8 +1183,7 @@ /area/maintenance/station/sec_lower) "bS" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/brig) @@ -1243,7 +1193,6 @@ "bU" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor, @@ -1253,8 +1202,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/machinery/camera/network/exploration, /turf/simulated/floor/tiled, @@ -1268,8 +1216,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 @@ -1308,20 +1255,16 @@ /area/tether/exploration/crew) "bY" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/bed/padded, /turf/simulated/floor/tiled, @@ -1338,7 +1281,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; frequency = 1442; - icon_state = "map_injector"; id = "riot_inject" }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -1346,20 +1288,16 @@ /area/security/brig) "ca" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/security/brig) @@ -1368,7 +1306,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1442; - icon_state = "map_injector"; id = "riot_inject" }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -1376,20 +1313,16 @@ /area/security/brig) "cc" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/bed/padded, /obj/item/weapon/bedsheet, @@ -1440,13 +1373,10 @@ /area/security/brig) "cj" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -1596,8 +1526,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -1623,8 +1552,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -1660,16 +1588,13 @@ /area/security/security_cell_hallway) "cw" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/cryopod{ @@ -1699,7 +1624,6 @@ }, /obj/machinery/door/airlock/maintenance/sec{ name = "Riot Control"; - req_access = list(); req_one_access = list(2,63) }, /obj/structure/disposalpipe/segment, @@ -1747,8 +1671,7 @@ dir = 4 }, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) @@ -1760,13 +1683,10 @@ /area/security/brig) "cE" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -1783,13 +1703,10 @@ /area/tether/exploration/crew) "cF" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -1800,25 +1717,20 @@ name = "Explorer" }, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "cG" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 8; - icon_state = "borderfloor_shifted" + dir = 8 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 8; - icon_state = "bordercolor_shifted" + dir = 8 }, /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/structure/table/reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -1829,13 +1741,10 @@ /area/security/brig/visitation) "cH" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -1893,16 +1802,13 @@ /area/maintenance/station/sec_lower) "cM" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, @@ -1960,8 +1866,7 @@ icon_state = "4-8" }, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/security/brig) @@ -1994,7 +1899,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -2003,7 +1907,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/window/brigdoor/southleft{ dir = 4; - icon_state = "leftsecure"; id = "Cell 3"; name = "Cell 3"; req_access = list(2) @@ -2059,7 +1962,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -2165,13 +2067,10 @@ /area/tether/exploration/showers) "de" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -2214,13 +2113,10 @@ /area/engineering/shaft) "di" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -2237,16 +2133,13 @@ /area/security/brig/visitation) "dk" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 4; - icon_state = "borderfloor_shifted" + dir = 4 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 4; - icon_state = "bordercolor_shifted" + dir = 4 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -2296,16 +2189,13 @@ /area/engineering/shaft) "do" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 8; - icon_state = "borderfloor_shifted" + dir = 8 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 8; - icon_state = "bordercolor_shifted" + dir = 8 }, /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -2321,7 +2211,6 @@ "dp" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/vending/hydronutrients/brig{ @@ -2331,16 +2220,13 @@ /area/security/brig) "dq" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/closet/secure_closet/brig{ @@ -2375,16 +2261,13 @@ /area/security/security_cell_hallway) "dt" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 8; - icon_state = "borderfloor_shifted" + dir = 8 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 8; - icon_state = "bordercolor_shifted" + dir = 8 }, /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -2396,8 +2279,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 10; - icon_state = "borderfloorcorner2_black" + dir = 10 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -2427,16 +2309,13 @@ /area/security/recstorage) "dw" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/closet/secure_closet/brig{ @@ -2448,8 +2327,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/red/border/shifted, /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -2503,7 +2381,6 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -2515,7 +2392,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled/white, @@ -2543,7 +2419,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -2568,7 +2443,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1442; - icon_state = "map_injector"; id = "riot_inject" }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -2587,8 +2461,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/red/border/shifted, /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -2614,7 +2487,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; frequency = 1442; - icon_state = "map_injector"; id = "riot_inject" }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -2622,16 +2494,13 @@ /area/security/brig) "dO" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/closet/secure_closet/brig{ @@ -2686,9 +2555,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -2764,8 +2631,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 @@ -2837,12 +2703,10 @@ "ef" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled/dark, @@ -2883,8 +2747,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/dark, /area/storage/tech) @@ -2939,8 +2802,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/security/brig/visitation) @@ -2980,8 +2842,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/green, /obj/effect/floor_decal/corner/lightorange/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /obj/structure/bed/chair{ dir = 1 @@ -2990,8 +2851,7 @@ /area/security/brig) "et" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/alarm{ dir = 1; @@ -3040,7 +2900,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -3057,13 +2916,10 @@ /area/security/brig) "ex" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, @@ -3103,13 +2959,10 @@ /area/ai_upload) "eB" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -3122,7 +2975,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -3172,14 +3024,11 @@ dir = 1 }, /obj/effect/floor_decal/corner/white/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -3189,8 +3038,7 @@ dir = 10 }, /obj/effect/floor_decal/corner/white/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -3202,8 +3050,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 @@ -3232,13 +3079,10 @@ dir = 9 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 10 @@ -3279,13 +3123,10 @@ /area/tether/exploration/hallway) "eL" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -3297,8 +3138,7 @@ dir = 4 }, /obj/machinery/camera/network/exploration{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) @@ -3378,16 +3218,14 @@ /area/tether/exploration/staircase) "eS" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/sign/deathsposal{ pixel_x = -32 @@ -3477,8 +3315,7 @@ id = "interrogation" }, /obj/structure/window/reinforced/tinted{ - dir = 8; - icon_state = "twindow" + dir = 8 }, /obj/structure/window/reinforced/tinted, /obj/structure/window/reinforced/tinted{ @@ -3505,8 +3342,7 @@ /obj/structure/table/steel, /obj/item/toy/stickhorse, /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/security/recstorage) @@ -3520,8 +3356,7 @@ id = "interrogation" }, /obj/structure/window/reinforced/tinted{ - dir = 4; - icon_state = "twindow" + dir = 4 }, /obj/structure/window/reinforced/tinted, /obj/structure/window/reinforced/tinted{ @@ -3562,7 +3397,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -3570,9 +3404,7 @@ "fi" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/catwalk, /turf/simulated/floor, @@ -3687,8 +3519,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 @@ -3706,18 +3537,13 @@ /area/tether/exploration/hallway) "fz" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 10 @@ -3733,7 +3559,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -3768,8 +3593,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 @@ -3833,8 +3657,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -3885,13 +3708,10 @@ /area/security/interrogation) "fL" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -3948,8 +3768,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4014,8 +3833,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance/engi{ - name = "Engineering Electrical Shaft"; - req_one_access = list(10) + name = "Engineering Electrical Shaft" }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, @@ -4035,7 +3853,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -4077,7 +3894,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/dark, @@ -4087,8 +3903,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 6 @@ -4110,13 +3925,10 @@ /area/tether/exploration/crew) "ge" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 8 @@ -4131,8 +3943,7 @@ dir = 5 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -4185,8 +3996,7 @@ dir = 10 }, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/bluegrid, /area/ai_upload) @@ -4243,7 +4053,6 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -4301,8 +4110,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/locker_room) @@ -4334,8 +4142,7 @@ /area/hallway/station/starboard) "gy" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4348,13 +4155,10 @@ /area/security/security_cell_hallway) "gz" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -4366,8 +4170,7 @@ /obj/item/weapon/paper_bin, /obj/item/device/taperecorder, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) @@ -4411,8 +4214,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -4434,13 +4236,10 @@ /area/tether/exploration/crew) "gH" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -4458,8 +4257,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 6 @@ -4481,13 +4279,10 @@ /area/tether/exploration/hallway) "gJ" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 8 @@ -4506,7 +4301,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled, @@ -4519,8 +4313,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) @@ -4623,8 +4416,7 @@ dir = 8 }, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled, /area/security/brig) @@ -4650,8 +4442,7 @@ /area/security/security_cell_hallway) "gW" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4702,8 +4493,7 @@ icon_state = "comfychair_preview" }, /obj/machinery/camera/network/exploration{ - dir = 1; - icon_state = "camera" + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) @@ -4753,13 +4543,10 @@ /area/tether/exploration/crew) "hf" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -4790,8 +4577,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -4806,8 +4592,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -4853,8 +4638,7 @@ /area/maintenance/station/exploration) "hn" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4973,7 +4757,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/dark, @@ -5049,14 +4832,9 @@ /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "hC" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/purple/bordercorner, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -5076,8 +4854,7 @@ /area/tether/exploration/hallway) "hD" = ( /obj/machinery/ai_status_display{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/porta_turret, /turf/simulated/floor/bluegrid, @@ -5096,7 +4873,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /turf/simulated/floor/tiled/techfloor, @@ -5128,17 +4904,14 @@ }, /obj/item/device/radio/intercom/locked/ai_private{ dir = 1; - icon_state = "intercom"; pixel_y = 32 }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "hH" = ( /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/porta_turret, /turf/simulated/floor/bluegrid, @@ -5208,8 +4981,7 @@ "hP" = ( /obj/structure/railing, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/open, /area/engineering/locker_room) @@ -5218,13 +4990,10 @@ /area/engineering/foyer_mezzenine) "hR" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 @@ -5233,13 +5002,10 @@ /area/tether/exploration/hallway) "hS" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -5380,9 +5146,7 @@ "if" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/bluegrid, /area/ai_upload) @@ -5455,26 +5219,21 @@ dir = 9 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "in" = ( /obj/structure/disposalpipe/sortjunction{ dir = 8; - icon_state = "pipe-j1s"; name = "Exploration Hangar"; sortType = "Exploration Hangar" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -5488,13 +5247,10 @@ icon_state = "pipe-c" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -5573,8 +5329,7 @@ icon_state = "4-8" }, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/security/interrogation) @@ -5592,18 +5347,13 @@ /area/tether/exploration/staircase) "iy" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 4 @@ -5640,13 +5390,10 @@ /area/security/riot_control) "iA" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -5657,13 +5404,10 @@ /area/tether/exploration/hallway) "iB" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -5689,13 +5433,10 @@ /area/security/security_cell_hallway) "iE" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -5704,7 +5445,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -5751,13 +5491,10 @@ icon_state = "1-2" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 @@ -5767,13 +5504,10 @@ /area/tether/exploration/hallway) "iI" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -5786,22 +5520,17 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "iJ" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -5831,8 +5560,7 @@ }, /obj/structure/flora/pottedplant/crystal, /obj/machinery/camera/network/exploration{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -6026,20 +5754,16 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/bluegrid, /area/ai_upload) "iY" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -6051,8 +5775,7 @@ dir = 4 }, /obj/machinery/camera/network/exploration{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -6115,7 +5838,6 @@ "jc" = ( /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -6266,7 +5988,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -6284,14 +6005,6 @@ /turf/simulated/floor/bluegrid, /area/ai_upload) "jn" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/purple/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -6304,6 +6017,14 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/purple/bordercorner, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "jo" = ( @@ -6384,8 +6105,7 @@ dir = 4 }, /obj/machinery/camera/network/exploration{ - dir = 1; - icon_state = "camera" + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -6444,8 +6164,7 @@ /area/tether/exploration/crew) "ju" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/railing, /turf/simulated/floor, @@ -6559,7 +6278,6 @@ /obj/effect/floor_decal/corner/yellow/border, /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -6609,8 +6327,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) @@ -6783,7 +6500,6 @@ /area/storage/tech) "jS" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -6866,33 +6582,32 @@ /area/ai_upload) "kb" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/bluegrid, /area/ai_upload) "kc" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, /obj/structure/table/rack/shelf, -/obj/item/device/multitool/tether_buffered{ - pixel_y = 2 +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = 24 }, -/obj/item/weapon/storage/toolbox/mechanical{ - pixel_y = -4 - }, -/obj/item/weapon/hand_labeler, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "kd" = ( @@ -6905,13 +6620,10 @@ /area/ai_upload) "ke" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -6923,8 +6635,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -6988,24 +6699,25 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "km" = ( +/obj/item/clothing/under/gladiator, +/obj/item/clothing/head/helmet/gladiator, +/turf/simulated/floor, +/area/tether/exploration/hallway) +"kn" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) -"kn" = ( -/turf/simulated/wall, -/area/tether/exploration/hallway) "ko" = ( /obj/structure/catwalk, /turf/simulated/floor, @@ -7073,8 +6785,7 @@ }, /obj/effect/floor_decal/techfloor/hole/right, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) @@ -7134,55 +6845,63 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "kA" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/purple/border{ - dir = 6 - }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/purple/border, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/purple/bordercorner2, -/obj/structure/flora/pottedplant/unusual, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "kB" = ( -/obj/item/clothing/under/gladiator, -/obj/item/clothing/head/helmet/gladiator, -/turf/simulated/floor, -/area/tether/exploration/hallway) -"kC" = ( /obj/item/weapon/material/twohanded/spear/foam, /turf/simulated/floor, /area/tether/exploration/hallway) -"kD" = ( -/obj/structure/table/rack/shelf, +"kC" = ( /obj/effect/floor_decal/borderfloor{ - dir = 9 + dir = 6 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 9; - icon_state = "bordercolor" + dir = 6 }, +/obj/structure/flora/pottedplant/unusual, +/turf/simulated/floor/tiled, +/area/tether/exploration/hallway) +"kD" = ( +/obj/structure/table/rack/shelf, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, /obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, /obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, /obj/item/clothing/head/helmet/space/void/exploration, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "kE" = ( /obj/structure/table/rack/shelf, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -7190,18 +6909,14 @@ }, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "kF" = ( @@ -7233,14 +6948,11 @@ "kH" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Exploration"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 0 + icon_state = "0-2" }, /obj/structure/cable/green, /obj/machinery/camera/network/engineering{ @@ -7305,15 +7017,11 @@ /turf/simulated/floor, /area/storage/tech) "kR" = ( -/obj/structure/table/rack/shelf, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -7325,19 +7033,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/machinery/suit_cycler/exploration, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "kS" = ( @@ -7351,8 +7047,7 @@ dir = 9 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) @@ -7402,8 +7097,7 @@ /area/maintenance/station/eng_upper) "kX" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/zpipe/down, /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers, @@ -7486,13 +7180,11 @@ /area/hallway/station/starboard) "lc" = ( /obj/machinery/power/terminal{ - dir = 8; - icon_state = "term" + dir = 8 }, /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 0 + icon_state = "0-2" }, /obj/machinery/light/small{ dir = 4 @@ -7538,15 +7230,16 @@ /turf/simulated/floor, /area/maintenance/substation/exploration) "lg" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, -/area/hallway/station/starboard) +/area/tether/exploration/equipment) "lh" = ( /obj/structure/cable{ d1 = 4; @@ -7575,24 +7268,27 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "lk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "ll" = ( @@ -7637,18 +7333,13 @@ /area/maintenance/station/exploration) "lo" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 4 @@ -7657,26 +7348,18 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/item/device/radio/intercom{ - dir = 1; - pixel_y = 24; - req_access = list() - }, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/flora/pottedplant/unusual, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "lp" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/steel, @@ -7694,7 +7377,13 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 5 }, -/obj/machinery/suit_cycler/exploration, +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "lr" = ( @@ -7707,8 +7396,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/catwalk, /turf/simulated/floor, @@ -7721,7 +7409,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/catwalk, @@ -7806,8 +7493,7 @@ "ly" = ( /obj/machinery/status_display{ layer = 4; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor, @@ -7930,8 +7616,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -7978,42 +7663,24 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "lM" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, /obj/effect/floor_decal/borderfloor{ - dir = 4 + dir = 5 }, /obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = 24 + dir = 5 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "lN" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 4 @@ -8023,9 +7690,7 @@ dir = 4 }, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/photocopier, @@ -8109,51 +7774,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"lU" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 - }, -/obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) -"lV" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) "lW" = ( /obj/structure/cable/green{ d1 = 4; @@ -8163,9 +7783,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "lX" = ( @@ -8175,11 +7792,10 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) @@ -8188,8 +7804,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -8212,13 +7827,10 @@ /area/tether/exploration/pathfinder_office) "ma" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -8294,7 +7906,6 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -8405,12 +8016,10 @@ "ml" = ( /obj/structure/table/steel, /obj/item/device/integrated_electronics/debugger{ - pixel_x = -5; - pixel_y = 0 + pixel_x = -5 }, /obj/item/device/integrated_electronics/wirer{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /turf/simulated/floor, /area/storage/tech) @@ -8508,8 +8117,7 @@ /obj/structure/cable, /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 0 + icon_state = "0-2" }, /obj/structure/cable{ d2 = 8; @@ -8526,20 +8134,22 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "mv" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/lightgrey/border{ +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/hallway/station/starboard) +/area/tether/exploration/hallway) "mw" = ( /obj/structure/railing, /obj/random/junk, @@ -8558,8 +8168,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -8817,7 +8426,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -8892,9 +8500,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/green{ @@ -9037,7 +8643,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -9047,13 +8652,11 @@ /obj/machinery/turretid/stun{ control_area = /area/ai_upload; name = "AI Upload turret control"; - pixel_x = 0; pixel_y = 30 }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) @@ -9166,8 +8769,7 @@ /area/hallway/station/starboard) "nm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) @@ -9179,7 +8781,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -9376,7 +8977,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -9398,7 +8998,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor, @@ -9556,7 +9155,6 @@ /area/tether/station/stairs_two) "nU" = ( /obj/machinery/ai_status_display{ - pixel_x = 0; pixel_y = -32 }, /obj/structure/table/rack/steel, @@ -9630,8 +9228,7 @@ "nZ" = ( /obj/machinery/status_display{ layer = 4; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/floor_decal/rust, /turf/simulated/floor, @@ -9679,8 +9276,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/open, /area/engineering/foyer_mezzenine) @@ -9727,8 +9323,7 @@ dir = 10 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -9762,8 +9357,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/catwalk, /obj/structure/disposalpipe/segment, @@ -9785,8 +9379,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -9816,13 +9409,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/catwalk, /obj/structure/disposalpipe/segment, @@ -9839,8 +9430,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/catwalk, /obj/structure/disposalpipe/segment, @@ -9951,33 +9541,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"oB" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 - }, -/obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/structure/table/bench/wooden, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 - }, -/obj/effect/landmark/start{ - name = "Field Medic" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) "oC" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -10045,8 +9608,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) @@ -10121,7 +9683,6 @@ /obj/machinery/door/airlock/glass_command{ id_tag = "evadoors"; name = "E.V.A."; - req_access = list(); req_one_access = list(18,19,43,67) }, /obj/machinery/door/firedoor/glass, @@ -10143,7 +9704,6 @@ /obj/machinery/door/airlock/glass_command{ id_tag = "evadoors"; name = "E.V.A."; - req_access = list(); req_one_access = list(18,19,43,67) }, /obj/machinery/door/firedoor/glass, @@ -10311,7 +9871,7 @@ "pu" = ( /obj/structure/table/bench/wooden, /obj/effect/landmark/start{ - name = "Field Medic" + name = "Explorer" }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) @@ -10364,8 +9924,7 @@ }, /obj/machinery/requests_console{ department = "EVA"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -10403,8 +9962,7 @@ /area/ai_monitored/storage/eva) "pC" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -10436,13 +9994,6 @@ /obj/item/clothing/head/helmet/space/void/security, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) -"pF" = ( -/obj/structure/table/bench/wooden, -/obj/effect/landmark/start{ - name = "Explorer" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) "pG" = ( /turf/simulated/floor/plating, /area/vacant/vacant_restaurant_upper) @@ -10507,8 +10058,7 @@ "pN" = ( /obj/machinery/requests_console{ department = "Tech storage"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/simulated/floor, /area/storage/tech) @@ -10551,7 +10101,6 @@ /area/hallway/station/starboard) "pR" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -10595,8 +10144,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -10612,9 +10160,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -10656,8 +10202,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -10667,7 +10212,7 @@ }, /obj/structure/table/bench/wooden, /obj/effect/landmark/start{ - name = "Explorer" + name = "Field Medic" }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) @@ -10676,8 +10221,7 @@ /area/ai_monitored/storage/eva) "qd" = ( /obj/machinery/door/airlock/glass_medical{ - name = "Medical Hardsuits"; - req_one_access = list(5) + name = "Medical Hardsuits" }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, @@ -10703,8 +10247,7 @@ /area/ai_monitored/storage/eva) "qh" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -10827,7 +10370,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable{ @@ -10874,8 +10416,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -10902,7 +10443,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /obj/structure/disposalpipe/segment{ @@ -11007,6 +10547,29 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) +"qJ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/table/bench/wooden, +/obj/effect/landmark/start{ + name = "Explorer" + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "qL" = ( /obj/structure/sign/nosmoking_1{ pixel_y = 32 @@ -11050,9 +10613,7 @@ /area/medical/surgery_hallway) "qP" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/item/device/radio/intercom{ @@ -11116,15 +10677,13 @@ /area/ai_monitored/storage/eva) "qU" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/table/rack, /obj/item/device/suit_cooling_unit, /obj/item/device/suit_cooling_unit, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -11157,8 +10716,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -11171,8 +10729,7 @@ department = "Pathfinder's Office" }, /obj/machinery/camera/network/exploration{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/exploration/pathfinder_office) @@ -11187,8 +10744,7 @@ /area/ai_server_room) "rb" = ( /obj/structure/disposalpipe/broken{ - dir = 4; - icon_state = "pipe-b" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -11323,7 +10879,6 @@ desc = "A remote control switch for exiting EVA."; id = "evadoors"; name = "EVA Door Control"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11336,9 +10891,7 @@ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -11361,8 +10914,7 @@ "ry" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -11383,8 +10935,7 @@ /area/medical/surgery_hallway) "rE" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11461,8 +11012,7 @@ dir = 4 }, /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -11568,8 +11118,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -11602,7 +11151,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -11623,7 +11171,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /obj/effect/floor_decal/borderfloor/corner2{ @@ -11636,8 +11183,7 @@ /area/hallway/station/port) "rZ" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/table/reinforced, /obj/fiftyspawner/rglass, @@ -11694,8 +11240,7 @@ scrub_id = "sec_riot_control" }, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/plating, /area/security/brig) @@ -11824,8 +11369,7 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -11835,14 +11379,11 @@ /area/medical/psych) "sJ" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -11872,8 +11413,7 @@ /area/medical/surgery_hallway) "sP" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/table/reinforced, /obj/item/weapon/storage/toolbox/electrical{ @@ -11965,8 +11505,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) @@ -12068,8 +11607,7 @@ "tr" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -12214,8 +11752,7 @@ /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, @@ -12238,18 +11775,14 @@ /area/ai_upload_foyer) "tH" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/open, /area/vacant/vacant_restaurant_upper) "tI" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -12275,8 +11808,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 @@ -12336,9 +11868,7 @@ pixel_y = -3 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -12403,8 +11933,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/cable/green{ d1 = 1; @@ -12447,8 +11976,7 @@ /area/ai_monitored/storage/eva) "uh" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12475,8 +12003,7 @@ "uk" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) @@ -12512,9 +12039,7 @@ "ur" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; - pixel_x = 2; - pixel_y = 0 + pixel_x = 2 }, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 5 @@ -12527,8 +12052,7 @@ /area/medical/resleeving) "us" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/effect/floor_decal/techfloor{ dir = 1 @@ -12539,9 +12063,7 @@ "ut" = ( /obj/machinery/washing_machine, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -12593,8 +12115,7 @@ /obj/item/weapon/storage/box/syringes, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -12672,15 +12193,13 @@ "uG" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "uH" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -12717,8 +12236,7 @@ req_one_access = list(18) }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -12733,7 +12251,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /obj/effect/map_helper/airlock/door/int_door, @@ -12908,8 +12425,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) @@ -12919,8 +12435,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) @@ -12932,8 +12447,7 @@ /area/ai_monitored/storage/eva) "vj" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/table/reinforced, /obj/item/weapon/storage/toolbox/mechanical{ @@ -12948,8 +12462,7 @@ /area/ai_monitored/storage/eva) "vk" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/tiled, @@ -12969,8 +12482,7 @@ /area/vacant/vacant_restaurant_upper) "vn" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -12979,8 +12491,7 @@ /area/tether/station/stairs_two) "vo" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12995,8 +12506,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13011,8 +12521,7 @@ /area/tether/station/stairs_two) "vq" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13024,8 +12533,7 @@ /area/tether/station/stairs_two) "vr" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13050,8 +12558,7 @@ }, /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /turf/simulated/floor/tiled/monofloor{ dir = 1 @@ -13083,8 +12590,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) @@ -13093,8 +12599,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -13115,8 +12620,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) @@ -13125,8 +12629,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/techfloor{ dir = 10 @@ -13138,8 +12641,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/dark, @@ -13147,9 +12649,7 @@ "vB" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -13193,7 +12693,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13248,7 +12747,6 @@ /obj/effect/floor_decal/industrial/warning, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -13266,7 +12764,6 @@ /obj/effect/floor_decal/industrial/warning/corner, /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -13406,8 +12903,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -13431,8 +12927,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) @@ -13446,8 +12941,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -13478,8 +12972,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) @@ -13523,8 +13016,7 @@ pixel_y = -2 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -13586,10 +13078,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/o2{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/storage/firstaid/o2, /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, @@ -13626,9 +13115,7 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -13678,7 +13165,6 @@ }, /obj/machinery/light_switch{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/simulated/floor/tiled/white, @@ -13692,7 +13178,6 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/computer/guestpass{ dir = 1; - icon_state = "guest"; pixel_y = -28 }, /turf/simulated/floor/tiled/white, @@ -13702,7 +13187,6 @@ dir = 1 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -13760,7 +13244,6 @@ /obj/structure/table/glass, /obj/item/weapon/book/manual/resleeving, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/structure/sign/nosmoking_1{ @@ -13798,10 +13281,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/toxin{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/storage/firstaid/toxin, /obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/tiled/white, /area/medical/biostorage) @@ -13811,10 +13291,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/fire{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/storage/firstaid/fire, /obj/effect/floor_decal/corner/yellow/full{ dir = 4 }, @@ -13822,8 +13299,7 @@ /area/medical/biostorage) "wP" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -13875,8 +13351,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ @@ -13907,7 +13382,6 @@ "wV" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor, @@ -13915,15 +13389,13 @@ "wW" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ scrub_id = "sec_riot_control" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/plating, /area/security/brig) @@ -13940,12 +13412,10 @@ /area/medical/surgery_hallway) "wY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/techfloor, /obj/effect/landmark{ @@ -14010,8 +13480,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -14052,8 +13521,7 @@ "xk" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/cable/green{ d1 = 1; @@ -14131,8 +13599,7 @@ dir = 4 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/biostorage) @@ -14156,8 +13623,7 @@ /obj/item/device/healthanalyzer, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -14194,7 +13660,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -14215,9 +13680,7 @@ "xv" = ( /obj/structure/bed/chair, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -14269,8 +13732,7 @@ dir = 8 }, /obj/machinery/camera/network/medbay{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -14339,8 +13801,7 @@ }, /obj/structure/closet/crate{ icon_state = "crate"; - name = "Grenade Crate"; - opened = 0 + name = "Grenade Crate" }, /obj/item/weapon/grenade/chem_grenade, /obj/item/weapon/grenade/chem_grenade, @@ -14401,8 +13862,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/biostorage) @@ -14416,8 +13876,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -14465,8 +13924,7 @@ dir = 4 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -14477,15 +13935,13 @@ dir = 10 }, /obj/effect/floor_decal/corner/white/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/effect/floor_decal/borderfloorwhite/corner2{ dir = 9 }, /obj/effect/floor_decal/corner/white/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -14532,7 +13988,6 @@ "ye" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 12; pixel_y = 8 }, @@ -14546,8 +14001,7 @@ dir = 5 }, /obj/effect/floor_decal/corner/white/bordercorner2{ - dir = 5; - icon_state = "bordercolorcorner2" + dir = 5 }, /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -14596,7 +14050,6 @@ icon_state = "pipe-c" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -14641,8 +14094,7 @@ /area/medical/surgery_hallway) "yr" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -14672,8 +14124,7 @@ /area/tether/station/stairs_two) "yt" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/landmark{ name = "JoinLateCyborg" @@ -14703,17 +14154,15 @@ /turf/simulated/floor, /area/maintenance/station/medbay) "yA" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/purple/border, +/obj/structure/closet/secure_closet/explorer, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 }, -/obj/effect/floor_decal/corner/purple/border{ - dir = 10 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/obj/structure/closet/secure_closet/sar, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "yB" = ( @@ -14729,7 +14178,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/structure/closet/secure_closet/sar, +/obj/structure/closet/secure_closet/explorer, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "yJ" = ( @@ -14740,8 +14189,7 @@ dir = 4 }, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/security/brig) @@ -14804,8 +14252,7 @@ "yZ" = ( /obj/machinery/optable, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/white, @@ -14870,8 +14317,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -14908,8 +14354,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/door/airlock/maintenance/medical, /turf/simulated/floor/tiled/white, @@ -14999,8 +14444,7 @@ dir = 6 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -15012,10 +14456,8 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -15027,8 +14469,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor, /area/maintenance/station/medbay) @@ -15076,8 +14517,7 @@ /obj/structure/closet/secure_closet/personal/patient, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -15107,13 +14547,11 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/button/windowtint{ id = "patient_room_a"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/green{ d2 = 2; @@ -15191,8 +14629,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/disposalpipe/segment, /obj/random/junk, @@ -15226,8 +14663,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 @@ -15250,8 +14686,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/patient_a) @@ -15269,8 +14704,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -15293,8 +14727,7 @@ "zZ" = ( /obj/machinery/door/firedoor/glass/hidden/steel, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -15367,9 +14800,7 @@ "Af" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop{ - dir = 8; - pixel_x = 0; - pixel_y = 0 + dir = 8 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -15401,9 +14832,7 @@ /area/medical/surgery_hallway) "Ah" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -15421,8 +14850,7 @@ /obj/structure/table/woodentable, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/machinery/light{ dir = 4 @@ -15492,8 +14920,7 @@ icon_state = "0-4" }, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /obj/random/junk, /obj/structure/table/rack{ @@ -15503,7 +14930,6 @@ /turf/simulated/floor, /area/maintenance/station/medbay) "As" = ( -/obj/structure/closet/secure_closet/explorer, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -15512,6 +14938,14 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/structure/table/rack/shelf, +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_y = -4 + }, +/obj/item/device/multitool/tether_buffered{ + pixel_y = 2 + }, +/obj/item/weapon/hand_labeler, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "At" = ( @@ -15574,8 +15008,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -15590,16 +15023,14 @@ /area/medical/surgery_hallway) "AC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "AD" = ( /obj/structure/railing, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /obj/random/trash_pile, /turf/simulated/floor, @@ -15619,8 +15050,7 @@ "AF" = ( /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -15643,13 +15073,11 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/button/windowtint{ id = "patient_room_b"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/green{ d2 = 2; @@ -15822,8 +15250,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 @@ -15846,8 +15273,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/patient_b) @@ -15888,8 +15314,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -15905,8 +15330,7 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -15930,8 +15354,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -15955,8 +15378,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/junction{ dir = 4; @@ -16150,7 +15572,6 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "Bt" = ( -/obj/structure/closet/secure_closet/explorer, /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -16160,6 +15581,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/closet/secure_closet/sar, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Bu" = ( @@ -16206,7 +15628,6 @@ "By" = ( /obj/structure/closet/crate/freezer, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -16220,7 +15641,6 @@ /obj/item/weapon/storage/box/bloodpacks, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /obj/effect/floor_decal/borderfloorwhite, @@ -16233,8 +15653,7 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -16264,7 +15683,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -16380,7 +15798,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/recharger/wallcharger{ @@ -16401,8 +15818,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 @@ -16514,16 +15930,14 @@ pixel_y = 6 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/tiled/white, /area/medical/recoveryrestroom) "Cg" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/medical/recoveryrestroom) @@ -16543,7 +15957,6 @@ }, /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -16626,8 +16039,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -16679,8 +16091,7 @@ "Cy" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/light, /turf/simulated/floor/tiled/white, @@ -16729,8 +16140,7 @@ dir = 6 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -16798,8 +16208,7 @@ "CM" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/tiled/white, /area/medical/recoveryrestroom) @@ -16887,8 +16296,7 @@ dir = 8 }, /obj/machinery/camera/network/medbay{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -16908,8 +16316,7 @@ /obj/item/weapon/bedsheet/medical, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -16939,9 +16346,7 @@ /obj/structure/table/standard, /obj/random/soap, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -16959,14 +16364,11 @@ "Da" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/simulated/floor/tiled/white, /area/medical/recoveryrestroom) @@ -17001,8 +16403,7 @@ "De" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/cable/green{ d1 = 1; @@ -17028,8 +16429,7 @@ }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -17074,8 +16474,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -17151,8 +16550,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -17167,12 +16565,10 @@ }, /obj/item/device/radio/intercom/locked/ai_private{ dir = 4; - icon_state = "intercom"; pixel_x = 32 }, /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) @@ -17187,6 +16583,28 @@ /obj/structure/closet/wardrobe/orange, /turf/simulated/floor/tiled/dark, /area/security/recstorage) +"Dt" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Dv" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -17374,7 +16792,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -17477,9 +16894,7 @@ /area/maintenance/station/exploration) "Ec" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/railing{ @@ -17511,8 +16926,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -17531,13 +16945,10 @@ /area/maintenance/station/sec_lower) "Eh" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -17575,6 +16986,9 @@ /area/tether/exploration/crew) "El" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "En" = ( @@ -17594,8 +17008,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 @@ -17658,8 +17071,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/cable/green{ d1 = 2; @@ -17719,8 +17131,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/recoveryrestroom) @@ -17735,17 +17146,13 @@ "EI" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -17768,7 +17175,6 @@ }, /obj/machinery/light_switch{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -17839,8 +17245,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/security/brig/visitation) @@ -17884,8 +17289,7 @@ /area/medical/ward) "ET" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -17922,8 +17326,7 @@ }, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 @@ -17948,8 +17351,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -17970,8 +17372,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/security/brig/visitation) @@ -17987,8 +17388,7 @@ /area/medical/ward) "Fb" = ( /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled, /area/security/brig/visitation) @@ -17996,7 +17396,6 @@ /obj/structure/bed/padded, /obj/item/weapon/bedsheet/medical, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -18048,9 +17447,7 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -18065,10 +17462,8 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -18076,8 +17471,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/status_display{ pixel_y = 30 @@ -18161,8 +17555,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -18184,7 +17577,6 @@ /turf/simulated/floor, /area/maintenance/station/sec_lower) "Fy" = ( -/obj/structure/closet/secure_closet/explorer, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -18194,9 +17586,9 @@ dir = 8 }, /obj/machinery/camera/network/exploration{ - dir = 1; - icon_state = "camera" + dir = 1 }, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Fz" = ( @@ -18267,7 +17659,6 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_two) "FE" = ( -/obj/structure/table/bench/wooden, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "FH" = ( @@ -18371,6 +17762,19 @@ "Gw" = ( /turf/simulated/floor/tiled/dark, /area/security/brig) +"GC" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 10 + }, +/obj/structure/closet/secure_closet/explorer, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "GD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18443,8 +17847,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -18494,8 +17897,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -18750,9 +18152,7 @@ /area/hallway/station/starboard) "IG" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/carpet/bcarpet, @@ -18768,7 +18168,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -18816,8 +18215,7 @@ "Jp" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/structure/cable/green{ d1 = 1; @@ -18882,8 +18280,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -18929,6 +18326,32 @@ /obj/structure/inflatable/door, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Kq" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/purple/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/hallway) +"Kt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Kv" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 6 @@ -19130,11 +18553,8 @@ "LP" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 1; - dir = 4; id_tag = null; name = "Exploration Equipment Storage"; - req_access = list(); req_one_access = list(19,43,67) }, /obj/structure/cable/green{ @@ -19150,6 +18570,12 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod1) +"Mf" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "Mn" = ( /obj/structure/table/steel, /turf/simulated/floor, @@ -19179,8 +18605,7 @@ /area/engineering/foyer_mezzenine) "Mw" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/closet/crate, /obj/random/junk, @@ -19207,13 +18632,10 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -19292,8 +18714,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/structure/cable/green{ d1 = 4; @@ -19323,8 +18744,7 @@ /area/engineering/locker_room) "Ng" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -19470,8 +18890,7 @@ "Oj" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/table/steel, /obj/random/maintenance/engineering, @@ -19486,8 +18905,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -19557,9 +18975,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -19585,8 +19001,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - icon_state = "map-scrubbers" + dir = 1 }, /turf/simulated/floor/tiled, /area/hallway/station/port) @@ -19651,16 +19066,14 @@ /area/hallway/station/starboard) "Pm" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/recharge_station, /turf/simulated/floor/tiled, /area/security/brig) "Pn" = ( /obj/effect/floor_decal/corner_steel_grid{ - dir = 4; - icon_state = "steel_grid" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -19687,8 +19100,7 @@ /area/maintenance/station/sec_lower) "PJ" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -19714,12 +19126,10 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/light_switch{ dir = 4; - icon_state = "light1"; pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -19733,8 +19143,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -19918,7 +19327,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -20020,8 +19428,7 @@ /area/maintenance/station/sec_lower) "Rg" = ( /obj/effect/floor_decal/corner/white/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled/monotile, /area/security/brig) @@ -20138,9 +19545,7 @@ /area/hallway/station/starboard) "Sb" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -20165,9 +19570,7 @@ icon_state = "pipe-c" }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -20218,13 +19621,10 @@ "SW" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -20295,6 +19695,13 @@ }, /turf/simulated/floor/tiled, /area/security/brig/visitation) +"Tl" = ( +/obj/structure/table/bench/wooden, +/obj/effect/landmark/start{ + name = "Field Medic" + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "Tm" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -20436,7 +19843,6 @@ icon_state = "1-4" }, /obj/machinery/door/blast/regular{ - dir = 1; id = "Cell 1"; name = "Cell 1" }, @@ -20610,6 +20016,30 @@ /obj/structure/bed/chair/shuttle, /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod1) +"Vi" = ( +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "Vk" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -20669,8 +20099,7 @@ dir = 4 }, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" + dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/station/port) @@ -20703,7 +20132,6 @@ icon_state = "1-4" }, /obj/machinery/door/blast/regular{ - dir = 1; id = "Cell 3"; name = "Cell 3" }, @@ -20838,7 +20266,6 @@ "WE" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 8 }, @@ -20880,12 +20307,34 @@ }, /turf/simulated/floor/tiled, /area/tether/station/stairs_two) +"WR" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/purple/border, +/turf/simulated/floor/tiled, +/area/tether/exploration/hallway) "WU" = ( /obj/machinery/vending/wallmed1{ layer = 3.3; name = "Emergency NanoMed"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/closet/walllocker/emerglocker/north, /obj/structure/bed/chair/shuttle, @@ -20914,8 +20363,7 @@ /area/tether/station/stairs_two) "Xp" = ( /obj/machinery/atmospherics/pipe/tank/nitrous_oxide{ - dir = 1; - icon_state = "n2o_map" + dir = 1 }, /turf/simulated/floor, /area/security/riot_control) @@ -20977,6 +20425,18 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"XP" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/purple/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/closet/secure_closet/sar, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "XQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -21018,16 +20478,13 @@ /area/security/brig/visitation) "XT" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/alarm{ pixel_y = 22 @@ -21064,8 +20521,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/catwalk, /turf/simulated/floor/airless, @@ -21146,9 +20602,7 @@ /area/security/brig) "YH" = ( /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = -32 }, /obj/structure/bed/chair/shuttle{ @@ -21279,6 +20733,27 @@ "Zy" = ( /turf/simulated/floor/plating, /area/engineering/shaft) +"ZA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "ZE" = ( /obj/structure/table/steel, /obj/random/maintenance/engineering, @@ -21290,6 +20765,22 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"ZI" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 9 + }, +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "ZJ" = ( /obj/structure/table/steel, /obj/item/weapon/storage/briefcase/inflatable, @@ -21317,12 +20808,10 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/table/reinforced, /obj/random/maintenance/clean, @@ -21341,7 +20830,6 @@ icon_state = "1-4" }, /obj/machinery/door/blast/regular{ - dir = 1; id = "Cell 2"; name = "Cell 2" }, @@ -31797,7 +31285,7 @@ jt hK jO hC -km +fv kA ea hz @@ -31938,11 +31426,11 @@ Ek gZ bA iy -jK -kn -kn +mv +fv +Kq ea -nl +kx lJ lJ li @@ -32082,12 +31570,12 @@ gG iA jn kn -kB +kC ea -nl -lJ -lJ -li +lM +Dt +Kt +ZA nN pQ DL @@ -32222,13 +31710,13 @@ gF he gG iB -jo -kn -kC -ea -lg -lM -mv +WR +kp +kp +kp +kp +kp +kp lj nO pR @@ -32366,10 +31854,10 @@ bA iE jp kp -kp -kp -kp -kp +ZI +Vi +qJ +GC kp lm nQ @@ -32496,8 +31984,8 @@ ac ac ac ac -ac -ac +ea +km ea eI gh @@ -32509,8 +31997,8 @@ iF jq kp kD -lU -oB +lg +pu yA kp lT @@ -32638,8 +32126,8 @@ ac ac ac ac -ac -ac +ea +kB ea eK fy @@ -32651,7 +32139,7 @@ iG jr kp kE -lV +lW pu yH kp @@ -33078,7 +32566,7 @@ lL ks Es El -pF +FE Fy kp na @@ -33220,7 +32708,7 @@ jx kp lo lk -pF +FE As kp nb @@ -33361,9 +32849,9 @@ iJ jy kp kc -lk -pF -As +Mf +Tl +XP kp nb nR diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 167d809c49e..aeb496cda4e 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -40,8 +40,7 @@ req_one_access = list(13) }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -63,8 +62,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/landmark{ name = "morphspawn" @@ -107,13 +105,11 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor, @@ -128,8 +124,7 @@ /area/security/eva) "aao" = ( /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /obj/machinery/atmospherics/binary/passive_gate/on{ dir = 4 @@ -146,8 +141,7 @@ /area/maintenance/station/ai) "aar" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/meter{ frequency = 1443; @@ -155,8 +149,7 @@ name = "Distribution Loop" }, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/security/eva) @@ -210,8 +203,7 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/glass_external, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor, @@ -256,7 +248,6 @@ "aaB" = ( /obj/effect/floor_decal/rust, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -433,8 +424,7 @@ icon_state = "4-8" }, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -443,8 +433,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/firealarm{ dir = 4; @@ -459,8 +448,7 @@ }, /obj/machinery/portable_atmospherics/canister/phoron, /obj/machinery/atmospherics/portables_connector/fuel{ - dir = 4; - icon_state = "map_connector-fuel" + dir = 4 }, /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, @@ -473,8 +461,7 @@ icon_state = "1-4" }, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -544,9 +531,7 @@ /obj/structure/catwalk, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor, /area/maintenance/station/sec_upper) @@ -596,8 +581,7 @@ "abj" = ( /obj/structure/catwalk, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -622,7 +606,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -635,8 +618,7 @@ dir = 8 }, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/floor, /area/maintenance/station/sec_upper) @@ -657,8 +639,7 @@ /area/maintenance/station/elevator) "abr" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -686,8 +667,7 @@ /area/security/hallwayaux) "abs" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -716,8 +696,7 @@ /area/security/hallwayaux) "abt" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -737,8 +716,7 @@ /area/security/hallwayaux) "abu" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -779,16 +757,14 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ icon_state = "2-8" }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/maintenance/substation/security) @@ -810,9 +786,7 @@ "abA" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Security"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green{ d2 = 4; @@ -844,9 +818,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/effect/floor_decal/rust, /turf/simulated/floor, @@ -868,7 +840,6 @@ icon_state = "1-4" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -885,9 +856,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -916,7 +885,6 @@ /obj/effect/floor_decal/corner/red/border, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -953,8 +921,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/hallwayaux) @@ -975,8 +942,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor, /area/maintenance/cargo) @@ -1018,8 +984,7 @@ /area/maintenance/station/ai) "abW" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable{ icon_state = "0-4" @@ -1050,9 +1015,7 @@ "abZ" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 2 - }, +/obj/effect/floor_decal/borderfloor/corner2, /turf/simulated/floor/tiled, /area/security/hallway) "aca" = ( @@ -1142,8 +1105,7 @@ /area/maintenance/station/elevator) "aci" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -1166,8 +1128,7 @@ /area/security/hallwayaux) "acj" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -1223,8 +1184,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor, @@ -1287,7 +1247,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -1337,9 +1296,7 @@ "acy" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -1411,8 +1368,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/danger/corner{ - dir = 1; - icon_state = "dangercorner" + dir = 1 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -1441,9 +1397,7 @@ "acL" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -1486,9 +1440,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -1655,9 +1607,7 @@ }, /obj/item/device/radio/intercom/department/security{ dir = 4; - icon_state = "secintercom"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/simulated/floor/wood, /area/security/breakroom) @@ -1702,15 +1652,13 @@ "adl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "adm" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1720,7 +1668,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable{ @@ -1791,8 +1738,7 @@ name = "tripai" }, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/bluegrid, /area/ai) @@ -1815,8 +1761,7 @@ dir = 8 }, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -1854,9 +1799,7 @@ "adA" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/cable{ d1 = 1; @@ -1877,8 +1820,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/simulated/wall/r_wall, /area/quartermaster/belterdock) @@ -1887,8 +1829,7 @@ /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "adE" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/machinery/recharge_station, /turf/simulated/floor/tiled, @@ -1977,8 +1918,7 @@ "adN" = ( /obj/random/trash_pile, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -2038,8 +1978,7 @@ /obj/structure/bed/chair/shuttle, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/mining_outpost/shuttle) @@ -2071,8 +2010,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/maintenance/substation/cargo) @@ -2086,7 +2024,6 @@ "aea" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plating, @@ -2142,8 +2079,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2264,7 +2200,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -2280,8 +2215,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1; - icon_state = "map-fuel" + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) @@ -2302,20 +2236,17 @@ }, /obj/structure/closet/secure_closet/security, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/item/device/holowarrant, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "aev" = ( /obj/effect/floor_decal/borderfloorblack/corner{ - dir = 8; - icon_state = "borderfloorcorner_black" + dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /obj/structure/table/bench/steel, /obj/effect/landmark/start{ @@ -2352,8 +2283,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) @@ -2362,8 +2292,7 @@ /area/security/breakroom) "aez" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6; - icon_state = "intact-fuel" + dir = 6 }, /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -2373,12 +2302,10 @@ /area/shuttle/excursion/general) "aeA" = ( /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/effect/floor_decal/corner/red{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -2394,19 +2321,16 @@ dir = 1 }, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled, /area/security/hallwayaux) "aeB" = ( /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/effect/floor_decal/corner/red{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -2481,8 +2405,7 @@ /area/security/breakroom) "aeG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1; - icon_state = "map-fuel" + dir = 1 }, /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -2492,8 +2415,7 @@ /area/shuttle/excursion/general) "aeH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10; - icon_state = "intact-fuel" + dir = 10 }, /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -2640,7 +2562,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/effect/floor_decal/corner/lightgrey/border, @@ -2660,14 +2581,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor, /area/maintenance/station/sec_upper) @@ -2763,7 +2681,6 @@ "afb" = ( /obj/machinery/light_switch{ dir = 4; - icon_state = "light1"; pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -2803,7 +2720,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -2821,8 +2737,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -2848,7 +2763,6 @@ alarms_hidden = 1; dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28; req_access = list(); req_one_access = list(11,67) @@ -2900,8 +2814,7 @@ req_one_access = list(11,67) }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/structure/cable{ icon_state = "0-4" @@ -2949,7 +2862,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -2968,8 +2880,7 @@ /area/maintenance/station/ai) "afq" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/railing{ dir = 4 @@ -2979,7 +2890,6 @@ "afr" = ( /obj/machinery/power/apc{ alarms_hidden = 1; - dir = 2; name = "south bump"; pixel_y = -28; req_access = list(); @@ -2999,8 +2909,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) @@ -3056,7 +2965,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -3148,7 +3056,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /obj/machinery/door/firedoor/glass/hidden/steel{ @@ -3164,8 +3071,7 @@ dir = 9 }, /obj/machinery/shower{ - dir = 1; - icon_state = "shower" + dir = 1 }, /obj/structure/curtain/open/shower/security, /turf/simulated/floor/tiled, @@ -3218,13 +3124,11 @@ /obj/structure/table/steel, /obj/item/device/camera, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/item/device/retail_scanner/security, /turf/simulated/floor/tiled, @@ -3243,7 +3147,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "shuttle blast"; name = "Shuttle Blast Doors"; @@ -3329,8 +3232,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6; - icon_state = "intact" + dir = 6 }, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) @@ -3417,12 +3319,10 @@ /area/security/brig) "agc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5; - icon_state = "intact-fuel" + dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) @@ -3441,7 +3341,6 @@ alarms_hidden = 1; dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28; req_access = list(); req_one_access = list(11,67) @@ -3504,7 +3403,6 @@ /area/space) "agx" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; frequency = 1379; id_tag = "sec_fore_pump" }, @@ -3526,15 +3424,13 @@ "agY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d2 = 8; icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -3549,8 +3445,7 @@ /area/security/eva) "aha" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/machinery/meter, /turf/simulated/floor/tiled, @@ -3623,7 +3518,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; @@ -3682,8 +3576,7 @@ pixel_y = -2 }, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/item/weapon/storage/box/holowarrants, /turf/simulated/floor/tiled/dark, @@ -3693,7 +3586,6 @@ dir = 1 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -3708,8 +3600,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/red/border/shifted, /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/structure/cable/green, /turf/simulated/floor/tiled, @@ -3870,9 +3761,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -3895,8 +3784,7 @@ icon_state = "1-4" }, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/security/hallway) @@ -3910,8 +3798,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/sec_upper) @@ -3929,8 +3816,7 @@ /area/ai) "aiz" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -3972,8 +3858,7 @@ /area/security/hallwayaux) "aiB" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4002,8 +3887,7 @@ /area/security/hallwayaux) "aiC" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4024,15 +3908,13 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled, /area/security/hallwayaux) "aiD" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4066,8 +3948,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4101,15 +3982,13 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled, /area/security/hallwayaux) "aiG" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4158,7 +4037,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; @@ -4206,15 +4084,13 @@ /area/maintenance/cargo) "aiX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6; - icon_state = "intact-fuel" + dir = 6 }, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) "aiY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/shuttle_sensor{ dir = 5; @@ -4223,9 +4099,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/handrail{ dir = 1 @@ -4268,9 +4142,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -4366,8 +4238,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/hallway) @@ -4468,8 +4339,7 @@ /area/ai) "ajQ" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/bluegrid, /area/ai) @@ -4584,16 +4454,13 @@ }, /obj/item/device/radio/intercom/locked/ai_private{ dir = 4; - icon_state = "intercom"; pixel_x = 32 }, /obj/item/device/radio/intercom{ broadcasting = 1; dir = 8; - listening = 1; name = "Common Channel"; - pixel_x = -21; - pixel_y = 0 + pixel_x = -21 }, /obj/item/device/radio/intercom{ dir = 1; @@ -4614,7 +4481,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled, @@ -4643,14 +4509,12 @@ /obj/structure/catwalk, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/sec_upper) @@ -4671,8 +4535,7 @@ "akx" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4703,8 +4566,7 @@ }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) @@ -4796,8 +4658,7 @@ name = "tripai" }, /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/bluegrid, /area/ai) @@ -4809,19 +4670,15 @@ /area/security/security_equiptment_storage) "akN" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/red{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/computer/area_atmos/tag{ - dir = 2; scrub_id = "sec_riot_control" }, /turf/simulated/floor/tiled, @@ -4862,8 +4719,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -4927,7 +4783,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -5159,7 +5014,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -5287,7 +5141,6 @@ "alR" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/bluegrid, @@ -5297,8 +5150,7 @@ dir = 4 }, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/bluegrid, /area/ai) @@ -5330,9 +5182,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -5420,13 +5270,10 @@ }, /obj/item/device/radio/intercom/department/security{ dir = 8; - icon_state = "secintercom"; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled/dark, @@ -5511,15 +5358,13 @@ dir = 8 }, /obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 8; - icon_state = "borderfloorcorner2_black" + dir = 8 }, /obj/structure/closet{ name = "Evidence Closet" }, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/security/evidence_storage) @@ -5543,8 +5388,7 @@ /area/security/hallway) "amj" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -5596,9 +5440,7 @@ /area/tether/exploration) "ams" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/industrial/danger{ dir = 1 @@ -5610,8 +5452,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/danger/corner{ - dir = 8; - icon_state = "dangercorner" + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -5621,8 +5462,7 @@ dir = 8 }, /obj/machinery/camera/network/exploration{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -5727,9 +5567,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/disposalpipe/segment, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) @@ -5757,9 +5595,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) @@ -5777,7 +5613,6 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -5850,7 +5685,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /turf/simulated/floor/bluegrid, @@ -5885,7 +5719,6 @@ }, /obj/item/device/radio/intercom/locked/ai_private{ dir = 1; - icon_state = "intercom"; pixel_y = 32 }, /turf/simulated/floor/bluegrid, @@ -5928,29 +5761,10 @@ "ane" = ( /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/wood, /area/security/breakroom) -"anf" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "ang" = ( /obj/structure/cable{ d1 = 4; @@ -6006,7 +5820,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/item/device/holowarrant, @@ -6099,8 +5912,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -6118,7 +5930,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -6145,8 +5956,7 @@ /obj/structure/closet/secure_closet/security, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/item/device/holowarrant, /turf/simulated/floor/tiled/dark, @@ -6292,8 +6102,7 @@ /obj/structure/closet/secure_closet/security, /obj/machinery/light_switch{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/item/device/holowarrant, /turf/simulated/floor/tiled/dark, @@ -6366,7 +6175,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled, @@ -6430,7 +6238,6 @@ /obj/structure/table/steel, /obj/machinery/light_switch{ dir = 4; - icon_state = "light1"; pixel_x = -24 }, /obj/item/device/taperecorder, @@ -6438,8 +6245,7 @@ /area/security/security_processing) "aoD" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -6492,7 +6298,6 @@ /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; - pixel_x = 0; pixel_y = 30 }, /obj/structure/table/standard, @@ -6536,7 +6341,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -6575,7 +6379,6 @@ /obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /turf/simulated/floor/tiled, @@ -6590,8 +6393,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -6620,8 +6422,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -6665,8 +6466,7 @@ /area/security/hallway) "apd" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -6708,8 +6508,7 @@ /area/security/hallway) "apf" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -6735,8 +6534,7 @@ /area/security/hallway) "apg" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -6762,8 +6560,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -6818,8 +6615,7 @@ dir = 9 }, /obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 10; - icon_state = "borderfloorcorner2_black" + dir = 10 }, /obj/structure/closet{ name = "Evidence Closet" @@ -6972,8 +6768,7 @@ /area/security/hallway) "apH" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -6999,8 +6794,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -7079,9 +6873,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -7320,9 +7112,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -7370,7 +7160,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/dark, @@ -7392,8 +7181,7 @@ /area/security/security_processing) "aqP" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -7410,8 +7198,7 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -7560,7 +7347,6 @@ }, /obj/machinery/light_switch{ dir = 4; - icon_state = "light1"; pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -7584,7 +7370,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/structure/filingcabinet/chestdrawer, @@ -7652,7 +7437,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; @@ -7719,8 +7503,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) @@ -7750,9 +7533,7 @@ icon_state = "4-8" }, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/borderfloor{ @@ -7911,8 +7692,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/tiled, /area/security/hallway) @@ -8068,8 +7848,7 @@ "asE" = ( /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -8103,7 +7882,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -8180,7 +7958,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; @@ -8197,13 +7974,11 @@ /obj/machinery/recharger, /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/red/border/shifted, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /turf/simulated/floor/tiled, /area/security/lobby) @@ -8241,8 +8016,7 @@ /area/security/hallway) "ata" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -8274,8 +8048,7 @@ /area/security/hallway) "atb" = ( /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/mineral/floor/vacuum, /area/security/nuke_storage) @@ -8299,8 +8072,7 @@ /area/hallway/station/upper) "atd" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -8372,8 +8144,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8419,8 +8190,7 @@ pixel_x = -16 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/structure/table/steel, /obj/item/roller, @@ -8459,9 +8229,7 @@ dir = 5 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/flora/pottedplant/stoutbush, @@ -8556,7 +8324,6 @@ /obj/item/weapon/storage/box, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/borderfloor{ @@ -8610,8 +8377,7 @@ /obj/structure/table/standard, /obj/item/weapon/material/ashtray/glass, /obj/machinery/newscaster{ - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/item/weapon/deck/cards, /obj/effect/floor_decal/borderfloor{ @@ -8741,8 +8507,7 @@ /obj/structure/railing, /obj/random/tool, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor, /area/maintenance/station/elevator) @@ -8834,8 +8599,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor, /area/storage/emergency_storage/emergency3) @@ -8852,7 +8616,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable{ @@ -9008,8 +8771,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -9049,7 +8811,6 @@ "auN" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/borderfloor, @@ -9148,7 +8909,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Damn, looks like it's on the clown world channel. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled, @@ -9205,8 +8965,7 @@ /obj/random/maintenance/cargo, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/item/weapon/storage/box/lights/mixed, /obj/item/weapon/storage/box/lights/mixed, @@ -9403,7 +9162,6 @@ /obj/machinery/recharge_station, /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /turf/simulated/floor/tiled, @@ -9440,8 +9198,7 @@ }, /obj/machinery/computer/security, /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/lobby) @@ -9453,21 +9210,17 @@ dir = 9 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 }, /obj/structure/bed/chair, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /turf/simulated/floor/tiled, @@ -9497,7 +9250,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like its set to the cooking channel. Wait did I just see one of those hot dogs moving? I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled, @@ -9697,7 +9449,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; @@ -9857,7 +9608,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Damn, looks like it's on the clown world channel. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -9898,7 +9648,6 @@ /obj/item/device/multitool, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/borderfloor{ @@ -9922,8 +9671,7 @@ }, /obj/machinery/papershredder, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/newscaster/security_unit{ pixel_x = -32 @@ -9966,7 +9714,6 @@ id = "BrigFoyer"; name = "Brig Foyer"; pixel_x = -6; - pixel_y = 0; req_access = list(1) }, /turf/simulated/floor/tiled, @@ -9975,8 +9722,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/red/border/shifted, /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/machinery/computer/security{ dir = 1 @@ -10007,7 +9753,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -10078,13 +9823,10 @@ }, /obj/structure/sign/directions/security{ dir = 1; - icon_state = "direction_sec"; pixel_y = 8 }, /obj/structure/sign/directions/medical{ - dir = 4; - pixel_x = 0; - pixel_y = 0 + dir = 4 }, /turf/simulated/wall, /area/tether/station/stairs_three) @@ -10172,8 +9914,7 @@ /obj/structure/table/standard, /obj/item/weapon/folder/yellow, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -10191,7 +9932,6 @@ "axu" = ( /obj/structure/sign/directions/security{ dir = 1; - icon_state = "direction_sec"; pixel_y = 8 }, /obj/structure/sign/directions/cargo{ @@ -10199,9 +9939,7 @@ pixel_y = -8 }, /obj/structure/sign/directions/medical{ - dir = 4; - pixel_x = 0; - pixel_y = 0 + dir = 4 }, /turf/simulated/wall/r_wall, /area/tether/station/stairs_three) @@ -10252,8 +9990,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/tiled, /area/security/lobby) @@ -10276,7 +10013,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; @@ -10365,8 +10101,7 @@ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /turf/simulated/floor/tiled, /area/maintenance/station/cargo) @@ -10481,8 +10216,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -10539,7 +10273,6 @@ /obj/machinery/disposal, /obj/machinery/light_switch{ dir = 4; - icon_state = "light1"; pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -10575,7 +10308,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -10597,8 +10329,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/lobby) @@ -10674,8 +10405,7 @@ /area/hallway/station/upper) "ayB" = ( /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/space, /area/security/nuke_storage) @@ -10724,7 +10454,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable{ @@ -10831,7 +10560,6 @@ "ayP" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -10910,7 +10638,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -11252,8 +10979,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/hallway/station/upper) @@ -11277,8 +11003,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled, /area/maintenance/station/cargo) @@ -11363,10 +11088,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/upper) "azJ" = ( -/obj/structure/sign/poster{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/structure/sign/poster, /turf/simulated/wall, /area/quartermaster/qm) "azK" = ( @@ -11423,7 +11145,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Oh, hey look it's a shopping channel! Are... Are they selling acid resistant underwear? I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled, @@ -11437,9 +11158,7 @@ "azS" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) @@ -11463,18 +11182,14 @@ dir = 9 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 10 }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled, /area/hallway/station/upper) @@ -11617,9 +11332,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -11729,7 +11442,6 @@ department = "Medical Department"; departmentType = 3; name = "Medical RC"; - pixel_x = 0; pixel_y = 30 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -11739,8 +11451,7 @@ dir = 5 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) @@ -11748,9 +11459,7 @@ /obj/machinery/disposal, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -11775,7 +11484,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's on the fishing channel. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled/white, @@ -11848,8 +11556,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/maintenance/station/cargo) @@ -11919,9 +11626,7 @@ /area/quartermaster/storage) "aAQ" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /obj/structure/closet/secure_closet/cargotech, @@ -11969,7 +11674,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/closet/secure_closet/cargotech, @@ -12081,8 +11785,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/industrial/danger{ - dir = 8; - icon_state = "danger" + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/station/upper) @@ -12265,8 +11968,7 @@ /obj/item/weapon/reagent_containers/dropper, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -12316,8 +12018,7 @@ /area/medical/chemistry) "aBL" = ( /obj/machinery/camera/network/cargo{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled, @@ -12384,7 +12085,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /turf/simulated/floor/tiled/white, @@ -12472,7 +12172,6 @@ /obj/effect/floor_decal/corner/lightgrey/border, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -12515,8 +12214,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 @@ -12562,8 +12260,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/steeldecal/steel_decals6, @@ -12677,8 +12374,7 @@ "aCx" = ( /obj/effect/floor_decal/rust, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /obj/structure/closet/crate, /obj/random/maintenance/clean, @@ -12748,8 +12444,7 @@ pixel_x = 28 }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled, @@ -12819,8 +12514,7 @@ }, /obj/structure/table/standard, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/cable/green{ d1 = 1; @@ -12839,7 +12533,6 @@ "aCL" = ( /obj/structure/disposalpipe/sortjunction{ dir = 1; - icon_state = "pipe-j1s"; name = "Cargo Bay"; sortType = "Cargo Bay" }, @@ -12863,8 +12556,7 @@ id = "QMLoad2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -12894,8 +12586,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /obj/structure/window/reinforced{ dir = 4 @@ -12944,19 +12635,16 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "aCW" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -13004,8 +12692,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13032,8 +12719,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13074,8 +12760,7 @@ /area/medical/reception) "aDn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) @@ -13182,8 +12867,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/wood, /area/quartermaster/qm) @@ -13267,8 +12951,7 @@ dir = 9 }, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/reception) @@ -13289,8 +12972,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor, /area/tether/station/stairs_three) @@ -13347,9 +13029,7 @@ "aDU" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Medical"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green{ d2 = 2; @@ -13412,9 +13092,7 @@ /area/quartermaster/warehouse) "aEe" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/green{ @@ -13567,7 +13245,6 @@ /obj/item/weapon/coin/silver, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/light, @@ -13653,8 +13330,7 @@ "aEA" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor, /area/tether/station/stairs_three) @@ -13688,7 +13364,6 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = -26; - pixel_y = 0; req_access = list(31) }, /turf/simulated/floor/tiled, @@ -13746,7 +13421,6 @@ "aEQ" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/rust, @@ -13784,7 +13458,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -13826,9 +13499,7 @@ /obj/item/clothing/glasses/science, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -13964,8 +13635,7 @@ "aFl" = ( /obj/structure/filingcabinet/filingcabinet, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/cable/green{ d1 = 1; @@ -14002,8 +13672,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /obj/structure/window/reinforced{ dir = 4 @@ -14017,7 +13686,6 @@ "aFo" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/table, @@ -14045,9 +13713,7 @@ "aFt" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/open, /area/tether/station/stairs_three) @@ -14093,8 +13759,7 @@ /area/maintenance/substation/cargo) "aFD" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/machinery/power/apc{ dir = 4; @@ -14144,8 +13809,7 @@ "aFH" = ( /obj/structure/closet/secure_closet/medical1, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -14232,7 +13896,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -14253,9 +13916,7 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -14276,8 +13937,7 @@ }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) @@ -14317,9 +13977,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/cable/green{ d1 = 1; @@ -14393,7 +14051,6 @@ dir = 1 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/item/device/radio/intercom/department/medbay{ @@ -14414,7 +14071,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -14443,8 +14099,7 @@ /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/reception) @@ -14527,7 +14182,6 @@ /area/medical/reception) "aGv" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -14688,7 +14342,6 @@ "aGP" = ( /obj/machinery/conveyor{ dir = 10; - icon_state = "conveyor0"; id = "QMLoad" }, /turf/simulated/floor, @@ -14715,7 +14368,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -14723,8 +14375,7 @@ icon_state = "0-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -14742,7 +14393,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_medical{ name = "Chemistry"; - req_access = list(); req_one_access = list(33) }, /obj/structure/cable/green{ @@ -14813,7 +14463,6 @@ "aHg" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -14840,8 +14489,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 4 @@ -14876,9 +14524,7 @@ /obj/item/device/flashlight/pen, /obj/item/device/flashlight/pen, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -14904,9 +14550,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks{ - pixel_y = 0 - }, +/obj/item/weapon/storage/box/masks, /obj/structure/table/glass, /obj/item/device/radio/intercom/department/medbay{ dir = 1; @@ -14937,8 +14581,7 @@ /obj/structure/table/glass, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -14969,9 +14612,7 @@ dir = 9 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -15021,9 +14662,7 @@ pixel_y = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -15049,8 +14688,7 @@ "aHu" = ( /obj/structure/table/glass, /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /obj/machinery/light{ dir = 1 @@ -15232,8 +14870,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /obj/structure/window/reinforced{ dir = 4 @@ -15244,7 +14881,6 @@ "aHI" = ( /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /obj/structure/cable/green{ @@ -15270,7 +14906,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -15297,14 +14932,11 @@ dir = 9 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/camera/network/medbay{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -15318,8 +14950,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -15346,9 +14977,7 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -15373,8 +15002,7 @@ dir = 8 }, /obj/machinery/camera/network/medbay{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -15394,8 +15022,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -15424,8 +15051,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -15527,8 +15153,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -15537,8 +15162,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite/corner, /obj/effect/floor_decal/corner/paleblue/bordercorner, @@ -15549,8 +15173,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -15561,8 +15184,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 8 @@ -15577,8 +15199,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -15690,7 +15311,6 @@ /area/quartermaster/storage) "aIv" = ( /obj/machinery/conveyor_switch/oneway{ - convdir = 1; id = "QMLoad" }, /obj/effect/floor_decal/industrial/warning{ @@ -15726,8 +15346,7 @@ /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -15742,8 +15361,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -15758,8 +15376,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -15773,8 +15390,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -15788,12 +15404,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -15811,12 +15425,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 @@ -15842,12 +15454,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -15864,12 +15474,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -15892,12 +15500,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -15914,12 +15520,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -15952,9 +15556,7 @@ "aIP" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Cargo"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green{ d2 = 4; @@ -15971,8 +15573,7 @@ /area/maintenance/substation/cargo) "aIQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -15980,9 +15581,7 @@ /obj/structure/closet/crate, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/steel, @@ -15998,7 +15597,6 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = 26; - pixel_y = 0; req_access = list(31) }, /turf/simulated/floor/tiled, @@ -16017,7 +15615,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -16042,8 +15639,7 @@ /area/quartermaster/storage) "aIZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -16113,8 +15709,7 @@ dir = 4 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) @@ -16134,8 +15729,7 @@ }, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -16144,8 +15738,7 @@ /obj/structure/sign/goldenplaque{ desc = "Done No Harm."; name = "Best Doctor 2552"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -16261,8 +15854,7 @@ "aJx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/steeldecal/steel_decals10, @@ -16316,8 +15908,7 @@ dir = 4 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -16347,8 +15938,7 @@ /area/maintenance/station/cargo) "aJH" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/freezer, @@ -16372,7 +15962,6 @@ "aJM" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled, @@ -16443,23 +16032,19 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/light_switch{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "aJW" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/space, /area/security/nuke_storage) "aJX" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/mineral/floor/vacuum, /area/security/nuke_storage) @@ -16488,7 +16073,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/floor_decal/borderfloorwhite, @@ -16563,8 +16147,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/corner_steel_grid{ dir = 5 @@ -16576,8 +16159,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 @@ -16586,12 +16168,10 @@ /area/medical/sleeper) "aKo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -16621,8 +16201,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/security/hallway) @@ -16660,8 +16239,7 @@ dir = 8 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -16679,9 +16257,7 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -16706,8 +16282,7 @@ name = "Scan Records" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -16766,9 +16341,7 @@ "aKO" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -16802,7 +16375,6 @@ "aKR" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/railing{ @@ -16872,7 +16444,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -17051,10 +16622,8 @@ }, /obj/effect/floor_decal/spline/plain, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -17109,8 +16678,7 @@ /area/maintenance/station/cargo) "aLy" = ( /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /obj/structure/railing, /obj/structure/closet/crate, @@ -17208,8 +16776,7 @@ /area/medical/sleeper) "aLJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -17258,7 +16825,6 @@ "aLP" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/cable/green{ @@ -17312,8 +16878,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -17329,8 +16894,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 1; @@ -17513,8 +17077,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -17542,8 +17105,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -17559,8 +17121,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -17575,8 +17136,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -17595,8 +17155,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -17623,8 +17182,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -17641,8 +17199,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -17651,8 +17208,7 @@ dir = 6 }, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -17666,8 +17222,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -17689,8 +17244,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -17749,8 +17303,7 @@ "aMx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -17802,8 +17355,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -17814,12 +17366,10 @@ /area/quartermaster/storage) "aMB" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/light_switch{ dir = 4; - icon_state = "light1"; pixel_x = -24 }, /obj/structure/reagent_dispensers/water_cooler/full{ @@ -17871,9 +17421,7 @@ "aMI" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -17931,15 +17479,13 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) @@ -17948,8 +17494,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -17972,8 +17517,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -17992,8 +17536,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 @@ -18011,8 +17554,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -18130,9 +17672,7 @@ "aNj" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -18156,8 +17696,7 @@ dir = 4 }, /obj/machinery/camera/network/exploration{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -18185,8 +17724,7 @@ /obj/item/weapon/storage/box/cups, /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/camera/network/medbay{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medbreak) @@ -18306,8 +17844,7 @@ pixel_x = -16 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/structure/table/steel, /obj/item/bodybag/cryobag{ @@ -18327,8 +17864,7 @@ }, /obj/item/weapon/reagent_containers/spray/cleaner, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled, /area/security/hallway) @@ -18358,8 +17894,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled, /area/security/hallwayaux) @@ -18413,8 +17948,7 @@ /area/quartermaster/storage) "aNY" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -18488,8 +18022,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -18536,8 +18069,7 @@ /area/quartermaster/belterdock) "aOO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/camera/network/mining{ dir = 8 @@ -18555,8 +18087,7 @@ }, /obj/machinery/disposal, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medbreak) @@ -18566,8 +18097,7 @@ }, /obj/machinery/disposal, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/wood, /area/security/breakroom) @@ -18622,16 +18152,14 @@ /area/ai_core_foyer) "aPq" = ( /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/open, /area/security/hallway) "aPr" = ( /obj/effect/floor_decal/techfloor, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/ai_core_foyer) @@ -18642,15 +18170,13 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "aPx" = ( /obj/machinery/camera/network/exploration{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -18677,8 +18203,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/bluegrid, @@ -18705,8 +18230,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera/network/exploration{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -18716,8 +18240,7 @@ /area/maintenance/station/cargo) "aQb" = ( /obj/machinery/camera/network/exploration{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/open, /area/tether/exploration) @@ -18754,8 +18277,7 @@ id = "QMLoad" }, /obj/machinery/camera/network/cargo{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor, /area/quartermaster/storage) @@ -18827,8 +18349,7 @@ /area/hallway/station/upper) "aQl" = ( /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/open, /area/security/brig) @@ -18884,8 +18405,7 @@ /area/ai_core_foyer) "aQx" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) @@ -18942,7 +18462,6 @@ "aQH" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -19027,23 +18546,19 @@ "aQV" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/machinery/alarm{ pixel_y = 22 }, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/red{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /turf/simulated/floor/tiled, /area/security/observation) @@ -19077,8 +18592,7 @@ /area/maintenance/station/sec_upper) "aRb" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/catwalk, /turf/simulated/floor, @@ -19088,9 +18602,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 8 @@ -19179,13 +18691,11 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/tether/exploration) @@ -19207,12 +18717,10 @@ /area/quartermaster/office) "aRv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10; - icon_state = "intact-fuel" + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6; - icon_state = "intact" + dir = 6 }, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) @@ -19246,8 +18754,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -19257,8 +18764,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -19269,8 +18775,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/sec_upper) @@ -19279,8 +18784,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ icon_state = "2-8" @@ -19292,8 +18796,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/sec_upper) @@ -19488,8 +18991,7 @@ "aSs" = ( /obj/effect/floor_decal/rust, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -19528,7 +19030,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor, @@ -19567,15 +19068,13 @@ "aSA" = ( /obj/machinery/door/airlock/maintenance/cargo{ name = "Belter Shuttle Access"; - req_access = list(); req_one_access = list(48,65,66) }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) "aSB" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6; - icon_state = "intact" + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -19625,7 +19124,6 @@ "aSJ" = ( /obj/machinery/door/airlock/maintenance/cargo{ name = "Belter Shuttle Access"; - req_access = list(); req_one_access = list(48,65,66) }, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -19701,7 +19199,6 @@ "aSU" = ( /obj/machinery/door/airlock/maintenance/cargo{ name = "Belter Shuttle Access"; - req_access = list(); req_one_access = list(48,65,66) }, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -19739,20 +19236,17 @@ /area/maintenance/station/cargo) "aSZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/machinery/meter, /turf/simulated/floor/plating, /area/maintenance/station/cargo) "aTa" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -19836,7 +19330,6 @@ pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; frequency = 1379; id_tag = "belter_access_pump" }, @@ -19850,7 +19343,6 @@ pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; frequency = 1379; id_tag = "belter_access_pump" }, @@ -19859,8 +19351,7 @@ /area/quartermaster/belterdock) "aTo" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -19868,8 +19359,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/catwalk, /turf/simulated/floor, @@ -19962,15 +19452,13 @@ /obj/machinery/mineral/equipment_vendor, /obj/machinery/alarm{ dir = 4; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "aTC" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -19980,15 +19468,13 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) "aTF" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -20002,7 +19488,6 @@ "aTI" = ( /obj/machinery/door/airlock/glass_mining{ name = "Belter Control Room"; - req_access = list(); req_one_access = list(48,66) }, /obj/structure/cable/green{ @@ -20064,12 +19549,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) @@ -20126,7 +19609,6 @@ "aTX" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/white, @@ -20138,8 +19620,7 @@ /area/quartermaster/belterdock) "aUa" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/outdoors/grass/forest, /area/quartermaster/qm) @@ -20177,15 +19658,13 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "aUg" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/structure/table/rack, @@ -20223,8 +19702,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /obj/machinery/door/airlock/hatch{ req_one_access = list() @@ -20257,7 +19735,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; @@ -20288,7 +19765,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /turf/simulated/floor/wood, @@ -20301,9 +19777,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) @@ -20367,8 +19841,7 @@ /area/quartermaster/belterdock) "aUG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) @@ -20389,8 +19862,7 @@ /area/quartermaster/belterdock) "aUJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/structure/cable/cyan{ d1 = 1; @@ -20402,8 +19874,7 @@ /area/shuttle/excursion/cockpit) "aUN" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 5; - icon_state = "warning" + dir = 5 }, /obj/structure/window/reinforced{ dir = 1 @@ -20492,8 +19963,7 @@ /obj/machinery/portable_atmospherics/canister/phoron, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/atmospherics/portables_connector/fuel{ - dir = 8; - icon_state = "map_connector-fuel" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) @@ -20572,8 +20042,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/structure/mirror{ pixel_y = 32 @@ -20582,7 +20051,6 @@ /area/crew_quarters/medical_restroom) "aVx" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -20675,8 +20143,7 @@ /area/shuttle/belter) "aVP" = ( /obj/machinery/atmospherics/unary/engine{ - dir = 4; - icon_state = "nozzle" + dir = 4 }, /turf/simulated/floor/airless, /area/shuttle/medivac/engines) @@ -20753,8 +20220,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall, /area/maintenance/substation/cargo) @@ -20772,8 +20238,7 @@ /obj/structure/closet/emcloset, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) @@ -20817,8 +20282,7 @@ /area/shuttle/excursion/cockpit) "aWq" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /turf/simulated/floor/airless, /area/quartermaster/belterdock) @@ -20840,8 +20304,7 @@ }, /obj/structure/handrail, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/effect/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -20853,16 +20316,13 @@ "aWv" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "aWz" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) @@ -20872,9 +20332,7 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 25 @@ -20900,8 +20358,7 @@ /area/crew_quarters/medical_restroom) "aWG" = ( /obj/machinery/computer/shuttle_control/explore/excursion{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/item/device/radio/intercom{ pixel_y = -24 @@ -20919,7 +20376,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/light_switch{ @@ -20941,15 +20397,12 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) "aWO" = ( /obj/machinery/conveyor{ - dir = 2; id = "miningops" }, /turf/simulated/floor/plating, @@ -20964,7 +20417,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_mining{ name = "Mining Gear Storage"; - req_access = list(); req_one_access = list(48,66) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -20992,8 +20444,7 @@ /area/quartermaster/belterdock/gear) "aWT" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ - dir = 1; - icon_state = "warningcorner_dust" + dir = 1 }, /turf/simulated/floor/airless, /area/mine/explored/upper_level) @@ -21004,9 +20455,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -21113,9 +20562,7 @@ icon_state = "pipe-c" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -21173,8 +20620,7 @@ /area/quartermaster/belterdock/refinery) "aXA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -21258,8 +20704,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/structure/handrail, /turf/simulated/floor/tiled/techfloor, @@ -21281,8 +20726,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/hallway/station/upper) @@ -21326,13 +20770,10 @@ "aYh" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) @@ -21343,9 +20784,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -21363,11 +20802,6 @@ /obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) -"aYp" = ( -/turf/simulated/wall{ - can_open = 0 - }, -/area/crew_quarters/medical_restroom) "aYt" = ( /obj/structure/dispenser/oxygen, /obj/effect/floor_decal/borderfloor, @@ -21382,7 +20816,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "shuttle blast"; name = "Shuttle Blast Doors"; @@ -21433,7 +20866,6 @@ "aYG" = ( /obj/machinery/mineral/input, /obj/machinery/conveyor{ - dir = 2; id = "miningops" }, /turf/simulated/floor/plating, @@ -21463,7 +20895,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/light_switch{ @@ -21483,8 +20914,7 @@ "aYQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -21502,8 +20932,7 @@ /area/security/breakroom) "aZf" = ( /obj/effect/floor_decal/industrial/loading{ - dir = 8; - icon_state = "loadingarea" + dir = 8 }, /obj/structure/sign/warning/moving_parts{ pixel_y = -32 @@ -21519,7 +20948,6 @@ "aZh" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ - dir = 2; id = "miningops" }, /turf/simulated/floor/plating, @@ -21527,7 +20955,6 @@ "aZi" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -21552,8 +20979,7 @@ /area/quartermaster/qm) "aZp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/outdoors/grass/forest, /area/quartermaster/qm) @@ -21594,8 +21020,7 @@ }, /obj/item/stack/flag/red, /obj/item/stack/flag/green{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /obj/item/weapon/storage/box/nifsofts_mining, /obj/effect/floor_decal/borderfloor, @@ -21616,7 +21041,6 @@ "aZC" = ( /obj/machinery/conveyor{ dir = 5; - icon_state = "conveyor0"; id = "miningops" }, /obj/machinery/mineral/input, @@ -21674,8 +21098,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/wood, /area/quartermaster/qm) @@ -21707,8 +21130,7 @@ "bad" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -21717,8 +21139,7 @@ /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "bae" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -21727,8 +21148,7 @@ /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "baf" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -21746,8 +21166,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) @@ -21771,8 +21190,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /turf/simulated/floor/airless, /area/quartermaster/belterdock) @@ -21791,9 +21209,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "bao" = ( @@ -21820,8 +21236,7 @@ /area/shuttle/belter) "bar" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/airless, /area/quartermaster/belterdock) @@ -21865,8 +21280,7 @@ "baA" = ( /obj/structure/closet/emcloset, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/mining_outpost/shuttle) @@ -21893,8 +21307,7 @@ /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 8; id_tag = "belter_docking"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/simulated/shuttle/floor/yellow/airless, /area/shuttle/belter) @@ -21956,15 +21369,13 @@ /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 8; id_tag = "mining_docking"; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/mining_outpost/shuttle) "baP" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -21973,8 +21384,7 @@ /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "baQ" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -22024,8 +21434,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -22099,8 +21508,7 @@ /area/mine/explored/upper_level) "bDD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5; - icon_state = "intact-fuel" + dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -22140,12 +21548,10 @@ /area/shuttle/securiship/engines) "bNj" = ( /obj/effect/floor_decal/corner/blue{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/effect/floor_decal/corner/blue{ - dir = 4; - icon_state = "corner_white" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -22249,9 +21655,7 @@ /area/hallway/station/upper) "ccy" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/structure/cable/cyan{ d1 = 1; @@ -22319,15 +21723,13 @@ /area/shuttle/securiship/general) "cGX" = ( /obj/machinery/computer/ship/sensors{ - dir = 8; - icon_state = "computer" + dir = 8 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/cockpit) "cIJ" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/cable{ d1 = 2; @@ -22369,8 +21771,7 @@ /area/security/security_equiptment_storage) "cNv" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable/green{ icon_state = "0-2" @@ -22382,7 +21783,6 @@ /obj/effect/map_helper/airlock/door/ext_door, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 4; - pixel_x = 0; pixel_y = -28 }, /obj/effect/map_helper/airlock/sensor/ext_sensor, @@ -22396,8 +21796,7 @@ /area/shuttle/medivac/engines) "daI" = ( /obj/machinery/computer/shuttle_control/explore/medivac{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/eris/steel/cyancorner, @@ -22461,8 +21860,7 @@ /area/hallway/station/upper) "dAo" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable/green{ d2 = 4; @@ -22517,8 +21915,7 @@ /area/shuttle/medivac/engines) "dSk" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -22539,8 +21936,7 @@ /area/security/hallway) "dYt" = ( /obj/machinery/computer/ship/helm{ - dir = 8; - icon_state = "computer" + dir = 8 }, /obj/machinery/light{ dir = 1 @@ -22621,15 +22017,13 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) "eof" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/light, @@ -22647,7 +22041,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled/techfloor, @@ -22656,7 +22049,6 @@ /obj/machinery/light/small, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -22676,8 +22068,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/item/device/radio/intercom{ dir = 4; @@ -22687,8 +22078,7 @@ /area/shuttle/excursion/general) "ewT" = ( /obj/machinery/atmospherics/portables_connector/fuel{ - dir = 8; - icon_state = "map_connector-fuel" + dir = 8 }, /obj/machinery/portable_atmospherics/canister/phoron, /obj/effect/floor_decal/industrial/outline/red, @@ -22716,7 +22106,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "shuttle blast"; name = "Shuttle Blast Doors"; @@ -22943,8 +22332,7 @@ /area/tether/exploration) "gqZ" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -22968,8 +22356,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/eris/white, /area/shuttle/medivac/general) @@ -22984,8 +22371,7 @@ /area/shuttle/excursion/general) "gBb" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -23083,12 +22469,10 @@ }, /obj/effect/overmap/visitable/ship/landable/excursion, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -23105,8 +22489,7 @@ /area/security/nuke_storage) "gSE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10; - icon_state = "intact-fuel" + dir = 10 }, /turf/simulated/wall/rshull, /area/shuttle/securiship/engines) @@ -23216,8 +22599,7 @@ /area/security/security_processing) "hyn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6; - icon_state = "intact-fuel" + dir = 6 }, /turf/simulated/wall/rshull, /area/shuttle/securiship/engines) @@ -23236,8 +22618,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/cable{ icon_state = "2-4" @@ -23262,8 +22643,7 @@ /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/portable_atmospherics/canister/phoron, /obj/machinery/atmospherics/portables_connector/fuel{ - dir = 8; - icon_state = "map_connector-fuel" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) @@ -23300,8 +22680,7 @@ /area/security/hallway) "ijU" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/cable/yellow, /obj/machinery/power/port_gen/pacman/mrs{ @@ -23312,12 +22691,10 @@ /area/shuttle/excursion/general) "ikk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 @@ -23328,7 +22705,6 @@ "imZ" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/catwalk, @@ -23344,8 +22720,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/blue{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/effect/floor_decal/corner/blue, /turf/simulated/floor/tiled/eris/white, @@ -23408,19 +22783,16 @@ pixel_x = -32 }, /obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/medivac/engines) "iEV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/techmaint, @@ -23473,8 +22845,7 @@ dir = 8 }, /obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 4; - icon_state = "bay_chair_preview" + dir = 4 }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) @@ -23488,8 +22859,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -23504,8 +22874,7 @@ "jfu" = ( /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -23534,8 +22903,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5; - icon_state = "intact-aux" + dir = 5 }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) @@ -23592,19 +22960,16 @@ "jQx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "jRD" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -23625,7 +22990,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -23657,7 +23021,6 @@ "kkg" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/landmark/start{ @@ -23716,8 +23079,7 @@ /area/shuttle/excursion/cockpit) "kDC" = ( /obj/structure/bed/chair/bay/chair/padded/blue{ - dir = 4; - icon_state = "bay_chair_preview" + dir = 4 }, /obj/machinery/button/remote/blast_door{ dir = 8; @@ -23776,8 +23138,7 @@ /area/shuttle/excursion/general) "kSC" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -23849,12 +23210,10 @@ /area/hallway/station/upper) "ldH" = ( /obj/structure/bed/chair/bay/chair/padded/blue{ - dir = 4; - icon_state = "bay_chair_preview" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /turf/simulated/floor/tiled/eris/steel/cyancorner, /area/shuttle/medivac/cockpit) @@ -23884,7 +23243,6 @@ dir = 9 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -23924,8 +23282,7 @@ /area/shuttle/medivac/general) "lyg" = ( /obj/machinery/computer/ship/engines{ - dir = 4; - icon_state = "computer" + dir = 4 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/cockpit) @@ -24069,8 +23426,7 @@ /area/shuttle/medivac/cockpit) "mDQ" = ( /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) @@ -24079,7 +23435,6 @@ pixel_x = 28 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; frequency = 1380; id_tag = "medivac_docker_pump_out_internal" }, @@ -24089,8 +23444,7 @@ /area/shuttle/medivac/general) "mLa" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -24118,12 +23472,10 @@ /area/tether/exploration/pilot_office) "ndd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5; - icon_state = "intact-fuel" + dir = 5 }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, @@ -24156,25 +23508,21 @@ pixel_y = 28 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/map_helper/airlock/door/ext_door, /obj/effect/map_helper/airlock/sensor/ext_sensor, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) "nlX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /obj/machinery/airlock_sensor{ pixel_y = 28 @@ -24236,7 +23584,6 @@ /obj/machinery/button/remote/blast_door{ id = "VaultAc"; name = "Vault Blast Door"; - pixel_x = 0; pixel_y = -32; req_access = list(53); req_one_access = list(53) @@ -24256,15 +23603,13 @@ /area/shuttle/securiship/general) "nvV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1; - icon_state = "map-fuel" + dir = 1 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/engines) "nzo" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -24316,8 +23661,7 @@ /area/shuttle/securiship/general) "oiV" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -24340,8 +23684,7 @@ /area/security/security_processing) "okJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /turf/simulated/wall/rshull, /area/shuttle/securiship/engines) @@ -24358,6 +23701,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) "opL" = ( @@ -24373,8 +23717,7 @@ }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled, /area/hallway/station/upper) @@ -24385,8 +23728,7 @@ /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) @@ -24444,8 +23786,7 @@ /area/security/hallwayaux) "ozS" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) @@ -24457,8 +23798,7 @@ /area/shuttle/medivac/general) "oDB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24481,8 +23821,7 @@ /area/security/hallway) "oJa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 6; - icon_state = "intact-aux" + dir = 6 }, /turf/simulated/wall/rshull, /area/shuttle/securiship/general) @@ -24526,9 +23865,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) @@ -24551,8 +23888,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled/eris/white, /area/shuttle/medivac/general) @@ -24573,8 +23909,7 @@ /area/shuttle/medivac/general) "plY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1; - icon_state = "map-fuel" + dir = 1 }, /turf/simulated/wall/rshull, /area/shuttle/securiship/engines) @@ -24583,8 +23918,7 @@ dir = 1 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/effect/map_helper/airlock/atmos/pump_out_internal, /obj/machinery/oxygen_pump{ @@ -24631,7 +23965,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "medivac blast"; name = "Shuttle Blast Doors"; @@ -24647,8 +23980,7 @@ /area/shuttle/medivac/general) "pUV" = ( /obj/structure/bed/chair/bay/chair{ - dir = 1; - icon_state = "bay_chair_preview" + dir = 1 }, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/shuttle/securiship/general) @@ -24707,8 +24039,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5; - icon_state = "intact-aux" + dir = 5 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) @@ -24721,8 +24052,7 @@ /area/shuttle/excursion/cargo) "qJK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) @@ -24732,8 +24062,7 @@ /area/maintenance/station/sec_upper) "qMb" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -24766,7 +24095,6 @@ "qOY" = ( /obj/machinery/door/airlock/multi_tile/metal/mait{ dir = 2; - icon_state = "door_closed"; req_one_access = list(5,67) }, /obj/machinery/door/firedoor/glass, @@ -24820,15 +24148,13 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 6; - icon_state = "intact-aux" + dir = 6 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "rhv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24890,7 +24216,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -24974,19 +24299,16 @@ }, /obj/effect/map_helper/airlock/sensor/int_sensor, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "scI" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/cable/green{ @@ -25012,8 +24334,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6; - icon_state = "intact-fuel" + dir = 6 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/engines) @@ -25033,7 +24354,6 @@ /obj/machinery/alarm{ breach_detection = 0; dir = 8; - icon_state = "alarm0"; pixel_x = 25; rcon_setting = 3; report_danger_level = 0 @@ -25132,12 +24452,10 @@ /area/shuttle/excursion/general) "tTA" = ( /obj/effect/floor_decal/corner/blue{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/effect/floor_decal/corner/blue{ - dir = 1; - icon_state = "corner_white" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -25160,11 +24478,9 @@ /area/maintenance/station/cargo) "ukN" = ( /obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 1; - icon_state = "bay_chair_preview" + dir = 1 }, /obj/machinery/button/remote/blast_door{ - dir = 2; id = "securiship blast"; name = "Shuttle Blast Doors"; pixel_x = -28; @@ -25250,7 +24566,6 @@ "uQo" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -25292,8 +24607,7 @@ /area/shuttle/medivac/general) "uVS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/structure/extinguisher_cabinet{ dir = 8; @@ -25306,8 +24620,7 @@ /area/shuttle/excursion/general) "uZd" = ( /obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 4; - icon_state = "bay_chair_preview" + dir = 4 }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) @@ -25346,8 +24659,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 9; - icon_state = "intact-aux" + dir = 9 }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) @@ -25384,8 +24696,7 @@ /area/shuttle/excursion/general) "vQT" = ( /obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 4; - icon_state = "bay_chair_preview" + dir = 4 }, /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/securiship/general) @@ -25411,23 +24722,20 @@ dir = 4 }, /obj/structure/bed/chair/bay/chair{ - dir = 1; - icon_state = "bay_chair_preview" + dir = 1 }, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/shuttle/securiship/general) "wcZ" = ( /obj/machinery/computer/ship/sensors{ - dir = 8; - icon_state = "computer" + dir = 8 }, /obj/machinery/light, /turf/simulated/floor/tiled/eris/steel/cyancorner, /area/shuttle/medivac/cockpit) "wiE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10; - icon_state = "intact-fuel" + dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -25473,12 +24781,10 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/eris/white, /area/shuttle/medivac/general) @@ -25542,12 +24848,10 @@ }, /obj/effect/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) @@ -25629,12 +24933,10 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/blue{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/effect/floor_decal/corner/blue{ - dir = 8; - icon_state = "corner_white" + dir = 8 }, /turf/simulated/floor/tiled/eris/white, /area/shuttle/medivac/general) @@ -25652,8 +24954,7 @@ pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/effect/map_helper/airlock/sensor/int_sensor, /turf/simulated/floor/tiled/eris/white, @@ -25767,8 +25068,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) @@ -25785,8 +25085,7 @@ /area/maintenance/station/sec_upper) "ygj" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -25803,7 +25102,6 @@ icon_state = "4-8" }, /obj/machinery/embedded_controller/radio/simple_docking_controller{ - dir = 2; frequency = 1380; id_tag = "securiship_bay"; pixel_x = -22; @@ -25819,8 +25117,7 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/tiled/eris/techmaint_cargo, /area/shuttle/securiship/general) @@ -31891,7 +31188,7 @@ aab aab aab aKE -aYp +aKE aKE aKE aMO @@ -34145,7 +33442,7 @@ auP auP azt ayA -anf +aBs aCh ayM aAC