diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index bc7dca1d74..c759e84c02 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -1290,6 +1290,9 @@ var/mob/dview/dview_mob = new /proc/dview(var/range = world.view, var/center, var/invis_flags = 0) if(!center) return + if(!dview_mob) //VOREStation Add: Debugging + dview_mob = new + log_error("Had to recreate the dview mob!") dview_mob.loc = center diff --git a/code/_onclick/hud/_defines_vr.dm b/code/_onclick/hud/_defines_vr.dm index 2b4f4fb85e..b419c6bd7f 100644 --- a/code/_onclick/hud/_defines_vr.dm +++ b/code/_onclick/hud/_defines_vr.dm @@ -1,3 +1,2 @@ -#define ui_shadekin_dark_display "EAST-1:28,CENTER-3:15" -#define ui_shadekin_energy_display "EAST-1:28,CENTER-4:15" +#define ui_shadekin_display "EAST-1:28,CENTER-3:15" #define ui_xenochimera_danger_display "EAST-1:28,CENTER-3:15" \ No newline at end of file diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 6387f40d9e..22e8e459fc 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -14,7 +14,7 @@ var/other = list() var/hotkeybuttons = list() var/slot_info = list() - + HUD.adding = adding HUD.other = other HUD.hotkeybuttons = hotkeybuttons //These can be disabled for hotkey users @@ -258,15 +258,10 @@ hud_elements |= healths //VOREStation Addition begin - shadekin_dark_display = new /obj/screen/shadekin/darkness() - shadekin_dark_display.screen_loc = ui_shadekin_dark_display - shadekin_dark_display.icon_state = "dark" - hud_elements |= shadekin_dark_display - - shadekin_energy_display = new /obj/screen/shadekin/energy() - shadekin_energy_display.screen_loc = ui_shadekin_energy_display - shadekin_energy_display.icon_state = "energy0" - hud_elements |= shadekin_energy_display + shadekin_display = new /obj/screen/shadekin() + shadekin_display.screen_loc = ui_shadekin_display + shadekin_display.icon_state = "shadekin" + hud_elements |= shadekin_display xenochimera_danger_display = new /obj/screen/xenochimera/danger_level() xenochimera_danger_display.screen_loc = ui_xenochimera_danger_display diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index e4a149eae2..238b5f5b19 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -500,7 +500,7 @@ var/list/gamemode_cache = list() config.respawn_time = raw_minutes MINUTES if ("respawn_message") - config.respawn_message = value + config.respawn_message = "[value]" if ("servername") config.server_name = value diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm index c8da9d206c..e2ff8049c9 100644 --- a/code/datums/supplypacks/misc.dm +++ b/code/datums/supplypacks/misc.dm @@ -85,6 +85,7 @@ /obj/item/toy/plushie/foxbear, /obj/item/toy/plushie/nukeplushie, /obj/item/toy/plushie/otter, + /obj/item/toy/plushie/vox, //VOREStation Add End //YawnWider Add Start /obj/item/toy/plushie/teshari/_yw, diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 0b6ab77d7a..1fbd897113 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -317,16 +317,16 @@ if(!length(t1)) return - for(var/datum/data/record/R in data_core.security) - if(t1 == lowertext(R.fields["name"]) || t1 == lowertext(R.fields["id"]) || t1 == lowertext(R.fields["b_dna"])) - active2 = R + for(var/datum/data/record/R in data_core.general) + if(t1 == lowertext(R.fields["name"]) || t1 == lowertext(R.fields["id"]) || t1 == lowertext(R.fields["fingerprint"])) + active1 = R break - if(!active2) - set_temp("Security record not found. You must enter the person's exact name, ID or DNA.", "danger") + if(!active1) + set_temp("Security record not found. You must enter the person's exact name, ID, or fingerprint.", "danger") return - for(var/datum/data/record/E in data_core.general) - if(E.fields["name"] == active2.fields["name"] && E.fields["id"] == active2.fields["id"]) - active1 = E + for(var/datum/data/record/E in data_core.security) + if(E.fields["name"] == active1.fields["name"] && E.fields["id"] == active1.fields["id"]) + active2 = E break screen = SEC_DATA_RECORD if("print_p") diff --git a/code/game/machinery/vending_machines.dm b/code/game/machinery/vending_machines.dm index 3ebb93289a..10607011ce 100644 --- a/code/game/machinery/vending_machines.dm +++ b/code/game/machinery/vending_machines.dm @@ -754,6 +754,8 @@ /obj/item/toy/plushie/foxbear = 1, /obj/item/toy/plushie/nukeplushie = 1, /obj/item/toy/plushie/otter = 1, + /obj/item/toy/plushie/vox = 1, + /obj/item/toy/mistletoe = 1, //VOREStation Add End //YawnWider Add Start /obj/item/toy/plushie/teshari/_yw = 1, @@ -800,6 +802,8 @@ /obj/item/toy/plushie/foxbear = 50, /obj/item/toy/plushie/nukeplushie = 50, /obj/item/toy/plushie/otter = 50, + /obj/item/toy/plushie/vox = 50, + /obj/item/toy/mistletoe = 50, //VOREStation Add End //YawnWider Add Start /obj/item/toy/plushie/teshari/_yw = 150, diff --git a/code/game/objects/items/toys/toys_vr.dm b/code/game/objects/items/toys/toys_vr.dm index 91c3ed7e06..73f73d8833 100644 --- a/code/game/objects/items/toys/toys_vr.dm +++ b/code/game/objects/items/toys/toys_vr.dm @@ -1,3 +1,9 @@ +/obj/item/toy/mistletoe + name = "mistletoe" + desc = "You are supposed to kiss someone under these" + icon = 'icons/obj/toy_vr.dmi' + icon_state = "mistletoe" + /obj/item/toy/plushie/lizardplushie name = "lizard plushie" desc = "An adorable stuffed toy that resembles a lizardperson." @@ -50,6 +56,14 @@ /obj/item/toy/plushie/borgplushie/scrubpuppy icon_state = "scrubpuppy" +/obj/item/toy/plushie/borgplushie/drakiesec + icon = 'icons/obj/drakietoy_vr.dmi' + icon_state = "secdrake" + +/obj/item/toy/plushie/borgplushie/drakiemed + icon = 'icons/obj/drakietoy_vr.dmi' + icon_state = "meddrake" + /obj/item/toy/plushie/foxbear name = "toy fox" desc = "Issa fox!" @@ -68,3 +82,22 @@ desc = "A perfectly sized snuggable river weasel! Keep away from Clams." icon = 'icons/obj/toy_vr.dmi' icon_state = "plushie_otter" + +/obj/item/toy/plushie/vox + name = "vox plushie" + desc = "A stitched-together vox, fresh from the skipjack. Press its belly to hear it skree!" + icon = 'icons/obj/toy_vr.dmi' + icon_state = "plushie_vox" + var/cooldown = 0 + +/obj/item/toy/plushie/vox/attack_self(mob/user as mob) + if(!cooldown) + playsound(user, 'sound/voice/shriek1.ogg', 10, 0) + src.visible_message("Skreee!") + cooldown = 1 + addtimer(CALLBACK(src, .proc/cooldownreset), 50) + return ..() + +/obj/item/toy/plushie/vox/proc/cooldownreset() + cooldown = 0 + diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index 754943671e..d8906955a1 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -93,3 +93,118 @@ //icon_state = "reinf-snowball" force_divisor = 0.20 thrown_force_divisor = 0.25 + +/obj/item/weapon/material/whip + name = "whip" + desc = "A tool used to discipline animals, or look cool. Mostly the latter." + description_info = "Help - Standard attack, no modifiers.
\ + Disarm - Disarming strike. Attempts to disarm the target at range, similar to an unarmed disarm. Additionally, will force the target (if possible) to move away from you.
\ + Grab - Grappling strike. Attempts to pull the target toward you. This can also move objects.
\ + Harm - A standard strike with a small chance to disarm." + icon = 'icons/obj/weapons.dmi' + icon_state = "whip" + item_state = "chain" + default_material = MAT_LEATHER + slot_flags = SLOT_BELT + w_class = ITEMSIZE_NORMAL + origin_tech = list(TECH_COMBAT = 2) + attack_verb = list("flogged", "whipped", "lashed", "disciplined") + force_divisor = 0.15 + thrown_force_divisor = 0.25 + reach = 2 + + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi', + ) + +/obj/item/weapon/material/whip/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) + ..() + + if(!proximity) + return + + if(istype(A, /atom/movable)) + var/atom/movable/AM = A + if(AM.anchored) + to_chat(user, "\The [AM] won't budge.") + return + + else + if(!istype(AM, /obj/item)) + user.visible_message("\The [AM] is pulled along by \the [src]!") + AM.Move(get_step(AM, get_dir(AM, src))) + return + + else + user.visible_message("\The [AM] is snatched by \the [src]!") + AM.throw_at(user, reach, 0.1, user) + +/obj/item/weapon/material/whip/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) + if(user.a_intent) + switch(user.a_intent) + if(I_HURT) + if(prob(10) && istype(target, /mob/living/carbon/human) && user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)) + to_chat(target, "\The [src] rips at your hands!") + ranged_disarm(target) + if(I_DISARM) + if(prob(min(90, force * 3)) && istype(target, /mob/living/carbon/human) && user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)) + ranged_disarm(target) + else + target.visible_message("\The [src] sends \the [target] stumbling away.") + target.Move(get_step(target,get_dir(user,target))) + if(I_GRAB) + var/turf/STurf = get_turf(target) + spawn(2) + playsound(STurf, 'sound/effects/snap.ogg', 60, 1) + target.visible_message("\The [src] yanks \the [target] towards \the [user]!") + target.throw_at(get_turf(get_step(user,get_dir(user,target))), 2, 1, src) + + ..() + +/obj/item/weapon/material/whip/proc/ranged_disarm(var/mob/living/carbon/human/H, var/mob/living/user) + if(istype(H)) + var/list/holding = list(H.get_active_hand() = 40, H.get_inactive_hand() = 20) + + if(user.zone_sel in list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)) + for(var/obj/item/weapon/gun/W in holding) + if(W && prob(holding[W])) + var/list/turfs = list() + for(var/turf/T in view()) + turfs += T + if(turfs.len) + var/turf/target = pick(turfs) + visible_message("[H]'s [W] goes off due to \the [src]!") + return W.afterattack(target,H) + + if(!(H.species.flags & NO_SLIP) && prob(10) && user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)) + var/armor_check = H.run_armor_check(user.zone_sel, "melee") + H.apply_effect(3, WEAKEN, armor_check) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + if(armor_check < 60) + visible_message("\The [src] has tripped [H]!") + else + visible_message("\The [src] attempted to trip [H]!") + return + + else + if(H.break_all_grabs(user)) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + return + + if(user.zone_sel in list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)) + for(var/obj/item/I in holding) + if(I && prob(holding[I])) + H.drop_from_inventory(I) + visible_message("\The [src] has disarmed [H]!") + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + return + +/obj/item/weapon/material/whip/suicide_act(mob/user) + var/datum/gender/T = gender_datums[user.get_visible_gender()] + user.visible_message(span("danger", "\The [user] [T.is] strangling [T.himself] with \the [src]! It looks like [T.he] [T.is] trying to commit suicide."), span("danger", "You start to strangle yourself with \the [src]!"), span("danger", "You hear the sound of someone choking!")) + return (OXYLOSS) + +/obj/item/weapon/material/whip/attack_self(mob/user) + user.visible_message("\The [user] cracks \the [src]!") + playsound(src, 'sound/effects/snap.ogg', 50, 1) diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 4185cf92c2..b7684d6a7f 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -9,10 +9,12 @@ origin_tech = list(TECH_COMBAT = 4) attack_verb = list("flogged", "whipped", "lashed", "disciplined") - suicide_act(mob/user) - var/datum/gender/T = gender_datums[user.get_visible_gender()] - user.visible_message(span("danger", "\The [user] [T.is] strangling [T.himself] with \the [src]! It looks like [T.he] [T.is] trying to commit suicide."), span("danger", "You start to strangle yourself with \the [src]!"), span("danger", "You hear the sound of someone choking!")) - return (OXYLOSS) + reach = 2 + +/obj/item/weapon/melee/chainofcommand/suicide_act(mob/user) + var/datum/gender/T = gender_datums[user.get_visible_gender()] + user.visible_message(span("danger", "\The [user] [T.is] strangling [T.himself] with \the [src]! It looks like [T.he] [T.is] trying to commit suicide."), span("danger", "You start to strangle yourself with \the [src]!"), span("danger", "You hear the sound of someone choking!")) + return (OXYLOSS) /obj/item/weapon/melee/umbrella name = "umbrella" diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 9b33ec232f..13568c27e6 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -674,6 +674,9 @@ /obj/item/toy/plushie/foxbear, /obj/item/toy/plushie/nukeplushie, /obj/item/toy/plushie/otter, + /obj/item/toy/plushie/vox, + /obj/item/toy/plushie/borgplushie/drakiesec, + /obj/item/toy/plushie/borgplushie/drakiemed, //VOREStation Add End //YawnWider Add Start /obj/item/toy/plushie/teshari/_yw, diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 92a753a14b..6d23cd00c3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -959,6 +959,25 @@ // U CKEYS // V CKEYS +/datum/gear/fluff/verie_suit + path = /obj/item/clothing/under/fluff/verie + display_name = "Verie's Salacious Suit" + ckeywhitelist = list("vitoras") + character_name = list("Verie") + +/datum/gear/fluff/verie_hoodie + path = /obj/item/clothing/suit/storage/hooded/fluff/verie + display_name = "Verie's Helluva Hoodie" + ckeywhitelist = list("vitoras") + character_name = list("Verie") + +/datum/gear/fluff/verie_comb + path = /obj/item/weapon/fluff/verie + display_name = "Verie's Crazy Comb" + description = "(Note: The highlights this gives you will be placed above EVERYTHING... including mobs!)" + ckeywhitelist = list("vitoras") + character_name = list("Verie") + /datum/gear/fluff/cameron_glasses path = /obj/item/clothing/glasses/fluff/science_proper display_name = "Cameron's Science Glasses" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 806ce0f42b..aa6ae67d3e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -65,7 +65,7 @@ ..() var/list/skirts = list() for(var/skirt in (typesof(/obj/item/clothing/under/skirt))) - if(skirt in typesof(/obj/item/clothing/under/skirt/fluff)) //VOREStation addition + if((skirt in typesof(/obj/item/clothing/under/skirt/fluff)) || (skirt in typesof(/obj/item/clothing/under/skirt/outfit/fluff))) //VOREStation addition continue //VOREStation addition var/obj/item/clothing/under/skirt/skirt_type = skirt skirts[initial(skirt_type.name)] = skirt_type diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm index 57bf6b9b7d..6e4b7c741f 100644 --- a/code/modules/materials/material_recipes.dm +++ b/code/modules/materials/material_recipes.dm @@ -269,3 +269,4 @@ recipes += new/datum/stack_recipe("[display_name] ring", /obj/item/clothing/gloves/ring/material, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) recipes += new/datum/stack_recipe("[display_name] bracelet", /obj/item/clothing/accessory/bracelet/material, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) recipes += new/datum/stack_recipe("[display_name] armor plate", /obj/item/weapon/material/armor_plating, 1, time = 20, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) + recipes += new/datum/stack_recipe("whip", /obj/item/weapon/material/whip, 5, time = 15 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]") diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm index 3fb94964da..3af25d4fae 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm @@ -219,34 +219,37 @@ /datum/species/shadekin/proc/update_shadekin_hud(var/mob/living/carbon/human/H) var/turf/T = get_turf(H) - if(!T) - return - if(H.shadekin_energy_display) - H.shadekin_energy_display.invisibility = 0 + if(H.shadekin_display) + var/l_icon = 0 + var/e_icon = 0 + + H.shadekin_display.invisibility = 0 + if(T) + var/brightness = T.get_lumcount() //Brightness in 0.0 to 1.0 + var/darkness = 1-brightness //Invert + switch(darkness) + if(0.80 to 1.00) + l_icon = 0 + if(0.60 to 0.80) + l_icon = 1 + if(0.40 to 0.60) + l_icon = 2 + if(0.20 to 0.40) + l_icon = 3 + if(0.00 to 0.20) + l_icon = 4 + switch(get_energy(H)) + if(0 to 24) + e_icon = 0 + if(25 to 49) + e_icon = 1 + if(50 to 74) + e_icon = 2 + if(75 to 99) + e_icon = 3 if(100 to INFINITY) - H.shadekin_energy_display.icon_state = "energy0" - if(75 to 100) - H.shadekin_energy_display.icon_state = "energy1" - if(50 to 75) - H.shadekin_energy_display.icon_state = "energy2" - if(25 to 50) - H.shadekin_energy_display.icon_state = "energy3" - if(0 to 25) - H.shadekin_energy_display.icon_state = "energy4" - if(H.shadekin_dark_display) - H.shadekin_dark_display.invisibility = 0 - var/brightness = T.get_lumcount() //Brightness in 0.0 to 1.0 - var/darkness = 1-brightness //Invert - switch(darkness) - if(0.80 to 1.00) - H.shadekin_dark_display.icon_state = "dark2" - if(0.60 to 0.80) - H.shadekin_dark_display.icon_state = "dark1" - if(0.40 to 0.60) - H.shadekin_dark_display.icon_state = "dark" - if(0.20 to 0.40) - H.shadekin_dark_display.icon_state = "dark-1" - if(0.00 to 0.20) - H.shadekin_dark_display.icon_state = "dark-2" + e_icon = 4 + + H.shadekin_display.icon_state = "shadekin-[l_icon]-[e_icon]" return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_hud.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_hud.dm index 5017cff724..23c23b0df8 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_hud.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_hud.dm @@ -1,17 +1,8 @@ /obj/screen/shadekin + name = "shadekin status" icon = 'icons/mob/shadekin_hud.dmi' invisibility = 101 -/obj/screen/shadekin/darkness - name = "darkness" - icon_state = "dark" - alpha = 150 - -/obj/screen/shadekin/energy - name = "energy" - icon_state = "energy0" - alpha = 150 - diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm index 138af95b25..ba4b3ee92a 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm @@ -176,7 +176,7 @@ to_chat(src, "Your refactoring is interrupted.") to_chat(blob, "Your refactoring is interrupted!") active_regen = FALSE - nano_outofblob() + nano_outofblob(blob) //// diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index 815d07ede0..6ba9e7c93c 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -221,5 +221,5 @@ YW comment finish*/ name = "Neural Hypersensitivity" desc = "Your nerves are particularly sensitive to physical changes, leading to experiencing twice the intensity of pain and pleasure alike. Doubles traumatic shock." cost = -1 - var_changes = list("traumatic_mod" = 2) + var_changes = list("trauma_mod" = 2) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index 4101362f84..099c9657dd 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -169,7 +169,8 @@ "K9 Alternative" = "k92", "Secborg model V-2" = "secborg", "Borgi" = "borgi-sec", - "Otieborg" = "oties" + "Otieborg" = "oties", + "Drake" = "drakesec" ) channels = list("Security" = 1) networks = list(NETWORK_SECURITY) @@ -247,7 +248,8 @@ "Medical Hound" = "medihound", "Dark Medical Hound (Static)" = "medihounddark", "Mediborg model V-2" = "vale", - "Borgi" = "borgi-medi" + "Borgi" = "borgi-medi", + "Drake" = "drakemed" ) /obj/item/weapon/robot_module/robot/medihound/New(var/mob/living/silicon/robot/R) @@ -379,7 +381,8 @@ sprites = list( "Custodial Hound" = "scrubpup", "Borgi" = "borgi-jani", - "Otieborg" = "otiej" + "Otieborg" = "otiej", + "Drake" = "drakejanit" ) channels = list("Service" = 1) pto_type = PTO_CIVILIAN @@ -464,7 +467,8 @@ "Research Hound" = "science", "Borgi" = "borgi-sci", "SciHound" = "scihound", - "SciHoundDark" = "scihounddark" + "SciHoundDark" = "scihounddark", + "Drake" = "drakesci" ) channels = list("Science" = 1) pto_type = PTO_SCIENCE @@ -539,7 +543,8 @@ "Borgi" = "borgi-eng", "V2 Engidog" = "thottbot", "EngiHound" = "engihound", - "EngiHoundDark" = "engihounddark" + "EngiHoundDark" = "engihounddark", + "Drake" = "drakeeng" ) channels = list("Engineering" = 1) networks = list(NETWORK_ENGINEERING) @@ -761,6 +766,7 @@ "Pinkhound" = "k69", "ServicehoundV2" = "serve2", "ServicehoundV2 Darkmode" = "servedark", + "Drake" = "drakemine" ) channels = list("Service" = 1) pto_type = PTO_CIVILIAN @@ -832,7 +838,8 @@ sprites = list( "KMine" = "kmine", "CargoHound" = "cargohound", - "CargoHoundDark" = "cargohounddark" + "CargoHoundDark" = "cargohounddark", + "Drake" = "drakemine" ) channels = list("Supply" = 1) pto_type = PTO_CARGO diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm index 21011e84c7..87afe03727 100644 --- a/code/modules/mob/living/silicon/robot/robot_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_vr.dm @@ -142,6 +142,10 @@ /mob/living/silicon/robot/proc/vr_sprite_check() if(wideborg == TRUE) + if(icontype== "Drake") // Why, Why can't we have normal nice things + icon = 'icons/mob/drakeborg/drakeborg_vr.dmi' + else + icon = 'icons/mob/widerobot_vr.dmi' return if((!(original_icon == icon)) && (!(icon == 'icons/mob/robots_vr.dmi'))) original_icon = icon diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index b05603182f..a451488ad5 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -682,7 +682,7 @@ // facing verbs /mob/proc/canface() - if(!canmove) return 0 +// if(!canmove) return 0 //VOREStation Edit. Redundant check that only affects conscious proning, actual inability to turn and shift around handled by actual inabilities. if(stat) return 0 if(anchored) return 0 if(transforming) return 0 diff --git a/code/modules/mob/mob_defines_vr.dm b/code/modules/mob/mob_defines_vr.dm index 1c6e19ac78..41c27a41d0 100644 --- a/code/modules/mob/mob_defines_vr.dm +++ b/code/modules/mob/mob_defines_vr.dm @@ -5,8 +5,7 @@ var/disconnect_time = null //Time of client loss, set by Logout(), for timekeeping - var/obj/screen/shadekin/darkness/shadekin_dark_display = null - var/obj/screen/shadekin/energy/shadekin_energy_display = null + var/obj/screen/shadekin/shadekin_display = null var/obj/screen/xenochimera/danger_level/xenochimera_danger_display = null /mob/drop_location() diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 247995a7e3..9b1cbfd574 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -370,7 +370,7 @@ // in message boxes, this looks nice and is easily delimited. /obj/belly/proc/get_messages(type, delim = "\n\n") ASSERT(type == "smo" || type == "smi" || type == "dmo" || type == "dmp" || type == "em") - + var/list/raw_messages switch(type) if("smo") @@ -522,7 +522,7 @@ owner.adjust_nutrition((nutrition_percent / 100) * 5 * digested) if(isrobot(owner)) var/mob/living/silicon/robot/R = owner - R.cell.charge += (50 * digested) + R.cell.charge += ((nutrition_percent / 100) * 50 * digested) return digested //Determine where items should fall out of us into. diff --git a/code/modules/vore/eating/bellymodes_datum_vr.dm b/code/modules/vore/eating/bellymodes_datum_vr.dm index 04f96becd4..ae60740248 100644 --- a/code/modules/vore/eating/bellymodes_datum_vr.dm +++ b/code/modules/vore/eating/bellymodes_datum_vr.dm @@ -42,7 +42,7 @@ GLOBAL_LIST_INIT(digest_modes, list()) L.adjustFireLoss(B.digest_burn) var/actual_brute = L.getBruteLoss() - old_brute var/actual_burn = L.getFireLoss() - old_burn - var/damage_gain = actual_brute + actual_burn + var/damage_gain = (actual_brute + actual_burn)*(B.nutrition_percent / 100) var/offset = (1 + ((L.weight - 137) / 137)) // 130 pounds = .95 140 pounds = 1.02 var/difference = B.owner.size_multiplier / L.size_multiplier @@ -50,9 +50,9 @@ GLOBAL_LIST_INIT(digest_modes, list()) var/mob/living/silicon/robot/R = B.owner R.cell.charge += 25 * damage_gain if(offset) // If any different than default weight, multiply the % of offset. - B.owner.adjust_nutrition(offset*((B.nutrition_percent / 100) * 4.5 * (damage_gain) / difference)) //4.5 nutrition points per health point. Normal same size 100+100 health prey with average weight would give 900 points if the digestion was instant. With all the size/weight offset taxes plus over time oxyloss+hunger taxes deducted with non-instant digestion, this should be enough to not leave the pred starved. + B.owner.adjust_nutrition(offset*(4.5 * (damage_gain) / difference)) //4.5 nutrition points per health point. Normal same size 100+100 health prey with average weight would give 900 points if the digestion was instant. With all the size/weight offset taxes plus over time oxyloss+hunger taxes deducted with non-instant digestion, this should be enough to not leave the pred starved. else - B.owner.adjust_nutrition((B.nutrition_percent / 100) * 4.5 * (damage_gain) / difference) + B.owner.adjust_nutrition(4.5 * (damage_gain) / difference) /datum/digest_mode/absorb id = DM_ABSORB @@ -149,33 +149,35 @@ GLOBAL_LIST_INIT(digest_modes, list()) if(B.owner.nutrition > 400 && H.nutrition < 400) B.owner.adjust_nutrition(-2) H.adjust_nutrition(1.5) - if(changes_eyes && B.check_eyes(H)) - B.change_eyes(H, 1) - return null - if(changes_hair_solo && B.check_hair(H)) - B.change_hair(H) - return null - if(changes_hairandskin && (B.check_hair(H) || B.check_skin(H))) - B.change_hair(H) - B.change_skin(H, 1) - return null - if(changes_species) - if(changes_ears_tail_wing_nocolor && (B.check_ears(H) || B.check_tail_nocolor(H) || B.check_wing_nocolor(H) || B.check_species(H))) - B.change_ears(H) - B.change_tail_nocolor(H) - B.change_wing_nocolor(H) - B.change_species(H, 1, 1) // ,1) preserves coloring - H.species.create_organs(H) - H.sync_organ_dna() + var/datum/species/target_species = H.species + if(!((target_species.spawn_flags & SPECIES_IS_WHITELISTED) || (target_species.spawn_flags & SPECIES_IS_RESTRICTED))) + if(changes_eyes && B.check_eyes(H)) + B.change_eyes(H, 1) return null - if(changes_ears_tail_wing_color && (B.check_ears(H) || B.check_tail(H) || B.check_wing(H) || B.check_species(H))) - B.change_ears(H) - B.change_tail(H) - B.change_wing(H) - B.change_species(H, 1, 2) // ,2) does not preserve coloring. - H.species.create_organs(H) - H.sync_organ_dna() + if(changes_hair_solo && B.check_hair(H)) + B.change_hair(H) return null + if(changes_hairandskin && (B.check_hair(H) || B.check_skin(H))) + B.change_hair(H) + B.change_skin(H, 1) + return null + if(changes_species) + if(changes_ears_tail_wing_nocolor && (B.check_ears(H) || B.check_tail_nocolor(H) || B.check_wing_nocolor(H) || B.check_species(H))) + B.change_ears(H) + B.change_tail_nocolor(H) + B.change_wing_nocolor(H) + B.change_species(H, 1, 1) // ,1) preserves coloring + H.species.create_organs(H) + H.sync_organ_dna() + return null + if(changes_ears_tail_wing_color && (B.check_ears(H) || B.check_tail(H) || B.check_wing(H) || B.check_species(H))) + B.change_ears(H) + B.change_tail(H) + B.change_wing(H) + B.change_species(H, 1, 2) // ,2) does not preserve coloring. + H.species.create_organs(H) + H.sync_organ_dna() + return null if(changes_gender && B.check_gender(H, changes_gender_to)) B.change_gender(H, changes_gender_to, 1) return null diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index d5eaeb4d25..f6c74215cd 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -56,7 +56,7 @@ var/datum/digest_mode/DM = GLOB.digest_modes["[digest_mode]"] if(!DM) - log_debug("Digest mode [digest_mode] didn't exist in the digest_modes list!!") + log_debug("Digest mode [digest_mode] didn't exist in the digest_modes list!!") return FALSE if(!digestion_noise_chance) @@ -89,7 +89,7 @@ else M.playsound_local(owner.loc, play_sound, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF) //these are all external sound triggers now, so it's ok. - + if(to_update) updateVRPanels() @@ -146,7 +146,7 @@ digestion_noise_chance = 25 to_update = TRUE break // Digest off one by one, not all at once - + //get rid of things like blood drops and gibs that end up in there else if(istype(A, /obj/effect/decal/cleanable)) qdel(A) @@ -215,7 +215,7 @@ if(compensation > 0) if(isrobot(owner)) var/mob/living/silicon/robot/R = owner - R.cell.charge += 25*compensation + R.cell.charge += 25*compensation*(nutrition_percent / 100) else owner.adjust_nutrition((nutrition_percent / 100)*4.5*compensation) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 1cb4f3311f..ed17e11f97 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -110,8 +110,8 @@ //ketrai:Ketrai /obj/item/clothing/head/fluff/ketrai - name = "Pink Bear Hat" - desc = "A pink space bear hat, the origins are unknown" + name = "Bear Pelt" + desc = "A luxury space bear pelt, its origins unknown." icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "bearpelt" @@ -2026,7 +2026,7 @@ Departamental Swimsuits, for general use desc = "A special hat, removed from its owner." //Ryumi: Nikki Yumeno -/obj/item/clothing/under/skirt/outfit/fluff/nikki +/obj/item/clothing/under/skirt/outfit/fluff/nikki name = "dorky outfit" desc = "A little witch costume that looks like it's been worn as ordinary clothes. Who in their right mind would...??" icon = 'icons/vore/custom_clothes_vr.dmi' @@ -2052,7 +2052,7 @@ Departamental Swimsuits, for general use icon_state = "nikki_boots" item_state = "nikki_boots" -/obj/item/clothing/shoes/fluff/nikki/mob_can_equip(var/mob/living/carbon/human/M, slot, disable_warning = 0) +/obj/item/clothing/shoes/fluff/nikki/mob_can_equip(var/mob/living/carbon/human/M, slot, disable_warning = 0) if(..()) if (M.ckey == "ryumi") return 1 @@ -2086,7 +2086,7 @@ Departamental Swimsuits, for general use icon_state = "nikki-hat" item_state = "nikki-hat" item_icons = list( - slot_l_hand_str = 'icons/vore/custom_clothes_left_hand_vr.dmi', + slot_l_hand_str = 'icons/vore/custom_clothes_left_hand_vr.dmi', slot_r_hand_str = 'icons/vore/custom_clothes_right_hand_vr.dmi', slot_head_str = 'icons/vore/custom_onmob_32x48_vr.dmi' ) @@ -2140,19 +2140,19 @@ Departamental Swimsuits, for general use to_chat(user, "You think to turn \the [src] on its creator?! FOOOOOOOOL.") to_chat(user, "From seemingly nowhere you hear echoing, derisive laughter, accompanied by a stock laugh track and... Are those bike horns?") return 0 - + if (!istype(target)) to_chat(user, "\The [src] isn't a valid target!") return 0 - + // Because other mobs (i.e. monkeys) apparently have dropnom prey set to 0, we check SPECIFICALLY for humans' dropnom setting. if (target.type == /mob/living/carbon/human && !target.can_be_drop_prey) teleport_fail(user, target) return 0 - + if (!translocator.teleport_checks(target, user)) return 0 - + else return 1 /obj/item/clothing/head/fluff/nikki/attackby(obj/item/weapon/I as obj, mob/user as mob) @@ -2239,7 +2239,7 @@ Departamental Swimsuits, for general use if (I_HURT) user.visible_message("[user] swipes \the [src] over \the [target]!") translocator.afterattack(target, user, proximity_flag) - + add_attack_logs(user, target, "Teleported [target] with via \the [src]'s [translocator]!") else ..() @@ -2253,7 +2253,7 @@ Departamental Swimsuits, for general use icon_override = 'icons/vore/custom_onmob_vr.dmi' item_state = "verie_hoodie" - + hoodtype = /obj/item/clothing/head/hood/winter/fluff/verie var/owner = "vitoras" @@ -2267,6 +2267,7 @@ Departamental Swimsuits, for general use ..() /obj/item/clothing/head/hood/winter/fluff/verie + body_parts_covered = null // This way, Verie's hair can show through the hood! name = "not-so-cyan hood" icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "verie_hood" diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index b121724219..c6be35df69 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -295,7 +295,7 @@ if(spawn_type) var/obj/item/weapon/gun/energy/new_gun = new spawn_type(src.loc) new_item = new_gun - new_item.icon_state = "egun[rand(1,12)]" + new_item.icon_state = "egun[rand(1,6)]" //VOREStation Edit: max value is 6 since xenoarcheoloy_vr only has 6 egun variants new_gun.desc = "This is an antique energy weapon, you're not sure if it will fire or not." //5% chance to explode when first fired diff --git a/icons/_nanomaps/tether_nanomap_z1.png b/icons/_nanomaps/tether_nanomap_z1.png index 158557cce7..614f2036a4 100644 Binary files a/icons/_nanomaps/tether_nanomap_z1.png and b/icons/_nanomaps/tether_nanomap_z1.png differ diff --git a/icons/_nanomaps/tether_nanomap_z2.png b/icons/_nanomaps/tether_nanomap_z2.png index 0b378b4732..381e6131e2 100644 Binary files a/icons/_nanomaps/tether_nanomap_z2.png and b/icons/_nanomaps/tether_nanomap_z2.png differ diff --git a/icons/_nanomaps/tether_nanomap_z3.png b/icons/_nanomaps/tether_nanomap_z3.png index f82f1f3dcf..72c7582c2a 100644 Binary files a/icons/_nanomaps/tether_nanomap_z3.png and b/icons/_nanomaps/tether_nanomap_z3.png differ diff --git a/icons/mob/drakeborg/Drakeborg-Licensing.txt b/icons/mob/drakeborg/Drakeborg-Licensing.txt new file mode 100644 index 0000000000..f2d3ca925c --- /dev/null +++ b/icons/mob/drakeborg/Drakeborg-Licensing.txt @@ -0,0 +1,69 @@ +Drakeborg & drakeplushies are created by deviantart.com/mizartz + +https://creativecommons.org/licenses/by-nc-sa/3.0/ +Attribution-NonCommercial-ShareAlike 3.0 Unported + +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. +License +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + +"Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. +"Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(g) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. +"Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. +"License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, Noncommercial, ShareAlike. +"Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. +"Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. +"Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. +"You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. +"Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. +"Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. +2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + +to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; +to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; +to Distribute and Publicly Perform the Work including as incorporated in Collections; and, +to Distribute and Publicly Perform Adaptations. +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved, including but not limited to the rights described in Section 4(e). + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + +You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(d), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(d), as requested. +You may Distribute or Publicly Perform an Adaptation only under: (i) the terms of this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-NonCommercial-ShareAlike 3.0 US) ("Applicable License"). You must include a copy of, or the URI, for Applicable License with every copy of each Adaptation You Distribute or Publicly Perform. You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License. You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License. +You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in con-nection with the exchange of copyrighted works. +If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and, (iv) consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(d) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. +For the avoidance of doubt: + +Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; +Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License if Your exercise of such rights is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(c) and otherwise waives the right to collect royalties through any statutory or compulsory licensing scheme; and, +Voluntary License Schemes. The Licensor reserves the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License that is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(c). +Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING AND TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO THIS EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + +This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. +Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. +8. Miscellaneous + +Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. +Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. +If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. +No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. +This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. +The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. +Creative Commons Notice +Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. + +Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of this License. + +Creative Commons may be contacted at https://creativecommons.org/. \ No newline at end of file diff --git a/icons/mob/drakeborg/drakeborg_vr.dmi b/icons/mob/drakeborg/drakeborg_vr.dmi new file mode 100644 index 0000000000..c1ec3f92b0 Binary files /dev/null and b/icons/mob/drakeborg/drakeborg_vr.dmi differ diff --git a/icons/mob/shadekin_hud.dmi b/icons/mob/shadekin_hud.dmi index 707feea2a9..a1340290e1 100644 Binary files a/icons/mob/shadekin_hud.dmi and b/icons/mob/shadekin_hud.dmi differ diff --git a/icons/mob/widerobot_vr.dmi b/icons/mob/widerobot_vr.dmi index 620a150254..da8c07762b 100644 Binary files a/icons/mob/widerobot_vr.dmi and b/icons/mob/widerobot_vr.dmi differ diff --git a/icons/obj/drakietoy_vr.dmi b/icons/obj/drakietoy_vr.dmi new file mode 100644 index 0000000000..34a4932513 Binary files /dev/null and b/icons/obj/drakietoy_vr.dmi differ diff --git a/icons/obj/toy_vr.dmi b/icons/obj/toy_vr.dmi index 9333c6b938..2e6c3af857 100644 Binary files a/icons/obj/toy_vr.dmi and b/icons/obj/toy_vr.dmi differ diff --git a/icons/turf/flooring/decals.dmi b/icons/turf/flooring/decals.dmi index 66e365251a..acd81e57f1 100644 Binary files a/icons/turf/flooring/decals.dmi and b/icons/turf/flooring/decals.dmi differ diff --git a/icons/turf/flooring/decals_vr.dmi b/icons/turf/flooring/decals_vr.dmi index 4447453ba9..6e99661d1f 100644 Binary files a/icons/turf/flooring/decals_vr.dmi and b/icons/turf/flooring/decals_vr.dmi differ diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index 3e3d53b3db..d9b172cd5a 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ diff --git a/maps/offmap_vr/talon/talon1.dmm b/maps/offmap_vr/talon/talon1.dmm index b194f0220a..ba71141c7d 100644 --- a/maps/offmap_vr/talon/talon1.dmm +++ b/maps/offmap_vr/talon/talon1.dmm @@ -118,14 +118,14 @@ /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/deckone_port) "an" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/white/golden, /area/talon/deckone/bridge) "ao" = ( @@ -324,7 +324,7 @@ /obj/structure/handrail{ dir = 8 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port_fore_wing) "aH" = ( /obj/structure/catwalk, @@ -334,14 +334,14 @@ /obj/structure/handrail{ dir = 4 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_fore_wing) "aI" = ( /obj/structure/catwalk, /obj/structure/sign/warning/moving_parts{ pixel_x = 30 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port_fore_wing) "aJ" = ( /obj/structure/table/rack/shelf/steel, @@ -407,7 +407,7 @@ /obj/structure/sign/warning/moving_parts{ pixel_x = -30 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_fore_wing) "aT" = ( /obj/structure/catwalk, @@ -416,7 +416,7 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port_fore_wing) "aU" = ( /obj/structure/catwalk, @@ -424,7 +424,7 @@ dir = 1; icon_state = "4-8" }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_fore_wing) "aV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux, @@ -456,34 +456,25 @@ /area/talon/deckone/armory) "aZ" = ( /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port_fore_wing) "ba" = ( /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_fore_wing) -"bb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/structure/closet/hydrant{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/eris/dark/cyancorner, -/area/talon/deckone/bridge) "bc" = ( /obj/structure/catwalk, /obj/structure/handrail{ dir = 8 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port_aft_wing) "bd" = ( /obj/structure/catwalk, /obj/structure/handrail{ dir = 4 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_aft_wing) "be" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -535,7 +526,7 @@ /area/talon/deckone/medical) "bi" = ( /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port_aft_wing) "bj" = ( /obj/structure/window/reinforced, @@ -550,7 +541,7 @@ /area/talon/maintenance/deckone_starboard) "bl" = ( /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_aft_wing) "bm" = ( /obj/structure/catwalk, @@ -559,7 +550,7 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port_aft_wing) "bn" = ( /obj/structure/catwalk, @@ -568,21 +559,21 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_aft_wing) "bo" = ( /obj/machinery/light/small{ dir = 4 }, /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port) "bp" = ( /obj/machinery/light/small{ dir = 8 }, /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard) "bq" = ( /obj/machinery/airlock_sensor{ @@ -676,7 +667,7 @@ }, /obj/effect/map_helper/airlock/sensor/ext_sensor, /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port) "by" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -705,7 +696,7 @@ }, /obj/effect/map_helper/airlock/sensor/ext_sensor, /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard) "bA" = ( /obj/structure/catwalk, @@ -715,7 +706,7 @@ /obj/machinery/camera/network/talon{ dir = 8 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port) "bB" = ( /obj/structure/catwalk, @@ -725,7 +716,7 @@ /obj/machinery/camera/network/talon{ dir = 4 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard) "bC" = ( /obj/structure/catwalk, @@ -739,6 +730,9 @@ /obj/structure/closet/autolok_wall{ pixel_y = -24 }, +/obj/structure/closet/hydrant{ + pixel_x = -26 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "bE" = ( @@ -798,12 +792,7 @@ /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/central_hallway) "bI" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/closet/hydrant{ - pixel_y = 32 - }, +/obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "bJ" = ( @@ -958,6 +947,9 @@ id = "talon_sensor"; name = "sensor blast shields" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "bX" = ( @@ -1929,6 +1921,9 @@ /area/talon/deckone/starboard_eng) "hQ" = ( /obj/structure/table/steel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "id" = ( @@ -2525,9 +2520,13 @@ /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/deckone_starboard) "nT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/emblem/talon, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled/eris/white/golden, /area/talon/deckone/bridge) "nW" = ( @@ -2699,6 +2698,9 @@ /obj/structure/closet/autolok_wall{ pixel_y = -24 }, +/obj/structure/closet/hydrant{ + pixel_x = 26 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "pJ" = ( @@ -4075,9 +4077,6 @@ /obj/machinery/computer/ship/helm{ req_one_access = list(301) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "Gb" = ( @@ -4248,9 +4247,6 @@ /area/talon/deckone/bridge_hallway) "HW" = ( /obj/machinery/computer/ship/sensors, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "Id" = ( @@ -5140,13 +5136,11 @@ /turf/simulated/floor/hull/airless, /area/talon/maintenance/deckone_starboard_aft_wing) "RS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, +/obj/structure/table/steel, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "RV" = ( /obj/structure/cable/green{ @@ -5418,6 +5412,9 @@ id = "talon_windows"; name = "window blast shields" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "UC" = ( @@ -15410,7 +15407,7 @@ aa af ab ac -bb +bI Nz bW tw @@ -15694,11 +15691,11 @@ aa ag ae al +ao +ao an ao ao -ao -ao as ac KP @@ -15836,8 +15833,8 @@ aa aa ai IM -RS -on +LH +LH nT on uy @@ -15978,10 +15975,10 @@ aa aa ai IM +LH +LH wm LH -LH -LH cC zy ac @@ -16122,7 +16119,7 @@ ab ac HW oS -hQ +RS Os VU YT diff --git a/maps/submaps/admin_use_vr/kk_mercship.dmm b/maps/submaps/admin_use_vr/kk_mercship.dmm index bb3ee7cabe..b5279064be 100644 --- a/maps/submaps/admin_use_vr/kk_mercship.dmm +++ b/maps/submaps/admin_use_vr/kk_mercship.dmm @@ -164,9 +164,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "aM" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -174,6 +171,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "aN" = ( @@ -255,9 +255,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "bc" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 2; d2 = 8; @@ -268,8 +265,17 @@ d2 = 4; icon_state = "2-4" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) +"bd" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/armoury_st) "bg" = ( /turf/space, /turf/space, @@ -337,7 +343,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "br" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 2; d2 = 4; @@ -350,6 +355,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "bt" = ( @@ -390,9 +398,15 @@ dir = 1 }, /obj/machinery/appliance/cooker/fryer, -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) +"by" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/armoury_st) "bA" = ( /obj/structure/closet/cabinet{ name = "Clothing Storage" @@ -648,9 +662,6 @@ /turf/simulated/floor/reinforced, /area/ship/manta/med) "cK" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -658,6 +669,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "cM" = ( @@ -719,9 +733,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "cX" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 8; @@ -731,6 +742,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "cY" = ( @@ -758,12 +772,12 @@ icon_state = "1-2" }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/dock_star) "da" = ( @@ -861,10 +875,10 @@ /turf/simulated/floor/wood, /area/ship/manta/barracks) "dH" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/structure/flora/pottedplant/minitree, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "dI" = ( @@ -929,12 +943,14 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/manta/bridge) "dZ" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "ec" = ( @@ -998,7 +1014,9 @@ /turf/simulated/floor/tiled/white, /area/ship/manta/med) "er" = ( -/obj/effect/floor_decal/techfloor/corner, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "et" = ( @@ -1012,8 +1030,8 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "eB" = ( /obj/machinery/chemical_dispenser/ert, @@ -1261,7 +1279,7 @@ /area/ship/manta/teleporter) "fU" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/white, /area/ship/manta/med) @@ -1308,7 +1326,7 @@ /area/ship/manta/barracks/bed_1) "gf" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 8 + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) @@ -1608,12 +1626,12 @@ /turf/simulated/floor/wood, /area/ship/manta/barracks) "hD" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "hH" = ( @@ -1640,12 +1658,12 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "hS" = ( @@ -1796,10 +1814,10 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "it" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "iu" = ( @@ -1807,8 +1825,8 @@ dir = 1 }, /obj/machinery/appliance/cooker/oven, -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "iv" = ( /obj/machinery/atmospherics/portables_connector/fuel{ @@ -1855,7 +1873,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/chicken, /obj/item/weapon/reagent_containers/food/snacks/meat/chicken, /obj/item/weapon/reagent_containers/food/snacks/meat/chicken, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "iB" = ( /obj/effect/floor_decal/techfloor{ @@ -2106,38 +2124,33 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "jz" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/black, -/obj/effect/floor_decal/corner/black{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "jB" = ( -/obj/effect/floor_decal/corner/black, -/obj/effect/floor_decal/corner/black{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "jD" = ( -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, +/obj/effect/floor_decal/corner/white{ dir = 1 }, -/obj/effect/floor_decal/corner/black, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/corner, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "jE" = ( /obj/machinery/door/blast/regular{ @@ -2162,25 +2175,25 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "jI" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "jP" = ( @@ -2197,9 +2210,6 @@ icon_state = "4-8" }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -2210,6 +2220,9 @@ dir = 1; pixel_y = -23 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "jW" = ( @@ -2286,7 +2299,7 @@ dir = 10 }, /obj/machinery/appliance/cooker/grill, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "kF" = ( /obj/structure/table/steel_reinforced, @@ -2310,10 +2323,10 @@ pixel_y = 8 }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/white{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "kJ" = ( /obj/machinery/vending/food{ @@ -2322,15 +2335,12 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/white{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "kL" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/effect/floor_decal/techfloor{ dir = 10 }, @@ -2345,6 +2355,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "kO" = ( @@ -2368,7 +2381,6 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 2; d2 = 4; @@ -2380,6 +2392,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "lg" = ( @@ -2482,15 +2497,15 @@ icon_state = "4-8" }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "lG" = ( @@ -2711,6 +2726,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "mG" = ( @@ -2810,9 +2828,6 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/light/no_nightshift{ dir = 4 }, @@ -2827,6 +2842,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "nl" = ( @@ -2948,14 +2966,14 @@ /turf/simulated/floor/plating, /area/ship/manta/dock_port) "nP" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "nS" = ( @@ -2975,12 +2993,6 @@ pixel_y = -24; req_access = list(150) }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/effect/floor_decal/techfloor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -2988,6 +3000,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "nY" = ( @@ -3053,9 +3071,6 @@ /turf/simulated/floor/reinforced/airless, /area/ship/manta/radiator_star) "oi" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -3070,6 +3085,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "om" = ( @@ -3181,10 +3199,10 @@ dir = 4 }, /obj/effect/floor_decal/techfloor/corner{ - dir = 8 + dir = 10 }, /obj/effect/floor_decal/techfloor/corner{ - dir = 1 + dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) @@ -3241,10 +3259,10 @@ pixel_y = 8 }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/white{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "oT" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -3257,9 +3275,6 @@ /area/ship/manta/radiator_port) "oU" = ( /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/engineering{ - req_one_access = list(150) - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -3271,6 +3286,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/airlock/engineering{ + name = "Radiator Array"; + req_one_access = list(150) + }, /turf/simulated/floor/plating, /area/ship/manta/radiator_star) "oW" = ( @@ -3380,12 +3399,12 @@ icon_state = "1-2" }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/dock_port) "pS" = ( @@ -3517,14 +3536,16 @@ /area/ship/manta/med) "qz" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 8 + dir = 10 }, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "qA" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "qB" = ( @@ -3626,12 +3647,14 @@ /turf/simulated/floor/tiled/white, /area/ship/manta/med) "rb" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "rl" = ( @@ -3661,7 +3684,7 @@ /area/ship/manta/radiator_port) "rq" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 1 + dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) @@ -3935,13 +3958,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "sV" = ( @@ -4003,7 +4026,9 @@ /turf/simulated/floor/wood, /area/ship/manta/barracks) "tm" = ( -/obj/effect/floor_decal/techfloor/corner, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "tp" = ( @@ -4108,7 +4133,7 @@ /area/ship/manta/recreation) "tQ" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 1 + dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) @@ -4126,14 +4151,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "ua" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "ub" = ( @@ -4264,7 +4289,7 @@ /area/ship/manta/hangar) "uE" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) @@ -4283,17 +4308,28 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "uK" = ( +/obj/structure/cable/orange{ + 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 = 4 + }, /obj/effect/floor_decal/techfloor/corner{ - dir = 1 + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "uM" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "uN" = ( @@ -4325,14 +4361,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "uS" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "uT" = ( @@ -4560,7 +4596,6 @@ /turf/simulated/floor/plating, /area/ship/manta/engine) "vU" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 2; d2 = 4; @@ -4572,6 +4607,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "vV" = ( @@ -4606,10 +4644,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "wb" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -4626,6 +4660,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "wc" = ( @@ -4652,7 +4692,7 @@ /area/ship/manta/armoury_st) "wd" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) @@ -4661,9 +4701,6 @@ /turf/simulated/floor/plating, /area/ship/manta/radiator_star) "wi" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -4675,6 +4712,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wl" = ( @@ -4715,7 +4755,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wp" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -4727,6 +4766,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wt" = ( @@ -4772,9 +4814,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wy" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -4786,6 +4825,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wC" = ( @@ -4832,12 +4874,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wP" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wQ" = ( @@ -4864,14 +4908,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "wX" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "wZ" = ( @@ -4896,7 +4940,7 @@ icon_state = "1-2" }, /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) @@ -5039,12 +5083,14 @@ /turf/simulated/floor/plating, /area/ship/manta/radiator_star) "xF" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "xG" = ( @@ -5071,6 +5117,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "xL" = ( @@ -5232,7 +5281,6 @@ /turf/simulated/floor/reinforced/airless, /area/ship/manta/dock_port) "yp" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -5249,6 +5297,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "ys" = ( @@ -5458,7 +5509,7 @@ /area/ship/manta/mech_bay) "zb" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) @@ -5481,7 +5532,7 @@ /area/ship/manta/engine) "zg" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 1 + dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) @@ -5546,10 +5597,10 @@ dir = 1 }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/white{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "zp" = ( /obj/structure/cable{ @@ -5754,14 +5805,11 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/manta_ship_boat) "Aw" = ( -/obj/effect/floor_decal/corner/black, -/obj/effect/floor_decal/corner/black{ - dir = 1 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "AA" = ( /obj/machinery/atmospherics/portables_connector{ @@ -5782,9 +5830,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/effect/floor_decal/techfloor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5792,6 +5837,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "AD" = ( @@ -6058,19 +6106,18 @@ /area/ship/manta/dock_star) "Cp" = ( /obj/effect/floor_decal/rust, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Cu" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -6082,6 +6129,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "Cw" = ( @@ -6155,9 +6205,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "CK" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -6169,6 +6216,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "CP" = ( @@ -6318,12 +6368,6 @@ /turf/simulated/floor/plating, /area/ship/manta/atmos) "Dp" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -6331,6 +6375,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_as) "Dq" = ( @@ -6463,15 +6513,15 @@ /turf/simulated/floor/plating, /area/ship/manta/radiator_star) "DR" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "DY" = ( @@ -6578,11 +6628,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "EA" = ( @@ -6833,11 +6885,11 @@ pixel_y = 4 }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/corner/black{ +/obj/machinery/light/no_nightshift, +/obj/effect/floor_decal/corner/white{ dir = 1 }, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "Gg" = ( /obj/structure/table/woodentable, @@ -7222,15 +7274,15 @@ icon_state = "1-4" }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/teleporter) "Iq" = ( @@ -7277,16 +7329,18 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "II" = ( @@ -7396,15 +7450,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "Jl" = ( @@ -7554,11 +7608,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "JY" = ( -/obj/effect/floor_decal/corner/black, -/obj/effect/floor_decal/corner/black{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "Kc" = ( /obj/item/modular_computer/console/preset/mercenary{ @@ -7595,19 +7646,18 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "Ko" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -7615,6 +7665,9 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "Kp" = ( @@ -7764,9 +7817,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner, /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 5 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) @@ -7778,8 +7833,8 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "Ld" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -7812,6 +7867,19 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) +"Lj" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/bridge) "Lm" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/wall/rplastihull, @@ -7821,12 +7889,12 @@ dir = 1 }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Lt" = ( @@ -7917,10 +7985,6 @@ pixel_y = 25; req_access = list(150) }, -/obj/effect/floor_decal/techfloor/corner, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -7930,6 +7994,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "LU" = ( @@ -7998,15 +8068,25 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Ml" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) +"Mp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/armoury_st) "Mr" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, /turf/simulated/floor/plating, @@ -8031,12 +8111,12 @@ dir = 4 }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "ME" = ( @@ -8050,14 +8130,14 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "MI" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "MM" = ( @@ -8068,10 +8148,12 @@ /turf/simulated/floor/plating, /area/ship/manta/hallways_star) "MQ" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "MU" = ( @@ -8079,12 +8161,12 @@ /turf/simulated/floor/plating, /area/ship/manta/radiator_port) "MV" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "MY" = ( @@ -8134,7 +8216,7 @@ /area/ship/manta/armoury_as) "Ne" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 8 + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) @@ -8223,14 +8305,16 @@ /area/ship/manta/armoury_st) "NA" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 8 + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "ND" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NE" = ( @@ -8273,9 +8357,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "NK" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -8283,6 +8364,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NM" = ( @@ -8298,7 +8382,9 @@ /turf/simulated/wall/plastihull, /area/ship/manta/barracks) "NT" = ( -/obj/effect/floor_decal/techfloor/corner, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NV" = ( @@ -8402,9 +8488,6 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 2; d2 = 8; @@ -8419,6 +8502,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "OK" = ( @@ -8869,9 +8955,6 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -8879,6 +8962,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "Rj" = ( @@ -8888,15 +8974,15 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/effect/floor_decal/corner/black, /obj/machinery/light/no_nightshift{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "Rq" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) @@ -9026,10 +9112,12 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "RR" = ( @@ -9200,6 +9288,7 @@ "SO" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/engineering{ + name = "Radiator Array"; req_one_access = list(150) }, /obj/structure/cable/orange{ @@ -9231,14 +9320,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "SW" = ( @@ -9369,12 +9458,18 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/ship/manta/engine) -"Tv" = ( +"Tp" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 9 }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/hallways_star) +"Tv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "Tw" = ( @@ -9483,14 +9578,14 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Ua" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Ub" = ( @@ -9917,9 +10012,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "We" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 8; @@ -9927,6 +10019,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "Wi" = ( @@ -9997,6 +10092,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/multi_tile/metal{ + name = "Engineering"; req_one_access = list(150) }, /obj/effect/floor_decal/techfloor{ @@ -10105,9 +10201,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 4; @@ -10115,6 +10208,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "Xp" = ( @@ -10223,9 +10319,6 @@ /turf/simulated/wall/rplastihull, /area/ship/manta/engine) "XF" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 4; @@ -10238,6 +10331,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "XH" = ( @@ -10269,10 +10365,10 @@ icon_state = "4-8" }, /obj/effect/floor_decal/techfloor/corner{ - dir = 8 + dir = 9 }, /obj/effect/floor_decal/techfloor/corner{ - dir = 1 + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) @@ -10282,6 +10378,7 @@ }, /obj/machinery/door/airlock/multi_tile/metal{ dir = 1; + name = "Brig"; req_one_access = list(150) }, /obj/effect/floor_decal/techfloor, @@ -10341,14 +10438,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "Yh" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Yi" = ( @@ -10455,14 +10552,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "YH" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 1 + dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) @@ -10658,14 +10757,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "ZI" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "ZO" = ( @@ -18595,7 +18694,7 @@ hU lj oD oD -iR +bd wi zv Du @@ -18744,7 +18843,7 @@ bR bR NA RR -iR +bd bR bR bR @@ -18886,7 +18985,7 @@ OR OR ND Sb -OR +Mp OR sy nC @@ -19021,7 +19120,7 @@ ih lo oO lo -aX +by wp zx Dz @@ -19305,7 +19404,7 @@ ip lz oP sk -iR +bd wy zy Eb @@ -19596,7 +19695,7 @@ bR bR NT St -aX +by bR bR bR @@ -19731,7 +19830,7 @@ iU lP lP lP -aX +by wP zH lP @@ -20744,7 +20843,7 @@ fx gR Jw FQ -FQ +Lj UF SV WN @@ -20886,7 +20985,7 @@ Bq gR zU Yd -Yd +er WV IG sg @@ -22003,7 +22102,7 @@ kh kh qz sz -uK +Tp xN NQ Fj @@ -22430,7 +22529,7 @@ mY qS rM uQ -yb +uK AX qn Ic @@ -22855,7 +22954,7 @@ ky nf qz sz -uK +Tp ys NQ tJ @@ -23430,7 +23529,7 @@ BJ BJ OT BJ -uK +Tp DR BJ OT diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index a11a486fc9..529143989b 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -28,10 +28,6 @@ "ae" = ( /turf/unsimulated/mineral/virgo3b, /area/space) -"af" = ( -/obj/structure/sign/warning/docking_area, -/turf/unsimulated/wall, -/area/centcom/simulated/terminal) "ag" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -58,12 +54,6 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) -"ai" = ( -/obj/machinery/door/blast/regular{ - dir = 4 - }, -/turf/unsimulated/floor/techfloor_grid, -/area/centcom/simulated/terminal) "aj" = ( /obj/structure/sign/warning{ name = "\improper STAND AWAY FROM TRACK EDGE" @@ -100,7 +90,6 @@ "ao" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ - icon_state = "spline_fancy"; dir = 9 }, /turf/simulated/floor/holofloor/grass, @@ -134,7 +123,6 @@ dir = 8 }, /obj/effect/floor_decal/carpet/corners{ - icon_state = "carpet_corners"; dir = 5 }, /turf/simulated/floor/holofloor/carpet, @@ -189,7 +177,6 @@ "aA" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ - icon_state = "spline_fancy"; dir = 10 }, /turf/simulated/floor/holofloor/grass, @@ -477,9 +464,7 @@ /area/holodeck/source_boxingcourt) "by" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/shuttle/floor, /area/shuttle/supply) @@ -755,7 +740,6 @@ /area/ai_multicam_room) "cj" = ( /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 9 }, /turf/simulated/floor/tiled/steel, @@ -787,6 +771,12 @@ /obj/item/toy/chess/pawn_white, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) +"cq" = ( +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "cs" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -848,20 +838,11 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) -"cC" = ( -/obj/effect/step_trigger/lost_in_space/tram, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" - }, -/area/space) "cO" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "supply_shuttle"; pixel_x = -25; - pixel_y = 0; req_one_access = list(13,31); tag_door = "supply_shuttle_hatch" }, @@ -1063,27 +1044,6 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) -"dz" = ( -/obj/effect/floor_decal/transit/orange{ - dir = 8 - }, -/obj/effect/transit/light{ - dir = 8 - }, -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 2; - name = "thrower_throwdownside"; - nostop = 1; - stopper = 0; - tiles = 0 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" - }, -/area/space) "dA" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -1098,6 +1058,22 @@ /obj/structure/window/reinforced, /turf/unsimulated/wall, /area/space) +"dD" = ( +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "escape_shuttle_hatch_station"; + locked = 1; + name = "Shuttle Hatch" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "dE" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -1164,9 +1140,7 @@ /area/holodeck/source_thunderdomecourt) "dU" = ( /obj/structure/table/holotable, -/obj/machinery/readybutton{ - pixel_y = 0 - }, +/obj/machinery/readybutton, /obj/effect/floor_decal/corner/red/full{ dir = 8 }, @@ -1603,9 +1577,7 @@ /area/holodeck/source_thunderdomecourt) "fX" = ( /obj/structure/table/holotable, -/obj/machinery/readybutton{ - pixel_y = 0 - }, +/obj/machinery/readybutton, /obj/effect/floor_decal/corner/green/full{ dir = 4 }, @@ -1706,6 +1678,18 @@ /obj/structure/flora/grass/both, /turf/simulated/floor/holofloor/snow, /area/holodeck/holodorm/source_snow) +"gE" = ( +/obj/structure/closet/hydrant{ + pixel_y = 32 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "gN" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/desert, @@ -1854,6 +1838,56 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/holodorm/source_boxing) +"ig" = ( +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/obj/effect/transit/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) +"ih" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"ii" = ( +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"in" = ( +/obj/effect/step_trigger/lost_in_space/tram, +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) +"ix" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "iO" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -1867,16 +1901,25 @@ }, /turf/space/transit/west, /area/space) -"iY" = ( -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" - }, -/area/space) +"iU" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "jf" = ( /turf/space/transit/north, /area/space) +"jr" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"jL" = ( +/obj/effect/step_trigger/lost_in_space/tram, +/turf/simulated/floor/maglev{ + icon = 'icons/turf/transit_vr.dmi' + }, +/area/space) "jQ" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -1904,28 +1947,47 @@ /obj/effect/floor_decal/sign/small_5, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) -"le" = ( -/obj/effect/floor_decal/transit/orange{ +"lf" = ( +/obj/effect/floor_decal/borderfloor/corner{ dir = 4 }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"li" = ( +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/grille, +/turf/simulated/floor/plating/eris/under, +/area/shuttle/escape) +"lE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"mb" = ( /obj/effect/step_trigger/lost_in_space/tram, +/obj/effect/floor_decal/transit/orange{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" + initial_flooring = null }, /area/space) -"mZ" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 4; - name = "thrower_escapeshuttletop(right)"; - tiles = 0 +"mF" = ( +/obj/effect/shuttle_landmark{ + base_area = null; + base_turf = null; + docking_controller = null; + landmark_tag = "escape_transit"; + name = "Escape Transit" }, /turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" + initial_flooring = null }, /area/space) "nj" = ( @@ -1938,6 +2000,23 @@ }, /turf/unsimulated/floor/steel, /area/centcom/control) +"nB" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) +"nC" = ( +/obj/structure/table/standard, +/obj/structure/closet/walllocker/emerglocker{ + pixel_x = 32 + }, +/obj/item/clothing/head/beret/nanotrasen, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "nV" = ( /obj/item/toy/chess/rook_black, /turf/simulated/floor/holofloor/wmarble, @@ -1961,19 +2040,28 @@ /obj/effect/floor_decal/sign/small_8, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) -"pu" = ( -/obj/effect/floor_decal/transit/orange{ +"pk" = ( +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/effect/transit/light{ +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) +"pv" = ( +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/area/space) +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "escape_shuttle_hatch_offsite"; + locked = 1; + name = "Shuttle Hatch" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "pF" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -1986,6 +2074,24 @@ "pT" = ( /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"pX" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"qc" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "qn" = ( /turf/space/transit/east, /area/space) @@ -1997,20 +2103,22 @@ /turf/space, /turf/space/internal_edge/bottomright, /area/space) -"qH" = ( -/obj/effect/floor_decal/transit/orange{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" - }, -/area/space) "qV" = ( /obj/effect/floor_decal/sign/small_6, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"qY" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"rh" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "ru" = ( /obj/item/toy/chess/pawn_black, /turf/simulated/floor/holofloor/bmarble, @@ -2026,10 +2134,94 @@ "sl" = ( /turf/space/internal_edge/top, /area/space) +"sp" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) +"sx" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "sF" = ( /obj/effect/overmap/bluespace_rift, /turf/unsimulated/map, /area/overmap) +"sN" = ( +/obj/effect/floor_decal/transit/orange{ + dir = 8 + }, +/obj/effect/transit/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) +"sT" = ( +/obj/structure/closet/hydrant{ + pixel_y = -32 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"ti" = ( +/obj/machinery/status_display{ + pixel_y = 32 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"tp" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) +"tu" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) "tC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -2039,7 +2231,6 @@ "tD" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 2; name = "thrower_throwdown"; stopper = 0; tiles = 0 @@ -2050,24 +2241,28 @@ /obj/effect/floor_decal/transit/orange{ dir = 8 }, -/obj/effect/step_trigger/lost_in_space/tram, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" +/obj/effect/transit/light{ + dir = 8 }, -/area/space) -"tJ" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 4; - name = "thrower_escapeshuttletop(right)"; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; tiles = 0 }, -/turf/simulated/floor/maglev{ - icon = 'icons/turf/transit_vr.dmi' +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null }, /area/space) +"tS" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "uc" = ( /turf/unsimulated/wall, /area/centcom/suppy) @@ -2078,8 +2273,8 @@ "ue" = ( /obj/structure/closet/crate, /turf/unsimulated/floor{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/centcom/suppy) "uf" = ( @@ -2096,44 +2291,27 @@ icon_state = "dark" }, /area/centcom/suppy) +"uG" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "uM" = ( /obj/item/toy/chess/knight_black, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) -"vi" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 2; - name = "thrower_throwdownside"; - nostop = 1; - stopper = 0; - tiles = 0 - }, -/turf/simulated/floor/maglev{ - icon = 'icons/turf/transit_vr.dmi' - }, -/area/space) -"vG" = ( -/obj/effect/step_trigger/lost_in_space/tram, -/turf/simulated/floor/maglev{ - icon = 'icons/turf/transit_vr.dmi' - }, -/area/space) -"vR" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 2; - name = "thrower_throwdownside"; - nostop = 1; - stopper = 0; - tiles = 0 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" - }, -/area/space) +"vu" = ( +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/grille, +/turf/simulated/floor/plating/eris/under, +/area/shuttle/escape) +"vz" = ( +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "vW" = ( /obj/effect/floor_decal/sign/small_a, /turf/simulated/floor/holofloor/wood, @@ -2162,19 +2340,6 @@ }, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) -"wr" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 8; - name = "thrower_escapeshuttletop(left)"; - tiles = 0 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" - }, -/area/space) "wy" = ( /turf/unsimulated/wall, /area/centcom/control) @@ -2190,9 +2355,21 @@ }, /turf/unsimulated/floor/steel, /area/centcom/control) +"xi" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" + }, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"xl" = ( +/obj/structure/table/standard, +/obj/random/maintenance/clean, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "xM" = ( /obj/machinery/light{ - icon_state = "tube1"; dir = 8 }, /turf/simulated/floor/tiled/steel, @@ -2216,16 +2393,6 @@ /obj/machinery/telecomms/receiver/preset_cent, /turf/unsimulated/floor/steel, /area/centcom/control) -"yF" = ( -/obj/effect/floor_decal/transit/orange{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" - }, -/area/space) "yK" = ( /obj/machinery/door/airlock/multi_tile/metal, /obj/effect/floor_decal/industrial/warning{ @@ -2233,45 +2400,73 @@ }, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) +"yU" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "zb" = ( /obj/effect/step_trigger/thrower{ direction = 1; name = "thrower_throwup"; - nostop = 0; tiles = 0 }, /turf/space/transit/east, /area/space) "zv" = ( -/obj/effect/floor_decal/transit/orange{ +/obj/effect/transit/light{ dir = 8 }, -/obj/effect/transit/light{ +/obj/effect/floor_decal/transit/orange{ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" + initial_flooring = null }, /area/space) -"zK" = ( -/obj/machinery/door/blast/regular{ +"zw" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/maglev, -/area/centcom/simulated/terminal) -"Al" = ( +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "escape_shuttle_hatch_offsite"; + locked = 1; + name = "Shuttle Hatch" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"zH" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/centcom/simulated/terminal) +"zK" = ( +/obj/machinery/door/blast/regular{ + dir = 4 + }, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"Al" = ( +/obj/structure/bed/chair/shuttle, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "Av" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 8; - name = "thrower_escapeshuttletop(left)"; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; tiles = 0 }, /turf/simulated/floor/maglev{ @@ -2287,10 +2482,30 @@ "Az" = ( /turf/unsimulated/beach/coastline, /area/beach) +"AD" = ( +/obj/effect/floor_decal/borderfloor/corner, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "Bm" = ( /obj/item/toy/chess/bishop_black, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"Bs" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "escape_shuttle_hatch_station"; + locked = 1; + name = "Shuttle Hatch" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "Bw" = ( /turf/unsimulated/beach/water, /area/beach) @@ -2306,9 +2521,30 @@ /turf/space, /turf/space/internal_edge/bottomleft, /area/space) +"Cd" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "Cn" = ( /turf/simulated/sky/virgo3b/south, /area/space) +"Cp" = ( +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/shuttle_landmark{ + base_area = /area/centcom/simulated/terminal; + base_turf = /turf/simulated/floor/tiled/techfloor/grid; + docking_controller = null; + landmark_tag = "escape_cc"; + name = "Escape Centcom" + }, +/obj/structure/grille, +/turf/simulated/floor/plating/eris/under, +/area/shuttle/escape) "Ct" = ( /obj/machinery/ntnet_relay, /turf/unsimulated/floor/steel, @@ -2323,6 +2559,15 @@ }, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) +"CG" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "CJ" = ( /obj/item/toy/chess/pawn_white, /turf/simulated/floor/holofloor/bmarble, @@ -2340,6 +2585,19 @@ }, /turf/simulated/floor/tiled/steel, /area/space) +"Dm" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"Dn" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "Dw" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/food/snacks/chips, @@ -2349,6 +2607,12 @@ /turf/space, /turf/space/internal_edge/topright, /area/space) +"DI" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "DL" = ( /obj/effect/floor_decal/sign/small_b, /turf/simulated/floor/holofloor/wood, @@ -2360,6 +2624,18 @@ /obj/effect/floor_decal/sign/small_g, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"Et" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/status_display{ + pixel_y = 32 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "ET" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/centcom/simulated/terminal) @@ -2371,25 +2647,27 @@ /obj/structure/table/standard, /turf/unsimulated/beach/sand, /area/beach) +"Fe" = ( +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/grille, +/turf/simulated/floor/plating/eris/under, +/area/shuttle/escape) "Fp" = ( /turf/simulated/floor/maglev, /area/centcom/simulated/terminal) -"Fr" = ( +"Ft" = ( +/obj/effect/transit/light{ + dir = 4 + }, /obj/effect/floor_decal/transit/orange{ dir = 4 }, -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 2; - name = "thrower_throwdownside"; - nostop = 1; - stopper = 0; - tiles = 0 - }, /turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" + initial_flooring = null }, /area/space) "FH" = ( @@ -2403,20 +2681,39 @@ }, /turf/unsimulated/beach/sand, /area/beach) +"FJ" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "FT" = ( -/obj/effect/shuttle_landmark{ - base_area = null; - base_turf = null; - docking_controller = null; - landmark_tag = "escape_transit"; - name = "Escape Transit" +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) +"FX" = ( +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/obj/effect/transit/light{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" + initial_flooring = null }, /area/space) +"FY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "Ga" = ( /turf/unsimulated/floor/steel, /area/centcom/control) @@ -2466,6 +2763,27 @@ /obj/machinery/telecomms/broadcaster/preset_cent, /turf/unsimulated/floor/steel, /area/centcom/control) +"HW" = ( +/obj/machinery/status_display{ + pixel_y = -30 + }, +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) +"HX" = ( +/obj/structure/closet/walllocker/emerglocker{ + pixel_x = -32 + }, +/obj/random/maintenance/clean, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) +"Ic" = ( +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "Ik" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/food/drinks/cans/cola, @@ -2495,7 +2813,6 @@ }, /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; @@ -2503,14 +2820,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" + initial_flooring = null }, /area/space) "IR" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 2; name = "thrower_throwdown"; stopper = 0; tiles = 0 @@ -2521,6 +2836,19 @@ /obj/item/toy/chess/bishop_white, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"Jq" = ( +/obj/structure/sign/warning/docking_area, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"Jw" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "Jx" = ( /obj/effect/floor_decal/corner_steel_grid/diagonal, /obj/effect/floor_decal/corner_steel_grid/diagonal{ @@ -2551,7 +2879,6 @@ "JL" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 2; name = "thrower_throwdown"; nostop = 1; stopper = 0; @@ -2602,7 +2929,6 @@ /area/holodeck/source_chess) "Lg" = ( /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 5 }, /turf/simulated/floor/tiled/steel, @@ -2611,33 +2937,52 @@ /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/simulated/sky/virgo3b/south, /area/space) -"Mb" = ( -/obj/effect/transit/light{ +"LD" = ( +/obj/machinery/light{ dir = 8 }, -/turf/unsimulated/mineral{ +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"Mb" = ( +/obj/effect/floor_decal/transit/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - icon_state = "rock" + initial_flooring = null + }, +/area/space) +"Mf" = ( +/obj/effect/step_trigger/lost_in_space/tram, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null }, /area/space) "Mi" = ( /obj/item/toy/chess/bishop_white, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) +"Mq" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "ME" = ( /obj/machinery/computer/rdservercontrol{ - name = "Master R&D Server Controller"; - icon_state = "computer"; + badmin = 1; dir = 1; - badmin = 1 + name = "Master R&D Server Controller" }, /turf/unsimulated/floor/steel, /area/centcom/control) "MK" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) @@ -2662,7 +3007,6 @@ "Nr" = ( /obj/machinery/cryopod/robot/door/gateway, /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 8 }, /turf/simulated/floor/tiled/steel, @@ -2673,6 +3017,24 @@ opacity = 1 }, /area/beach) +"NA" = ( +/obj/structure/closet/hydrant{ + pixel_y = -32 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"NW" = ( +/obj/structure/table/standard, +/obj/structure/closet/walllocker/emerglocker{ + pixel_x = 32 + }, +/obj/random/maintenance/clean, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "Oj" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2686,16 +3048,16 @@ /obj/item/toy/chess/knight_white, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) -"OR" = ( -/turf/simulated/shuttle/wall, -/area/shuttle/escape) "OY" = ( /turf/unsimulated/map, /area/overmap) "Pe" = ( +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, /obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/eris/under, /area/shuttle/escape) "Pf" = ( /obj/structure/table/woodentable{ @@ -2707,12 +3069,14 @@ /turf/simulated/floor/tiled, /area/centcom/simulated/terminal) "Pg" = ( -/turf/simulated/shuttle/wall/hard_corner, +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) "Pi" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 2; name = "thrower_throwdown"; nostop = 1; stopper = 0; @@ -2725,38 +3089,40 @@ icon = 'icons/turf/transit_vr.dmi' }, /area/space) +"Py" = ( +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) +"PU" = ( +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) "Qa" = ( -/obj/structure/closet/hydrant{ - pixel_x = -30; - pixel_y = 0 - }, -/obj/item/weapon/storage/firstaid/o2{ - layer = 2.8; - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, -/obj/structure/bed/chair/shuttle, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, +/obj/structure/table/standard, +/obj/random/soap, +/turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) "Qs" = ( /obj/item/toy/chess/queen_black, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) -"QW" = ( -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, -/area/shuttle/escape) -"QX" = ( -/obj/structure/bed/chair/shuttle, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, -/area/shuttle/escape) "QY" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-21" @@ -2770,100 +3136,47 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/centcom/simulated/terminal) "Rd" = ( -/obj/structure/table/standard, -/obj/random/maintenance/clean, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" +/obj/effect/floor_decal/borderfloor{ + dir = 9 }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "Re" = ( -/obj/structure/table/standard, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, -/area/shuttle/escape) -"Rf" = ( -/obj/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/table/standard, -/obj/machinery/light{ +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "Rg" = ( -/obj/structure/bed/chair/shuttle{ +/obj/effect/floor_decal/borderfloor/corner{ dir = 1 }, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) -"Rh" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'HIGH VOLTAGE'"; - icon_state = "shock"; - name = "HIGH VOLTAGE" - }, -/turf/unsimulated/wall, -/area/centcom/simulated/terminal) "Ri" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "escape_shuttle_hatch_station"; - locked = 1; - name = "Shuttle Hatch" +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/turf/simulated/shuttle/floor/yellow, -/area/shuttle/escape) -"Rj" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "escape_shuttle_hatch_offsite"; - locked = 1; - name = "Shuttle Hatch" - }, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "Rk" = ( /obj/structure/bed/chair/shuttle, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = -28 - }, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, -/area/shuttle/escape) -"Rl" = ( -/obj/structure/bed/chair/shuttle, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = 28 - }, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "Rm" = ( -/obj/structure/table/standard, -/obj/random/junk, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "Ro" = ( -/obj/structure/table/standard, -/obj/random/maintenance/clean, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" +/obj/structure/closet/hydrant{ + pixel_y = 32 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "Rq" = ( /obj/machinery/door/blast/regular{ @@ -2885,19 +3198,11 @@ /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) "Rs" = ( -/obj/structure/sign/nanotrasen, -/obj/effect/shuttle_landmark{ - base_area = /area/centcom/simulated/terminal; - base_turf = /turf/simulated/floor/tiled/techfloor/grid; - docking_controller = null; - landmark_tag = "escape_cc"; - name = "Escape Centcom" +/obj/structure/table/standard, +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/turf/simulated/shuttle/wall, -/area/shuttle/escape) -"Rt" = ( -/obj/structure/sign/nanotrasen, -/turf/simulated/shuttle/wall, +/turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) "Ru" = ( /turf/simulated/floor/tiled/steel, @@ -2917,83 +3222,44 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/living) -"Rw" = ( -/obj/structure/table/standard, -/obj/item/clothing/head/beret/nanotrasen, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, -/area/shuttle/escape) -"Rx" = ( -/obj/structure/table/standard, -/obj/random/plushie, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, -/area/shuttle/escape) -"Ry" = ( -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = -28 - }, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, -/area/shuttle/escape) "Rz" = ( -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = 28 - }, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "RA" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/shuttle/floor/white, +/turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) "RC" = ( -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "RD" = ( /obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/obj/machinery/light, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" + dir = 8 }, +/turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) "RE" = ( -/obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/light, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" +/obj/machinery/light{ + dir = 4 }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "RF" = ( -/obj/random/junk, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) "RG" = ( -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/obj/random/soap, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, +/obj/structure/table/standard, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) "RV" = ( /obj/effect/step_trigger/teleporter/random{ @@ -3008,16 +3274,16 @@ }, /turf/simulated/sky/virgo3b/south, /area/space) +"RY" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "Sh" = ( -/obj/effect/floor_decal/transit/orange{ - dir = 4 - }, -/obj/effect/transit/light{ - dir = 4 - }, /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; @@ -3025,19 +3291,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" + initial_flooring = null }, /area/space) "Sl" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/machinery/camera/network/crescent{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/centcom/simulated/terminal) +/obj/structure/sign/nanotrasen, +/turf/simulated/wall/rshull, +/area/shuttle/escape) "Sm" = ( /turf/simulated/shuttle/wall/alien/blue/hard_corner, /area/unknown/dorm4) @@ -3080,6 +3340,13 @@ /obj/structure/fans, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) +"Sy" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "Sz" = ( /obj/machinery/smartfridge/survival_pod, /obj/item/weapon/storage/mre/menu11, @@ -3133,11 +3400,13 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) "SG" = ( -/obj/machinery/door/blast/regular{ - dir = 4 +/obj/structure/table/standard, +/obj/structure/closet/walllocker/emerglocker{ + pixel_x = -32 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/centcom/simulated/terminal) +/obj/item/clothing/head/beret/nanotrasen, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "SH" = ( /obj/structure/bed/chair{ dir = 8 @@ -3243,7 +3512,6 @@ /area/centcom/simulated/living) "Th" = ( /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 8 }, /turf/simulated/floor/tiled/steel, @@ -3329,6 +3597,15 @@ }, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm3) +"Tv" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "Tx" = ( /obj/structure/prop/alien/dispenser, /turf/simulated/shuttle/floor/alien, @@ -3782,9 +4059,7 @@ /turf/simulated/floor/tiled/steel, /area/centcom/simulated/evac) "Vo" = ( -/obj/machinery/door/blast/regular{ - dir = 1 - }, +/obj/machinery/door/blast/regular, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/evac) "Vp" = ( @@ -3834,8 +4109,7 @@ /area/centcom/simulated/bathroom) "Vz" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/centcom/simulated/bathroom) @@ -3955,7 +4229,6 @@ /area/centcom/simulated/restaurant) "VZ" = ( /obj/structure/bed/chair/wood/wings{ - icon_state = "wooden_chair_wings"; dir = 4 }, /turf/simulated/floor/wood, @@ -3972,7 +4245,6 @@ /area/centcom/simulated/restaurant) "Wd" = ( /obj/structure/bed/chair/wood/wings{ - icon_state = "wooden_chair_wings"; dir = 8 }, /turf/simulated/floor/wood, @@ -4046,7 +4318,6 @@ }, /obj/machinery/computer/cryopod/dorms{ name = "Company Property Retention System"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/steel, @@ -4082,7 +4353,6 @@ }) "Wz" = ( /obj/structure/bed/chair/wood/wings{ - icon_state = "wooden_chair_wings"; dir = 1 }, /turf/simulated/floor/wood, @@ -4188,7 +4458,6 @@ /area/centcom/simulated/restaurant) "WN" = ( /obj/structure/bed/chair/wood/wings{ - icon_state = "wooden_chair_wings"; dir = 4 }, /obj/machinery/light{ @@ -4214,8 +4483,6 @@ "WR" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich{ - pixel_w = 0; - pixel_x = 0; pixel_y = 10 }, /turf/simulated/floor/wood, @@ -4331,13 +4598,9 @@ dir = 4 }, /obj/item/device/radio/intercom{ - broadcasting = 0; dir = 1; frequency = 1475; - icon_state = "intercom"; - listening = 1; name = "Station Intercom (Security)"; - pixel_x = 0; pixel_y = 27 }, /turf/simulated/floor/tiled, @@ -4393,7 +4656,6 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 12; pixel_y = 8 }, @@ -4413,20 +4675,13 @@ name = "\improper CentCom Security Arrivals" }) "XE" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/centcom/simulated/terminal) +/turf/simulated/wall/rshull, +/area/shuttle/escape) "XH" = ( /obj/structure/bed/chair{ dir = 8 }, /obj/machinery/light{ - icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/tiled, @@ -4467,8 +4722,7 @@ "XQ" = ( /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, @@ -4501,8 +4755,6 @@ check_access = 0; check_anomalies = 0; check_records = 0; - check_synth = 0; - check_weapons = 0; control_area = "\improper CentCom Security Arrivals"; pixel_x = 32; req_access = list(101); @@ -4512,6 +4764,15 @@ /area/centcom/simulated/security{ name = "\improper CentCom Security Arrivals" }) +"XW" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "XX" = ( /obj/machinery/computer/crew{ dir = 4 @@ -4564,7 +4825,6 @@ "Yk" = ( /obj/structure/medical_stand, /obj/machinery/light{ - icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/tiled/white, @@ -4635,7 +4895,6 @@ /area/centcom/simulated/medical) "Yx" = ( /obj/machinery/light{ - icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/tiled, @@ -4654,10 +4913,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 @@ -4686,7 +4942,6 @@ /area/centcom/simulated/medical) "YG" = ( /obj/machinery/light{ - icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/tiled/steel, @@ -4730,8 +4985,7 @@ /area/centcom/simulated/medical) "YN" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/centcom/simulated/medical) @@ -4873,7 +5127,6 @@ /area/centcom/simulated/medical) "Zn" = ( /obj/machinery/light{ - icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/tiled/white, @@ -4883,8 +5136,7 @@ /obj/item/weapon/book/manual/security_space_law, /obj/item/weapon/book/manual/security_space_law, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/centcom/simulated/security{ @@ -4923,8 +5175,7 @@ /obj/item/weapon/storage/box/donkpockets, /obj/item/weapon/storage/box/donkpockets, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/centcom/simulated/security{ @@ -4962,14 +5213,12 @@ pixel_y = 5 }, /obj/machinery/light{ - icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/tiled/white, /area/centcom/simulated/medical) "ZC" = ( /obj/machinery/light{ - icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/wood, @@ -8826,7 +9075,6 @@ OY Xl "} (28,1,1) = {" -ap Hy Hy Hy @@ -8859,17 +9107,18 @@ Hy Hy Hy Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -8968,7 +9217,6 @@ OY Xl "} (29,1,1) = {" -ap Hy Hy Hy @@ -9001,17 +9249,18 @@ Hy Hy Hy Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -9110,7 +9359,6 @@ OY Xl "} (30,1,1) = {" -ap Hy Hy Hy @@ -9143,17 +9391,18 @@ Hy Hy Hy Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -9252,7 +9501,6 @@ OY Xl "} (31,1,1) = {" -ap Hy Hy Hy @@ -9285,17 +9533,18 @@ Hy Hy Hy Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -9394,7 +9643,7 @@ OY Xl "} (32,1,1) = {" -ap +Hy Hy dg dg @@ -9426,6 +9675,17 @@ dg dg dg dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg Hy ap ap @@ -9488,17 +9748,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Xl OY OY @@ -9536,50 +9785,50 @@ OY Xl "} (33,1,1) = {" -ap Hy -qH -qH +Hy +Mb +Mb zv -qH -qH -qH -dz +Mb +Mb +sN IN IN IN -dz +tH IN IN IN -dz +tH IN IN IN -dz +tH +sp +IN +IN +tH IN IN IN -dz +tH +IN +IN IN -qH -qH -zv -qH -qH tH Mb -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Mb +Mb +zv +Mb +Mb +sN +Mb +mb +sN +dg +Hy ap ap ap @@ -9678,38 +9927,49 @@ OY Xl "} (34,1,1) = {" -ap Hy -iY -iY -iY -iY -iY -iY -wr -wr -iY -iY -iY -iY -iY -iY +Hy FT -iY -iY -iY -iY -iY -iY -iY -vR -vR -iY -iY -iY -iY -iY -cC +FT +FT +FT +FT +FT +Sh +Sh +Sh +Sh +Sh +FT +FT +FT +FT +FT +FT +mF +FT +FT +FT +FT +FT +FT +FT +Sh +Sh +Sh +Sh +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg Hy ap ap @@ -9772,17 +10032,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Xl OY OY @@ -9820,7 +10069,7 @@ OY Xl "} (35,1,1) = {" -ap +Hy Hy Pq Pq @@ -9829,6 +10078,8 @@ Pq Pq Pq Av +Av +Av Pq Pq Pq @@ -9845,13 +10096,22 @@ Pq Pq Pq Pq -vi +Pq +Pq +Av +Av +Av Pq Pq Pq Pq Pq -vG +Pq +Pq +Pq +jL +Pq +dg Hy ap ap @@ -9914,17 +10174,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Xl Xl Xl @@ -9962,50 +10211,50 @@ Xl Xl "} (36,1,1) = {" -ap Hy -iY -iY -iY -iY -iY -iY -wr -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -vR -iY -iY -iY -iY -iY -cC Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +FT +FT +FT +FT +FT +FT +Sh +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg +Hy ap ap ap @@ -10104,50 +10353,50 @@ ap ap "} (37,1,1) = {" -ap Hy -iY -iY -iY -iY -iY -iY -wr -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -vR -iY -iY -iY -iY -iY -cC Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg +Hy ap ap ap @@ -10246,50 +10495,50 @@ ap ap "} (38,1,1) = {" -ap Hy -iY -iY -iY -iY -iY -iY -mZ -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -vR -iY -iY -iY -iY -iY -cC Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg +Hy ap ap ap @@ -10388,50 +10637,50 @@ ap ap "} (39,1,1) = {" -ap Hy -iY -iY -iY -iY -iY -iY -mZ -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -vR -iY -iY -iY -iY -iY -cC Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg +Hy ap ap ap @@ -10530,50 +10779,50 @@ ap ap "} (40,1,1) = {" -ap Hy -Pq -Pq -Pq -Pq -Pq -Pq -tJ -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -vi -Pq -Pq -Pq -Pq -Pq -vG Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg +Hy ap ap ap @@ -10672,50 +10921,50 @@ ap ap "} (41,1,1) = {" -ap Hy -iY -iY -iY -iY -iY -iY -mZ -mZ -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -vR -vR -iY -iY -iY -iY -iY -cC Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg +Hy ap ap ap @@ -10814,50 +11063,50 @@ ap ap "} (42,1,1) = {" -ap Hy -yF -yF -yF -pu -yF -yF -Fr -Sh -Fr -Fr -Fr -Sh -Fr -Fr -Fr -Sh -Fr -Fr -Fr -Sh -Fr -Fr -Fr -Sh -yF -yF -yF -pu -yF -le Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +FT +FT +FT +FT +FT +FT +Sh +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg +Hy ap ap ap @@ -10956,37 +11205,48 @@ ap ap "} (43,1,1) = {" -ap Hy -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg +Hy +Pq +Pq +Pq +Pq +Pq +Pq +Av +Av +Av +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Av +Av +Av +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +jL +Pq dg Hy ap @@ -11085,63 +11345,52 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (44,1,1) = {" -ap Hy Hy +FT +FT +FT +FT +FT +FT +Sh +Sh +Sh +Sh +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +Sh +Sh +Sh +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -11240,50 +11489,50 @@ ap ap "} (45,1,1) = {" -ap Hy Hy +PU +PU +Ft +PU +PU +FX +Py +Py +Py +ig +Py +Py +Py +ig +Py +Py +Py +ig +tu +Py +Py +ig +Py +Py +Py +ig +Py +Py +Py +ig +PU +PU +PU +Ft +PU +PU +FX +PU +in +FX +dg Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -11382,50 +11631,50 @@ ap ap "} (46,1,1) = {" -ap Hy Hy +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -11524,7 +11773,6 @@ ap ap "} (47,1,1) = {" -ap Hy Hy Hy @@ -11557,17 +11805,18 @@ Hy Hy Hy Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -11666,50 +11915,50 @@ ap ap "} (48,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -11808,50 +12057,50 @@ ap ap "} (49,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -11950,50 +12199,50 @@ ap ap "} (50,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -15686,33 +15935,33 @@ ae ae ae ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap ap ap ap @@ -15828,33 +16077,33 @@ ae ae ae ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap ap ap ap @@ -15970,33 +16219,33 @@ ae ae ae ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap ap ap ap @@ -16112,33 +16361,33 @@ ae ae ae ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae +Jq +dZ +dZ +dZ +dZ +dZ +dZ +xi +dZ +dZ +dZ +dZ +dZ +dZ +dZ +dZ +dZ +dZ +dZ +xi +dZ +dZ +dZ +dZ +dZ +dZ +aj ap ap ap @@ -16254,33 +16503,33 @@ ae ae ae ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae +zK +sx +sx +zH +sx +sx +sx +zH +sx +sx +sx +sx +zH +sx +zH +sx +sx +sx +sx +zH +sx +sx +sx +zH +sx +sx +zK ap ap ap @@ -16396,33 +16645,33 @@ ae ae ae ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae +zK +ET +ET +ET +ET +ET +XE +XE +dD +XE +Sl +Bs +Cp +li +Bs +Sl +XE +dD +XE +XE +ET +ET +ET +ET +ET +ET +zK ap ap ap @@ -16538,33 +16787,33 @@ ae ae ae ae -af -dZ -dZ -dZ -dZ -dZ -Rh -dZ -dZ -dZ -dZ -dZ -dZ -Rh -dZ -dZ -dZ -dZ -dZ -af -ae -ae -ae -ae -ae -ae -ae +zK +Fp +Fp +Fp +XE +XE +XE +XE +gE +yU +LD +ix +yU +Mq +ix +ih +Mq +NA +XE +XE +XE +XE +Fp +Fp +Fp +Fp +zK ap ap ap @@ -16680,33 +16929,33 @@ ae ae ae ae -ai -Al -Al +zK +ET +ET XE Sl Al -Al -XE -Al -Al -Al -Al -XE -Al -Al -Sl -XE -Al +HX +cq +Re +Jw +XW +FY +XW +XW +FY +XW +FJ +Ic Al SG -ae -ae -ae -ae -ae -ae -ae +HW +XE +XE +ET +ET +ET +zK ap ap ap @@ -16822,33 +17071,33 @@ ae ae ae ae -ai +zK ET -ET -OR -Pe -Pe +XE +XE +XE +ti Ri -OR -Pe +Ri +Rg Rs -Rt -Pe -OR +iU +RA +iU +iU +RA +iU +RG +qY Ri -RA -RA -OR +Ri +RY +Sl +XE +XE ET ET -SG -ae -ae -ae -ae -ae -ae -ae +zK ap ap ap @@ -16965,32 +17214,32 @@ ae ae ae zK -Fp -OR +ET +Pe Pg Rd Rg -QW Rk -Re -Rg -QX -Rw -Ry -QW -Rg +Rk +Rm +Tv RD +RA +RD +RD +RA +RD +tS +Rm +ii +ii +qY +lE Pg -OR -Fp +vu +ET +ET zK -ae -ae -ae -ae -ae -ae -ae ap ap ap @@ -17106,33 +17355,33 @@ ae ae ae ae -ai +zK ET Pe Qa Re -Rg -QW -QX Rm -Rg -QX -Re -Rg -QW -QW -QW +vz +vz +Rm +DI +RA +RA +RA +RA +RA +RA RF -Pe +Rm +vz +vz +Rm +Ic +xl +vu ET -SG -ae -ae -ae -ae -ae -ae -ae +ET +zK ap ap ap @@ -17248,33 +17497,33 @@ ae ae ae ae -ai +zK ET Pe -QW -QW -QW -QW -QW -QW -QW -QW -QW -QW -QW -QX -QX -Rg -Pe +RD +jr +lf +Rk +Rk +Rm +CG +Pg +RA +Pg +Pg +RA +Pg +tp +Rm +ii +ii +AD +Cd +RD +vu ET -SG -ae -ae -ae -ae -ae -ae -ae +ET +zK ap ap ap @@ -17390,33 +17639,33 @@ ae ae ae ae -ai +zK ET -Pe -QW -QW -QW -QW -QW -QW -QW -QW -QW -QW -QW -QX -QX +XE +XE +XE +Et +rh +rh +lf +Rs +iU +RA +iU +iU +RA +iU RG -Pe +AD +rh +rh +Sy +Sl +XE +XE ET -SG -ae -ae -ae -ae -ae -ae -ae +ET +zK ap ap ap @@ -17532,33 +17781,33 @@ ae ae ae ae -ai +zK ET -Pe -QX -Re -Rg -QW -QX -Re -Rg -QX -Re -Rg -QW -QW -QW -QW -Pe ET -SG -ae -ae -ae -ae -ae -ae -ae +XE +Sl +Al +nC +cq +Re +qc +nB +pk +nB +nB +pk +nB +Dn +Ic +Al +NW +HW +XE +XE +ET +ET +ET +zK ap ap ap @@ -17676,31 +17925,31 @@ ae ae zK Fp -OR -Pg -Rf -Rg -QW -Rl +Fp +Fp +XE +XE +XE +XE Ro -Rg -QX -Rx Rz -QW +uG +RC +Rz +Dm RC RE -Pg -OR +Dm +sT +XE +XE +XE +XE +Fp +Fp +Fp Fp zK -ae -ae -ae -ae -ae -ae -ae ap ap ap @@ -17816,33 +18065,33 @@ ae ae ae ae -ai +zK ET ET -OR -Pe -Pe -Rj -OR -Pe -Rt -Rt -Pe -OR -Rj -RA -RA -OR ET ET -SG -ae -ae -ae -ae -ae -ae -ae +ET +XE +XE +zw +XE +Sl +zw +Fe +Fe +zw +Sl +XE +pv +XE +XE +ET +ET +ET +ET +ET +ET +zK ap ap ap @@ -17958,7 +18207,7 @@ ae ae ae ae -ai +zK Rc Rc Rc @@ -17977,14 +18226,14 @@ Rc Rc Rc Rc -SG -ae -ae -ae -ae -ae -ae -ae +pX +Rc +Rc +Rc +pX +Rc +Rc +zK ap ap ap @@ -18120,13 +18369,13 @@ Jx Jx Zt aj -ae -ae -ae -ae -ae -ae -ae +dZ +dZ +dZ +dZ +dZ +dZ +aj ap ap ap diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index ec14010697..728bd4fd7a 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -322,9 +322,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) "aaE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) "aaF" = ( @@ -368,12 +366,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) -"aaI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/carpet/blue, -/area/tether/surfacebase/medical/mentalhealth) "aaJ" = ( /obj/structure/table/woodentable, /obj/item/weapon/folder/white, @@ -1424,12 +1416,6 @@ /obj/machinery/vending/loadout, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) -"acA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/carpet/blue, -/area/tether/surfacebase/medical/mentalhealth) "acB" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -1460,9 +1446,6 @@ pixel_y = 10; range = 12 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/button/windowtint{ id = "psych_office_inside"; pixel_x = 6; @@ -1770,16 +1753,10 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 10 }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) -"adg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/carpet/blue, -/area/tether/surfacebase/medical/mentalhealth) "adh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -1853,7 +1830,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "adm" = ( -/obj/structure/bed/chair/bay/chair/padded/red/bignest, +/obj/structure/bed/chair/bay/chair/padded/red/bignest{ + name = "Tweeter's Bed" + }, /mob/living/simple_mob/animal/passive/bird/azure_tit/tweeter, /turf/simulated/floor/grass, /area/tether/surfacebase/medical/mentalhealth) @@ -2301,6 +2280,9 @@ /area/tether/surfacebase/medical/lowerhall) "adT" = ( /obj/structure/flora/pottedplant/fern, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) "adU" = ( @@ -3490,13 +3472,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "afH" = ( -/obj/effect/floor_decal/techfloor/orange{ +/obj/effect/floor_decal/industrial/danger{ dir = 4 }, -/obj/machinery/camera/network/civilian{ - dir = 9 +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor/grid, +/turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/tram) "afI" = ( /obj/item/device/radio/intercom{ @@ -11545,16 +11527,22 @@ /turf/simulated/wall, /area/tether/surfacebase/tram) "atA" = ( -/obj/machinery/door/blast/regular, -/turf/simulated/floor/maglev, -/area/tether/surfacebase/tram) -"atB" = ( -/obj/machinery/door/blast/regular, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) +"atB" = ( +/turf/simulated/floor/maglev, +/area/tether/surfacebase/tram) "atC" = ( -/obj/structure/sign/warning/docking_area, -/turf/simulated/wall, +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "atD" = ( /obj/structure/closet/excavation, @@ -11804,10 +11792,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aua" = ( -/obj/machinery/light{ - dir = 1 +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "aub" = ( /obj/effect/floor_decal/industrial/danger{ @@ -11825,12 +11816,22 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "aue" = ( -/turf/simulated/floor/maglev, +/obj/effect/shuttle_landmark{ + base_area = /area/tether/surfacebase/tram; + base_turf = /turf/simulated/floor/tiled/techfloor/grid; + docking_controller = null; + landmark_tag = "escape_station"; + name = "Tether Surface Base" + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "auf" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 }, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "aug" = ( @@ -12139,10 +12140,10 @@ /area/tether/surfacebase/tram) "auD" = ( /obj/effect/floor_decal/techfloor/orange{ - dir = 4 + dir = 8 }, /obj/machinery/light{ - dir = 4 + dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) @@ -12358,16 +12359,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rnd/external) -"auX" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/tether/surfacebase/tram; - base_turf = /turf/simulated/floor/tiled/techfloor/grid; - docking_controller = null; - landmark_tag = "escape_station"; - name = "Tether Surface Base" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/tram) "auY" = ( /obj/structure/cable/green{ d1 = 1; @@ -13215,14 +13206,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) -"awk" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'HIGH VOLTAGE'"; - icon_state = "shock"; - name = "HIGH VOLTAGE" - }, -/turf/simulated/wall, -/area/tether/surfacebase/tram) "awl" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -15522,15 +15505,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) -"azr" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/tram) "azs" = ( /turf/simulated/wall/r_wall, /area/maintenance/lower/solars) @@ -26930,19 +26904,19 @@ /turf/simulated/wall, /area/crew_quarters/showers) "aUc" = ( -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -26951,13 +26925,13 @@ /obj/machinery/alarm{ pixel_y = 22 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUh" = ( /obj/effect/floor_decal/borderfloor{ @@ -27258,24 +27232,24 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 5 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUH" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 6 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUI" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, /obj/machinery/light, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUK" = ( /obj/effect/floor_decal/borderfloor{ @@ -27401,13 +27375,13 @@ /obj/machinery/shower{ dir = 4 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUX" = ( /obj/machinery/shower{ dir = 8 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUY" = ( /obj/effect/floor_decal/borderfloor{ @@ -27617,7 +27591,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aVr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -27626,7 +27600,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aVs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -27639,7 +27613,7 @@ /obj/machinery/door/airlock{ name = "Unisex Showers" }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aVt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -27887,7 +27861,7 @@ /area/maintenance/lower/atmos) "aVJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aVK" = ( /obj/effect/floor_decal/borderfloor{ @@ -28117,20 +28091,20 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aWg" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aWh" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aWi" = ( /obj/effect/floor_decal/borderfloor{ @@ -28302,23 +28276,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aWE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aWF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aWG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aWH" = ( /obj/effect/floor_decal/borderfloor{ @@ -31114,9 +31088,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) -"blL" = ( -/turf/simulated/floor, -/area/tether/surfacebase/outside/outside1) "bqI" = ( /turf/simulated/wall, /area/tether/surfacebase/security/brig/storage) @@ -31856,6 +31827,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/washing_machine, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/lowernorthhall) "evF" = ( @@ -34496,6 +34468,9 @@ /obj/item/device/radio/intercom{ pixel_y = -24 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "orf" = ( @@ -36366,12 +36341,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "xdV" = ( @@ -46836,8 +46811,8 @@ agd bbs bbC qDR -blL -blL +eQz +eQz abT wzA aku @@ -46978,8 +46953,8 @@ bbg bbu bbD adt -blL -blL +eQz +eQz abT tCV akt @@ -47121,7 +47096,7 @@ bbv bbE adt eQz -blL +eQz abT tCV ahs @@ -50648,10 +50623,10 @@ aad aad aad aar -aaI abL -acA -adg +abL +abL +abL aea afb atO @@ -53103,7 +53078,7 @@ aah aah aah atx -aua +auB auB auB auB @@ -53245,7 +53220,7 @@ aah aah baU aty -aub +afH aub aub aub @@ -53265,11 +53240,11 @@ aub aub aub aty -aad -aad -aad -aad -aad +atx +atx +atx +atx +aty aad aad aad @@ -53387,25 +53362,30 @@ aah aah baU atz +atA +atA +atA +atA +atA +atA +atA auc auc auc auc +atA +atA auc auc auc auc -azr -azr -azr -auc -auc -auc -auc -auc +atA +atA +auD auc auc auc +auD atz aad aad @@ -53464,11 +53444,6 @@ aad aad aad aad -aad -aad -aad -aad -aad aaa "} (120,1,1) = {" @@ -53538,7 +53513,12 @@ aud aud aud aud -auX +aud +aud +aud +aud +aud +aud aud aud aud @@ -53606,11 +53586,6 @@ aad aad aad aad -aad -aad -aad -aad -aad aaa "} (121,1,1) = {" @@ -53670,32 +53645,32 @@ aad aad aad aad -atA +atz +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -atA -aad -aad -aad -aad -aad +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +atz aad aad aad @@ -53812,32 +53787,32 @@ aad aad aad aad +atz atB -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud atB -aad -aad -aad -aad -aad +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atz aad aad aad @@ -53954,7 +53929,7 @@ aad aad aad aad -atB +atz aud aud aud @@ -53974,12 +53949,12 @@ aud aud aud aud -atB -aad -aad -aad -aad -aad +aud +aud +aud +aud +aud +atz aad aad aad @@ -54096,7 +54071,7 @@ aad aad aad aad -atB +atz aud aud aud @@ -54116,12 +54091,12 @@ aud aud aud aud -atB -aad -aad -aad -aad -aad +aud +aud +aud +aud +aud +atz aad aad aad @@ -54238,7 +54213,7 @@ aad aad aad aad -atB +atz aud aud aud @@ -54258,12 +54233,12 @@ aud aud aud aud -atB -aad -aad -aad -aad -aad +aud +aud +aud +aud +aud +atz aad aad aad @@ -54380,32 +54355,32 @@ aad aad aad aad -atA -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -atA -aad -aad -aad -aad -aad +atz +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +atz aad aad aad @@ -54542,6 +54517,11 @@ aud aud aud aud +aud +aud +aud +aud +aud atz aad aad @@ -54589,11 +54569,6 @@ aad aad aad aad -aad -aad -aad -aad -aad bcV aad aad @@ -54665,25 +54640,30 @@ aad aad aad atz -auf -auD -auf -afH -auD -auf -auf -auD -auf -auf -auf -auD -auf -auf -auD -afH -auf -auD -auf +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud atz aad aad @@ -54742,11 +54722,6 @@ aad aad aad aad -aad -aad -aad -aad -aad aaa "} (129,1,1) = {" @@ -54806,32 +54781,32 @@ aad aad aad aad -atC -atx -atx -atx -atx -awk -atx -atx -atx -atx -awk -atx -atx -atx -atx -awk -atx -atx -atx -atx -atC -aad -aad -aad -aad -aad +atz +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +atz aad aad aad @@ -54948,32 +54923,32 @@ aad aad aad aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad +atz +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atz aad aad aad @@ -55090,32 +55065,32 @@ aad aad aad aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad +atz +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +atz aad aad aad @@ -55232,32 +55207,32 @@ aad aad aad aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad +atz +atC +atC +aua +atC +atC +atC +aua +atC +atC +auf +aua +atC +atC +aua +atC +atC +atC +aua +atC +auf +atC +aua +atC +atC +atz aad aad aad @@ -55374,32 +55349,32 @@ aad aad aad aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad +aty +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +aty aad aad aad diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index aa9c4341ef..425e3d9903 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -67,9 +67,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) @@ -254,9 +252,7 @@ dir = 9 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled/techfloor, @@ -337,9 +333,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) @@ -394,8 +388,7 @@ /area/tether/surfacebase/medical/centralhall) "aaH" = ( /obj/machinery/vending/coffee{ - dir = 8; - icon_state = "coffee" + dir = 8 }, /obj/structure/window/reinforced, /turf/simulated/floor/wood, @@ -423,10 +416,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aaJ" = ( -/obj/item/device/radio/intercom/department/medbay{ - dir = 8; - pixel_x = -24 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -557,9 +546,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorwhite/corner2, -/obj/effect/floor_decal/corner/pink/bordercorner2{ - dir = 2 - }, +/obj/effect/floor_decal/corner/pink/bordercorner2, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/examroom) "aaQ" = ( @@ -604,7 +591,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -685,7 +671,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -693,8 +678,7 @@ "aaX" = ( /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -715,8 +699,7 @@ /area/tether/surfacebase/medical/centralhall) "aaY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 @@ -733,15 +716,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aaZ" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/sign/poster{ - pixel_y = 32 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -754,14 +731,16 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 10 }, +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the medbay recovery room door."; + id = "MedicalRecovery"; + name = "Exit Button"; + pixel_x = -5; + pixel_y = 24 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "aba" = ( -/obj/item/device/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 24 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -772,6 +751,9 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/structure/sign/poster{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "abb" = ( @@ -908,7 +890,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /turf/simulated/floor/tiled/white, @@ -970,11 +951,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "abr" = ( -/obj/machinery/button/windowtint{ - id = "patient_room_a"; - pixel_x = 26; - pixel_y = -26 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, @@ -985,11 +961,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -24; - pixel_y = -30 - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -1028,7 +999,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -1047,30 +1017,10 @@ /area/tether/surfacebase/medical/uppernorthstairwell{ name = "\improper North Medical Stairwell" }) -"abv" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/centralhall) "abw" = ( /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -1114,6 +1064,11 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_x = -28 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "abz" = ( @@ -1149,12 +1104,17 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, +/obj/machinery/button/windowtint{ + id = "ward_tint"; + pixel_x = -24; + pixel_y = 8; + range = 12 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "abC" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -1198,11 +1158,6 @@ /turf/simulated/open, /area/tether/surfacebase/medical/centralstairwell) "abG" = ( -/obj/machinery/button/windowtint{ - id = "patient_room_b"; - pixel_x = -26; - pixel_y = -26 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, @@ -1213,11 +1168,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 24; - pixel_y = -30 - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -1241,8 +1191,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor, /area/chapel/main) @@ -1282,8 +1231,7 @@ dir = 1 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -1336,18 +1284,18 @@ }, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) "abP" = ( @@ -1363,9 +1311,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/light{ - dir = 1 - }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) "abR" = ( @@ -1388,8 +1333,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -35; - pixel_y = 0 + pixel_x = -35 }, /obj/machinery/light{ dir = 8 @@ -1417,6 +1361,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) "abU" = ( @@ -1515,7 +1462,6 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/structure/bed/chair, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acd" = ( @@ -1531,7 +1477,6 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/structure/bed/chair, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "ace" = ( @@ -1564,8 +1509,7 @@ /obj/machinery/photocopier, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) @@ -1585,7 +1529,6 @@ id = "medbayquar"; name = "Medbay Emergency Lockdown Control"; pixel_x = -36; - pixel_y = 0; req_access = list(5) }, /obj/machinery/button/remote/airlock{ @@ -1600,7 +1543,6 @@ id = "virologyquar"; name = "Virology Emergency Lockdown Control"; pixel_x = -28; - pixel_y = 0; req_access = list(5) }, /obj/machinery/button/windowtint{ @@ -1661,14 +1603,11 @@ "acq" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ dir = 4; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/techfloor{ dir = 4 @@ -1714,20 +1653,6 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 5 }, -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the medbay recovery room door."; - dir = 8; - id = "SurfMedicalResleeving"; - name = "Exit Button"; - pixel_x = 28; - pixel_y = -4 - }, -/obj/machinery/button/windowtint/multitint{ - dir = 8; - id = "surfresleeving"; - pixel_x = 28; - pixel_y = 8 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acv" = ( @@ -1750,8 +1675,7 @@ dir = 8 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /obj/structure/window/reinforced{ dir = 1 @@ -1776,12 +1700,16 @@ /obj/item/weapon/stamp/cmo, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, /turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "acB" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/machinery/computer/med_data/laptop{ + dir = 1; + pixel_y = 4 + }, /turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "acC" = ( @@ -1790,14 +1718,8 @@ "acD" = ( /obj/structure/table/glass, /obj/machinery/computer/skills{ - dir = 8; - icon_state = "laptop"; - pixel_x = 4; - pixel_y = -3 - }, -/obj/machinery/computer/med_data/laptop{ - dir = 8; - pixel_x = -4; + dir = 1; + pixel_x = -9; pixel_y = 4 }, /obj/machinery/requests_console{ @@ -1875,6 +1797,9 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 4 }, +/obj/machinery/alarm{ + pixel_y = 22 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "acJ" = ( @@ -1885,11 +1810,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acK" = ( @@ -1899,9 +1819,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acL" = ( @@ -1909,8 +1826,7 @@ /obj/item/device/reagent_scanner, /obj/item/device/mass_spectrometer/adv, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/structure/cable/green{ d1 = 1; @@ -2005,8 +1921,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -2025,7 +1940,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2070,7 +1984,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "2-4" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) @@ -2228,17 +2142,14 @@ /turf/simulated/wall, /area/tether/surfacebase/medical/examroom) "adj" = ( -/obj/machinery/shower{ - dir = 4; - icon_state = "shower"; - pixel_x = 2; - pixel_y = 0 - }, /obj/structure/curtain/open/shower/medical, /obj/effect/floor_decal/steeldecal/steel_decals10, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 4 }, +/obj/machinery/shower{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "adk" = ( @@ -2354,11 +2265,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "adt" = ( @@ -2398,9 +2304,7 @@ "adA" = ( /obj/structure/table/reinforced, /obj/machinery/computer/med_data/laptop{ - dir = 8; - pixel_x = 0; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) @@ -2440,7 +2344,6 @@ "adE" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/simulated/floor/tiled/dark, @@ -2450,31 +2353,17 @@ name = "Evidence Closet" }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/evidence) "adG" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "adH" = ( -/obj/machinery/organ_printer/flesh, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -2487,6 +2376,23 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the medbay recovery room door."; + dir = 8; + id = "SurfMedicalResleeving"; + name = "Exit Button"; + pixel_x = 28; + pixel_y = -4 + }, +/obj/machinery/button/windowtint/multitint{ + dir = 8; + id = "surfresleeving"; + pixel_x = 28; + pixel_y = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "adI" = ( @@ -2532,8 +2438,7 @@ dir = 8 }, /obj/machinery/camera/network/medbay{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) @@ -2707,7 +2612,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite/corner2{ @@ -2722,7 +2626,6 @@ "adZ" = ( /obj/machinery/computer/guestpass{ dir = 1; - icon_state = "guest"; pixel_y = -28 }, /obj/effect/floor_decal/borderfloorwhite, @@ -2733,6 +2636,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 9 }, +/obj/machinery/organ_printer/flesh, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aea" = ( @@ -2788,8 +2692,7 @@ /obj/structure/table/glass, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/weapon/clipboard, /obj/effect/floor_decal/borderfloorwhite{ @@ -2804,8 +2707,7 @@ /obj/structure/window/reinforced, /obj/machinery/dnaforensics, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) @@ -2856,8 +2758,7 @@ /obj/structure/window/reinforced, /obj/structure/filingcabinet, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) @@ -2885,8 +2786,7 @@ "aen" = ( /obj/machinery/vending/loadout/uniform, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 @@ -2894,6 +2794,11 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 6 }, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28 + }, +/obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aeo" = ( @@ -2917,8 +2822,7 @@ /obj/structure/filingcabinet/chestdrawer, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) @@ -2943,8 +2847,7 @@ /obj/structure/table/glass, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/weapon/clipboard, /obj/effect/floor_decal/borderfloorwhite{ @@ -2978,8 +2881,7 @@ /obj/structure/table/glass, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/weapon/clipboard, /obj/effect/floor_decal/borderfloorwhite{ @@ -3059,8 +2961,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -3085,8 +2986,7 @@ /area/tether/surfacebase/security/detective) "aeI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -3126,8 +3026,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -3343,14 +3242,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -27; + pixel_y = -28 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) "afe" = ( -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 24; - pixel_y = -30 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -3360,8 +3259,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, @@ -3420,14 +3318,19 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/machinery/button/windowtint{ + id = "patient_room_a"; + pixel_x = -3; + pixel_y = -22 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 6; + pixel_y = -22 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_a) "afi" = ( -/obj/machinery/button/windowtint{ - id = "patient_room_c"; - pixel_x = -26; - pixel_y = -26 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, @@ -3438,11 +3341,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 24; - pixel_y = -30 - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -3481,6 +3379,16 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 6; + pixel_y = -22 + }, +/obj/machinery/button/windowtint{ + id = "patient_room_c"; + pixel_x = -3; + pixel_y = -22 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_c) "afl" = ( @@ -3517,7 +3425,6 @@ "afm" = ( /obj/machinery/light_switch{ dir = 1; - pixel_x = 0; pixel_y = -28 }, /obj/structure/disposalpipe/segment{ @@ -3563,6 +3470,16 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 6; + pixel_y = -22 + }, +/obj/machinery/button/windowtint{ + id = "patient_room_b"; + pixel_x = -3; + pixel_y = -22 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_b) "afo" = ( @@ -3592,8 +3509,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, @@ -3602,8 +3518,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/catwalk, /obj/structure/catwalk, @@ -3718,8 +3633,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) @@ -3738,8 +3652,7 @@ /area/tether/surfacebase/security/middlehall) "afG" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -3748,8 +3661,7 @@ dir = 4 }, /obj/machinery/vending/fitness{ - dir = 4; - icon_state = "fitness" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) @@ -3766,13 +3678,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, @@ -3972,7 +3881,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -4163,8 +4071,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/lower/north) @@ -4180,14 +4087,12 @@ /obj/structure/catwalk, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/lower/north) @@ -4260,8 +4165,7 @@ "agv" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -4426,7 +4330,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/dark, @@ -4447,8 +4350,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/lower/north) @@ -4457,8 +4359,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/surface_two_hall) @@ -4522,8 +4423,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-4" @@ -4586,8 +4486,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 = 4 @@ -4609,8 +4508,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 @@ -4623,21 +4521,12 @@ }, /obj/machinery/computer/guestpass{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/machinery/door/firedoor/glass/hidden, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "aha" = ( -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the medbay recovery room door."; - dir = 2; - id = "SurfMedicalResleevingMaintExit"; - name = "Exit Button"; - pixel_x = 28; - pixel_y = -28 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, @@ -4659,6 +4548,9 @@ /obj/structure/bookcase, /obj/item/weapon/book/manual/security_space_law, /obj/item/weapon/book/manual/security_space_law, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) "ahe" = ( @@ -4666,7 +4558,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -4697,7 +4588,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -4710,13 +4600,15 @@ /obj/structure/bookcase, /obj/item/weapon/book/manual/security_space_law, /obj/item/weapon/book/manual/security_space_law, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) "ahl" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -4735,8 +4627,7 @@ icon_state = "1-2" }, /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -4772,8 +4663,7 @@ }, /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, @@ -4805,12 +4695,10 @@ /area/tether/surfacebase/security/outfitting) "ahr" = ( /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{ @@ -4836,7 +4724,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/item/device/holowarrant, @@ -4872,8 +4759,7 @@ /obj/machinery/vending/security, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) @@ -4902,8 +4788,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) @@ -4961,8 +4846,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/window/basic{ dir = 4 @@ -4994,7 +4878,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction{ dir = 1; - icon_state = "pipe-j1s"; name = "CMO Office"; sortType = "CMO Office" }, @@ -5028,17 +4911,11 @@ }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/firealarm{ - dir = 1; - pixel_x = 0; - pixel_y = -24 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "ahH" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; - icon_state = "pipe-j1s"; name = "CMO Office"; sortType = "CMO Office" }, @@ -5047,7 +4924,6 @@ "ahI" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; - icon_state = "pipe-j1s"; name = "Medical Breakroom"; sortType = "Medical Breakroom" }, @@ -5061,8 +4937,7 @@ "ahK" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -5241,8 +5116,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, @@ -5349,7 +5223,6 @@ "ail" = ( /obj/structure/table/steel, /obj/item/ammo_magazine/m45/rubber{ - pixel_x = 0; pixel_y = 9 }, /obj/item/ammo_magazine/m45/rubber{ @@ -5357,7 +5230,6 @@ pixel_y = 3 }, /obj/item/ammo_magazine/m45/rubber{ - pixel_x = 0; pixel_y = -3 }, /obj/machinery/recharger/wallcharger{ @@ -5403,8 +5275,7 @@ /area/tether/surfacebase/security/armory) "aip" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -5468,7 +5339,6 @@ /obj/structure/table/glass, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /turf/simulated/floor/tiled/white, @@ -5542,6 +5412,9 @@ /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "aiy" = ( @@ -5587,8 +5460,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/morgue) @@ -5614,6 +5486,10 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 9 }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aiC" = ( @@ -5629,8 +5505,7 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -5709,8 +5584,7 @@ dir = 8 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) @@ -5782,7 +5656,6 @@ dir = 8 }, /obj/structure/sign/poster{ - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled/white, @@ -5814,7 +5687,6 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5875,6 +5747,12 @@ req_access = list(5); req_one_access = list(5) }, +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the medbay recovery room door."; + id = "SurfMedicalResleevingMaintExit"; + name = "Exit Button"; + pixel_x = -24 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "aiU" = ( @@ -5922,8 +5800,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) @@ -5947,22 +5824,19 @@ /area/tether/surfacebase/security/detective/officea) "aja" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) "ajb" = ( /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) "ajc" = ( /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) @@ -6006,8 +5880,7 @@ /area/tether/surfacebase/security/detective/officeb) "ajg" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -6179,8 +6052,7 @@ pixel_y = 3 }, /obj/item/weapon/storage/box/flashshells{ - pixel_x = 1; - pixel_y = 0 + pixel_x = 1 }, /obj/item/weapon/storage/box/beanbags{ pixel_x = 4; @@ -6233,17 +6105,11 @@ /obj/structure/table/rack/steel, /obj/item/clothing/gloves/arm_guard/laserproof, /obj/item/clothing/shoes/leg_guard/laserproof, -/obj/item/clothing/suit/armor/laserproof{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/clothing/suit/armor/laserproof, /obj/item/clothing/head/helmet/laserproof, /obj/item/clothing/gloves/arm_guard/laserproof, /obj/item/clothing/shoes/leg_guard/laserproof, -/obj/item/clothing/suit/armor/laserproof{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/clothing/suit/armor/laserproof, /obj/item/clothing/head/helmet/laserproof, /obj/structure/window/reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -6341,9 +6207,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -6452,8 +6316,7 @@ dir = 4 }, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -6490,14 +6353,6 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "ajU" = ( -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the medbay recovery room door."; - dir = 4; - id = "MedicalRecovery"; - name = "Exit Button"; - pixel_x = -26; - pixel_y = 26 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -6558,17 +6413,9 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) "ajZ" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) "aka" = ( -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) "akb" = ( @@ -6733,8 +6580,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) @@ -6764,7 +6610,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 1; - icon_state = "pipe-j1s"; name = "Medical Breakroom"; sortType = "Medical Breakroom" }, @@ -6803,8 +6648,7 @@ dir = 5 }, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/morgue) @@ -6822,7 +6666,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's set to ree-Anur-ntertanment, I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -6877,7 +6720,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -6907,7 +6749,6 @@ dir = 9 }, /obj/structure/sign/poster{ - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled/white, @@ -6926,8 +6767,7 @@ /area/tether/surfacebase/medical/uppersouthstairwell) "akG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloorwhite{ @@ -7007,9 +6847,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -7040,8 +6878,7 @@ /area/tether/surfacebase/medical/centralhall) "akP" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/junction, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -7278,8 +7115,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -7297,8 +7133,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -7327,8 +7162,7 @@ pixel_y = 22 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -7346,8 +7180,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -7394,8 +7227,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -7416,8 +7248,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -7446,15 +7277,13 @@ "als" = ( /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 @@ -7617,8 +7446,7 @@ "alG" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/cable/green{ d1 = 1; @@ -7658,7 +7486,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor, @@ -7760,7 +7587,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -7777,8 +7603,7 @@ dir = 8 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) @@ -7806,15 +7631,13 @@ dir = 6 }, /obj/structure/sign/poster{ - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "alW" = ( /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 @@ -7943,8 +7766,7 @@ }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -8015,6 +7837,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/light, /turf/simulated/floor/lino, /area/tether/surfacebase/security/detective/officea) "amj" = ( @@ -8022,12 +7845,12 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/light, /turf/simulated/floor/lino, /area/tether/surfacebase/security/detective/officeb) "amk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -8151,7 +7974,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/floor_decal/borderfloor, @@ -8253,8 +8075,7 @@ /area/tether/surfacebase/security/armory) "amz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -8292,8 +8113,7 @@ pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -8455,7 +8275,6 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -8531,8 +8350,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) @@ -8611,8 +8429,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) @@ -8807,9 +8624,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/tether/surfacebase/medical/recoveryward) @@ -8834,8 +8649,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/techfloor{ dir = 1 @@ -8869,8 +8683,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) @@ -8938,8 +8751,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/item/weapon/storage/box/cups{ pixel_x = 8; @@ -9031,7 +8843,6 @@ "anT" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled/white, @@ -9094,9 +8905,7 @@ /area/maintenance/lower/north) "aoe" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/borderfloor{ @@ -9125,8 +8934,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) @@ -9134,7 +8942,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/effect/floor_decal/borderfloor{ @@ -9296,8 +9103,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -9313,13 +9119,11 @@ /area/tether/surfacebase/security/middlehall) "aou" = ( /obj/machinery/computer/prisoner{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/item/device/radio/intercom{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -9375,8 +9179,7 @@ req_access = list(3) }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -9427,8 +9230,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 @@ -9507,8 +9309,7 @@ "aoC" = ( /obj/structure/closet/bombcloset/double, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) @@ -9537,12 +9338,10 @@ "aoF" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -9555,11 +9354,10 @@ /turf/simulated/floor, /area/maintenance/lower/north) "aoH" = ( -/obj/machinery/light/small{ - dir = 8; - pixel_y = 0 - }, /obj/machinery/recharge_station, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "aoI" = ( @@ -9595,8 +9393,7 @@ "aoL" = ( /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/white, /area/tether/surfacebase/medical/bathroom) @@ -9751,7 +9548,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable{ @@ -9777,8 +9573,7 @@ name_tag = "Command Subgrid" }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/structure/cable/green{ d1 = 1; @@ -9815,15 +9610,13 @@ "apg" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plating, /area/maintenance/lower/rnd) "aph" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -9846,8 +9639,7 @@ /area/maintenance/lower/rnd) "apk" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/structure/railing{ dir = 1 @@ -9927,8 +9719,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -9958,8 +9749,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -10037,12 +9827,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ dir = 8 }, @@ -10079,7 +9865,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/structure/disposalpipe/segment{ @@ -10108,8 +9893,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) @@ -10137,12 +9921,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ dir = 8 }, @@ -10197,8 +9977,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -10207,8 +9986,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) @@ -10244,9 +10022,7 @@ }, /obj/item/device/radio/intercom/department/security{ dir = 8; - icon_state = "secintercom"; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -10364,8 +10140,7 @@ "apY" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /obj/machinery/status_display{ level = 4; @@ -10383,7 +10158,6 @@ "aqa" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -10415,8 +10189,7 @@ }, /obj/machinery/disposal, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) @@ -10447,9 +10220,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/tether/surfacebase/medical/bathroom) @@ -10616,8 +10387,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -10916,12 +10686,6 @@ /turf/simulated/floor/plating, /area/maintenance/lower/north) "aqW" = ( -/obj/machinery/button/windowtint{ - id = "ward_tint"; - pixel_x = -24; - pixel_y = 8; - range = 12 - }, /obj/effect/landmark{ name = "lightsout" }, @@ -10948,8 +10712,7 @@ /area/maintenance/lower/rnd) "aqZ" = ( /obj/effect/floor_decal/industrial/danger{ - dir = 8; - icon_state = "danger" + dir = 8 }, /obj/structure/sign/warning/caution{ pixel_y = 32 @@ -10990,9 +10753,7 @@ /area/maintenance/lower/bar) "are" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/effect/floor_decal/techfloor{ dir = 4 @@ -11168,8 +10929,7 @@ "arx" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/brig/bathroom) @@ -11179,8 +10939,7 @@ name = "Security Officer" }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/brig/bathroom) @@ -11322,8 +11081,7 @@ /obj/item/clothing/head/helmet/space/void/security, /obj/machinery/alarm{ dir = 4; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -11341,8 +11099,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/evastorage) @@ -11395,8 +11152,7 @@ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) @@ -11405,8 +11161,7 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/flasher/portable, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) @@ -11447,8 +11202,7 @@ "arU" = ( /obj/structure/catwalk, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/lower/mining) @@ -11664,7 +11418,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /turf/simulated/floor/plating, @@ -11701,9 +11454,7 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 @@ -11712,9 +11463,7 @@ /area/tether/surfacebase/public_garden_two) "asu" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 @@ -11756,8 +11505,7 @@ /obj/structure/table/rack/holorack, /obj/random/maintenance/clean, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -11921,8 +11669,7 @@ /obj/item/weapon/tank/jetpack/carbondioxide, /obj/item/weapon/tank/jetpack/carbondioxide, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -11990,7 +11737,6 @@ "asP" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/flora/pottedplant/large, @@ -11998,8 +11744,7 @@ /area/tether/surfacebase/medical/bathroom) "asQ" = ( /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/plating, /area/tether/surfacebase/emergency_storage/atmos) @@ -12125,8 +11870,7 @@ /area/maintenance/asmaint2) "atb" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/machinery/recharge_station, /turf/simulated/floor/tiled/white, @@ -12160,8 +11904,7 @@ /obj/item/weapon/bedsheet/medical, /obj/structure/curtain/open/privacy, /obj/machinery/camera/network/medbay{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -12192,8 +11935,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -12203,9 +11945,7 @@ "ati" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/table/rack, /obj/random/maintenance/clean, @@ -12267,8 +12007,7 @@ dir = 4 }, /obj/effect/floor_decal/techfloor/hole{ - dir = 4; - icon_state = "techfloor_hole_left" + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) @@ -12296,9 +12035,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/effect/floor_decal/techfloor{ dir = 8 @@ -12312,15 +12049,13 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/plating, /area/engineering/atmos/storage) "atu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 6; - icon_state = "intact" + dir = 6 }, /obj/machinery/light/small{ dir = 1 @@ -12436,8 +12171,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 @@ -12525,8 +12259,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/brig/bathroom) @@ -12609,8 +12342,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -12636,8 +12368,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -12703,8 +12434,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 @@ -12718,8 +12448,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/sortjunction{ dir = 4; @@ -12747,8 +12476,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 @@ -12773,8 +12501,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -12909,9 +12636,7 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 25 @@ -13136,8 +12861,7 @@ /area/maintenance/engineering/pumpstation) "auG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/red{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/meter, /turf/simulated/floor/plating, @@ -13160,8 +12884,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, @@ -13191,9 +12914,7 @@ dir = 9 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) @@ -13273,9 +12994,7 @@ "auU" = ( /obj/structure/catwalk, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/disposalpipe/segment{ @@ -13337,8 +13056,7 @@ dir = 4 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -13429,7 +13147,6 @@ dir = 10 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/machinery/camera/network/civilian{ @@ -13452,8 +13169,7 @@ /area/tether/surfacebase/public_garden_two) "avk" = ( /obj/machinery/shower{ - dir = 1; - icon_state = "shower" + dir = 1 }, /obj/structure/curtain/open/shower/security, /obj/effect/floor_decal/steeldecal/steel_decals10{ @@ -13568,8 +13284,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -13580,8 +13295,7 @@ "avs" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -13702,7 +13416,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/techfloor, @@ -13832,8 +13545,7 @@ /obj/structure/bed/padded, /obj/item/weapon/bedsheet/red, /obj/effect/floor_decal/techfloor/hole/right{ - dir = 4; - icon_state = "techfloor_hole_right" + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) @@ -13877,8 +13589,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 8; - icon_state = "up-scrubbers" + dir = 8 }, /obj/structure/cable/green{ icon_state = "0-8" @@ -14025,8 +13736,7 @@ "awk" = ( /obj/effect/floor_decal/rust, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/cable/green, /obj/structure/cable/green{ @@ -14149,14 +13859,12 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/light_switch{ pixel_x = 25; @@ -14189,8 +13897,7 @@ dir = 4 }, /obj/structure/window/reinforced/tinted{ - dir = 8; - icon_state = "twindow" + dir = 8 }, /turf/simulated/floor/plating, /area/tether/surfacebase/security/interrogation) @@ -14205,8 +13912,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 @@ -14445,8 +14151,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 4; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/interrogation) @@ -14513,7 +14218,6 @@ "axi" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/floor_decal/rust, @@ -14551,8 +14255,7 @@ dir = 1 }, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) @@ -14589,8 +14292,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -14604,8 +14306,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -14622,8 +14323,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -14634,8 +14334,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/extinguisher_cabinet{ pixel_y = 30 @@ -14652,8 +14351,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -14670,8 +14368,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -14694,8 +14391,7 @@ "axv" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/weapon/deck/cah/black{ @@ -14709,16 +14405,13 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -14732,7 +14425,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable{ @@ -14948,8 +14640,7 @@ /area/tether/surfacebase/security/interrogation) "axW" = ( /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/interrogation) @@ -14988,7 +14679,6 @@ /obj/structure/lattice, /obj/structure/cable/green{ d1 = 32; - d2 = 1; icon_state = "32-1" }, /obj/machinery/door/firedoor/glass, @@ -15052,7 +14742,6 @@ /obj/structure/catwalk, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/techfloor, @@ -15095,11 +14784,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"ayo" = ( -/turf/simulated/wall{ - can_open = 0 - }, -/area/maintenance/lower/bar) "ayp" = ( /obj/effect/catwalk_plated/dark, /turf/simulated/open, @@ -15136,8 +14820,7 @@ /area/maintenance/lower/bar) "ayu" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) @@ -15292,7 +14975,6 @@ /obj/effect/floor_decal/corner/green/border, /obj/structure/disposalpipe/sortjunction{ dir = 4; - icon_state = "pipe-j1s"; name = "Command Meeting Room"; sortType = "Command Meeting Room" }, @@ -15372,15 +15054,13 @@ /area/maintenance/lower/bar) "ayT" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "ayU" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) @@ -15533,8 +15213,7 @@ /area/maintenance/lower/bar) "azo" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) @@ -15547,8 +15226,7 @@ /area/tether/surfacebase/fish_farm) "azr" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/water/deep/indoors, /area/tether/surfacebase/fish_farm) @@ -15636,8 +15314,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/window/basic{ dir = 4 @@ -15695,7 +15372,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -15732,8 +15408,7 @@ "azM" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/teleporter) @@ -15749,8 +15424,7 @@ "azO" = ( /obj/item/weapon/stool/padded, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/item/device/radio/intercom{ dir = 1; @@ -15859,8 +15533,7 @@ }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) @@ -15905,8 +15578,7 @@ /area/maintenance/asmaint2) "aAh" = ( /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -15916,8 +15588,7 @@ "aAi" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -15985,8 +15656,7 @@ /area/teleporter) "aAq" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/teleporter) @@ -16091,7 +15761,6 @@ "aAD" = ( /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /turf/simulated/open, @@ -16114,8 +15783,7 @@ "aAH" = ( /obj/structure/closet/firecloset, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -16250,8 +15918,7 @@ /area/maintenance/lower/bar) "aAZ" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) @@ -16266,15 +15933,13 @@ /area/maintenance/lower/bar) "aBb" = ( /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/wall, /area/tether/surfacebase/fish_farm) "aBc" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, @@ -16326,22 +15991,18 @@ "aBj" = ( /obj/structure/sign/directions/medical{ dir = 1; - icon_state = "direction_med"; pixel_y = 8 }, /obj/structure/sign/directions/science{ dir = 1; - icon_state = "direction_sci"; pixel_y = 3 }, /obj/structure/sign/directions/security{ dir = 1; - icon_state = "direction_sec"; pixel_y = -4 }, /obj/structure/sign/directions/engineering{ dir = 4; - icon_state = "direction_eng"; pixel_y = -10 }, /turf/simulated/wall, @@ -16403,13 +16064,11 @@ /area/teleporter) "aBr" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /turf/simulated/floor/tiled/dark, @@ -16418,8 +16077,7 @@ /obj/machinery/shieldwallgen, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/teleporter) @@ -16481,8 +16139,7 @@ /obj/random/maintenance/clean, /obj/random/tool, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/lower/bar) @@ -16505,8 +16162,7 @@ /area/tether/surfacebase/fish_farm) "aBC" = ( /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/water/deep/indoors, /area/tether/surfacebase/fish_farm) @@ -16535,7 +16191,6 @@ /obj/item/stack/cable_coil/pink, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -16557,8 +16212,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -16570,8 +16224,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -16587,8 +16240,7 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -16605,8 +16257,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -16621,8 +16272,7 @@ dir = 2 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -16637,8 +16287,7 @@ /area/tether/surfacebase/north_staires_two) "aBM" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/structure/cable{ icon_state = "4-8" @@ -16648,8 +16297,7 @@ /area/tether/surfacebase/north_staires_two) "aBN" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/structure/cable{ icon_state = "4-8" @@ -16662,8 +16310,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 @@ -16677,16 +16324,14 @@ /area/tether/surfacebase/north_staires_two) "aBP" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_staires_two) "aBQ" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -16874,8 +16519,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/chapel/chapel_morgue) @@ -16892,8 +16536,7 @@ "aCo" = ( /obj/structure/railing, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/water/deep/indoors, /area/tether/surfacebase/fish_farm) @@ -16913,8 +16556,7 @@ /area/tether/surfacebase/fish_farm) "aCs" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -16927,13 +16569,10 @@ /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; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -17041,7 +16680,6 @@ dir = 4 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -17057,7 +16695,6 @@ "aCB" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -17072,8 +16709,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable{ icon_state = "1-4" @@ -17090,14 +16726,12 @@ /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, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, @@ -17106,8 +16740,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, @@ -17131,8 +16764,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{ dir = 4 @@ -17151,8 +16783,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{ dir = 4 @@ -17169,8 +16800,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 = 10 @@ -17288,7 +16918,6 @@ "aCR" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/cable{ @@ -17414,8 +17043,7 @@ "aDj" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/fish_farm) @@ -17425,15 +17053,13 @@ /area/tether/surfacebase/fish_farm) "aDl" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "aDm" = ( /obj/effect/floor_decal/spline/plain{ - dir = 8; - icon_state = "spline_plain" + dir = 8 }, /turf/simulated/floor/beach/sand/desert, /area/tether/surfacebase/fish_farm) @@ -17467,8 +17093,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -17489,8 +17114,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -17507,8 +17131,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -17520,8 +17143,7 @@ /area/tether/surfacebase/surface_two_hall) "aDs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -17560,8 +17182,7 @@ /area/tether/surfacebase/surface_two_hall) "aDw" = ( /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -17592,12 +17213,10 @@ "aDz" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/bridge_hallway) @@ -17616,8 +17235,7 @@ icon_state = "2-4" }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/bridge_hallway) @@ -17652,7 +17270,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/structure/cable/green{ @@ -17666,10 +17283,8 @@ }, /obj/item/device/radio/intercom{ broadcasting = 1; - dir = 2; frequency = 1473; name = "Confession Intercom"; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/dark, @@ -17692,7 +17307,6 @@ }, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /turf/simulated/floor/tiled/dark, @@ -17704,9 +17318,7 @@ /obj/structure/cable, /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Command"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /turf/simulated/floor/plating, /area/maintenance/substation/command) @@ -17724,8 +17336,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/light/small{ dir = 4 @@ -17841,7 +17452,6 @@ }, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /turf/simulated/floor/tiled/dark, @@ -17970,8 +17580,7 @@ /area/maintenance/lower/south) "aEi" = ( /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/bridge_hallway) @@ -17991,13 +17600,11 @@ dir = 1 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /turf/simulated/floor/plating, @@ -18006,8 +17613,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/substation/command) @@ -18016,8 +17622,7 @@ dir = 10 }, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/chapel/main) @@ -18030,8 +17635,7 @@ /obj/structure/lattice, /obj/machinery/door/firedoor/glass, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/open, /area/chapel/main) @@ -18075,23 +17679,20 @@ /obj/effect/floor_decal/techfloor, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/disposalpipe/up{ dir = 8 }, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /obj/machinery/atmospherics/pipe/zpipe/up/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 8; - icon_state = "up-scrubbers" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/chapel/main) @@ -18100,8 +17701,7 @@ dir = 6 }, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/chapel/main) @@ -18171,8 +17771,7 @@ /area/chapel/chapel_morgue) "aEx" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/railing{ dir = 8 @@ -18181,19 +17780,16 @@ /area/tether/surfacebase/fish_farm) "aEy" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/floor/water/deep/indoors, /area/tether/surfacebase/fish_farm) "aEz" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/water/deep/indoors, /area/tether/surfacebase/fish_farm) @@ -18275,7 +17871,6 @@ "aEH" = ( /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /turf/simulated/floor/tiled/steel_dirty, @@ -18335,7 +17930,6 @@ /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; - dir = 1; icon_state = "pdoor0"; id = "bridge blast"; layer = 1; @@ -18371,9 +17965,7 @@ /area/maintenance/commandmaint) "aEP" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/green{ @@ -18406,8 +17998,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/substation/command) @@ -18453,8 +18044,7 @@ "aEX" = ( /obj/machinery/portable_atmospherics/powered/scrubber, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/techfloor{ dir = 9 @@ -18488,8 +18078,7 @@ /area/maintenance/lower/bar) "aFb" = ( /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{ @@ -18530,9 +18119,7 @@ alarm_id = "anomaly_testing"; breach_detection = 0; dir = 8; - frequency = 1439; pixel_x = 22; - pixel_y = 0; report_danger_level = 0 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -18546,8 +18133,7 @@ }, /obj/machinery/disposal, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -18573,8 +18159,7 @@ icon_state = "1-8" }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/disposalpipe/segment, /obj/structure/railing{ @@ -18592,8 +18177,7 @@ /area/maintenance/lower/rnd) "aFk" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/railing, /obj/effect/floor_decal/rust, @@ -18655,8 +18239,7 @@ "aFs" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18669,8 +18252,7 @@ icon_state = "4-8" }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -18684,8 +18266,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -18858,8 +18439,7 @@ /area/maintenance/lower/bar) "aFJ" = ( /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -18907,8 +18487,7 @@ dir = 1 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -18917,8 +18496,7 @@ /area/chapel/chapel_morgue) "aFO" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) @@ -18989,9 +18567,7 @@ "aFX" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/machinery/light/small{ dir = 8 @@ -19026,8 +18602,7 @@ /area/tether/surfacebase/surface_two_hall) "aGb" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/requests_console{ announcementConsole = 1; @@ -19076,9 +18651,7 @@ /area/bridge/meeting_room) "aGf" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/green{ @@ -19091,9 +18664,7 @@ pixel_y = 30 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/structure/cable/green{ d1 = 2; @@ -19182,7 +18753,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /turf/simulated/floor/tiled/techmaint, @@ -19218,8 +18788,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, @@ -19252,8 +18821,7 @@ /area/chapel/chapel_morgue) "aGu" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/floor/beach/sand/desert, /area/tether/surfacebase/fish_farm) @@ -19362,12 +18930,10 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, @@ -19398,8 +18964,7 @@ /area/chapel/main) "aGS" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/carpet, /area/chapel/main) @@ -19460,8 +19025,7 @@ "aGY" = ( /obj/machinery/door/airlock/maintenance/common, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, @@ -19469,8 +19033,7 @@ "aGZ" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -19535,8 +19098,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, /turf/simulated/floor/tiled/techmaint, @@ -19610,8 +19172,7 @@ /obj/machinery/button/windowtint{ dir = 1; id = "meetingroom"; - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -19670,8 +19231,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 = 8 @@ -19723,16 +19283,13 @@ /area/chapel/main) "aHC" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/chapel/main) "aHD" = ( /obj/machinery/camera/network/outside{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside2) @@ -19753,7 +19310,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plating, @@ -19816,8 +19372,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 = 6 @@ -20010,7 +19565,6 @@ /obj/effect/floor_decal/rust, /obj/item/clothing/glasses/sunglasses{ desc = "My vision is augmented"; - icon_state = "sun"; name = "Augmented shades" }, /turf/simulated/floor/plating, @@ -20104,8 +19658,7 @@ "aIr" = ( /obj/machinery/photocopier, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -20128,9 +19681,7 @@ }, /obj/machinery/disposal, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -20144,8 +19695,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/scrubbers{ dir = 8 @@ -20225,7 +19775,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ dir = 1; - icon_state = "pipe-j1s"; name = "Chapel"; sortType = "Chapel" }, @@ -20250,8 +19799,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - icon_state = "map-scrubbers" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/chapel/main) @@ -20353,8 +19901,7 @@ /area/maintenance/lower/atmos) "aIL" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) @@ -20424,8 +19971,7 @@ /obj/structure/table/woodentable, /obj/item/weapon/storage/box/cups, /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -20439,8 +19985,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, /turf/simulated/floor/tiled/techmaint, @@ -20614,8 +20159,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, /turf/simulated/floor/tiled/techmaint, @@ -20703,8 +20247,7 @@ /area/rnd/rdoffice) "aJC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20713,8 +20256,7 @@ /area/rnd/rdoffice) "aJD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20726,7 +20268,6 @@ }, /obj/machinery/door/window/eastleft{ dir = 8; - icon_state = "left"; name = "Kendrick's Pen"; req_access = list(30); req_one_access = list(19) @@ -20735,16 +20276,13 @@ /area/rnd/rdoffice) "aJE" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20753,8 +20291,7 @@ /area/rnd/rdoffice) "aJF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20822,8 +20359,7 @@ /area/maintenance/lower/rnd) "aJN" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers, /obj/machinery/atmospherics/pipe/zpipe/down/supply, @@ -20859,7 +20395,6 @@ /area/chapel/office) "aJR" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; pixel_x = 10; pixel_y = 32 @@ -20923,7 +20458,6 @@ desc = "A firewall prevents AIs from interacting with this device."; name = "Telecoms lethal turret control"; pixel_x = 29; - pixel_y = 0; req_access = list(61); req_one_access = list(12) }, @@ -20954,9 +20488,7 @@ "aKc" = ( /obj/machinery/photocopier, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 @@ -21224,8 +20756,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/door/firedoor/glass/hidden, @@ -21299,7 +20830,6 @@ /area/maintenance/lower/atmos) "aKL" = ( /obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; icon_state = "map_vent_out"; use_power = 1 }, @@ -21324,8 +20854,7 @@ /area/server) "aKN" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6; - icon_state = "intact" + dir = 6 }, /obj/effect/floor_decal/techfloor{ dir = 1 @@ -21349,9 +20878,7 @@ "aKP" = ( /obj/machinery/papershredder, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 @@ -21399,17 +20926,14 @@ dir = 4 }, /obj/machinery/camera/network/research{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "aKU" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Research"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green, /obj/structure/cable/green{ @@ -21568,8 +21092,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, /turf/simulated/floor/tiled/techmaint, @@ -21653,8 +21176,7 @@ /area/maintenance/lower/atmos) "aLt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/bluegrid{ name = "Server Base"; @@ -21694,9 +21216,7 @@ /area/server) "aLx" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 @@ -21733,7 +21253,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/flora/pottedplant/stoutbush, @@ -21784,8 +21303,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/engineering{ name = "Science Substation"; @@ -21934,8 +21452,7 @@ name = "Chaplain" }, /obj/structure/bed/chair/wood/wings{ - dir = 1; - icon_state = "wooden_chair_wings" + dir = 1 }, /turf/simulated/floor/lino, /area/chapel/office) @@ -21955,7 +21472,6 @@ }, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /turf/simulated/floor/lino, @@ -21988,18 +21504,15 @@ "aLZ" = ( /obj/item/device/radio/intercom{ broadcasting = 1; - dir = 2; frequency = 1473; name = "Confession Intercom"; - pixel_x = 0; pixel_y = -24 }, /obj/structure/bed/chair{ dir = 4 }, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/chapel/main) @@ -22007,25 +21520,21 @@ /obj/structure/grille, /obj/structure/window/reinforced/tinted, /obj/structure/window/reinforced/tinted{ - dir = 4; - icon_state = "twindow" + dir = 4 }, /obj/structure/window/reinforced/tinted{ dir = 1 }, /obj/structure/window/reinforced/tinted{ - dir = 8; - icon_state = "twindow" + dir = 8 }, /turf/simulated/floor, /area/chapel/main) "aMb" = ( /obj/item/device/radio/intercom{ broadcasting = 1; - dir = 2; frequency = 1473; name = "Confession Intercom"; - pixel_x = 0; pixel_y = -24 }, /obj/structure/bed/chair{ @@ -22190,7 +21699,6 @@ /obj/effect/floor_decal/borderfloor, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/floor_decal/corner/yellow/border, @@ -22216,8 +21724,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, @@ -22231,8 +21738,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2, /turf/simulated/floor/tiled/techmaint, @@ -22278,7 +21784,6 @@ "aMD" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -30 }, /turf/simulated/floor/tiled/techmaint, @@ -22305,8 +21810,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -22368,8 +21872,7 @@ /area/maintenance/lower/south) "aMO" = ( /obj/machinery/light_construct{ - dir = 4; - icon_state = "tube-construct-stage1" + dir = 4 }, /turf/simulated/floor/plating, /area/vacant/vacant_bar_upper) @@ -22586,7 +22089,6 @@ dir = 6 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -30 }, /turf/simulated/floor/tiled/techmaint, @@ -22650,8 +22152,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/tiled/techmaint, @@ -22828,7 +22329,6 @@ /obj/structure/closet/wardrobe/robotics_black, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/dark, @@ -22841,16 +22341,13 @@ /area/tether/surfacebase/emergency_storage/atmos) "aNE" = ( /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/yellow{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/powered/scrubber, @@ -22858,36 +22355,30 @@ /area/engineering/lower/lobby) "aNF" = ( /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/yellow{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/structure/bed/chair, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "aNG" = ( /obj/effect/floor_decal/corner/yellow{ - dir = 1; - icon_state = "corner_white" + dir = 1 }, /obj/structure/bed/chair, /obj/machinery/light{ dir = 1 }, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 6; - icon_state = "borderfloor_shifted" + dir = 6 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 6; - icon_state = "bordercolor_shifted" + dir = 6 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -22902,13 +22393,10 @@ /area/engineering/lower/lobby) "aNI" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -22917,12 +22405,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -22945,15 +22431,13 @@ dir = 5 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/structure/disposalpipe/trunk{ dir = 8 @@ -22976,7 +22460,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -23037,8 +22520,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/tether/surfacebase/east_stairs_two) @@ -23109,7 +22591,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled/techfloor, @@ -23393,8 +22874,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -23429,7 +22909,6 @@ /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/mauve/bordercorner2, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -23480,8 +22959,7 @@ /area/engineering/lower/lobby) "aOx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -23496,15 +22974,13 @@ /area/engineering/lower/lobby) "aOA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "aOB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, @@ -23518,15 +22994,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 5; - icon_state = "bordercolorcorner2" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -23664,9 +23138,7 @@ /area/server) "aOW" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 @@ -23714,8 +23186,7 @@ dir = 6 }, /obj/machinery/camera/network/research{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/staircase/secondfloor) @@ -23754,8 +23225,7 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/int{ - name = "Emergency Storage"; - req_one_access = list() + name = "Emergency Storage" }, /turf/simulated/floor/plating, /area/tether/surfacebase/emergency_storage/atmos) @@ -23910,8 +23380,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -23934,8 +23403,6 @@ /obj/machinery/button/remote/blast_door{ id = "atmoslockdown"; name = "Atmospherics Lockdown"; - pixel_x = 0; - pixel_y = 0; req_one_access = list(10,24) }, /turf/simulated/floor/carpet, @@ -24018,16 +23485,13 @@ /area/maintenance/lower/south) "aPE" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/firealarm{ dir = 8; @@ -24055,8 +23519,7 @@ /area/rnd/staircase/secondfloor) "aPI" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/open, /area/rnd/staircase/secondfloor) @@ -24069,9 +23532,7 @@ /area/rnd/breakroom) "aPL" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -24118,7 +23579,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -24130,7 +23590,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's set to Free-Anur-Entertanment, I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/wood, @@ -24138,7 +23597,6 @@ "aPS" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/flora/pottedplant/stoutbush, @@ -24161,14 +23619,12 @@ /area/tether/surfacebase/emergency_storage/atmos) "aPW" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -24178,22 +23634,19 @@ /area/engineering/lower/lobby) "aPX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 6; - icon_state = "intact" + dir = 6 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "aPY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "aPZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/machinery/meter, /turf/simulated/floor/tiled, @@ -24211,8 +23664,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -24233,15 +23685,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 6 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 6; - icon_state = "bordercolorcorner2" + dir = 6 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -24250,8 +23700,7 @@ /area/engineering/lower/lobby) "aQf" = ( /obj/machinery/computer/station_alert{ - dir = 4; - icon_state = "computer" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/engineering/lower/breakroom) @@ -24297,9 +23746,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) @@ -24389,7 +23836,6 @@ "aQx" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/random/tool, @@ -24479,8 +23925,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/white/border/shifted, /obj/effect/floor_decal/corner/yellow{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/structure/flora/pottedplant/subterranean, /turf/simulated/floor/tiled, @@ -24489,8 +23934,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/blue/border/shifted, /obj/effect/floor_decal/corner/yellow{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -24502,8 +23946,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/white/border/shifted, /obj/effect/floor_decal/corner/yellow{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -24515,8 +23958,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/white/border/shifted, /obj/effect/floor_decal/corner/yellow{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/structure/bed/chair{ dir = 1 @@ -24528,20 +23970,17 @@ /area/engineering/lower/lobby) "aQN" = ( /obj/effect/floor_decal/corner/yellow{ - dir = 8; - icon_state = "corner_white" + dir = 8 }, /obj/structure/bed/chair{ dir = 1 }, /obj/machinery/light, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 5; - icon_state = "borderfloor_shifted" + dir = 5 }, /obj/effect/floor_decal/corner/blue/border/shifted{ - dir = 5; - icon_state = "bordercolor_shifted" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -24568,8 +24007,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2, /turf/simulated/floor/tiled, @@ -24592,8 +24030,7 @@ dir = 6 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/yellow/bordercorner2, @@ -24729,8 +24166,7 @@ department = "Science"; departmentType = 2; name = "Science Requests Console"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /obj/structure/bed/chair/comfy/brown{ dir = 1 @@ -24774,8 +24210,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/structure/table/rack{ dir = 8; @@ -24794,13 +24229,10 @@ /area/engineering/lower/atmos_eva) "aRr" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/alarm{ pixel_y = 22 @@ -24816,8 +24248,7 @@ dir = 5 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /obj/structure/table/standard, /obj/item/weapon/storage/briefcase/inflatable{ @@ -24831,9 +24262,7 @@ pixel_x = -3 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -24950,7 +24379,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /turf/simulated/floor/tiled/techfloor, @@ -24962,8 +24390,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) @@ -24974,8 +24401,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/corner_techfloor_grid{ dir = 1 @@ -25054,8 +24480,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/structure/table/rack{ dir = 8; @@ -25081,8 +24506,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/structure/table/standard, /obj/item/device/suit_cooling_unit, @@ -25100,8 +24524,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/structure/closet/secure_closet/atmos_personal, /obj/machinery/camera/network/engineering, @@ -25109,13 +24532,10 @@ /area/engineering/lower/atmos_lockers) "aRV" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/structure/closet/secure_closet/atmos_personal, /obj/machinery/alarm{ @@ -25125,20 +24545,15 @@ /area/engineering/lower/atmos_lockers) "aRW" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/structure/closet/secure_closet/atmos_personal, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/light{ @@ -25154,17 +24569,13 @@ /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/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/vending/engivend, /turf/simulated/floor/tiled, @@ -25177,8 +24588,7 @@ dir = 5 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /obj/machinery/vending/tool, /turf/simulated/floor/tiled, @@ -25209,13 +24619,10 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -25224,12 +24631,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /turf/simulated/floor/tiled/monotile, /area/engineering/atmos) @@ -25275,8 +24680,7 @@ /area/maintenance/engineering/pumpstation) "aSi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/cable/cyan{ d2 = 2; @@ -25285,7 +24689,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /turf/simulated/floor/plating, @@ -25326,8 +24729,7 @@ dir = 9 }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) @@ -25483,15 +24885,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/suit_cycler/engineering{ name = "Atmospherics suit cycler" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_eva) @@ -25512,15 +24912,13 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 5; - icon_state = "bordercolorcorner2" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_eva) @@ -25529,17 +24927,13 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/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/yellow/bordercorner2{ - dir = 10; - icon_state = "bordercolorcorner2" + dir = 10 }, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_lockers) @@ -25566,15 +24960,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 5; - icon_state = "bordercolorcorner2" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_lockers) @@ -25626,7 +25018,6 @@ /obj/machinery/portable_atmospherics/powered/pump/filled, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/plating, @@ -25644,8 +25035,7 @@ /area/maintenance/engineering/pumpstation) "aSY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/red{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) @@ -25671,15 +25061,13 @@ "aTb" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; - icon_state = "pipe-j1s"; name = "Janitor Closet"; sortType = "Janitor Closet" }, /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 @@ -25813,8 +25201,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 @@ -25837,8 +25224,7 @@ dir = 6 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) @@ -25896,8 +25282,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/power/apc{ cell_type = /obj/item/weapon/cell/super; @@ -26129,8 +25514,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/plating, /area/engineering/atmos/storage) @@ -26199,8 +25583,7 @@ dir = 4 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 6 @@ -26293,15 +25676,13 @@ dir = 10 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/camera/network/engineering{ @@ -26325,16 +25706,14 @@ dir = 6 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 6 }, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 6; - icon_state = "bordercolorcorner2" + dir = 6 }, /obj/effect/floor_decal/corner/yellow/bordercorner2, /obj/machinery/recharge_station, @@ -26345,15 +25724,13 @@ dir = 10 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 8 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 8; - icon_state = "bordercolorcorner2" + dir = 8 }, /obj/structure/closet/secure_closet/engineering_electrical, /turf/simulated/floor/tiled, @@ -26391,15 +25768,13 @@ dir = 6 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 6 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 6; - icon_state = "bordercolorcorner2" + dir = 6 }, /obj/structure/table/standard, /obj/item/clothing/gloves/black, @@ -26435,8 +25810,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2, /turf/simulated/floor/tiled/monotile, @@ -26474,7 +25848,6 @@ /area/engineering/atmos/storage) "aUG" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -26494,19 +25867,16 @@ /area/tether/surfacebase/east_stairs_two) "aUL" = ( /obj/effect/floor_decal/corner/purple{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/structure/mopbucket, /obj/item/weapon/mop, /obj/item/weapon/reagent_containers/glass/bucket, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled, @@ -26516,16 +25886,13 @@ pixel_y = 32 }, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/structure/mopbucket, /obj/item/weapon/mop, @@ -26540,20 +25907,16 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/structure/mopbucket, /obj/item/weapon/mop, @@ -26562,16 +25925,13 @@ /area/janitor) "aUO" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/structure/janitorialcart, /obj/structure/sink/kitchen{ @@ -26582,16 +25942,13 @@ "aUP" = ( /obj/structure/janitorialcart, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/alarm{ pixel_y = 22 @@ -26604,16 +25961,13 @@ "aUQ" = ( /obj/structure/janitorialcart, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /turf/simulated/floor/tiled, /area/janitor) @@ -26655,7 +26009,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -26685,14 +26038,10 @@ "aVh" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/mirror{ @@ -26798,9 +26147,7 @@ /obj/machinery/button/remote/blast_door{ id = "janitor_blast"; name = "Desk Shutters"; - pixel_x = -22; - pixel_y = 0; - pixel_z = 0 + pixel_x = -22 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -26831,8 +26178,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/janitor) @@ -26844,8 +26190,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled/techfloor, @@ -26862,8 +26207,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -26873,8 +26217,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/lower/south) @@ -26884,8 +26227,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/lower/south) @@ -26932,8 +26274,7 @@ /area/rnd/breakroom/bathroom) "aVL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -26943,9 +26284,7 @@ "aVM" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 29 @@ -26960,8 +26299,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/machinery/camera/network/engineering, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -26971,13 +26309,10 @@ /area/engineering/atmos) "aVR" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/alarm{ pixel_y = 22 @@ -26997,9 +26332,7 @@ icon_state = "2-4" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -27008,15 +26341,13 @@ dir = 6 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -27043,9 +26374,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -27054,15 +26383,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 @@ -27076,21 +26403,16 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -27105,9 +26427,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -27116,8 +26436,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -27133,9 +26452,7 @@ icon_state = "2-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -27144,8 +26461,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -27156,16 +26472,13 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -27179,9 +26492,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -27190,15 +26501,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 @@ -27217,8 +26526,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -27250,13 +26558,10 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -27265,12 +26570,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /obj/structure/cable/cyan{ d1 = 4; @@ -27305,9 +26608,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -27316,15 +26617,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/structure/cable/cyan{ d1 = 4; @@ -27341,16 +26640,13 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/structure/cable/cyan{ d1 = 4; @@ -27364,9 +26660,7 @@ /area/engineering/atmos) "aWf" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -27375,12 +26669,10 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/structure/cable/cyan{ d1 = 4; @@ -27391,9 +26683,7 @@ /area/engineering/atmos) "aWg" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -27402,12 +26692,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/cable/cyan{ d1 = 4; @@ -27418,20 +26706,16 @@ /area/engineering/atmos) "aWh" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/cable/cyan{ d1 = 4; @@ -27445,9 +26729,7 @@ /area/engineering/atmos) "aWi" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -27456,12 +26738,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/cable/cyan{ d1 = 4; @@ -27475,9 +26755,7 @@ /area/engineering/atmos) "aWj" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -27486,12 +26764,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/structure/cable/cyan{ d1 = 1; @@ -27502,9 +26778,7 @@ /area/engineering/atmos) "aWk" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -27513,8 +26787,7 @@ dir = 10 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/red, /turf/simulated/floor/tiled, @@ -27524,8 +26797,7 @@ dir = 5 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -27553,12 +26825,9 @@ "aWo" = ( /obj/machinery/door/window/eastleft{ dir = 8; - icon_state = "left"; name = "Janitorial Desk" }, /obj/machinery/door/window/eastleft{ - dir = 4; - icon_state = "left"; name = "Janitorial Desk"; req_access = list(26) }, @@ -27616,12 +26885,10 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -27683,7 +26950,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; layer = 1; @@ -27699,8 +26965,7 @@ dir = 10 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -27738,7 +27003,6 @@ /obj/effect/floor_decal/corner/yellow/border, /obj/structure/disposalpipe/sortjunction{ dir = 4; - icon_state = "pipe-j1s"; name = "Drone Fabrication"; sortType = "Drone Fabrication" }, @@ -27771,8 +27035,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -27805,8 +27068,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 6; - icon_state = "intact" + dir = 6 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -27817,8 +27079,7 @@ /area/engineering/atmos) "aWS" = ( /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, @@ -27833,8 +27094,7 @@ /area/engineering/atmos) "aWT" = ( /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, @@ -27851,8 +27111,7 @@ /area/engineering/atmos) "aWU" = ( /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, @@ -27860,8 +27119,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -27875,14 +27133,12 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction{ dir = 4; - icon_state = "pipe-j1s"; name = "Atmospherics"; sortType = "Atmospherics" }, @@ -27913,8 +27169,7 @@ pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 @@ -27926,8 +27181,7 @@ /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -27941,8 +27195,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -27953,19 +27206,16 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) "aXb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -27975,8 +27225,7 @@ /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/yellow/bordercorner2, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -27988,8 +27237,7 @@ /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 @@ -28000,8 +27248,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -28013,8 +27260,7 @@ }, /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -28026,8 +27272,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /obj/machinery/camera/network/engineering{ dir = 1 @@ -28056,13 +27301,10 @@ 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; - icon_state = "bordercolorcorner2" + dir = 10 }, /turf/simulated/floor/tiled, /area/janitor) @@ -28093,19 +27335,6 @@ }, /turf/simulated/floor/tiled, /area/janitor) -"aXl" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "aXs" = ( /obj/machinery/door/airlock{ name = "Unit 2" @@ -28154,8 +27383,7 @@ /area/engineering/drone_fabrication) "aXA" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/machinery/camera/network/engineering{ dir = 4 @@ -28224,8 +27452,7 @@ /area/engineering/atmos) "aXK" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/machinery/camera/network/engineering{ dir = 8 @@ -28260,9 +27487,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -28354,8 +27579,7 @@ icon_state = "pipe-c" }, /obj/structure/extinguisher_cabinet{ - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -28384,8 +27608,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, @@ -28405,8 +27628,7 @@ /area/rnd/breakroom/bathroom) "aYb" = ( /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/rnd/breakroom/bathroom) @@ -28417,8 +27639,7 @@ dir = 1 }, /obj/machinery/shower{ - dir = 1; - icon_state = "shower" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -28436,7 +27657,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/cyan{ @@ -28480,8 +27700,7 @@ pixel_y = 28 }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/machinery/light/small{ dir = 4 @@ -28501,7 +27720,6 @@ "aYk" = ( /obj/structure/cable/cyan{ d1 = 32; - d2 = 1; icon_state = "32-1" }, /obj/structure/lattice, @@ -28519,15 +27737,13 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/machinery/light{ dir = 1 }, /obj/machinery/computer/general_air_control/large_tank_control{ dir = 4; - frequency = 1441; input_tag = "atmos_out"; name = "Atmos Intake Control"; output_tag = "atmos_in"; @@ -28537,20 +27753,16 @@ /area/engineering/atmos/monitoring) "aYm" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /obj/structure/table/standard, /obj/item/taperoll/atmos, @@ -28559,8 +27771,6 @@ /obj/machinery/button/remote/blast_door{ id = "atmoslockdown"; name = "Atmospherics Lockdown"; - pixel_x = 0; - pixel_y = 0; req_one_access = list(10,24) }, /turf/simulated/floor/tiled, @@ -28589,20 +27799,16 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/machinery/computer/power_monitor, /turf/simulated/floor/tiled, @@ -28621,8 +27827,7 @@ dir = 5 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /obj/machinery/computer/rcon, /obj/machinery/light{ @@ -28657,8 +27862,7 @@ /area/maintenance/lower/south) "aYv" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/camera/network/tether{ dir = 4 @@ -28667,8 +27871,7 @@ /area/tether/surfacebase/east_stairs_two) "aYw" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) @@ -28676,8 +27879,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) @@ -28691,8 +27893,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's set to history channel, the show is talking about modern aliens. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) @@ -28707,8 +27908,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ - dir = 8; - icon_state = "bordercolorcorner2" + dir = 8 }, /obj/structure/closet/jcloset, /obj/item/weapon/soap/nanotrasen, @@ -28758,8 +27958,7 @@ dir = 5 }, /obj/machinery/computer/drone_control{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/machinery/firealarm{ dir = 8; @@ -28786,8 +27985,7 @@ /area/engineering/drone_fabrication) "aYI" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/rust, /obj/structure/disposalpipe/segment, @@ -28807,8 +28005,7 @@ /area/engineering/atmos) "aYL" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/open, /area/engineering/atmos) @@ -28817,12 +28014,10 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/computer/atmoscontrol{ - dir = 4; - icon_state = "computer" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) @@ -28849,8 +28044,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/structure/table/standard, /obj/item/weapon/storage/firstaid/regular, @@ -28908,9 +28102,7 @@ dir = 5 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) @@ -28948,8 +28140,7 @@ fabricator_tag = "Atmos" }, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) @@ -28972,8 +28163,7 @@ /area/engineering/drone_fabrication) "aZk" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -28986,8 +28176,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/computer/area_atmos/tag{ dir = 4; @@ -29026,8 +28215,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/structure/table/standard, /obj/item/weapon/paper_bin{ @@ -29105,7 +28293,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; layer = 1; @@ -29148,12 +28335,10 @@ /area/engineering/drone_fabrication) "aZK" = ( /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/techmaint, /area/engineering/drone_fabrication) @@ -29162,8 +28347,7 @@ dir = 10 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/structure/closet/firecloset, /turf/simulated/floor/tiled, @@ -29173,8 +28357,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) @@ -29202,8 +28385,7 @@ dir = 6 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /obj/structure/disposalpipe/trunk{ dir = 8 @@ -29265,8 +28447,7 @@ /area/maintenance/asmaint2) "aZX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -29312,8 +28493,7 @@ dir = 10 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/machinery/computer/station_alert{ dir = 1 @@ -29324,8 +28504,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/computer/atmos_alert{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/machinery/camera/network/engineering{ dir = 1 @@ -29337,8 +28516,7 @@ dir = 6 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /obj/machinery/computer/security/engineering{ dir = 1 @@ -29388,8 +28566,7 @@ dir = 6 }, /obj/machinery/computer/drone_control{ - dir = 4; - icon_state = "computer" + dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) @@ -29415,9 +28592,7 @@ "baw" = ( /obj/structure/catwalk, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/plating, @@ -29448,16 +28623,14 @@ /area/maintenance/lower/atmos) "baB" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/cryopod/robot, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "baC" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/computer/cryopod/robot{ pixel_y = -32 @@ -29469,8 +28642,7 @@ /area/engineering/drone_fabrication) "baD" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/machinery/light/small{ dir = 4 @@ -29585,8 +28757,7 @@ /area/maintenance/asmaint2) "bbc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) @@ -29639,9 +28810,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) @@ -29660,8 +28829,7 @@ "bbz" = ( /obj/structure/railing, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/open, /area/engineering/atmos) @@ -29710,7 +28878,6 @@ /obj/structure/catwalk, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; layer = 1; @@ -29818,12 +28985,10 @@ /area/maintenance/lower/atmos) "bbZ" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/mirror{ dir = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/carpet, @@ -29896,8 +29061,7 @@ dir = 1 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/railing, /obj/effect/floor_decal/rust, @@ -29957,8 +29121,7 @@ "bcN" = ( /obj/structure/catwalk, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/lower/south) @@ -29978,9 +29141,7 @@ "bcP" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/wood, /area/maintenance/lower/atmos) @@ -30085,8 +29246,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 = 8 @@ -30196,8 +29356,7 @@ dir = 8 }, /obj/structure/plushie/carp{ - dir = 4; - icon_state = "carpplushie" + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) @@ -30209,7 +29368,6 @@ "bdm" = ( /obj/structure/plushie/ian{ dir = 8; - icon_state = "ianplushie"; pixel_y = 6 }, /turf/simulated/floor/wood, @@ -30293,9 +29451,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -30466,16 +29622,14 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/readingrooms) "bdG" = ( /obj/structure/plushie/drone{ - dir = 1; - icon_state = "droneplushie" + dir = 1 }, /turf/simulated/floor/wood, /area/maintenance/lower/atmos) @@ -30549,9 +29703,7 @@ "bdY" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) @@ -30586,8 +29738,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, @@ -30596,8 +29747,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/tcomms) @@ -30618,20 +29768,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/readingrooms) -"bei" = ( -/obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 - }, -/turf/simulated/floor/reinforced, -/area/rnd/outpost/xenobiology/outpost_slimepens) "bej" = ( /obj/machinery/camera/network/research/xenobio{ network = list("Xenobiology") @@ -30675,7 +29816,6 @@ "ben" = ( /obj/machinery/processor, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; pixel_x = 4; pixel_y = 26 @@ -30689,7 +29829,6 @@ pixel_y = 21 }, /obj/machinery/alarm{ - pixel_x = 0; pixel_y = 30 }, /obj/machinery/computer/security/xenobio, @@ -30758,7 +29897,6 @@ /obj/random/medical/lite, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/techfloor, @@ -30787,8 +29925,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -30833,7 +29970,6 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/research{ name = "Slime Pen 1"; - req_access = list(); req_one_access = list(47,55) }, /obj/machinery/door/blast/regular{ @@ -30859,7 +29995,6 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/research{ name = "Slime Pen 2"; - req_access = list(); req_one_access = list(47,55) }, /obj/machinery/door/blast/regular{ @@ -30884,7 +30019,6 @@ component_coeff = 0.9; desc = "A machine used for construction of legit prosthetics. You weren't sure if cardboard was considered an engineering material until now."; dir = 4; - emagged = 0; name = "Legitimate Prosthetics Fabricator"; req_access = list(); res_max_amount = 150000; @@ -30947,8 +30081,7 @@ /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Telecomms"; charge = 100000; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -31021,9 +30154,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled/dark, @@ -31051,8 +30182,7 @@ "bfj" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) @@ -31216,8 +30346,7 @@ }) "bfC" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/tcommsat/computer) @@ -31238,15 +30367,13 @@ /area/tcommsat/computer) "bfF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/floor/tiled, /area/tcommsat/computer) "bfG" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /turf/simulated/floor/tiled, /area/tcommsat/computer) @@ -31274,7 +30401,6 @@ id = "xenobiodiv1"; name = "Divider 1 Blast Doors"; pixel_x = -38; - pixel_y = 0; req_access = list(55) }, /obj/machinery/button/remote/blast_door{ @@ -31292,9 +30418,7 @@ req_access = list(55) }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) @@ -31310,7 +30434,6 @@ id = "xenobiodiv2"; name = "Divider 2 Blast Doors"; pixel_x = 38; - pixel_y = 0; req_access = list(55) }, /obj/machinery/button/remote/blast_door{ @@ -31385,7 +30508,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /turf/simulated/floor/tiled, @@ -31400,14 +30522,11 @@ desc = "A firewall prevents AIs from interacting with this device."; name = "Telecoms Foyer turret control"; pixel_x = 29; - pixel_y = 0; req_access = list(61); req_one_access = list(12) }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -31502,8 +30621,7 @@ /area/tcommsat/computer) "bgh" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled, /area/tcommsat/computer) @@ -31530,7 +30648,6 @@ }, /obj/machinery/camera/network/research/xenobio{ dir = 9; - icon_state = "camera"; network = list("Xenobiology") }, /turf/simulated/floor/reinforced, @@ -31642,7 +30759,6 @@ }, /obj/machinery/camera/network/research/xenobio{ dir = 4; - icon_state = "camera"; network = list("Xenobiology") }, /turf/simulated/floor/reinforced, @@ -31728,8 +30844,7 @@ }, /obj/machinery/door/airlock/hatch{ name = "Telecomms Foyer"; - req_access = list(61); - req_one_access = list(12) + req_access = list(61) }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, @@ -31864,8 +30979,7 @@ "bgN" = ( /obj/machinery/door/airlock/hatch{ name = "Telecoms Control Room"; - req_access = list(61); - req_one_access = list(12) + req_access = list(61) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -31888,8 +31002,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, @@ -31901,8 +31014,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -31921,8 +31033,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -31968,8 +31079,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/plating, @@ -32037,7 +31147,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -32085,7 +31194,6 @@ dir = 1 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -32114,8 +31222,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/tcomsat{ @@ -32152,7 +31259,6 @@ }) "bht" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -32167,7 +31273,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled, @@ -32187,7 +31292,6 @@ /area/tcommsat/computer) "bhw" = ( /obj/machinery/atmospherics/unary/freezer{ - dir = 2; icon_state = "freezer_1"; set_temperature = 73; use_power = 1 @@ -32213,8 +31317,7 @@ /area/tcommsat/computer) "bhz" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/machinery/airlock_sensor/airlock_exterior{ frequency = 1381; @@ -32232,8 +31335,7 @@ id_tag = "server_access_outer"; locked = 1; name = "Telecoms Server Access"; - req_access = list(61); - req_one_access = list(12) + req_access = list(61) }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -32257,7 +31359,6 @@ frequency = 1381; id_tag = "server_access_airlock"; name = "Server Access Airlock"; - pixel_x = 0; pixel_y = 25; tag_airpump = "server_access_pump"; tag_chamber_sensor = "server_access_sensor"; @@ -32414,8 +31515,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass/hidden{ - dir = 2; - icon_state = "door_open" + dir = 2 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) @@ -32616,8 +31716,7 @@ id_tag = "server_access_inner"; locked = 1; name = "Telecoms Server Access"; - req_access = list(61); - req_one_access = list(12) + req_access = list(61) }, /turf/simulated/floor/tiled/dark{ nitrogen = 100; @@ -32639,8 +31738,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) @@ -32695,17 +31793,14 @@ id = "xenobiodiv3"; name = "Divider 3 Blast Doors"; pixel_x = -25; - pixel_y = 0; req_access = list(55) }, /obj/machinery/alarm{ dir = 4; - pixel_x = -35; - pixel_y = 0 + pixel_x = -35 }, /obj/machinery/camera/network/research/xenobio{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) @@ -32724,7 +31819,6 @@ id = "xenobiodiv4"; name = "Divider 4 Blast Doors"; pixel_x = 38; - pixel_y = 0; req_access = list(55) }, /obj/machinery/button/remote/blast_door{ @@ -32756,8 +31850,7 @@ /area/rnd/outpost/xenobiology/outpost_slimepens) "bis" = ( /obj/machinery/light_construct{ - dir = 8; - icon_state = "tube-construct-stage1" + dir = 8 }, /obj/structure/closet/secure_closet/personal, /turf/simulated/floor/wood, @@ -32769,8 +31862,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice, /obj/item/weapon/reagent_containers/food/drinks/bottle/lemonjuice, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) @@ -32959,14 +32051,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) @@ -33113,8 +32203,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -33130,8 +32219,7 @@ /obj/item/weapon/stock_parts/subspace/ansible, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -33172,8 +32260,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) @@ -33561,7 +32648,6 @@ id = "xenobiodiv5"; name = "Divider 5 Blast Doors"; pixel_x = -30; - pixel_y = 0; req_access = list(55) }, /obj/machinery/button/remote/blast_door{ @@ -33572,9 +32658,7 @@ req_access = list(55) }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/button/remote/blast_door{ id = "xenobiopen7"; @@ -33585,8 +32669,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -35; - pixel_y = 0 + pixel_x = -35 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) @@ -33601,7 +32684,6 @@ id = "xenobiodiv6"; name = "Divider 6 Blast Doors"; pixel_x = 38; - pixel_y = 0; req_access = list(55) }, /obj/machinery/button/remote/blast_door{ @@ -33619,8 +32701,7 @@ req_access = list(55) }, /obj/machinery/camera/network/research/xenobio{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) @@ -33688,12 +32769,10 @@ }) "bkf" = ( /obj/structure/sign/nosmoking_2{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/bluegrid{ name = "Mainframe Base"; @@ -33765,8 +32844,7 @@ /area/tcommsat/chamber) "bkn" = ( /obj/structure/sign/nosmoking_2{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/light{ dir = 4 @@ -33909,8 +32987,7 @@ /obj/structure/table/steel, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/random/junk, /turf/simulated/floor/plating, @@ -34152,7 +33229,6 @@ /obj/effect/floor_decal/industrial/outline/blue, /obj/structure/cable/green{ d1 = 32; - d2 = 1; icon_state = "32-1" }, /turf/simulated/floor/wood, @@ -34261,8 +33337,7 @@ /area/tether/surfacebase/southhall) "bll" = ( /obj/machinery/camera/network/outside{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside2) @@ -34299,7 +33374,6 @@ "blo" = ( /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; - req_access = list(); req_one_access = list(47,55) }, /obj/structure/cable/green{ @@ -34338,7 +33412,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; - req_access = list(); req_one_access = list(47,55) }, /obj/machinery/door/firedoor, @@ -34358,8 +33431,7 @@ /area/rnd/outpost/xenobiology/outpost_slimepens) "blt" = ( /obj/machinery/camera/network/outside{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside2) @@ -34489,12 +33561,10 @@ id = "phoroncelldoor9"; name = "Phoron Cell 9 Doorlock"; pixel_x = -38; - pixel_y = 0; specialfunctions = 4 }, /obj/machinery/light_switch{ dir = 1; - pixel_x = 0; pixel_y = 38 }, /turf/simulated/floor/tiled/dark, @@ -34565,7 +33635,6 @@ id = "phoroncelldoor10"; name = "Phoron Cell 10 Doorlock"; pixel_x = 38; - pixel_y = 0; specialfunctions = 4 }, /turf/simulated/floor/tiled/dark, @@ -34610,7 +33679,6 @@ /obj/machinery/door/airlock/research{ id_tag = "phoroncelldoor9"; name = "Slime Pen 9"; - req_access = list(); req_one_access = list(47,55) }, /obj/machinery/door/firedoor, @@ -34624,8 +33692,7 @@ "blW" = ( /obj/structure/stairs/north, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/railing{ dir = 8 @@ -34638,8 +33705,7 @@ "blX" = ( /obj/structure/stairs/north, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/window/basic{ dir = 1 @@ -34649,12 +33715,10 @@ "blY" = ( /obj/structure/stairs/north, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /obj/structure/window/basic{ dir = 1 @@ -34676,7 +33740,6 @@ /obj/machinery/door/airlock/research{ id_tag = "phoroncelldoor10"; name = "Slime Pen 10"; - req_access = list(); req_one_access = list(47,55) }, /obj/machinery/door/firedoor, @@ -34730,8 +33793,7 @@ /area/rnd/outpost/xenobiology/outpost_slimepens) "bmf" = ( /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) @@ -34775,7 +33837,6 @@ /obj/machinery/alarm/monitor/isolation{ alarm_id = "slime_pens"; dir = 1; - pixel_x = 0; pixel_y = -22 }, /turf/simulated/floor/reinforced, @@ -34786,7 +33847,6 @@ }, /obj/machinery/camera/network/research/xenobio{ dir = 10; - icon_state = "camera"; network = list("Xenobiology") }, /turf/simulated/floor/reinforced, @@ -34871,7 +33931,6 @@ alarm_id = null; breach_detection = 0; dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/disposalpipe/trunk{ @@ -34909,7 +33968,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -25 }, /turf/simulated/floor/tiled/dark, @@ -34962,7 +34020,6 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -34990,8 +34047,7 @@ dir = 4 }, /obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() + name = "Shower" }, /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled, @@ -35014,7 +34070,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable{ @@ -35053,8 +34108,7 @@ dir = 8 }, /obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() + name = "Shower" }, /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled, @@ -35077,8 +34131,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/railing, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /obj/structure/cable/green{ icon_state = "16-0" @@ -35128,8 +34181,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -35156,9 +34208,7 @@ dir = 9 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) @@ -35184,8 +34234,7 @@ /obj/structure/lattice, /obj/machinery/door/firedoor/glass, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/cable/green{ d1 = 32; @@ -35249,8 +34298,7 @@ dir = 4 }, /obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() + name = "Shower" }, /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled, @@ -35272,8 +34320,7 @@ dir = 8 }, /obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() + name = "Shower" }, /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled, @@ -35284,8 +34331,7 @@ /area/tether/surfacebase/medical/breakroom) "bpL" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/wall, /area/tether/surfacebase/medical/breakroom) @@ -35332,8 +34378,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -35377,7 +34422,6 @@ }, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /turf/simulated/floor/tiled/dark, @@ -35387,17 +34431,9 @@ /obj/machinery/vending/snack, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) -"foy" = ( -/obj/structure/railing{ - dir = 1; - icon_state = "railing0" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining) "fxr" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) @@ -35467,8 +34503,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -35504,13 +34539,6 @@ /obj/item/weapon/deck/cah, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) -"oXI" = ( -/obj/structure/railing{ - dir = 1; - icon_state = "railing0" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) "pah" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock{ @@ -35544,7 +34572,6 @@ dir = 4 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -35608,7 +34635,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -25 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -35618,8 +34644,7 @@ /area/maintenance/lower/south) "tHa" = ( /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, @@ -35637,14 +34662,11 @@ "uKv" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/structure/bed/chair{ dir = 4 @@ -35671,8 +34693,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/lower/south) @@ -35711,8 +34732,7 @@ /area/tether/surfacebase/medical/breakroom) "xSO" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) @@ -40369,15 +39389,15 @@ aab aab aab bdS -bei +bkt beG bfj bfJ -bei +bkt beG bfj bim -bei +bkt beG bfj bjU @@ -48398,7 +47418,7 @@ ajG tpu kPb tpu -oXI +awH aac adt avD @@ -48540,7 +47560,7 @@ ajG amN amT tHa -foy +amV atY atY avD @@ -50533,7 +49553,7 @@ avJ ard ard ard -ayo +ard ayP ard ard @@ -50572,18 +49592,18 @@ auH aUR aVA aWu -aXl +aSo aXT -aXl -aXl -aXl -aXl -aXl -aXl -aXl -aXl -aXl -aXl +aSo +aSo +aSo +aSo +aSo +aSo +aSo +aSo +aSo +aSo bbR aLY aLY @@ -50727,10 +49747,10 @@ aLX bcN aLX bbS -aXl -aXl -aXl -aXl +aSo +aSo +aSo +aSo bde bdE aLY @@ -50798,7 +49818,7 @@ adp aec afb afX -abv +abq agN akN abC @@ -51081,7 +50101,7 @@ adm adT aeB afk -afX +acC acI agQ akP @@ -52419,7 +51439,7 @@ adt adt adt adt -aab +aeG aab aab aab @@ -52550,18 +51570,18 @@ abn abn abn abn -aeG +abn abn abn abn aeG aeG aeG -aab -aab -aab -aab -aab +aeG +aeG +aeG +aeG +aeG aab aab aab @@ -52684,6 +51704,12 @@ aeG aeG aeG aeG +abn +abn +abn +abn +abn +aeG aeG aeG abn @@ -52698,12 +51724,6 @@ aeG aeG aeG aeG -aeG -aab -aab -aab -aab -aab aab aab aab @@ -52826,6 +51846,19 @@ aeG aeG aeG aeG +abn +abn +abn +abn +aeG +aeG +aeG +aeG +aeG +aeG +abn +abn +abn aeG aeG aeG @@ -52833,19 +51866,6 @@ aeG aeG aeG aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aab -aab -aab -aab -aab aab aab aab @@ -52969,6 +51989,18 @@ aeG aeG aeG aeG +abn +abn +abn +aeG +aac +aac +aeG +aeG +aeG +abn +abn +abn aeG aeG aeG @@ -52976,18 +52008,6 @@ aeG aeG aeG aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aab -aab -aab -aab -aab aab aab aab @@ -53108,28 +52128,28 @@ aeG aeG aeG aeG +aac +aac +aeG +aeG +abn +abn +aeG +aac +aac +aeG +aeG +aeG +aeG +aeG +abn +abn aeG aeG aeG aeG aeG aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aab -aab -aab -aab -aab aab aab aab @@ -53250,6 +52270,12 @@ aeG aeG aeG aeG +aac +aac +aeG +aeG +aeG +abn aeG aeG aeG @@ -53259,19 +52285,13 @@ aeG aeG aeG aeG +abn +abn +abn aeG aeG aeG aeG -aeG -aeG -aeG -aeG -aab -aab -aab -aab -aab aab aab aab @@ -53396,6 +52416,10 @@ aeG aeG aeG aeG +abn +abn +abn +abn aeG aeG aeG @@ -53405,6 +52429,7 @@ aeG aeG aeG aeG +abn aeG aeG aeG @@ -53466,11 +52491,6 @@ aab aab aab aab -aab -aab -aab -aab -aab aaa "} (126,1,1) = {" @@ -53538,24 +52558,24 @@ aeG aeG aeG aeG +abn +abn +abn +abn +abn +abn +abn aeG aeG aeG aeG aeG +abn +abn aeG aeG aeG aeG -aeG -aeG -aeG -aeG -aab -aab -aab -aab -aab aab aab aab @@ -53680,24 +52700,24 @@ aeG aeG aeG aeG +abn +abn +abn +abn +abn +abn +abn +abn +abn aeG aeG aeG +abn +abn +abn +abn aeG aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aab -aab -aab -aab -aab aab aab aab @@ -53822,6 +52842,12 @@ aeG aeG aeG aeG +abn +abn +abn +abn +abn +abn aeG aeG aeG @@ -53830,16 +52856,10 @@ aeG aeG aeG aeG +abn +abn aeG aeG -aeG -aeG -aeG -aab -aab -aab -aab -aab aab aab aab @@ -53963,6 +52983,12 @@ aeG aeG aeG aeG +abn +abn +abn +aeG +abn +abn aeG aeG aeG @@ -53976,12 +53002,6 @@ aeG aeG aeG aeG -aeG -aab -aab -aab -aab -aab aab aab aab @@ -54098,32 +53118,32 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +aeG +aeG +aeG +aeG +abn +abn +abn +abn +abn +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG aab aab aab @@ -54240,32 +53260,32 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +aeG +aeG +aeG +abn +abn +abn +abn +aeG +abn +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG aab aab aab @@ -54382,32 +53402,32 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG aab aab aab @@ -54524,32 +53544,32 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG aab aab aab diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 9e395c460a..7b1f4e67c7 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -727,9 +727,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -1833,14 +1830,7 @@ name = "\improper North Medical Stairwell" }) "acN" = ( -/obj/machinery/camera/network/medbay{ - dir = 10 - }, /obj/structure/railing, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24 - }, /turf/simulated/open, /area/tether/surfacebase/medical/uppernorthstairwell{ name = "\improper North Medical Stairwell" @@ -1858,6 +1848,10 @@ dir = 4; pixel_x = 11 }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "acP" = ( @@ -2585,11 +2579,6 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -30; - pixel_y = -24 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, @@ -2796,6 +2785,9 @@ pixel_x = -10; pixel_y = -30 }, +/obj/machinery/camera/network/medbay{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppernorthstairwell{ name = "\improper North Medical Stairwell" @@ -3480,10 +3472,6 @@ name = "north bump"; pixel_y = 28 }, -/obj/machinery/button/windowtint{ - id = "surfsurgery2"; - pixel_x = -26 - }, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -3809,6 +3797,16 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 6; + pixel_y = -22 + }, +/obj/machinery/button/windowtint{ + id = "surfsurgery2"; + pixel_x = -3; + pixel_y = -22 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "afB" = ( @@ -3931,9 +3929,6 @@ /obj/machinery/atmospherics/unary/freezer{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 25 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, @@ -3943,10 +3938,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 39 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "afI" = ( @@ -8359,7 +8350,9 @@ /area/tether/surfacebase/surface_three_hall) "ani" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "anj" = ( @@ -8680,14 +8673,14 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "anN" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "anO" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/universal, @@ -9529,15 +9522,19 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "api" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/appliance/cooker/grill, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 5 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/button/remote/blast_door{ + id = "kitchen2"; + name = "Kitchen shutters"; + pixel_x = -24 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23; + pixel_y = 9 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -11522,12 +11519,12 @@ /area/tether/surfacebase/surface_three_hall) "asw" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/alarm{ - pixel_y = 25 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start{ + name = "Chef" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "asx" = ( @@ -11702,24 +11699,6 @@ dir = 1 }, /obj/structure/closet/secure_closet/freezer/fridge, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) -"asM" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "asN" = ( @@ -11832,6 +11811,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/table/woodentable, /turf/simulated/floor/grass, /area/hydroponics) "ata" = ( @@ -11870,9 +11850,10 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "atf" = ( -/obj/machinery/appliance/cooker/fryer, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 +/obj/structure/table/standard, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -12014,10 +11995,8 @@ /obj/machinery/camera/network/outside{ dir = 5 }, -/obj/machinery/appliance/cooker/oven, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 - }, +/obj/structure/table/standard, +/obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atx" = ( @@ -12056,9 +12035,9 @@ "atA" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -12126,7 +12105,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/table/standard, +/obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atK" = ( @@ -12139,24 +12118,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"atL" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ - pixel_x = 3 - }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ - pixel_x = -3 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "atM" = ( /obj/structure/table/standard, -/obj/machinery/microwave, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/item/weapon/material/knife/butch, +/obj/item/weapon/material/kitchen/rollingpin, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atN" = ( @@ -12168,29 +12134,28 @@ /area/crew_quarters/bar) "atO" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/landmark/start{ - name = "Chef" +/obj/structure/table/standard, +/obj/item/weapon/reagent_containers/dropper, +/obj/item/weapon/reagent_containers/food/condiment/enzyme{ + layer = 5 + }, +/obj/item/weapon/reagent_containers/food/condiment/enzyme{ + layer = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atP" = ( -/obj/machinery/button/remote/blast_door{ - id = "kitchen"; - name = "Kitchen shutters"; - pixel_x = -24; - pixel_y = -24 - }, /obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/appliance/mixer/cereal, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 + dir = 8 }, +/obj/structure/closet/secure_closet/freezer/kitchen, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atQ" = ( @@ -12199,9 +12164,14 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/structure/table/standard, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atR" = ( @@ -12930,6 +12900,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/table/woodentable, /turf/simulated/floor/grass, /area/hydroponics) "avh" = ( @@ -13130,13 +13101,6 @@ /obj/effect/floor_decal/corner/beige{ dir = 6 }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/machinery/computer/guestpass{ - dir = 8; - pixel_x = 25 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "avB" = ( @@ -13153,13 +13117,13 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "avD" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/appliance/mixer/candy, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 6 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/obj/machinery/button/remote/blast_door{ + id = "kitchen"; + name = "Kitchen shutters"; + pixel_x = -24 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -13235,8 +13199,12 @@ /turf/simulated/floor/plating, /area/crew_quarters/bar) "avL" = ( -/obj/machinery/chem_master/condimaster, -/turf/simulated/floor/tiled/white, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass{ + name = "Hydroponics"; + req_one_access = list(35,28) + }, +/turf/simulated/floor/tiled/freezer, /area/crew_quarters/kitchen) "avM" = ( /obj/effect/floor_decal/corner/beige{ @@ -13392,13 +13360,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"awc" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "awd" = ( /obj/machinery/librarycomp, /obj/structure/table/woodentable, @@ -13573,14 +13534,15 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "awv" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/shutters{ + id = "kitchen2"; + layer = 3.3; + name = "Kitchen Shutters" }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -14188,12 +14150,6 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) -"axq" = ( -/obj/machinery/camera/network/civilian{ - dir = 4 - }, -/turf/simulated/floor/grass, -/area/maintenance/lower/xenoflora) "axr" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 @@ -14228,16 +14184,14 @@ }, /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ - pixel_x = 3 + dir = 1 }, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/machinery/chemical_dispenser/bar_soft/full, -/obj/machinery/recharger, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "axu" = ( @@ -15989,6 +15943,8 @@ icon_state = "1-2" }, /obj/structure/table/standard, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/microwave, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aAa" = ( @@ -16435,12 +16391,13 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/table/standard, -/obj/item/device/destTagger{ - pixel_x = 4; - pixel_y = 3 +/obj/machinery/chem_master/condimaster, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 }, -/obj/item/weapon/packageWrap, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aAM" = ( @@ -16889,14 +16846,13 @@ /turf/simulated/floor/tiled, /area/rnd/staircase/thirdfloor) "aBx" = ( -/obj/structure/table/standard, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/microwave, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aBy" = ( @@ -16962,15 +16918,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aBD" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/box/donkpockets{ - pixel_x = 3; - pixel_y = 3 +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker{ - pixel_x = 5 +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 6 }, -/obj/item/weapon/reagent_containers/food/snacks/mint, +/obj/machinery/appliance/mixer/cereal, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aBE" = ( @@ -17348,8 +17302,11 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aCf" = ( -/obj/structure/table/standard, -/obj/item/weapon/book/manual/chef_recipes, +/obj/machinery/appliance/mixer/candy, +/obj/effect/floor_decal/industrial/warning/dust, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aCg" = ( @@ -17452,11 +17409,6 @@ dir = 8 }, /obj/structure/closet/secure_closet/freezer/meat, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aCr" = ( @@ -18877,14 +18829,16 @@ /turf/simulated/floor/carpet, /area/library) "aES" = ( -/obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ - layer = 5 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ - layer = 5 +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, -/obj/item/weapon/reagent_containers/dropper, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aET" = ( @@ -19686,10 +19640,17 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aGh" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/freezer{ + name = "Kitchen"; + req_access = list(28) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aGi" = ( @@ -19698,9 +19659,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/table/standard, -/obj/machinery/reagentgrinder, +/obj/machinery/appliance/cooker/fryer, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aGj" = ( @@ -19815,21 +19780,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) -"aGr" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/table/standard, -/obj/item/weapon/storage/box/beakers{ - name = "box of measuring cups"; - pixel_x = 2; - pixel_y = 3; - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "aGs" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/research{ @@ -20192,6 +20142,8 @@ dir = 8; pixel_x = -28 }, +/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/weapon/storage/pill_bottle/dice_nerd, /turf/simulated/floor/wood, /area/library) "aGZ" = ( @@ -20449,11 +20401,10 @@ /turf/simulated/floor/plating, /area/crew_quarters/bar) "aHs" = ( -/obj/structure/table/gamblingtable, -/obj/item/weapon/storage/pill_bottle/dice, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aHt" = ( @@ -20540,10 +20491,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aHB" = ( -/obj/structure/table/gamblingtable, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/table/marble, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aHC" = ( @@ -20962,13 +20913,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "aIg" = ( -/obj/item/weapon/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aIh" = ( @@ -21255,7 +21206,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aIH" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/marble, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aII" = ( @@ -21315,12 +21266,20 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "aIN" = ( -/obj/structure/table/gamblingtable, -/obj/item/weapon/deck/cards, -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/bar) +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aIO" = ( -/obj/item/weapon/stool/padded, /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) @@ -21675,11 +21634,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aJv" = ( -/obj/structure/table/gamblingtable, -/obj/item/weapon/storage/pill_bottle/dice_nerd, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/table/marble, +/obj/machinery/recharger, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aJw" = ( @@ -21813,7 +21772,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aJK" = ( -/obj/item/weapon/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 4 }, @@ -21821,6 +21779,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aJL" = ( @@ -22126,11 +22085,11 @@ /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/bar) "aKo" = ( -/obj/item/weapon/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aKp" = ( @@ -22179,10 +22138,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aKv" = ( @@ -22228,16 +22185,11 @@ /area/tether/surfacebase/surface_three_hall) "aKy" = ( /obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/sink/kitchen{ + pixel_y = 28 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 + dir = 10 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -22503,9 +22455,6 @@ /area/tether/surfacebase/servicebackroom) "aLc" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/effect/landmark/start{ name = "Chef" }, @@ -26047,11 +25996,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/alarm{ - dir = 1; - pixel_x = 30; - pixel_y = -22 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -26647,6 +26591,10 @@ pixel_x = 10; pixel_y = 14 }, +/obj/item/weapon/storage/box/body_record_disk{ + pixel_x = -3; + pixel_y = -3 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "aTL" = ( @@ -26954,6 +26902,7 @@ /area/hallway/lower/third_south) "aUq" = ( /obj/structure/closet/secure_closet/freezer/meat, +/obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "aUr" = ( @@ -27801,10 +27750,6 @@ "aVT" = ( /obj/structure/table/standard, /obj/item/device/healthanalyzer, -/obj/machinery/button/windowtint{ - id = "surfsurgery2"; - pixel_x = -26 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) @@ -28439,6 +28384,10 @@ }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, +/obj/machinery/button/windowtint{ + id = "surfsurgery2"; + pixel_x = -22 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "aXd" = ( @@ -29545,20 +29494,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) -"aZg" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/grass, -/area/hydroponics) "aZh" = ( /obj/machinery/door/airlock/glass_command{ name = "Bridge"; @@ -30053,9 +29988,6 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, @@ -30068,11 +30000,21 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 6 }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aZX" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/foodcart, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aZY" = ( @@ -30366,16 +30308,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/beige/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, /turf/simulated/floor/tiled, @@ -30406,13 +30346,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "baA" = ( -/obj/item/weapon/stool/padded, /obj/structure/disposalpipe/segment{ dir = 8 }, /obj/machinery/light{ dir = 8 }, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "baB" = ( @@ -30427,10 +30367,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/camera/network/civilian{ - dir = 1 - }, -/turf/simulated/floor/grass, +/turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "baC" = ( /obj/machinery/vending/cola{ @@ -30461,14 +30398,21 @@ /area/hallway/lower/third_south) "baE" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/table/standard, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, +/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "baF" = ( @@ -30575,21 +30519,18 @@ /area/tether/surfacebase/surface_three_hall) "baM" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/button/remote/blast_door{ - id = "kitchen2"; - name = "Kitchen shutters"; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "baN" = ( @@ -30601,12 +30542,31 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "baO" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/vending/dinnerware{ +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "baP" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -30669,6 +30629,10 @@ dir = 1; pixel_y = -25 }, +/obj/machinery/computer/guestpass{ + dir = 8; + pixel_x = 25 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "baX" = ( @@ -30800,11 +30764,6 @@ /area/tether/surfacebase/entertainment) "bbm" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/weapon/paper{ - desc = ""; - info = "Yes hello, the goat in the freezer is named 'Spike'. Please do not fuck with Spike. He doesn't have the best temper."; - name = "Important notice from Rancher Jim" - }, /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 @@ -31072,6 +31031,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "bbJ" = ( @@ -31254,7 +31216,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/camera/network/civilian, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bcb" = ( @@ -31302,9 +31267,16 @@ /area/tether/surfacebase/servicebackroom) "bcf" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/table/standard, +/obj/item/frame/noticeboard{ + pixel_x = 32 }, +/obj/item/weapon/paper{ + desc = ""; + info = "Yes hello, the goat in the freezer is named 'Spike'. Please do not fuck with Spike. He doesn't have the best temper."; + name = "Important notice from Rancher Jim" + }, +/obj/item/weapon/book/manual/chef_recipes, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bcg" = ( @@ -31907,19 +31879,17 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "bda" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/standard, +/obj/item/weapon/storage/box/donkpockets{ + pixel_x = 3; + pixel_y = 3 }, -/obj/machinery/door/airlock/freezer{ - name = "Kitchen"; - req_access = list(28) - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/item/weapon/reagent_containers/food/snacks/mint, +/obj/item/weapon/reagent_containers/glass/beaker{ + pixel_x = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bdb" = ( @@ -32157,10 +32127,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bdy" = ( @@ -32208,18 +32178,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"bdE" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "bdF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -32331,9 +32289,6 @@ /area/crew_quarters/bar) "bdR" = ( /obj/structure/kitchenspike, -/obj/machinery/camera/network/civilian{ - dir = 9 - }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "bdS" = ( @@ -32466,15 +32421,21 @@ /area/crew_quarters/barrestroom) "bej" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23; + pixel_y = 22 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bek" = ( @@ -32487,6 +32448,9 @@ /obj/item/device/radio/intercom{ pixel_y = -25 }, +/obj/machinery/vending/dinnerware{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bel" = ( @@ -32596,11 +32560,6 @@ /area/crew_quarters/kitchen) "bev" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -32609,28 +32568,28 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start{ + name = "Chef" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bew" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/light_switch{ - pixel_x = 24 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bex" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/computer/guestpass{ + pixel_y = 23 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bey" = ( @@ -32658,6 +32617,8 @@ /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/standard, +/obj/machinery/microwave, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "beA" = ( @@ -32712,8 +32673,8 @@ /area/hydroponics) "beF" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -32741,9 +32702,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "beI" = ( @@ -32919,7 +32878,7 @@ "bfb" = ( /obj/machinery/door/airlock/freezer{ name = "Service"; - req_access = list(28) + req_one_access = list(35,28) }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -32938,18 +32897,13 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bfe" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/camera/network/civilian{ - dir = 1 +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -25 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -33045,13 +32999,10 @@ /area/tether/surfacebase/servicebackroom) "bfn" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/table/standard, +/obj/machinery/reagentgrinder, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -33409,6 +33360,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, +/obj/machinery/camera/network/civilian{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bga" = ( @@ -33442,7 +33396,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bgf" = ( -/obj/machinery/camera/network/civilian, +/obj/item/frame/noticeboard{ + pixel_y = 26 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgg" = ( @@ -33517,12 +33473,22 @@ /area/tether/surfacebase/southhall) "bgn" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/table/standard, +/obj/item/weapon/storage/box/beakers{ + name = "box of measuring cups"; + pixel_x = 2; + pixel_y = 3; + starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgo" = ( @@ -33533,41 +33499,51 @@ /area/tether/surfacebase/entertainment/stage) "bgp" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) -"bgq" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/structure/table/standard, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"bgr" = ( -/obj/effect/floor_decal/corner/grey/diagonal, +"bgq" = ( /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/appliance/cooker/oven, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) +"bgr" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/machinery/appliance/cooker/grill, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgs" = ( -/obj/machinery/hologram/holopad, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/standard, +/obj/item/weapon/packageWrap, +/obj/item/device/destTagger{ + pixel_x = 4; + pixel_y = 3 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgt" = ( @@ -33588,6 +33564,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/alarm{ + pixel_y = 25 + }, +/obj/item/weapon/tool/wrench, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgu" = ( @@ -33619,9 +33599,6 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/sink/kitchen{ - pixel_y = 28 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgy" = ( @@ -35627,14 +35604,14 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; - id = "shuttle blast"; + id = "tourbus_windows"; name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/eris/under, /area/shuttle/tourbus/general) "bkO" = ( @@ -37192,6 +37169,23 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) +"bsa" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "kitchen"; + layer = 3.3; + name = "Kitchen Shutters" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/chemical_dispenser/bar_soft/full{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bsb" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -37338,6 +37332,13 @@ dir = 4 }, /obj/effect/map_helper/airlock/door/simple, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/tourbus/general) "cbn" = ( @@ -37494,6 +37495,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"cGs" = ( +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/bar) "cGt" = ( /obj/structure/cable/green{ d1 = 4; @@ -37685,15 +37689,15 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; dir = 4; icon_state = "pdoor0"; - id = "shuttle blast"; + id = "tourbus_windows"; name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/eris/under, /area/shuttle/tourbus/cockpit) "dgA" = ( @@ -38283,15 +38287,6 @@ }, /turf/simulated/wall, /area/tether/surfacebase/medical/storage) -"fNt" = ( -/obj/structure/cable/green{ - dir = 1 - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/steel_dirty, -/area/shuttle/tourbus/engines) "fNA" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/floor_decal/borderfloor{ @@ -38626,6 +38621,12 @@ /obj/machinery/computer/operating, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) +"hfN" = ( +/obj/machinery/camera/network/civilian{ + dir = 4 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "hgf" = ( /obj/machinery/door/firedoor/glass/hidden{ dir = 2 @@ -38995,6 +38996,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) +"iOL" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/uppernorthstairwell{ + name = "\improper North Medical Stairwell" + }) "iQr" = ( /obj/machinery/hologram/holopad, /obj/effect/landmark/start{ @@ -39271,6 +39281,13 @@ req_one_access = list(19,43,67); specialfunctions = 4 }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/tourbus/general) "jPW" = ( @@ -39285,6 +39302,11 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) +"jRO" = ( +/obj/effect/floor_decal/spline/plain, +/obj/item/weapon/stool/padded, +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/bar) "jSV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -39337,6 +39359,11 @@ /obj/structure/closet/emergsuit_wall{ pixel_y = 32 }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "tourbus_windows"; + name = "window blast shields" + }, /turf/simulated/floor/tiled/eris/white/orangecorner, /area/shuttle/tourbus/cockpit) "keg" = ( @@ -39443,11 +39470,6 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "kun" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; - req_access = list(67) - }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, @@ -39524,8 +39546,9 @@ }, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/portable_atmospherics/canister/phoron, -/obj/structure/window/reinforced{ - dir = 1 +/obj/machinery/door/window/southleft{ + dir = 1; + req_one_access = list(19,43,67) }, /turf/simulated/floor/tiled/eris/dark/bluecorner, /area/shuttle/tourbus/engines) @@ -40290,6 +40313,13 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) +"nXZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "nYB" = ( /obj/structure/cable/green{ d1 = 1; @@ -40482,6 +40512,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"oII" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "oIJ" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -40975,6 +41012,14 @@ /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/structure/window/reinforced, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/engines) "qoL" = ( @@ -41235,6 +41280,14 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) +"rBz" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "rCt" = ( /obj/structure/closet/lawcloset, /obj/effect/floor_decal/spline/plain{ @@ -41414,6 +41467,21 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"soG" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/landmark/start{ + name = "Chef" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) +"sts" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/foodcart, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "suT" = ( /obj/structure/cable/green{ d1 = 4; @@ -41488,13 +41556,13 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/door/window/southleft{ - dir = 1; - req_one_access = list(19,43,67) - }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 9 }, +/obj/machinery/door/window/southright{ + dir = 1; + req_one_access = list(19,43,67) + }, /turf/simulated/floor/tiled/eris/dark/bluecorner, /area/shuttle/tourbus/engines) "sJv" = ( @@ -42437,6 +42505,20 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor, /area/tether/surfacebase/security/briefingroom) +"wju" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "kitchen"; + layer = 3.3; + name = "Kitchen Shutters" + }, +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "wlf" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -42543,16 +42625,36 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; - id = "shuttle blast"; + id = "tourbus_windows"; name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/eris/under, /area/shuttle/tourbus/general) +"wBv" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "kitchen"; + layer = 3.3; + name = "Kitchen Shutters" + }, +/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3 + }, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "wKZ" = ( /obj/effect/landmark/start{ name = "Medical Doctor" @@ -54635,7 +54737,7 @@ rbR hCB wQf tLv -fNt +qom aKU aOI aPb @@ -56119,7 +56221,7 @@ ajG ajG aag abq -abq +iOL aah aaI agj @@ -57014,7 +57116,7 @@ xUo fOj ahR arG -akH +xEB akH akH aGv @@ -57157,7 +57259,7 @@ apS ajX aZW baw -baw +baO avn avn aKx @@ -57298,8 +57400,8 @@ aXT aXT bbN aru -avp -avp +aGh +aru avp atl avd @@ -57434,12 +57536,12 @@ aqh agw apc asZ -aVy +anN aVO ate -aop -aZg -bda +ate +baB +asD baM api atf @@ -57452,10 +57554,10 @@ bfZ aHy bee aCT -aIl +cGs aHs baA -aIN +aIl aIO bgD asX @@ -57576,18 +57678,18 @@ aqi apc apc avg -aVy +anN aVO ate -aop +ate baB -aru +awv asw beF -anj +bda atO +soG anj -awc bfe avy bgf @@ -57598,7 +57700,7 @@ aIl aHB aJv aIH -aIO +jRO bcc bdM bdQ @@ -57728,10 +57830,10 @@ beu aqY anj anj +oII anj -aGh aLc -avo +wBv avz avM asX @@ -57872,7 +57974,7 @@ azZ atJ atQ bfd -awc +anj avm avz avM @@ -58007,14 +58109,14 @@ aVO bdB ayL baP -aru +avp asL bdx bez beI bgn aKu -awc +anj avo avz avM @@ -58149,14 +58251,14 @@ aVO ate aFK bbI -aru +avp aCq -beH +baq atM -atL +bgx aBx -bfn -aLc +baq +anj avo avz avM @@ -58294,11 +58396,11 @@ aru aru aKy beH -anj +bfn baq bgp baE -awc +aLc axt avA aCi @@ -58432,17 +58534,17 @@ aWE aWE beE beM -aru +amY ani -bcf -bdE anj -baq -bgp -baE -awv -aru -aru +bgx +anj +bgx +nXZ +bgx +anj +wju +bsa aru bgj aET @@ -58575,16 +58677,16 @@ beC beK bcN bcg -anN +anj atA aAL -avL +anj aGi bgq bgr anj -aZX -baO +anj +anj aru avJ aIM @@ -58716,15 +58818,15 @@ aVP aVP aFS beO -amY +aru +aES +aIN +aCf +anj +bgx +nXZ baq anj -aCf -aru -bgx -anj -baE -bgs anj anj bcu @@ -58858,13 +58960,13 @@ aVy aVy aop aKm -aru -asM -anj +avL +atA +aZX aBD -aES -aGr anj +bgx +rBz bew bfp bfl @@ -59145,10 +59247,10 @@ awQ aru bgt bbm -baX -anj +bcf +bgs bch -anj +sts aru bge bfm @@ -59412,7 +59514,7 @@ acV acV axr ayK -axq +hfN atg aSy aop