diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index e687eac639..593d3cbd8b 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -396,7 +396,7 @@ to_chat(user, "Now welding the vent.") if(do_after(user, 20 * WT.toolspeed)) if(!src || !WT.isOn()) return - playsound(src.loc, WT.usesound, 50, 1) + playsound(src, WT.usesound, 50, 1) if(!welded) user.visible_message("\The [user] welds the vent shut.", "You weld the vent shut.", "You hear welding.") welded = 1 diff --git a/code/ATMOSPHERICS/pipes/simple.dm b/code/ATMOSPHERICS/pipes/simple.dm index 215f3498b7..e0f6f7d951 100644 --- a/code/ATMOSPHERICS/pipes/simple.dm +++ b/code/ATMOSPHERICS/pipes/simple.dm @@ -78,7 +78,7 @@ /obj/machinery/atmospherics/pipe/simple/proc/burst() src.visible_message("\The [src] bursts!"); - playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) + playsound(src, 'sound/effects/bang.ogg', 25, 1) var/datum/effect/effect/system/smoke_spread/smoke = new smoke.set_up(1,0, src.loc, 0) smoke.start() diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 59837bbe5f..4d92a42c35 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -97,7 +97,7 @@ atom/movable/proc/airflow_hit(atom/A) mob/airflow_hit(atom/A) for(var/mob/M in hearers(src)) M.show_message("\The [src] slams into \a [A]!",1,"You hear a loud slam!",2) - playsound(src.loc, "smash.ogg", 25, 1, -1) + playsound(src, "smash.ogg", 25, 1, -1) var/weak_amt = istype(A,/obj/item) ? A:w_class : rand(1,5) //Heheheh Weaken(weak_amt) . = ..() @@ -105,7 +105,7 @@ mob/airflow_hit(atom/A) obj/airflow_hit(atom/A) for(var/mob/M in hearers(src)) M.show_message("\The [src] slams into \a [A]!",1,"You hear a loud slam!",2) - playsound(src.loc, "smash.ogg", 25, 1, -1) + playsound(src, "smash.ogg", 25, 1, -1) . = ..() obj/item/airflow_hit(atom/A) @@ -115,7 +115,7 @@ obj/item/airflow_hit(atom/A) mob/living/carbon/human/airflow_hit(atom/A) // for(var/mob/M in hearers(src)) // M.show_message("[src] slams into [A]!",1,"You hear a loud slam!",2) - playsound(src.loc, "punch", 25, 1, -1) + playsound(src, "punch", 25, 1, -1) if (prob(33)) loc:add_blood(src) bloody_body(src) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 89e0baa087..afed5b2c54 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -308,7 +308,7 @@ var/obj/item/projectile/beam/LE = new (T) LE.icon = 'icons/effects/genetics.dmi' LE.icon_state = "eyelasers" - playsound(usr.loc, 'sound/weapons/taser2.ogg', 75, 1) + playsound(src, 'sound/weapons/taser2.ogg', 75, 1) LE.firer = src LE.preparePixelProjectile(A, src, params) LE.fire() diff --git a/code/_onclick/hud/skybox.dm b/code/_onclick/hud/skybox.dm index affeef8893..f055ea8693 100644 --- a/code/_onclick/hud/skybox.dm +++ b/code/_onclick/hud/skybox.dm @@ -49,9 +49,9 @@ if(old_z != new_z) client?.update_skybox(TRUE) -/mob/doMove() - if((. = ..())) - client?.update_skybox() +/mob/Moved() + . = ..() + client?.update_skybox() /mob/set_viewsize() . = ..() diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 954eb90c44..8f34599fba 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -98,7 +98,7 @@ avoid code duplication. This includes items that may sometimes act as a standard /obj/item/proc/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone, var/attack_modifier) user.break_cloak() if(hitsound) - playsound(loc, hitsound, 50, 1, -1) + playsound(src, hitsound, 50, 1, -1) var/power = force for(var/datum/modifier/M in user.modifiers) diff --git a/code/controllers/subsystems/mobs.dm b/code/controllers/subsystems/mobs.dm index 4f7d524a8f..8fb2bf3f89 100644 --- a/code/controllers/subsystems/mobs.dm +++ b/code/controllers/subsystems/mobs.dm @@ -42,6 +42,7 @@ SUBSYSTEM_DEF(mobs) if(!M || QDELETED(M)) mob_list -= M + continue else if(M.low_priority && !(process_z[get_z(M)])) slept_mobs++ continue diff --git a/code/controllers/subsystems/open_space.dm b/code/controllers/subsystems/open_space.dm index dfc1319009..4e96dbfda4 100644 --- a/code/controllers/subsystems/open_space.dm +++ b/code/controllers/subsystems/open_space.dm @@ -79,22 +79,6 @@ SUBSYSTEM_DEF(open_space) /datum/controller/subsystem/open_space/stat_entry(msg_prefix) return ..("T [turfs_to_process.len]") -/turf/Entered(atom/movable/AM) - . = ..() - if(GLOB.open_space_initialised && !AM.invisibility && isobj(AM)) - var/turf/T = GetAbove(src) - if(isopenspace(T)) - // log_debug("[T] ([T.x],[T.y],[T.z]) queued for update for [src].Entered([AM])") - SSopen_space.add_turf(T, 1) - -/turf/Exited(atom/movable/AM) - . = ..() - if(GLOB.open_space_initialised && !AM.invisibility && isobj(AM)) - var/turf/T = GetAbove(src) - if(isopenspace(T)) - // log_debug("[T] ([T.x],[T.y],[T.z]) queued for update for [src].Exited([AM])") - SSopen_space.add_turf(T, 1) - /obj/update_icon() . = ..() if(GLOB.open_space_initialised && !invisibility && isturf(loc)) diff --git a/code/controllers/subsystems/time_track.dm b/code/controllers/subsystems/time_track.dm index aed175ed27..239e99c0b6 100644 --- a/code/controllers/subsystems/time_track.dm +++ b/code/controllers/subsystems/time_track.dm @@ -30,8 +30,11 @@ SUBSYSTEM_DEF(time_track) time_dilation_avg_fast = MC_AVERAGE_FAST(time_dilation_avg_fast, time_dilation_current) time_dilation_avg = MC_AVERAGE(time_dilation_avg, time_dilation_avg_fast) time_dilation_avg_slow = MC_AVERAGE_SLOW(time_dilation_avg_slow, time_dilation_avg) + + log_game("TIDI: [time_dilation_current];[time_dilation_avg_fast];[time_dilation_avg];[time_dilation_avg_slow]") else first_run = FALSE + log_debug("TiDi Starting Log") last_tick_realtime = current_realtime last_tick_byond_time = current_byondtime last_tick_tickcount = current_tickcount diff --git a/code/game/antagonist/antagonist_helpers.dm b/code/game/antagonist/antagonist_helpers.dm index 10f7a75b15..ebf212f065 100644 --- a/code/game/antagonist/antagonist_helpers.dm +++ b/code/game/antagonist/antagonist_helpers.dm @@ -12,8 +12,12 @@ return FALSE if(avoid_silicons) var/datum/job/J = SSjob.get_job(player.assigned_role) - if(J.mob_type & JOB_SILICON) - return FALSE + if(J) + if(J.mob_type & JOB_SILICON) + return FALSE + else // If SSjob couldn't find a job, they don't have one yet, so the next best thing we can switch on are job preferences + if((player.current.client.prefs.job_engsec_high | player.current.client.prefs.job_engsec_med | player.current.client.prefs.job_engsec_low) & (AI | CYBORG)) // If they have ANY chance of being silicon + return FALSE return TRUE /datum/antagonist/proc/antags_are_dead() diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index d4a200d80c..f8e6351380 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -25,6 +25,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station requires_power = 1 always_unpowered = 1 dynamic_lighting = 0 + has_gravity = 0 power_light = 0 power_equip = 0 power_environ = 0 diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 2dac39e0e7..49c481be15 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -420,7 +420,7 @@ var/list/mob/living/forced_ambiance_list = new H.AdjustStunned(3) H.AdjustWeakened(3) to_chat(mob, "The sudden appearance of gravity makes you fall to the floor!") - playsound(get_turf(src), "bodyfall", 50, 1) + playsound(mob, "bodyfall", 50, 1) /area/proc/prison_break(break_lights = TRUE, open_doors = TRUE, open_blast_doors = TRUE) var/obj/machinery/power/apc/theAPC = get_apc() diff --git a/code/game/gamemodes/changeling/powers/armblade.dm b/code/game/gamemodes/changeling/powers/armblade.dm index 664e6191ae..4a84fde371 100644 --- a/code/game/gamemodes/changeling/powers/armblade.dm +++ b/code/game/gamemodes/changeling/powers/armblade.dm @@ -113,11 +113,11 @@ /obj/item/weapon/melee/changeling/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(default_parry_check(user, attacker, damage_source) && prob(defend_chance)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") - playsound(user.loc, 'sound/weapons/slash.ogg', 50, 1) + playsound(src, 'sound/weapons/slash.ogg', 50, 1) return 1 if(unique_parry_check(user, attacker, damage_source) && prob(projectile_parry_chance)) user.visible_message("\The [user] deflects [attack_text] with \the [src]!") - playsound(user.loc, 'sound/weapons/slash.ogg', 50, 1) + playsound(src, 'sound/weapons/slash.ogg', 50, 1) return 1 return 0 diff --git a/code/game/gamemodes/cult/construct_spells.dm b/code/game/gamemodes/cult/construct_spells.dm index 64c97a30f4..954361fb9f 100644 --- a/code/game/gamemodes/cult/construct_spells.dm +++ b/code/game/gamemodes/cult/construct_spells.dm @@ -537,7 +537,7 @@ proc/findNullRod(var/atom/target) new_projectile.fire() log_and_message_admins("has casted [src] at \the [hit_atom].") if(fire_sound) - playsound(get_turf(src), fire_sound, 75, 1) + playsound(src, fire_sound, 75, 1) return 1 return 0 diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 8560582ee8..827e9730da 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -35,7 +35,7 @@ throw_at(get_edge_target_turf(src, pick(alldirs)), rand(1,3), throw_speed) var/spooky = pick('sound/hallucinations/growl1.ogg', 'sound/hallucinations/growl2.ogg', 'sound/hallucinations/growl3.ogg', 'sound/hallucinations/wail.ogg') - playsound(loc, spooky, 50, 1) + playsound(src, spooky, 50, 1) return 1 diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index b9d434902e..bbf4bfb343 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -57,7 +57,7 @@ if(prob(1+ damage * 5)) visible_message("[shatter_message]") STOP_PROCESSING(SSobj, src) - playsound(get_turf(src),shatter_sound, 75, 1) + playsound(src,shatter_sound, 75, 1) isbroken = 1 density = 0 icon_state = "[initial(icon_state)]-broken" @@ -73,21 +73,21 @@ ) STOP_PROCESSING(SSobj, src) user.do_attack_animation(src) - playsound(get_turf(src),shatter_sound, 75, 1) + playsound(src,shatter_sound, 75, 1) isbroken = 1 density = 0 icon_state = "[initial(icon_state)]-broken" set_light(0) else to_chat(user, "You hit \the [src]!") - playsound(get_turf(src),impact_sound, 75, 1) + playsound(src,impact_sound, 75, 1) else if(prob(damage * 2)) to_chat(user, "You pulverize what was left of \the [src]!") qdel(src) else to_chat(user, "You hit \the [src]!") - playsound(get_turf(src),impact_sound, 75, 1) + playsound(src,impact_sound, 75, 1) /obj/structure/cult/pylon/proc/repair(mob/user as mob) if(isbroken) diff --git a/code/game/gamemodes/events/dust.dm b/code/game/gamemodes/events/dust.dm index 400ae1058d..526164cd58 100644 --- a/code/game/gamemodes/events/dust.dm +++ b/code/game/gamemodes/events/dust.dm @@ -95,7 +95,7 @@ The "dust" will damage the hull of the station causin minor hull breaches. if(!M.stat && !istype(M, /mob/living/silicon/ai)) shake_camera(M, 3, 1) if (A) - playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1) + playsound(src, 'sound/effects/meteorimpact.ogg', 40, 1) if(ismob(A)) A.ex_act(strength)//This should work for now I guess diff --git a/code/game/gamemodes/events/holidays/Christmas.dm b/code/game/gamemodes/events/holidays/Christmas.dm index ed86c4045d..e0991edaa2 100644 --- a/code/game/gamemodes/events/holidays/Christmas.dm +++ b/code/game/gamemodes/events/holidays/Christmas.dm @@ -40,7 +40,7 @@ "What do you get from eating tree decorations?\n\nTinsilitis!", "What do snowmen wear on their heads?\n\nIce caps!", "Why is Christmas just like life on ss13?\n\nYou do all the work and the fat guy gets all the credit.", - "Why doesn’t Santa have any children?\n\nBecause he only comes down the chimney.") + "Why doesn't Santa have any children?\n\nBecause he only comes down the chimney.") new /obj/item/clothing/head/festive(target.loc) user.update_icons() cracked = 1 @@ -49,7 +49,7 @@ other_half.cracked = 1 other_half.icon_state = "cracker2" target.put_in_active_hand(other_half) - playsound(user, 'sound/effects/snap.ogg', 50, 1) + playsound(src, 'sound/effects/snap.ogg', 50, 1) return 1 return ..() diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 5447431279..62406c3877 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -211,7 +211,7 @@ /obj/item/weapon/pinpointer/nukeop/proc/workdisk() if(bomb_set) //If the bomb is set, lead to the shuttle mode = 1 //Ensures worklocation() continues to work - playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) //Plays a beep + playsound(src, 'sound/machines/twobeep.ogg', 50, 1) //Plays a beep visible_message("Shuttle Locator active.") //Lets the mob holding it know that the mode has changed return //Get outta here @@ -236,7 +236,7 @@ /obj/item/weapon/pinpointer/nukeop/proc/worklocation() if(!bomb_set) mode = 0 - playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) + playsound(src, 'sound/machines/twobeep.ogg', 50, 1) visible_message("Authentication Disk Locator active.") return diff --git a/code/game/gamemodes/technomancer/devices/shield_armor.dm b/code/game/gamemodes/technomancer/devices/shield_armor.dm index c8e8130adc..7618708aad 100644 --- a/code/game/gamemodes/technomancer/devices/shield_armor.dm +++ b/code/game/gamemodes/technomancer/devices/shield_armor.dm @@ -70,7 +70,7 @@ to_chat(user, "Your shield has absorbed most of \the [damage_source].") spark_system.start() - playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) return 0 // This shield does not block all damage, so returning 0 is needed to tell the game to apply the new damage. /obj/item/clothing/suit/armor/shield/attack_self(mob/user) diff --git a/code/game/gamemodes/technomancer/devices/tesla_armor.dm b/code/game/gamemodes/technomancer/devices/tesla_armor.dm index 86d6f82b08..124e1ed1f3 100644 --- a/code/game/gamemodes/technomancer/devices/tesla_armor.dm +++ b/code/game/gamemodes/technomancer/devices/tesla_armor.dm @@ -81,4 +81,4 @@ lightning.old_style_target(target) lightning.fire() visible_message("\The [src] strikes \the [target] with lightning!") - playsound(get_turf(src), 'sound/weapons/gauss_shoot.ogg', 75, 1) \ No newline at end of file + playsound(src, 'sound/weapons/gauss_shoot.ogg', 75, 1) \ No newline at end of file diff --git a/code/game/gamemodes/technomancer/spells/audible_deception.dm b/code/game/gamemodes/technomancer/spells/audible_deception.dm index c8a66fac3c..21236e940f 100644 --- a/code/game/gamemodes/technomancer/spells/audible_deception.dm +++ b/code/game/gamemodes/technomancer/spells/audible_deception.dm @@ -75,7 +75,7 @@ /obj/item/weapon/spell/audible_deception/on_ranged_cast(atom/hit_atom, mob/living/user) var/turf/T = get_turf(hit_atom) if(selected_sound && pay_energy(200)) - playsound(T, selected_sound, 80, 1, -1) + playsound(hit_atom, selected_sound, 80, 1, -1) adjust_instability(1) // Air Horn time. if(selected_sound == 'sound/items/AirHorn.ogg' && pay_energy(3800)) diff --git a/code/game/gamemodes/technomancer/spells/instability_tap.dm b/code/game/gamemodes/technomancer/spells/instability_tap.dm index 13a2b5e318..ad2c72518b 100644 --- a/code/game/gamemodes/technomancer/spells/instability_tap.dm +++ b/code/game/gamemodes/technomancer/spells/instability_tap.dm @@ -26,5 +26,5 @@ else core.give_energy(amount) adjust_instability(50) - playsound(get_turf(src), 'sound/effects/supermatter.ogg', 75, 1) + playsound(src, 'sound/effects/supermatter.ogg', 75, 1) qdel(src) \ No newline at end of file diff --git a/code/game/gamemodes/technomancer/spells/oxygenate.dm b/code/game/gamemodes/technomancer/spells/oxygenate.dm index 61c6367260..b36f17c726 100644 --- a/code/game/gamemodes/technomancer/spells/oxygenate.dm +++ b/code/game/gamemodes/technomancer/spells/oxygenate.dm @@ -29,5 +29,5 @@ if(pay_energy(1500)) T.assume_gas("oxygen", 200) T.assume_gas("nitrogen", 800) - playsound(src.loc, 'sound/effects/spray.ogg', 50, 1, -3) + playsound(src, 'sound/effects/spray.ogg', 50, 1, -3) adjust_instability(10) \ No newline at end of file diff --git a/code/game/gamemodes/technomancer/spells/projectile/projectile.dm b/code/game/gamemodes/technomancer/spells/projectile/projectile.dm index a52bb2e584..62ae49b0f0 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/projectile.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/projectile.dm @@ -16,7 +16,7 @@ new_projectile.fire() log_and_message_admins("has casted [src] at \the [hit_atom].") if(fire_sound) - playsound(get_turf(src), fire_sound, 75, 1) + playsound(src, fire_sound, 75, 1) adjust_instability(instability_per_shot) return 1 return 0 diff --git a/code/game/gamemodes/technomancer/spells/reflect.dm b/code/game/gamemodes/technomancer/spells/reflect.dm index 47ed0663f2..756e9e27fc 100644 --- a/code/game/gamemodes/technomancer/spells/reflect.dm +++ b/code/game/gamemodes/technomancer/spells/reflect.dm @@ -60,7 +60,7 @@ P.damage = P.damage * 1.5 spark_system.start() - playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) // now send a log so that admins don't think they're shooting themselves on purpose. log_and_message_admins("[user] reflected [attacker]'s attack back at them.") @@ -80,7 +80,7 @@ on the same side, and hits you!") spark_system.start() - playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) log_and_message_admins("[user] reflected [attacker]'s attack back at them.") diff --git a/code/game/gamemodes/technomancer/spells/shield.dm b/code/game/gamemodes/technomancer/spells/shield.dm index 6bcbda5ec4..b11d5590b0 100644 --- a/code/game/gamemodes/technomancer/spells/shield.dm +++ b/code/game/gamemodes/technomancer/spells/shield.dm @@ -55,7 +55,7 @@ if(check_shield_arc(user, bad_arc, damage_source, attacker)) user.visible_message("\The [user]'s [src] blocks [attack_text]!") spark_system.start() - playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) adjust_instability(2) return 1 return 0 diff --git a/code/game/machinery/CableLayer.dm b/code/game/machinery/CableLayer.dm index d954a80b29..8edc131ac8 100644 --- a/code/game/machinery/CableLayer.dm +++ b/code/game/machinery/CableLayer.dm @@ -41,7 +41,7 @@ m = min(m, cable.amount) m = min(m, 30) if(m) - playsound(src.loc, O.usesound, 50, 1) + playsound(src, O.usesound, 50, 1) use_cable(m) var/obj/item/stack/cable_coil/CC = new (get_turf(src)) CC.amount = m diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index 83160969ad..bf0c8f78dd 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -116,7 +116,7 @@ /obj/machinery/alarm/proc/first_run() alarm_area = get_area(src) - area_uid = "\ref[alarm_area]" + area_uid = "\ref[alarm_area]" if(name == "alarm") name = "[alarm_area.name] Air Alarm" @@ -192,7 +192,7 @@ regulating_temperature = 1 audible_message("\The [src] clicks as it starts [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\ "You hear a click and a faint electronic hum.") - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) else //check for when we should stop adjusting temperature if(get_danger_level(target_temperature, TLV["temperature"]) || abs(environment.temperature - target_temperature) <= 0.5) @@ -200,7 +200,7 @@ regulating_temperature = 0 audible_message("\The [src] clicks quietly as it stops [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\ "You hear a click as a faint electronic humming stops.") - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) if(regulating_temperature) if(target_temperature > T0C + MAX_TEMPERATURE) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 3833c72ee4..3a012a1ccd 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -171,7 +171,7 @@ update_flag location.assume_air(air_contents) src.destroyed = 1 - playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3) + playsound(src, 'sound/effects/spray.ogg', 10, 1, -3) src.density = 0 update_icon() diff --git a/code/game/machinery/atmoalter/pump_vr.dm b/code/game/machinery/atmoalter/pump_vr.dm index ce1376503a..69be9208a1 100644 --- a/code/game/machinery/atmoalter/pump_vr.dm +++ b/code/game/machinery/atmoalter/pump_vr.dm @@ -89,7 +89,7 @@ return anchored = !anchored - playsound(get_turf(src), I.usesound, 50, 1) + playsound(src, I.usesound, 50, 1) to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") return diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index dd81a92616..219cf7801f 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -220,7 +220,7 @@ return anchored = !anchored - playsound(src.loc, I.usesound, 50, 1) + playsound(src, I.usesound, 50, 1) to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") return diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 220d9fd013..4bd89e07dc 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -164,11 +164,11 @@ processing = 1 update_icon() updateUsrDialog() - playsound(src.loc, 'sound/machines/blender.ogg', 40, 1) + playsound(src, 'sound/machines/blender.ogg', 40, 1) use_power(S * 30) sleep((S + 15) / eat_eff) processing = 0 - playsound(src.loc, 'sound/machines/biogenerator_end.ogg', 40, 1) + playsound(src, 'sound/machines/biogenerator_end.ogg', 40, 1) update_icon() else menustat = "void" diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index b5a25b24a0..43cd3e0e2d 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -285,7 +285,7 @@ /obj/machinery/organ_printer/flesh/print_organ(var/choice) var/obj/item/organ/O = ..() - playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + playsound(src, 'sound/machines/ding.ogg', 50, 1) visible_message("\The [src] dings, then spits out \a [O].") return O @@ -350,7 +350,7 @@ var/obj/item/organ/O = ..() O.robotize() O.status |= ORGAN_CUT_AWAY // robotize() resets status to 0 - playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + playsound(src, 'sound/machines/ding.ogg', 50, 1) audible_message("\The [src] dings, then spits out \a [O].") return O diff --git a/code/game/machinery/bomb_tester_vr.dm b/code/game/machinery/bomb_tester_vr.dm index fb5b2819c0..b4f3b192ed 100644 --- a/code/game/machinery/bomb_tester_vr.dm +++ b/code/game/machinery/bomb_tester_vr.dm @@ -359,11 +359,11 @@ if(cancelled) return if(simulation_results == "Error") - playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 50, 0) + playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) state("Invalid parameters.") else ping("Simulation complete!") - playsound(loc, "sound/effects/printer.ogg", 50, 1) + playsound(src, "sound/effects/printer.ogg", 50, 1) var/obj/item/weapon/paper/P = new(get_turf(src)) P.name = "Explosive Simulator printout" P.info = simulation_results diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 786761b3b1..0f209a1a99 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -21,5 +21,5 @@ // VOREStation Edit Begin /obj/machinery/button/attack_hand(obj/item/weapon/W, mob/user as mob) if(..()) return 1 - playsound(loc, 'sound/machines/button.ogg', 100, 1) + playsound(src, 'sound/machines/button.ogg', 100, 1) // VOREStation Edit End diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index ba5e1038f0..454025d425 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -158,7 +158,7 @@ user.do_attack_animation(src) user.setClickCooldown(user.get_attack_speed()) visible_message("\The [user] slashes at [src]!") - playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1) + playsound(src, 'sound/weapons/slash.ogg', 100, 1) add_hiddenprint(user) destroy() @@ -169,7 +169,7 @@ S.do_attack_animation(src) S.setClickCooldown(user.get_attack_speed()) visible_message("\The [user] [pick(S.attacktext)] \the [src]!") - playsound(src.loc, S.attack_sound, 100, 1) + playsound(src, S.attack_sound, 100, 1) add_hiddenprint(user) destroy() ..() @@ -183,7 +183,7 @@ panel_open = !panel_open user.visible_message("[user] screws the camera's panel [panel_open ? "open" : "closed"]!", "You screw the camera's panel [panel_open ? "open" : "closed"].") - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) else if((W.is_wirecutter() || istype(W, /obj/item/device/multitool)) && panel_open) interact(user) @@ -258,7 +258,7 @@ if (istype(W, /obj/item)) //is it even possible to get into attackby() with non-items? var/obj/item/I = W if (I.hitsound) - playsound(loc, I.hitsound, 50, 1, -1) + playsound(src, I.hitsound, 50, 1, -1) take_damage(W.force) else @@ -278,7 +278,7 @@ visible_message(" [user] has deactivated [src]!") else visible_message(" [src] clicks and shuts down. ") - playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) + playsound(src, 'sound/items/Wirecutter.ogg', 100, 1) icon_state = "[initial(icon_state)]1" add_hiddenprint(user) else @@ -286,7 +286,7 @@ visible_message(" [user] has reactivated [src]!") else visible_message(" [src] clicks and reactivates itself. ") - playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) + playsound(src, 'sound/items/Wirecutter.ogg', 100, 1) icon_state = initial(icon_state) add_hiddenprint(user) @@ -308,7 +308,7 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, loc) spark_system.start() - playsound(loc, "sparks", 50, 1) + playsound(src, "sparks", 50, 1) /obj/machinery/camera/proc/set_status(var/newstatus) if (status != newstatus) @@ -404,7 +404,7 @@ // Do after stuff here to_chat(user, "You start to weld [src]..") - playsound(src.loc, WT.usesound, 50, 1) + playsound(src, WT.usesound, 50, 1) WT.eyecheck(user) busy = 1 if(do_after(user, 100 * WT.toolspeed)) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 759a09107a..17f82629d4 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -78,7 +78,7 @@ if(3) // State 3 if(W.is_screwdriver()) - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) var/input = sanitize(input(usr, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: "+using_map.station_short+",Security,Secret ", "Set Network", camera_network ? camera_network : NETWORK_DEFAULT)) if(!input) @@ -118,7 +118,7 @@ else if(W.is_wirecutter()) new/obj/item/stack/cable_coil(get_turf(src), 2) - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) to_chat(user, "You cut the wires from the circuits.") state = 2 return @@ -161,7 +161,7 @@ return 0 to_chat(user, "You start to weld the [src]..") - playsound(src.loc, WT.usesound, 50, 1) + playsound(src, WT.usesound, 50, 1) WT.eyecheck(user) busy = 1 if(do_after(user, 20 * WT.toolspeed)) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index e5fec765ca..2c6a5d34e6 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -201,7 +201,7 @@ return else if((occupant.health >= heal_level || occupant.health == occupant.getMaxHealth()) && (!eject_wait)) - playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + playsound(src, 'sound/machines/ding.ogg', 50, 1) audible_message("\The [src] signals that the cloning process is complete.") connected_message("Cloning Process Complete.") locked = 0 diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 8a88948ee0..397366c6c2 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -15,7 +15,7 @@ switch(state) if(0) if(P.is_wrench()) - playsound(loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) to_chat(user, "You wrench the frame into place.") anchored = 1 @@ -25,7 +25,7 @@ if(!WT.isOn()) to_chat(user, "The welder must be on for this task.") return - playsound(loc, WT.usesound, 50, 1) + playsound(src, WT.usesound, 50, 1) if(do_after(user, 20 * WT.toolspeed)) if(!src || !WT.remove_fuel(0, user)) return to_chat(user, "You deconstruct the frame.") @@ -33,25 +33,25 @@ qdel(src) if(1) if(P.is_wrench()) - playsound(loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) to_chat(user, "You unfasten the frame.") anchored = 0 state = 0 if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit) - playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You place the circuit board inside the frame.") icon_state = "1" circuit = P user.drop_item() P.loc = src if(P.is_screwdriver() && circuit) - playsound(loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You screw the circuit board into place.") state = 2 icon_state = "2" if(P.is_crowbar() && circuit) - playsound(loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You remove the circuit board.") state = 1 icon_state = "0" @@ -59,7 +59,7 @@ circuit = null if(2) if(P.is_screwdriver() && circuit) - playsound(loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You unfasten the circuit board.") state = 1 icon_state = "1" @@ -69,7 +69,7 @@ to_chat(user, "You need five coils of wire to add them to the frame.") return to_chat(user, "You start to add cables to the frame.") - playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if (do_after(user, 20) && state == 2) if (C.use(5)) state = 3 @@ -81,7 +81,7 @@ if (brain) to_chat(user, "Get that brain out of there first") else - playsound(loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You remove the cables.") state = 2 icon_state = "2" @@ -94,7 +94,7 @@ to_chat(user, "You need two sheets of glass to put in the glass panel.") return to_chat(user, "You start to put in the glass panel.") - playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if (do_after(user, 20) && state == 3) if(RG.use(2)) to_chat(user, "You put in the glass panel.") @@ -146,7 +146,7 @@ icon_state = "3b" if(P.is_crowbar() && brain) - playsound(loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You remove the brain.") brain.loc = loc brain = null @@ -154,7 +154,7 @@ if(4) if(P.is_crowbar()) - playsound(loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You remove the glass panel.") state = 3 if (brain) @@ -165,7 +165,7 @@ return if(P.is_screwdriver()) - playsound(loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You connect the monitor.") if(!brain) var/open_for_latejoin = alert(user, "Would you like this core to be open for latejoining AIs?", "Latejoin", "Yes", "Yes", "No") == "Yes" diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 960ce3dc35..054c9c2cc3 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -14,7 +14,7 @@ switch(state) if(0) if(P.is_wrench()) - playsound(src.loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) to_chat(user, "You wrench the frame into place.") src.anchored = 1 @@ -24,7 +24,7 @@ if(!WT.remove_fuel(0, user)) to_chat(user, "The welding tool must be on to complete this task.") return - playsound(src.loc, WT.usesound, 50, 1) + playsound(src, WT.usesound, 50, 1) if(do_after(user, 20 * WT.toolspeed)) if(!src || !WT.isOn()) return to_chat(user, "You deconstruct the frame.") @@ -32,7 +32,7 @@ qdel(src) if(1) if(P.is_wrench()) - playsound(src.loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) to_chat(user, "You unfasten the frame.") src.anchored = 0 @@ -40,7 +40,7 @@ if(istype(P, /obj/item/weapon/circuitboard) && !circuit) var/obj/item/weapon/circuitboard/B = P if(B.board_type == "computer") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You place the circuit board inside the frame.") src.icon_state = "1" src.circuit = P @@ -49,12 +49,12 @@ else to_chat(user, "This frame does not accept circuit boards of this type!") if(P.is_screwdriver() && circuit) - playsound(src.loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You screw the circuit board into place.") src.state = 2 src.icon_state = "2" if(P.is_crowbar()) && circuit) - playsound(src.loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You remove the circuit board.") src.state = 1 src.icon_state = "0" @@ -62,7 +62,7 @@ src.circuit = null if(2) if(P.is_screwdriver() && circuit) - playsound(src.loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You unfasten the circuit board.") src.state = 1 src.icon_state = "1" @@ -72,7 +72,7 @@ to_chat(user, "You need five coils of wire to add them to the frame.") return to_chat(user, "You start to add cables to the frame.") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20) && state == 2) if (C.use(5)) to_chat(user, "You add cables to the frame.") @@ -80,7 +80,7 @@ icon_state = "3" if(3) if(P.is_wirecutter()) - playsound(src.loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You remove the cables.") src.state = 2 src.icon_state = "2" @@ -92,7 +92,7 @@ if (G.get_amount() < 2) to_chat(user, "You need two sheets of glass to put in the glass panel.") return - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You start to put in the glass panel.") if(do_after(user, 20) && state == 3) if (G.use(2)) @@ -101,13 +101,13 @@ src.icon_state = "4" if(4) if(P.is_crowbar()) - playsound(src.loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You remove the glass panel.") src.state = 3 src.icon_state = "3" new /obj/item/stack/material/glass( src.loc, 2 ) if(P.is_screwdriver()) - playsound(src.loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You connect the monitor.") var/B = new src.circuit.build_path ( src.loc ) src.circuit.construct(B) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 441970a8cb..dbd5ba8383 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -51,7 +51,7 @@ /* /obj/machinery/computer/pod/attackby(I as obj, user as mob) if(I.is_screwdriver()) - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) if(do_after(user, 20)) if(stat & BROKEN) to_chat(user, "The broken glass falls out.") diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index aa9c230e22..3717da58c5 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -33,7 +33,7 @@ if (C.get_amount() < 5) to_chat(user, "You need five lengths of cable to add them to the frame.") return - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You start to add cables to the frame.") if(do_after(user, 20) && state == 1) if(C.use(5)) @@ -50,7 +50,7 @@ if(istype(P, /obj/item/weapon/circuitboard)) var/obj/item/weapon/circuitboard/B = P if(B.board_type == "machine") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You add the circuit board to the frame.") circuit = P user.drop_item() @@ -72,7 +72,7 @@ to_chat(user, "This frame does not accept circuit boards of this type!") else if(P.is_wirecutter()) - playsound(src.loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You remove the cables.") state = 1 icon_state = "box_0" @@ -103,7 +103,7 @@ component_check = 0 break if(component_check) - playsound(src.loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) var/obj/machinery/new_machine = new src.circuit.build_path(src.loc, src.dir) if(new_machine.component_parts) @@ -131,7 +131,7 @@ if(istype(P, /obj/item)) for(var/I in req_components) if(istype(P, text2path(I)) && (req_components[I] > 0)) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(P.is_cable_coil)) var/obj/item/stack/cable_coil/CP = P if(CP.get_amount() > 1) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 42725bbe28..05eb9c322c 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -57,7 +57,7 @@ Barricades if("brute") health -= W.force * 0.75 if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD))) - playsound(loc, 'sound/effects/woodcutting.ogg', 100, 1) + playsound(src, 'sound/effects/woodcutting.ogg', 100, 1) else playsound(src, 'sound/weapons/smash.ogg', 50, 1) CheckHealth() @@ -76,9 +76,9 @@ Barricades /obj/structure/barricade/attack_generic(var/mob/user, var/damage, var/attack_verb) visible_message("[user] [attack_verb] the [src]!") if(material == get_material_by_name("resin")) - playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) + playsound(src, 'sound/effects/attackblob.ogg', 100, 1) else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD))) - playsound(loc, 'sound/effects/woodcutting.ogg', 100, 1) + playsound(src, 'sound/effects/woodcutting.ogg', 100, 1) else playsound(src, 'sound/weapons/smash.ogg', 50, 1) user.do_attack_animation(src) diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 18e0678fcf..958101a3b9 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -31,7 +31,7 @@ if(req_access.len || req_one_access.len) req_access = list() req_one_access = list() - playsound(src.loc, "sparks", 100, 1) + playsound(src, "sparks", 100, 1) return 1 /obj/machinery/button/remote/attack_hand(mob/user as mob) diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm index 9df92aa209..3c453682b7 100644 --- a/code/game/machinery/doorbell_vr.dm +++ b/code/game/machinery/doorbell_vr.dm @@ -20,7 +20,7 @@ if(inoperable()) return use_power(active_power_usage) - playsound(src.loc, chime_sound, 75) + playsound(src, chime_sound, 75) icon_state = "dbchime-active" set_light(2, 0.5, "#33FF33") visible_message("\The [src]'s light flashes.") @@ -139,7 +139,7 @@ to_chat(user, "You save the data in \the [M]'s buffer.") else if(W.is_wrench()) to_chat(user, "You start to unwrench \the [src].") - playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) + playsound(src, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 15) && !QDELETED(src)) to_chat(user, "You unwrench \the [src].") new /obj/item/frame/doorbell(src.loc) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 2a14c17bdb..ee66c2172a 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -81,7 +81,7 @@ if(do_after(user,5 SECONDS,src)) visible_message("\The [user] forces \the [src] open, sparks flying from its electronics!") src.do_animate("spark") - playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1) src.locked = 0 src.welded = 0 update_icon() @@ -90,7 +90,7 @@ else if(src.density) visible_message("\The [user] begins forcing \the [src] open!") if(do_after(user, 5 SECONDS,src)) - playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1) visible_message("\The [user] forces \the [src] open!") open(1) else @@ -946,7 +946,7 @@ About the new airlock wires panel: src.welded = 1 else src.welded = null - playsound(src.loc, C.usesound, 75, 1) + playsound(src, C.usesound, 75, 1) src.update_icon() return else @@ -1066,9 +1066,9 @@ About the new airlock wires panel: //if the door is unpowered then it doesn't make sense to hear the woosh of a pneumatic actuator if(arePowerSystemsOn()) - playsound(src.loc, open_sound_powered, 50, 1) + playsound(src, open_sound_powered, 50, 1) else - playsound(src.loc, open_sound_unpowered, 75, 1) + playsound(src, open_sound_unpowered, 75, 1) if(src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density) src.closeOther.close() @@ -1150,7 +1150,7 @@ About the new airlock wires panel: for(var/atom/movable/AM in turf) if(AM.blocks_airlock()) if(!has_beeped) - playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0) + playsound(src, 'sound/machines/buzz-two.ogg', 50, 0) has_beeped = 1 autoclose_in(6) return @@ -1163,9 +1163,9 @@ About the new airlock wires panel: use_power(360) //360 W seems much more appropriate for an actuator moving an industrial door capable of crushing people has_beeped = 0 if(arePowerSystemsOn()) - playsound(src.loc, close_sound_powered, 50, 1) + playsound(src, close_sound_powered, 50, 1) else - playsound(src.loc, open_sound_unpowered, 75, 1) + playsound(src, open_sound_unpowered, 75, 1) for(var/turf/turf in locs) var/obj/structure/window/killthis = (locate(/obj/structure/window) in turf) if(killthis) diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index 5ff587a7d9..136b793f10 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -100,7 +100,7 @@ // Description: Opens or closes the door, depending on current state. No checks are done inside this proc. /obj/machinery/door/blast/proc/force_toggle(var/forced = 0, mob/user as mob) if (forced) - playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1) if(src.density) src.force_open() @@ -150,7 +150,7 @@ user.visible_message("\The [user] hits \the [src] with \the [W] with no visible effect.") else user.visible_message("\The [user] forcefully strikes \the [src] with \the [W]!") - playsound(src.loc, hitsound, 100, 1) + playsound(src, hitsound, 100, 1) take_damage(W.force*0.35) //it's a blast door, it should take a while. -Luke return @@ -180,7 +180,7 @@ user.visible_message("\The [user] hits \the [src] with \the [W] with no visible effect.") else user.visible_message("\The [user] forcefully strikes \the [src] with \the [W]!") - playsound(src.loc, hitsound, 100, 1) + playsound(src, hitsound, 100, 1) take_damage(W.force*0.15) //If the item isn't a weapon, let's make this take longer than usual to break it down. return @@ -194,13 +194,13 @@ if(src.density) visible_message("\The [user] begins forcing \the [src] open!") if(do_after(user, 15 SECONDS,src)) - playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1) visible_message("\The [user] forces \the [src] open!") force_open(1) else visible_message("\The [user] begins forcing \the [src] closed!") if(do_after(user, 5 SECONDS,src)) - playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1) visible_message("\The [user] forces \the [src] closed!") force_close(1) else diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 20f83d9de2..49a16849ea 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -201,7 +201,7 @@ tforce = 15 * (speed/5) else tforce = AM:throwforce * (speed/5) - playsound(src.loc, hitsound, 100, 1) + playsound(src, hitsound, 100, 1) take_damage(tforce) return @@ -289,7 +289,7 @@ user.visible_message("\The [user] hits \the [src] with \the [W] with no visible effect.") else user.visible_message("\The [user] forcefully strikes \the [src] with \the [W]!") - playsound(src.loc, hitsound, 100, 1) + playsound(src, hitsound, 100, 1) take_damage(W.force) return @@ -414,7 +414,7 @@ if("deny") if(density && !(stat & (NOPOWER|BROKEN))) flick("door_deny", src) - playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0) + playsound(src, 'sound/machines/buzz-two.ogg', 50, 0) return diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 29125c8500..e31465168f 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -200,14 +200,14 @@ if(src.blocked) visible_message("\The [user] begins digging into \the [src] internals!") if(do_after(user,5 SECONDS,src)) - playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1) src.blocked = 0 update_icon() open(1) else if(src.density) visible_message("\The [user] begins forcing \the [src] open!") if(do_after(user, 2 SECONDS,src)) - playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1) visible_message("\The [user] forces \the [src] open!") open(1) else diff --git a/code/game/machinery/doors/firedoor_assembly.dm b/code/game/machinery/doors/firedoor_assembly.dm index 4eeec7c5ff..aa857d5065 100644 --- a/code/game/machinery/doors/firedoor_assembly.dm +++ b/code/game/machinery/doors/firedoor_assembly.dm @@ -32,7 +32,7 @@ obj/structure/firedoor_assembly/attackby(obj/item/C, mob/user as mob) to_chat(user, "You wire \the [src].") else if(C.is_wirecutter() && wired ) - playsound(src.loc, C.usesound, 100, 1) + playsound(src, C.usesound, 100, 1) user.visible_message("[user] cuts the wires from \the [src].", "You start to cut the wires from \the [src].") if(do_after(user, 40)) @@ -43,7 +43,7 @@ obj/structure/firedoor_assembly/attackby(obj/item/C, mob/user as mob) else if(istype(C, /obj/item/weapon/circuitboard/airalarm) && wired) if(anchored) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) user.visible_message("[user] has inserted a circuit into \the [src]!", "You have inserted the circuit into \the [src]!") if(glass) @@ -56,7 +56,7 @@ obj/structure/firedoor_assembly/attackby(obj/item/C, mob/user as mob) to_chat(user, "You must secure \the [src] first!") else if(C.is_wrench()) anchored = !anchored - playsound(src.loc, C.usesound, 50, 1) + playsound(src, C.usesound, 50, 1) user.visible_message("[user] has [anchored ? "" : "un" ]secured \the [src]!", "You have [anchored ? "" : "un" ]secured \the [src]!") update_icon() @@ -86,7 +86,7 @@ obj/structure/firedoor_assembly/attackby(obj/item/C, mob/user as mob) else if(istype(C, /obj/item/stack/material) && C.get_material_name() == "rglass" && !glass) var/obj/item/stack/S = C if (S.get_amount() >= 1) - playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) + playsound(src, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [S.name] to \the [src].", "You start to install [S.name] into \the [src].") if(do_after(user, 40, src) && !glass && S.use(1)) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index f7b8a1222d..98fb1c75d8 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -115,7 +115,7 @@ if (!operating) //in case of emag operating = 1 flick(text("[src.base_state]opening"), src) - playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1) + playsound(src, 'sound/machines/windowdoor.ogg', 100, 1) sleep(10) explosion_resistance = 0 @@ -132,7 +132,7 @@ return FALSE operating = TRUE flick(text("[]closing", src.base_state), src) - playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1) + playsound(src, 'sound/machines/windowdoor.ogg', 100, 1) density = TRUE update_icon() @@ -158,7 +158,7 @@ if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user if(H.species.can_shred(H)) - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) visible_message("[user] smashes against the [src.name].", 1) user.do_attack_animation(src) user.setClickCooldown(user.get_attack_speed()) @@ -212,8 +212,8 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() - playsound(src.loc, "sparks", 50, 1) - playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, "sparks", 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) visible_message("The glass door was sliced open by [user]!") return 1 @@ -259,7 +259,7 @@ if(src.density && istype(I, /obj/item/weapon) && !istype(I, /obj/item/weapon/card)) user.setClickCooldown(user.get_attack_speed(I)) var/aforce = I.force - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) visible_message("[src] was hit by [I].") if(I.damtype == BRUTE || I.damtype == BURN) take_damage(aforce) diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm index 82237b32ea..388b834e82 100644 --- a/code/game/machinery/fire_alarm.dm +++ b/code/game/machinery/fire_alarm.dm @@ -208,7 +208,7 @@ FIRE ALARM for(var/obj/machinery/firealarm/FA in area) fire_alarm.triggerAlarm(loc, FA, duration, hidden = alarms_hidden) update_icon() - playsound(src.loc, 'sound/machines/airalarm.ogg', 25, 0, 4) + playsound(src, 'sound/machines/airalarm.ogg', 25, 0, 4) return /obj/machinery/firealarm/proc/set_security_level(var/newlevel) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 169fc6386c..ad82ffd656 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -56,7 +56,7 @@ if((disable) || (last_flash && world.time < last_flash + 150)) return - playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1) + playsound(src, 'sound/weapons/flash.ogg', 100, 1) flick("[base_state]_flash", src) last_flash = world.time use_power(1500) diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm index c494782ce1..0a3f13fedc 100644 --- a/code/game/machinery/floor_light.dm +++ b/code/game/machinery/floor_light.dm @@ -31,7 +31,7 @@ var/list/floor_light_cache = list() if(!WT.remove_fuel(0, user)) to_chat(user, "\The [src] must be on to complete this task.") return - playsound(src.loc, WT.usesound, 50, 1) + playsound(src, WT.usesound, 50, 1) if(!do_after(user, 20 * WT.toolspeed)) return if(!src || !WT.isOn()) @@ -53,7 +53,7 @@ var/list/floor_light_cache = list() stat |= BROKEN else visible_message("\The [user] attacks \the [src]!") - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) if(isnull(damaged)) damaged = 0 update_brightness() return diff --git a/code/game/machinery/frame.dm b/code/game/machinery/frame.dm index d77e2dff7a..bcb69d7c79 100644 --- a/code/game/machinery/frame.dm +++ b/code/game/machinery/frame.dm @@ -284,7 +284,7 @@ if(P.is_wrench()) if(state == FRAME_PLACED && !anchored) to_chat(user, "You start to wrench the frame into place.") - playsound(src.loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) anchored = TRUE if(!need_circuit && circuit) @@ -305,7 +305,7 @@ if(state == FRAME_PLACED) var/obj/item/weapon/weldingtool/WT = P if(WT.remove_fuel(0, user)) - playsound(src.loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) if(src && WT.isOn()) to_chat(user, "You deconstruct the frame.") @@ -321,7 +321,7 @@ var/obj/item/weapon/circuitboard/B = P var/datum/frame/frame_types/board_type = B.board_type if(board_type.name == frame_type.name) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You place the circuit board inside the frame.") circuit = P user.drop_item() @@ -474,7 +474,7 @@ to_chat(user, "You need five coils of wire to add them to the frame.") return to_chat(user, "You start to add cables to the frame.") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20) && state == FRAME_FASTENED) if(C.use(5)) to_chat(user, "You add cables to the frame.") @@ -485,7 +485,7 @@ if(frame_type.frame_class == FRAME_CLASS_MACHINE) for(var/I in req_components) if(istype(P, I) && (req_components[I] > 0)) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CP = P if(CP.get_amount() > 1) @@ -534,7 +534,7 @@ if(G.get_amount() < 2) to_chat(user, "You need two sheets of glass to put in the glass panel.") return - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You start to put in the glass panel.") if(do_after(user, 20) && state == FRAME_WIRED) if(G.use(2)) @@ -546,7 +546,7 @@ if(G.get_amount() < 2) to_chat(user, "You need two sheets of glass to put in the glass panel.") return - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You start to put in the glass panel.") if(do_after(user, 20) && state == FRAME_WIRED) if(G.use(2)) @@ -558,7 +558,7 @@ if(frame_type.frame_class == FRAME_CLASS_MACHINE) for(var/I in req_components) if(istype(P, I) && (req_components[I] > 0)) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(istype(P, /obj/item/stack)) var/obj/item/stack/ST = P if(ST.get_amount() > 1) diff --git a/code/game/machinery/holoposter.dm b/code/game/machinery/holoposter.dm index b894c0313b..a273cc1474 100644 --- a/code/game/machinery/holoposter.dm +++ b/code/game/machinery/holoposter.dm @@ -83,7 +83,7 @@ GLOBAL_LIST_EMPTY(holoposters) if(stat & (NOPOWER)) return if (W.is_multitool()) - playsound(user.loc, 'sound/items/penclick.ogg', 60, 1) + playsound(src, 'sound/items/penclick.ogg', 60, 1) icon_state = input("Available Posters", "Holographic Poster") as null|anything in postertypes + "random" if(!Adjacent(user)) return diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 42f7b681b7..54ea37b5c6 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -217,7 +217,7 @@ StopPlaying() else if(href_list["play"]) if(emagged) - playsound(src.loc, 'sound/items/AirHorn.ogg', 100, 1) + playsound(src, 'sound/items/AirHorn.ogg', 100, 1) for(var/mob/living/carbon/M in ohearers(6, src)) if(M.get_ear_protection() >= 2) continue diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index b126376ecc..2611a418ee 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -277,7 +277,7 @@ Class Procs: text = "\The [src] pings." state(text, "blue") - playsound(src.loc, 'sound/machines/ping.ogg', 50, 0) + playsound(src, 'sound/machines/ping.ogg', 50, 0) /obj/machinery/proc/shock(mob/user, prb) if(inoperable()) @@ -342,7 +342,7 @@ Class Procs: return FALSE if(panel_open) return FALSE // Close panel first! - playsound(loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) var/actual_time = W.toolspeed * time if(actual_time != 0) user.visible_message( \ @@ -403,12 +403,12 @@ Class Procs: if(!panel_open) return 0 user.visible_message("[user] has cut the wires inside \the [src]!", "You have cut the wires inside \the [src].") - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) new/obj/item/stack/cable_coil(get_turf(src), 5) . = dismantle() /obj/machinery/proc/dismantle() - playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) + playsound(src, 'sound/items/Crowbar.ogg', 50, 1) //TFF 3/6/19 - port Cit RP fix of infinite frames. If it doesn't have a circuit board, don't create a frame. Return a smack instead. BONK! if(!circuit) return 0 diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 9fd9f74999..4c9c2f0359 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -904,7 +904,7 @@ obj/item/weapon/newspaper/Topic(href, href_list) if(curr_page == 0) //We're at the start, get to the middle screen = 1 curr_page++ - playsound(loc, "pageturn", 50, 1) + playsound(src, "pageturn", 50, 1) else if(href_list["prev_page"]) if(curr_page == 0) @@ -916,7 +916,7 @@ obj/item/weapon/newspaper/Topic(href, href_list) if(curr_page == pages+1) //we're at the end, let's go back to the middle. screen = 1 curr_page-- - playsound(src.loc, "pageturn", 50, 1) + playsound(src, "pageturn", 50, 1) if(istype(src.loc, /mob)) attack_self(src.loc) @@ -974,9 +974,9 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob) spawn(300) alert = 0 update_icon() - playsound(src.loc, 'sound/machines/twobeep.ogg', 75, 1) + playsound(src, 'sound/machines/twobeep.ogg', 75, 1) else for(var/mob/O in hearers(world.view-1, T)) O.show_message("[name] beeps, \"Attention! Wanted issue distributed!\"",2) - playsound(src.loc, 'sound/machines/warning-buzzer.ogg', 75, 1) + playsound(src, 'sound/machines/warning-buzzer.ogg', 75, 1) return diff --git a/code/game/machinery/painter_vr.dm b/code/game/machinery/painter_vr.dm index 4130194012..cc961a737f 100644 --- a/code/game/machinery/painter_vr.dm +++ b/code/game/machinery/painter_vr.dm @@ -93,12 +93,12 @@ if(href_list["paint"]) for(var/atom/movable/O in processing) O.color = activecolor - playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1) + playsound(src, 'sound/effects/spray3.ogg', 50, 1) if(href_list["clear"]) for(var/atom/movable/O in processing) O.color = initial(O.color) - playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1) + playsound(src, 'sound/effects/spray3.ogg', 50, 1) if(href_list["eject"]) for(var/atom/movable/O in processing) diff --git a/code/game/machinery/partslathe_vr.dm b/code/game/machinery/partslathe_vr.dm index 7763e28f1a..a4a027d5e4 100644 --- a/code/game/machinery/partslathe_vr.dm +++ b/code/game/machinery/partslathe_vr.dm @@ -167,7 +167,7 @@ busy = 0 update_use_power(USE_POWER_IDLE) update_icon() - playsound(src.loc, 'sound/machines/chime.ogg', 50, 0) + playsound(src, 'sound/machines/chime.ogg', 50, 0) /obj/machinery/partslathe/proc/addToQueue(var/datum/category_item/partslathe/D) queue += D diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 0004949067..c307017d8a 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -549,12 +549,12 @@ if(do_after(user, 50 * I.toolspeed)) //This code handles moving the turret around. After all, it's a portable turret! if(!anchored) - playsound(loc, I.usesound, 100, 1) + playsound(src, I.usesound, 100, 1) anchored = TRUE update_icon() to_chat(user, "You secure the exterior bolts on the turret.") else if(anchored) - playsound(loc, I.usesound, 100, 1) + playsound(src, I.usesound, 100, 1) anchored = FALSE to_chat(user, "You unsecure the exterior bolts on the turret.") update_icon() @@ -890,10 +890,10 @@ var/obj/item/projectile/A if(emagged || lethal) A = new lethal_projectile(loc) - playsound(loc, lethal_shot_sound, 75, 1) + playsound(src, lethal_shot_sound, 75, 1) else A = new projectile(loc) - playsound(loc, shot_sound, 75, 1) + playsound(src, shot_sound, 75, 1) // Lethal/emagged turrets use twice the power due to higher energy beams // Emagged turrets again use twice as much power due to higher firing rates @@ -966,14 +966,14 @@ switch(build_step) if(0) //first step if(I.is_wrench() && !anchored) - playsound(loc, I.usesound, 100, 1) + playsound(src, I.usesound, 100, 1) to_chat(user, "You secure the external bolts.") anchored = TRUE build_step = 1 return else if(I.is_crowbar() && !anchored) - playsound(loc, I.usesound, 75, 1) + playsound(src, I.usesound, 75, 1) to_chat(user, "You dismantle the turret construction.") new /obj/item/stack/material/steel(loc, 5) qdel(src) @@ -991,7 +991,7 @@ return else if(I.is_wrench()) - playsound(loc, I.usesound, 75, 1) + playsound(src, I.usesound, 75, 1) to_chat(user, "You unfasten the external bolts.") anchored = FALSE build_step = 0 @@ -999,7 +999,7 @@ if(2) if(I.is_wrench()) - playsound(loc, I.usesound, 100, 1) + playsound(src, I.usesound, 100, 1) to_chat(user, "You bolt the metal armor into place.") build_step = 3 return @@ -1012,7 +1012,7 @@ to_chat(user, "You need more fuel to complete this task.") return - playsound(loc, I.usesound, 50, 1) + playsound(src, I.usesound, 50, 1) if(do_after(user, 20 * I.toolspeed)) if(!src || !WT.remove_fuel(5, user)) return build_step = 1 @@ -1039,7 +1039,7 @@ return else if(I.is_wrench()) - playsound(loc, I.usesound, 100, 1) + playsound(src, I.usesound, 100, 1) to_chat(user, "You remove the turret's metal armor bolts.") build_step = 2 return @@ -1058,7 +1058,7 @@ if(5) if(I.is_screwdriver()) - playsound(loc, I.usesound, 100, 1) + playsound(src, I.usesound, 100, 1) build_step = 6 to_chat(user, "You close the internal access hatch.") return @@ -1076,7 +1076,7 @@ return else if(I.is_screwdriver()) - playsound(loc, I.usesound, 100, 1) + playsound(src, I.usesound, 100, 1) build_step = 5 to_chat(user, "You open the internal access hatch.") return @@ -1088,7 +1088,7 @@ if(WT.get_fuel() < 5) to_chat(user, "You need more fuel to complete this task.") - playsound(loc, WT.usesound, 50, 1) + playsound(src, WT.usesound, 50, 1) if(do_after(user, 30 * WT.toolspeed)) if(!src || !WT.remove_fuel(5, user)) return @@ -1106,7 +1106,7 @@ qdel(src) // qdel else if(I.is_crowbar()) - playsound(loc, I.usesound, 75, 1) + playsound(src, I.usesound, 75, 1) to_chat(user, "You pry off the turret's exterior armor.") new /obj/item/stack/material/steel(loc, 2) build_step = 6 diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 2b8b8aa637..db5594685e 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -84,7 +84,7 @@ return anchored = !anchored to_chat(user, "You [anchored ? "attached" : "detached"] [src].") - playsound(loc, G.usesound, 75, 1) + playsound(src, G.usesound, 75, 1) else if(default_deconstruction_screwdriver(user, G)) return else if(default_deconstruction_crowbar(user, G)) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 5f3b462452..ad0d64ae78 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -206,7 +206,7 @@ protected = 1 if(!protected) - playsound(src.loc, "sparks", 75, 1, -1) + playsound(src, "sparks", 75, 1, -1) to_chat(user, "You try to touch the controls but you get zapped. There must be a short circuit somewhere.") return*/ else //welp, the guy is protected, we can continue @@ -232,7 +232,7 @@ protected = 1 if(!protected) - playsound(src.loc, "sparks", 75, 1, -1) + playsound(src, "sparks", 75, 1, -1) to_chat(user, "You try to touch the controls but you get zapped. There must be a short circuit somewhere.") return*/ else @@ -1068,6 +1068,22 @@ if("Gem-Encrusted" || "Wizard") parent_helmet = /obj/item/clothing/head/helmet/space/void/wizard parent_suit = /obj/item/clothing/suit/space/void/wizard + //Special or Event suits + if("Vintage Crew") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb + parent_suit = /obj/item/clothing/suit/space/void/refurb + if("Vintage Engineering") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/engineering + parent_suit = /obj/item/clothing/suit/space/void/refurb/engineering + if("Vintage Medical") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/medical + parent_suit = /obj/item/clothing/suit/space/void/refurb/medical + if("Vintage Marine") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/marine + parent_suit = /obj/item/clothing/suit/space/void/refurb/marine + if("Vintage Officer") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/officer + parent_suit = /obj/item/clothing/suit/space/void/refurb/officer //BEGIN: Space for additional downstream variants //VOREStation Addition Start if("Director") @@ -1076,6 +1092,21 @@ if("Prototype") parent_helmet = /obj/item/clothing/head/helmet/space/void/merc/prototype parent_suit = /obj/item/clothing/suit/space/void/merc/prototype + if("Talon Crew") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/talon + parent_suit = /obj/item/clothing/suit/space/void/refurb/talon + if("Talon Engineering") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/engineering/talon + parent_suit = /obj/item/clothing/suit/space/void/refurb/engineering/talon + if("Talon Medical") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/medical/talon + parent_suit = /obj/item/clothing/suit/space/void/refurb/medical/talon + if("Talon Marine") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/marine/talon + parent_suit = /obj/item/clothing/suit/space/void/refurb/marine/talon + if("Talon Officer") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/officer/talon + parent_suit = /obj/item/clothing/suit/space/void/refurb/officer/talon //VOREStation Addition End //END: downstream variant space diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index a6c0ddba0a..0459b90b0e 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -29,3 +29,42 @@ /obj/machinery/suit_cycler/prototype/Initialize() //No Teshari Sprites species -= SPECIES_TESHARI return ..() + +/obj/machinery/suit_cycler/vintage + name = "Vintage suit cycler" + model_text = "Vintage" + departments = list("Vintage Crew","Vintage Engineering","Vintage Marine","Vintage Medical","Vintage Officer") + +/obj/machinery/suit_cycler/vintage/Initialize() //No Teshari Sprites + species -= SPECIES_TESHARI + return ..() + +/obj/machinery/suit_cycler/vintage/tcrew + name = "Talon crew suit cycler" + model_text = "Talon crew" + req_access = list(access_talon) + departments = list("Talon Crew") + +/obj/machinery/suit_cycler/vintage/tengi + name = "Talon engineer suit cycler" + model_text = "Talon engineer" + req_access = list(access_talon) + departments = list("Talon Engineering") + +/obj/machinery/suit_cycler/vintage/tguard + name = "Talon guard suit cycler" + model_text = "Talon guard" + req_access = list(access_talon) + departments = list("Talon Marine") + +/obj/machinery/suit_cycler/vintage/tmedic + name = "Talon doctor suit cycler" + model_text = "Talon doctor" + req_access = list(access_talon) + departments = list("Talon Medical") + +/obj/machinery/suit_cycler/vintage/tcaptain + name = "Talon captain suit cycler" + model_text = "Talon captain" + req_access = list(access_talon) + departments = list("Talon Officer") \ No newline at end of file diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index f04cf7076a..8cd1d8811e 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -192,7 +192,7 @@ /obj/machinery/computer/telecomms/server/emag_act(var/remaining_charges, var/mob/user) if(!emagged) - playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) + playsound(src, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 to_chat(user, "You you disable the security protocols") src.updateUsrDialog() diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index 819108b2ce..51a6ebf991 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -127,7 +127,7 @@ /obj/machinery/computer/telecomms/monitor/emag_act(var/remaining_charges, var/mob/user) if(!emagged) - playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) + playsound(src, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 to_chat(user, "You you disable the security protocols") src.updateUsrDialog() diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 686a764ada..51c09d95e3 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -210,7 +210,7 @@ /obj/machinery/computer/telecomms/traffic/emag_act(var/remaining_charges, var/mob/user) if(!emagged) - playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) + playsound(src, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 to_chat(user, "You you disable the security protocols") src.updateUsrDialog() diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index c9c8ba20ae..621feae713 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -28,14 +28,14 @@ if(stat & (BROKEN|NOPOWER)) return if(!transform_dead && H.stat == DEAD) - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) return - playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) + playsound(src, 'sound/items/Welder.ogg', 50, 1) use_power(5000) // Use a lot of power. var/mob/living/silicon/robot = H.Robotize() robot.SetLockDown() spawn(50) // So he can't jump out the gate right away. - playsound(src.loc, 'sound/machines/ping.ogg', 50, 0) + playsound(src, 'sound/machines/ping.ogg', 50, 0) if(robot) robot.SetLockDown(0) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 780ff1fb14..cf2bec70ca 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -252,7 +252,7 @@ */ /obj/machinery/vending/proc/pay_with_ewallet(var/obj/item/weapon/spacecash/ewallet/wallet) visible_message("\The [usr] swipes \the [wallet] through \the [src].") - playsound(src.loc, 'sound/machines/id_swipe.ogg', 50, 1) + playsound(src, 'sound/machines/id_swipe.ogg', 50, 1) if(currently_vending.price > wallet.worth) status_message = "Insufficient funds on chargecard." status_error = 1 @@ -273,7 +273,7 @@ visible_message("\The [usr] swipes \the [I] through \the [src].") else visible_message("\The [usr] swipes \the [ID_container] through \the [src].") - playsound(src.loc, 'sound/machines/id_swipe.ogg', 50, 1) + playsound(src, 'sound/machines/id_swipe.ogg', 50, 1) var/datum/money_account/customer_account = get_account(I.associated_account_number) if(!customer_account) status_message = "Error: Unable to access account. Please contact technical support if problem persists." @@ -429,7 +429,7 @@ if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH to_chat(usr, "Access denied.") //Unless emagged of course flick("[icon_state]-deny",src) - playsound(src.loc, 'sound/machines/deniedbeep.ogg', 50, 0) + playsound(src, 'sound/machines/deniedbeep.ogg', 50, 0) return var/key = text2num(href_list["vend"]) @@ -466,7 +466,7 @@ if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH to_chat(usr, "Access denied.") //Unless emagged of course flick("[icon_state]-deny",src) - playsound(src.loc, 'sound/machines/deniedbeep.ogg', 50, 0) + playsound(src, 'sound/machines/deniedbeep.ogg', 50, 0) return vend_ready = 0 //One thing at a time!! status_message = "Vending..." @@ -505,7 +505,7 @@ sleep(3) if(R.get_product(get_turf(src))) visible_message("\The [src] clunks as it vends an additional item.") - playsound(src.loc, "sound/[vending_sound]", 100, 1, 1) + playsound(src, "sound/[vending_sound]", 100, 1, 1) status_message = "" status_error = 0 diff --git a/code/game/mecha/combat/fighter.dm b/code/game/mecha/combat/fighter.dm index 5b04451dce..9d0fd7cfbf 100644 --- a/code/game/mecha/combat/fighter.dm +++ b/code/game/mecha/combat/fighter.dm @@ -164,7 +164,7 @@ else if(moved && gravity && !ground_capable) occupant_message("Collision alert! Vehicle not rated for use in gravity!") take_damage(NOGRAV_FIGHTER_DAMAGE, "brute") - playsound(loc, 'sound/effects/grillehit.ogg', 50, 1) + playsound(src, 'sound/effects/grillehit.ogg', 50, 1) /obj/mecha/combat/fighter/handle_equipment_movement() . = ..() diff --git a/code/game/mecha/combat/gorilla.dm b/code/game/mecha/combat/gorilla.dm index 2d5456953f..81a70b4b6d 100644 --- a/code/game/mecha/combat/gorilla.dm +++ b/code/game/mecha/combat/gorilla.dm @@ -192,7 +192,7 @@ HONK Blaster and a pulse cannon protected by projectile armor and powered by a b src.occupant_message("Zoom mode [zoom?"en":"dis"]abled.") if(zoom) src.occupant.set_viewsize(12) - src.occupant << sound('sound/mecha/imag_enh.ogg',volume=50) + playsound(src, 'sound/mecha/imag_enh.ogg',50) else src.occupant.set_viewsize() // Reset to default return diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 56a2169b06..678ac64910 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -32,7 +32,7 @@ sleep(equip_cooldown) set_ready_state(1) if(ready_sound) //Kind of like the kinetic accelerator. - playsound(loc, ready_sound, 50, 1, -1) + playsound(src, ready_sound, 50, 1, -1) if(target && chassis) return 1 return 0 diff --git a/code/game/mecha/equipment/tools/clamp.dm b/code/game/mecha/equipment/tools/clamp.dm index a587d89568..6091764c2b 100644 --- a/code/game/mecha/equipment/tools/clamp.dm +++ b/code/game/mecha/equipment/tools/clamp.dm @@ -33,7 +33,7 @@ if(FD.blocked) FD.visible_message("\The [chassis] begins prying on \the [FD]!") if(do_after(chassis.occupant,10 SECONDS,FD)) - playsound(FD.loc, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(FD, 'sound/machines/airlock_creaking.ogg', 100, 1) FD.blocked = 0 FD.update_icon() FD.open(1) @@ -41,7 +41,7 @@ else if(FD.density) FD.visible_message("\The [chassis] begins forcing \the [FD] open!") if(do_after(chassis.occupant, 5 SECONDS,FD)) - playsound(FD.loc, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(FD, 'sound/machines/airlock_creaking.ogg', 100, 1) FD.visible_message("\The [chassis] forces \the [FD] open!") FD.open(1) else @@ -57,7 +57,7 @@ if(do_after(chassis.occupant, 15 SECONDS,AD) && chassis.Adjacent(AD)) AD.welded = FALSE AD.update_icon() - playsound(AD.loc, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(AD, 'sound/machines/airlock_creaking.ogg', 100, 1) AD.visible_message("\The [chassis] tears \the [AD] open!") if(!AD.welded) if(density) @@ -100,15 +100,15 @@ M.adjustOxyLoss(round(dam_force/2)) M.updatehealth() occupant_message("You squeeze [target] with [src.name]. Something cracks.") - playsound(src.loc, "fracture", 5, 1, -2) //CRACK + playsound(src, "fracture", 5, 1, -2) //CRACK chassis.visible_message("[chassis] squeezes [target].") else if(chassis.occupant.a_intent == I_DISARM && enable_special) - playsound(src.loc, 'sound/mecha/hydraulic.ogg', 10, 1, -2) + playsound(src, 'sound/mecha/hydraulic.ogg', 10, 1, -2) M.take_overall_damage(dam_force/2) M.adjustOxyLoss(round(dam_force/3)) M.updatehealth() occupant_message("You slam [target] with [src.name]. Something cracks.") - playsound(src.loc, "fracture", 3, 1, -2) //CRACK 2 + playsound(src, "fracture", 3, 1, -2) //CRACK 2 chassis.visible_message("[chassis] slams [target].") M.throw_at(get_step(M,get_dir(src, M)), 14, 1.5, chassis) else diff --git a/code/game/mecha/equipment/tools/cloak.dm b/code/game/mecha/equipment/tools/cloak.dm index 6f6ddd1c8f..e78a4f7395 100644 --- a/code/game/mecha/equipment/tools/cloak.dm +++ b/code/game/mecha/equipment/tools/cloak.dm @@ -46,7 +46,7 @@ log_message("Activated.") cloak_iterator.start() set_ready_state(0) - playsound(get_turf(src), 'sound/effects/EMPulse.ogg', 100, 1) + playsound(src, 'sound/effects/EMPulse.ogg', 100, 1) /obj/item/mecha_parts/mecha_equipment/cloak/proc/stop_cloak() if(chassis) @@ -54,7 +54,7 @@ log_message("Deactivated.") cloak_iterator.stop() set_ready_state(1) - playsound(get_turf(src), 'sound/effects/EMPulse.ogg', 100, 1) + playsound(src, 'sound/effects/EMPulse.ogg', 100, 1) // These things are so silly /datum/global_iterator/mecha_cloak/process(var/obj/item/mecha_parts/mecha_equipment/cloak/cloak) diff --git a/code/game/mecha/equipment/tools/extinguisher.dm b/code/game/mecha/equipment/tools/extinguisher.dm index 4ed6735b62..98712726c0 100644 --- a/code/game/mecha/equipment/tools/extinguisher.dm +++ b/code/game/mecha/equipment/tools/extinguisher.dm @@ -25,14 +25,14 @@ var/obj/o = target var/amount = o.reagents.trans_to_obj(src, 200) occupant_message("[amount] units transferred into internal tank.") - playsound(chassis, 'sound/effects/refill.ogg', 50, 1, -6) + playsound(src, 'sound/effects/refill.ogg', 50, 1, -6) return if (src.reagents.total_volume < 1) occupant_message("\The [src] is empty.") return - playsound(chassis, 'sound/effects/extinguish.ogg', 75, 1, -3) + playsound(src, 'sound/effects/extinguish.ogg', 75, 1, -3) var/direction = get_dir(chassis,target) diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm index 57e63b7829..a914839869 100644 --- a/code/game/mecha/equipment/tools/syringe_gun.dm +++ b/code/game/mecha/equipment/tools/syringe_gun.dm @@ -67,7 +67,7 @@ syringes -= S S.icon = 'icons/obj/chemical.dmi' S.icon_state = "syringeproj" - playsound(chassis, 'sound/items/syringeproj.ogg', 50, 1) + playsound(src, 'sound/items/syringeproj.ogg', 50, 1) log_message("Launched [S] from [src], targeting [target].") spawn(-1) src = null //if src is deleted, still process the syringe diff --git a/code/game/mecha/equipment/weapons/honk.dm b/code/game/mecha/equipment/weapons/honk.dm index 921111a6cd..427d53295c 100644 --- a/code/game/mecha/equipment/weapons/honk.dm +++ b/code/game/mecha/equipment/weapons/honk.dm @@ -16,7 +16,7 @@ if(!equip_ready) return 0 - playsound(chassis, 'sound/effects/bang.ogg', 30, 1, 30) + playsound(src, 'sound/effects/bang.ogg', 30, 1, 30) chassis.occupant_message("You emit a high-pitched noise from the mech.") for(var/mob/living/carbon/M in ohearers(6, chassis)) if(istype(M, /mob/living/carbon/human)) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 5d01416785..355ce629ac 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -36,7 +36,7 @@ aimloc = locate(targloc.x+GaussRandRound(deviation,1),targloc.y+GaussRandRound(deviation,1),targloc.z) if(!aimloc || aimloc == curloc || (locs && aimloc in locs)) break - playsound(chassis, fire_sound, fire_volume, 1) + playsound(src, fire_sound, fire_volume, 1) projectiles-- var/turf/projectile_turf if(chassis.locs && chassis.locs.len) // Multi tile. diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 594c89a4ee..d030979576 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -673,12 +673,12 @@ if(!prob(src.deflect_chance)) src.take_damage(15) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) - playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/slash.ogg', 50, 1, -1) to_chat(user, "You slash at the armored suit!") visible_message("\The [user] slashes at [src.name]'s armor!") else src.log_append_to_last("Armor saved.") - playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/slash.ogg', 50, 1, -1) to_chat(user, "Your claws had no effect!") src.occupant_message("\The [user]'s claws are stopped by the armor.") visible_message("\The [user] rebounds off [src.name]'s armor!") @@ -807,14 +807,14 @@ if(!prob(src.deflect_chance)) src.take_damage(6) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) - playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1) + playsound(src, 'sound/effects/blobattack.ogg', 50, 1, -1) to_chat(user, "You smash at the armored suit!") for (var/mob/V in viewers(src)) if(V.client && !(V.blinded)) V.show_message("\The [user] smashes against [src.name]'s armor!", 1) else src.log_append_to_last("Armor saved.") - playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1) + playsound(src, 'sound/effects/blobattack.ogg', 50, 1, -1) to_chat(user, "Your attack had no effect!") src.occupant_message("\The [user]'s attack is stopped by the armor.") for (var/mob/V in viewers(src)) @@ -2023,7 +2023,7 @@ user.attack_log += text("\[[time_stamp()]\] attacked [src.name]") else src.log_append_to_last("Armor saved.") - playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/slash.ogg', 50, 1, -1) src.occupant_message("\The [user]'s attack is stopped by the armor.") visible_message("\The [user] rebounds off [src.name]'s armor!") user.attack_log += text("\[[time_stamp()]\] attacked [src.name]") diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 3d4c2ffe37..171fcadd22 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -135,7 +135,7 @@ // step_towards(M, src) . = buckle_mob(M, forced) - playsound(src.loc, 'sound/effects/seatbelt.ogg', 50, 1) + playsound(src, 'sound/effects/seatbelt.ogg', 50, 1) if(.) var/reveal_message = list("buckled_mob" = null, "buckled_to" = null) //VORE EDIT: This being a list and messages existing for the buckle target atom. if(!silent) @@ -163,7 +163,7 @@ /atom/movable/proc/user_unbuckle_mob(mob/living/buckled_mob, mob/user) var/mob/living/M = unbuckle_mob(buckled_mob) - playsound(src.loc, 'sound/effects/seatbelt.ogg', 50, 1) + playsound(src, 'sound/effects/seatbelt.ogg', 50, 1) if(M) if(M != user) M.visible_message(\ diff --git a/code/game/objects/effects/alien/aliens.dm b/code/game/objects/effects/alien/aliens.dm index d11b054730..3d2676c4dd 100644 --- a/code/game/objects/effects/alien/aliens.dm +++ b/code/game/objects/effects/alien/aliens.dm @@ -66,7 +66,7 @@ /obj/effect/alien/resin/attack_generic(var/mob/user, var/damage, var/attack_verb) visible_message("[user] [attack_verb] the [src]!") - playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) + playsound(src, 'sound/effects/attackblob.ogg', 100, 1) user.do_attack_animation(src) health -= damage healthcheck() @@ -100,7 +100,7 @@ tforce = 10 else tforce = AM:throwforce - playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) + playsound(src, 'sound/effects/attackblob.ogg', 100, 1) health = max(0, health - tforce) healthcheck() ..() @@ -137,7 +137,7 @@ user.setClickCooldown(user.get_attack_speed(W)) var/aforce = W.force health = max(0, health - aforce) - playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) + playsound(src, 'sound/effects/attackblob.ogg', 100, 1) healthcheck() ..() return @@ -328,7 +328,7 @@ if(WT.remove_fuel(0, user)) damage = 15 - playsound(loc, 'sound/items/Welder.ogg', 100, 1) + playsound(src, 'sound/items/Welder.ogg', 100, 1) health -= damage healthcheck() @@ -531,7 +531,7 @@ if(WT.remove_fuel(0, user)) damage = 15 - playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) + playsound(src, 'sound/items/Welder.ogg', 100, 1) src.health -= damage src.healthcheck() diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index b0a28aa490..4222f58e35 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -146,7 +146,7 @@ /obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob) if(W.is_wirecutter()) - playsound(src.loc, W.usesound, 100, 1) + playsound(src, W.usesound, 100, 1) if(ruined) to_chat(user, "You remove the remnants of the poster.") qdel(src) @@ -166,7 +166,7 @@ return visible_message("[user] rips [src] in a single, decisive motion!" ) - playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1) + playsound(src, 'sound/items/poster_ripped.ogg', 100, 1) ruined = 1 icon_state = "poster_ripped" name = "ripped poster" diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index b872f9b3d3..15931b5868 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -98,7 +98,7 @@ steam.start() -- spawns the effect /obj/effect/effect/sparks/New() ..() - playsound(src.loc, "sparks", 100, 1) + playsound(src, "sparks", 100, 1) var/turf/T = src.loc if (istype(T, /turf)) T.hotspot_expose(1000,100) diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index f2a15be551..1497e4e7a0 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -61,7 +61,7 @@ panel_open = !panel_open user.visible_message("[user] very carefully screws the mine's panel [panel_open ? "open" : "closed"].", "You very carefully screw the mine's panel [panel_open ? "open" : "closed"].") - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) else if((W.is_wirecutter() || istype(W, /obj/item/device/multitool)) && panel_open) interact(user) @@ -224,7 +224,7 @@ msg_admin_attack("[key_name_admin(user)] primed \a [src]") user.visible_message("[user] starts priming \the [src.name].", "You start priming \the [src.name]. Hold still!") if(do_after(user, 10 SECONDS)) - playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) + playsound(src, 'sound/weapons/armbomb.ogg', 75, 1, -3) prime(user) else visible_message("[user] triggers \the [src.name]!", "You accidentally trigger \the [src.name]!") diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 6fd5f0b386..c938476cd4 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -508,7 +508,7 @@ var/list/global/slot_flags_enumeration = list( var/hit_zone = get_zone_with_miss_chance(U.zone_sel.selecting, M, U.get_accuracy_penalty(U)) if(!hit_zone) U.do_attack_animation(M) - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) //visible_message("[U] attempts to stab [M] in the eyes, but misses!") for(var/mob/V in viewers(M)) V.show_message("[U] attempts to stab [M] in the eyes, but misses!") diff --git a/code/game/objects/items/bells.dm b/code/game/objects/items/bells.dm index af9d7ce0f8..c05c7d2686 100644 --- a/code/game/objects/items/bells.dm +++ b/code/game/objects/items/bells.dm @@ -19,7 +19,7 @@ /obj/item/weapon/deskbell/attack(mob/target as mob, mob/living/user as mob) if(!broken) - playsound(user.loc, 'sound/effects/deskbell.ogg', 50, 1) + playsound(src, 'sound/effects/deskbell.ogg', 50, 1) ..() /obj/item/weapon/deskbell/attack_hand(mob/user) @@ -61,12 +61,12 @@ /obj/item/weapon/deskbell/proc/ring(mob/user) if(user.a_intent == "harm") - playsound(user.loc, 'sound/effects/deskbell_rude.ogg', 50, 1) + playsound(src, 'sound/effects/deskbell_rude.ogg', 50, 1) to_chat(user,"You hammer [src] rudely!") if (prob(2)) break_bell(user) else - playsound(user.loc, 'sound/effects/deskbell.ogg', 50, 1) + playsound(src, 'sound/effects/deskbell.ogg', 50, 1) to_chat(user,"You gracefully ring [src].") /obj/item/weapon/deskbell/proc/check_ability(mob/user) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index c3f70abc12..237f6962f3 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -330,7 +330,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/ai/attack_self(mob/user as mob) if ((honkamt > 0) && (prob(60)))//For clown virus. honkamt-- - playsound(loc, 'sound/items/bikehorn.ogg', 30, 1) + playsound(src, 'sound/items/bikehorn.ogg', 30, 1) return @@ -774,7 +774,7 @@ var/global/list/obj/item/device/pda/PDAs = list() scanmode = 4 if("Honk") if ( !(last_honk && world.time < last_honk + 20) ) - playsound(loc, 'sound/items/bikehorn.ogg', 50, 1) + playsound(src, 'sound/items/bikehorn.ogg', 50, 1) last_honk = world.time if("Gas Scan") if(scanmode == 5) @@ -978,7 +978,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if ((honkamt > 0) && (prob(60)))//For clown virus. honkamt-- - playsound(loc, 'sound/items/bikehorn.ogg', 30, 1) + playsound(src, 'sound/items/bikehorn.ogg', 30, 1) return 1 // return 1 tells it to refresh the UI in NanoUI @@ -1015,14 +1015,14 @@ var/global/list/obj/item/device/pda/PDAs = list() var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem S.attach(P.loc) S.set_up(P, 10, 0, P.loc) - playsound(P.loc, 'sound/effects/smoke.ogg', 50, 1, -3) + playsound(P, 'sound/effects/smoke.ogg', 50, 1, -3) S.start() message += "Large clouds of smoke billow forth from your [P]!" if(i>=40 && i<=45) //Bad smoke var/datum/effect/effect/system/smoke_spread/bad/B = new /datum/effect/effect/system/smoke_spread/bad B.attach(P.loc) B.set_up(P, 10, 0, P.loc) - playsound(P.loc, 'sound/effects/smoke.ogg', 50, 1, -3) + playsound(P, 'sound/effects/smoke.ogg', 50, 1, -3) B.start() message += "Large clouds of noxious smoke billow forth from your [P]!" if(i>=65 && i<=75) //Weaken @@ -1059,7 +1059,7 @@ var/global/list/obj/item/device/pda/PDAs = list() var/mob/M = loc M.put_in_hands(id) to_chat(usr, "You remove the ID from the [name].") - playsound(loc, 'sound/machines/id_swipe.ogg', 100, 1) + playsound(src, 'sound/machines/id_swipe.ogg', 100, 1) else id.loc = get_turf(src) id = null @@ -1146,7 +1146,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/proc/new_info(var/beep_silent, var/message_tone, var/reception_message) if (!beep_silent) - playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) + playsound(src, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(2, loc)) O.show_message(text("[bicon(src)] *[message_tone]*")) //Search for holder of the PDA. @@ -1275,7 +1275,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if (cartridge.radio) cartridge.radio.hostpda = null to_chat(usr, "You remove \the [cartridge] from the [name].") - playsound(loc, 'sound/machines/id_swipe.ogg', 100, 1) + playsound(src, 'sound/machines/id_swipe.ogg', 100, 1) cartridge = null /obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use. diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 627145a38f..d6f42bee8f 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -31,7 +31,7 @@ if(!proximity) return if(!active_dummy) if(istype(target,/obj/item) && !istype(target, /obj/item/weapon/disk/nuclear)) - playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6) + playsound(src, 'sound/weapons/flash.ogg', 100, 1, -6) to_chat(user, "Scanned [target].") saved_item = target.type saved_icon = target.icon @@ -42,7 +42,7 @@ if(!can_use || !saved_item) return if(active_dummy) eject_all() - playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) + playsound(src, 'sound/effects/pop.ogg', 100, 1, -6) qdel(active_dummy) active_dummy = null to_chat(usr, "You deactivate the [src].") @@ -51,7 +51,7 @@ flick("emppulse",T) spawn(8) qdel(T) else - playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) + playsound(src, 'sound/effects/pop.ogg', 100, 1, -6) var/obj/O = new saved_item(src) if(!O) return var/obj/effect/dummy/chameleon/C = new /obj/effect/dummy/chameleon(usr.loc) diff --git a/code/game/objects/items/devices/communicator/messaging.dm b/code/game/objects/items/devices/communicator/messaging.dm index 57e480957f..263f6d4db3 100644 --- a/code/game/objects/items/devices/communicator/messaging.dm +++ b/code/game/objects/items/devices/communicator/messaging.dm @@ -76,7 +76,7 @@ return if(ringer) - playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) + playsound(src, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(2, loc)) O.show_message(text("[bicon(src)] *beep*")) diff --git a/code/game/objects/items/devices/communicator/phone.dm b/code/game/objects/items/devices/communicator/phone.dm index d7816fbb82..7075dbe958 100644 --- a/code/game/objects/items/devices/communicator/phone.dm +++ b/code/game/objects/items/devices/communicator/phone.dm @@ -161,7 +161,7 @@ voice_requests |= candidate if(ringer) - playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) + playsound(src, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(2, loc)) O.show_message(text("[bicon(src)] *beep*")) diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm index 8df119f0d5..80a015e7bf 100644 --- a/code/game/objects/items/devices/defib.dm +++ b/code/game/objects/items/devices/defib.dm @@ -395,12 +395,12 @@ if(!do_after(user, 30, H)) return user.visible_message("\The [user] places [src] on [H]'s chest.", "You place [src] on [H]'s chest.") - playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0) + playsound(src, 'sound/machines/defib_charge.ogg', 50, 0) var/error = can_defib(H) if(error) make_announcement(error, "warning") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) + playsound(src, 'sound/machines/defib_failed.ogg', 50, 0) return if(check_blood_level(H)) @@ -413,18 +413,18 @@ //deduct charge here, in case the base unit was EMPed or something during the delay time if(!checked_use(chargecost)) make_announcement("buzzes, \"Insufficient charge.\"", "warning") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) + playsound(src, 'sound/machines/defib_failed.ogg', 50, 0) return H.visible_message("\The [H]'s body convulses a bit.") - playsound(get_turf(src), "bodyfall", 50, 1) - playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) + playsound(src, "bodyfall", 50, 1) + playsound(src, 'sound/machines/defib_zap.ogg', 50, 1, -1) set_cooldown(cooldowntime) error = can_revive(H) if(error) make_announcement(error, "warning") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) + playsound(src, 'sound/machines/defib_failed.ogg', 50, 0) return H.apply_damage(burn_damage_amt, BURN, BP_TORSO) @@ -438,7 +438,7 @@ H.adjustToxLoss(-H.getToxLoss()) make_announcement("pings, \"Resuscitation successful.\"", "notice") - playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0) + playsound(src, 'sound/machines/defib_success.ogg', 50, 0) make_alive(H) @@ -459,7 +459,7 @@ to_chat(user, "You can't do that while the safety is enabled.") return - playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0) + playsound(src, 'sound/machines/defib_charge.ogg', 50, 0) audible_message("\The [src] lets out a steadily rising hum...") if(!do_after(user, chargetime, H)) @@ -468,12 +468,12 @@ //deduct charge here, in case the base unit was EMPed or something during the delay time if(!checked_use(chargecost)) make_announcement("buzzes, \"Insufficient charge.\"", "warning") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) + playsound(src, 'sound/machines/defib_failed.ogg', 50, 0) return user.visible_message("\The [user] shocks [H] with \the [src]!", "You shock [H] with \the [src]!") - playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 100, 1, -1) - playsound(loc, 'sound/weapons/Egloves.ogg', 100, 1, -1) + playsound(src, 'sound/machines/defib_zap.ogg', 100, 1, -1) + playsound(src, 'sound/weapons/Egloves.ogg', 100, 1, -1) set_cooldown(cooldowntime) H.stun_effect_act(2, 120, target_zone) @@ -547,10 +547,10 @@ safety = new_safety if(safety) make_announcement("beeps, \"Safety protocols enabled!\"", "notice") - playsound(get_turf(src), 'sound/machines/defib_safetyon.ogg', 50, 0) + playsound(src, 'sound/machines/defib_safetyon.ogg', 50, 0) else make_announcement("beeps, \"Safety protocols disabled!\"", "warning") - playsound(get_turf(src), 'sound/machines/defib_safetyoff.ogg', 50, 0) + playsound(src, 'sound/machines/defib_safetyoff.ogg', 50, 0) update_icon() ..() diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index bd7a4687ae..2247674f60 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -48,7 +48,7 @@ user.visible_message("\The [user] successfully repairs \the [src]!") broken = FALSE update_icon() - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) else user.visible_message("\The [user] fails to repair \the [src].") repairing = FALSE @@ -138,7 +138,7 @@ if(user) update_icon() to_chat(user, "click") - playsound(src.loc, 'sound/weapons/empty.ogg', 80, 1) + playsound(src, 'sound/weapons/empty.ogg', 80, 1) return FALSE else if(battery && battery.checked_use(charge_cost + (round(charge_cost / 4) * max(0, times_used - max_flashes)))) // Using over your maximum flashes starts taking more charge per added flash. times_used++ @@ -164,7 +164,7 @@ if(!check_capacitor(user)) return - playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1) + playsound(src, 'sound/weapons/flash.ogg', 100, 1) var/flashfail = 0 //VOREStation Add - NIF @@ -253,7 +253,7 @@ if(!check_capacitor(user)) return - playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1) + playsound(src, 'sound/weapons/flash.ogg', 100, 1) flick("flash2", src) if(user && isrobot(user)) spawn(0) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index c908f30e17..d45f4ff716 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -60,7 +60,7 @@ if(cell.use(power_usage) != power_usage) // we weren't able to use our full power_usage amount! visible_message("\The [src] flickers before going dull.") set_light(0) - playsound(src.loc, 'sound/effects/sparks3.ogg', 10, 1, -3) //Small cue that your light went dull in your pocket. + playsound(src, 'sound/effects/sparks3.ogg', 10, 1, -3) //Small cue that your light went dull in your pocket. on = 0 update_icon() return PROCESS_KILL @@ -109,7 +109,7 @@ START_PROCESSING(SSobj, src) else if(power_use) STOP_PROCESSING(SSobj, src) - playsound(src.loc, 'sound/weapons/empty.ogg', 15, 1, -3) + playsound(src, 'sound/weapons/empty.ogg', 15, 1, -3) update_icon() user.update_action_buttons() return 1 diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm index 0b6d25f0c9..a48a3da024 100644 --- a/code/game/objects/items/devices/hacktool.dm +++ b/code/game/objects/items/devices/hacktool.dm @@ -26,7 +26,7 @@ /obj/item/device/multitool/hacktool/attackby(var/obj/item/W, var/mob/user) if(W.is_screwdriver()) in_hack_mode = !in_hack_mode - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) else ..() diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 3ce7a0b236..6ae95bcf8a 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -96,7 +96,7 @@ new_bulbs += AddShards(1) qdel(L) if(new_bulbs != 0) - playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + playsound(src, 'sound/machines/ding.ogg', 50, 1) to_chat(user, "You insert \the [L.name] into \the [src.name]. You have [uses] light\s remaining.") return @@ -148,7 +148,7 @@ /obj/item/device/lightreplacer/proc/Use(var/mob/user) - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) add_uses(-1) return 1 @@ -182,7 +182,7 @@ var/new_bulbs = AddShards(1) if(new_bulbs != 0) to_chat(U, "\The [src] has fabricated a new bulb from the broken bulbs it has stored. It now has [uses] uses.") - playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + playsound(src, 'sound/machines/ding.ogg', 50, 1) target.status = LIGHT_EMPTY target.update() @@ -211,7 +211,7 @@ /obj/item/device/lightreplacer/emag_act(var/remaining_charges, var/mob/user) emagged = !emagged - playsound(src.loc, "sparks", 100, 1) + playsound(src, "sparks", 100, 1) update_icon() return 1 diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 7e7bbdb629..5516ccb099 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -134,7 +134,7 @@ user.audible_message("[user.GetVoice()][user.GetAltName()] broadcasts, \"[pick(insultmsg)]\"") if(broadcast_size >= 11) var/turf/T = get_turf(user) - playsound(T, 'sound/items/AirHorn.ogg', 100, 1) + playsound(src, 'sound/items/AirHorn.ogg', 100, 1) for(var/mob/living/carbon/M in oviewers(4, T)) if(M.get_ear_protection() >= 2) continue diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index 6847bb6fb0..820229fd83 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -47,7 +47,7 @@ to_chat(user, "[O] must be safely placed on the ground for modification.") return - playsound(src.loc, O.usesound, 100, 1) + playsound(src, O.usesound, 100, 1) user.visible_message("\The [user] opens \the [src] and modifies \the [O].","You open \the [src] and modify \the [O].") diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 7a9b07b999..3ddc35a209 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -50,7 +50,7 @@ effective or pretty fucking useless. add_attack_logs(user,affected,"Used a [name]") - playsound(src.loc, 'sound/misc/interference.ogg', 50, 1) + playsound(src, 'sound/misc/interference.ogg', 50, 1) to_chat(user, "You trigger [src].") times_used += 1 if(times_used >= max_uses) diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm index 40c61b1c2c..6778bfae7a 100644 --- a/code/game/objects/items/devices/translocator_vr.dm +++ b/code/game/objects/items/devices/translocator_vr.dm @@ -506,7 +506,7 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac while(recharging) if(!do_after(user, 10, src)) break - playsound(get_turf(src),'sound/items/change_drill.ogg',25,1) + playsound(src,'sound/items/change_drill.ogg',25,1) if(power_source.give(phase_power) < phase_power) break diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index c26d3f80aa..cf8cebeec1 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -32,11 +32,11 @@ return if(isnull(insults)) - playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0) + playsound(src, 'sound/voice/halt.ogg', 100, 1, vary = 0) user.audible_message("[user]'s [name] rasps, \"[use_message]\"", "\The [user] holds up \the [name].") else if(insults > 0) - playsound(get_turf(src), 'sound/voice/binsult.ogg', 100, 1, vary = 0) + playsound(src, 'sound/voice/binsult.ogg', 100, 1, vary = 0) // Yes, it used to show the transcription of the sound clip. That was a) inaccurate b) immature as shit. user.audible_message("[user]'s [name] gurgles something indecipherable and deeply offensive.", "\The [user] holds up \the [name].") insults-- diff --git a/code/game/objects/items/falling_object_vr.dm b/code/game/objects/items/falling_object_vr.dm index 038fc51025..2769b7f013 100644 --- a/code/game/objects/items/falling_object_vr.dm +++ b/code/game/objects/items/falling_object_vr.dm @@ -38,7 +38,7 @@ for(var/mob/living/M in oviewers(3, src)) shake_camera(M, 2, 2) - playsound(loc, 'sound/effects/meteorimpact.ogg', 50, 1) + playsound(src, 'sound/effects/meteorimpact.ogg', 50, 1) density = initial(density) opacity = initial(opacity) plane = initial(plane) diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm index f3bd0c1d3a..223c9a2018 100644 --- a/code/game/objects/items/paintkit.dm +++ b/code/game/objects/items/paintkit.dm @@ -16,7 +16,7 @@ /obj/item/device/kit/proc/use(var/amt, var/mob/user) uses -= amt - playsound(get_turf(user), 'sound/items/Screwdriver.ogg', 50, 1) + playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) if(uses<1) user.drop_item() qdel(src) diff --git a/code/game/objects/items/stacks/marker_beacons.dm b/code/game/objects/items/stacks/marker_beacons.dm index 88eb8e6271..5c7ed3aa04 100644 --- a/code/game/objects/items/stacks/marker_beacons.dm +++ b/code/game/objects/items/stacks/marker_beacons.dm @@ -58,7 +58,7 @@ var/list/marker_beacon_colors = list( return if(use(1)) to_chat(user, "You activate and anchor [amount ? "a":"the"] [singular_name] in place.") - playsound(user, 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) var/obj/structure/marker_beacon/M = new(user.loc, picked_color) transfer_fingerprints_to(M) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 287b471b41..d8237b30a5 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -363,13 +363,21 @@ else return ..() -/obj/item/stack/Moved(atom/old_loc, direction, forced = FALSE) +/obj/item/stack/proc/combine_in_loc() + for(var/obj/item/stack/S in loc) + if(S == src) + continue + S.transfer_to(src) // them to us, so if we're being pulled, we can keep being pulled + +/obj/item/stack/dropped(atom/old_loc) . = ..() if(isturf(loc)) - for(var/obj/item/stack/S in loc) - if(S == src) - continue - S.transfer_to(src) // them to us, so if we're being pulled, we can keep being pulled + combine_in_loc() + +/obj/item/stack/Moved(atom/old_loc, direction, forced) + . = ..() + if(pulledby && isturf(loc)) + combine_in_loc() /* * Recipe datum diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 5eb7a8f69a..854dee4662 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -181,7 +181,7 @@ bullets-- D.icon_state = "foamdart" D.name = "foam dart" - playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1) + playsound(src, 'sound/items/syringeproj.ogg', 50, 1) for(var/i=0, i<6, i++) if (D) @@ -229,7 +229,7 @@ O.show_message(text("\The [] casually lines up a shot with []'s head and pulls the trigger!", user, M), 1, "You hear the sound of foam against skull", 2) O.show_message(text("\The [] was hit in the head by the foam dart!", M), 1) - playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1) + playsound(src, 'sound/items/syringeproj.ogg', 50, 1) new /obj/item/toy/ammo/crossbow(M.loc) src.bullets-- else if (M.lying && src.bullets == 0) @@ -278,12 +278,12 @@ src.active = !( src.active ) if (src.active) to_chat(user, "You extend the plastic blade with a quick flick of your wrist.") - playsound(user, 'sound/weapons/saberon.ogg', 50, 1) + playsound(src, 'sound/weapons/saberon.ogg', 50, 1) src.item_state = "[icon_state]_blade" src.w_class = ITEMSIZE_LARGE else to_chat(user, "You push the plastic blade back down into the handle.") - playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) + playsound(src, 'sound/weapons/saberoff.ogg', 50, 1) src.item_state = "[icon_state]" src.w_class = ITEMSIZE_SMALL update_icon() @@ -397,7 +397,7 @@ /obj/item/toy/bosunwhistle/attack_self(mob/user as mob) if(cooldown < world.time - 35) to_chat(user, "You blow on [src], creating an ear-splitting noise!") - playsound(user, 'sound/misc/boatswain.ogg', 20, 1) + playsound(src, 'sound/misc/boatswain.ogg', 20, 1) cooldown = world.time /* @@ -413,14 +413,14 @@ /obj/item/toy/prize/attack_self(mob/user as mob) if(cooldown < world.time - 8) to_chat(user, "You play with [src].") - playsound(user, 'sound/mecha/mechstep.ogg', 20, 1) + playsound(src, 'sound/mecha/mechstep.ogg', 20, 1) cooldown = world.time /obj/item/toy/prize/attack_hand(mob/user as mob) if(loc == user) if(cooldown < world.time - 8) to_chat(user, "You play with [src].") - playsound(user, 'sound/mecha/mechturn.ogg', 20, 1) + playsound(src, 'sound/mecha/mechturn.ogg', 20, 1) cooldown = world.time return ..() @@ -499,7 +499,7 @@ if(cooldown < world.time) cooldown = (world.time + 30) //3 second cooldown user.visible_message("The [src] says \"[toysay]\".") - playsound(user, 'sound/machines/click.ogg', 20, 1) + playsound(src, 'sound/machines/click.ogg', 20, 1) /obj/item/toy/figure/cmo name = "Chief Medical Officer action figure" @@ -753,12 +753,12 @@ // Attack mob /obj/item/toy/plushie/carp/attack(mob/M as mob, mob/user as mob) - playsound(loc, bitesound, 20, 1) // Play bite sound in local area + playsound(src, bitesound, 20, 1) // Play bite sound in local area return ..() // Attack self /obj/item/toy/plushie/carp/attack_self(mob/user as mob) - playsound(src.loc, bitesound, 20, 1) + playsound(src, bitesound, 20, 1) return ..() @@ -1371,7 +1371,7 @@ if(!cooldown) //for the sanity of everyone var/message = generate_ion_law() to_chat(user, "You press the button on [src].") - playsound(user, 'sound/machines/click.ogg', 20, 1) + playsound(src, 'sound/machines/click.ogg', 20, 1) visible_message("[message]") cooldown = 1 spawn(30) cooldown = 0 @@ -1390,7 +1390,7 @@ if(!cooldown) //for the sanity of everyone var/message = pick("You won't get away this time, Griffin!", "Stop right there, criminal!", "Hoot! Hoot!", "I am the night!") to_chat(user, "You pull the string on the [src].") - //playsound(user, 'sound/misc/hoot.ogg', 25, 1) + //playsound(src, 'sound/misc/hoot.ogg', 25, 1) visible_message("[message]") cooldown = 1 spawn(30) cooldown = 0 @@ -1409,7 +1409,7 @@ if(!cooldown) //for the sanity of everyone var/message = pick("You can't stop me, Owl!", "My plan is flawless! The vault is mine!", "Caaaawwww!", "You will never catch me!") to_chat(user, "You pull the string on the [src].") - //playsound(user, 'sound/misc/caw.ogg', 25, 1) + //playsound(src, 'sound/misc/caw.ogg', 25, 1) visible_message("[message]") cooldown = 1 spawn(30) cooldown = 0 diff --git a/code/game/objects/items/trash_vr.dm b/code/game/objects/items/trash_vr.dm index e60d39321e..7619130ed0 100644 --- a/code/game/objects/items/trash_vr.dm +++ b/code/game/objects/items/trash_vr.dm @@ -4,7 +4,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.species.trashcan == 1) - playsound(H.loc,'sound/items/eatfood.ogg', rand(10,50), 1) + playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1) user.drop_item() forceMove(H.vore_selected) to_chat(H, "You can taste the flavor of garbage. Wait what?") @@ -13,7 +13,7 @@ if(isrobot(M)) var/mob/living/silicon/robot/R = M if(R.module.type == /obj/item/weapon/robot_module/robot/scrubpup) // You can now feed the trash borg yay. - playsound(R.loc,'sound/items/eatfood.ogg', rand(10,50), 1) + playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1) user.drop_item() forceMove(R.vore_selected) R.visible_message("[user] feeds [R] with [src]!") diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 5a0deea83a..d90a462519 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -59,7 +59,7 @@ stored_matter += cartridge.remaining user.drop_from_inventory(W) qdel(W) - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) to_chat(user, span("notice", "The RCD now holds [stored_matter]/[max_stored_matter] matter-units.")) return TRUE return ..() @@ -73,7 +73,7 @@ mode_index++ to_chat(user, span("notice", "Changed mode to '[modes[mode_index]]'.")) - playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) + playsound(src, 'sound/effects/pop.ogg', 50, 0) if(prob(20)) src.spark_system.start() @@ -109,7 +109,7 @@ to_chat(user, span("warning", "\The [src] lacks the required material to start.")) return FALSE - playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) var/true_delay = rcd_results[RCD_VALUE_DELAY] * toolspeed @@ -130,7 +130,7 @@ return FALSE if(A.rcd_act(user, src, rcd_results[RCD_VALUE_MODE])) consume_resources(rcd_results[RCD_VALUE_COST]) - playsound(get_turf(A), 'sound/items/deconstruct.ogg', 50, 1) + playsound(A, 'sound/items/deconstruct.ogg', 50, 1) return TRUE // If they moved, kill the beam immediately. diff --git a/code/game/objects/items/weapons/RCD_vr.dm b/code/game/objects/items/weapons/RCD_vr.dm index 65786bc7bc..d120e593f4 100644 --- a/code/game/objects/items/weapons/RCD_vr.dm +++ b/code/game/objects/items/weapons/RCD_vr.dm @@ -77,7 +77,7 @@ to_chat(user, span("warning", "\The [cartridge] dissolves as it empties of compressed matter.")) user.drop_from_inventory(W) qdel(W) - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) to_chat(user, span("notice", "The RCD now holds [stored_matter]/[max_stored_matter] matter-units.")) update_icon() return TRUE diff --git a/code/game/objects/items/weapons/RPD_vr.dm b/code/game/objects/items/weapons/RPD_vr.dm index c627956d63..b40f28701f 100644 --- a/code/game/objects/items/weapons/RPD_vr.dm +++ b/code/game/objects/items/weapons/RPD_vr.dm @@ -64,8 +64,8 @@ /obj/item/weapon/pipe_dispenser/suicide_act(mob/user) var/datum/gender/TU = gender_datums[user.get_visible_gender()] user.visible_message("[user] points the end of the RPD down [TU.his] throat and presses a button! It looks like [TU.hes] trying to commit suicide...") - playsound(get_turf(user), 'sound/machines/click.ogg', 50, 1) - playsound(get_turf(user), 'sound/items/deconstruct.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/items/deconstruct.ogg', 50, 1) return(BRUTELOSS) /obj/item/weapon/pipe_dispenser/attack_self(mob/user) @@ -231,7 +231,7 @@ if(anyclicked) if(playeffect) spark_system.start() - playsound(get_turf(src), 'sound/effects/pop.ogg', 50, 0) + playsound(src, 'sound/effects/pop.ogg', 50, 0) src.interact(usr) /obj/item/weapon/pipe_dispenser/afterattack(atom/A, mob/user as mob, proximity) @@ -255,7 +255,7 @@ if(!istype(A, /obj/machinery/atmospherics/pipe)) return ..() var/obj/machinery/atmospherics/pipe/P = A - playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) P.change_color(pipe_colors[paint_color]) user.visible_message("[user] paints \the [P] [paint_color].", "You paint \the [P] [paint_color].") return @@ -264,7 +264,7 @@ if(!(istype(A, /obj/item/pipe) || istype(A, /obj/item/pipe_meter) || istype(A, /obj/structure/disposalconstruct))) return ..() to_chat(user, "You start destroying a pipe...") - playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 2, target = A)) activate() animate_deletion(A) @@ -272,7 +272,7 @@ if(ATMOS_MODE) //Making pipes if(!can_make_pipe) return ..() - playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) if (istype(recipe, /datum/pipe_recipe/meter)) to_chat(user, "You start building a meter...") if(do_after(user, 2, target = A)) @@ -311,7 +311,7 @@ to_chat(user, "[src]'s error light flickers; there's something in the way!") return to_chat(user, "You start building a disposals pipe...") - playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 4, target = A)) var/obj/structure/disposalconstruct/C = new(A, R.pipe_type, queued_p_dir, queued_p_flipped, R.subtype) @@ -352,7 +352,7 @@ qdel(P) /obj/item/weapon/pipe_dispenser/proc/activate() - playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/deconstruct.ogg', 50, 1) /obj/item/weapon/pipe_dispenser/proc/do_wrench(var/atom/target, mob/user) var/resolved = target.attackby(tool,user) diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index b8eded77c6..35cf707bc3 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -48,7 +48,7 @@ RSF qdel(W) stored_matter += 10 - playsound(src.loc, 'sound/machines/click.ogg', 10, 1) + playsound(src, 'sound/machines/click.ogg', 10, 1) to_chat(user,"The RSF now holds [stored_matter]/30 fabrication-units.") return @@ -64,8 +64,8 @@ RSF glasstype = /obj/item/weapon/reagent_containers/food/drinks/metaglass /obj/item/weapon/rsf/attack_self(mob/user as mob) - playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) - if(mode == 1) + playsound(src, 'sound/effects/pop.ogg', 50, 0) + if (mode == 1) mode = 2 to_chat(user,"Changed dispensing mode to 'Container'.") return @@ -105,7 +105,7 @@ RSF if(!istype(A, /obj/structure/table) && !istype(A, /turf/simulated/floor)) return - playsound(src.loc, 'sound/machines/click.ogg', 10, 1) + playsound(src, 'sound/machines/click.ogg', 10, 1) var/used_energy = 0 var/obj/product diff --git a/code/game/objects/items/weapons/canes.dm b/code/game/objects/items/weapons/canes.dm index f7688fb2d1..5b7f346684 100644 --- a/code/game/objects/items/weapons/canes.dm +++ b/code/game/objects/items/weapons/canes.dm @@ -33,7 +33,7 @@ if(concealed_blade) user.visible_message("[user] has unsheathed \a [concealed_blade] from [T.his] [src]!", "You unsheathe \the [concealed_blade] from \the [src].") // Calling drop/put in hands to properly call item drop/pickup procs - playsound(user.loc, 'sound/weapons/holster/sheathout.ogg', 50, 1) + playsound(src, 'sound/weapons/holster/sheathout.ogg', 50, 1) user.drop_from_inventory(src) user.put_in_hands(concealed_blade) user.put_in_hands(src) @@ -47,7 +47,7 @@ if(!src.concealed_blade && istype(W)) var/datum/gender/T = gender_datums[user.get_visible_gender()] user.visible_message("[user] has sheathed \a [W] into [T.his] [src]!", "You sheathe \the [W] into \the [src].") - playsound(user.loc, 'sound/weapons/holster/sheathin.ogg', 50, 1) + playsound(src, 'sound/weapons/holster/sheathin.ogg', 50, 1) user.drop_from_inventory(W) W.loc = src src.concealed_blade = W @@ -119,6 +119,6 @@ H.update_inv_l_hand() H.update_inv_r_hand() - playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(src, 'sound/weapons/empty.ogg', 50, 1) add_fingerprint(user) return TRUE \ No newline at end of file diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index ffa3753233..3577ea0a55 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -193,7 +193,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/proc/die(var/nomessage = 0) var/turf/T = get_turf(src) set_light(0) - playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) + playsound(src, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) STOP_PROCESSING(SSobj, src) if (type_butt) var/obj/item/butt = new type_butt(T) @@ -215,7 +215,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/mob/living/M = loc if (!nomessage) to_chat(M, "Your [name] goes out, and you empty the ash.") - playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) + playsound(src, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) lit = 0 icon_state = initial(icon_state) item_state = initial(item_state) @@ -327,7 +327,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(lit == 1) if(user.a_intent == I_HURT) user.visible_message("[user] drops and treads on the lit [src], putting it out instantly.") - playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) + playsound(src, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) die(1) else user.visible_message("[user] puts out \the [src].") @@ -421,7 +421,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(lit == 1) if(user.a_intent == I_HURT) user.visible_message("[user] empties the lit [src] on the floor!.") - playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) + playsound(src, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) die(1) else user.visible_message("[user] puts out \the [src].") @@ -546,7 +546,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM lit = 1 icon_state = "[base_state]on" item_state = "[base_state]on" - playsound(src.loc, activation_sound, 75, 1) + playsound(src, activation_sound, 75, 1) if(istype(src, /obj/item/weapon/flame/lighter/zippo) ) user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.") else @@ -566,7 +566,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM lit = 0 icon_state = "[base_state]" item_state = "[base_state]" - playsound(src.loc, deactivation_sound, 75, 1) + playsound(src, deactivation_sound, 75, 1) if(istype(src, /obj/item/weapon/flame/lighter/zippo) ) user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.") else diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 1f53e64e77..73604b49f9 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -71,7 +71,7 @@ /obj/item/weapon/bikehorn/attack_self(mob/user as mob) if (spam_flag == 0) spam_flag = 1 - playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1) + playsound(src, 'sound/items/bikehorn.ogg', 50, 1) src.add_fingerprint(user) spawn(20) spam_flag = 0 diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index c50998557e..ca8a538646 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -75,7 +75,7 @@ var/obj/o = target var/amount = o.reagents.trans_to_obj(src, 50) to_chat(user, "You fill [src] with [amount] units of the contents of [target].") - playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) + playsound(src, 'sound/effects/refill.ogg', 50, 1, -6) return if (!safety) @@ -88,7 +88,7 @@ src.last_use = world.time - playsound(src.loc, 'sound/effects/extinguish.ogg', 75, 1, -3) + playsound(src, 'sound/effects/extinguish.ogg', 75, 1, -3) var/direction = get_dir(src,target) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 94ca8b7cd2..88d9b0ff5d 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -27,7 +27,7 @@ /obj/item/weapon/gift/attack_self(mob/user as mob) user.drop_item() - playsound(src.loc, 'sound/items/package_unwrap.ogg', 50,1) + playsound(src, 'sound/items/package_unwrap.ogg', 50,1) if(src.gift) user.put_in_active_hand(gift) src.gift.add_fingerprint(user) diff --git a/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm b/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm index 6646e698f9..fe4d80418d 100644 --- a/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm +++ b/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm @@ -7,7 +7,7 @@ origin_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 4) /obj/item/weapon/grenade/anti_photon/detonate() - playsound(src.loc, 'sound/effects/phasein.ogg', 50, 1, 5) + playsound(src, 'sound/effects/phasein.ogg', 50, 1, 5) set_light(10, -10, "#FFFFFF") var/extra_delay = rand(0,90) @@ -18,5 +18,5 @@ set_light(10, 10, "#[num2hex(rand(64,255))][num2hex(rand(64,255))][num2hex(rand(64,255))]") spawn(210) ..() - playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 5) + playsound(src, 'sound/effects/bang.ogg', 50, 1, 5) qdel(src) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 157c64f09f..cb3184a7f6 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -63,7 +63,7 @@ return path = 1 to_chat(user, "You add [W] to the metal casing.") - playsound(src.loc, 'sound/items/Screwdriver2.ogg', 25, -3) + playsound(src, 'sound/items/Screwdriver2.ogg', 25, -3) user.remove_from_mob(det) det.loc = src detonator = det @@ -96,7 +96,7 @@ return else to_chat(user, "You unlock the assembly.") - playsound(src.loc, W.usesound, 50, -3) + playsound(src, W.usesound, 50, -3) name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]" icon_state = initial(icon_state) + (detonator?"_ass":"") stage = 1 @@ -154,7 +154,7 @@ active = 0 if(!has_reagents) icon_state = initial(icon_state) +"_locked" - playsound(src.loc, 'sound/items/Screwdriver2.ogg', 50, 1) + playsound(src, 'sound/items/Screwdriver2.ogg', 50, 1) spawn(0) //Otherwise det_time is erroneously set to 0 after this if(istimer(detonator.a_left)) //Make sure description reflects that the timer has been reset var/obj/item/device/assembly/timer/T = detonator.a_left @@ -164,7 +164,7 @@ det_time = 10*T.time return - playsound(src.loc, 'sound/effects/bamf.ogg', 50, 1) + playsound(src, 'sound/effects/bamf.ogg', 50, 1) for(var/obj/item/weapon/reagent_containers/glass/G in beakers) G.reagents.trans_to_obj(src, G.reagents.total_volume) diff --git a/code/game/objects/items/weapons/grenades/concussion.dm b/code/game/objects/items/weapons/grenades/concussion.dm index 073b5ed9d1..fb821ab6f8 100644 --- a/code/game/objects/items/weapons/grenades/concussion.dm +++ b/code/game/objects/items/weapons/grenades/concussion.dm @@ -19,7 +19,7 @@ if(is_below_sound_pressure(T)) visible_message("Whump.") return - playsound(src.loc, 'sound/effects/bang.ogg', 75, 1, -3) + playsound(src, 'sound/effects/bang.ogg', 75, 1, -3) if(istype(T)) for(var/mob/living/L in orange(T, radius)) if(ishuman(L)) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 087265ca5b..e2d095e0e1 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -29,7 +29,7 @@ /obj/item/weapon/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/carbon/M) // Added a new proc called 'bang' that takes a location and a person to be banged. to_chat(M, "BANG") // Called during the loop that bangs people in lockers/containers and when banging - playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 30) // people in normal view. Could theroetically be called during other explosions. + playsound(src, 'sound/effects/bang.ogg', 50, 1, 30) // people in normal view. Could theroetically be called during other explosions. // -- Polymorph //Checking for protections @@ -119,11 +119,11 @@ for(var/do_spawn = numspawned, do_spawn > 0, do_spawn--) new /obj/item/weapon/grenade/flashbang/cluster(src.loc)//Launches flashbangs - playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) + playsound(src, 'sound/weapons/armbomb.ogg', 75, 1, -3) for(var/do_again = again, do_again > 0, do_again--) new /obj/item/weapon/grenade/flashbang/clusterbang/segment(src.loc)//Creates a 'segment' that launches a few more flashbangs - playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) + playsound(src, 'sound/weapons/armbomb.ogg', 75, 1, -3) qdel(src) return diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index fdab7aaf39..7ac049a774 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -33,7 +33,7 @@ to_chat(user, "You prime the [name]! [det_time/10] seconds!") active = 1 icon_state = initial(icon_state) + "_active" - playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) + playsound(src, 'sound/weapons/armbomb.ogg', 75, 1, -3) spawn(det_time) detonate() return @@ -75,7 +75,7 @@ icon_state = initial(icon_state) + "_active" active = 1 - playsound(loc, arm_sound, 75, 1, -3) + playsound(src, arm_sound, 75, 1, -3) spawn(det_time) detonate() @@ -83,7 +83,7 @@ /obj/item/weapon/grenade/proc/detonate() -// playsound(loc, 'sound/items/Welder2.ogg', 25, 1) +// playsound(src, 'sound/items/Welder2.ogg', 25, 1) var/turf/T = get_turf(src) if(T) T.hotspot_expose(700,125) diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index 28540b981f..75c0e6a299 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -21,7 +21,7 @@ return ..() /obj/item/weapon/grenade/smokebomb/detonate() - playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3) + playsound(src, 'sound/effects/smoke.ogg', 50, 1, -3) src.smoke.set_up(10, 0, usr.loc) spawn(0) for(var/i = 1 to smoke_strength) diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm index 5cab658098..5f1bd4503b 100644 --- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm +++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm @@ -15,7 +15,7 @@ if(spawner_type && deliveryamt) // Make a quick flash var/turf/T = get_turf(src) - playsound(T, 'sound/effects/phasein.ogg', 100, 1) + playsound(src, 'sound/effects/phasein.ogg', 100, 1) for(var/mob/living/carbon/human/M in viewers(T, null)) if(M:eyecheck() <= 0) M.flash_eyes() diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 2f7e3d6e08..b28ebcaf1e 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -60,7 +60,7 @@ return 0 /obj/item/weapon/handcuffs/proc/place_handcuffs(var/mob/living/carbon/target, var/mob/user) - playsound(src.loc, cuff_sound, 30, 1, -2) + playsound(src, cuff_sound, 30, 1, -2) var/mob/living/carbon/human/H = target if(!istype(H)) @@ -244,7 +244,7 @@ var/last_chew = 0 to_chat(user, "You need to have a firm grip on [C] before you can put \the [src] on!") /obj/item/weapon/handcuffs/legcuffs/proc/place_legcuffs(var/mob/living/carbon/target, var/mob/user) - playsound(src.loc, cuff_sound, 30, 1, -2) + playsound(src, cuff_sound, 30, 1, -2) var/mob/living/carbon/human/H = target if(!istype(H)) @@ -315,7 +315,7 @@ var/last_chew = 0 qdel(src) /obj/item/weapon/handcuffs/legcuffs/bola/place_legcuffs(var/mob/living/carbon/target, var/mob/user) - playsound(src.loc, cuff_sound, 30, 1, -2) + playsound(src, cuff_sound, 30, 1, -2) var/mob/living/carbon/human/H = target if(!istype(H)) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 34f44ffc8d..81d5bb8f04 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -252,7 +252,7 @@ Implant Specifics:
"} if (elevel == "Localized Limb") if(part) //For some reason, small_boom() didn't work. So have this bit of working copypaste. imp_in.visible_message("Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!") - playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3) + playsound(src, 'sound/items/countdown.ogg', 75, 1, -3) sleep(25) if (istype(part,/obj/item/organ/external/chest) || \ istype(part,/obj/item/organ/external/groin) || \ @@ -325,7 +325,7 @@ Implant Specifics:
"} /obj/item/weapon/implant/explosive/proc/small_boom() if (ishuman(imp_in) && part) imp_in.visible_message("Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!") - playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3) + playsound(src, 'sound/items/countdown.ogg', 75, 1, -3) spawn(25) if (ishuman(imp_in) && part) //No tearing off these parts since it's pretty much killing diff --git a/code/game/objects/items/weapons/material/chainsaw.dm b/code/game/objects/items/weapons/material/chainsaw.dm index fe99fad674..8ba5f20695 100644 --- a/code/game/objects/items/weapons/material/chainsaw.dm +++ b/code/game/objects/items/weapons/material/chainsaw.dm @@ -53,7 +53,7 @@ obj/item/weapon/chainsaw/proc/turnOff(mob/user as mob) if(!on) return to_chat(user, "You switch the gas nozzle on the chainsaw, turning it off.") attack_verb = list("bluntly hit", "beat", "knocked") - playsound(user, 'sound/weapons/chainsaw_turnoff.ogg',40,1) + playsound(src, 'sound/weapons/chainsaw_turnoff.ogg',40,1) force = inactive_force edge = 0 sharp = 0 @@ -93,7 +93,7 @@ obj/item/weapon/chainsaw/afterattack(atom/A as mob|obj|turf|area, mob/user as mo to_chat(user, "You begin filling the tank on the chainsaw.") if(do_after(usr, 15)) A.reagents.trans_to_obj(src, max_fuel) - playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) + playsound(src, 'sound/effects/refill.ogg', 50, 1, -6) to_chat(user, "Chainsaw succesfully refueled.") else to_chat(user, "Don't move while you're refilling the chainsaw.") diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index b2369f995d..4464084f85 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -46,7 +46,7 @@ if(!(M.can_force_feed(user, loaded) && do_mob(user, M, 5 SECONDS))) return M.visible_message("\The [user] feeds some [loaded] to \the [M] with \the [src].") - playsound(M.loc,'sound/items/eatfood.ogg', rand(10,40), 1) + playsound(src,'sound/items/eatfood.ogg', rand(10,40), 1) overlays.Cut() return else diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index cf5a706525..9f8a27102c 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -46,7 +46,7 @@ active = !active if(active) to_chat(user, "You flip out \the [src].") - playsound(user, 'sound/weapons/flipblade.ogg', 15, 1) + playsound(src, 'sound/weapons/flipblade.ogg', 15, 1) else to_chat(user, "\The [src] can now be concealed.") update_force() diff --git a/code/game/objects/items/weapons/material/material_armor.dm b/code/game/objects/items/weapons/material/material_armor.dm index d981cafc07..91aca12dc1 100644 --- a/code/game/objects/items/weapons/material/material_armor.dm +++ b/code/game/objects/items/weapons/material/material_armor.dm @@ -125,7 +125,7 @@ Protectiveness | Armor % var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) spark_system.start() - playsound(user.loc, 'sound/effects/teleport.ogg', 50, 1) + playsound(src, 'sound/effects/teleport.ogg', 50, 1) user.loc = picked return PROJECTILE_FORCE_MISS diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index e2394537f3..19eaf7f776 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -102,7 +102,7 @@ if(will_break && src.loc == user) // If it's not in our hand anymore user.visible_message("[user] hit \the [target] with \the [src], shattering it!", "You shatter \the [src] in your hand!") - playsound(user, pick('sound/effects/Glassbr1.ogg', 'sound/effects/Glassbr2.ogg', 'sound/effects/Glassbr3.ogg'), 30, 1) + playsound(src, pick('sound/effects/Glassbr1.ogg', 'sound/effects/Glassbr2.ogg', 'sound/effects/Glassbr3.ogg'), 30, 1) qdel(src) return @@ -116,7 +116,7 @@ if(M.buckled) //wheelchairs, office chairs, rollerbeds return - playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds + playsound(src, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm index 3affd40887..ba0fe4ddfe 100644 --- a/code/game/objects/items/weapons/material/swords.dm +++ b/code/game/objects/items/weapons/material/swords.dm @@ -14,7 +14,7 @@ /obj/item/weapon/material/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(unique_parry_check(user, attacker, damage_source) && prob(50)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") - playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1) + playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index 108751654a..0ffd1dfaac 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -61,7 +61,7 @@ /obj/item/weapon/material/twohanded/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(wielded && default_parry_check(user, attacker, damage_source) && prob(15)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") - playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1) + playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 21d4d53a5c..7153ebfa60 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -57,14 +57,14 @@ sharp = 1 edge = 1 w_class = active_w_class - playsound(user, 'sound/weapons/saberon.ogg', 50, 1) + playsound(src, 'sound/weapons/saberon.ogg', 50, 1) update_icon() set_light(lrange, lpower, lcolor) /obj/item/weapon/melee/energy/proc/deactivate(mob/living/user) if(!active) return - playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) + playsound(src, 'sound/weapons/saberoff.ogg', 50, 1) item_state = "[icon_state]" active = 0 embed_chance = initial(embed_chance) @@ -310,7 +310,7 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) spark_system.start() - playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) return 1 if(active && unique_parry_check(user, attacker, damage_source) && prob(projectile_parry_chance)) user.visible_message("\The [user] deflects [attack_text] with \the [src]!") @@ -318,7 +318,7 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) spark_system.start() - playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) return 1 return 0 @@ -370,7 +370,7 @@ // EMP stuff. var/obj/O = AM O.emp_act(3) // A weaker severity is used because this has infinite uses. - playsound(get_turf(O), 'sound/effects/EMPulse.ogg', 100, 1) + playsound(O, 'sound/effects/EMPulse.ogg', 100, 1) user.setClickCooldown(user.get_attack_speed(src)) // A lot of objects don't set click delay. return ..() @@ -379,9 +379,9 @@ if(target.isSynthetic() && active) // Do some extra damage. Not a whole lot more since emp_act() is pretty nasty on FBPs already. target.emp_act(3) // A weaker severity is used because this has infinite uses. - playsound(get_turf(target), 'sound/effects/EMPulse.ogg', 100, 1) + playsound(target, 'sound/effects/EMPulse.ogg', 100, 1) target.adjustFireLoss(force * 3) // 15 Burn, for 20 total. - playsound(get_turf(target), 'sound/weapons/blade1.ogg', 100, 1) + playsound(target, 'sound/weapons/blade1.ogg', 100, 1) // Make lesser robots really mad at us. if(target.mob_class & MOB_CLASS_SYNTHETIC) @@ -481,7 +481,7 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) spark_system.start() - playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) return 1 if(unique_parry_check(user, attacker, damage_source) && prob(projectile_parry_chance)) user.visible_message("\The [user] deflects [attack_text] with \the [src]!") @@ -489,7 +489,7 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) spark_system.start() - playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) return 1 return 0 @@ -547,6 +547,6 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) spark_system.start() - playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) return 1 return 0 diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 7d390d613f..4185cf92c2 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -69,7 +69,7 @@ /obj/item/weapon/melee/cursedblade/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(default_parry_check(user, attacker, damage_source) && prob(50)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") - playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1) + playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 diff --git a/code/game/objects/items/weapons/paiwire.dm b/code/game/objects/items/weapons/paiwire.dm index 3dfa83b844..48358ea259 100644 --- a/code/game/objects/items/weapons/paiwire.dm +++ b/code/game/objects/items/weapons/paiwire.dm @@ -8,7 +8,7 @@ return //VOREStation Add End user.visible_message("[user] inserts [src] into a data port on [M].", "You insert [src] into a data port on [M].", "You hear the satisfying click of a wire jack fastening into place.") - playsound(user, 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) user.drop_item() src.forceMove(M) src.machine = M diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 4d78a09bc5..e4a518e8db 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -94,7 +94,7 @@ return 0 //Otherwise, if we're here, we're gonna stop the attack entirely. user.visible_message("\The [user] blocks [attack_text] with \the [src]!") - playsound(user.loc, 'sound/weapons/Genhit.ogg', 50, 1) + playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) return 1 return 0 @@ -102,7 +102,7 @@ if(istype(W, /obj/item/weapon/melee/baton)) if(cooldown < world.time - 25) user.visible_message("[user] bashes [src] with [W]!") - playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1) + playsound(src, 'sound/effects/shieldbash.ogg', 50, 1) cooldown = world.time else ..() @@ -144,7 +144,7 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) spark_system.start() - playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) /obj/item/weapon/shield/energy/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null) if(istype(damage_source, /obj/item/projectile)) @@ -163,7 +163,7 @@ update_icon() w_class = ITEMSIZE_LARGE slot_flags = null - playsound(user, 'sound/weapons/saberon.ogg', 50, 1) + playsound(src, 'sound/weapons/saberon.ogg', 50, 1) to_chat(user, "\The [src] is now active.") else @@ -171,7 +171,7 @@ update_icon() w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS - playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) + playsound(src, 'sound/weapons/saberoff.ogg', 50, 1) to_chat(user, "\The [src] can now be concealed.") if(istype(user,/mob/living/carbon/human)) @@ -240,7 +240,7 @@ /obj/item/weapon/shield/riot/tele/attack_self(mob/living/user) active = !active icon_state = "teleriot[active]" - playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(src, 'sound/weapons/empty.ogg', 50, 1) if(active) force = 8 diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 88f6caeb74..2cdc341523 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -21,13 +21,13 @@ /obj/item/weapon/storage/backpack/equipped(var/mob/user, var/slot) if (slot == slot_back && src.use_sound) - playsound(src.loc, src.use_sound, 50, 1, -5) + playsound(src, src.use_sound, 50, 1, -5) ..(user, slot) /* /obj/item/weapon/storage/backpack/dropped(mob/user as mob) if (loc == user && src.use_sound) - playsound(src.loc, src.use_sound, 50, 1, -5) + playsound(src, src.use_sound, 50, 1, -5) ..(user) */ diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 0d97b4f878..75cbc2297e 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -35,5 +35,5 @@ /obj/item/weapon/storage/bible/attackby(obj/item/weapon/W as obj, mob/user as mob) if (src.use_sound) - playsound(src.loc, src.use_sound, 50, 1, -5) + playsound(src, src.use_sound, 50, 1, -5) ..() diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 66b3547d6c..aafc0d5e98 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -52,7 +52,7 @@ return // Now make the cardboard to_chat(user, "You fold [src] flat.") - playsound(src.loc, 'sound/items/storage/boxfold.ogg', 30, 1) + playsound(src, 'sound/items/storage/boxfold.ogg', 30, 1) new foldable(get_turf(src)) qdel(src) diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index 2fa8e54e87..b10caa3610 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -40,8 +40,8 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() - playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) - playsound(src.loc, "sparks", 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, "sparks", 50, 1) if(!locked) ..() else diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index c8bc129e3d..034e37ff8e 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -39,8 +39,8 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() - playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) - playsound(src.loc, "sparks", 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, "sparks", 50, 1) return if (W.is_screwdriver()) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 5fc789549a..bfcbd695e5 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -142,7 +142,7 @@ /obj/item/weapon/storage/proc/open(mob/user as mob) if (use_sound) - playsound(src.loc, src.use_sound, 50, 0, -5) + playsound(src, src.use_sound, 50, 0, -5) orient2hud(user) if (user.s_active) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index a875dbfa3c..7eb1c73e69 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -148,7 +148,7 @@ if(bcell && bcell.charge > hitcost) status = !status to_chat(user, "[src] is now [status ? "on" : "off"].") - playsound(loc, "sparks", 75, 1, -1) + playsound(src, "sparks", 75, 1, -1) update_icon() else status = 0 @@ -193,7 +193,7 @@ target.visible_message("[target] has been prodded in the [affecting.name] with [src] by [user]!") else target.visible_message("[target] has been prodded with [src] by [user]!") - playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/Egloves.ogg', 50, 1, -1) //stun effects if(status) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index 204ebb6f89..a4a7992872 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -77,7 +77,7 @@ H.update_inv_l_hand() H.update_inv_r_hand() - playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(src, 'sound/weapons/empty.ogg', 50, 1) add_fingerprint(user) if(blood_overlay && blood_DNA && (blood_DNA.len >= 1)) //updates blood overlay, if any @@ -104,7 +104,7 @@ user.take_organ_damage(2*force) return if(..()) - //playsound(src.loc, "swing_hit", 50, 1, -1) + //playsound(src, "swing_hit", 50, 1, -1) return else return ..() diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index c4e273deea..b97f5303df 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -48,7 +48,7 @@ /obj/item/weapon/syndie/c4explosive/proc/detonate() icon_state = "c-4[size]_1" - playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1) + playsound(src, 'sound/weapons/armbomb.ogg', 75, 1) for(var/mob/O in hearers(src, null)) O.show_message("[bicon(src)] The [src.name] beeps! ") sleep(50) diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index f8c4dd68be..4dbe4e7a35 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -32,7 +32,7 @@ . = ..() if(air_contents.total_moles < 5) . += "The meter on \the [src] indicates you are almost out of gas!" - playsound(user, 'sound/effects/alert.ogg', 50, 1) + playsound(src, 'sound/effects/alert.ogg', 50, 1) /obj/item/weapon/tank/jetpack/verb/toggle_rockets() set name = "Toggle Jetpack Stabilization" diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 0cdf8887a5..25c08c725a 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -471,7 +471,7 @@ var/list/global/tank_gauge_cache = list() if(!T) return T.assume_air(air_contents) - playsound(get_turf(src), 'sound/weapons/Gunshot_shotgun.ogg', 20, 1) + playsound(src, 'sound/weapons/Gunshot_shotgun.ogg', 20, 1) visible_message("[bicon(src)] \The [src] flies apart!", "You hear a bang!") T.hotspot_expose(air_contents.temperature, 70, 1) @@ -518,7 +518,7 @@ var/list/global/tank_gauge_cache = list() T.assume_air(leaked_gas) if(!leaking) visible_message("[bicon(src)] \The [src] relief valve flips open with a hiss!", "You hear hissing.") - playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3) + playsound(src, 'sound/effects/spray.ogg', 10, 1, -3) leaking = 1 #ifdef FIREDBG log_debug("[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]") diff --git a/code/game/objects/items/weapons/tools/crowbar.dm b/code/game/objects/items/weapons/tools/crowbar.dm index 56afaf8219..a139efe9f6 100644 --- a/code/game/objects/items/weapons/tools/crowbar.dm +++ b/code/game/objects/items/weapons/tools/crowbar.dm @@ -102,7 +102,7 @@ return ..() /obj/item/weapon/tool/crowbar/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + playsound(src, 'sound/items/change_jaws.ogg', 50, 1) user.drop_item(src) counterpart.forceMove(get_turf(src)) src.forceMove(counterpart) diff --git a/code/game/objects/items/weapons/tools/screwdriver.dm b/code/game/objects/items/weapons/tools/screwdriver.dm index 8045445ca3..ce405db83b 100644 --- a/code/game/objects/items/weapons/tools/screwdriver.dm +++ b/code/game/objects/items/weapons/tools/screwdriver.dm @@ -154,7 +154,7 @@ return ..() /obj/item/weapon/tool/screwdriver/power/attack_self(mob/user) - playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) + playsound(src,'sound/items/change_drill.ogg',50,1) user.drop_item(src) counterpart.forceMove(get_turf(src)) src.forceMove(counterpart) diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index e6c2cb3630..5c69d122e5 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -151,7 +151,7 @@ if(!welding && max_fuel) O.reagents.trans_to_obj(src, max_fuel) to_chat(user, "Welder refueled") - playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) + playsound(src, 'sound/effects/refill.ogg', 50, 1, -6) return else if(!welding) to_chat(user, "[src] doesn't use fuel.") @@ -278,7 +278,7 @@ to_chat(M, "You switch the [src] on.") else if(T) T.visible_message("\The [src] turns on.") - playsound(loc, acti_sound, 50, 1) + playsound(src, acti_sound, 50, 1) src.force = 15 src.damtype = "fire" src.w_class = ITEMSIZE_LARGE @@ -300,7 +300,7 @@ to_chat(M, "You switch \the [src] off.") else if(T) T.visible_message("\The [src] turns off.") - playsound(loc, deac_sound, 50, 1) + playsound(src, deac_sound, 50, 1) src.force = 3 src.damtype = "brute" src.w_class = initial(src.w_class) diff --git a/code/game/objects/items/weapons/tools/wirecutters.dm b/code/game/objects/items/weapons/tools/wirecutters.dm index 91a48299c6..6e25b57d47 100644 --- a/code/game/objects/items/weapons/tools/wirecutters.dm +++ b/code/game/objects/items/weapons/tools/wirecutters.dm @@ -121,7 +121,7 @@ return ..() /obj/item/weapon/tool/wirecutters/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + playsound(src, 'sound/items/change_jaws.ogg', 50, 1) user.drop_item(src) counterpart.forceMove(get_turf(src)) src.forceMove(counterpart) diff --git a/code/game/objects/items/weapons/tools/wrench.dm b/code/game/objects/items/weapons/tools/wrench.dm index 89a51cf217..6a1e7ccb99 100644 --- a/code/game/objects/items/weapons/tools/wrench.dm +++ b/code/game/objects/items/weapons/tools/wrench.dm @@ -103,7 +103,7 @@ return ..() /obj/item/weapon/tool/wrench/power/attack_self(mob/user) - playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) + playsound(src,'sound/items/change_drill.ogg',50,1) user.drop_item(src) counterpart.forceMove(get_turf(src)) src.forceMove(counterpart) diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm index ba1b662ebb..b9566c399b 100644 --- a/code/game/objects/items/weapons/towels.dm +++ b/code/game/objects/items/weapons/towels.dm @@ -12,7 +12,7 @@ /obj/item/weapon/towel/attack_self(mob/living/user as mob) user.visible_message(text("[] uses [] to towel themselves off.", user, src)) - playsound(user, 'sound/weapons/towelwipe.ogg', 25, 1) + playsound(src, 'sound/weapons/towelwipe.ogg', 25, 1) if(user.fire_stacks > 0) user.fire_stacks = (max(0, user.fire_stacks - 1.5)) else if(user.fire_stacks < 0) diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index 8e6667c759..42bbc38410 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -39,7 +39,7 @@ "You have deployed \the [src]!", "You hear a latch click loudly." ) - playsound(src.loc, 'sound/machines/click.ogg',70, 1) + playsound(src, 'sound/machines/click.ogg',70, 1) deployed = 1 user.drop_from_inventory(src) @@ -64,7 +64,7 @@ "You begin disarming \the [src]!", "You hear a latch click followed by the slow creaking of a spring." ) - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 60)) user.visible_message( diff --git a/code/game/objects/items/weapons/trays.dm b/code/game/objects/items/weapons/trays.dm index 48d65ffb16..6809ae4547 100644 --- a/code/game/objects/items/weapons/trays.dm +++ b/code/game/objects/items/weapons/trays.dm @@ -36,10 +36,10 @@ M.Weaken(1) user.take_organ_damage(2) if(prob(50)) - playsound(M, 'sound/items/trayhit1.ogg', 50, 1) + playsound(src, 'sound/items/trayhit1.ogg', 50, 1) return else - playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' + playsound(src, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' return //it always returns, but I feel like adding an extra return just for safety's sakes. EDIT; Oh well I won't :3 var/mob/living/carbon/human/H = M ///////////////////////////////////// /Let's have this ready for later. @@ -60,12 +60,12 @@ else M.take_organ_damage(5) if(prob(50)) - playsound(M, 'sound/items/trayhit1.ogg', 50, 1) + playsound(src, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) O.show_message(text("[] slams [] with the tray!", user, M), 1) return else - playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //we applied the damage, we played the sound, we showed the appropriate messages. Time to return and stop the proc + playsound(src, 'sound/items/trayhit2.ogg', 50, 1) //we applied the damage, we played the sound, we showed the appropriate messages. Time to return and stop the proc for(var/mob/O in viewers(M, null)) O.show_message(text("[] slams [] with the tray!", user, M), 1) return @@ -93,11 +93,11 @@ location.add_blood(H) if(prob(50)) - playsound(M, 'sound/items/trayhit1.ogg', 50, 1) + playsound(src, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) O.show_message(text("[] slams [] with the tray!", user, M), 1) else - playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' + playsound(src, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' for(var/mob/O in viewers(M, null)) O.show_message(text("[] slams [] with the tray!", user, M), 1) if(prob(10)) @@ -117,11 +117,11 @@ location.add_blood(H) if(prob(50)) - playsound(M, 'sound/items/trayhit1.ogg', 50, 1) + playsound(src, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) O.show_message(text("[] slams [] in the face with the tray!", user, M), 1) else - playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' again + playsound(src, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' again for(var/mob/O in viewers(M, null)) O.show_message(text("[] slams [] in the face with the tray!", user, M), 1) if(prob(30)) @@ -141,7 +141,7 @@ if(istype(W, /obj/item/weapon/material/kitchen/rollingpin)) if(cooldown < world.time - 25) user.visible_message("[user] bashes [src] with [W]!") - playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1) + playsound(src, 'sound/effects/shieldbash.ogg', 50, 1) cooldown = world.time else ..() diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm index f603aa6498..e839bba3b3 100644 --- a/code/game/objects/items/weapons/weldbackpack.dm +++ b/code/game/objects/items/weapons/weldbackpack.dm @@ -68,7 +68,7 @@ to_chat(user, "That was close!") src.reagents.trans_to_obj(W, T.max_fuel) to_chat(user, "Welder refilled!") - playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) + playsound(src, 'sound/effects/refill.ogg', 50, 1, -6) return else if(nozzle) if(nozzle == W) @@ -105,7 +105,7 @@ if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume < max_fuel) O.reagents.trans_to_obj(src, max_fuel) to_chat(user, "You crack the cap off the top of the pack and fill it back up again from the tank.") - playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) + playsound(src, 'sound/effects/refill.ogg', 50, 1, -6) return else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume == max_fuel) to_chat(user, "The pack is already full!") diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index da481521d6..c8c312334f 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -123,7 +123,7 @@ health -= amount if(health <= 0) visible_message("\The [src] breaks down!") - playsound(loc, 'sound/effects/grillehit.ogg', 50, 1) + playsound(src, 'sound/effects/grillehit.ogg', 50, 1) new /obj/item/stack/rods(get_turf(src)) Destroy() diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index d14ccc602b..83e77f1570 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -123,7 +123,7 @@ src.icon_state = src.icon_opened src.opened = 1 - playsound(src.loc, open_sound, 15, 1, -3) + playsound(src, open_sound, 15, 1, -3) if(initial(density)) density = !density return 1 @@ -148,7 +148,7 @@ src.icon_state = src.icon_closed src.opened = 0 - playsound(src.loc, close_sound, 15, 1, -3) + playsound(src, close_sound, 15, 1, -3) if(initial(density)) density = !density return 1 @@ -428,7 +428,7 @@ breakout = 0 return - playsound(src.loc, breakout_sound, 100, 1) + playsound(src, breakout_sound, 100, 1) animate_shake() add_fingerprint(escapee) @@ -436,7 +436,7 @@ breakout = 0 to_chat(escapee, "You successfully break out!") visible_message("\The [escapee] successfully broke out of \the [src]!") - playsound(src.loc, breakout_sound, 100, 1) + playsound(src, breakout_sound, 100, 1) break_open() animate_shake() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 7c90e2a50a..d75cf18e5a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -82,8 +82,8 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() - playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) - playsound(src.loc, "sparks", 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, "sparks", 50, 1) else to_chat(user, "Access Denied") return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index af07ceb9e5..c5732a337e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -56,7 +56,7 @@ return if(src.allowed(user)) src.locked = !src.locked - playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3) + playsound(src, 'sound/machines/click.ogg', 15, 1, -3) for(var/mob/O in viewers(user, 3)) if((O.client && !( O.blinded ))) to_chat(O, "The locker has been [locked ? null : "un"]locked by [user].") @@ -86,8 +86,8 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() - playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) - playsound(src.loc, "sparks", 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, "sparks", 50, 1) else if(W.is_wrench()) if(sealed) if(anchored) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 431b60f2ee..015afb8a9c 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -34,7 +34,7 @@ if(usr.stunned) return 2 - playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3) + playsound(src, 'sound/machines/click.ogg', 15, 1, -3) for(var/obj/O in src) O.forceMove(get_turf(src)) icon_state = icon_opened @@ -50,7 +50,7 @@ if(!src.can_close()) return 0 - playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3) + playsound(src, 'sound/machines/click.ogg', 15, 1, -3) var/itemcount = 0 for(var/obj/O in get_turf(src)) if(itemcount >= storage_capacity) @@ -97,7 +97,7 @@ else if(W.is_wirecutter()) if(rigged) to_chat(user , "You cut away the wiring.") - playsound(src.loc, W.usesound, 100, 1) + playsound(src, W.usesound, 100, 1) rigged = 0 return else return attack_hand(user) @@ -206,7 +206,7 @@ overlays += emag overlays += sparks spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface* - playsound(src.loc, "sparks", 60, 1) + playsound(src, "sparks", 60, 1) src.locked = 0 src.broken = 1 to_chat(user, "You unlock \the [src].") @@ -225,7 +225,7 @@ overlays += emag overlays += sparks spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface* - playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) + playsound(src, 'sound/effects/sparks4.ogg', 75, 1) src.locked = 0 if(!opened && prob(20/severity)) if(!locked) diff --git a/code/game/objects/structures/crates_lockers/vehiclecage.dm b/code/game/objects/structures/crates_lockers/vehiclecage.dm index b565124e78..b98636eb16 100644 --- a/code/game/objects/structures/crates_lockers/vehiclecage.dm +++ b/code/game/objects/structures/crates_lockers/vehiclecage.dm @@ -32,11 +32,11 @@ if(!T) to_chat(user, "You can't open this here!") if(W.is_wrench() && do_after(user, 60 * W.toolspeed, src)) - playsound(loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) disassemble(W, user) user.visible_message("[user] begins loosening \the [src]'s bolts.") if(W.is_wirecutter() && do_after(user, 70 * W.toolspeed, src)) - playsound(loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) disassemble(W, user) user.visible_message("[user] begins cutting \the [src]'s bolts.") else diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index cbf9fad58f..13530d731a 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -22,7 +22,7 @@ ..(P, def_zone) /obj/structure/curtain/attack_hand(mob/user) - playsound(get_turf(loc), "rustle", 15, 1, -5) + playsound(src, "rustle", 15, 1, -5) toggle() ..() diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 088dbd33c6..0f18d967b3 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -43,7 +43,7 @@ playsound(src, "shatter", 70, 1) update_icon() else - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) return /obj/structure/displaycase/update_icon() @@ -57,7 +57,7 @@ /obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob) user.setClickCooldown(user.get_attack_speed(W)) user.do_attack_animation(src) - playsound(loc, 'sound/effects/Glasshit.ogg', 50, 1) + playsound(src, 'sound/effects/Glasshit.ogg', 50, 1) src.health -= W.force src.healthcheck() ..() diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 40c47c9bb9..5a786cacd8 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -268,7 +268,7 @@ if (S) if (S.get_amount() >= 1) if(material_name == "rglass") - playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) + playsound(src, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.") if(do_after(user, 40) && !glass) if (S.use(1)) @@ -280,7 +280,7 @@ to_chat(user, "You cannot make an airlock out of that material.") return if(S.get_amount() >= 2) - playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) + playsound(src, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.") if(do_after(user, 40) && !glass) if (S.use(2)) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 0879e196f2..ed3669247a 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -38,7 +38,7 @@ if(O.is_wrench()) if(!has_extinguisher) to_chat(user, "You start to unwrench the extinguisher cabinet.") - playsound(src.loc, O.usesound, 50, 1) + playsound(src, O.usesound, 50, 1) if(do_after(user, 15 * O.toolspeed)) to_chat(user, "You unwrench the extinguisher cabinet.") new /obj/item/frame/extinguisher_cabinet( src.loc ) diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index e5735d1255..2e2251fabe 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -31,7 +31,7 @@ if (isrobot(user) || locked) if(istype(O, /obj/item/device/multitool)) to_chat(user, "Resetting circuitry...") - playsound(user, 'sound/machines/lockreset.ogg', 50, 1) + playsound(src, 'sound/machines/lockreset.ogg', 50, 1) if(do_after(user, 20 * O.toolspeed)) locked = 0 to_chat(user, " You disable the locking modules.") @@ -44,13 +44,13 @@ toggle_close_open() return else - playsound(user, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time + playsound(src, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time if(W.force < 15) to_chat(user, "The cabinet's protective glass glances off the hit.") else hitstaken++ if(hitstaken == 4) - playsound(user, 'sound/effects/Glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that. + playsound(src, 'sound/effects/Glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that. smashed = 1 locked = 0 open= 1 @@ -82,7 +82,7 @@ return else to_chat(user, "Resetting circuitry...") - playsound(user, 'sound/machines/lockenable.ogg', 50, 1) + playsound(src, 'sound/machines/lockenable.ogg', 50, 1) if(do_after(user,20 * O.toolspeed)) locked = 1 to_chat(user, " You re-enable the locking modules.") diff --git a/code/game/objects/structures/fitness.dm b/code/game/objects/structures/fitness.dm index f0b121a1aa..729e578ba5 100644 --- a/code/game/objects/structures/fitness.dm +++ b/code/game/objects/structures/fitness.dm @@ -20,7 +20,7 @@ if(user.a_intent == I_HURT) user.setClickCooldown(user.get_attack_speed()) flick("[icon_state]_hit", src) - playsound(src.loc, 'sound/effects/woodhit.ogg', 25, 1, -1) + playsound(src, 'sound/effects/woodhit.ogg', 25, 1, -1) user.do_attack_animation(src) user.nutrition = user.nutrition - 5 to_chat(user, "You [pick(hit_message)] \the [src].") @@ -34,7 +34,7 @@ /obj/structure/fitness/weightlifter/attackby(obj/item/weapon/W as obj, mob/user as mob) if(W.is_wrench()) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 75, 1) weight = ((weight) % qualifiers.len) + 1 to_chat(user, "You set the machine's weight level to [weight].") @@ -52,11 +52,11 @@ return else being_used = 1 - playsound(src.loc, 'sound/effects/weightlifter.ogg', 50, 1) + playsound(src, 'sound/effects/weightlifter.ogg', 50, 1) user.set_dir(SOUTH) flick("[icon_state]_[weight]", src) if(do_after(user, 20 + (weight * 10))) - playsound(src.loc, 'sound/effects/weightdrop.ogg', 25, 1) + playsound(src, 'sound/effects/weightdrop.ogg', 25, 1) user.adjust_nutrition(weight * -10) to_chat(user, "You lift the weights [qualifiers[weight]].") being_used = 0 diff --git a/code/game/objects/structures/flora/trees.dm b/code/game/objects/structures/flora/trees.dm index 97625c7c5f..a4fb21901c 100644 --- a/code/game/objects/structures/flora/trees.dm +++ b/code/game/objects/structures/flora/trees.dm @@ -58,9 +58,9 @@ damage_to_do = round(damage_to_do / 4) if(damage_to_do > 0) if(W.sharp && W.edge) - playsound(get_turf(src), 'sound/effects/woodcutting.ogg', 50, 1) + playsound(src, 'sound/effects/woodcutting.ogg', 50, 1) else - playsound(get_turf(src), W.hitsound, 50, 1) + playsound(src, W.hitsound, 50, 1) if(damage_to_do > 5 && !indestructable) adjust_health(-damage_to_do) else diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 16bdbdf120..17ea6845e3 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -27,7 +27,7 @@ /obj/structure/grille/attack_hand(mob/user as mob) user.setClickCooldown(user.get_attack_speed()) - playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) + playsound(src, 'sound/effects/grillehit.ogg', 80, 1) user.do_attack_animation(src) var/damage_dealt = 1 @@ -153,7 +153,7 @@ else if((W.flags & NOCONDUCT) || !shock(user, 70)) user.setClickCooldown(user.get_attack_speed(W)) user.do_attack_animation(src) - playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) + playsound(src, 'sound/effects/grillehit.ogg', 80, 1) switch(W.damtype) if("fire") health -= W.force diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index 995bf4eece..3e58a93850 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -86,7 +86,7 @@ /obj/structure/inflatable/proc/hit(var/damage, var/sound_effect = 1) health = max(0, health - damage) if(sound_effect) - playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) if(health <= 0) puncture() @@ -102,7 +102,7 @@ qdel(src) /obj/structure/inflatable/proc/deflate() - playsound(loc, 'sound/machines/hiss.ogg', 75, 1) + playsound(src, 'sound/machines/hiss.ogg', 75, 1) //to_chat(user, "You slowly deflate the inflatable wall.") visible_message("[src] slowly deflates.") spawn(50) @@ -111,7 +111,7 @@ qdel(src) /obj/structure/inflatable/proc/puncture() - playsound(loc, 'sound/machines/hiss.ogg', 75, 1) + playsound(src, 'sound/machines/hiss.ogg', 75, 1) visible_message("[src] rapidly deflates!") var/obj/item/inflatable/torn/R = new /obj/item/inflatable/torn(loc) src.transfer_fingerprints_to(R) @@ -227,7 +227,7 @@ icon_state = "door_closed" /obj/structure/inflatable/door/deflate() - playsound(loc, 'sound/machines/hiss.ogg', 75, 1) + playsound(src, 'sound/machines/hiss.ogg', 75, 1) visible_message("[src] slowly deflates.") spawn(50) var/obj/item/inflatable/door/R = new /obj/item/inflatable/door(loc) @@ -235,7 +235,7 @@ qdel(src) /obj/structure/inflatable/door/puncture() - playsound(loc, 'sound/machines/hiss.ogg', 75, 1) + playsound(src, 'sound/machines/hiss.ogg', 75, 1) visible_message("[src] rapidly deflates!") var/obj/item/inflatable/door/torn/R = new /obj/item/inflatable/door/torn(loc) src.transfer_fingerprints_to(R) diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index e6e58954a4..6916401936 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -56,7 +56,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) else mybucket.reagents.trans_to_obj(I, 5) // to_chat(user, "You wet [I] in [mybucket].") - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + playsound(src, 'sound/effects/slosh.ogg', 25, 1) else to_chat(user, "[I] can't absorb anymore liquid!") else @@ -328,7 +328,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) if(reagents.total_volume > 1) reagents.trans_to_obj(I, 2) to_chat(user, "You wet [I] in the [callme].") - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + playsound(src, 'sound/effects/slosh.ogg', 25, 1) else to_chat(user, "This [callme] is out of water!") else if(istype(I, /obj/item/key)) diff --git a/code/game/objects/structures/medical_stand_vr.dm b/code/game/objects/structures/medical_stand_vr.dm index 9e0b2cdf37..e32a1a39df 100644 --- a/code/game/objects/structures/medical_stand_vr.dm +++ b/code/game/objects/structures/medical_stand_vr.dm @@ -212,7 +212,7 @@ breather.internal = tank breather.internals?.icon_state = "internal1" valve_opened = TRUE - //playsound(get_turf(src), 'sound/effects/internals.ogg', 100, 1) + //playsound(src, 'sound/effects/internals.ogg', 100, 1) update_icon() START_PROCESSING(SSobj,src) if ("Remove vessel") diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 07cc774fb0..4705b39276 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -51,7 +51,7 @@ /obj/structure/mirror/attackby(obj/item/I as obj, mob/user as mob) if(I.is_wrench()) if(!glass) - playsound(src.loc, I.usesound, 50, 1) + playsound(src, I.usesound, 50, 1) if(do_after(user, 20 * I.toolspeed)) to_chat(user, "You unfasten the frame.") new /obj/item/frame/mirror( src.loc ) @@ -65,7 +65,7 @@ new /obj/item/weapon/material/shard( src.loc ) return if(!shattered && glass) - playsound(src.loc, I.usesound, 50, 1) + playsound(src, I.usesound, 50, 1) to_chat(user, "You remove the glass.") glass = !glass icon_state = "mirror_frame" @@ -88,7 +88,7 @@ return if(shattered && glass) - playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1) + playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1) return if(prob(I.force * 2)) @@ -97,13 +97,13 @@ shatter() else visible_message("[user] hits [src] with [I]!") - playsound(src.loc, 'sound/effects/Glasshit.ogg', 70, 1) + playsound(src, 'sound/effects/Glasshit.ogg', 70, 1) /obj/structure/mirror/attack_generic(var/mob/user, var/damage) user.do_attack_animation(src) if(shattered && glass) - playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1) + playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1) return 0 if(damage) diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 1c6476d1d1..5d5e4fb630 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -28,4 +28,4 @@ GLOBAL_LIST_BOILERPLATE(all_mopbuckets, /obj/structure/mopbucket) else reagents.trans_to_obj(I, 5) to_chat(user, "You wet \the [I] in \the [src].") - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + playsound(src, 'sound/effects/slosh.ogg', 25, 1) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 2043ca2a11..a908f3f0c0 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -95,13 +95,13 @@ for(var/atom/movable/A as mob|obj in src.connected.loc) if (!( A.anchored )) A.forceMove(src) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) qdel(src.connected) src.connected = null /obj/structure/morgue/proc/open() - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) src.connected = new /obj/structure/m_tray( src.loc ) step(src.connected, src.dir) src.connected.layer = OBJ_LAYER @@ -225,11 +225,11 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium) for(var/atom/movable/A as mob|obj in src.connected.loc) if (!( A.anchored )) A.forceMove(src) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) //src.connected = null qdel(src.connected) else if (src.locked == 0) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) src.connected = new /obj/structure/m_tray/c_tray( src.loc ) step(src.connected, dir) //Vorestation Edit src.connected.layer = OBJ_LAYER @@ -319,7 +319,7 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium) sleep(30) cremating = 0 locked = 0 - playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + playsound(src, 'sound/machines/ding.ogg', 50, 1) return diff --git a/code/game/objects/structures/morgue_vr.dm b/code/game/objects/structures/morgue_vr.dm index 2abe7098d1..3d9a72deb8 100644 --- a/code/game/objects/structures/morgue_vr.dm +++ b/code/game/objects/structures/morgue_vr.dm @@ -55,5 +55,5 @@ sleep(30) cremating = 0 locked = 0 - playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + playsound(src, 'sound/machines/ding.ogg', 50, 1) return \ No newline at end of file diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index bf9e811b3d..8cd4e60fce 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -356,7 +356,7 @@ /obj/structure/device/piano/attackby(obj/item/O as obj, mob/user as mob) if(O.is_wrench()) if(anchored) - playsound(src.loc, O.usesound, 50, 1) + playsound(src, O.usesound, 50, 1) to_chat(user, "You begin to loosen \the [src]'s casters...") if (do_after(user, 40 * O.toolspeed)) user.visible_message( \ @@ -365,7 +365,7 @@ "You hear ratchet.") src.anchored = 0 else - playsound(src.loc, O.usesound, 50, 1) + playsound(src, O.usesound, 50, 1) to_chat(user, "You begin to tighten \the [src] to the floor...") if (do_after(user, 20 * O.toolspeed)) user.visible_message( \ diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index c701ae9015..629bc1c41e 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -43,7 +43,7 @@ to_chat(user, "You reach to pin your paper to the board but hesitate. You are certain your paper will not be seen among the many others already attached.") if(O.is_wrench()) to_chat(user, "You start to unwrench the noticeboard.") - playsound(src.loc, O.usesound, 50, 1) + playsound(src, O.usesound, 50, 1) if(do_after(user, 15 * O.toolspeed)) to_chat(user, "You unwrench the noticeboard.") new /obj/item/frame/noticeboard( src.loc ) diff --git a/code/game/objects/structures/props/swarm.dm b/code/game/objects/structures/props/swarm.dm index 181001036a..455698acb2 100644 --- a/code/game/objects/structures/props/swarm.dm +++ b/code/game/objects/structures/props/swarm.dm @@ -37,7 +37,7 @@ if(prob(1 + damage * 3)) visible_message("[shatter_message]") STOP_PROCESSING(SSobj, src) - playsound(get_turf(src),shatter_sound, 75, 1) + playsound(src,shatter_sound, 75, 1) isbroken = 1 density = 0 icon_state = "[initial(icon_state)]-broken" @@ -53,21 +53,21 @@ ) STOP_PROCESSING(SSobj, src) user.do_attack_animation(src) - playsound(get_turf(src),shatter_sound, 75, 1) + playsound(src,shatter_sound, 75, 1) isbroken = 1 density = 0 icon_state = "[initial(icon_state)]-broken" set_light(0) else to_chat(user, "You hit \the [src]!") - playsound(get_turf(src),impact_sound, 75, 1) + playsound(src,impact_sound, 75, 1) else if(prob(damage * 2)) to_chat(user, "You pulverize what was left of \the [src]!") qdel(src) else to_chat(user, "You hit \the [src]!") - playsound(get_turf(src),impact_sound, 75, 1) + playsound(src,impact_sound, 75, 1) /obj/structure/cult/pylon/swarm/pylon_unique() . = ..() @@ -117,7 +117,7 @@ if(prob(1 + damage * 3) && round(damage * 0.8) >= 30) visible_message("[shatter_message]") STOP_PROCESSING(SSobj, src) - playsound(get_turf(src),shatter_sound, 75, 1) + playsound(src,shatter_sound, 75, 1) isbroken = 1 density = 0 icon_state = "[initial(icon_state)]-broken" @@ -133,18 +133,18 @@ ) STOP_PROCESSING(SSobj, src) user.do_attack_animation(src) - playsound(get_turf(src),shatter_sound, 75, 1) + playsound(src,shatter_sound, 75, 1) isbroken = 1 density = 0 icon_state = "[initial(icon_state)]-broken" set_light(0) else to_chat(user, "You hit \the [src]!") - playsound(get_turf(src),impact_sound, 75, 1) + playsound(src,impact_sound, 75, 1) else if(prob(damage * 2)) to_chat(user, "You pulverize what was left of \the [src]!") qdel(src) else to_chat(user, "You hit \the [src]!") - playsound(get_turf(src),impact_sound, 75, 1) + playsound(src,impact_sound, 75, 1) diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm index ae21c406c3..5a4ce00a8c 100644 --- a/code/game/objects/structures/railing.dm +++ b/code/game/objects/structures/railing.dm @@ -63,7 +63,7 @@ health -= amount if(health <= 0) visible_message("\The [src] breaks down!") - playsound(loc, 'sound/effects/grillehit.ogg', 50, 1) + playsound(src, 'sound/effects/grillehit.ogg', 50, 1) new /obj/item/stack/rods(get_turf(src)) qdel(src) @@ -203,7 +203,7 @@ /obj/structure/railing/attackby(obj/item/W as obj, mob/user as mob) // Dismantle if(W.is_wrench() && !anchored) - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) if(do_after(user, 20, src)) user.visible_message("\The [user] dismantles \the [src].", "You dismantle \the [src].") new /obj/item/stack/material/steel(get_turf(usr), 2) @@ -214,7 +214,7 @@ if(health < maxhealth && istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/F = W if(F.welding) - playsound(src.loc, F.usesound, 50, 1) + playsound(src, F.usesound, 50, 1) if(do_after(user, 20, src)) user.visible_message("\The [user] repairs some damage to \the [src].", "You repair some damage to \the [src].") health = min(health+(maxhealth/5), maxhealth) // 20% repair per application @@ -223,7 +223,7 @@ // Install if(W.is_screwdriver()) user.visible_message(anchored ? "\The [user] begins unscrewing \the [src]." : "\The [user] begins fasten \the [src]." ) - playsound(loc, W.usesound, 75, 1) + playsound(src, W.usesound, 75, 1) if(do_after(user, 10, src)) to_chat(user, (anchored ? "You have unfastened \the [src] from the floor." : "You have fastened \the [src] to the floor.")) anchored = !anchored @@ -245,7 +245,7 @@ M.apply_damage(8,def_zone = "head") take_damage(8) visible_message("[G.assailant] slams [G.affecting]'s face against \the [src]!") - playsound(loc, 'sound/effects/grillehit.ogg', 50, 1) + playsound(src, 'sound/effects/grillehit.ogg', 50, 1) else to_chat(user, "You need a better grip to do that!") return @@ -260,7 +260,7 @@ return else - playsound(loc, 'sound/effects/grillehit.ogg', 50, 1) + playsound(src, 'sound/effects/grillehit.ogg', 50, 1) take_damage(W.force) user.setClickCooldown(user.get_attack_speed(W)) diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 9de9dc082b..e68fa43640 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -114,7 +114,7 @@ FLOOR SAFES tumbler_2_pos = decrement(tumbler_2_pos) if(canhear) to_chat(user, "You hear a [pick("click", "chink", "clink")] from \the [src].") - playsound(user, 'sound/machines/click.ogg', 20, 1) + playsound(src, 'sound/machines/click.ogg', 20, 1) check_unlocked(user, canhear) updateUsrDialog() @@ -130,7 +130,7 @@ FLOOR SAFES tumbler_2_pos = increment(tumbler_2_pos) if(canhear) to_chat(user, "You hear a [pick("click", "chink", "clink")] from \the [src].") - playsound(user, 'sound/machines/click.ogg', 20, 1) + playsound(src, 'sound/machines/click.ogg', 20, 1) check_unlocked(user, canhear) updateUsrDialog() return diff --git a/code/game/objects/structures/salvageable.dm b/code/game/objects/structures/salvageable.dm index 2703a7eed6..201b203acc 100644 --- a/code/game/objects/structures/salvageable.dm +++ b/code/game/objects/structures/salvageable.dm @@ -15,7 +15,7 @@ /obj/structure/salvageable/attackby(obj/item/I, mob/user) if(I.is_crowbar()) - playsound(loc, I.usesound, 50, 1) + playsound(src, I.usesound, 50, 1) var/actual_time = I.toolspeed * 170 user.visible_message( \ "\The [user] begins salvaging from \the [src].", \ @@ -240,7 +240,7 @@ obj/structure/salvageable/bliss/Initialize() /obj/structure/salvageable/bliss/attackby(obj/item/I, mob/user) if((. = ..())) - playsound(user, 'sound/machines/shutdown.ogg', 60, 1) + playsound(src, 'sound/machines/shutdown.ogg', 60, 1) ////////////////// //// ONE STAR //// diff --git a/code/game/objects/structures/simple_doors.dm b/code/game/objects/structures/simple_doors.dm index 60b94841ea..95689683a5 100644 --- a/code/game/objects/structures/simple_doors.dm +++ b/code/game/objects/structures/simple_doors.dm @@ -37,7 +37,7 @@ else set_opacity(1) if(material.products_need_process()) - START_PROCESSING(SSobj, src) + START_PROCESSING(SSobj, src) update_nearby_tiles(need_rebuild=1) /obj/structure/simple_door/Destroy() @@ -95,7 +95,7 @@ /obj/structure/simple_door/proc/Open() isSwitchingStates = 1 - playsound(loc, material.dooropen_noise, 100, 1) + playsound(src, material.dooropen_noise, 100, 1) flick("[material.door_icon_base]opening",src) sleep(10) density = 0 @@ -107,7 +107,7 @@ /obj/structure/simple_door/proc/Close() isSwitchingStates = 1 - playsound(loc, material.dooropen_noise, 100, 1) + playsound(src, material.dooropen_noise, 100, 1) flick("[material.door_icon_base]closing",src) sleep(10) density = 1 @@ -135,9 +135,9 @@ hardness -= W.force/10 visible_message("[user] hits [src] with [W]!") if(material == get_material_by_name("resin")) - playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) + playsound(src, 'sound/effects/attackblob.ogg', 100, 1) else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD))) - playsound(loc, 'sound/effects/woodcutting.ogg', 100, 1) + playsound(src, 'sound/effects/woodcutting.ogg', 100, 1) else playsound(src, 'sound/weapons/smash.ogg', 50, 1) CheckHardness() @@ -160,9 +160,9 @@ /obj/structure/simple_door/attack_generic(var/mob/user, var/damage, var/attack_verb) visible_message("[user] [attack_verb] the [src]!") if(material == get_material_by_name("resin")) - playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) + playsound(src, 'sound/effects/attackblob.ogg', 100, 1) else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD))) - playsound(loc, 'sound/effects/woodcutting.ogg', 100, 1) + playsound(src, 'sound/effects/woodcutting.ogg', 100, 1) else playsound(src, 'sound/weapons/smash.ogg', 50, 1) user.do_attack_animation(src) diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index 270583011d..ebba811fb9 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -73,7 +73,7 @@ /obj/structure/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob) var/aforce = W.force health = max(0, health - aforce) - playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) + playsound(src, 'sound/effects/attackblob.ogg', 100, 1) for(var/mob/M in viewers(src, 7)) M.show_message("[user] hits [src] with [W]!", 1) healthcheck() diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index b053e33805..9511b3625b 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -124,7 +124,7 @@ to_chat(user, "\The [src] has no padding to remove.") return to_chat(user, "You remove the padding from \the [src].") - playsound(src.loc, W.usesound, 100, 1) + playsound(src, W.usesound, 100, 1) remove_padding() else if(istype(W, /obj/item/weapon/grab)) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index d471ba3840..a3426aa816 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -22,7 +22,7 @@ return user.drop_item() var/obj/structure/bed/chair/e_chair/E = new (src.loc, material.name) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) E.set_dir(dir) E.part = SK SK.loc = E @@ -175,7 +175,7 @@ occupant.apply_effect(6, WEAKEN, blocked) occupant.apply_effect(6, STUTTER, blocked) occupant.apply_damage(10, BRUTE, def_zone, blocked, soaked) - playsound(src.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/punch1.ogg', 50, 1, -1) if(istype(A, /mob/living)) var/mob/living/victim = A def_zone = ran_zone() diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm index fa28f71bad..30e79012fe 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm @@ -217,7 +217,7 @@ ..(newloc, DEFAULT_WALL_MATERIAL, padding) /obj/structure/bed/chair/bay/shuttle/post_buckle_mob() - playsound(loc,buckling_sound,75,1) + playsound(src,buckling_sound,75,1) if(has_buckled_mobs()) base_icon = "shuttle_chair-b" else diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 525b9883d5..e0432bfb64 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -145,7 +145,7 @@ var/global/list/stool_cache = list() //haha stool to_chat(user, "\The [src] has no padding to remove.") return to_chat(user, "You remove the padding from \the [src].") - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) remove_padding() else ..() diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 639020ba5d..089e65fc04 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -166,7 +166,7 @@ occupant.apply_effect(6, WEAKEN, blocked) occupant.apply_effect(6, STUTTER, blocked) occupant.apply_damage(10, BRUTE, def_zone, soaked) - playsound(src.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/punch1.ogg', 50, 1, -1) if(istype(A, /mob/living)) var/mob/living/victim = A def_zone = ran_zone() diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 467579a225..78ad49d907 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -46,7 +46,7 @@ /obj/structure/toilet/attackby(obj/item/I as obj, mob/living/user as mob) if(I.is_crowbar()) to_chat(user, "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"].") - playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1) + playsound(src, 'sound/effects/stonedoor_openclose.ogg', 50, 1) if(do_after(user, 30)) user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "You hear grinding porcelain.") cistern = !cistern @@ -172,7 +172,7 @@ if(I.is_wrench()) var/newtemp = input(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve") in temperature_settings to_chat(user, "You begin to adjust the temperature valve with \the [I].") - playsound(src.loc, I.usesound, 50, 1) + playsound(src, I.usesound, 50, 1) if(do_after(user, 50 * I.toolspeed)) watertemp = newtemp user.visible_message("[user] adjusts the shower with \the [I].", "You adjust the shower with \the [I].") @@ -384,7 +384,7 @@ return to_chat(usr, "You start washing your hands.") - playsound(loc, 'sound/effects/sink_long.ogg', 75, 1) + playsound(src, 'sound/effects/sink_long.ogg', 75, 1) busy = 1 sleep(40) @@ -407,7 +407,7 @@ if (istype(RG) && RG.is_open_container()) RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) user.visible_message("[user] fills \the [RG] using \the [src].","You fill \the [RG] using \the [src].") - playsound(loc, 'sound/effects/sink.ogg', 75, 1) + playsound(src, 'sound/effects/sink.ogg', 75, 1) return 1 else if (istype(O, /obj/item/weapon/melee/baton)) @@ -431,7 +431,7 @@ else if(istype(O, /obj/item/weapon/mop)) O.reagents.add_reagent("water", 5) to_chat(user, "You wet \the [O] in \the [src].") - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + playsound(src, 'sound/effects/slosh.ogg', 25, 1) return var/turf/location = user.loc diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 353df5ecb8..400b997dc5 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -91,7 +91,7 @@ obj/structure/windoor_assembly/Destroy() var/obj/item/weapon/weldingtool/WT = W if (WT.remove_fuel(0,user)) user.visible_message("[user] disassembles the windoor assembly.", "You start to disassemble the windoor assembly.") - playsound(src.loc, WT.usesound, 50, 1) + playsound(src, WT.usesound, 50, 1) if(do_after(user, 40 * WT.toolspeed)) if(!src || !WT.isOn()) return @@ -157,7 +157,7 @@ obj/structure/windoor_assembly/Destroy() //Adding airlock electronics for access. Step 6 complete. else if(istype(W, /obj/item/weapon/airlock_electronics)) - playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) + playsound(src, 'sound/items/Screwdriver.ogg', 100, 1) user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.") if(do_after(user, 40)) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 2434d33e89..4a5db1e7a9 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -62,7 +62,7 @@ shatter() else if(sound_effect) - playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1) + playsound(src, 'sound/effects/Glasshit.ogg', 100, 1) if(health < maxhealth / 4 && initialhealth >= maxhealth / 4) visible_message("[src] looks like it's about to shatter!" ) update_icon() @@ -176,7 +176,7 @@ /obj/structure/window/attack_tk(mob/user as mob) user.visible_message("Something knocks on [src].") - playsound(loc, 'sound/effects/Glasshit.ogg', 50, 1) + playsound(src, 'sound/effects/Glasshit.ogg', 50, 1) /obj/structure/window/attack_hand(mob/user as mob) user.setClickCooldown(user.get_attack_speed()) @@ -194,13 +194,13 @@ attack_generic(H,25) return - playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1) + playsound(src, 'sound/effects/glassknock.ogg', 80, 1) user.do_attack_animation(src) usr.visible_message("\The [usr] bangs against \the [src]!", "You bang against \the [src]!", "You hear a banging sound.") else - playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1) + playsound(src, 'sound/effects/glassknock.ogg', 80, 1) usr.visible_message("[usr.name] knocks on the [src.name].", "You knock on the [src.name].", "You hear a knocking sound.") @@ -301,13 +301,13 @@ else if(istype(W, /obj/item/stack/cable_coil) && reinf && state == 0 && !istype(src, /obj/structure/window/reinforced/polarized)) var/obj/item/stack/cable_coil/C = W if (C.use(1)) - playsound(src.loc, 'sound/effects/sparks1.ogg', 75, 1) + playsound(src, 'sound/effects/sparks1.ogg', 75, 1) user.visible_message( \ "\The [user] begins to wire \the [src] for electrochromic tinting.", \ "You begin to wire \the [src] for electrochromic tinting.", \ "You hear sparks.") if(do_after(user, 20 * C.toolspeed, src) && state == 0) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) var/obj/structure/window/reinforced/polarized/P = new(loc, dir) if(is_fulltile()) P.fulltile = TRUE @@ -330,7 +330,7 @@ update_nearby_icons() step(src, get_dir(user, src)) else - playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) ..() return diff --git a/code/game/objects/stumble_into_vr.dm b/code/game/objects/stumble_into_vr.dm index f1612be040..1493323af1 100644 --- a/code/game/objects/stumble_into_vr.dm +++ b/code/game/objects/stumble_into_vr.dm @@ -1,5 +1,5 @@ /atom/proc/stumble_into(mob/living/M) - playsound(get_turf(M), "punch", 25, 1, -1) + playsound(src, "punch", 25, 1, -1) visible_message("[M] [pick("ran", "slammed")] into \the [src]!") to_chat(M, "You just [pick("ran", "slammed")] into \the [src]!") M.apply_damage(5, BRUTE) @@ -11,9 +11,9 @@ if(occupied) return ..() if(material) - playsound(get_turf(src), material.tableslam_noise, 25, 1, -1) + playsound(src, material.tableslam_noise, 25, 1, -1) else - playsound(get_turf(src), 'sound/weapons/tablehit1.ogg', 25, 1, -1) + playsound(src, 'sound/weapons/tablehit1.ogg', 25, 1, -1) visible_message("[M] flopped onto \the [src]!") M.apply_damage(5, BRUTE) M.Weaken(2) @@ -21,7 +21,7 @@ M.stop_flying() /obj/machinery/disposal/stumble_into(mob/living/M) - playsound(get_turf(src), 'sound/effects/clang.ogg', 25, 1, -1) + playsound(src, 'sound/effects/clang.ogg', 25, 1, -1) visible_message("[M] [pick("tripped", "stumbled")] into \the [src]!") if(M.client) M.client.perspective = EYE_PERSPECTIVE @@ -33,20 +33,20 @@ update() /obj/structure/inflatable/stumble_into(mob/living/M) - playsound(get_turf(M), "sound/effects/Glasshit.ogg", 25, 1, -1) + playsound(src, "sound/effects/Glasshit.ogg", 25, 1, -1) visible_message("[M] [pick("ran", "slammed")] into \the [src]!") M.Weaken(1) M.stop_flying() /obj/structure/kitchenspike/stumble_into(mob/living/M) - playsound(get_turf(M), "sound/weapons/pierce.ogg", 25, 1, -1) + playsound(src, "sound/weapons/pierce.ogg", 25, 1, -1) visible_message("[M] [pick("ran", "slammed")] into the spikes on \the [src]!") M.apply_damage(15, BRUTE, sharp=1) M.Weaken(5) M.stop_flying() /obj/structure/m_tray/stumble_into(mob/living/M) - playsound(get_turf(src), 'sound/weapons/tablehit1.ogg', 25, 1, -1) + playsound(src, 'sound/weapons/tablehit1.ogg', 25, 1, -1) visible_message("[M] flopped onto \the [src]!") M.apply_damage(5, BRUTE) M.Weaken(2) @@ -54,7 +54,7 @@ M.stop_flying() /obj/structure/c_tray/stumble_into(mob/living/M) - playsound(get_turf(src), 'sound/weapons/tablehit1.ogg', 25, 1, -1) + playsound(src, 'sound/weapons/tablehit1.ogg', 25, 1, -1) visible_message("[M] flopped onto \the [src]!") M.apply_damage(5, BRUTE) M.Weaken(2) @@ -72,7 +72,7 @@ var/obj/occupied = turf_is_crowded() if(occupied) return ..() - playsound(get_turf(src), 'sound/misc/slip.ogg', 25, 1, -1) + playsound(src, 'sound/misc/slip.ogg', 25, 1, -1) visible_message("[M] [pick("tripped", "stumbled")] over \the [src]!") M.Weaken(2) M.stop_flying() @@ -99,7 +99,7 @@ /obj/machinery/atmospherics/unary/cryo_cell/stumble_into(mob/living/M) if((stat & (NOPOWER|BROKEN)) || !istype(M, /mob/living/carbon) || occupant || M.abiotic() || !node) return ..() - playsound(get_turf(src), 'sound/effects/Glasshit.ogg', 25, 1, -1) + playsound(src, 'sound/effects/Glasshit.ogg', 25, 1, -1) visible_message("[M] [pick("tripped", "stumbled")] into \the [src]!") M.apply_damage(5, BRUTE) M.Weaken(2) @@ -123,7 +123,7 @@ /obj/machinery/suit_storage_unit/stumble_into(mob/living/M) if(!ishuman(M) || !isopen || !ispowered || isbroken || OCCUPANT || HELMET || SUIT) return ..() - playsound(get_turf(src), 'sound/effects/clang.ogg', 25, 1, -1) + playsound(src, 'sound/effects/clang.ogg', 25, 1, -1) visible_message("[M] [pick("tripped", "stumbled")] into \the [src]!") if(M.client) M.client.perspective = EYE_PERSPECTIVE diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index 071499c297..9a5c0c4b48 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -45,7 +45,7 @@ else if(istype(O, /obj/item/weapon/mop)) O.reagents.add_reagent(reagent_type, 5) to_chat(user, "You wet \the [O] in \the [src].") - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + playsound(src, 'sound/effects/slosh.ogg', 25, 1) return 1 else return ..() diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 793942ecbe..0094ab1983 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -134,15 +134,10 @@ return /turf/space/Entered(var/atom/movable/A) - ..() - - if (!A || src != A.loc) - return - - inertial_drift(A) + . = ..() if(edge && ticker?.mode) - A.touch_map_edge() + A?.touch_map_edge() /turf/space/proc/Sandbox_Spacemove(atom/movable/A as mob|obj) var/cur_x diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index d206625193..e93380d791 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -142,19 +142,6 @@ turf/attackby(obj/item/weapon/W as obj, mob/user as mob) sleep(2) O.update_transform() -/turf/Entered(var/atom/movable/A, var/old_loc) - . = ..() - - if(ismob(A)) - var/mob/M = A - if(M.lastarea?.has_gravity == 0) - inertial_drift(M) - if(M.flying) //VORESTATION Edit Start. This overwrites the above is_space without touching it all that much. - M.make_floating(1) //VOREStation Edit End. - else if(!is_space()) - M.inertia_dir = 0 - M.make_floating(0) - /turf/CanPass(atom/movable/mover, turf/target) if(!target) return FALSE @@ -223,22 +210,6 @@ turf/attackby(obj/item/weapon/W as obj, mob/user as mob) /turf/proc/is_plating() return 0 -/turf/proc/inertial_drift(atom/movable/A as mob|obj) - if(!(A.last_move)) return - if((istype(A, /mob/) && src.x > 1 && src.x < (world.maxx) && src.y > 1 && src.y < (world.maxy))) - var/mob/M = A - if(M.Process_Spacemove(1)) - M.inertia_dir = 0 - return - spawn(5) - if((M && !(M.anchored) && !(M.pulledby) && (M.loc == src))) - if(M.inertia_dir) - step(M, M.inertia_dir) - return - M.inertia_dir = M.last_move - step(M, M.inertia_dir) - return - /turf/proc/levelupdate() for(var/obj/O in src) O.hide(O.hides_under_flooring() && !is_plating()) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index c47fa3a190..881eb95abb 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -426,43 +426,6 @@ log_and_message_admins("has opened [S]'s law manager.") feedback_add_details("admin_verb","MSL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/change_human_appearance_admin() - set name = "Change Mob Appearance - Admin" - set desc = "Allows you to change the mob appearance" - set category = "Admin" - - if(!check_rights(R_FUN)) return - - var/mob/living/carbon/human/H = input("Select mob.", "Change Mob Appearance - Admin") as null|anything in human_mob_list - if(!H) return - - log_and_message_admins("is altering the appearance of [H].") - H.change_appearance(APPEARANCE_ALL, usr, usr, check_species_whitelist = 0, state = admin_state) - feedback_add_details("admin_verb","CHAA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/client/proc/change_human_appearance_self() - set name = "Change Mob Appearance - Self" - set desc = "Allows the mob to change its appearance" - set category = "Admin" - - if(!check_rights(R_FUN)) return - - var/mob/living/carbon/human/H = input("Select mob.", "Change Mob Appearance - Self") as null|anything in human_mob_list - if(!H) return - - if(!H.client) - to_chat(usr, " Only mobs with clients can alter their own appearance.") - return - var/datum/gender/T = gender_datums[H.get_visible_gender()] - switch(alert("Do you wish for [H] to be allowed to select non-whitelisted races?","Alter Mob Appearance","Yes","No","Cancel")) - if("Yes") - log_and_message_admins("has allowed [H] to change [T.his] appearance, without whitelisting of races.") - H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 0) - if("No") - log_and_message_admins("has allowed [H] to change [T.his] appearance, with whitelisting of races.") - H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 1) - feedback_add_details("admin_verb","CMAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - /client/proc/change_security_level() set name = "Set security level" set desc = "Sets the station security level" @@ -485,74 +448,6 @@ // feedback_add_details("admin_verb","MP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return -/client/proc/editappear() - set name = "Edit Appearance" - set category = "Fun" - - if(!check_rights(R_FUN)) return - - var/mob/living/carbon/human/M = input("Select mob.", "Edit Appearance") as null|anything in human_mob_list - - if(!istype(M, /mob/living/carbon/human)) - to_chat(usr, "You can only do this to humans!") - return - switch(alert("Are you sure you wish to edit this mob's appearance? Skrell, Unathi, Tajaran can result in unintended consequences.",,"Yes","No")) - if("No") - return - var/new_facial = input("Please select facial hair color.", "Character Generation") as color - if(new_facial) - M.r_facial = hex2num(copytext(new_facial, 2, 4)) - M.g_facial = hex2num(copytext(new_facial, 4, 6)) - M.b_facial = hex2num(copytext(new_facial, 6, 8)) - - var/new_hair = input("Please select hair color.", "Character Generation") as color - if(new_facial) - M.r_hair = hex2num(copytext(new_hair, 2, 4)) - M.g_hair = hex2num(copytext(new_hair, 4, 6)) - M.b_hair = hex2num(copytext(new_hair, 6, 8)) - - var/new_eyes = input("Please select eye color.", "Character Generation") as color - if(new_eyes) - M.r_eyes = hex2num(copytext(new_eyes, 2, 4)) - M.g_eyes = hex2num(copytext(new_eyes, 4, 6)) - M.b_eyes = hex2num(copytext(new_eyes, 6, 8)) - M.update_eyes() - - var/new_skin = input("Please select body color. This is for Tajaran, Unathi, and Skrell only!", "Character Generation") as color - if(new_skin) - M.r_skin = hex2num(copytext(new_skin, 2, 4)) - M.g_skin = hex2num(copytext(new_skin, 4, 6)) - M.b_skin = hex2num(copytext(new_skin, 6, 8)) - - var/new_tone = input("Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation") as text - - if (new_tone) - M.s_tone = max(min(round(text2num(new_tone)), 220), 1) - M.s_tone = -M.s_tone + 35 - - // hair - var/new_hstyle = input(usr, "Select a hair style", "Grooming") as null|anything in hair_styles_list - if(new_hstyle) - M.h_style = new_hstyle - - // facial hair - var/new_fstyle = input(usr, "Select a facial hair style", "Grooming") as null|anything in facial_hair_styles_list - if(new_fstyle) - M.f_style = new_fstyle - - var/new_gender = alert(usr, "Please select gender.", "Character Generation", "Male", "Female", "Neuter") - if (new_gender) - if(new_gender == "Male") - M.gender = MALE - else if (new_gender == "Female") - M.gender = FEMALE - else - M.gender = NEUTER - - M.update_hair(FALSE) - M.update_icons_body() - M.check_dna(M) - /client/proc/playernotes() set name = "Show Player Info" set category = "Admin" diff --git a/code/modules/admin/verbs/change_appearance.dm b/code/modules/admin/verbs/change_appearance.dm new file mode 100644 index 0000000000..e547d03f84 --- /dev/null +++ b/code/modules/admin/verbs/change_appearance.dm @@ -0,0 +1,107 @@ +/client/proc/change_human_appearance_admin() + set name = "Change Mob Appearance - Admin" + set desc = "Allows you to change the mob appearance" + set category = "Admin" + + if(!check_rights(R_FUN)) return + + var/mob/living/carbon/human/H = input("Select mob.", "Change Mob Appearance - Admin") as null|anything in human_mob_list + if(!H) return + + log_and_message_admins("is altering the appearance of [H].") + H.change_appearance(APPEARANCE_ALL, usr, usr, check_species_whitelist = 0, state = admin_state) + feedback_add_details("admin_verb","CHAA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + +/client/proc/change_human_appearance_self() + set name = "Change Mob Appearance - Self" + set desc = "Allows the mob to change its appearance" + set category = "Admin" + + if(!check_rights(R_FUN)) return + + var/mob/living/carbon/human/H = input("Select mob.", "Change Mob Appearance - Self") as null|anything in human_mob_list + if(!H) return + + if(!H.client) + to_chat(usr, " Only mobs with clients can alter their own appearance.") + return + var/datum/gender/T = gender_datums[H.get_visible_gender()] + switch(alert("Do you wish for [H] to be allowed to select non-whitelisted races?","Alter Mob Appearance","Yes","No","Cancel")) + if("Yes") + log_and_message_admins("has allowed [H] to change [T.his] appearance, without whitelisting of races.") + H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 0) + if("No") + log_and_message_admins("has allowed [H] to change [T.his] appearance, with whitelisting of races.") + H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 1) + feedback_add_details("admin_verb","CMAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + +/client/proc/editappear() + set name = "Edit Appearance" + set category = "Fun" + + if(!check_rights(R_FUN)) return + + var/mob/living/carbon/human/M = input("Select mob.", "Edit Appearance") as null|anything in human_mob_list + + if(!istype(M, /mob/living/carbon/human)) + to_chat(usr, "You can only do this to humans!") + return + switch(alert("Are you sure you wish to edit this mob's appearance? Skrell, Unathi, Tajaran can result in unintended consequences.",,"Yes","No")) + if("No") + return + var/new_facial = input("Please select facial hair color.", "Character Generation") as color + if(new_facial) + M.r_facial = hex2num(copytext(new_facial, 2, 4)) + M.g_facial = hex2num(copytext(new_facial, 4, 6)) + M.b_facial = hex2num(copytext(new_facial, 6, 8)) + + var/new_hair = input("Please select hair color.", "Character Generation") as color + if(new_facial) + M.r_hair = hex2num(copytext(new_hair, 2, 4)) + M.g_hair = hex2num(copytext(new_hair, 4, 6)) + M.b_hair = hex2num(copytext(new_hair, 6, 8)) + + var/new_eyes = input("Please select eye color.", "Character Generation") as color + if(new_eyes) + M.r_eyes = hex2num(copytext(new_eyes, 2, 4)) + M.g_eyes = hex2num(copytext(new_eyes, 4, 6)) + M.b_eyes = hex2num(copytext(new_eyes, 6, 8)) + M.update_eyes() + + var/new_skin = input("Please select body color. This is for Tajaran, Unathi, and Skrell only!", "Character Generation") as color + if(new_skin) + M.r_skin = hex2num(copytext(new_skin, 2, 4)) + M.g_skin = hex2num(copytext(new_skin, 4, 6)) + M.b_skin = hex2num(copytext(new_skin, 6, 8)) + + var/new_tone = input("Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation") as text + + if (new_tone) + M.s_tone = max(min(round(text2num(new_tone)), 220), 1) + M.s_tone = -M.s_tone + 35 + + // hair + var/new_hstyle = input(usr, "Select a hair style", "Grooming") as null|anything in hair_styles_list + if(new_hstyle) + M.h_style = new_hstyle + + // facial hair + var/new_fstyle = input(usr, "Select a facial hair style", "Grooming") as null|anything in facial_hair_styles_list + if(new_fstyle) + M.f_style = new_fstyle + + var/new_gender = alert(usr, "Please select gender.", "Character Generation", "Male", "Female", "Neuter") + if (new_gender) + if(new_gender == "Male") + M.gender = MALE + M.dna.SetUIState(DNA_UI_GENDER, FALSE) + else if (new_gender == "Female") + M.gender = FEMALE + M.dna.SetUIState(DNA_UI_GENDER, TRUE) + else + M.gender = NEUTER + M.dna.SetUIState(DNA_UI_GENDER, FALSE) + + M.update_dna(M) + M.update_hair(FALSE) + M.update_icons_body() \ No newline at end of file diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 3b3843efbd..4acf3a54c1 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -28,7 +28,7 @@ var/list/sounds_cache = list() log_admin("[key_name(src)] played a local sound [S]") message_admins("[key_name_admin(src)] played a local sound [S]", 1) - playsound(get_turf(src.mob), S, 50, 0, 0) + playsound(src.mob, S, 50, 0, 0) feedback_add_details("admin_verb","PLS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/ai/ai_holder_communication.dm b/code/modules/ai/ai_holder_communication.dm index ef8fcf253d..beddb68924 100644 --- a/code/modules/ai/ai_holder_communication.dm +++ b/code/modules/ai/ai_holder_communication.dm @@ -34,8 +34,8 @@ if(holder.say_list) holder.ISay(safepick(holder.say_list.say_threaten)) - playsound(holder.loc, holder.say_list.threaten_sound, 50, 1) // We do this twice to make the sound -very- noticable to the target. - playsound(target.loc, holder.say_list.threaten_sound, 50, 1) // Actual aim-mode also does that so at least it's consistant. + playsound(holder, holder.say_list.threaten_sound, 50, 1) // We do this twice to make the sound -very- noticable to the target. + playsound(target, holder.say_list.threaten_sound, 50, 1) // Actual aim-mode also does that so at least it's consistant. else // Otherwise we are waiting for them to go away or to wait long enough for escalate. if(target in list_targets()) // Are they still visible? var/should_escalate = FALSE @@ -57,8 +57,8 @@ set_stance(STANCE_IDLE) if(holder.say_list) holder.ISay(safepick(holder.say_list.say_stand_down)) - playsound(holder.loc, holder.say_list.stand_down_sound, 50, 1) // We do this twice to make the sound -very- noticable to the target. - playsound(target.loc, holder.say_list.stand_down_sound, 50, 1) // Actual aim-mode also does that so at least it's consistant. + playsound(holder, holder.say_list.stand_down_sound, 50, 1) // We do this twice to make the sound -very- noticable to the target. + playsound(target, holder.say_list.stand_down_sound, 50, 1) // Actual aim-mode also does that so at least it's consistant. // Determines what is deserving of a warning when STANCE_ALERT is active. /datum/ai_holder/proc/will_threaten(mob/living/the_target) diff --git a/code/modules/artifice/deadringer.dm b/code/modules/artifice/deadringer.dm index 0906eda63e..b5edd57784 100644 --- a/code/modules/artifice/deadringer.dm +++ b/code/modules/artifice/deadringer.dm @@ -89,7 +89,7 @@ /obj/item/weapon/deadringer/proc/reveal() if(watchowner) watchowner.alpha = 255 - playsound(get_turf(src), 'sound/effects/uncloak.ogg', 35, 1, -1) + playsound(src, 'sound/effects/uncloak.ogg', 35, 1, -1) return /obj/item/weapon/deadringer/proc/makeacorpse(var/mob/living/carbon/human/H) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index b294fc90c8..6ea9dfdff7 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -43,7 +43,7 @@ var/mob/living/simple_mob/animal/passive/mouse/M = target visible_message("SPLAT!") M.splat() - playsound(target.loc, 'sound/effects/snap.ogg', 50, 1) + playsound(target, 'sound/effects/snap.ogg', 50, 1) layer = MOB_LAYER - 0.2 armed = 0 update_icon() @@ -65,7 +65,7 @@ to_chat(user, "You disarm [src].") armed = !armed update_icon() - playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) + playsound(user, 'sound/weapons/handcuffs.ogg', 30, 1, -3) /obj/item/device/assembly/mousetrap/attack_hand(var/mob/living/user) if(armed) diff --git a/code/modules/blob/blob.dm b/code/modules/blob/blob.dm index 877c684b5e..91524d6899 100644 --- a/code/modules/blob/blob.dm +++ b/code/modules/blob/blob.dm @@ -43,7 +43,7 @@ /obj/effect/blob/take_damage(var/damage) // VOREStation Edit health -= damage if(health < 0) - playsound(loc, 'sound/effects/splat.ogg', 50, 1) + playsound(src, 'sound/effects/splat.ogg', 50, 1) qdel(src) else update_icon() @@ -103,7 +103,7 @@ if(L.stat == DEAD) continue L.visible_message("The blob attacks \the [L]!", "The blob attacks you!") - playsound(loc, 'sound/effects/attackblob.ogg', 50, 1) + playsound(src, 'sound/effects/attackblob.ogg', 50, 1) L.take_organ_damage(rand(30, 40)) return new expandType(T, min(health, 30)) @@ -135,7 +135,7 @@ /obj/effect/blob/attackby(var/obj/item/weapon/W, var/mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - playsound(loc, 'sound/effects/attackblob.ogg', 50, 1) + playsound(src, 'sound/effects/attackblob.ogg', 50, 1) visible_message("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]") var/damage = 0 switch(W.damtype) diff --git a/code/modules/blob2/blobs/base_blob.dm b/code/modules/blob2/blobs/base_blob.dm index 1bcf7c35bd..71d4ad7254 100644 --- a/code/modules/blob2/blobs/base_blob.dm +++ b/code/modules/blob2/blobs/base_blob.dm @@ -32,7 +32,7 @@ GLOBAL_LIST_EMPTY(all_blobs) /obj/structure/blob/Destroy() - playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) //Expand() is no longer broken, no check necessary. + playsound(src, 'sound/effects/splat.ogg', 50, 1) //Expand() is no longer broken, no check necessary. GLOB.all_blobs -= src overmind = null return ..() @@ -149,7 +149,7 @@ GLOBAL_LIST_EMPTY(all_blobs) if(istype(T, /turf/space) && !(locate(/obj/structure/lattice) in T) && prob(80)) make_blob = FALSE - playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) //Let's give some feedback that we DID try to spawn in space, since players are used to it + playsound(src, 'sound/effects/splat.ogg', 50, 1) //Let's give some feedback that we DID try to spawn in space, since players are used to it consume_tile() //hit the tile we're in, making sure there are no border objects blocking us @@ -223,7 +223,7 @@ GLOBAL_LIST_EMPTY(all_blobs) /obj/structure/blob/attack_generic(var/mob/user, var/damage, var/attack_verb) visible_message("[user] [attack_verb] the [src]!") - playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) + playsound(src, 'sound/effects/attackblob.ogg', 100, 1) user.do_attack_animation(src) if(overmind) damage *= overmind.blob_type.brute_multiplier @@ -307,7 +307,7 @@ GLOBAL_LIST_EMPTY(all_blobs) /obj/structure/blob/attackby(var/obj/item/weapon/W, var/mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - playsound(loc, 'sound/effects/attackblob.ogg', 50, 1) + playsound(src, 'sound/effects/attackblob.ogg', 50, 1) visible_message("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]") var/damage = W.force switch(W.damtype) @@ -318,7 +318,7 @@ GLOBAL_LIST_EMPTY(all_blobs) damage *= 2 if(damage > 0) - playsound(src.loc, 'sound/items/welder.ogg', 100, 1) + playsound(src, 'sound/items/welder.ogg', 100, 1) else playsound(src, 'sound/weapons/tap.ogg', 50, 1) if(BRUTE, SEARING, TOX, CLONE) @@ -328,7 +328,7 @@ GLOBAL_LIST_EMPTY(all_blobs) damage *= 2 if(damage > 0) - playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) + playsound(src, 'sound/effects/attackblob.ogg', 50, 1) else playsound(src, 'sound/weapons/tap.ogg', 50, 1) if(overmind) @@ -369,7 +369,7 @@ GLOBAL_LIST_EMPTY(all_blobs) /obj/structure/blob/proc/adjust_integrity(amount) integrity = between(0, integrity + amount, max_integrity) if(integrity == 0) - playsound(loc, 'sound/effects/splat.ogg', 50, 1) + playsound(src, 'sound/effects/splat.ogg', 50, 1) if(overmind) overmind.blob_type.on_death(src) qdel(src) diff --git a/code/modules/blob2/overmind/types/ravenous_macrophage.dm b/code/modules/blob2/overmind/types/ravenous_macrophage.dm index 0a73501c34..b6b3b65a4f 100644 --- a/code/modules/blob2/overmind/types/ravenous_macrophage.dm +++ b/code/modules/blob2/overmind/types/ravenous_macrophage.dm @@ -23,7 +23,7 @@ /datum/blob_type/ravenous_macrophage/on_pulse(var/obj/structure/blob/B) var/mob/living/L = locate() in range(world.view, B) - if(prob(1) && L.mind && !L.stat) // There's some active living thing nearby, produce offgas. + if(L && prob(1) && L.mind && !L.stat) // There's some active living thing nearby, produce offgas. var/turf/T = get_turf(B) var/datum/effect/effect/system/smoke_spread/noxious/BS = new /datum/effect/effect/system/smoke_spread/noxious BS.attach(T) diff --git a/code/modules/catalogue/cataloguer.dm b/code/modules/catalogue/cataloguer.dm index e4e148c230..8f7f3152f3 100644 --- a/code/modules/catalogue/cataloguer.dm +++ b/code/modules/catalogue/cataloguer.dm @@ -111,25 +111,25 @@ GLOBAL_LIST_EMPTY(all_cataloguers) box_segments = draw_box(target, scan_range, user.client) color_box(box_segments, "#00FF00", scan_delay) - playsound(src.loc, 'sound/machines/beep.ogg', 50) + playsound(src, 'sound/machines/beep.ogg', 50) // The delay, and test for if the scan succeeds or not. var/scan_start_time = world.time if(do_after(user, scan_delay, target, ignore_movement = TRUE, max_distance = scan_range)) if(target.can_catalogue(user)) to_chat(user, span("notice", "You successfully scan \the [target] with \the [src].")) - playsound(src.loc, 'sound/machines/ping.ogg', 50) + playsound(src, 'sound/machines/ping.ogg', 50) catalogue_object(target, user) else // In case someone else scans it first, or it died, etc. to_chat(user, span("warning", "\The [target] is no longer valid to scan with \the [src].")) - playsound(src.loc, 'sound/machines/buzz-two.ogg', 50) + playsound(src, 'sound/machines/buzz-two.ogg', 50) partial_scanned = null partial_scan_time = 0 else to_chat(user, span("warning", "You failed to finish scanning \the [target] with \the [src].")) - playsound(src.loc, 'sound/machines/buzz-two.ogg', 50) + playsound(src, 'sound/machines/buzz-two.ogg', 50) color_box(box_segments, "#FF0000", 3) partial_scanned = weakref(target) partial_scan_time += world.time - scan_start_time // This is added to the existing value so two partial scans will add up correctly. @@ -204,7 +204,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers) busy = TRUE update_icon() - playsound(src.loc, 'sound/machines/beep.ogg', 50) + playsound(src, 'sound/machines/beep.ogg', 50) // First, get everything able to be scanned. var/list/scannable_atoms = list() @@ -232,9 +232,9 @@ GLOBAL_LIST_EMPTY(all_cataloguers) busy = FALSE update_icon() if(scannable_atoms.len) - playsound(src.loc, 'sound/machines/ping.ogg', 50) + playsound(src, 'sound/machines/ping.ogg', 50) else - playsound(src.loc, 'sound/machines/buzz-two.ogg', 50) + playsound(src, 'sound/machines/buzz-two.ogg', 50) to_chat(user, span("notice", "\The [src] found [scannable_atoms.len] object\s that can be scanned.")) diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 226d39e73f..29be6fb3c4 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -401,18 +401,6 @@ else . = ..() - -// Byond seemingly calls stat, each tick. -// Calling things each tick can get expensive real quick. -// So we slow this down a little. -// See: http://www.byond.com/docs/ref/info.html#/client/proc/Stat -/client/Stat() - . = ..() - if (holder) - sleep(1) - else - stoplag(5) - /client/proc/last_activity_seconds() return inactivity / 10 diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 0f5e85ec4b..a5ded4db22 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -325,7 +325,7 @@ update_icon() return - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) user.visible_message("[user] cuts the fingertips off of the [src].","You cut the fingertips off of the [src].") clipped = 1 @@ -602,7 +602,7 @@ if(usr.put_in_hands(holding)) usr.visible_message("\The [usr] pulls a knife out of their boot!") - playsound(get_turf(src), 'sound/weapons/holster/sheathout.ogg', 25) + playsound(src, 'sound/weapons/holster/sheathout.ogg', 25) holding = null overlays -= image(icon, "[icon_state]_knife") else diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm index a9a43cc297..e1f71ddc36 100644 --- a/code/modules/clothing/glasses/glasses_vr.dm +++ b/code/modules/clothing/glasses/glasses_vr.dm @@ -9,7 +9,7 @@ name = "[initial(name)]" user.visible_message("[user] replaces the prescription lenses in \the [src] with generics.") - playsound(user,'sound/items/screwdriver.ogg', 50, 1) + playsound(src,'sound/items/screwdriver.ogg', 50, 1) //Prescription kit /obj/item/device/glasses_kit diff --git a/code/modules/clothing/glasses/hud_vr.dm b/code/modules/clothing/glasses/hud_vr.dm index 01990ed031..04a1025d0e 100644 --- a/code/modules/clothing/glasses/hud_vr.dm +++ b/code/modules/clothing/glasses/hud_vr.dm @@ -38,7 +38,7 @@ /obj/item/clothing/glasses/omnihud/prescribe(var/mob/user) prescription = !prescription - playsound(user,'sound/items/screwdriver.ogg', 50, 1) + playsound(src,'sound/items/screwdriver.ogg', 50, 1) if(prescription) name = "[initial(name)] (pr)" user.visible_message("[user] uploads new prescription data to the [src.name].") diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 816c5052fc..7590817a37 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -37,7 +37,7 @@ set_slowdown() force = 5 if(icon_base) icon_state = "[icon_base]1" - playsound(get_turf(src), 'sound/effects/magnetclamp.ogg', 20) + playsound(src, 'sound/effects/magnetclamp.ogg', 20) to_chat(user, "You enable the mag-pulse traction system.") user.update_inv_shoes() //so our mob-overlays update user.update_action_buttons() diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index f2e9e689b4..cf055ae9c0 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -405,7 +405,7 @@ drain_loc = interfaced_with.loc holder.spark_system.start() - playsound(H.loc, 'sound/effects/sparks2.ogg', 50, 1) + playsound(H, 'sound/effects/sparks2.ogg', 50, 1) return 1 @@ -429,7 +429,7 @@ return 0 holder.spark_system.start() - playsound(H.loc, 'sound/effects/sparks2.ogg', 50, 1) + playsound(H, 'sound/effects/sparks2.ogg', 50, 1) H.break_cloak() diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index 6381e6b1b0..f81a48c2ac 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -59,7 +59,7 @@ for(var/mob/O in oviewers(H)) O.show_message("[H.name] appears from thin air!",1) - playsound(get_turf(H), 'sound/effects/stealthoff.ogg', 75, 1) + playsound(src, 'sound/effects/stealthoff.ogg', 75, 1) /obj/item/rig_module/teleporter @@ -83,8 +83,8 @@ return holder.spark_system.start() - playsound(T, 'sound/effects/phasein.ogg', 25, 1) - playsound(T, 'sound/effects/sparks2.ogg', 50, 1) + playsound(src, 'sound/effects/phasein.ogg', 25, 1) + playsound(src, 'sound/effects/sparks2.ogg', 50, 1) anim(T,M,'icons/mob/mob.dmi',,"phasein",,M.dir) /obj/item/rig_module/teleporter/proc/phase_out(var/mob/M,var/turf/T) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/cloak.dm b/code/modules/clothing/spacesuits/rig/modules/specific/cloak.dm index a1dfb05812..c63f1c2fbd 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/cloak.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/cloak.dm @@ -50,4 +50,4 @@ H.alpha = initial(H.alpha) H.visible_message("[H.name] appears from thin air!") - playsound(get_turf(H), 'sound/effects/stealthoff.ogg', 75, 1) \ No newline at end of file + playsound(H, 'sound/effects/stealthoff.ogg', 75, 1) \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/powersink.dm b/code/modules/clothing/spacesuits/rig/modules/specific/powersink.dm index ec8fba92d6..bfea5ccf1c 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/powersink.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/powersink.dm @@ -57,7 +57,7 @@ drain_loc = interfaced_with.loc holder.spark_system.start() - playsound(H.loc, 'sound/effects/sparks2.ogg', 50, 1) + playsound(H, 'sound/effects/sparks2.ogg', 50, 1) return 1 @@ -81,7 +81,7 @@ return 0 holder.spark_system.start() - playsound(H.loc, 'sound/effects/sparks2.ogg', 50, 1) + playsound(H, 'sound/effects/sparks2.ogg', 50, 1) H.break_cloak() diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index 04df18d1e8..82caf79deb 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -69,7 +69,7 @@ tacknife.loc = get_turf(src) if(M.put_in_active_hand(tacknife)) to_chat(M, "You slide \the [tacknife] out of [src].") - playsound(M, 'sound/weapons/flipblade.ogg', 40, 1) + playsound(src, 'sound/weapons/flipblade.ogg', 40, 1) tacknife = null update_icon() return @@ -83,7 +83,7 @@ tacknife = I I.loc = src to_chat(M, "You slide the [I] into [src].") - playsound(M, 'sound/weapons/flipblade.ogg', 40, 1) + playsound(src, 'sound/weapons/flipblade.ogg', 40, 1) update_icon() ..() diff --git a/code/modules/clothing/spacesuits/void/event.dm b/code/modules/clothing/spacesuits/void/event.dm new file mode 100644 index 0000000000..8b46a5a740 --- /dev/null +++ b/code/modules/clothing/spacesuits/void/event.dm @@ -0,0 +1,208 @@ +//Refurbished Set +//Voidsuits from old Terran exploration vessels and naval ships. + +//Standard Crewsuit (GRAY) +//Nothing really special here. Some light resists for mostly-non-combat purposes. The rad protection ain't bad? +//The reduced slowdown is an added bonus - something to make it worth considering using if you do find it. +/obj/item/clothing/head/helmet/space/void/refurb + name = "vintage crewman's voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. This one is devoid of any identifying markings or rank indicators." + icon_state = "rig0-vintagecrew" + icon = 'icons/obj/clothing/helmets_vr.dmi' + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 30, bullet = 15, laser = 15,energy = 5, bomb = 20, bio = 100, rad = 50) + light_overlay = "helmet_light" + sprite_sheets = list( + SPECIES_HUMAN = 'icons/mob/helmet_vr.dmi', + SPECIES_TAJ = 'icons/mob/species/tajaran/helmet_vr.dmi', + SPECIES_SKRELL = 'icons/mob/species/skrell/helmet_vr.dmi', + SPECIES_UNATHI = 'icons/mob/species/unathi/helmet_vr.dmi', + SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet_vr.dmi', + SPECIES_AKULA = 'icons/mob/species/unathi/helmet_vr.dmi', + SPECIES_SERGAL = 'icons/mob/species/unathi/helmet_vr.dmi', + SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/helmet_vr.dmi', + SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/helmet_vr.dmi', + SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet_vr.dmi' + ) + sprite_sheets_obj = list( + SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/helmets_vr.dmi', // Copied from void.dm + SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/helmets_vr.dmi', // Copied from void.dm + SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/helmets_vr.dmi', // Copied from void.dm + SPECIES_XENOHYBRID = 'icons/obj/clothing/species/unathi/helmets_vr.dmi', + SPECIES_AKULA = 'icons/obj/clothing/species/unathi/helmets_vr.dmi', + SPECIES_SERGAL = 'icons/obj/clothing/species/unathi/helmets_vr.dmi', + SPECIES_VULPKANIN = 'icons/obj/clothing/species/vulpkanin/helmets_vr.dmi', + SPECIES_ZORREN_HIGH = 'icons/obj/clothing/species/vulpkanin/helmets_vr.dmi', + SPECIES_FENNEC = 'icons/obj/clothing/species/vulpkanin/helmets_vr.dmi' + ) + sprite_sheets_refit = list() //have to nullify this as well just to be thorough + +/obj/item/clothing/suit/space/void/refurb + name = "vintage crewman's voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer spacers swear by these old things, even if new powered hardsuits have more features and better armor. This one is devoid of any identifying markings or rank indicators." + icon_state = "rig-vintagecrew" + icon = 'icons/obj/clothing/spacesuits_vr.dmi' + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + slowdown = 0.5 + armor = list(melee = 30, bullet = 15, laser = 15,energy = 5, bomb = 20, bio = 100, rad = 50) + allowed = list(/obj/item/device/flashlight, + /obj/item/weapon/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/weapon/storage/briefcase/inflatable, + /obj/item/device/gps, + /obj/item/device/radio/beacon, + /obj/item/weapon/pickaxe, + /obj/item/weapon/shovel + ) + sprite_sheets = list( + SPECIES_HUMAN = 'icons/mob/spacesuit_vr.dmi', + SPECIES_TAJ = 'icons/mob/species/tajaran/suit_vr.dmi', + SPECIES_SKRELL = 'icons/mob/species/skrell/suit_vr.dmi', + SPECIES_UNATHI = 'icons/mob/species/unathi/suit_vr.dmi', + SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit_vr.dmi', + SPECIES_AKULA = 'icons/mob/species/unathi/suit_vr.dmi', + SPECIES_SERGAL = 'icons/mob/species/unathi/suit_vr.dmi', + SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/suit_vr.dmi', + SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/suit_vr.dmi', + SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit_vr.dmi' + ) + sprite_sheets_obj = list( + SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/spacesuits_vr.dmi', // Copied from void.dm + SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/spacesuits_vr.dmi', // Copied from void.dm + SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/spacesuits_vr.dmi', // Copied from void.dm + SPECIES_XENOHYBRID = 'icons/obj/clothing/species/unathi/spacesuits_vr.dmi', + SPECIES_AKULA = 'icons/obj/clothing/species/unathi/spacesuits_vr.dmi', + SPECIES_SERGAL = 'icons/obj/clothing/species/unathi/spacesuits_vr.dmi', + SPECIES_VULPKANIN = 'icons/obj/clothing/species/vulpkanin/spacesuits_vr.dmi', + SPECIES_ZORREN_HIGH = 'icons/obj/clothing/species/vulpkanin/spacesuits_vr.dmi', + SPECIES_FENNEC = 'icons/obj/clothing/species/vulpkanin/spacesuits_vr.dmi' + ) + +//Engineering Crewsuit (ORANGE, RING) +//This is probably the most appealing to get your hands on for basic protection and the specialist stuff +//Don't expect it to stand up to modern assault/laser rifles, but it'll make you a fair bit tougher against most low-end pistols and SMGs +/obj/item/clothing/head/helmet/space/void/refurb/engineering + name = "vintage engineering voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. This one in particular seems to be an ode to the Ship of Theseus, but the insulation and radiation proofing are top-notch, and it has several oily stains that seem to be impossible to scrub off." + icon_state = "rig0-vintageengi" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 40, bullet = 20, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 100) + min_pressure_protection = 0 * ONE_ATMOSPHERE + max_pressure_protection = 15 * ONE_ATMOSPHERE + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + +/obj/item/clothing/suit/space/void/refurb/engineering + name = "vintage engineering voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. This one in particular seems to be an ode to the Ship of Theseus, but the insulation and radiation proofing are top-notch. The chestplate bears the logo of an old shipyard - though you don't recognize the name." + icon_state = "rig-vintageengi" + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + slowdown = 1 + armor = list(melee = 40, bullet = 20, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 100) + min_pressure_protection = 0 * ONE_ATMOSPHERE + max_pressure_protection = 15 * ONE_ATMOSPHERE + max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE + allowed = list(/obj/item/device/flashlight, + /obj/item/weapon/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/device/t_scanner, + /obj/item/weapon/rcd, + /obj/item/weapon/rcd_ammo, + /obj/item/weapon/storage/toolbox, + /obj/item/weapon/storage/briefcase/inflatable, + /obj/item/device/gps, + /obj/item/device/radio/beacon, + /obj/item/weapon/tool, + /obj/item/weapon/weldingtool, + /obj/item/weapon/cell, + /obj/item/weapon/pickaxe, + /obj/item/weapon/shovel + ) + +//Medical Crewsuit (GREEN, CROSS) +//This thing is basically tissuepaper, but it has very solid rad protection for its age +//It also has the bonus of not slowing you down quite as much as other suits, same as the crew suit +/obj/item/clothing/head/helmet/space/void/refurb/medical + name = "vintage medical voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. The green and white markings indicate this as a medic's suit." + icon_state = "rig0-vintagemedic" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 30, bullet = 15, laser = 15, energy = 5, bomb = 25, bio = 100, rad = 75) + +/obj/item/clothing/suit/space/void/refurb/medical + name = "vintage medical voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer spacers swear by these old things, even if new powered hardsuits have more features and better armor. The green and white markings indicate this as a medic's suit." + icon_state = "rig-vintagemedic" + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + slowdown = 0.5 + armor = list(melee = 30, bullet = 15, laser = 15, energy = 5, bomb = 25, bio = 100, rad = 75) + allowed = list(/obj/item/device/flashlight, + /obj/item/weapon/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/weapon/storage/firstaid, + /obj/item/device/healthanalyzer, + /obj/item/stack/medical, + /obj/item/device/gps, + /obj/item/device/radio/beacon, + /obj/item/weapon/cell + ) + +//Marine Crewsuit (BLUE, SHIELD) +//Really solid, balance between Sec and Sec EVA, but it has slightly worse shock protection +/obj/item/clothing/head/helmet/space/void/refurb/marine + name = "vintage marine's voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. The blue markings indicate this as the marine/guard variant, likely from a merchant ship." + icon_state = "rig0-vintagemarine" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 40, bullet = 35, laser = 35, energy = 5, bomb = 40, bio = 100, rad = 50) + siemens_coefficient = 0.8 + +/obj/item/clothing/suit/space/void/refurb/marine + name = "vintage marine's voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer marines swear by these old things, even if new powered hardsuits have more features and better armor. The blue markings indicate this as the marine/guard variant, likely from a merchant ship." + icon_state = "rig-vintagemarine" + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + slowdown = 1 + armor = list(melee = 40, bullet = 35, laser = 35, energy = 5, bomb = 40, bio = 100, rad = 50) + siemens_coefficient = 0.8 + allowed = list(/obj/item/weapon/gun, + /obj/item/device/flashlight, + /obj/item/weapon/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/weapon/melee, + /obj/item/device/gps, + /obj/item/device/radio/beacon, + /obj/item/weapon/handcuffs, + /obj/item/ammo_magazine, + /obj/item/weapon/cell + ) + +//Officer Crewsuit (GOLD, X) +//The best of the bunch - at the time, this would have been almost cutting edge +//Now it's good, but it's badly outclassed by the hot shit that the TSCs and such can get +/obj/item/clothing/head/helmet/space/void/refurb/officer + name = "vintage officer's voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. This variant appears to be an officer's, and has the best protection of all the old models." + icon_state = "rig0-vintageofficer" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 50, bullet = 45, laser = 45, energy = 10, bomb = 30, bio = 100, rad = 60) + siemens_coefficient = 0.7 + +/obj/item/clothing/suit/space/void/refurb/officer + name = "vintage officer's voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer spacers swear by these old things, even if new powered hardsuits have more features and better armor. This variant appears to be an officer's, and has the best protection of all the old models." + icon_state = "rig-vintageofficer" + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + slowdown = 1 + armor = list(melee = 50, bullet = 45, laser = 45, energy = 10, bomb = 30, bio = 100, rad = 60) + siemens_coefficient = 0.7 + allowed = list(/obj/item/weapon/gun, + /obj/item/device/flashlight, + /obj/item/weapon/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/weapon/melee, + /obj/item/device/gps, + /obj/item/device/radio/beacon, + /obj/item/weapon/handcuffs, + /obj/item/ammo_magazine, + /obj/item/weapon/cell + ) \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/void/event_vr.dm b/code/modules/clothing/spacesuits/void/event_vr.dm new file mode 100644 index 0000000000..2a49229d0a --- /dev/null +++ b/code/modules/clothing/spacesuits/void/event_vr.dm @@ -0,0 +1,40 @@ +/obj/item/clothing/head/helmet/space/void/refurb/talon + name = "talon pilot's voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. This one belongs to the ship's pilot." + camera_networks = list(NETWORK_TALON_HELMETS) + +/obj/item/clothing/suit/space/void/refurb/talon + name = "talon pilot's voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer spacers swear by these old things, even if new powered hardsuits have more features and better armor. This one belongs to the ship's pilot." + +/obj/item/clothing/head/helmet/space/void/refurb/engineering/talon + name = "talon engineering voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. This one in particular must be several decades old, but the insulation and radiation proofing are top-notch. Don't mind the grease marks." + camera_networks = list(NETWORK_TALON_HELMETS) + +/obj/item/clothing/suit/space/void/refurb/engineering/talon + name = "talon engineering voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. This one in particular must be several decades old, but the insulation and radiation proofing are top-notch. The chestplate has a simple gear logo on it." + +/obj/item/clothing/head/helmet/space/void/refurb/medical/talon + name = "talon medical voidsuit helmet" + camera_networks = list(NETWORK_TALON_HELMETS) + +/obj/item/clothing/suit/space/void/refurb/medical/talon + name = "talon medical voidsuit" + +/obj/item/clothing/head/helmet/space/void/refurb/marine/talon + name = "talon marine's voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. The blue markings indicate this as the marine/guard variant." + camera_networks = list(NETWORK_TALON_HELMETS) + +/obj/item/clothing/suit/space/void/refurb/marine/talon + name = "talon marine's voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer marines swear by these old things, even if new powered hardsuits have more features and better armor. The blue markings indicate this as the marine/guard variant." + +/obj/item/clothing/head/helmet/space/void/refurb/officer/talon + name = "talon officer's voidsuit helmet" + camera_networks = list(NETWORK_TALON_HELMETS) + +/obj/item/clothing/suit/space/void/refurb/officer/talon + name = "talon officer's voidsuit" \ No newline at end of file diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index c41ff83d81..7fb4df785e 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -189,7 +189,7 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) spark_system.start() - playsound(user.loc, "sparks", 50, 1) + playsound(src, "sparks", 50, 1) user.loc = picked return PROJECTILE_FORCE_MISS diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index c241a7f701..b1237ed62b 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -25,7 +25,7 @@ return if(holster_in) - playsound(get_turf(src), holster_in, 50) + playsound(src, holster_in, 50) if(istype(user)) user.stop_aiming(no_message=1) @@ -62,7 +62,7 @@ ) if(holster_out) - playsound(get_turf(src), holster_out, sound_vol) + playsound(src, holster_out, sound_vol) user.put_in_hands(holstered) holstered.add_fingerprint(user) diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index b02660b69d..d6224638c3 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -58,9 +58,9 @@ log transactions for(var/obj/item/weapon/spacecash/S in src) S.loc = src.loc if(prob(50)) - playsound(loc, 'sound/items/polaroid1.ogg', 50, 1) + playsound(src, 'sound/items/polaroid1.ogg', 50, 1) else - playsound(loc, 'sound/items/polaroid2.ogg', 50, 1) + playsound(src, 'sound/items/polaroid2.ogg', 50, 1) break /obj/machinery/atm/emag_act(var/remaining_charges, var/mob/user) @@ -103,9 +103,9 @@ log transactions //consume the money authenticated_account.money += I:worth if(prob(50)) - playsound(loc, 'sound/items/polaroid1.ogg', 50, 1) + playsound(src, 'sound/items/polaroid1.ogg', 50, 1) else - playsound(loc, 'sound/items/polaroid2.ogg', 50, 1) + playsound(src, 'sound/items/polaroid2.ogg', 50, 1) //create a transaction log entry var/datum/transaction/T = new() @@ -383,9 +383,9 @@ log transactions R.stamps += "
This paper has been stamped by the Automatic Teller Machine." if(prob(50)) - playsound(loc, 'sound/items/polaroid1.ogg', 50, 1) + playsound(src, 'sound/items/polaroid1.ogg', 50, 1) else - playsound(loc, 'sound/items/polaroid2.ogg', 50, 1) + playsound(src, 'sound/items/polaroid2.ogg', 50, 1) if ("print_transaction") if(authenticated_account) var/obj/item/weapon/paper/R = new(src.loc) @@ -425,9 +425,9 @@ log transactions R.stamps += "
This paper has been stamped by the Automatic Teller Machine." if(prob(50)) - playsound(loc, 'sound/items/polaroid1.ogg', 50, 1) + playsound(src, 'sound/items/polaroid1.ogg', 50, 1) else - playsound(loc, 'sound/items/polaroid2.ogg', 50, 1) + playsound(src, 'sound/items/polaroid2.ogg', 50, 1) if("insert_card") if(!held_card) diff --git a/code/modules/events/money_spam.dm b/code/modules/events/money_spam.dm index 8e4fabe4a2..0b877cef3d 100644 --- a/code/modules/events/money_spam.dm +++ b/code/modules/events/money_spam.dm @@ -65,7 +65,7 @@ message = pick("Luxury watches for Blowout sale prices!",\ "Watches, Jewelry & Accessories, Bags & Wallets !",\ "Deposit 100$ and get 300$ totally free!",\ - " 100K NT.|WOWGOLD õnly $89 ",\ + " 100K NT.|WOWGOLD �nly $89 ",\ "We have been filed with a complaint from one of your customers in respect of their business relations with you.",\ "We kindly ask you to open the COMPLAINT REPORT (attached) to reply on this complaint..") if(4) @@ -113,7 +113,7 @@ //P.tnote += "← From [sender] (Unknown / spam?):
[message]
" if (!P.message_silent) - playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1) + playsound(P, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(3, P.loc)) if(!P.message_silent) O.show_message(text("[bicon(P)] *[P.ttone]*")) //Search for holder of the PDA. diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm index 1dd137ff32..657946d019 100644 --- a/code/modules/food/food/condiment.dm +++ b/code/modules/food/food/condiment.dm @@ -48,7 +48,7 @@ ..() /obj/item/weapon/reagent_containers/food/condiment/feed_sound(var/mob/user) - playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1) + playsound(src, 'sound/items/drink.ogg', rand(10, 50), 1) /obj/item/weapon/reagent_containers/food/condiment/self_feed_message(var/mob/user) to_chat(user, "You swallow some of contents of \the [src].") diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 546c47a7e2..816c910339 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -25,7 +25,7 @@ open(user) /obj/item/weapon/reagent_containers/food/drinks/proc/open(mob/user) - playsound(loc,"canopen", rand(10,50), 1) + playsound(src,"canopen", rand(10,50), 1) to_chat(user, "You open [src] with an audible pop!") flags |= OPENCONTAINER @@ -69,7 +69,7 @@ to_chat(user, "You swallow a gulp from \the [src].") /obj/item/weapon/reagent_containers/food/drinks/feed_sound(var/mob/user) - playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1) + playsound(src, 'sound/items/drink.ogg', rand(10, 50), 1) /obj/item/weapon/reagent_containers/food/drinks/examine(mob/user) . = ..() diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index 28915dff7e..89c06552f5 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -187,7 +187,7 @@ var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken") /obj/item/weapon/broken_bottle/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return ..() /obj/item/weapon/reagent_containers/food/drinks/bottle/gin diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index a3f16a3563..72ac7787ce 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -135,7 +135,7 @@ return if(reagents) //Handle ingestion of the reagent. - playsound(M.loc,'sound/items/eatfood.ogg', rand(10,50), 1) + playsound(M,'sound/items/eatfood.ogg', rand(10,50), 1) if(reagents.total_volume) if(reagents.total_volume > bitesize) reagents.trans_to_mob(M, bitesize, CHEM_INGEST) diff --git a/code/modules/food/kitchen/cooking_machines/_cooker.dm b/code/modules/food/kitchen/cooking_machines/_cooker.dm index 70d7a9ad9c..f0716e015f 100644 --- a/code/modules/food/kitchen/cooking_machines/_cooker.dm +++ b/code/modules/food/kitchen/cooking_machines/_cooker.dm @@ -166,7 +166,7 @@ qdel(cooking_obj) src.visible_message("\The [src] pings!") if(cooked_sound) - playsound(get_turf(src), cooked_sound, 50, 1) + playsound(src, cooked_sound, 50, 1) if(!can_burn_food) icon_state = off_icon diff --git a/code/modules/food/kitchen/gibber.dm b/code/modules/food/kitchen/gibber.dm index ab70028bd6..1fca845091 100644 --- a/code/modules/food/kitchen/gibber.dm +++ b/code/modules/food/kitchen/gibber.dm @@ -227,7 +227,7 @@ occupant.gib() occupant = null - playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) + playsound(src, 'sound/effects/splat.ogg', 50, 1) operating = 0 for (var/obj/thing in contents) // There's a chance that the gibber will fail to destroy some evidence. diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 593a7892fd..8f27afe2b1 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -353,7 +353,7 @@ src.updateUsrDialog() /obj/machinery/microwave/proc/muck_start() - playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) // Play a splat sound + playsound(src, 'sound/effects/splat.ogg', 50, 1) // Play a splat sound src.icon_state = "mwbloody1" // Make it look dirty!! /obj/machinery/microwave/proc/muck_finish() diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index d4eb606aa2..3be22f940a 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -230,7 +230,7 @@ cards -= P cards = newcards user.visible_message("\The [user] shuffles [src].") - playsound(user, 'sound/items/cardshuffle.ogg', 50, 1) + playsound(src, 'sound/items/cardshuffle.ogg', 50, 1) cooldown = world.time else return diff --git a/code/modules/games/tarot.dm b/code/modules/games/tarot.dm index cae71540cb..7c49f7ec43 100644 --- a/code/modules/games/tarot.dm +++ b/code/modules/games/tarot.dm @@ -36,7 +36,7 @@ newcards += P cards -= P cards = newcards - playsound(user, 'sound/items/cardshuffle.ogg', 50, 1) + playsound(src, 'sound/items/cardshuffle.ogg', 50, 1) user.visible_message("\The [user] shuffles [src].") cooldown = world.time else diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm index 2d02146315..1cd3ddf51d 100644 --- a/code/modules/holodeck/HolodeckControl.dm +++ b/code/modules/holodeck/HolodeckControl.dm @@ -155,7 +155,7 @@ SSnanoui.update_uis(src) /obj/machinery/computer/HolodeckControl/emag_act(var/remaining_charges, var/mob/user as mob) - playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) + playsound(src, 'sound/effects/sparks4.ogg', 75, 1) last_to_emag = user //emag again to change the owner if (!emagged) emagged = 1 diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index ed66db42f3..f4abcc9e0f 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -137,7 +137,7 @@ datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/u user.do_attack_animation(src) var/damage = rand(0, 9) if(!damage) - playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(target, 'sound/weapons/punchmiss.ogg', 25, 1, -1) target.visible_message("[user] has attempted to punch [target]!") return TRUE var/obj/item/organ/external/affecting = target.get_organ(ran_zone(user.zone_sel.selecting)) @@ -147,7 +147,7 @@ datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/u if(HULK in user.mutations) damage += 5 - playsound(target.loc, "punch", 25, 1, -1) + playsound(target, "punch", 25, 1, -1) target.visible_message("[user] has punched [target]!") @@ -204,7 +204,7 @@ datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/u update_nearby_icons() step(src, get_dir(user, src)) else - playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) ..() return @@ -222,7 +222,7 @@ datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/u if(src.density && istype(I, /obj/item/weapon) && !istype(I, /obj/item/weapon/card)) var/aforce = I.force - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) visible_message("[src] was hit by [I].") if(I.damtype == BRUTE || I.damtype == BURN) take_damage(aforce) @@ -294,7 +294,7 @@ datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/u var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) spark_system.start() - playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) return TRUE return FALSE @@ -304,13 +304,13 @@ datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/u force = 30 item_state = "[icon_state]_blade" w_class = ITEMSIZE_LARGE - playsound(user, 'sound/weapons/saberon.ogg', 50, 1) + playsound(src, 'sound/weapons/saberon.ogg', 50, 1) to_chat(user, "[src] is now active.") else force = 3 item_state = "[icon_state]" w_class = ITEMSIZE_SMALL - playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) + playsound(src, 'sound/weapons/saberoff.ogg', 50, 1) to_chat(user, "[src] can now be concealed.") update_icon() diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm index a170bc9c0d..4172d3dead 100644 --- a/code/modules/hydroponics/beekeeping/beehive.dm +++ b/code/modules/hydroponics/beekeeping/beehive.dm @@ -43,7 +43,7 @@ return else if(I.is_wrench()) anchored = !anchored - playsound(loc, I.usesound, 50, 1) + playsound(src, I.usesound, 50, 1) user.visible_message("[user] [anchored ? "wrenches" : "unwrenches"] \the [src].", "You [anchored ? "wrench" : "unwrench"] \the [src].") return else if(istype(I, /obj/item/bee_smoker)) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 90afa7f416..ad3b16e440 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -164,7 +164,7 @@ M.stop_pulling() to_chat(M, "You slipped on the [name]!") - playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) + playsound(src, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(8) M.Weaken(5) seed.thrown_at(src,M) @@ -200,7 +200,7 @@ else if(seed.chems) if(W.sharp && W.edge && !isnull(seed.chems["woodpulp"])) user.show_message("You make planks out of \the [src]!", 1) - playsound(loc, 'sound/effects/woodcutting.ogg', 50, 1) + playsound(src, 'sound/effects/woodcutting.ogg', 50, 1) var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR) if(!flesh_colour) flesh_colour = seed.get_trait(TRAIT_PRODUCT_COLOUR) for(var/i=0,i<2,i++) diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 053ce5a59c..b8ea1fa748 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -502,7 +502,7 @@ to_chat(user, "There are no seeds in \the [O.name].") return else if(O.is_wrench()) - playsound(loc, O.usesound, 50, 1) + playsound(src, O.usesound, 50, 1) anchored = !anchored to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") else if(O.is_screwdriver()) diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 50da409bc2..474800fcf4 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -566,7 +566,7 @@ pestlevel -= spray.pest_kill_str weedlevel -= spray.weed_kill_str to_chat(user, "You spray [src] with [O].") - playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6) + playsound(src, 'sound/effects/spray3.ogg', 50, 1, -6) qdel(O) check_health() @@ -576,7 +576,7 @@ if(locate(/obj/machinery/atmospherics/portables_connector/) in loc) return ..() - playsound(loc, O.usesound, 50, 1) + playsound(src, O.usesound, 50, 1) anchored = !anchored to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index e8a7a5dc89..aea7ffc4ea 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -248,12 +248,12 @@ return FALSE if(add_circuit(I, user)) to_chat(user, "You slide \the [I] inside \the [src].") - playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) interact(user) return TRUE else if(I.is_crowbar()) - playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) + playsound(src, 'sound/items/Crowbar.ogg', 50, 1) opened = !opened to_chat(user, "You [opened ? "opened" : "closed"] \the [src].") update_icon() @@ -284,7 +284,7 @@ user.drop_item(cell) cell.forceMove(src) battery = cell - playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You slot \the [cell] inside \the [src]'s power supplier.") interact(user) return TRUE diff --git a/code/modules/integrated_electronics/core/assemblies/device.dm b/code/modules/integrated_electronics/core/assemblies/device.dm index de92fe6638..3170393fc3 100644 --- a/code/modules/integrated_electronics/core/assemblies/device.dm +++ b/code/modules/integrated_electronics/core/assemblies/device.dm @@ -20,7 +20,7 @@ ..() /obj/item/device/assembly/electronic_assembly/proc/toggle_open(mob/user) - playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) + playsound(src, 'sound/items/Crowbar.ogg', 50, 1) opened = !opened EA.opened = opened to_chat(user, "You [opened ? "opened" : "closed"] \the [src].") diff --git a/code/modules/integrated_electronics/core/assemblies/generic.dm b/code/modules/integrated_electronics/core/assemblies/generic.dm index 2508f9919d..49a933fe1b 100644 --- a/code/modules/integrated_electronics/core/assemblies/generic.dm +++ b/code/modules/integrated_electronics/core/assemblies/generic.dm @@ -211,7 +211,7 @@ if(!istype(T, /turf/simulated/floor)) to_chat(user, "You cannot place \the [src] on this spot!") return - playsound(src.loc, 'sound/machines/click.ogg', 75, 1) + playsound(src, 'sound/machines/click.ogg', 75, 1) user.visible_message("\The [user] attaches \the [src] to the wall.", "You attach \the [src] to the wall.", "You hear clicking.") diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm index 7bb9b332d1..d64f9a8645 100644 --- a/code/modules/integrated_electronics/subtypes/manipulation.dm +++ b/code/modules/integrated_electronics/subtypes/manipulation.dm @@ -39,7 +39,7 @@ size += gun.w_class gun.forceMove(src) to_chat(user, "You slide \the [gun] into the firing mechanism.") - playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) + playsound(src, 'sound/items/Crowbar.ogg', 50, 1) else ..() @@ -48,7 +48,7 @@ installed_gun.forceMove(get_turf(src)) to_chat(user, "You slide \the [installed_gun] out of the firing mechanism.") size = initial(size) - playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) + playsound(src, 'sound/items/Crowbar.ogg', 50, 1) installed_gun = null else to_chat(user, "There's no weapon to remove from the mechanism.") diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm index 110d237629..5f4685da95 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -198,7 +198,7 @@ if(!selected_sound) return vol = between(0, vol, 100) - playsound(get_turf(src), selected_sound, vol, freq, -1) + playsound(src, selected_sound, vol, freq, -1) /obj/item/integrated_circuit/output/sound/beeper name = "beeper circuit" diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index ca834b3a09..f0e92e9e7a 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -37,7 +37,7 @@ ..() /obj/item/integrated_circuit/reagent/smoke/do_work() - playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3) + playsound(src, 'sound/effects/smoke.ogg', 50, 1, -3) var/datum/effect/effect/system/smoke_spread/chem/smoke_system = new() smoke_system.set_up(reagents, 10, 0, get_turf(src)) spawn(0) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 1eb05b7949..9273ece79e 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -39,11 +39,11 @@ else name = ("bookcase ([newname])") else if(O.is_wrench()) - playsound(loc, O.usesound, 100, 1) + playsound(src, O.usesound, 100, 1) to_chat(user, (anchored ? "You unfasten \the [src] from the floor." : "You secure \the [src] to the floor.")) anchored = !anchored else if(O.is_screwdriver()) - playsound(loc, O.usesound, 75, 1) + playsound(src, O.usesound, 75, 1) to_chat(user, "You begin dismantling \the [src].") if(do_after(user,25 * O.toolspeed)) to_chat(user, "You dismantle \the [src].") @@ -195,9 +195,9 @@ Book Cart End if(src.dat) user << browse("Penned by [author].
" + "[dat]", "window=book") user.visible_message("[user] opens a book titled \"[src.title]\" and begins reading intently.") - playsound(loc, 'sound/bureaucracy/bookopen.ogg', 50, 1) + playsound(src, 'sound/bureaucracy/bookopen.ogg', 50, 1) onclose(user, "book") - playsound(loc, 'sound/bureaucracy/bookclose.ogg', 50, 1) + playsound(src, 'sound/bureaucracy/bookclose.ogg', 50, 1) else to_chat(user, "This book is completely blank!") @@ -280,7 +280,7 @@ Book Cart End to_chat(user, "You begin to carve out [title].") if(do_after(user, 30)) to_chat(user, "You carve out the pages from [title]! You didn't want to read it anyway.") - playsound(loc, 'sound/bureaucracy/papercrumple.ogg', 50, 1) + playsound(src, 'sound/bureaucracy/papercrumple.ogg', 50, 1) new /obj/item/weapon/shreddedp(get_turf(src)) carved = 1 return @@ -353,11 +353,11 @@ Book Cart End if(href_list["next_page"]) if(page != pages.len) page++ - playsound(src.loc, "pageturn", 50, 1) + playsound(src, "pageturn", 50, 1) if(href_list["prev_page"]) if(page > 1) page-- - playsound(src.loc, "pageturn", 50, 1) + playsound(src, "pageturn", 50, 1) src.attack_self(usr) updateUsrDialog() else diff --git a/code/modules/looking_glass/lg_console.dm b/code/modules/looking_glass/lg_console.dm index 410269b8a0..60b51a325a 100644 --- a/code/modules/looking_glass/lg_console.dm +++ b/code/modules/looking_glass/lg_console.dm @@ -118,7 +118,7 @@ /obj/machinery/computer/looking_glass/emag_act(var/remaining_charges, var/mob/user as mob) if (!emagged) - playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) + playsound(src, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 to_chat(user, "You unlock several programs that were hidden somewhere in memory.") log_game("[key_name(usr)] emagged the [name]") diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index 01cfd9bc62..029191ff6e 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -362,7 +362,7 @@ user.setClickCooldown(time) if(do_after(user, time, src) && use(1)) to_chat(user, "You cut up a log into planks.") - playsound(get_turf(src), 'sound/effects/woodcutting.ogg', 50, 1) + playsound(src, 'sound/effects/woodcutting.ogg', 50, 1) var/obj/item/stack/material/wood/existing_wood = null for(var/obj/item/stack/material/wood/M in user.loc) if(M.material.name == src.material.name) diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 6f8fc7a8f9..11917f4c40 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -164,7 +164,7 @@ to_chat(user, "You leave the crate alone.") else if(check_input(input)) to_chat(user, "The crate unlocks!") - playsound(user, 'sound/machines/lockreset.ogg', 50, 1) + playsound(src, 'sound/machines/lockreset.ogg', 50, 1) set_locked(0) else visible_message("A red light on \the [src]'s control panel flashes briefly.") diff --git a/code/modules/mining/drilling/scanner.dm b/code/modules/mining/drilling/scanner.dm index 1bd784bdb9..31da4a9753 100644 --- a/code/modules/mining/drilling/scanner.dm +++ b/code/modules/mining/drilling/scanner.dm @@ -10,7 +10,7 @@ /obj/item/weapon/mining_scanner/attack_self(mob/user as mob) to_chat(user, "You begin sweeping \the [src] about, scanning for metal deposits.") - playsound(loc, 'sound/items/goggles_charge.ogg', 50, 1, -6) + playsound(src, 'sound/items/goggles_charge.ogg', 50, 1, -6) if(!do_after(user, scan_time)) return diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index c6f7cc4a9f..d2bb572512 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -93,7 +93,7 @@ var/global/list/total_extraction_beacons = list() balloon.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM holder_obj.cut_overlay(balloon2) holder_obj.add_overlay(balloon) - playsound(holder_obj.loc, 'sound/items/fulext_deploy.wav', 50, 1, -3) + playsound(holder_obj, 'sound/items/fulext_deploy.wav', 50, 1, -3) animate(holder_obj, pixel_z = 10, time = 20) sleep(20) animate(holder_obj, pixel_z = 15, time = 10) @@ -104,7 +104,7 @@ var/global/list/total_extraction_beacons = list() sleep(10) animate(holder_obj, pixel_z = 10, time = 10) sleep(10) - playsound(holder_obj.loc, 'sound/items/fultext_launch.wav', 50, 1, -3) + playsound(holder_obj, 'sound/items/fultext_launch.wav', 50, 1, -3) animate(holder_obj, pixel_z = 1000, time = 30) if(ishuman(A)) var/mob/living/carbon/human/L = A diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 79ef6b1c4c..3868a23826 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -337,7 +337,7 @@ turf/simulated/mineral/floor/light_corner return to_chat(user, "You start digging.") - playsound(user.loc, 'sound/effects/rustle1.ogg', 50, 1) + playsound(user, 'sound/effects/rustle1.ogg', 50, 1) if(!do_after(user,30)) return //YAWN change. 30 from 40 diff --git a/code/modules/mining/shelter_atoms_vr.dm b/code/modules/mining/shelter_atoms_vr.dm index d3be02cfd7..8d080c64cd 100644 --- a/code/modules/mining/shelter_atoms_vr.dm +++ b/code/modules/mining/shelter_atoms_vr.dm @@ -87,7 +87,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) smoke.start() sleep(4 SECONDS) - playsound(get_turf(src), 'sound/effects/phasein.ogg', 100, 1) + playsound(src, 'sound/effects/phasein.ogg', 100, 1) log_and_message_admins("[key_name_admin(usr)] activated a bluespace capsule at [get_area(T)]!") if(above_location) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 1a8c2df735..cede44eecf 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -91,8 +91,6 @@ var/track = null if(isobserver(src)) - if(italics && is_preference_enabled(/datum/client_preference/ghost_radio)) - return if(speaker_name != speaker.real_name && speaker.real_name) speaker_name = "[speaker.real_name] ([speaker_name])" track = "([ghost_follow_link(speaker, src)]) " @@ -281,4 +279,4 @@ name = speaker.voice_name var/rendered = "[name] [message]" - to_chat(src, rendered) \ No newline at end of file + to_chat(src, rendered) diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm index 14d6fb853d..cf372545e7 100644 --- a/code/modules/mob/language/language.dm +++ b/code/modules/mob/language/language.dm @@ -270,7 +270,7 @@ if (species_language) set_default_language(GLOB.all_languages[species_language]) else - set_default_language(null) + set_default_language(GLOB.all_languages[LANGUAGE_GIBBERISH]) else var/datum/language/L = locate(href_list["default_lang"]) if(L && (L in languages)) diff --git a/code/modules/mob/living/bot/SLed209bot.dm b/code/modules/mob/living/bot/SLed209bot.dm index 7b5bbc76e5..fa17b05696 100644 --- a/code/modules/mob/living/bot/SLed209bot.dm +++ b/code/modules/mob/living/bot/SLed209bot.dm @@ -40,7 +40,7 @@ if(emagged) projectile = /obj/item/projectile/beam/shock - playsound(loc, emagged ? 'sound/weapons/laser3.ogg' : 'sound/weapons/Taser.ogg', 50, 1) + playsound(src, emagged ? 'sound/weapons/laser3.ogg' : 'sound/weapons/Taser.ogg', 50, 1) var/obj/item/projectile/P = new projectile(loc) P.firer = src diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index b1ea693f2f..6a4c45f123 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -22,7 +22,7 @@ /mob/living/bot/cleanbot/handleIdle() if(!screwloose && !oddbutton && prob(2)) custom_emote(2, "makes an excited booping sound!") - playsound(src.loc, 'sound/machines/synth_yes.ogg', 50, 0) + playsound(src, 'sound/machines/synth_yes.ogg', 50, 0) if(screwloose && prob(5)) // Make a mess if(istype(loc, /turf/simulated)) @@ -179,7 +179,7 @@ if(!screwloose || !oddbutton) if(user) to_chat(user, "The [src] buzzes and beeps.") - playsound(src.loc, 'sound/machines/buzzbeep.ogg', 50, 0) + playsound(src, 'sound/machines/buzzbeep.ogg', 50, 0) oddbutton = 1 screwloose = 1 return 1 diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm index 0d77e837f0..f0e58c455f 100644 --- a/code/modules/mob/living/bot/ed209bot.dm +++ b/code/modules/mob/living/bot/ed209bot.dm @@ -65,7 +65,7 @@ if(emagged) projectile = /obj/item/projectile/beam - playsound(loc, emagged ? 'sound/weapons/Laser.ogg' : 'sound/weapons/Taser.ogg', 50, 1) + playsound(src, emagged ? 'sound/weapons/Laser.ogg' : 'sound/weapons/Taser.ogg', 50, 1) var/obj/item/projectile/P = new projectile(loc) P.firer = src diff --git a/code/modules/mob/living/bot/edCLNbot.dm b/code/modules/mob/living/bot/edCLNbot.dm index 13abfa8da3..a7b9812b9f 100644 --- a/code/modules/mob/living/bot/edCLNbot.dm +++ b/code/modules/mob/living/bot/edCLNbot.dm @@ -27,7 +27,7 @@ /mob/living/bot/cleanbot/edCLN/handleIdle() if(prob(10)) custom_emote(2, "makes a less than thrilled beeping sound.") - playsound(src.loc, 'sound/machines/synth_yes.ogg', 50, 0) + playsound(src, 'sound/machines/synth_yes.ogg', 50, 0) if(red_switch && !blue_switch && !green_switch && prob(10) || src.emagged) if(istype(loc, /turf/simulated)) @@ -124,7 +124,7 @@ if(!emagged) if(user) to_chat(user, "The [src] buzzes and beeps.") - playsound(src.loc, 'sound/machines/buzzbeep.ogg', 50, 0) + playsound(src, 'sound/machines/buzzbeep.ogg', 50, 0) emagged = 1 return 1 diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 4cfb7417a8..18bd3805c3 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -185,7 +185,7 @@ busy = 1 if(do_after(src, 30, A)) - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + playsound(src, 'sound/effects/slosh.ogg', 25, 1) visible_message("[src] waters \the [A].") tank.reagents.trans_to(T, 100 - T.waterlevel) if(FARMBOT_UPROOT) @@ -223,7 +223,7 @@ while(do_after(src, 10) && tank.reagents.total_volume < tank.reagents.maximum_volume) tank.reagents.add_reagent("water", 100) //VOREStation Edit if(prob(5)) - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + playsound(src, 'sound/effects/slosh.ogg', 25, 1) busy = 0 action = "" diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm index aa399a22f3..c34274a6ab 100644 --- a/code/modules/mob/living/bot/floorbot.dm +++ b/code/modules/mob/living/bot/floorbot.dm @@ -58,7 +58,7 @@ emagged = 1 if(user) to_chat(user, "The [src] buzzes and beeps.") - playsound(src.loc, 'sound/machines/buzzbeep.ogg', 50, 0) + playsound(src, 'sound/machines/buzzbeep.ogg', 50, 0) return 1 /mob/living/bot/floorbot/Topic(href, href_list) @@ -102,7 +102,7 @@ if(prob(1)) custom_emote(2, "makes an excited beeping sound!") - playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0) + playsound(src, 'sound/machines/twobeep.ogg', 50, 0) /mob/living/bot/floorbot/handleAdjacentTarget() if(get_turf(target) == src.loc) @@ -278,7 +278,7 @@ /mob/living/bot/floorbot/explode() turn_off() visible_message("\The [src] blows apart!") - playsound(src.loc, "sparks", 50, 1) + playsound(src, "sparks", 50, 1) var/turf/Tsec = get_turf(src) var/obj/item/weapon/storage/toolbox/mechanical/N = new /obj/item/weapon/storage/toolbox/mechanical(Tsec) diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm index edb7486fd1..a67440e013 100644 --- a/code/modules/mob/living/bot/medbot.dm +++ b/code/modules/mob/living/bot/medbot.dm @@ -44,7 +44,7 @@ ) var/message = pick(message_options) say(message) - playsound(loc, message_options[message], 50, 0) + playsound(src, message_options[message], 50, 0) /mob/living/bot/medbot/handleAdjacentTarget() UnarmedAttack(target) @@ -88,7 +88,7 @@ ) var/message = pick(message_options) say(message) - playsound(loc, message_options[message], 50, 0) + playsound(src, message_options[message], 50, 0) custom_emote(1, "points at [H.name].") last_newpatient_speak = world.time break @@ -133,7 +133,7 @@ ) var/message = pick(death_messages) say(message) - playsound(loc, death_messages[message], 50, 0) + playsound(src, death_messages[message], 50, 0) // This is down here for the same reason as above. else @@ -148,7 +148,7 @@ ) var/message = pick(possible_messages) say(message) - playsound(loc, possible_messages[message], 50, 0) + playsound(src, possible_messages[message], 50, 0) busy = 0 update_icons() @@ -293,7 +293,7 @@ reagent_glass = null if(emagged && prob(25)) - playsound(loc, 'sound/voice/medbot/minsult.ogg', 50, 0) + playsound(src, 'sound/voice/medbot/minsult.ogg', 50, 0) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) diff --git a/code/modules/mob/living/bot/mulebot.dm b/code/modules/mob/living/bot/mulebot.dm index b0eee0e650..9bef4c0cbc 100644 --- a/code/modules/mob/living/bot/mulebot.dm +++ b/code/modules/mob/living/bot/mulebot.dm @@ -183,7 +183,7 @@ locked = !locked to_chat(user, "You [locked ? "lock" : "unlock"] the mulebot's controls!") flick("mulebot-emagged", src) - playsound(loc, 'sound/effects/sparks1.ogg', 100, 0) + playsound(src, 'sound/effects/sparks1.ogg', 100, 0) return 1 /mob/living/bot/mulebot/update_icons() @@ -202,13 +202,13 @@ /mob/living/bot/mulebot/handleFrustrated() custom_emote(2, "makes a sighing buzz.") - playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) ..() /mob/living/bot/mulebot/handleAdjacentTarget() if(target == src.loc) custom_emote(2, "makes a chiming sound.") - playsound(loc, 'sound/machines/chime.ogg', 50, 0) + playsound(src, 'sound/machines/chime.ogg', 50, 0) UnarmedAttack(target) resetTarget() if(auto_return && home && (loc != home)) @@ -244,7 +244,7 @@ /mob/living/bot/mulebot/proc/runOver(var/mob/living/carbon/human/H) if(istype(H)) // No safety checks - WILL run over lying humans. Stop ERPing in the maint! visible_message("[src] drives over [H]!") - playsound(loc, 'sound/effects/splat.ogg', 50, 1) + playsound(src, 'sound/effects/splat.ogg', 50, 1) var/damage = rand(5, 7) H.apply_damage(2 * damage, BRUTE, BP_HEAD) @@ -298,7 +298,7 @@ if(crates_only && !istype(C,/obj/structure/closet/crate)) custom_emote(2, "makes a sighing buzz.") - playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) return var/obj/structure/closet/crate/crate = C diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index 0c979ba008..1fce90b611 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -172,7 +172,7 @@ return if(!target) - playsound(src.loc, pick(threat_found_sounds), 50) + playsound(src, pick(threat_found_sounds), 50) global_announcer.autosay("[src] was attacked by a hostile [target_name(attacker)] in [get_area(src)].", "[src]", "Security") target = attacker attacked = TRUE @@ -183,7 +183,7 @@ if(declare_arrests) global_announcer.autosay("[src] is [arrest_type ? "detaining" : "arresting"] a level [threat] suspect [suspect_name] in [get_area(src)].", "[src]", "Security") say("Down on the floor, [suspect_name]! You have [SECBOT_WAIT_TIME*2] seconds to comply.") - playsound(src.loc, pick(preparing_arrest_sounds), 50) + playsound(src, pick(preparing_arrest_sounds), 50) // Register to be told when the target moves GLOB.moved_event.register(target, src, /mob/living/bot/secbot/proc/target_moved) @@ -221,7 +221,7 @@ awaiting_surrender = 0 say("Level [threat] infraction alert!") custom_emote(1, "points at [M.name]!") - playsound(src.loc, pick(threat_found_sounds), 50) + playsound(src, pick(threat_found_sounds), 50) return /mob/living/bot/secbot/handleAdjacentTarget() @@ -270,10 +270,10 @@ if(can_next_insult > world.time) return if(threat >= 10) - playsound(src.loc, 'sound/voice/binsult.ogg', 75) + playsound(src, 'sound/voice/binsult.ogg', 75) can_next_insult = world.time + 20 SECONDS else - playsound(src.loc, pick(fighting_sounds), 75) + playsound(src, pick(fighting_sounds), 75) can_next_insult = world.time + 5 SECONDS @@ -292,7 +292,7 @@ cuff = FALSE if(!cuff) H.stun_effect_act(0, stun_strength, null) - playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/Egloves.ogg', 50, 1, -1) do_attack_animation(H) busy = TRUE update_icons() @@ -302,7 +302,7 @@ visible_message("\The [H] was prodded by \the [src] with a stun baton!") insult(H) else - playsound(loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) + playsound(src, 'sound/weapons/handcuffs.ogg', 30, 1, -2) visible_message("\The [src] is trying to put handcuffs on \the [H]!") busy = TRUE if(do_mob(src, H, 60)) @@ -317,7 +317,7 @@ var/mob/living/L = M L.adjustBruteLoss(xeno_harm_strength) do_attack_animation(M) - playsound(loc, "swing_hit", 50, 1, -1) + playsound(src, "swing_hit", 50, 1, -1) busy = TRUE update_icons() spawn(2) diff --git a/code/modules/mob/living/carbon/alien/alien_attacks.dm b/code/modules/mob/living/carbon/alien/alien_attacks.dm index c120b9deef..e2c965e2c9 100644 --- a/code/modules/mob/living/carbon/alien/alien_attacks.dm +++ b/code/modules/mob/living/carbon/alien/alien_attacks.dm @@ -25,7 +25,7 @@ LAssailant = M - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("[] has grabbed [] passively!", M, src), 1) @@ -40,7 +40,7 @@ step_away(src,M,15) sleep(3) step_away(src,M,15) - playsound(loc, "punch", 25, 1, -1) + playsound(src, "punch", 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("[] has punched []!", M, src), 1) @@ -52,7 +52,7 @@ adjustBruteLoss(damage) updatehealth() else - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("[] has attempted to punch []!", M, src), 1) diff --git a/code/modules/mob/living/carbon/alien/emote.dm b/code/modules/mob/living/carbon/alien/emote.dm index 6c9cca88fb..5782b5d127 100644 --- a/code/modules/mob/living/carbon/alien/emote.dm +++ b/code/modules/mob/living/carbon/alien/emote.dm @@ -98,7 +98,7 @@ m_type = 2 if("chirp") message = "[src] chirps!" - playsound(loc, 'sound/misc/nymphchirp.ogg', 50, 0) + playsound(src, 'sound/misc/nymphchirp.ogg', 50, 0) m_type = 2 if("help") to_chat(src, "burp, chirp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roll, scratch,\nscretch, shake, sign-#, sulk, sway, tail, twitch, whimper") diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index a8a0b8fb01..52d0a839e2 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -15,6 +15,7 @@ var/datum/reagents/R = new/datum/reagents(1000) reagents = R R.my_atom = src + default_language = GLOB.all_languages[LANGUAGE_GALCOM] /mob/living/carbon/brain/Destroy() if(key) //If there is a mob connected to this thing. Have to check key twice to avoid false death reporting. @@ -44,5 +45,24 @@ /mob/living/carbon/brain/isSynthetic() return istype(loc, /obj/item/device/mmi) -///mob/living/carbon/brain/binarycheck()//No binary without a binary communication device -// return isSynthetic() +/mob/living/carbon/brain/set_typing_indicator(var/state) + if(isturf(loc)) + return ..() + + if(!is_preference_enabled(/datum/client_preference/show_typing_indicator)) + loc.cut_overlay(typing_indicator, TRUE) + return + + if(!typing_indicator) + typing_indicator = new + typing_indicator.icon = 'icons/mob/talk_vr.dmi' //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons + typing_indicator.icon_state = "[speech_bubble_appearance()]_typing" + + if(state && !typing) + loc.add_overlay(typing_indicator, TRUE) + typing = TRUE + else if(typing) + loc.cut_overlay(typing_indicator, TRUE) + typing = FALSE + + return state diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 554d873dd5..af0c7ec14b 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -67,7 +67,7 @@ else src.take_organ_damage(d) user.visible_message("[user] attacks [src]'s stomach wall with the [I.name]!") - playsound(user.loc, 'sound/effects/attackblob.ogg', 50, 1) + playsound(user, 'sound/effects/attackblob.ogg', 50, 1) if(prob(src.getBruteLoss() - 50)) for(var/atom/movable/A in stomach_contents) @@ -112,7 +112,7 @@ src.apply_damage(0.2 * shock_damage, BURN, null, used_weapon="Electrocution") //shock a random part! src.apply_damage(0.2 * shock_damage, BURN, null, used_weapon="Electrocution") //shock a random part! - playsound(loc, "sparks", 50, 1, -1) + playsound(src, "sparks", 50, 1, -1) if (shock_damage > 15) src.visible_message( "[src] was electrocuted[source ? " by the [source]" : ""]!", \ @@ -200,7 +200,7 @@ if((SKELETON in H.mutations) && (!H.w_uniform) && (!H.wear_suit)) H.play_xylophone() else if (on_fire) - playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if (M.on_fire) M.visible_message("[M] tries to pat out [src]'s flames, but to no avail!", "You try to pat out [src]'s flames, but to no avail! Put yourself out first!") @@ -268,7 +268,7 @@ AdjustStunned(-3) AdjustWeakened(-3) - playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) /mob/living/carbon/proc/eyecheck() return 0 @@ -368,7 +368,7 @@ return 0 stop_pulling() to_chat(src, "You slipped on [slipped_on]!") - playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) + playsound(src, 'sound/misc/slip.ogg', 50, 1, -3) Weaken(FLOOR(stun_duration/2, 1)) return 1 @@ -386,9 +386,9 @@ return GLOB.all_languages[LANGUAGE_GIBBERISH] if(!species) - return null + return GLOB.all_languages[LANGUAGE_GIBBERISH] - return species.default_language ? GLOB.all_languages[species.default_language] : null + return species.default_language ? GLOB.all_languages[species.default_language] : GLOB.all_languages[LANGUAGE_GIBBERISH] /mob/living/carbon/proc/should_have_organ(var/organ_check) return 0 diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index cd59a549ec..df195a495e 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -92,7 +92,7 @@ user.visible_message("\The [user] cut [src]'s neck with \the [W]!") if(W.hitsound) - playsound(loc, W.hitsound, 50, 1, -1) + playsound(src, W.hitsound, 50, 1, -1) G.last_action = world.time flick(G.hud.icon_state, G.hud) @@ -112,7 +112,7 @@ apply_damage(damage, W.damtype, "torso", 0, sharp=W.sharp, edge=W.edge) if(W.hitsound) - playsound(loc, W.hitsound, 50, 1, -1) + playsound(src, W.hitsound, 50, 1, -1) add_attack_logs(user,src,"Knifed (shanked)") diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm index afc9e704a2..57206c05e2 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -23,8 +23,8 @@ src.gender = gender //reset_hair() //VOREStation Remove - Don't just randomize hair on gender swaps for prometheans. - update_icons_body() update_dna() + update_icons_body() return 1 /mob/living/carbon/human/proc/change_gender_identity(var/identifying_gender) @@ -141,6 +141,8 @@ /mob/living/carbon/human/proc/update_dna() check_dna() dna.ready_dna(src) + for(var/obj/item/organ/O in organs) + O.dna = dna // Update all of those because apparently they're separate, and icons won't update properly /mob/living/carbon/human/proc/generate_valid_species(var/check_whitelist = 1, var/list/whitelist = list(), var/list/blacklist = list()) var/list/valid_species = new() diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 72c36df999..dd816d1e8f 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -12,7 +12,7 @@ for(var/obj/item/organ/I in internal_organs) I.removed() - if(istype(loc,/turf)) + if(isturf(I?.loc)) // Some organs qdel themselves or other things when removed I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30) for(var/obj/item/organ/external/E in src.organs) @@ -88,7 +88,7 @@ to_chat(O, "[src] has died in [get_area(src)]. [ghost_follow_link(src, O)] ") if(!gibbed && species.death_sound) - playsound(loc, species.death_sound, 80, 1, 1) + playsound(src, species.death_sound, 80, 1, 1) if(ticker && ticker.mode) sql_report_death(src) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 26e445b759..07653c5f71 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -77,7 +77,7 @@ message = "[display_msg] at [param]." else message = "[display_msg]." - playsound(loc, use_sound, 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add + playsound(src, use_sound, 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add m_type = 1 //Promethean-only emotes @@ -87,7 +87,7 @@ to_chat(src, "You are not a slime thing!") return */ //VOREStation Removal End - playsound(loc, 'sound/effects/slime_squish.ogg', 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add //Credit to DrMinky (freesound.org) for the sound. + playsound(src, 'sound/effects/slime_squish.ogg', 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add //Credit to DrMinky (freesound.org) for the sound. message = "squishes." m_type = 1 @@ -97,7 +97,7 @@ to_chat(src, "You are not a Skrell!") return - playsound(loc, 'sound/effects/warble.ogg', 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add // Copyright CC BY 3.0 alienistcog (freesound.org) for the sound. + playsound(src, 'sound/effects/warble.ogg', 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add // Copyright CC BY 3.0 alienistcog (freesound.org) for the sound. message = "warbles." m_type = 2 @@ -189,7 +189,7 @@ if("clap") if(!restrained()) message = "claps." - playsound(loc, 'sound/misc/clapping.ogg') + playsound(src, 'sound/misc/clapping.ogg') m_type = 2 if(miming) m_type = 1 @@ -270,7 +270,7 @@ use_sound = pick('sound/effects/mob_effects/f_machine_cougha.ogg','sound/effects/mob_effects/f_machine_coughb.ogg') else use_sound = pick('sound/effects/mob_effects/m_machine_cougha.ogg','sound/effects/mob_effects/m_machine_coughb.ogg', 'sound/effects/mob_effects/m_machine_coughc.ogg') - playsound(loc, use_sound, 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add + playsound(src, use_sound, 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add else message = "makes a strong noise." m_type = 2 @@ -558,7 +558,7 @@ use_sound = 'sound/effects/mob_effects/machine_sneeze.ogg' else use_sound = 'sound/effects/mob_effects/f_machine_sneeze.ogg' - playsound(loc, use_sound, 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add + playsound(src, use_sound, 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add else message = "makes a strange noise." m_type = 2 @@ -671,14 +671,14 @@ break if(M) message = "slaps [M] across the face. Ouch!" - playsound(loc, 'sound/effects/snap.ogg', 50, 1, preference = /datum/client_preference/emote_noises) //VOREStation Add + playsound(src, 'sound/effects/snap.ogg', 50, 1, preference = /datum/client_preference/emote_noises) //VOREStation Add if(ishuman(M)) //Snowflakey! var/mob/living/carbon/human/H = M if(istype(H.wear_mask,/obj/item/clothing/mask/smokable)) H.drop_from_inventory(H.wear_mask) else message = "slaps [T.himself]!" - playsound(loc, 'sound/effects/snap.ogg', 50, 1, preference = /datum/client_preference/emote_noises) //VOREStation Add + playsound(src, 'sound/effects/snap.ogg', 50, 1, preference = /datum/client_preference/emote_noises) //VOREStation Add if("scream", "screams") if(miming) @@ -690,9 +690,9 @@ m_type = 2 /* Removed, pending the location of some actually good, properly licensed sounds. if(get_gender() == FEMALE) - playsound(loc, "[species.female_scream_sound]", 80, 1) + playsound(src, "[species.female_scream_sound]", 80, 1) else - playsound(loc, "[species.male_scream_sound]", 80, 1) //default to male screams if no gender is present. + playsound(src, "[species.male_scream_sound]", 80, 1) //default to male screams if no gender is present. */ else message = "makes a very loud noise." @@ -715,7 +715,7 @@ return message = "snaps [T.his] fingers." - playsound(loc, 'sound/effects/fingersnap.ogg', 50, 1, -3, preference = /datum/client_preference/emote_noises) //VOREStation Add + playsound(src, 'sound/effects/fingersnap.ogg', 50, 1, -3, preference = /datum/client_preference/emote_noises) //VOREStation Add if("swish") animate_tail_once() @@ -739,14 +739,14 @@ if("whistle" || "whistles") if(!muzzled) message = "whistles a tune." - playsound(loc, 'sound/misc/longwhistle.ogg', preference = /datum/client_preference/emote_noises) //VOREStation Add + playsound(src, 'sound/misc/longwhistle.ogg', preference = /datum/client_preference/emote_noises) //VOREStation Add else message = "makes a light spitting noise, a poor attempt at a whistle." if("qwhistle") if(!muzzled) message = "whistles quietly." - playsound(loc, 'sound/misc/shortwhistle.ogg', preference = /datum/client_preference/emote_noises) //VOREStation Add + playsound(src, 'sound/misc/shortwhistle.ogg', preference = /datum/client_preference/emote_noises) //VOREStation Add else message = "makes a light spitting noise, a poor attempt at a whistle." diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 368a29a79c..3d0337db15 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -29,107 +29,107 @@ if("awoo") m_type = 2 message = "lets out an awoo." - playsound(loc, 'sound/voice/awoo.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/awoo.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("awoo2") m_type = 2 message = "lets out an awoo." - playsound(loc, 'sound/voice/long_awoo.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/long_awoo.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("growl") m_type = 2 message = "lets out a growl." - playsound(loc, 'sound/voice/growl.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/growl.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("woof") m_type = 2 message = "lets out an woof." - playsound(loc, 'sound/voice/woof.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/woof.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("woof2") m_type = 2 message = "lets out an woof." - playsound(loc, 'sound/voice/woof2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/woof2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("nya") message = "lets out a nya." m_type = 2 - playsound(loc, 'sound/voice/nya.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/nya.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("mrowl") message = "mrowls." m_type = 2 - playsound(loc, 'sound/voice/mrow.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/mrow.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("peep") message = "peeps like a bird." m_type = 2 - playsound(loc, 'sound/voice/peep.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/peep.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("chirp") message = "chirps!" - playsound(loc, 'sound/misc/nymphchirp.ogg', 50, 0, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/misc/nymphchirp.ogg', 50, 0, preference = /datum/client_preference/emote_noises) m_type = 2 if("hoot") message = "hoots!" - playsound(loc, 'sound/voice/hoot.ogg', 50, 1, ,-1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/hoot.ogg', 50, 1, ,-1, preference = /datum/client_preference/emote_noises) m_type = 2 if("weh") message = "lets out a weh." m_type = 2 - playsound(loc, 'sound/voice/weh.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/weh.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("merp") message = "lets out a merp." m_type = 2 - playsound(loc, 'sound/voice/merp.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/merp.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("myarp") message = "lets out a myarp." m_type = 2 - playsound(loc, 'sound/voice/myarp.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/myarp.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("bark") message = "lets out a bark." m_type = 2 - playsound(loc, 'sound/voice/bark2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/bark2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("bork") m_type = 2 message = "lets out a bork." - playsound(loc, 'sound/voice/bork.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/bork.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if ("mrow") m_type = 2 message = "lets out a mrow." - playsound(loc, 'sound/voice/mrow.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/mrow.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if ("hypno") m_type = 2 message = "lets out a mystifying tone." - playsound(loc, 'sound/voice/hypno.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/hypno.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("hiss") message = "lets out a hiss." m_type = 2 - playsound(loc, 'sound/voice/hiss.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/hiss.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("rattle") message = "rattles!" m_type = 2 - playsound(loc, 'sound/voice/rattle.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/rattle.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("squeak") message = "lets out a squeak." m_type = 2 - playsound(loc, 'sound/effects/mouse_squeak.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/effects/mouse_squeak.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("geck") message = "geckers!" m_type = 2 - playsound(loc, 'sound/voice/geck.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/geck.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("baa") message = "lets out a baa." m_type = 2 - playsound(loc, 'sound/voice/baa.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/baa.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("baa2") message = "bleats." m_type = 2 - playsound(loc, 'sound/voice/baa2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/baa2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("deathgasp2") message = "[species.get_death_message()]" m_type = 1 - playsound(loc, 'sound/voice/deathgasp2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/deathgasp2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("mar") message = "lets out a mar." m_type = 2 - playsound(loc, 'sound/voice/mar.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/mar.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("wurble") message = "lets out a wurble." m_type = 2 - playsound(loc, 'sound/voice/wurble.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/wurble.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("nsay") nsay() return TRUE diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index c08fb9b20e..356dc87c94 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -757,7 +757,7 @@ var/datum/gender/T = gender_datums[get_visible_gender()] visible_message("\The [src] begins playing [T.his] ribcage like a xylophone. It's quite spooky.","You begin to play a spooky refrain on your ribcage.","You hear a spooky xylophone melody.") var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg') - playsound(loc, song, 50, 1, -1) + playsound(src, song, 50, 1, -1) xylophone = 1 spawn(1200) xylophone=0 diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 805a63d9a3..c77c9a8ce3 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -54,7 +54,7 @@ var/hit_zone = get_zone_with_miss_chance(H.zone_sel.selecting, src, H.get_accuracy_penalty()) if(!hit_zone) H.do_attack_animation(src) - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) visible_message("[H] reaches for [src], but misses!") return FALSE @@ -132,7 +132,7 @@ LAssailant = M H.do_attack_animation(src) - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) //VORESTATION EDIT visible_message("[M] has grabbed [src] [(M.zone_sel.selecting == BP_L_HAND || M.zone_sel.selecting == BP_R_HAND)? "by [(gender==FEMALE)? "her" : ((gender==MALE)? "his": "their")] hands": "passively"]!") //VORESTATION END END @@ -249,7 +249,7 @@ else H.visible_message("[attack_message]") - playsound(loc, ((miss_type) ? (miss_type == 1 ? attack.miss_sound : 'sound/weapons/thudswoosh.ogg') : attack.attack_sound), 25, 1, -1) + playsound(src, ((miss_type) ? (miss_type == 1 ? attack.miss_sound : 'sound/weapons/thudswoosh.ogg') : attack.attack_sound), 25, 1, -1) add_attack_logs(H,src,"Melee attacked with fists (miss/block)") @@ -315,7 +315,7 @@ if((shoes || !(species.flags & NO_SLIP)) && randn <= 25) var/armor_check = run_armor_check(affecting, "melee") apply_effect(3, WEAKEN, armor_check) - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(armor_check < 60) visible_message("[M] has pushed [src]!") else @@ -325,7 +325,7 @@ if(randn <= 60) //See about breaking grips or pulls if(break_all_grabs(M)) - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) return //Actually disarm them @@ -333,10 +333,10 @@ if(I) drop_from_inventory(I) visible_message("[M] has disarmed [src]!") - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) return - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) visible_message(" [M] attempted to disarm [src]!") return diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 3675866e24..8e351372c9 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -227,7 +227,7 @@ emp_act if(!hit_zone) user.do_attack_animation(src) - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) visible_message("\The [user] misses [src] with \the [I]!") return null diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index acc4607191..9c1a2ef398 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -72,7 +72,7 @@ else failed = 1 - playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) + playsound(src, 'sound/weapons/pierce.ogg', 25, 1, -1) if(failed) src.Weaken(rand(2,4)) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 135c5df17c..444607b470 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1225,16 +1225,16 @@ var/hungry_alert = /obj/screen/alert/hungry var/starving_alert = /obj/screen/alert/starving - if(get_species() == SPECIES_CUSTOM) + if(isSynthetic()) + fat_alert = /obj/screen/alert/fat/synth + hungry_alert = /obj/screen/alert/hungry/synth + starving_alert = /obj/screen/alert/starving/synth + else if(get_species() == SPECIES_CUSTOM) var/datum/species/custom/C = species if(/datum/trait/bloodsucker in C.traits) fat_alert = /obj/screen/alert/fat/vampire hungry_alert = /obj/screen/alert/hungry/vampire starving_alert = /obj/screen/alert/starving/vampire - else if(isSynthetic()) - fat_alert = /obj/screen/alert/fat/synth - hungry_alert = /obj/screen/alert/hungry/synth - starving_alert = /obj/screen/alert/starving/synth switch(nutrition) if(450 to INFINITY) diff --git a/code/modules/mob/living/carbon/human/species/species_attack.dm b/code/modules/mob/living/carbon/human/species/species_attack.dm index 9e6a07d168..3a5c358720 100644 --- a/code/modules/mob/living/carbon/human/species/species_attack.dm +++ b/code/modules/mob/living/carbon/human/species/species_attack.dm @@ -92,4 +92,4 @@ /datum/unarmed_attack/stomp/weak/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) var/obj/item/organ/external/affecting = target.get_organ(zone) user.visible_message("[user] jumped up and down on \the [target]'s [affecting.name]!") - playsound(user.loc, attack_sound, 25, 1, -1) \ No newline at end of file + playsound(user, attack_sound, 25, 1, -1) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index a0170217ee..6cc817a6f7 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -107,75 +107,113 @@ ..() /mob/living/simple_mob/protean_blob/updatehealth() - if(humanform) - //Set the max - maxHealth = humanform.getMaxHealth()*2 //HUMANS, and their 'double health', bleh. - //Set us to their health, but, human health ignores robolimbs so we do it 'the hard way' - health = maxHealth - humanform.getOxyLoss() - humanform.getToxLoss() - humanform.getCloneLoss() - humanform.getActualFireLoss() - humanform.getActualBruteLoss() + if(!humanform) + return ..() - //Alive, becoming dead - if((stat < DEAD) && (health <= 0)) - death() + //Set the max + maxHealth = humanform.getMaxHealth()*2 //HUMANS, and their 'double health', bleh. + //Set us to their health, but, human health ignores robolimbs so we do it 'the hard way' + health = maxHealth - humanform.getOxyLoss() - humanform.getToxLoss() - humanform.getCloneLoss() - humanform.getActualFireLoss() - humanform.getActualBruteLoss() - //Overhealth - if(health > getMaxHealth()) - health = getMaxHealth() + //Alive, becoming dead + if((stat < DEAD) && (health <= 0)) + death() - //Update our hud if we have one - if(healths) - if(stat != DEAD) - var/heal_per = (health / getMaxHealth()) * 100 - switch(heal_per) - if(100 to INFINITY) - healths.icon_state = "health0" - if(80 to 100) - healths.icon_state = "health1" - if(60 to 80) - healths.icon_state = "health2" - if(40 to 60) - healths.icon_state = "health3" - if(20 to 40) - healths.icon_state = "health4" - if(0 to 20) - healths.icon_state = "health5" - else - healths.icon_state = "health6" - else - healths.icon_state = "health7" - else - ..() + //Overhealth + if(health > getMaxHealth()) + health = getMaxHealth() + //Grab any other interesting values + confused = humanform.confused + radiation = humanform.radiation + paralysis = humanform.paralysis + + //Update our hud if we have one + if(healths) + if(stat != DEAD) + var/heal_per = (health / getMaxHealth()) * 100 + switch(heal_per) + if(100 to INFINITY) + healths.icon_state = "health0" + if(80 to 100) + healths.icon_state = "health1" + if(60 to 80) + healths.icon_state = "health2" + if(40 to 60) + healths.icon_state = "health3" + if(20 to 40) + healths.icon_state = "health4" + if(0 to 20) + healths.icon_state = "health5" + else + healths.icon_state = "health6" + else + healths.icon_state = "health7" + +// All the damage and such to the blob translates to the human /mob/living/simple_mob/protean_blob/adjustBruteLoss(var/amount) if(humanform) - humanform.adjustBruteLoss(amount) + return humanform.adjustBruteLoss(amount) else - ..() + return ..() /mob/living/simple_mob/protean_blob/adjustFireLoss(var/amount) if(humanform) - humanform.adjustFireLoss(amount) + return humanform.adjustFireLoss(amount) else - ..() + return ..() + +/mob/living/simple_mob/protean_blob/adjustToxLoss(amount) + if(humanform) + return humanform.adjustToxLoss(amount) + else + return ..() + +/mob/living/simple_mob/protean_blob/adjustOxyLoss(amount) + if(humanform) + return humanform.adjustOxyLoss(amount) + else + return ..() + +/mob/living/simple_mob/protean_blob/adjustHalLoss(amount) + if(humanform) + return humanform.adjustHalLoss(amount) + else + return ..() + +/mob/living/simple_mob/protean_blob/emp_act(severity) + if(humanform) + return humanform.emp_act(severity) + else + return ..() + +/mob/living/simple_mob/protean_blob/ex_act(severity) + if(humanform) + return humanform.ex_act(severity) + else + return ..() + +/mob/living/simple_mob/protean_blob/rad_act(severity) + if(humanform) + return humanform.ex_act(severity) + else + return ..() + +/mob/living/simple_mob/protean_blob/bullet_act(obj/item/projectile/P) + if(humanform) + return humanform.bullet_act(P) + else + return ..() /mob/living/simple_mob/protean_blob/death(gibbed, deathmessage = "dissolves away, leaving only a few spare parts!") if(humanform) - humanform.death(gibbed = gibbed) - for(var/organ in humanform.internal_organs) - var/obj/item/organ/internal/O = organ - O.removed() - O.forceMove(drop_location()) - var/list/items = humanform.get_equipped_items() - if(prev_left_hand) items += prev_left_hand - if(prev_right_hand) items += prev_right_hand - for(var/obj/object in items) - object.forceMove(drop_location()) - QDEL_NULL(humanform) //Don't leave it just sitting in nullspace - - animate(src,alpha = 0,time = 2 SECONDS) - sleep(2 SECONDS) - qdel(src) - - ..() + humanform.death(gibbed, deathmessage) + else + animate(src, alpha = 0, time = 2 SECONDS) + sleep(2 SECONDS) + + if(!QDELETED(src)) // Human's handle death should have taken us, but maybe we were adminspawned or something without a human counterpart + qdel(src) /mob/living/simple_mob/protean_blob/Life() . = ..() diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm index dfcb66dcb7..adc20e6f4e 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm @@ -162,10 +162,23 @@ return rgb(80,80,80,230) /datum/species/protean/handle_death(var/mob/living/carbon/human/H) - to_chat(H,"You died as a Protean. Please sit out of the round for at least 60 minutes before respawning, to represent the time it would take to ship a new-you to the station.") - spawn(1) //This spawn is here so that if the protean_blob calls qdel, it doesn't try to gib the humanform. - if(H) - H.gib() + if(!H) + return // Iono! + + if(H.temporary_form) + H.forceMove(H.temporary_form.drop_location()) + H.ckey = H.temporary_form.ckey + QDEL_NULL(H.temporary_form) + + to_chat(H, "You died as a Protean. Please sit out of the round for at least 60 minutes before respawning, to represent the time it would take to ship a new-you to the station.") + + for(var/obj/item/organ/I in H.internal_organs) + I.removed() + + for(var/obj/item/I in src) + H.drop_from_inventory(I) + + qdel(H) /datum/species/protean/handle_environment_special(var/mob/living/carbon/human/H) if((H.getActualBruteLoss() + H.getActualFireLoss()) > H.maxHealth*0.5 && isturf(H.loc)) //So, only if we're not a blob (we're in nullspace) or in someone (or a locker, really, but whatever) diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm index f9c68c331f..4e3ce65811 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm @@ -144,7 +144,7 @@ P.firer = src P.old_style_target(A) P.fire() - playsound(loc, 'sound/weapons/pierce.ogg', 25, 0) + playsound(src, 'sound/weapons/pierce.ogg', 25, 0) else ..() @@ -295,7 +295,7 @@ src.visible_message("\The [src] leaps at [T]!") src.throw_at(get_step(get_turf(T),get_turf(src)), 4, 1, src) - playsound(src.loc, 'sound/voice/hiss5.ogg', 50, 1) + playsound(src, 'sound/voice/hiss5.ogg', 50, 1) sleep(5) diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm index 57001713e9..2f15a4ba49 100644 --- a/code/modules/mob/living/carbon/human/unarmed_attack.dm +++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm @@ -91,7 +91,7 @@ var/global/list/sparring_attack_cache = list() /datum/unarmed_attack/proc/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) var/obj/item/organ/external/affecting = target.get_organ(zone) user.visible_message("[user] [pick(attack_verb)] [target] in the [affecting.name]!") - playsound(user.loc, attack_sound, 25, 1, -1) + playsound(user, attack_sound, 25, 1, -1) /datum/unarmed_attack/proc/handle_eye_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target) var/obj/item/organ/internal/eyes/eyes = target.internal_organs_by_name[O_EYES] diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm index 90955cd402..4e0aa7cbe3 100644 --- a/code/modules/mob/living/carbon/lick_wounds.dm +++ b/code/modules/mob/living/carbon/lick_wounds.dm @@ -83,4 +83,4 @@ W.bandage() W.disinfect() H.UpdateDamageIcon() - playsound(src.loc, 'sound/effects/ointment.ogg', 25) + playsound(src, 'sound/effects/ointment.ogg', 25) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 61d937644f..cb666cfc7f 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -206,7 +206,7 @@ default behaviour is: /* VOREStation Removal - See above if(confused && prob(50) && m_intent=="run") Weaken(2) - playsound(loc, "punch", 25, 1, -1) + playsound(src, "punch", 25, 1, -1) visible_message("[src] [pick("ran", "slammed")] into \the [AM]!") src.apply_damage(5, BRUTE) to_chat(src, "You just [pick("ran", "slammed")] into \the [AM]!") @@ -826,19 +826,18 @@ default behaviour is: handle_footstep(loc) if(pulling) // we were pulling a thing and didn't lose it during our move. + var/pull_dir = get_dir(src, pulling) + if(pulling.anchored || !isturf(pulling.loc)) stop_pulling() - return - - var/pull_dir = get_dir(src, pulling) - if(get_dist(src, pulling) > 1 || (moving_diagonally != SECOND_DIAG_STEP && ((pull_dir - 1) & pull_dir))) // puller and pullee more than one tile away or in diagonal position + + else if(get_dist(src, pulling) > 1 || (moving_diagonally != SECOND_DIAG_STEP && ((pull_dir - 1) & pull_dir))) // puller and pullee more than one tile away or in diagonal position // If it is too far away or across z-levels from old location, stop pulling. if(get_dist(pulling.loc, oldloc) > 1 || pulling.loc.z != oldloc?.z) stop_pulling() - return // living might take damage from drags - if(isliving(pulling)) + else if(isliving(pulling)) var/mob/living/M = pulling M.dragged(src, oldloc) @@ -846,6 +845,35 @@ default behaviour is: if(pulling && get_dist(src, pulling) > 1) // the pullee couldn't keep up stop_pulling() + if(!isturf(loc)) + return + else if(lastarea?.has_gravity == 0) + inertial_drift() + //VOREStation Edit Start + else if(flying) + inertial_drift() + make_floating(1) + //VOREStation Edit End + else if(!isspace(loc)) + inertia_dir = 0 + make_floating(0) + +/mob/living/proc/inertial_drift() + if(x > 1 && x < (world.maxx) && y > 1 && y < (world.maxy)) + if(Process_Spacemove(1)) + inertia_dir = 0 + return + + var/locthen = loc + spawn(5) + if(!anchored && !pulledby && loc == locthen) + var/stepdir = inertia_dir ? inertia_dir : last_move + if(!stepdir) + return + var/turf/T = get_step(src, stepdir) + if(!T) + return + Move(T, stepdir, 5) /mob/living/proc/handle_footstep(turf/T) return FALSE @@ -1010,7 +1038,7 @@ default behaviour is: Stun(5) src.visible_message("[src] throws up!","You throw up!") - playsound(loc, 'sound/effects/splat.ogg', 50, 1) + playsound(src, 'sound/effects/splat.ogg', 50, 1) var/turf/simulated/T = get_turf(src) //TODO: Make add_blood_floor remove blood from human mobs if(istype(T)) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index b74edbcbba..a8137a8a89 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -209,7 +209,7 @@ damage *= 0.66 // Take 2/3s as much damage. visible_message("\The [B] [attack_verb] \the [src]!", "[attack_message]!") - playsound(loc, 'sound/effects/attackblob.ogg', 50, 1) + playsound(src, 'sound/effects/attackblob.ogg', 50, 1) //Armor var/soaked = get_armor_soak(def_zone, armor_check, armor_pen) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index f3d3947923..60afea6268 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -326,6 +326,19 @@ proc/get_radio_key_from_channel(var/channel) //var/image/speech_bubble = image('icons/mob/talk_vr.dmi',src,"h[speech_bubble_test]") //VOREStation Edit. Commented this out in case we need to reenable. var/speech_type = speech_bubble_appearance() var/image/speech_bubble = image('icons/mob/talk_vr.dmi',src,"[speech_type][speech_bubble_test]") //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons + var/sb_alpha = 255 + var/atom/loc_before_turf = src + //VOREStation Add + if(isbelly(loc)) + speech_bubble.pixel_y = -13 //teehee + //VOREStation Add End + while(loc_before_turf && !isturf(loc_before_turf.loc)) + loc_before_turf = loc_before_turf.loc + sb_alpha -= 50 + if(sb_alpha < 0) + break + speech_bubble.loc = loc_before_turf + speech_bubble.alpha = CLAMP(sb_alpha, 0, 255) images_to_clients[speech_bubble] = list() // Attempt Multi-Z Talking diff --git a/code/modules/mob/living/silicon/emote.dm b/code/modules/mob/living/silicon/emote.dm index ff3e340419..00a5e42993 100644 --- a/code/modules/mob/living/silicon/emote.dm +++ b/code/modules/mob/living/silicon/emote.dm @@ -23,7 +23,7 @@ message = "[src] beeps at [param]." else message = "[src] beeps." - playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0) + playsound(src, 'sound/machines/twobeep.ogg', 50, 0) m_type = 1 if("ping") @@ -40,7 +40,7 @@ message = "[src] pings at [param]." else message = "[src] pings." - playsound(src.loc, 'sound/machines/ping.ogg', 50, 0) + playsound(src, 'sound/machines/ping.ogg', 50, 0) m_type = 1 if("buzz") @@ -57,7 +57,7 @@ message = "[src] buzzes at [param]." else message = "[src] buzzes." - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) m_type = 1 if("yes", "ye") @@ -74,7 +74,7 @@ message = "[src] emits an affirmative blip at [param]." else message = "[src] emits an affirmative blip." - playsound(src.loc, 'sound/machines/synth_yes.ogg', 50, 0) + playsound(src, 'sound/machines/synth_yes.ogg', 50, 0) m_type = 1 if("dwoop") @@ -90,7 +90,7 @@ message = "[src] chirps happily at [param]" else message = "[src] chirps happily." - playsound(src.loc, 'sound/machines/dwoop.ogg', 50, 0) + playsound(src, 'sound/machines/dwoop.ogg', 50, 0) m_type = 1 if("no") @@ -107,7 +107,7 @@ message = "[src] emits a negative blip at [param]." else message = "[src] emits a negative blip." - playsound(src.loc, 'sound/machines/synth_no.ogg', 50, 0) + playsound(src, 'sound/machines/synth_no.ogg', 50, 0) m_type = 1 ..(act, m_type, message) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm index e159308d1b..e4f461179d 100644 --- a/code/modules/mob/living/silicon/pai/life.dm +++ b/code/modules/mob/living/silicon/pai/life.dm @@ -8,7 +8,7 @@ var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) M.show_message("The data cable rapidly retracts back into its spool.", 3, "You hear a click and the sound of wire spooling rapidly.", 2) - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) qdel(src.cable) src.cable = null diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index b7241721f1..efd3f0be50 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -273,11 +273,11 @@ L.apply_effect(STUTTER, 1) L.visible_message("[user] has shocked [L] with its tongue!", \ "[user] has shocked you with its tongue! You can feel the betrayal.") - playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/Egloves.ogg', 50, 1, -1) R.cell.charge -= 666 else user.visible_message("\the [user] affectionately licks all over \the [target]'s face!", "You affectionately lick all over \the [target]'s face!") - playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) + playsound(src, 'sound/effects/attackblob.ogg', 50, 1) water.use_charge(5) var/mob/living/carbon/human/H = target if(H.species.lightweight == 1) @@ -424,7 +424,7 @@ src.visible_message("\The [src] leaps at [T]!") src.throw_at(get_step(get_turf(T),get_turf(src)), 4, 1, src) - playsound(src.loc, 'sound/mecha/mechstep2.ogg', 50, 1) + playsound(src, 'sound/mecha/mechstep2.ogg', 50, 1) pixel_y = default_pixel_y cell.charge -= 750 diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index 0b54a814f9..5b67d5e46e 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -84,7 +84,7 @@ if(do_after(user, 30, target) && length(contents) < max_item_count) target.forceMove(src) user.visible_message("[hound.name]'s [src.name] groans lightly as [target.name] slips inside.", "Your [src.name] groans lightly as [target] slips inside.") - playsound(hound, gulpsound, vol = 60, vary = 1, falloff = 0.1, preference = /datum/client_preference/eating_noises) + playsound(src, gulpsound, vol = 60, vary = 1, falloff = 0.1, preference = /datum/client_preference/eating_noises) if(analyzer && istype(target,/obj/item)) var/obj/item/tech_item = target for(var/T in tech_item.origin_tech) @@ -102,7 +102,7 @@ trashmouse.forceMove(src) trashmouse.reset_view(src) user.visible_message("[hound.name]'s [src.name] groans lightly as [trashmouse] slips inside.", "Your [src.name] groans lightly as [trashmouse] slips inside.") - playsound(hound, gulpsound, vol = 60, vary = 1, falloff = 0.1, preference = /datum/client_preference/eating_noises) + playsound(src, gulpsound, vol = 60, vary = 1, falloff = 0.1, preference = /datum/client_preference/eating_noises) if(delivery) if(islist(deliverylists[delivery_tag])) deliverylists[delivery_tag] |= trashmouse @@ -124,7 +124,7 @@ START_PROCESSING(SSobj, src) user.visible_message("[hound.name]'s [src.name] groans lightly as [trashman] slips inside.", "Your [src.name] groans lightly as [trashman] slips inside.") message_admins("[key_name(hound)] has eaten [key_name(patient)] as a dogborg. ([hound ? "JMP" : "null"])") - playsound(hound, gulpsound, vol = 100, vary = 1, falloff = 0.1, preference = /datum/client_preference/eating_noises) + playsound(src, gulpsound, vol = 100, vary = 1, falloff = 0.1, preference = /datum/client_preference/eating_noises) if(delivery) if(islist(deliverylists[delivery_tag])) deliverylists[delivery_tag] |= trashman @@ -155,7 +155,7 @@ START_PROCESSING(SSobj, src) user.visible_message("[hound.name]'s [src.name] lights up as [H.name] slips inside.", "Your [src] lights up as [H] slips inside. Life support functions engaged.") message_admins("[key_name(hound)] has eaten [key_name(patient)] as a dogborg. ([hound ? "JMP" : "null"])") - playsound(hound, gulpsound, vol = 100, vary = 1, falloff = 0.1, preference = /datum/client_preference/eating_noises) + playsound(src, gulpsound, vol = 100, vary = 1, falloff = 0.1, preference = /datum/client_preference/eating_noises) /obj/item/device/dogborg/sleeper/proc/go_out(var/target) hound = src.loc @@ -173,7 +173,7 @@ else var/obj/T = C T.loc = hound.loc - playsound(loc, 'sound/effects/splat.ogg', 50, 1) + playsound(src, 'sound/effects/splat.ogg', 50, 1) update_patient() else //You clicked eject with nothing in you, let's just reset stuff to be sure. update_patient() @@ -357,7 +357,7 @@ else var/obj/T = C T.loc = hound.loc - playsound(loc, 'sound/effects/splat.ogg', 50, 1) + playsound(src, 'sound/effects/splat.ogg', 50, 1) update_patient() deliverylists[delivery_tag].Cut() sleeperUI(usr) @@ -374,10 +374,10 @@ files.RefreshResearch() if(success) to_chat(usr, "You connect to the research server, push your data upstream to it, then pull the resulting merged data from the master branch.") - playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 1) + playsound(src, 'sound/machines/twobeep.ogg', 50, 1) else to_chat(usr, "Reserch server ping response timed out. Unable to connect. Please contact the system administrator.") - playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1) + playsound(src, 'sound/machines/buzz-two.ogg', 50, 1) sleeperUI(usr) return @@ -495,11 +495,11 @@ 'sound/vore/death8.ogg', 'sound/vore/death9.ogg', 'sound/vore/death10.ogg') - playsound(hound, finisher, vol = 100, vary = 1, falloff = 0.1, ignore_walls = TRUE, preference = /datum/client_preference/digestion_noises) + playsound(src, finisher, vol = 100, vary = 1, falloff = 0.1, ignore_walls = TRUE, preference = /datum/client_preference/digestion_noises) to_chat(hound, "Your [src.name] is now clean. Ending self-cleaning cycle.") cleaning = 0 update_patient() - playsound(hound, 'sound/machines/ding.ogg', vol = 100, vary = 1, falloff = 0.1, ignore_walls = TRUE, preference = /datum/client_preference/digestion_noises) + playsound(src, 'sound/machines/ding.ogg', vol = 100, vary = 1, falloff = 0.1, ignore_walls = TRUE, preference = /datum/client_preference/digestion_noises) return if(prob(20)) @@ -516,7 +516,7 @@ 'sound/vore/digest10.ogg', 'sound/vore/digest11.ogg', 'sound/vore/digest12.ogg') - playsound(hound, churnsound, vol = 100, vary = 1, falloff = 0.1, ignore_walls = TRUE, preference = /datum/client_preference/digestion_noises) + playsound(src, churnsound, vol = 100, vary = 1, falloff = 0.1, ignore_walls = TRUE, preference = /datum/client_preference/digestion_noises) //If the timing is right, and there are items to be touched if(air_master.current_cycle%3==1 && length(touchable_items)) @@ -552,7 +552,7 @@ 'sound/vore/death8.ogg', 'sound/vore/death9.ogg', 'sound/vore/death10.ogg') - playsound(hound, deathsound, vol = 100, vary = 1, falloff = 0.1, ignore_walls = TRUE, preference = /datum/client_preference/digestion_noises) + playsound(src, deathsound, vol = 100, vary = 1, falloff = 0.1, ignore_walls = TRUE, preference = /datum/client_preference/digestion_noises) if(is_vore_predator(T)) for(var/belly in T.vore_organs) var/obj/belly/B = belly diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 5f097ef50a..b578f18c23 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -126,7 +126,7 @@ var/list/mob_hat_cache = list() if(!module) module = new module_type(src) flavor_text = "It's a tiny little repair drone. The casing is stamped with an corporate logo and the subscript: '[using_map.company_name] Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'" - playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0) + playsound(src, 'sound/machines/twobeep.ogg', 50, 0) //Redefining some robot procs... /mob/living/silicon/robot/drone/SetName(pickedName as text) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 33bc706194..795929992b 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -123,7 +123,7 @@ if(istype(module,/obj/item/weapon/robot_module/robot/security) || istype(module,/obj/item/weapon/robot_module/robot/knine)) //VOREStation Add - K9 message = "[src] shows its legal authorization barcode." - playsound(src.loc, 'sound/voice/biamthelaw.ogg', 50, 0) + playsound(src, 'sound/voice/biamthelaw.ogg', 50, 0) m_type = 2 else to_chat(src, "You are not THE LAW, pal.") @@ -132,7 +132,7 @@ if(istype(module,/obj/item/weapon/robot_module/robot/security) || istype(module,/obj/item/weapon/robot_module/robot/knine)) //VOREStation Add - K9 message = "[src] 's speakers skreech, \"Halt! Security!\"." - playsound(src.loc, 'sound/voice/halt.ogg', 50, 0) + playsound(src, 'sound/voice/halt.ogg', 50, 0) m_type = 2 else to_chat(src, "You are not security.") @@ -141,7 +141,7 @@ if (istype(module,/obj/item/weapon/robot_module/robot/knine) || istype(module,/obj/item/weapon/robot_module/robot/medihound) || istype(module,/obj/item/weapon/robot_module/robot/scrubpup) || istype(module,/obj/item/weapon/robot_module/robot/ert) || istype(module,/obj/item/weapon/robot_module/robot/science) || istype(module,/obj/item/weapon/robot_module/robot/engiedog) || istype(module,/obj/item/weapon/robot_module/robot/clerical/brodog) || istype(module,/obj/item/weapon/robot_module/robot/kmine) ) message = "[src] lets out a bark." - playsound(loc, 'sound/voice/bark2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + playsound(src, 'sound/voice/bark2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) m_type = 2 else src << "You're not a dog!" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 542758efb9..235879e6da 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -703,12 +703,12 @@ attack_generic(H, rand(30,50), "slashed") return else - playsound(src.loc, 'sound/effects/bang.ogg', 10, 1) + playsound(src, 'sound/effects/bang.ogg', 10, 1) visible_message("[H] punches [src], but doesn't leave a dent.") return if(I_DISARM) H.do_attack_animation(src) - playsound(src.loc, 'sound/effects/clang1.ogg', 10, 1) + playsound(src, 'sound/effects/clang1.ogg', 10, 1) visible_message("[H] taps [src].") return //VOREStation Edit: Addition of borg petting end diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index a4a3c8c14b..78d741b012 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -27,7 +27,7 @@ if(confirm == "Yes" && !QDELETED(loaded_item)) //This is pretty copypasta-y to_chat(user, "You activate the analyzer's microlaser, analyzing \the [loaded_item] and breaking it down.") flick("portable_analyzer_scan", src) - playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) + playsound(src, 'sound/items/Welder2.ogg', 50, 1) for(var/T in loaded_item.origin_tech) files.UpdateTech(T, loaded_item.origin_tech[T]) to_chat(user, "\The [loaded_item] had level [loaded_item.origin_tech[T]] in [CallTechName(T)].") @@ -63,10 +63,10 @@ files.RefreshResearch() if(success) to_chat(user, "You connect to the research server, push your data upstream to it, then pull the resulting merged data from the master branch.") - playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 1) + playsound(src, 'sound/machines/twobeep.ogg', 50, 1) else to_chat(user, "Reserch server ping response timed out. Unable to connect. Please contact the system administrator.") - playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1) + playsound(src, 'sound/machines/buzz-two.ogg', 50, 1) if(response == "Eject") if(loaded_item) loaded_item.loc = get_turf(src) @@ -276,7 +276,7 @@ var/choice = input("Would you like to change colour or mode?") as null|anything in list("Colour","Mode") if(!choice) return - playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) + playsound(src, 'sound/effects/pop.ogg', 50, 0) switch(choice) @@ -486,7 +486,7 @@ return stored_doors++ qdel(A) - playsound(loc, 'sound/machines/hiss.ogg', 75, 1) + playsound(src, 'sound/machines/hiss.ogg', 75, 1) visible_message("\The [user] deflates \the [A] with \the [src]!") return if(istype(A, /obj/item/inflatable)) diff --git a/code/modules/mob/living/silicon/robot/robot_remote_control.dm b/code/modules/mob/living/silicon/robot/robot_remote_control.dm index 2f4ca0e56b..c605584aa0 100644 --- a/code/modules/mob/living/silicon/robot/robot_remote_control.dm +++ b/code/modules/mob/living/silicon/robot/robot_remote_control.dm @@ -17,9 +17,9 @@ GLOBAL_LIST_EMPTY(available_ai_shells) /mob/living/silicon/robot/proc/post_mmi_setup() if(istype(mmi, /obj/item/device/mmi/inert/ai_remote)) make_shell() - playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0) + playsound(src, 'sound/machines/twobeep.ogg', 50, 0) else - playsound(loc, 'sound/voice/liveagain.ogg', 75, 1) + playsound(src, 'sound/voice/liveagain.ogg', 75, 1) return /mob/living/silicon/robot/proc/make_shell() diff --git a/code/modules/mob/living/silicon/robot/subtypes/gravekeeper.dm b/code/modules/mob/living/silicon/robot/subtypes/gravekeeper.dm index 255eef5318..23e4aa81ea 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/gravekeeper.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/gravekeeper.dm @@ -24,4 +24,4 @@ laws = new /datum/ai_laws/gravekeeper() - playsound(loc, 'sound/mecha/nominalsyndi.ogg', 75, 0) + playsound(src, 'sound/mecha/nominalsyndi.ogg', 75, 0) diff --git a/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm b/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm index d374562230..0460226f3f 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm @@ -21,7 +21,7 @@ if(!cell) cell = new /obj/item/weapon/cell/high(src) // 15k cell, as recharging stations are a lot more rare on the Surface. - playsound(loc, 'sound/mecha/nominalsyndi.ogg', 75, 0) + playsound(src, 'sound/mecha/nominalsyndi.ogg', 75, 0) /mob/living/silicon/robot/lost/speech_bubble_appearance() return "synthetic_evil" diff --git a/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm b/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm index 4416117d6c..68c778f0be 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm @@ -21,7 +21,7 @@ if(!cell) cell = new /obj/item/weapon/cell/high(src) // 15k cell, as recharging stations are a lot more rare on the Surface. - playsound(loc, 'sound/mecha/nominalsyndi.ogg', 75, 0) + playsound(src, 'sound/mecha/nominalsyndi.ogg', 75, 0) /mob/living/silicon/robot/stray/speech_bubble_appearance() return "synthetic_evil" diff --git a/code/modules/mob/living/silicon/robot/subtypes/syndicate.dm b/code/modules/mob/living/silicon/robot/subtypes/syndicate.dm index 76496f4d4c..00e75248c7 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/syndicate.dm @@ -25,7 +25,7 @@ radio.keyslot = new /obj/item/device/encryptionkey/syndicate(radio) radio.recalculateChannels() - playsound(loc, 'sound/mecha/nominalsyndi.ogg', 75, 0) + playsound(src, 'sound/mecha/nominalsyndi.ogg', 75, 0) /mob/living/silicon/robot/syndicate/protector/init() ..() diff --git a/code/modules/mob/living/silicon/robot/syndicate.dm b/code/modules/mob/living/silicon/robot/syndicate.dm index acd441171b..c52755e696 100644 --- a/code/modules/mob/living/silicon/robot/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/syndicate.dm @@ -25,4 +25,4 @@ radio.keyslot = new /obj/item/device/encryptionkey/syndicate(radio) radio.recalculateChannels() - playsound(loc, 'sound/mecha/nominalsyndi.ogg', 75, 0) + playsound(src, 'sound/mecha/nominalsyndi.ogg', 75, 0) diff --git a/code/modules/mob/living/simple_mob/combat.dm b/code/modules/mob/living/simple_mob/combat.dm index 046a4ef988..7a950bf11a 100644 --- a/code/modules/mob/living/simple_mob/combat.dm +++ b/code/modules/mob/living/simple_mob/combat.dm @@ -143,7 +143,7 @@ if(do_after(src, reload_time)) if(reload_sound) - playsound(src.loc, reload_sound, 50, 1) + playsound(src, reload_sound, 50, 1) reload_count = 0 . = TRUE else diff --git a/code/modules/mob/living/simple_mob/defense.dm b/code/modules/mob/living/simple_mob/defense.dm index a8234ac970..d94d83c0a9 100644 --- a/code/modules/mob/living/simple_mob/defense.dm +++ b/code/modules/mob/living/simple_mob/defense.dm @@ -163,7 +163,7 @@ return 0 apply_damage(damage = shock_damage, damagetype = BURN, def_zone = null, blocked = null, blocked = resistance, used_weapon = null, sharp = FALSE, edge = FALSE) - playsound(loc, "sparks", 50, 1, -1) + playsound(src, "sparks", 50, 1, -1) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(5, 1, loc) diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index 86380b5b26..2a6d23194a 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -154,7 +154,7 @@ M.visible_message("\the [src] pounces on \the [M]!!") else // pounce misses! M.visible_message("\the [src] attempts to pounce \the [M] but misses!!") - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) if(will_eat(M) && (!M.canmove || vore_standing_too)) //if they're edible then eat them too return EatTarget(M) @@ -411,7 +411,7 @@ src.visible_message("\The [src] leaps at [T]!") src.throw_at(get_step(get_turf(T),get_turf(src)), 4, 1, src) - playsound(src.loc, 'sound/effects/bodyfall1.ogg', 50, 1) + playsound(src, 'sound/effects/bodyfall1.ogg', 50, 1) pixel_y = default_pixel_y sleep(5) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm index 15b04e119a..cb086c6ec3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm @@ -104,7 +104,7 @@ var/mob/living/L = A L.Weaken(cloaked_weaken_amount) to_chat(L, span("danger", "\The [src] ambushes you!")) - playsound(L, 'sound/weapons/spiderlunge.ogg', 75, 1) + playsound(src, 'sound/weapons/spiderlunge.ogg', 75, 1) uncloak() ..() // For the poison. diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm index 31997d204c..53d4bd0d24 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm @@ -115,7 +115,7 @@ continue visible_message(span("danger","\The [src] erupts from underneath, and hits \the [L]!")) - playsound(L, 'sound/weapons/heavysmash.ogg', 75, 1) + playsound(src, 'sound/weapons/heavysmash.ogg', 75, 1) L.Weaken(3) overshoot = FALSE @@ -164,7 +164,7 @@ // Stun anyone in our way. for(var/mob/living/L in T) - playsound(L, 'sound/weapons/heavysmash.ogg', 75, 1) + playsound(src, 'sound/weapons/heavysmash.ogg', 75, 1) L.Weaken(2) // Get into the tile. diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm index 5f4a4dc7e0..0ac8d54c2b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm @@ -93,7 +93,7 @@ var/was_stunned = L.incapacitated(INCAPACITATION_DISABLED) L.Weaken(weaken_amount) - playsound(L, 'sound/effects/break_stone.ogg', 75, 1) + playsound(src, 'sound/effects/break_stone.ogg', 75, 1) if(was_stunned) // Try to prevent chain-stuns by having them thrown. var/throwdir = get_dir(src, L) L.throw_at(get_edge_target_turf(L, throwdir), 5, 1, src) diff --git a/code/modules/mob/living/simple_mob/subtypes/illusion/illusion.dm b/code/modules/mob/living/simple_mob/subtypes/illusion/illusion.dm index 0b1dea13ff..69486a061d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/illusion/illusion.dm +++ b/code/modules/mob/living/simple_mob/subtypes/illusion/illusion.dm @@ -56,7 +56,7 @@ /mob/living/simple_mob/illusion/attack_hand(mob/living/carbon/human/M) if(!realistic) - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) visible_message(span("warning", "\The [M]'s hand goes through \the [src]!")) return else @@ -67,10 +67,10 @@ span("notice", "\The [M] hugs [src] to make [T.him] feel better!"), \ span("notice", "You hug [src] to make [T.him] feel better!") ) // slightly redundant as at the moment most mobs still use the normal gender var, but it works and future-proofs it - playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(I_DISARM) - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) visible_message(span("danger", "\The [M] attempted to disarm [src]!")) M.do_attack_animation(src) @@ -86,7 +86,7 @@ if(realistic) return ..() - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) visible_message(span("warning", "\The [user]'s [I] goes through \the [src]!")) return FALSE diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm index 8b3b6fff5d..4d418b0001 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm @@ -152,7 +152,7 @@ visible_message(span("warning", "\The [src] creates \an [energy_ball] around itself!")) - playsound(src.loc, 'sound/effects/lightning_chargeup.ogg', 100, 1, extrarange = 30) + playsound(src, 'sound/effects/lightning_chargeup.ogg', 100, 1, extrarange = 30) // Shock nearby things that aren't ourselves. for(var/i = 1 to 10) @@ -179,7 +179,7 @@ // Shoot a tesla bolt, and flashes people who are looking at the mecha without sufficent eye protection. visible_message(span("warning", "\The [energy_ball] explodes in a flash of light, sending a shock everywhere!")) - playsound(src.loc, 'sound/effects/lightningbolt.ogg', 100, 1, extrarange = 30) + playsound(src, 'sound/effects/lightningbolt.ogg', 100, 1, extrarange = 30) tesla_zap(src.loc, 5, ELECTRIC_ZAP_POWER, FALSE) for(var/mob/living/L in viewers(src)) if(L == src) @@ -346,4 +346,4 @@ if(get_dist(holder, A) >= rocket_explosive_radius + 1) holder.a_intent = I_HURT // Fire rockets if it's an obj/turf. else - holder.a_intent = I_DISARM // Electricity might not work but it's safe up close. + holder.a_intent = I_DISARM // Electricity might not work but it's safe up close. diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm index 30c891088c..404a209c60 100644 --- a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm +++ b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm @@ -38,6 +38,6 @@ /mob/living/simple_mob/animal/space/tree/death() ..(null,"is hacked into pieces!") - playsound(loc, 'sound/effects/woodcutting.ogg', 100, 1) + playsound(src, 'sound/effects/woodcutting.ogg', 100, 1) new /obj/item/stack/material/wood(loc) qdel(src) \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/feral/feral.dm b/code/modules/mob/living/simple_mob/subtypes/slime/feral/feral.dm index 2fc06815ca..e2ef92e982 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/feral/feral.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/feral/feral.dm @@ -69,7 +69,7 @@ sharp = TRUE /obj/item/projectile/icicle/on_impact(atom/A) - playsound(get_turf(A), "shatter", 70, 1) + playsound(A, "shatter", 70, 1) return ..() /obj/item/projectile/icicle/get_structure_damage() @@ -93,4 +93,4 @@ if(L.has_AI()) // Other AIs should react to hostile auras. L.ai_holder.react_to_attack(src) - + diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm index 7590fb2e05..a5419bc559 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm @@ -221,5 +221,5 @@ return "slime" /mob/living/simple_mob/slime/proc/squish() - playsound(src.loc, 'sound/effects/slime_squish.ogg', 50, 0) + playsound(src, 'sound/effects/slime_squish.ogg', 50, 0) visible_message("\The [src] squishes!") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm index dc8c2be032..51266a6d88 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm @@ -10,11 +10,11 @@ if(prob(fail_odds)) visible_message(span("warning", "\The [L] attempts to wrestle \the [name] off!")) - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) else visible_message(span("warning", "\The [L] manages to wrestle \the [name] off!")) - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(prob(40)) adjust_discipline(1) // Do this here so that it will be justified discipline. diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm index cf75159b27..9c5bf2df0c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm @@ -207,7 +207,7 @@ /mob/living/simple_mob/otie/attackby(var/obj/item/O, var/mob/user) // Trade donuts for bellybrig victims. if(istype(O, /obj/item/weapon/reagent_containers/food)) qdel(O) - playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1) + playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1) if(!has_AI())//No autobarf on player control. return if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/donut) && istype(src, /mob/living/simple_mob/otie/security)) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm index 11c19794f7..d708f265bb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm @@ -91,7 +91,7 @@ for(var/obj/item/weapon/reagent_containers/food/snacks/S in oview(src,3)) //Accept thrown offerings and scavenge surroundings. if(get_dist(src,S) <=1) visible_emote("hungrily devours \the [S].") - playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1) + playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1) qdel(S) hunger = 0 food = null @@ -155,7 +155,7 @@ /mob/living/simple_mob/vore/aggressive/rat/tame/attackby(var/obj/item/O, var/mob/user) // Feed the rat your food to satisfy it. if(istype(O, /obj/item/weapon/reagent_containers/food/snacks)) qdel(O) - playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1) + playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1) hunger = 0 food = null return diff --git a/code/modules/mob/mob_defines_vr.dm b/code/modules/mob/mob_defines_vr.dm index 48273ec211..1c6e19ac78 100644 --- a/code/modules/mob/mob_defines_vr.dm +++ b/code/modules/mob/mob_defines_vr.dm @@ -7,4 +7,9 @@ var/obj/screen/shadekin/darkness/shadekin_dark_display = null var/obj/screen/shadekin/energy/shadekin_energy_display = null - var/obj/screen/xenochimera/danger_level/xenochimera_danger_display = null \ No newline at end of file + var/obj/screen/xenochimera/danger_level/xenochimera_danger_display = null + +/mob/drop_location() + if(temporary_form) + return temporary_form.drop_location() + return ..() \ No newline at end of file diff --git a/code/modules/mob/mob_grab_specials.dm b/code/modules/mob/mob_grab_specials.dm index 1702e73ec9..a7a9d45db7 100644 --- a/code/modules/mob/mob_grab_specials.dm +++ b/code/modules/mob/mob_grab_specials.dm @@ -108,7 +108,7 @@ target.apply_effect(20, PARALYZE) target.visible_message("[target] [target.species.get_knockout_message(target)]") - playsound(attacker.loc, "swing_hit", 25, 1, -1) + playsound(attacker, "swing_hit", 25, 1, -1) add_attack_logs(attacker,target,"Headbutted using grab") attacker.drop_from_inventory(src) @@ -121,7 +121,7 @@ to_chat(attacker, "You require a better grab to do this.") return if(target.grab_joint(attacker, target_zone)) - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) return /obj/item/weapon/grab/proc/pin_down(mob/target, mob/attacker) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index c76b7fcb4c..2da05bc4de 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -391,9 +391,9 @@ //Check to see if we slipped if(prob(Process_Spaceslipping(5)) && !buckled) - to_chat(src, "You slipped!") - src.inertia_dir = src.last_move - step(src, src.inertia_dir) + to_chat(src, "You slipped!") + inertia_dir = last_move + step(src, src.inertia_dir) // Not using Move for smooth glide here because this is a 'slip' so should be sudden. return 0 //If not then we can reset inertia and move inertia_dir = 0 @@ -405,7 +405,7 @@ var/shoegrip for(var/turf/turf in oview(1,src)) - if(istype(turf,/turf/space)) + if(isspace(turf)) continue if(istype(turf,/turf/simulated/floor)) // Floors don't count if they don't have gravity diff --git a/code/modules/multiz/ladder_assembly_vr.dm b/code/modules/multiz/ladder_assembly_vr.dm index 675cc1e969..e46bdca799 100644 --- a/code/modules/multiz/ladder_assembly_vr.dm +++ b/code/modules/multiz/ladder_assembly_vr.dm @@ -25,14 +25,14 @@ switch(state) if(CONSTRUCTION_UNANCHORED) state = CONSTRUCTION_WRENCHED - playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) + playsound(src, 'sound/items/Ratchet.ogg', 75, 1) user.visible_message("\The [user] secures \the [src]'s reinforcing bolts.", \ "You secure the reinforcing bolts.", \ "You hear a ratchet") src.anchored = 1 if(CONSTRUCTION_WRENCHED) state = CONSTRUCTION_UNANCHORED - playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) + playsound(src, 'sound/items/Ratchet.ogg', 75, 1) user.visible_message("\The [user] unsecures \the [src]'s reinforcing bolts.", \ "You undo the reinforcing bolts.", \ "You hear a ratchet") @@ -48,7 +48,7 @@ to_chat(user, "The refinforcing bolts need to be secured.") if(CONSTRUCTION_WRENCHED) if(WT.remove_fuel(0, user)) - playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) + playsound(src, 'sound/items/Welder2.ogg', 50, 1) user.visible_message("\The [user] starts to weld \the [src] to the floor.", \ "You start to weld \the [src] to the floor.", \ "You hear welding") @@ -61,7 +61,7 @@ to_chat(user, "You need more welding fuel to complete this task.") if(CONSTRUCTION_WELDED) if(WT.remove_fuel(0, user)) - playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) + playsound(src, 'sound/items/Welder2.ogg', 50, 1) user.visible_message("\The [user] starts to cut \the [src] free from the floor.", \ "You start to cut \the [src] free from the floor.", \ "You hear welding") diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index f60dd4f8b8..f5201f60ec 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -492,7 +492,7 @@ visible_message("\The [src] falls from above and slams into \the [landing]!", \ "You fall off and hit \the [landing]!", \ "You hear something slam into \the [landing].") - playsound(loc, "punch", 25, 1, -1) + playsound(src, "punch", 25, 1, -1) // Because wounds heal rather quickly, 10 (the default for this proc) should be enough to discourage jumping off but not be enough to ruin you, at least for the first time. // Hits 10 times, because apparently targeting individual limbs lets certain species survive the fall from atmosphere @@ -589,7 +589,7 @@ visible_message("\The [src] falls from above and slams into \the [landing]!", \ "You fall off and hit \the [landing]!", \ "You hear something slam into \the [landing].") - playsound(loc, "punch", 25, 1, -1) + playsound(src, "punch", 25, 1, -1) // And now to hurt the mech. if(!planetary) diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm index 7bdb8c74e3..bbca4eef0d 100644 --- a/code/modules/multiz/movement_vr.dm +++ b/code/modules/multiz/movement_vr.dm @@ -58,7 +58,7 @@ else if(prey.can_be_drop_pred && pred.can_be_drop_prey) //Is person being fallen onto pred & person falling prey pred.feed_grabbed_to_self_falling_nom(prey,pred) //oh, how the tables have turned. else - playsound(loc, "punch", 25, 1, -1) + playsound(src, "punch", 25, 1, -1) prey.Weaken(8) //Just fall onto them if neither of the above apply. var/tdamage for(var/i = 1 to 10) @@ -85,7 +85,7 @@ else prey.Weaken(8) pred.loc = prey.loc - playsound(loc, "punch", 25, 1, -1) + playsound(src, "punch", 25, 1, -1) var/tdamage for(var/i = 1 to 10) tdamage = rand(0, 10)/2 diff --git a/code/modules/multiz/pipes.dm b/code/modules/multiz/pipes.dm index 237e38562e..0bc21f07eb 100644 --- a/code/modules/multiz/pipes.dm +++ b/code/modules/multiz/pipes.dm @@ -79,7 +79,7 @@ obj/machinery/atmospherics/pipe/zpipe/check_pressure(pressure) obj/machinery/atmospherics/pipe/zpipe/proc/burst() src.visible_message("\The [src] bursts!"); - playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) + playsound(src, 'sound/effects/bang.ogg', 25, 1) var/datum/effect/effect/system/smoke_spread/smoke = new smoke.set_up(1,0, src.loc, 0) smoke.start() diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm index 1a1d4081a7..652e86d464 100644 --- a/code/modules/multiz/turf.dm +++ b/code/modules/multiz/turf.dm @@ -39,15 +39,30 @@ ..() update() +/turf/simulated/open/ChangeTurf() + var/turf/T = GetBelow(src) + if(T) + GLOB.turf_entered_event.unregister(T, src, .proc/BelowOpenUpdated) + GLOB.turf_exited_event.unregister(T, src, .proc/BelowOpenUpdated) + . = ..() + /turf/simulated/open/Initialize() . = ..() ASSERT(HasBelow(z)) update() + var/turf/T = GetBelow(src) + if(T) + GLOB.turf_entered_event.register(T, src, .proc/BelowOpenUpdated) + GLOB.turf_exited_event.register(T, src, .proc/BelowOpenUpdated) /turf/simulated/open/Entered(var/atom/movable/mover) . = ..() mover.fall() +/turf/simulated/open/proc/BelowOpenUpdated(turf/T, atom/movable/AM, old_loc) + if(isobj(AM) && GLOB.open_space_initialised && !AM.invisibility) + SSopen_space.add_turf(src, 1) + // Called when thrown object lands on this turf. /turf/simulated/open/hitby(var/atom/movable/AM, var/speed) . = ..() diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm index b38f2cccfa..85b0ebbee8 100644 --- a/code/modules/nifsoft/nif.dm +++ b/code/modules/nifsoft/nif.dm @@ -206,7 +206,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable if(open == 0 && W.is_screwdriver()) if(do_after(user, 4 SECONDS, src) && open == 0) user.visible_message("[user] unscrews and pries open \the [src].","You unscrew and pry open \the [src].") - playsound(user, 'sound/items/Screwdriver.ogg', 50, 1) + playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) open = 1 update_icon() else if(open == 1 && istype(W,/obj/item/stack/cable_coil)) @@ -216,7 +216,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable return if(do_after(user, 6 SECONDS, src) && open == 1 && C.use(3)) user.visible_message("[user] replaces some wiring in \the [src].","You replace any burned out wiring in \the [src].") - playsound(user, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) open = 2 update_icon() else if(open == 2 && istype(W,/obj/item/device/multitool)) @@ -227,7 +227,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable else if(open == 3 && W.is_screwdriver()) if(do_after(user, 3 SECONDS, src) && open == 3) user.visible_message("[user] closes up \the [src].","You re-seal \the [src] for use once more.") - playsound(user, 'sound/items/Screwdriver.ogg', 50, 1) + playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) open = FALSE durability = initial(durability) savetofile = TRUE diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index c12d548235..ddb546ff88 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -106,8 +106,8 @@ var/list/organ_cache = list() STOP_PROCESSING(SSobj, src) handle_organ_mod_special(TRUE) if(owner && vital) - owner.death() owner.can_defib = 0 + owner.death() /obj/item/organ/proc/adjust_germ_level(var/amount) // Unless you're setting germ level directly to 0, use this proc instead germ_level = CLAMP(germ_level + amount, 0, INFECTION_LEVEL_MAX) @@ -352,7 +352,7 @@ var/list/organ_cache = list() var/obj/item/organ/external/affected = owner.get_organ(parent_organ) if(affected) affected.internal_organs -= src - loc = get_turf(owner) + forceMove(owner.drop_location()) START_PROCESSING(SSobj, src) rejecting = null var/datum/reagent/blood/organ_blood = locate(/datum/reagent/blood) in reagents.reagent_list @@ -361,9 +361,10 @@ var/list/organ_cache = list() if(owner && vital) if(user) - add_attack_logs(user,owner,"Removed vital organ [src.name]") - owner.death() - owner.can_defib = 0 + add_attack_logs(user, owner, "Removed vital organ [src.name]") + if(owner.stat != DEAD) + owner.can_defib = 0 + owner.death() handle_organ_mod_special(TRUE) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 5ea5ec2196..cf951eb3ae 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -1059,7 +1059,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(organ_can_feel_pain() && !isbelly(owner.loc)) owner.emote("scream") - playsound(src.loc, "fracture", 10, 1, -2) + playsound(src, "fracture", 10, 1, -2) status |= ORGAN_BROKEN broken_description = pick("broken","fracture","hairline fracture") diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index 1a79b2b14a..221767b15b 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -131,9 +131,9 @@ var/global/list/limb_icon_cache = list() /obj/item/organ/external/proc/get_icon(var/skeletal) - var/gender = "f" - if(owner && owner.gender == MALE) - gender = "m" + var/gender = "m" + if(owner && owner.gender == FEMALE) + gender = "f" icon_cache_key = "[icon_name]_[species ? species.get_bodytype() : SPECIES_HUMAN]" //VOREStation Edit diff --git a/code/modules/organs/subtypes/machine.dm b/code/modules/organs/subtypes/machine.dm index 6bb76bbd5e..fdf630f001 100644 --- a/code/modules/organs/subtypes/machine.dm +++ b/code/modules/organs/subtypes/machine.dm @@ -89,7 +89,7 @@ /obj/item/organ/internal/mmi_holder/emp_act(severity) // ..() // VOREStation Edit - Don't take damage - owner.adjustToxLoss(rand(6/severity, 12/severity)) + owner?.adjustToxLoss(rand(6/severity, 12/severity)) /obj/item/organ/internal/mmi_holder/posibrain name = "positronic brain interface" diff --git a/code/modules/overmap/overmap_shuttle.dm b/code/modules/overmap/overmap_shuttle.dm index d009c53847..6693778ec5 100644 --- a/code/modules/overmap/overmap_shuttle.dm +++ b/code/modules/overmap/overmap_shuttle.dm @@ -160,11 +160,11 @@ if(W.is_crowbar()) if(opened) to_chat(user, "You tightly shut \the [src] door.") - playsound(src.loc, 'sound/effects/locker_close.ogg', 25, 0, -3) + playsound(src, 'sound/effects/locker_close.ogg', 25, 0, -3) opened = 0 else to_chat(user, "You open up \the [src] door.") - playsound(src.loc, 'sound/effects/locker_open.ogg', 15, 1, -3) + playsound(src, 'sound/effects/locker_open.ogg', 15, 1, -3) opened = 1 else if(istype(W,/obj/item/weapon/tank)) if(!opened) diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index b359f552d5..e4e77f9005 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -98,7 +98,7 @@ if (href_list["scan"]) var/obj/effect/overmap/O = locate(href_list["scan"]) if(istype(O) && !QDELETED(O) && (O in view(7,linked))) - playsound(loc, "sound/machines/dotprinter.ogg", 30, 1) + playsound(src, "sound/machines/dotprinter.ogg", 30, 1) new/obj/item/weapon/paper/(get_turf(src), O.get_scan_data(user), "paper (Sensor Scan - [O])") return TOPIC_HANDLED diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm index d111c2614e..fd689fb990 100644 --- a/code/modules/overmap/ships/engines/gas_thruster.dm +++ b/code/modules/overmap/ships/engines/gas_thruster.dm @@ -159,7 +159,7 @@ if(!removed) return 0 . = calculate_thrust(removed) - playsound(loc, 'sound/machines/thruster.ogg', 100 * thrust_limit, 0, world.view * 4, 0.1) + playsound(src, 'sound/machines/thruster.ogg', 100 * thrust_limit, 0, world.view * 4, 0.1) if(network) network.update = 1 diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index a850cf9989..040bd0a9c1 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -156,7 +156,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins return 0 //You can't send faxes to "Unknown" flick("faxreceive", src) - playsound(loc, "sound/effects/printer.ogg", 50, 1) + playsound(src, "sound/effects/printer.ogg", 50, 1) // give the sprite some time to flick diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 374fb647c5..cf1f251307 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -38,19 +38,19 @@ P.loc = src icon_state = "[initial(icon_state)]-open" flick("[initial(icon_state)]-open",src) - playsound(loc, 'sound/bureaucracy/filingcabinet.ogg', 50, 1) + playsound(src, 'sound/bureaucracy/filingcabinet.ogg', 50, 1) sleep(40) icon_state = initial(icon_state) updateUsrDialog() else if(P.is_wrench()) - playsound(loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) anchored = !anchored to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") else if(P.is_screwdriver()) to_chat(user, "You begin taking the [name] apart.") playsound(src, P.usesound, 50, 1) if(do_after(user, 10 * P.toolspeed)) - playsound(loc, P.usesound, 50, 1) + playsound(src, P.usesound, 50, 1) to_chat(user, "You take the [name] apart.") new /obj/item/stack/material/steel( src.loc, 4 ) for(var/obj/item/I in contents) @@ -101,7 +101,7 @@ usr.put_in_hands(P) updateUsrDialog() flick("[initial(icon_state)]-open",src) - playsound(loc, 'sound/bureaucracy/filingcabinet.ogg', 50, 1) + playsound(src, 'sound/bureaucracy/filingcabinet.ogg', 50, 1) spawn(0) sleep(20) icon_state = initial(icon_state) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index f5722053eb..908967a79e 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -189,7 +189,7 @@ if(rigged && (Holiday == "April Fool's Day")) if(spam_flag == 0) spam_flag = 1 - playsound(loc, 'sound/items/bikehorn.ogg', 50, 1) + playsound(src, 'sound/items/bikehorn.ogg', 50, 1) spawn(20) spam_flag = 0 return @@ -392,7 +392,7 @@ user.visible_message("[user] holds \the [P] up to \the [src], it looks like [TU.hes] trying to burn it!", \ "You hold \the [P] up to \the [src], burning it slowly.") - playsound(src.loc, 'sound/bureaucracy/paperburn.ogg', 50, 1) + playsound(src, 'sound/bureaucracy/paperburn.ogg', 50, 1) spawn(20) if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit) diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 28979b4154..bbf66d9f9a 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -154,13 +154,13 @@ insert_sheet_at(usr, page+1, in_hand) else if(page != pages.len) page++ - playsound(src.loc, "pageturn", 50, 1) + playsound(src, "pageturn", 50, 1) if(href_list["prev_page"]) if(in_hand && (istype(in_hand, /obj/item/weapon/paper) || istype(in_hand, /obj/item/weapon/photo))) insert_sheet_at(usr, page, in_hand) else if(page > 1) page-- - playsound(src.loc, "pageturn", 50, 1) + playsound(src, "pageturn", 50, 1) if(href_list["remove"]) var/obj/item/weapon/W = pages[page] usr.put_in_hands(W) diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm index cbbe7eeb4e..f5fae97d83 100644 --- a/code/modules/paperwork/papershredder.dm +++ b/code/modules/paperwork/papershredder.dm @@ -60,7 +60,7 @@ paperamount += paper_result user.drop_from_inventory(W) qdel(W) - playsound(src.loc, 'sound/items/pshred.ogg', 75, 1) + playsound(src, 'sound/items/pshred.ogg', 75, 1) flick(shred_anim, src) if(paperamount > max_paper) to_chat(user,"\The [src] was too full, and shredded paper goes everywhere!") diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index af51ebdf1f..e27f8db8b0 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -30,7 +30,7 @@ return user.setClickCooldown(1 SECOND) to_chat(user, "Click.") - playsound(loc, 'sound/items/penclick.ogg', 50, 1) + playsound(src, 'sound/items/penclick.ogg', 50, 1) /obj/item/weapon/pen/blue desc = "It's a normal blue ink pen." @@ -53,7 +53,7 @@ /obj/item/weapon/pen/AltClick(mob/user) to_chat(user, "Click.") - playsound(loc, 'sound/items/penclick.ogg', 50, 1) + playsound(src, 'sound/items/penclick.ogg', 50, 1) return /obj/item/weapon/pen/multi/attack_self(mob/user) @@ -152,7 +152,7 @@ sharp = 1 edge = 1 w_class = active_w_class - playsound(user, 'sound/weapons/saberon.ogg', 15, 1) + playsound(src, 'sound/weapons/saberon.ogg', 15, 1) damtype = SEARING catchable = FALSE @@ -166,7 +166,7 @@ /obj/item/weapon/pen/blade/proc/deactivate(mob/living/user) if(!active) return - playsound(user, 'sound/weapons/saberoff.ogg', 15, 1) + playsound(src, 'sound/weapons/saberoff.ogg', 15, 1) active = 0 icon_state = default_icon_state embed_chance = initial(embed_chance) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 72200f1631..5bf6a9102a 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -70,35 +70,35 @@ break if (istype(copyitem, /obj/item/weapon/paper)) - playsound(loc, "sound/machines/copier.ogg", 100, 1) + playsound(src, "sound/machines/copier.ogg", 100, 1) sleep(11) copy(copyitem) audible_message("You can hear [src] whirring as it finishes printing.") - playsound(loc, "sound/machines/buzzbeep.ogg", 30) + playsound(src, "sound/machines/buzzbeep.ogg", 30) else if (istype(copyitem, /obj/item/weapon/photo)) - playsound(loc, "sound/machines/copier.ogg", 100, 1) + playsound(src, "sound/machines/copier.ogg", 100, 1) sleep(11) photocopy(copyitem) audible_message("You can hear [src] whirring as it finishes printing.") - playsound(loc, "sound/machines/buzzbeep.ogg", 30) + playsound(src, "sound/machines/buzzbeep.ogg", 30) else if (istype(copyitem, /obj/item/weapon/paper_bundle)) sleep(11) - playsound(loc, "sound/machines/copier.ogg", 100, 1) + playsound(src, "sound/machines/copier.ogg", 100, 1) var/obj/item/weapon/paper_bundle/B = bundlecopy(copyitem) sleep(11*B.pages.len) audible_message("You can hear [src] whirring as it finishes printing.") - playsound(loc, "sound/machines/buzzbeep.ogg", 30) + playsound(src, "sound/machines/buzzbeep.ogg", 30) else if (has_buckled_mobs()) // VOREStation EDIT: For ass-copying. - playsound(loc, "sound/machines/copier.ogg", 100, 1) + playsound(src, "sound/machines/copier.ogg", 100, 1) audible_message("You can hear [src] whirring as it attempts to scan.") sleep(rand(20,45)) // Sit with your bare ass on the copier for a random time, feel like a fool, get stared at. copyass(user) sleep(15) audible_message("You can hear [src] whirring as it finishes printing.") - playsound(loc, "sound/machines/buzzbeep.ogg", 30) + playsound(src, "sound/machines/buzzbeep.ogg", 30) else to_chat(user, "\The [copyitem] can't be copied by [src].") - playsound(loc, "sound/machines/buzz-two.ogg", 100) + playsound(src, "sound/machines/buzz-two.ogg", 100) break use_power(active_power_usage) @@ -156,7 +156,7 @@ copyitem = O O.loc = src to_chat(user, "You insert \the [O] into \the [src].") - playsound(loc, "sound/machines/click.ogg", 100, 1) + playsound(src, "sound/machines/click.ogg", 100, 1) flick(insert_anim, src) else to_chat(user, "There is already something in \the [src].") @@ -170,7 +170,7 @@ else to_chat(user, "This cartridge is not yet ready for replacement! Use up the rest of the toner.") else if(O.is_wrench()) - playsound(loc, O.usesound, 50, 1) + playsound(src, O.usesound, 50, 1) anchored = !anchored to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") else if(default_deconstruction_screwdriver(user, O)) @@ -232,7 +232,7 @@ if(need_toner) toner-- if(toner == 0) - playsound(loc, "sound/machines/buzz-sigh.ogg", 100) + playsound(src, "sound/machines/buzz-sigh.ogg", 100) visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") return c @@ -255,7 +255,7 @@ toner -= 5 //photos use a lot of ink! if(toner < 0) toner = 0 - playsound(loc, "sound/machines/buzz-sigh.ogg", 100) + playsound(src, "sound/machines/buzz-sigh.ogg", 100) visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") return p @@ -339,7 +339,7 @@ toner -= 10 // PHOTOCOPYING YOUR ASS IS EXPENSIVE (And so you can't just spam it a bunch). if(toner < 0) toner = 0 - playsound(loc, "sound/machines/buzz-sigh.ogg", 100) + playsound(src, "sound/machines/buzz-sigh.ogg", 100) visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") return p @@ -351,7 +351,7 @@ for(var/obj/item/weapon/W in bundle.pages) if(toner <= 0 && need_toner) toner = 0 - playsound(loc, "sound/machines/buzz-sigh.ogg", 100) + playsound(src, "sound/machines/buzz-sigh.ogg", 100) visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") break diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 3641f5c6f6..728602dcf7 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -97,7 +97,7 @@ var/global/photo_count = 0 var/mob/living/carbon/human/M = usr if(!( istype(over_object, /obj/screen) )) return ..() - playsound(loc, "rustle", 50, 1, -5) + playsound(src, "rustle", 50, 1, -5) if((!( M.restrained() ) && !( M.stat ) && M.back == src)) switch(over_object.name) if("r_hand") @@ -242,7 +242,7 @@ var/global/photo_count = 0 if(!on || !pictures_left || ismob(target.loc)) return captureimage(target, user, flag) - playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3) + playsound(src, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3) pictures_left-- desc = "A polaroid camera. It has [pictures_left] photos left." diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index 46f05bfd80..93c716b426 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -69,7 +69,7 @@ /obj/machinery/power/am_control_unit/proc/produce_power() - playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) + playsound(src, 'sound/effects/bang.ogg', 25, 1) var/core_power = reported_core_efficiency//Effectively how much fuel we can safely deal with if(core_power <= 0) return 0//Something is wrong var/core_damage = 0 @@ -85,7 +85,7 @@ for(var/obj/machinery/am_shielding/AMS in linked_cores) AMS.stability -= core_damage AMS.check_stability(1) - playsound(src.loc, 'sound/effects/bang.ogg', 50, 1) + playsound(src, 'sound/effects/bang.ogg', 50, 1) return diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 26bc4c9168..72fc9f2cf8 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -531,12 +531,12 @@ GLOBAL_LIST_EMPTY(apcs) if (has_electronics==1 && terminal) has_electronics = 2 stat &= ~MAINT - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) to_chat(user, "You screw the circuit electronics into place.") else if (has_electronics==2) has_electronics = 1 stat |= MAINT - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) to_chat(user, "You unfasten the electronics.") else /* has_electronics==0 */ to_chat(user, "There is nothing to secure.") @@ -562,7 +562,7 @@ GLOBAL_LIST_EMPTY(apcs) return user.visible_message("[user.name] adds cables to the APC frame.", \ "You start adding cables to the APC frame...") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) if (C.amount >= 10 && !terminal && opened && has_electronics != 2) var/obj/structure/cable/N = T.get_cable_node() @@ -585,7 +585,7 @@ GLOBAL_LIST_EMPTY(apcs) return user.visible_message("[user.name] starts dismantling the [src]'s power terminal.", \ "You begin to cut the cables...") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 50 * W.toolspeed)) if(terminal && opened && has_electronics!=2) if (prob(50) && electrocute_mob(usr, terminal.powernet, terminal)) @@ -600,7 +600,7 @@ GLOBAL_LIST_EMPTY(apcs) else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && !((stat & BROKEN))) user.visible_message("[user.name] inserts the power control board into [src].", \ "You start to insert the power control board into the frame...") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 10)) if(has_electronics==0) has_electronics = 1 @@ -660,7 +660,7 @@ GLOBAL_LIST_EMPTY(apcs) if(do_after(user, 50)) user.visible_message("[user.name] resets the APC with a beep from their [W.name].",\ "You finish resetting the APC.") - playsound(src.loc, 'sound/machines/chime.ogg', 25, 1) + playsound(src, 'sound/machines/chime.ogg', 25, 1) reboot() else if ((stat & BROKEN) \ @@ -745,7 +745,7 @@ GLOBAL_LIST_EMPTY(apcs) if(H.species.can_shred(H)) user.setClickCooldown(user.get_attack_speed()) user.visible_message("[user.name] slashes at the [src.name]!", "You slash at the [src.name]!") - playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1) + playsound(src, 'sound/weapons/slash.ogg', 100, 1) var/allcut = wires.IsAllCut() diff --git a/code/modules/power/gravitygenerator_vr.dm b/code/modules/power/gravitygenerator_vr.dm index 9f5dd799f4..e0e24f31a5 100644 --- a/code/modules/power/gravitygenerator_vr.dm +++ b/code/modules/power/gravitygenerator_vr.dm @@ -223,7 +223,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) if(PS.get_amount() >= 10) PS.use(10) to_chat(user, "You add the plating to the framework.") - playsound(src.loc, 'sound/machines/click.ogg', 75, 1) + playsound(src, 'sound/machines/click.ogg', 75, 1) broken_state++ update_icon() else @@ -351,7 +351,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) charge_count -= 2 if(charge_count % 4 == 0 && prob(75)) // Let them know it is charging/discharging. - playsound(src.loc, 'sound/effects/empulse.ogg', 100, 1) + playsound(src, 'sound/effects/empulse.ogg', 100, 1) updateDialog() if(prob(25)) // To help stop "Your clothes feel warm." spam. diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 815252e8c6..00ef599124 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -112,7 +112,7 @@ var/global/list/light_type_cache = list() new /obj/item/stack/material/steel( get_turf(src.loc), sheets_refunded ) user.visible_message("[user.name] deconstructs [src].", \ "You deconstruct [src].", "You hear a noise.") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 75, 1) qdel(src) if (src.stage == 2) to_chat(usr, "You have to remove the wires first.") @@ -129,7 +129,7 @@ var/global/list/light_type_cache = list() new /obj/item/stack/cable_coil(get_turf(src.loc), 1, "red") user.visible_message("[user.name] removes the wiring from [src].", \ "You remove the wiring from [src].", "You hear a noise.") - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) return if(istype(W, /obj/item/stack/cable_coil)) @@ -423,7 +423,7 @@ var/global/list/light_type_cache = list() if(!on) needsound = TRUE // Play sound next time we turn on else if(needsound) - playsound(src.loc, 'sound/effects/lighton.ogg', 65, 1) + playsound(src, 'sound/effects/lighton.ogg', 65, 1) needsound = FALSE // Don't play sound again until we've been turned off //VOREStation Edit End @@ -804,7 +804,7 @@ var/global/list/light_type_cache = list() if(!skip_sound_and_sparks) if(status == LIGHT_OK || status == LIGHT_BURNED) - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) if(on) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) @@ -1025,7 +1025,7 @@ var/global/list/light_type_cache = list() status = LIGHT_BROKEN force = 5 sharp = 1 - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) update_icon() //Lamp Shade diff --git a/code/modules/power/lightswitch_vr.dm b/code/modules/power/lightswitch_vr.dm index 409110331f..d5fe4cd6ab 100644 --- a/code/modules/power/lightswitch_vr.dm +++ b/code/modules/power/lightswitch_vr.dm @@ -34,7 +34,7 @@ return ..() /obj/machinery/light_switch/dismantle() - playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) + playsound(src, 'sound/items/Crowbar.ogg', 50, 1) var/obj/structure/construction/lightswitch/A = new(src.loc, src.dir) A.stage = FRAME_WIRED A.pixel_x = pixel_x @@ -89,7 +89,7 @@ if(!WT.remove_fuel(0, user)) to_chat(user, "\The [src] must be on to complete this task.") return - playsound(src.loc, WT.usesound, 50, 1) + playsound(src, WT.usesound, 50, 1) user.visible_message( \ "\The [user] begins deconstructing \the [src].", \ "You start deconstructing \the [src].") @@ -98,7 +98,7 @@ user.visible_message( \ "\The [user] has deconstructed \the [src].", \ "You deconstruct \the [src].") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 75, 1) qdel(src) else if (stage == FRAME_FASTENED) to_chat(user, "You have to unscrew the case first.") @@ -113,7 +113,7 @@ new /obj/item/stack/cable_coil(get_turf(src), 1, "red") user.visible_message("\The [user] removes the wiring from \the [src].", \ "You remove the wiring from \the [src].", "You hear a snip.") - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) update_icon() return @@ -125,7 +125,7 @@ user.update_examine_panel(src) user.visible_message("\The [user] adds wires to \the [src].", \ "You add wires to \the [src].", "You hear a noise.") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) update_icon() return diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm index 26a534e222..81f73be63d 100644 --- a/code/modules/power/pacman2.dm +++ b/code/modules/power/pacman2.dm @@ -72,7 +72,7 @@ else if(!active) if(O.is_wrench()) anchored = !anchored - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(anchored) to_chat(user, "You secure the generator to the floor.") else @@ -80,13 +80,13 @@ SSmachines.makepowernets() else if(O.is_screwdriver()) open = !open - playsound(loc, O.usesound, 50, 1) + playsound(src, O.usesound, 50, 1) if(open) to_chat(user, "You open the access panel.") else to_chat(user, "You close the access panel.") else if(O.is_crowbar() && !open) - playsound(loc, O.usesound, 50, 1) + playsound(src, O.usesound, 50, 1) var/obj/machinery/constructable_frame/machine_frame/new_frame = new /obj/machinery/constructable_frame/machine_frame(src.loc) for(var/obj/item/I in component_parts) I.loc = src.loc diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 10b638121f..3251aee2f9 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -272,7 +272,7 @@ else disconnect_from_network() to_chat(user, "You unsecure the generator from the floor.") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) anchored = !anchored return else if(default_deconstruction_screwdriver(user, O)) diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm index 5cdd86b047..1e07385f70 100644 --- a/code/modules/power/port_gen_vr.dm +++ b/code/modules/power/port_gen_vr.dm @@ -152,7 +152,7 @@ going_kaboom = TRUE visible_message("\The [src] lets out an shower of sparks as it starts to lose stability!",\ "You hear a loud electrical crack!") - playsound(src.loc, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5) + playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5) tesla_zap(src, 5, power_gen * 0.05) addtimer(CALLBACK(GLOBAL_PROC, .proc/explosion, get_turf(src), 2, 3, 4, 8), 100) // Not a normal explosion. diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 3b381ff2f0..ea8b5cd230 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -134,7 +134,7 @@ var/burst_time = (min_burst_delay + max_burst_delay)/2 + 2*(burst_shots-1) var/power_per_shot = active_power_usage * (burst_time/10) / burst_shots - playsound(src.loc, 'sound/weapons/emitter.ogg', 25, 1) + playsound(src, 'sound/weapons/emitter.ogg', 25, 1) if(prob(35)) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(5, 1, src) @@ -181,7 +181,7 @@ to_chat(user, "\The [src] needs to be wrenched to the floor.") if(1) if (WT.remove_fuel(0,user)) - playsound(loc, WT.usesound, 50, 1) + playsound(src, WT.usesound, 50, 1) user.visible_message("[user.name] starts to weld [src] to the floor.", \ "You start to weld [src] to the floor.", \ "You hear welding") @@ -194,7 +194,7 @@ to_chat(user, "You need more welding fuel to complete this task.") if(2) if (WT.remove_fuel(0,user)) - playsound(loc, WT.usesound, 50, 1) + playsound(src, WT.usesound, 50, 1) user.visible_message("[user.name] starts to cut [src] free from the floor.", \ "You start to cut [src] free from the floor.", \ "You hear welding") diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 6a510f0060..763dd32ca8 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -130,7 +130,7 @@ field_generator power level display return if(1) if (WT.remove_fuel(0,user)) - playsound(loc, WT.usesound, 50, 1) + playsound(src, WT.usesound, 50, 1) user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \ "You start to weld the [src] to the floor.", \ "You hear welding") @@ -142,7 +142,7 @@ field_generator power level display return if(2) if (WT.remove_fuel(0,user)) - playsound(loc, WT.usesound, 50, 1) + playsound(src, WT.usesound, 50, 1) user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \ "You start to cut the [src] free from the floor.", \ "You hear welding") diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm index bb470811ba..213b37d01a 100644 --- a/code/modules/power/singularity/generator.dm +++ b/code/modules/power/singularity/generator.dm @@ -31,12 +31,12 @@ return if(W.is_screwdriver()) panel_open = !panel_open - playsound(loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) visible_message("\The [user] adjusts \the [src]'s mechanisms.") if(panel_open && do_after(user, 30)) to_chat(user, "\The [src] looks like it could be modified.") if(panel_open && do_after(user, 80 * W.toolspeed)) // We don't have skills, so a delayed hint for engineers will have to do for now. (Panel open check for sanity) - playsound(loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) to_chat(user, "\The [src] looks like it could be adapted to forge advanced materials via particle acceleration, somehow..") else to_chat(user, "\The [src]'s mechanisms look secure.") diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index e79474b3a0..c05c4e1523 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -325,7 +325,7 @@ GLOBAL_LIST_EMPTY(smeses) to_chat(user, "You must remove the floor plating first.") else to_chat(user, "You begin to cut the cables...") - playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 50 * W.toolspeed)) if (prob(50) && electrocute_mob(usr, term.powernet, term)) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index a43bf079c8..f8bf16087e 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -333,7 +333,7 @@ to_chat(user, "You have to disassemble the terminal first!") return - playsound(get_turf(src), W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) to_chat(user, "You begin to disassemble the [src]!") if (do_after(usr, (100 * cur_coils) * W.toolspeed)) // More coils = takes longer to disassemble. It's complex so largest one with 5 coils will take 50s with a normal crowbar diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index f38cf26b61..34a2d8cd5e 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -65,14 +65,14 @@ GLOBAL_LIST_EMPTY(solars_list) /obj/machinery/power/solar/attackby(obj/item/weapon/W, mob/user) if(W.is_crowbar()) - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) user.visible_message("[user] begins to take the glass off the solar panel.") if(do_after(user, 50)) var/obj/item/solar_assembly/S = locate() in src if(S) S.loc = src.loc S.give_glass() - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) user.visible_message("[user] takes the glass off the solar panel.") qdel(src) return @@ -247,7 +247,7 @@ GLOBAL_LIST_EMPTY(solars_list) var/obj/item/stack/material/S = W if(S.use(2)) glass_type = W.type - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) user.visible_message("[user] places the glass on the solar assembly.") if(tracker) new /obj/machinery/power/tracker(get_turf(src), src) diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index ab54a82957..28835d7fdd 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -77,7 +77,7 @@ var/power_produced = powernet ? power / power_loss : power add_avail(power_produced*input_power_multiplier) flick("coilhit", src) - playsound(src.loc, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5) + playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5) tesla_zap(src, 5, power_produced) //addtimer(CALLBACK(src, .proc/reset_shocked), 10) spawn(10) reset_shocked() @@ -92,7 +92,7 @@ coeff = max(coeff, 10) var/power = (powernet.avail/2) draw_power(power) - playsound(src.loc, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5) + playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5) tesla_zap(src, 10, power/(coeff/2)) //TFF 3/6/19 - Port Cit RP fix for infinite frames diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 5a8c807642..4578db9b14 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -60,7 +60,7 @@ move_the_basket_ball(max(wait - 5, 4 + orbiting_balls.len * 1.5)) - playsound(src.loc, 'sound/effects/lightningbolt.ogg', 100, 1, extrarange = 30) + playsound(src, 'sound/effects/lightningbolt.ogg', 100, 1, extrarange = 30) set_dir(tesla_zap(src, 7, TESLA_DEFAULT_POWER, TRUE)) @@ -101,7 +101,7 @@ energy_to_lower = energy_to_raise - 20 energy_to_raise = energy_to_raise * 1.25 - playsound(src.loc, 'sound/effects/lightning_chargeup.ogg', 100, 1, extrarange = 30) + playsound(src, 'sound/effects/lightning_chargeup.ogg', 100, 1, extrarange = 30) //addtimer(CALLBACK(src, .proc/new_mini_ball), 100) spawn(100) new_mini_ball() diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 673b2ece86..0e2cc7cbf8 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -60,14 +60,14 @@ /obj/machinery/power/tracker/attackby(var/obj/item/weapon/W, var/mob/user) if(W.is_crowbar()) - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) + playsound(src, 'sound/machines/click.ogg', 50, 1) user.visible_message("[user] begins to take the glass off the solar tracker.") if(do_after(user, 50)) var/obj/item/solar_assembly/S = locate() in src if(S) S.loc = src.loc S.give_glass() - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) user.visible_message("[user] takes the glass off the tracker.") qdel(src) return diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 01f4e6003a..65ec739d62 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -134,7 +134,7 @@ AC.loc = src stored_ammo.Insert(1, AC) //add it to the head of our magazine's list L.update_icon() - playsound(user.loc, 'sound/weapons/flipblade.ogg', 50, 1) + playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) update_icon() // This dumps all the bullets right on the floor @@ -144,11 +144,11 @@ to_chat(user, "[src] is already empty!") return to_chat(user, "You empty [src].") - playsound(user.loc, "casing_sound", 50, 1) + playsound(src, "casing_sound", 50, 1) spawn(7) - playsound(user.loc, "casing_sound", 50, 1) + playsound(src, "casing_sound", 50, 1) spawn(10) - playsound(user.loc, "casing_sound", 50, 1) + playsound(src, "casing_sound", 50, 1) for(var/obj/item/ammo_casing/C in stored_ammo) C.loc = user.loc C.set_dir(pick(cardinal)) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index b33cd304c0..39a25d6746 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -543,7 +543,7 @@ user.visible_message("*click click*", "*click*") else src.visible_message("*click click*") - playsound(src.loc, 'sound/weapons/empty.ogg', 100, 1) + playsound(src, 'sound/weapons/empty.ogg', 100, 1) // Called when the user is about to fire. // Moved from handle_post_fire() because if using a laser, the message for when someone got shot would show up before the firing message. @@ -693,9 +693,9 @@ return if(silenced) - playsound(user, shot_sound, 10, 1) + playsound(src, shot_sound, 10, 1) else - playsound(user, shot_sound, 50, 1) + playsound(src, shot_sound, 50, 1) //Suicide handling. /obj/item/weapon/gun/var/mouthshoot = 0 //To stop people from suiciding twice... >.> diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index bff75f27f7..c1dae89a6e 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -127,7 +127,7 @@ power_supply = P P.loc = src user.visible_message("[user] inserts [P] into [src].", "You insert [P] into [src].") - playsound(src.loc, 'sound/weapons/flipblade.ogg', 50, 1) + playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) update_icon() update_held_icon() else @@ -143,7 +143,7 @@ power_supply.update_icon() user.visible_message("[user] removes [power_supply] from [src].", "You remove [power_supply] from [src].") power_supply = null - playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(src, 'sound/weapons/empty.ogg', 50, 1) update_icon() update_held_icon() else diff --git a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm index 9e9967289f..005741bfe4 100644 --- a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm +++ b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm @@ -45,7 +45,7 @@ return var/turf/T = get_turf(src) to_chat(user, "You remove [scanmod] from [src].") - playsound(T, I.usesound, 75, 1) + playsound(src, I.usesound, 75, 1) scanmod.forceMove(T) scanmod = null update_fail_chance() @@ -77,7 +77,7 @@ firable = FALSE VARSET_IN(src, firable, TRUE, 30 SECONDS) to_chat(user,"\The [src] shot fizzles due to interference!") - playsound(user, 'sound/weapons/wave.ogg', 60, 1) + playsound(src, 'sound/weapons/wave.ogg', 60, 1) return var/turf/T = get_turf(A) if(!T || (T.check_density() && mode == 1)) @@ -96,7 +96,7 @@ firable = FALSE VARSET_IN(src, firable, TRUE, 30 SECONDS) - playsound(user, 'sound/weapons/wave.ogg', 60, 1) + playsound(src, 'sound/weapons/wave.ogg', 60, 1) user.visible_message("[user] fires \the [src]!","You fire \the [src]!") diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm index a4f9db949e..1a6df20b1a 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm @@ -171,7 +171,7 @@ B.loc = src stored_ammo.Add(B) update_icon() - playsound(user.loc, 'sound/weapons/flipblade.ogg', 50, 1) + playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) update_icon() /obj/item/ammo_magazine/cell_mag/update_icon() diff --git a/code/modules/projectiles/guns/energy/crestrose_vr.dm b/code/modules/projectiles/guns/energy/crestrose_vr.dm index a486afca54..c702d05b09 100644 --- a/code/modules/projectiles/guns/energy/crestrose_vr.dm +++ b/code/modules/projectiles/guns/energy/crestrose_vr.dm @@ -35,6 +35,6 @@ /obj/item/weapon/gun/projectile/automatic/fluff/crestrose/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(default_parry_check(user, attacker, damage_source) && prob(50)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") - playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1) + playsound(user, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/gunsword_vr.dm b/code/modules/projectiles/guns/energy/gunsword_vr.dm index 54f689133d..fcf1fcfe26 100644 --- a/code/modules/projectiles/guns/energy/gunsword_vr.dm +++ b/code/modules/projectiles/guns/energy/gunsword_vr.dm @@ -69,7 +69,7 @@ sharp = 1 edge = 1 w_class = active_w_class - playsound(user, 'sound/weapons/saberon.ogg', 50, 1) + playsound(src, 'sound/weapons/saberon.ogg', 50, 1) set_light(lrange, lpower, lcolor) attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -78,7 +78,7 @@ /obj/item/weapon/cell/device/weapon/gunsword/proc/deactivate(mob/living/user) if(!active) return - playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) + playsound(src, 'sound/weapons/saberoff.ogg', 50, 1) icon_state = "gsaberoff" item_state = "gsaberoff" active = 0 diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm index bd9ab4d1c3..4f3a35c763 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm @@ -33,7 +33,7 @@ if(istype(A, /obj/item/weapon/tool/crowbar)) if(modkits.len) to_chat(user, "You pry the modifications out.") - playsound(loc, A.usesound, 100, 1) + playsound(src, A.usesound, 100, 1) for(var/obj/item/borg/upgrade/modkit/M in modkits) M.uninstall(src) else @@ -80,7 +80,7 @@ . = ..() spawn(fire_delay) if(power_supply && power_supply.check_charge(charge_cost)) - playsound(loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) + playsound(src, 'sound/weapons/kenetic_reload.ogg', 60, 1) /obj/item/weapon/gun/energy/kinetic_accelerator/update_icon() cut_overlays() @@ -195,7 +195,7 @@ if(KA.get_remaining_mod_capacity() >= cost) if(.) to_chat(user, "You install the modkit.") - playsound(loc, usesound, 100, 1) + playsound(src, usesound, 100, 1) user.unEquip(src) forceMove(KA) KA.modkits += src diff --git a/code/modules/projectiles/guns/energy/laser_vr.dm b/code/modules/projectiles/guns/energy/laser_vr.dm index 458442051c..86a32cb97f 100644 --- a/code/modules/projectiles/guns/energy/laser_vr.dm +++ b/code/modules/projectiles/guns/energy/laser_vr.dm @@ -223,7 +223,7 @@ while(recharging) if(!do_after(user, 10, src)) break - playsound(get_turf(src),'sound/items/change_drill.ogg',25,1) + playsound(src,'sound/items/change_drill.ogg',25,1) if(power_supply.give(phase_power) < phase_power) break diff --git a/code/modules/projectiles/guns/energy/particle.dm b/code/modules/projectiles/guns/energy/particle.dm index a9ce49bf52..a255f80262 100644 --- a/code/modules/projectiles/guns/energy/particle.dm +++ b/code/modules/projectiles/guns/energy/particle.dm @@ -71,12 +71,12 @@ if (!power_supply || power_supply.charge < charge_cost) user.visible_message("*click*", "*click*") - playsound(src.loc, 'sound/weapons/empty.ogg', 100, 1) + playsound(src, 'sound/weapons/empty.ogg', 100, 1) return 0 if(pressure >= 10) if (safetycatch) //weapons with a pressure regulator simply won't fire user.visible_message("*click*", "The pressure-interlock prevents you from firing \the [src].") - playsound(src.loc, 'sound/weapons/empty.ogg', 100, 1) + playsound(src, 'sound/weapons/empty.ogg', 100, 1) return 0 else if (prob(min(pressure, 100))) //pressure% chance of failing var/severity = rand(pressure) @@ -88,11 +88,11 @@ /obj/item/weapon/gun/energy/particle/proc/pressuremalfunction(severity, var/mob/user, var/turf/T) if (severity <= 10) // just doesn't fire. 10% chance in 100 atmo. user.visible_message("*click*", "\The [src] jams.") - playsound(src.loc, 'sound/weapons/empty.ogg', 100, 1) + playsound(src, 'sound/weapons/empty.ogg', 100, 1) else if (severity <= 60) //50% chance of fizzling and wasting a shot user.visible_message("\The [user] fires \the [src], but the shot fizzles in the air!", "You fire \the [src], but the shot fizzles in the air!") power_supply.charge -= charge_cost - playsound(src.loc, fire_sound, 100, 1) + playsound(src, fire_sound, 100, 1) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(2, 1, T) sparks.start() diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index f47053cba0..e5d43ca526 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -150,7 +150,7 @@ user.visible_message("*fizzle*", "*fizzle*") else src.visible_message("*fizzle*") - playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 1) + playsound(src, 'sound/effects/sparks1.ogg', 100, 1) /* /obj/item/weapon/gun/energy/staff/animate name = "staff of animation" diff --git a/code/modules/projectiles/guns/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/launcher/grenade_launcher.dm index 259d5e2e82..5f33557727 100644 --- a/code/modules/projectiles/guns/launcher/grenade_launcher.dm +++ b/code/modules/projectiles/guns/launcher/grenade_launcher.dm @@ -61,7 +61,7 @@ grenades.len-- user.put_in_hands(G) user.visible_message("[user] removes \a [G] from [src].", "You remove \a [G] from [src].") - playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(src, 'sound/weapons/empty.ogg', 50, 1) else to_chat(user, "[src] is empty.") @@ -119,7 +119,7 @@ if(chambered) user.put_in_hands(chambered) user.visible_message("[user] removes \a [chambered] from [src].", "You remove \a [chambered] from [src].") - playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(src, 'sound/weapons/empty.ogg', 50, 1) chambered = null else to_chat(user, "[src] is empty.") \ No newline at end of file diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index b8fe6c4e35..6a6bf73cb1 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -53,7 +53,7 @@ item_storage.remove_from_storage(removing, src.loc) user.put_in_hands(removing) to_chat(user, "You remove [removing] from the hopper.") - playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(src, 'sound/weapons/empty.ogg', 50, 1) else to_chat(user, "There is nothing to remove in \the [src].") diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 17778ffae4..3d60e22405 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -30,7 +30,7 @@ /obj/item/weapon/syringe_cartridge/attack_self(mob/user) if(syringe) to_chat(user, "You remove [syringe] from [src].") - playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(src, 'sound/weapons/empty.ogg', 50, 1) user.put_in_hands(syringe) syringe = null sharp = initial(sharp) @@ -97,7 +97,7 @@ user.visible_message("[user] unlatches and carefully relaxes the bolt on [src].", "You unlatch and carefully relax the bolt on [src], unloading the spring.") next = null else if(darts.len) - playsound(src.loc, 'sound/weapons/flipblade.ogg', 50, 1) + playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) user.visible_message("[user] draws back the bolt on [src], clicking it into place.", "You draw back the bolt on the [src], loading the spring!") next = darts[1] add_fingerprint(user) @@ -114,7 +114,7 @@ darts -= C user.put_in_hands(C) user.visible_message("[user] removes \a [C] from [src].", "You remove \a [C] from [src].") - playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(src, 'sound/weapons/empty.ogg', 50, 1) else ..() diff --git a/code/modules/projectiles/guns/magnetic/bore.dm b/code/modules/projectiles/guns/magnetic/bore.dm index 9d59dbbe1d..0594e2abb3 100644 --- a/code/modules/projectiles/guns/magnetic/bore.dm +++ b/code/modules/projectiles/guns/magnetic/bore.dm @@ -58,7 +58,7 @@ removing.forceMove(get_turf(src)) user.put_in_hands(removing) user.visible_message("\The [user] removes \the [removing] from \the [src].") - playsound(loc, 'sound/machines/click.ogg', 10, 1) + playsound(src, 'sound/machines/click.ogg', 10, 1) update_icon() return . = ..() @@ -84,7 +84,7 @@ cell = thing user.drop_from_inventory(cell) cell.forceMove(src) - playsound(loc, 'sound/machines/click.ogg', 10, 1) + playsound(src, 'sound/machines/click.ogg', 10, 1) user.visible_message("\The [user] slots \the [cell] into \the [src].") update_icon() return @@ -95,7 +95,7 @@ manipulator.forceMove(get_turf(src)) user.put_in_hands(manipulator) user.visible_message("\The [user] levers \the [manipulator] from \the [src].") - playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) + playsound(src, 'sound/items/Crowbar.ogg', 50, 1) manipulator = null update_icon() return @@ -106,7 +106,7 @@ capacitor.forceMove(get_turf(src)) user.put_in_hands(capacitor) user.visible_message("\The [user] unscrews \the [capacitor] from \the [src].") - playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) + playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) capacitor = null update_icon() return @@ -118,7 +118,7 @@ capacitor = thing user.drop_from_inventory(capacitor) capacitor.forceMove(src) - playsound(loc, 'sound/machines/click.ogg', 10, 1) + playsound(src, 'sound/machines/click.ogg', 10, 1) power_per_tick = (power_cost*0.15) * capacitor.rating user.visible_message("\The [user] slots \the [capacitor] into \the [src].") update_icon() @@ -131,7 +131,7 @@ manipulator = thing user.drop_from_inventory(manipulator) manipulator.forceMove(src) - playsound(loc, 'sound/machines/click.ogg', 10,1) + playsound(src, 'sound/machines/click.ogg', 10,1) mat_cost = initial(mat_cost) % (2*manipulator.rating) user.visible_message("\The [user] slots \the [manipulator] into \the [src].") update_icon() @@ -154,14 +154,14 @@ if(mat_storage + 2000 <= max_mat_storage && do_after(user,1.5 SECONDS)) can_hold_val ++ mat_storage += 2000 - playsound(loc, 'sound/effects/phasein.ogg', 15, 1) + playsound(src, 'sound/effects/phasein.ogg', 15, 1) else loading = FALSE break M.use(can_hold_val) user.visible_message("\The [user] loads \the [src] with \the [M].") - playsound(loc, 'sound/weapons/flipblade.ogg', 50, 1) + playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) update_icon() return . = ..() diff --git a/code/modules/projectiles/guns/magnetic/magnetic.dm b/code/modules/projectiles/guns/magnetic/magnetic.dm index 8c6d007fc0..ae12ce034c 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic.dm @@ -101,7 +101,7 @@ cell = thing user.drop_from_inventory(cell) cell.forceMove(src) - playsound(loc, 'sound/machines/click.ogg', 10, 1) + playsound(src, 'sound/machines/click.ogg', 10, 1) user.visible_message("\The [user] slots \the [cell] into \the [src].") update_icon() return @@ -113,7 +113,7 @@ capacitor.forceMove(get_turf(src)) user.put_in_hands(capacitor) user.visible_message("\The [user] unscrews \the [capacitor] from \the [src].") - playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) + playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) capacitor = null update_icon() return @@ -125,7 +125,7 @@ capacitor = thing user.drop_from_inventory(capacitor) capacitor.forceMove(src) - playsound(loc, 'sound/machines/click.ogg', 10, 1) + playsound(src, 'sound/machines/click.ogg', 10, 1) power_per_tick = (power_cost*0.15) * capacitor.rating user.visible_message("\The [user] slots \the [capacitor] into \the [src].") update_icon() @@ -149,7 +149,7 @@ ammo.use(1) user.visible_message("\The [user] loads \the [src] with \the [loaded].") - playsound(loc, 'sound/weapons/flipblade.ogg', 50, 1) + playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) update_icon() return . = ..() @@ -169,7 +169,7 @@ removing.forceMove(get_turf(src)) user.put_in_hands(removing) user.visible_message("\The [user] removes \the [removing] from \the [src].") - playsound(loc, 'sound/machines/click.ogg', 10, 1) + playsound(src, 'sound/machines/click.ogg', 10, 1) update_icon() return . = ..() @@ -238,7 +238,7 @@ removable_components = FALSE spawn(15) audible_message("\The [src]'s power supply begins to overload as the device crumples!") //Why are you still holding this? - playsound(loc, 'sound/effects/grillehit.ogg', 10, 1) + playsound(src, 'sound/effects/grillehit.ogg', 10, 1) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() var/turf/T = get_turf(src) sparks.set_up(2, 1, T) diff --git a/code/modules/projectiles/guns/magnetic/magnetic_construction.dm b/code/modules/projectiles/guns/magnetic/magnetic_construction.dm index 637f2460a6..7745c9c623 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_construction.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_construction.dm @@ -45,7 +45,7 @@ return user.visible_message("\The [user] welds the barrel of \the [src] into place.") - playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1) + playsound(src, 'sound/items/Welder2.ogg', 100, 1) increment_construction_stage() return @@ -68,7 +68,7 @@ if(thing.is_screwdriver() && construction_stage >= 9) user.visible_message("\The [user] secures \the [src] and finishes it off.") - playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) + playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) var/obj/item/weapon/gun/magnetic/coilgun = new(loc) var/put_in_hands var/mob/M = src.loc diff --git a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm index dbcc1a1b41..c9688ab0d8 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm @@ -52,7 +52,7 @@ loaded.forceMove(get_turf(src)) loaded = null visible_message("\The [src] beeps and ejects its empty cartridge.","There's a beeping sound!") - playsound(get_turf(src), empty_sound, 40, 1) + playsound(src, empty_sound, 40, 1) /obj/item/weapon/gun/magnetic/railgun/automatic // Adminspawn only, this shit is absurd. name = "\improper RHR accelerator" diff --git a/code/modules/projectiles/guns/modular_guns.dm b/code/modules/projectiles/guns/modular_guns.dm index 38e2ed1a93..4eb990c0ca 100644 --- a/code/modules/projectiles/guns/modular_guns.dm +++ b/code/modules/projectiles/guns/modular_guns.dm @@ -142,7 +142,7 @@ power_supply = P P.loc = src user.visible_message("[user] inserts [P] into [src].", "You insert [P] into [src].") - playsound(src.loc, 'sound/weapons/flipblade.ogg', 50, 1) + playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) update_icon() update_held_icon() return diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index d0d321b299..7f93579230 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -89,7 +89,7 @@ return else chambered.loc = get_turf(src) - playsound(src.loc, "casing", 50, 1) + playsound(src, "casing", 50, 1) if(CYCLE_CASINGS) //cycle the casing back to the end. if(ammo_magazine) ammo_magazine.stored_ammo += chambered @@ -117,7 +117,7 @@ AM.loc = src ammo_magazine = AM user.visible_message("[user] inserts [AM] into [src].", "You insert [AM] into [src].") - playsound(src.loc, 'sound/weapons/flipblade.ogg', 50, 1) + playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) if(SPEEDLOADER) if(loaded.len >= max_shells) to_chat(user, "[src] is full!") @@ -133,7 +133,7 @@ count++ if(count) user.visible_message("[user] reloads [src].", "You load [count] round\s into [src].") - playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(src, 'sound/weapons/empty.ogg', 50, 1) AM.update_icon() else if(istype(A, /obj/item/ammo_casing)) var/obj/item/ammo_casing/C = A @@ -147,7 +147,7 @@ C.loc = src loaded.Insert(1, C) //add to the head of the list user.visible_message("[user] inserts \a [C] into [src].", "You insert \a [C] into [src].") - playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(src, 'sound/weapons/empty.ogg', 50, 1) else if(istype(A, /obj/item/weapon/storage)) var/obj/item/weapon/storage/storage = A @@ -174,7 +174,7 @@ if(ammo_magazine) user.put_in_hands(ammo_magazine) user.visible_message("[user] removes [ammo_magazine] from [src].", "You remove [ammo_magazine] from [src].") - playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(src, 'sound/weapons/empty.ogg', 50, 1) ammo_magazine.update_icon() ammo_magazine = null else if(loaded.len) @@ -194,7 +194,7 @@ loaded.len-- user.put_in_hands(C) user.visible_message("[user] removes \a [C] from [src].", "You remove \a [C] from [src].") - playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(src, 'sound/weapons/empty.ogg', 50, 1) else to_chat(user, "[src] is empty.") update_icon() @@ -224,7 +224,7 @@ "[ammo_magazine] falls out and clatters on the floor!" ) if(auto_eject_sound) - playsound(user, auto_eject_sound, 40, 1) + playsound(src, auto_eject_sound, 40, 1) ammo_magazine.update_icon() ammo_magazine = null update_icon() //make sure to do this after unsetting ammo_magazine diff --git a/code/modules/projectiles/guns/projectile/boltaction.dm b/code/modules/projectiles/guns/projectile/boltaction.dm index 0555fb31de..15571e53c7 100644 --- a/code/modules/projectiles/guns/projectile/boltaction.dm +++ b/code/modules/projectiles/guns/projectile/boltaction.dm @@ -30,7 +30,7 @@ to_chat(user, "You begin to shorten the barrel and stock of \the [src].") if(loaded.len) afterattack(user, user) - playsound(user, fire_sound, 50, 1) + playsound(src, fire_sound, 50, 1) user.visible_message("[src] goes off!", "The rifle goes off in your face!") return if(do_after(user, 30)) diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index e407703498..3b9431c938 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -19,7 +19,7 @@ chamber_offset = 0 visible_message("\The [usr] spins the cylinder of \the [src]!", \ "You hear something metallic spin and click.") - playsound(src.loc, 'sound/weapons/revolver_spin.ogg', 100, 1) + playsound(src, 'sound/weapons/revolver_spin.ogg', 100, 1) loaded = shuffle(loaded) if(rand(1,max_shells) > loaded.len) chamber_offset = rand(0,max_shells - loaded.len) @@ -242,7 +242,7 @@ obj/item/weapon/gun/projectile/revolver/detective45/verb/rename_gun() chamber_offset = 0 visible_message("\The [usr] spins the cylinder of \the [src]!", \ "You hear something metallic spin and click.") - playsound(src.loc, 'sound/weapons/revolver_spin.ogg', 100, 1) + playsound(src, 'sound/weapons/revolver_spin.ogg', 100, 1) if(!flipped_firing) loaded = shuffle(loaded) if(rand(1,max_shells) > loaded.len) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 9862b71b06..e091552859 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -29,7 +29,7 @@ recentpump = world.time /obj/item/weapon/gun/projectile/shotgun/pump/proc/pump(mob/M as mob) - playsound(M, action_sound, 60, 1) + playsound(src, action_sound, 60, 1) if(chambered)//We have a shell in the chamber chambered.loc = get_turf(src)//Eject casing diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 343384f290..074917a5df 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -30,7 +30,7 @@ icon_state = "heavysniper" /obj/item/weapon/gun/projectile/heavysniper/attack_self(mob/user as mob) - playsound(src.loc, 'sound/weapons/flipblade.ogg', 50, 1) + playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) bolt_open = !bolt_open if(bolt_open) if(chambered) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 47e9c5f6d6..8a03ec8347 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -792,4 +792,4 @@ var/volume = CLAMP(vol_by_damage() + 20, 0, 100) if(silenced) volume = 5 - playsound(get_turf(A), hitsound_wall, volume, 1, -1) + playsound(A, hitsound_wall, volume, 1, -1) diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index ca3f1c8f51..80fa2227c4 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -195,7 +195,7 @@ /obj/item/projectile/energy/plasmastun/proc/bang(var/mob/living/carbon/M) to_chat(M, "You hear a loud roar.") - playsound(M.loc, 'sound/effects/bang.ogg', 50, 1) + playsound(src, 'sound/effects/bang.ogg', 50, 1) var/ear_safety = 0 ear_safety = M.get_ear_protection() if(ear_safety == 1) diff --git a/code/modules/projectiles/projectile/hook.dm b/code/modules/projectiles/projectile/hook.dm index ad02dee8cf..ee5fd6c471 100644 --- a/code/modules/projectiles/projectile/hook.dm +++ b/code/modules/projectiles/projectile/hook.dm @@ -82,7 +82,7 @@ if(!(H.species.flags & NO_SLIP) && prob(50)) var/armor_check = H.run_armor_check(def_zone, "melee") H.apply_effect(3, WEAKEN, armor_check) - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(armor_check < 60) visible_message("\The [src] has pushed [H]!") else @@ -91,19 +91,19 @@ else if(H.break_all_grabs(firer)) - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) return for(var/obj/item/I in holding) if(I) H.drop_from_inventory(I) visible_message("\The [src] has disarmed [H]!") - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) return /obj/item/projectile/energy/hook/proc/perform_intent_unique(atom/target) - playsound(src.loc, impact_sound, 40, 1) + playsound(src, impact_sound, 40, 1) var/success = FALSE if(istype(target,/turf)) if(launcher_intent) @@ -148,7 +148,7 @@ var/message = pick(help_messages) if(message == "slaps") spawn(1) - playsound(loc, 'sound/effects/snap.ogg', 50, 1) + playsound(src, 'sound/effects/snap.ogg', 50, 1) visible_message("\The [src] [message] [target].") done_mob_unique = TRUE success = TRUE diff --git a/code/modules/projectiles/projectile/magnetic.dm b/code/modules/projectiles/projectile/magnetic.dm index 4c36476ddb..5c3b1f817b 100644 --- a/code/modules/projectiles/projectile/magnetic.dm +++ b/code/modules/projectiles/projectile/magnetic.dm @@ -137,7 +137,7 @@ /obj/item/projectile/bullet/magnetic/fuelrod/supermatter/on_hit(var/atom/target, var/blocked = 0, var/def_zone = null) //You cannot touch the supermatter without disentigrating. Assumedly, this is true for condensed rods of it flying at relativistic speeds. if(istype(target,/turf/simulated/wall) || istype(target,/mob/living)) target.visible_message("The [src] burns a perfect hole through \the [target] with a blinding flash!") - playsound(target.loc, 'sound/effects/teleport.ogg', 40, 0) + playsound(target, 'sound/effects/teleport.ogg', 40, 0) return ..(target, blocked, def_zone) /obj/item/projectile/bullet/magnetic/fuelrod/supermatter/check_penetrate() diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index ac039460cb..9c06241ecf 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -116,7 +116,7 @@ if(A) A.ex_act(2) - playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1) + playsound(src, 'sound/effects/meteorimpact.ogg', 40, 1) for(var/mob/M in range(10, src)) if(!M.stat && !istype(M, /mob/living/silicon/ai))\ diff --git a/code/modules/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm index 9bce28831f..a7d069fad4 100644 --- a/code/modules/projectiles/targeting/targeting_overlay.dm +++ b/code/modules/projectiles/targeting/targeting_overlay.dm @@ -175,7 +175,7 @@ obj/aiming_overlay/proc/update_aiming_deferred() aiming_with = thing aiming_at = target if(istype(aiming_with, /obj/item/weapon/gun)) - playsound(get_turf(owner), 'sound/weapons/TargetOn.ogg', 50,1) + playsound(owner, 'sound/weapons/TargetOn.ogg', 50,1) forceMove(get_turf(target)) START_PROCESSING(SSobj, src) @@ -215,7 +215,7 @@ obj/aiming_overlay/proc/update_aiming_deferred() if(!aiming_with || !aiming_at) return if(istype(aiming_with, /obj/item/weapon/gun)) - playsound(get_turf(owner), 'sound/weapons/TargetOff.ogg', 50,1) + playsound(owner, 'sound/weapons/TargetOff.ogg', 50,1) if(!no_message) owner.visible_message("\The [owner] lowers \the [aiming_with].") diff --git a/code/modules/random_map/drop/droppod_doors.dm b/code/modules/random_map/drop/droppod_doors.dm index 7c7075f45f..c472a9f1f9 100644 --- a/code/modules/random_map/drop/droppod_doors.dm +++ b/code/modules/random_map/drop/droppod_doors.dm @@ -35,7 +35,7 @@ deployed = 1 visible_message("The explosive bolts on \the [src] detonate, throwing it open!") - playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 5) + playsound(src, 'sound/effects/bang.ogg', 50, 1, 5) // This is shit but it will do for the sake of testing. for(var/obj/structure/droppod_door/D in orange(1,src)) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index e13dcbdb69..4b9a892881 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -548,7 +548,7 @@ if (!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume)) return - playsound(src.loc, 'sound/machines/blender.ogg', 50, 1) + playsound(src, 'sound/machines/blender.ogg', 50, 1) inuse = 1 // Reset the machine. diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm index c6a75ea12a..fcabd92e39 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm @@ -103,6 +103,6 @@ /datum/reagent/nutriment/magicdust/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() - playsound(M.loc, 'sound/items/hooh.ogg', 50, 1, -1) + playsound(M, 'sound/items/hooh.ogg', 50, 1, -1) if(prob(5)) to_chat(M, "You feel like you've been gnomed...") diff --git a/code/modules/reagents/Chemistry-Recipes_vr.dm b/code/modules/reagents/Chemistry-Recipes_vr.dm index dfa4a24463..4450b59342 100644 --- a/code/modules/reagents/Chemistry-Recipes_vr.dm +++ b/code/modules/reagents/Chemistry-Recipes_vr.dm @@ -161,7 +161,7 @@ var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - /obj/item/weapon/reagent_containers/food/snacks // BORK BORK BORK - playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) + playsound(holder.my_atom, 'sound/effects/phasein.ogg', 100, 1) /* Removed at some point, unsure what to replace with for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null)) if(M:eyecheck() <= 0) @@ -191,7 +191,7 @@ for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The solution begins to vibrate violently!"), 1) // It was at this moment, the Xenobiologist knew... he fucked up. sleep(30) - playsound(get_turf(holder.my_atom), 'sound/items/Welder2.ogg', 100, 1) + playsound(holder.my_atom, 'sound/items/Welder2.ogg', 100, 1) for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The reaction begins to rapidly sizzle and swell outwards!"), 1) sleep(20) @@ -200,7 +200,7 @@ return if(fail_chance < 101) // 10% chance of it not working at all. - playsound(get_turf(holder.my_atom), 'sound/items/Welder.ogg', 100, 1) + playsound(holder.my_atom, 'sound/items/Welder.ogg', 100, 1) for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The slime core fizzles disappointingly."), 1) return @@ -221,7 +221,7 @@ var/list/material = typesof(/obj/item/stack/material) - blocked - playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) + playsound(holder.my_atom, 'sound/effects/phasein.ogg', 100, 1) /* Removed at some point, unsure what to replace with for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null)) if(M:eyecheck() <= 0) @@ -270,7 +270,7 @@ for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The slime extract begins to vibrate violently!"), 1) sleep(50) - playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) + playsound(holder.my_atom, 'sound/effects/phasein.ogg', 100, 1) for(var/mob/living/M in range (get_turf(holder.my_atom), 7)) M.bodytemperature -= 140 to_chat(M, " You suddenly feel a chill!") @@ -385,7 +385,7 @@ blocked += typesof(/mob/living/simple_mob/horror) var/list/voremobs = typesof(mob_path) - blocked // list of possible hostile mobs - playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) + playsound(holder.my_atom, 'sound/effects/phasein.ogg', 100, 1) /* Removed at some point, unsure what to replace with for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null)) if(M:eyecheck() <= 0) diff --git a/code/modules/reagents/dispenser/dispenser2.dm b/code/modules/reagents/dispenser/dispenser2.dm index 69577da357..b859e419bd 100644 --- a/code/modules/reagents/dispenser/dispenser2.dm +++ b/code/modules/reagents/dispenser/dispenser2.dm @@ -160,7 +160,7 @@ var/label = href_list["dispense"] if(cartridges[label] && container && container.is_open_container()) var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C = cartridges[label] - playsound(src.loc, 'sound/machines/reagent_dispense.ogg', 25, 1) + playsound(src, 'sound/machines/reagent_dispense.ogg', 25, 1) C.reagents.trans_to(container, amount) else if(href_list["ejectBeaker"]) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index d993a0719a..347c136e40 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -113,7 +113,7 @@ if(href_list["reagent"]) var/t = reagent_ids.Find(href_list["reagent"]) if(t) - playsound(loc, 'sound/effects/pop.ogg', 50, 0) + playsound(src, 'sound/effects/pop.ogg', 50, 0) mode = t var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]] to_chat(usr, "Synthesizer is now producing '[R.name]'.") diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 44b2af6a5d..6d4ab24605 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -296,7 +296,7 @@ else reagents.trans_to_obj(D, 5) to_chat(user, "You wet \the [D] in \the [src].") - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + playsound(src, 'sound/effects/slosh.ogg', 25, 1) else return ..() @@ -337,7 +337,7 @@ obj/item/weapon/reagent_containers/glass/bucket/wood else reagents.trans_to_obj(D, 5) to_chat(user, "You wet \the [D] in \the [src].") - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + playsound(src, 'sound/effects/slosh.ogg', 25, 1) return else return ..() diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 0963f45ba9..bb70781c7e 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -105,7 +105,7 @@ loaded_vial = null to_chat(user, "You remove the vial from the [src].") update_icon() - playsound(src.loc, 'sound/weapons/flipblade.ogg', 50, 1) + playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) return ..() else @@ -127,7 +127,7 @@ loaded_vial.reagents.trans_to_holder(reagents,volume) user.visible_message("[user] has loaded [W] into \the [src].","You have loaded [W] into \the [src].") update_icon() - playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(src, 'sound/weapons/empty.ogg', 50, 1) else to_chat(user, "\The [src] already has a vial.") else diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 1aece5b845..2a89067e8a 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -55,7 +55,7 @@ return /obj/item/weapon/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity) - playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6) + playsound(src, 'sound/effects/spray2.ogg', 50, 1, -6) if (A.density && proximity) A.visible_message("[usr] sprays [A] with [src].") reagents.splash(A, amount_per_transfer_from_this) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index eb25d9c7b3..df90197f2b 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -265,7 +265,7 @@ if(I.is_wrench()) src.add_fingerprint(user) if(bottle) - playsound(loc, I.usesound, 50, 1) + playsound(src, I.usesound, 50, 1) if(do_after(user, 20) && bottle) to_chat(user, "You unfasten the jug.") var/obj/item/weapon/reagent_containers/glass/cooler_bottle/G = new /obj/item/weapon/reagent_containers/glass/cooler_bottle( src.loc ) @@ -284,12 +284,12 @@ if(!src) return to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") anchored = !anchored - playsound(loc, I.usesound, 50, 1) + playsound(src, I.usesound, 50, 1) return if(I.is_screwdriver()) if(cupholder) - playsound(loc, I.usesound, 50, 1) + playsound(src, I.usesound, 50, 1) to_chat(user, "You take the cup dispenser off.") new /obj/item/stack/material/plastic( src.loc ) if(cups) @@ -300,7 +300,7 @@ update_icon() return if(!bottle && !cupholder) - playsound(loc, I.usesound, 50, 1) + playsound(src, I.usesound, 50, 1) to_chat(user, "You start taking the water-cooler apart.") if(do_after(user, 20 * I.toolspeed) && !bottle && !cupholder) to_chat(user, "You take the water-cooler apart.") @@ -334,7 +334,7 @@ var/obj/item/stack/material/plastic/P = I src.add_fingerprint(user) to_chat(user, "You start to attach a cup dispenser onto the water-cooler.") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20) && !cupholder && anchored) if (P.use(1)) to_chat(user, "You attach a cup dispenser onto the water-cooler.") diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index ef6d6a5812..ad5c60c998 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -281,7 +281,7 @@ else density = 1 // We don't want disposal bins or outlets to go density 0 to_chat(user, "You attach the [nicetype] to the underfloor.") - playsound(loc, I.usesound, 100, 1) + playsound(src, I.usesound, 100, 1) update() // weldingtool: convert to real pipe diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index f3dd0fa384..e8eaa809fe 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -639,7 +639,7 @@ for (var/mob/M in hearers(src.loc.loc)) to_chat(M, "CLONG, clong!") - playsound(src.loc, 'sound/effects/clang.ogg', 50, 0, 0) + playsound(src, 'sound/effects/clang.ogg', 50, 0, 0) // called to vent all gas in holder to a location proc/vent_gas(var/atom/location) @@ -1169,7 +1169,7 @@ if(O.currTag)// Tag set sort_tag = O.currTag - playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1) + playsound(src, 'sound/machines/twobeep.ogg', 100, 1) to_chat(user, "Changed tag to '[sort_tag]'.") updatename() updatedesc() @@ -1237,7 +1237,7 @@ if(O.currTag)// Tag set sortType = O.currTag - playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1) + playsound(src, 'sound/machines/twobeep.ogg', 100, 1) to_chat(user, "Changed filter to '[sortType]'.") updatename() updatedesc() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 343650f67d..159ce9ed4a 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -18,7 +18,7 @@ unwrap() proc/unwrap() - playsound(loc, 'sound/items/package_unwrap.ogg', 50, 1) + playsound(src, 'sound/items/package_unwrap.ogg', 50, 1) // Destroy will drop our wrapped object on the turf, so let it. qdel(src) @@ -33,7 +33,7 @@ update_icon() else src.sortTag = O.currTag - playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 1) + playsound(src, 'sound/machines/twobeep.ogg', 50, 1) else to_chat(user, "The package is already labeled for [O.currTag].") else @@ -143,7 +143,7 @@ update_icon() else src.sortTag = O.currTag - playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 1) + playsound(src, 'sound/machines/twobeep.ogg', 50, 1) else to_chat(user, "The package is already labeled for [O.currTag].") else @@ -273,7 +273,7 @@ user.visible_message("\The [user] wraps \a [target] with \a [src].",\ "You wrap \the [target], leaving [amount] units of paper on \the [src].",\ "You hear someone taping paper around a small object.") - playsound(loc, 'sound/items/package_wrap.ogg', 50, 1) + playsound(src, 'sound/items/package_wrap.ogg', 50, 1) else if (istype(target, /obj/structure/closet/crate)) var/obj/structure/closet/crate/O = target if (src.amount > 3 && !O.opened) @@ -285,7 +285,7 @@ user.visible_message("\The [user] wraps \a [target] with \a [src].",\ "You wrap \the [target], leaving [amount] units of paper on \the [src].",\ "You hear someone taping paper around a large object.") - playsound(loc, 'sound/items/package_wrap.ogg', 50, 1) + playsound(src, 'sound/items/package_wrap.ogg', 50, 1) else if(src.amount < 3) to_chat(user, "You need more paper.") else if (istype (target, /obj/structure/closet)) @@ -299,7 +299,7 @@ user.visible_message("\The [user] wraps \a [target] with \a [src].",\ "You wrap \the [target], leaving [amount] units of paper on \the [src].",\ "You hear someone taping paper around a large object.") - playsound(loc, 'sound/items/package_wrap.ogg', 50, 1) + playsound(src, 'sound/items/package_wrap.ogg', 50, 1) else if(src.amount < 3) to_chat(user, "You need more paper.") else @@ -432,18 +432,18 @@ if(I.is_screwdriver()) if(c_mode==0) c_mode=1 - playsound(src.loc, I.usesound, 50, 1) + playsound(src, I.usesound, 50, 1) to_chat(user, "You remove the screws around the power connection.") return else if(c_mode==1) c_mode=0 - playsound(src.loc, I.usesound, 50, 1) + playsound(src, I.usesound, 50, 1) to_chat(user, "You attach the screws around the power connection.") return else if(istype(I, /obj/item/weapon/weldingtool) && c_mode==1) var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(0,user)) - playsound(src.loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) to_chat(user, "You start slicing the floorweld off the delivery chute.") if(do_after(user,20 * W.toolspeed)) if(!src || !W.isOn()) return diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index ebe09e3a98..bbcda60927 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -129,12 +129,12 @@ var/global/list/obj/machinery/message_server/message_servers = list() switch(priority) if(2) if(!Console.silent) - playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) + playsound(Console, 'sound/machines/twobeep.ogg', 50, 1) Console.audible_message(text("[bicon(Console)] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5) Console.message_log += "High Priority message from [sender]
[authmsg]" else if(!Console.silent) - playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) + playsound(Console, 'sound/machines/twobeep.ogg', 50, 1) Console.audible_message(text("[bicon(Console)] *The Requests Console beeps: 'Message from [sender]'"),,4) Console.message_log += "Message from [sender]
[authmsg]" Console.set_light(2) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index db70d08863..41510d0545 100755 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -147,7 +147,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, /obj/machinery/computer/rdconsole/emp_act(var/remaining_charges, var/mob/user) if(!emagged) - playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) + playsound(src, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 to_chat(user, "You you disable the security protocols.") return 1 diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 4776646105..075bd3d4d1 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -290,7 +290,7 @@ /obj/machinery/computer/rdservercontrol/emag_act(var/remaining_charges, var/mob/user) if(!emagged) - playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) + playsound(src, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 to_chat(user, "You you disable the security protocols.") src.updateUsrDialog() diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index cbf3a6af4c..394245a9cf 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -147,7 +147,7 @@ return else if(((occupant.health == occupant.maxHealth)) && (!eject_wait)) - playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + playsound(src, 'sound/machines/ding.ogg', 50, 1) audible_message("\The [src] signals that the growing process is complete.") connected_message("Growing Process Complete.") locked = 0 diff --git a/code/modules/shieldgen/directional_shield.dm b/code/modules/shieldgen/directional_shield.dm index 26963a1227..d3d943297a 100644 --- a/code/modules/shieldgen/directional_shield.dm +++ b/code/modules/shieldgen/directional_shield.dm @@ -67,7 +67,7 @@ /obj/effect/directional_shield/bullet_act(var/obj/item/projectile/P) adjust_health(-P.get_structure_damage()) P.on_hit() - playsound(get_turf(src), 'sound/effects/EMPulse.ogg', 75, 1) + playsound(src, 'sound/effects/EMPulse.ogg', 75, 1) // All the shields tied to their projector are one 'unit', and don't have individualized health values like most other shields. /obj/effect/directional_shield/proc/adjust_health(amount) @@ -144,12 +144,12 @@ destroy_shields() var/turf/T = get_turf(src) T.visible_message("\The [src] overloads and the shield vanishes!") - playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 75, 0) + playsound(src, 'sound/machines/defib_failed.ogg', 75, 0) else if(shield_health < max_shield_health / 4) // Play a more urgent sounding beep if it's at 25% health. - playsound(get_turf(src), 'sound/machines/defib_success.ogg', 75, 0) + playsound(src, 'sound/machines/defib_success.ogg', 75, 0) else - playsound(get_turf(src), 'sound/machines/defib_SafetyOn.ogg', 75, 0) + playsound(src, 'sound/machines/defib_SafetyOn.ogg', 75, 0) last_damaged_time = world.time update_shield_colors() @@ -203,9 +203,9 @@ if(always_on && !active) // Make shields as soon as possible if this is set. create_shields() if(shield_health == max_shield_health) - playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 75, 0) + playsound(src, 'sound/machines/defib_ready.ogg', 75, 0) else - playsound(get_turf(src), 'sound/machines/defib_safetyOff.ogg', 75, 0) + playsound(src, 'sound/machines/defib_safetyOff.ogg', 75, 0) /obj/item/shield_projector/examine(var/mob/user) . = ..() diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index 21e244cc36..4920ffb513 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -48,7 +48,7 @@ src.health -= aforce //Play a fitting sound - playsound(src.loc, 'sound/effects/EMPulse.ogg', 75, 1) + playsound(src, 'sound/effects/EMPulse.ogg', 75, 1) check_failure() set_opacity(1) @@ -105,7 +105,7 @@ src.health -= tforce //This seemed to be the best sound for hitting a force field. - playsound(src.loc, 'sound/effects/EMPulse.ogg', 100, 1) + playsound(src, 'sound/effects/EMPulse.ogg', 100, 1) check_failure() diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index 6c584e1762..b6302a50d1 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -146,16 +146,16 @@ if (dna_hash in authorized) src.visible_message("\The [src] buzzes. That ID has already been scanned.") - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) return 0 if (!(access_heads in access)) src.visible_message("\The [src] buzzes, rejecting [ident].") - playsound(src.loc, 'sound/machines/deniedbeep.ogg', 50, 0) + playsound(src, 'sound/machines/deniedbeep.ogg', 50, 0) return 0 src.visible_message("\The [src] beeps as it scans [ident].") - playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0) + playsound(src, 'sound/machines/twobeep.ogg', 50, 0) authorized[dna_hash] = auth_name if (req_authorizations - authorized.len) to_chat(world, "Alert: [req_authorizations - authorized.len] authorization\s needed to override the shuttle autopilot.") //TODO- Belsima, make this an announcement instead of magic. diff --git a/code/modules/spells/aoe_turf/conjure/conjure.dm b/code/modules/spells/aoe_turf/conjure/conjure.dm index 9e02cf9513..e9874ccc12 100644 --- a/code/modules/spells/aoe_turf/conjure/conjure.dm +++ b/code/modules/spells/aoe_turf/conjure/conjure.dm @@ -25,7 +25,7 @@ How they spawn stuff is decided by behaviour vars, which are explained below cast_sound = 'sound/items/welder.ogg' /spell/aoe_turf/conjure/cast(list/targets, mob/user) - playsound(get_turf(user), cast_sound, 50, 1) + playsound(user, cast_sound, 50, 1) for(var/i=1,i <= summon_amt,i++) if(!targets.len) diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 624d94443c..276af95ce8 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -243,6 +243,6 @@ if (prob(fail_prob)) var/obj/item/weapon/implant/imp = affected.implants[1] user.visible_message(" Something beeps inside [target]'s [affected.name]!") - playsound(imp.loc, 'sound/items/countdown.ogg', 75, 1, -3) + playsound(imp, 'sound/items/countdown.ogg', 75, 1, -3) spawn(25) imp.activate() diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm index 1455fc0192..6cbf77cd99 100644 --- a/code/modules/tables/interactions.dm +++ b/code/modules/tables/interactions.dm @@ -89,9 +89,9 @@ M.apply_damage(8,def_zone = BP_HEAD) visible_message("[G.assailant] slams [G.affecting]'s face against \the [src]!") if(material) - playsound(loc, material.tableslam_noise, 50, 1) + playsound(src, material.tableslam_noise, 50, 1) else - playsound(loc, 'sound/weapons/tablehit1.ogg', 50, 1) + playsound(src, 'sound/weapons/tablehit1.ogg', 50, 1) var/list/L = take_damage(rand(1,5)) // Shards. Extra damage, plus potentially the fact YOU LITERALLY HAVE A PIECE OF GLASS/METAL/WHATEVER IN YOUR FACE for(var/obj/item/weapon/material/shard/S in L) @@ -122,8 +122,8 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() - playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) - playsound(src.loc, "sparks", 50, 1) + playsound(src, 'sound/weapons/blade1.ogg', 50, 1) + playsound(src, "sparks", 50, 1) user.visible_message("\The [src] was sliced apart by [user]!") break_to_parts() return diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index 249c84be73..80ab93043b 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -263,7 +263,7 @@ var/list/table_icon_cache = list() user.visible_message("\The [user] begins removing the [type_holding] holding \the [src]'s [M.display_name] [what] in place.", "You begin removing the [type_holding] holding \the [src]'s [M.display_name] [what] in place.") if(sound) - playsound(src.loc, sound, 50, 1) + playsound(src, sound, 50, 1) if(!do_after(user, delay)) manipulating = 0 return M diff --git a/code/modules/telesci/quantum_pad.dm b/code/modules/telesci/quantum_pad.dm index 91b5c19dc2..0588f802b7 100644 --- a/code/modules/telesci/quantum_pad.dm +++ b/code/modules/telesci/quantum_pad.dm @@ -135,7 +135,7 @@ /obj/machinery/power/quantumpad/proc/doteleport(mob/user) if(!linked_pad) return - playsound(get_turf(src), 'sound/weapons/flash.ogg', 25, 1) + playsound(src, 'sound/weapons/flash.ogg', 25, 1) teleporting = 1 spawn(teleport_speed) @@ -163,9 +163,9 @@ linked_pad.sparks() flick("qpad-beam", src) - playsound(get_turf(src), 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5) + playsound(src, 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5) flick("qpad-beam", linked_pad) - playsound(get_turf(linked_pad), 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5) + playsound(linked_pad, 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5) for(var/atom/movable/ROI in get_turf(src)) // if is anchored, don't let through if(ROI.anchored) diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 9f1a34760e..1119e565ef 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -195,7 +195,7 @@ flick("pad-beam", telepad) if(spawn_time > 15) // 1.5 seconds - playsound(telepad.loc, 'sound/weapons/flash.ogg', 50, 1) + playsound(telepad, 'sound/weapons/flash.ogg', 50, 1) // Wait depending on the time the projectile took to get there teleporting = 1 temp_msg = "Powering up bluespace crystals.
Please wait." @@ -241,7 +241,7 @@ dest = target flick("pad-beam", telepad) - playsound(telepad.loc, 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5) + playsound(telepad, 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5) for(var/atom/movable/ROI in source) // if is anchored, don't let through if(ROI.anchored) diff --git a/code/modules/turbolift/turbolift.dm b/code/modules/turbolift/turbolift.dm index db1ec9805e..cc2739d028 100644 --- a/code/modules/turbolift/turbolift.dm +++ b/code/modules/turbolift/turbolift.dm @@ -159,7 +159,7 @@ if(!fire_mode) open_doors() control_panel_interior.audible_message("\The [current_floor.ext_panel] buzzes loudly.") - playsound(control_panel_interior.loc, "sound/machines/buzz-two.ogg", 50, 1) + playsound(control_panel_interior, "sound/machines/buzz-two.ogg", 50, 1) return 0 doors_closing = 0 // The doors weren't open, so they are done closing @@ -168,7 +168,7 @@ if(target_floor == current_floor) - playsound(control_panel_interior.loc, origin.arrival_sound, 50, 1) + playsound(control_panel_interior, origin.arrival_sound, 50, 1) target_floor.arrived(src) target_floor = null diff --git a/code/modules/turbolift/turbolift_console.dm b/code/modules/turbolift/turbolift_console.dm index 71579d5471..d69a9b0a16 100644 --- a/code/modules/turbolift/turbolift_console.dm +++ b/code/modules/turbolift/turbolift_console.dm @@ -72,7 +72,7 @@ var/obj/item/weapon/card/id/id = W.GetID() if(istype(id)) if(!check_access(id)) - playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0) + playsound(src, 'sound/machines/buzz-two.ogg', 50, 0) return lift.priority_mode() if(floor == lift.current_floor) @@ -86,7 +86,7 @@ if(!..()) return if(lift.fire_mode || lift.priority_mode) - playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0) + playsound(src, 'sound/machines/buzz-two.ogg', 50, 0) return light_up() pressed(user) @@ -126,12 +126,12 @@ var/obj/item/weapon/card/id/id = W.GetID() if(istype(id)) if(!check_access(id)) - playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0) + playsound(src, 'sound/machines/buzz-two.ogg', 50, 0) return lift.update_fire_mode(!lift.fire_mode) if(lift.fire_mode) audible_message("Firefighter Mode Activated. Door safeties disabled. Manual control engaged.") - playsound(src.loc, 'sound/machines/airalarm.ogg', 25, 0, 4) + playsound(src, 'sound/machines/airalarm.ogg', 25, 0, 4) else audible_message("Firefighter Mode Deactivated. Door safeties enabled. Automatic control engaged.") return diff --git a/code/modules/vehicles/construction.dm b/code/modules/vehicles/construction.dm index 49021d5fd0..bb0ca7cb0b 100644 --- a/code/modules/vehicles/construction.dm +++ b/code/modules/vehicles/construction.dm @@ -130,10 +130,10 @@ if(7) if(W.is_wrench() || W.is_screwdriver()) - playsound(loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) to_chat(user, "You begin your finishing touches on \the [src].") if(do_after(user, 20) && build_stage == 7) - playsound(loc, W.usesound, 30, 1) + playsound(src, W.usesound, 30, 1) var/obj/vehicle/train/engine/quadbike/built/product = new(src) to_chat(user, "You finish \the [product]") product.loc = get_turf(src) @@ -178,7 +178,7 @@ if(2) if(W.is_screwdriver()) - playsound(loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) to_chat(user, "You close up \the [src].") var/obj/vehicle/train/trolley/trailer/product = new(src) product.loc = get_turf(src) @@ -259,10 +259,10 @@ if(6) if(W.is_wrench() || W.is_screwdriver()) - playsound(loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) to_chat(user, "You begin your finishing touches on \the [src].") if(do_after(user, 20) && build_stage == 6) - playsound(loc, W.usesound, 30, 1) + playsound(src, W.usesound, 30, 1) var/obj/vehicle/bike/built/product = new(src) to_chat(user, "You finish \the [product]") product.loc = get_turf(src) diff --git a/code/modules/virus2/centrifuge.dm b/code/modules/virus2/centrifuge.dm index fddfb04441..521b74544d 100644 --- a/code/modules/virus2/centrifuge.dm +++ b/code/modules/virus2/centrifuge.dm @@ -138,7 +138,7 @@ delay = delay/2 curing = round(delay) - playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1) + playsound(src, 'sound/machines/juicer.ogg', 50, 1) update_icon() return 1 diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 373da4d551..fb0bdcb726 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -168,9 +168,8 @@ /obj/belly/Destroy() STOP_PROCESSING(SSbellies, src) - if(owner) - owner.vore_organs -= src - owner = null + owner?.vore_organs?.Remove(src) + owner = null return ..() // Called whenever an atom enters this belly diff --git a/code/modules/vore/eating/silicon_vr.dm b/code/modules/vore/eating/silicon_vr.dm index 37ed30e8c6..5f128fcd68 100644 --- a/code/modules/vore/eating/silicon_vr.dm +++ b/code/modules/vore/eating/silicon_vr.dm @@ -21,7 +21,7 @@ /obj/effect/overlay/aiholo/proc/get_prey(var/mob/living/prey) if(bellied) return - playsound('sound/effects/stealthoff.ogg',50,0) + playsound(src, 'sound/effects/stealthoff.ogg',50,0) bellied = prey prey.forceMove(src) visible_message("[src] entirely engulfs [prey] in hardlight holograms!") @@ -34,7 +34,7 @@ /obj/effect/overlay/aiholo/proc/drop_prey() if(!bellied) return - playsound('sound/effects/stealthoff.ogg',50,0) + playsound(src, 'sound/effects/stealthoff.ogg',50,0) bellied.forceMove(get_turf(src)) bellied.Weaken(2) bellied.visible_message("[bellied] flops out of [src].","You flop out of [src].","You hear a thud.") diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 4e2494fb69..ff25ac561d 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -103,7 +103,7 @@ if(user.ckey != owner_ckey) //ERROR: UNAUTHORIZED USER to_chat(user, "You probably shouldn't mess with all these strange tools and parts...") //give them a slightly fluffy explanation as to why it didn't work return - playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1) + playsound(src, 'sound/items/Screwdriver.ogg', 100, 1) var/obj/N = new to_type(O.loc) user.visible_message("[user] opens \the [src] and modifies \the [O] into \the [N].","You open \the [src] and modify \the [O] into \the [N].") @@ -182,7 +182,7 @@ if(default_parry_check(user, attacker, damage_source) && prob(75)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") - playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1) + playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 @@ -195,7 +195,7 @@ if(default_parry_check(user, attacker, damage_source) && prob(75)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") - playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1) + playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 @@ -395,7 +395,7 @@ if(istype(O,/obj/item/weapon/card/id) && O.icon_state != new_icon) //O.icon = icon // just in case we're using custom sprite paths with fluff items. O.icon_state = new_icon // Changes the icon without changing the access. - playsound(user.loc, 'sound/items/polaroid2.ogg', 100, 1) + playsound(src, 'sound/items/polaroid2.ogg', 100, 1) user.visible_message(" [user] reprints their ID.") qdel(src) else if(O.icon_state == new_icon) @@ -654,7 +654,7 @@ /obj/item/weapon/cane/wand/attack_self(mob/user) if(last_use + cooldown >= world.time) return - playsound(loc, 'sound/weapons/sparkle.ogg', 50, 1) + playsound(src, 'sound/weapons/sparkle.ogg', 50, 1) user.visible_message(" [user] swings their wand.") var/datum/effect/effect/system/spark_spread/s = new s.set_up(3, 1, src) @@ -676,7 +676,7 @@ O.icon = new_icon O.icon_state = new_icon_state // Changes the icon without changing the access. O.desc = new_desc - playsound(user.loc, 'sound/items/polaroid2.ogg', 100, 1) + playsound(src, 'sound/items/polaroid2.ogg', 100, 1) user.visible_message(" [user] reprints their ID.") qdel(src) else if(O.icon_state == new_icon) @@ -1561,7 +1561,7 @@ /obj/item/weapon/melee/baton/fluff/stunstaff/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(wielded && default_parry_check(user, attacker, damage_source) && prob(30)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") - playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1) + playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 @@ -1585,9 +1585,9 @@ status = !status to_chat(user, "[src] is now [status ? "on" : "off"].") if(status == 0) - playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) + playsound(src, 'sound/weapons/saberoff.ogg', 50, 1) else - playsound(user, 'sound/weapons/saberon.ogg', 50, 1) + playsound(src, 'sound/weapons/saberon.ogg', 50, 1) else status = 0 to_chat(user, "[src] is out of charge.") @@ -1635,12 +1635,12 @@ sharp = 1 edge = 1 w_class = active_w_class - playsound(user, 'sound/weapons/sparkle.ogg', 50, 1) + playsound(src, 'sound/weapons/sparkle.ogg', 50, 1) /obj/item/weapon/melee/fluffstuff/proc/deactivate(mob/living/user) if(!active) return - playsound(user, 'sound/weapons/sparkle.ogg', 50, 1) + playsound(src, 'sound/weapons/sparkle.ogg', 50, 1) active = 0 embed_chance = initial(embed_chance) force = initial(force) diff --git a/code/modules/vore/weight/fitness_machines_vr.dm b/code/modules/vore/weight/fitness_machines_vr.dm index df828e8eef..e9125b26d8 100644 --- a/code/modules/vore/weight/fitness_machines_vr.dm +++ b/code/modules/vore/weight/fitness_machines_vr.dm @@ -26,7 +26,7 @@ var/message = pick(messages) to_chat(user, "[message].") for(var/s in workout_sounds) - playsound(loc, s, 50, 1) + playsound(src, s, 50, 1) /obj/machinery/fitness/punching_bag name = "punching bag" @@ -59,7 +59,7 @@ add_fingerprint(user) user.visible_message("[user] has [anchored ? "un" : ""]secured \the [src].", "You [anchored ? "un" : ""]secure \the [src].") anchored = !anchored - playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) + playsound(src, 'sound/items/Ratchet.ogg', 50, 1) return /obj/machinery/fitness/heavy/attack_hand(mob/living/user) diff --git a/code/modules/xenoarcheaology/effects/vampire.dm b/code/modules/xenoarcheaology/effects/vampire.dm index ee75ea5ba1..cf0ae9a246 100644 --- a/code/modules/xenoarcheaology/effects/vampire.dm +++ b/code/modules/xenoarcheaology/effects/vampire.dm @@ -12,7 +12,7 @@ /datum/artifact_effect/vampire/proc/bloodcall(var/mob/living/carbon/human/M) last_bloodcall = world.time if(istype(M)) - playsound(holder.loc, pick('sound/hallucinations/wail.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/far_noise.ogg'), 50, 1, -3) + playsound(holder, pick('sound/hallucinations/wail.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/far_noise.ogg'), 50, 1, -3) var/target = pick(M.organs_by_name) M.apply_damage(rand(5, 10), SEARING, target) @@ -54,7 +54,7 @@ charges += 0.25 else charges += 1 - playsound(holder.loc, 'sound/effects/splat.ogg', 50, 1, -3) + playsound(holder, 'sound/effects/splat.ogg', 50, 1, -3) qdel(B) @@ -68,7 +68,7 @@ charges -= 1 var/spawn_type = pick(/mob/living/simple_mob/animal/space/bats, /mob/living/simple_mob/creature, /mob/living/simple_mob/faithless) new spawn_type(get_turf(pick(view(1,T)))) - playsound(holder.loc, pick('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg'), 50, 1, -3) + playsound(holder, pick('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg'), 50, 1, -3) if(charges >= 1 && nearby_mobs.len && prob(15 * nearby_mobs.len)) var/mob/living/L = pick(nearby_mobs) diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm index 3ed9ce38e8..93bfa10966 100644 --- a/code/modules/xenoarcheaology/finds/special.dm +++ b/code/modules/xenoarcheaology/finds/special.dm @@ -77,7 +77,7 @@ charges += 0.25 else charges += 1 - playsound(src.loc, 'sound/effects/splat.ogg', 50, 1, -3) + playsound(src, 'sound/effects/splat.ogg', 50, 1, -3) //use up stored charges if(charges >= 10) @@ -89,12 +89,12 @@ charges -= 1 var/spawn_type = pick(/mob/living/simple_mob/creature) new spawn_type(pick(view(1,src))) - playsound(src.loc, pick('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg'), 50, 1, -3) + playsound(src, pick('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg'), 50, 1, -3) if(charges >= 1) if(shadow_wights.len < 5 && prob(5)) shadow_wights.Add(new /obj/effect/shadow_wight(src.loc)) - playsound(src.loc, 'sound/effects/ghost.ogg', 50, 1, -3) + playsound(src, 'sound/effects/ghost.ogg', 50, 1, -3) charges -= 0.1 if(charges >= 0.1) @@ -124,7 +124,7 @@ /obj/item/weapon/vampiric/proc/bloodcall(var/mob/living/carbon/human/M) last_bloodcall = world.time if(istype(M)) - playsound(src.loc, pick('sound/hallucinations/wail.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/far_noise.ogg'), 50, 1, -3) + playsound(src, pick('sound/hallucinations/wail.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/far_noise.ogg'), 50, 1, -3) nearby_mobs.Add(M) var/target = pick(M.organs_by_name) @@ -180,7 +180,7 @@ src.loc = get_turf(pick(orange(1,src))) var/mob/living/carbon/M = locate() in src.loc if(M) - playsound(src.loc, pick('sound/hallucinations/behind_you1.ogg',\ + playsound(src, pick('sound/hallucinations/behind_you1.ogg',\ 'sound/hallucinations/behind_you2.ogg',\ 'sound/hallucinations/i_see_you1.ogg',\ 'sound/hallucinations/i_see_you2.ogg',\ diff --git a/code/modules/xenoarcheaology/tools/coolant_tank.dm b/code/modules/xenoarcheaology/tools/coolant_tank.dm index 9f5172b3de..2975cf0749 100644 --- a/code/modules/xenoarcheaology/tools/coolant_tank.dm +++ b/code/modules/xenoarcheaology/tools/coolant_tank.dm @@ -21,7 +21,7 @@ var/datum/effect/effect/system/smoke_spread/S = new /datum/effect/effect/system/smoke_spread S.set_up(5, 0, src.loc) - playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3) + playsound(src, 'sound/effects/smoke.ogg', 50, 1, -3) spawn(0) S.start() diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm index c5e5c029fd..60de4ca494 100644 --- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm +++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm @@ -244,7 +244,7 @@ scanner_temperature = max(scanner_temperature - 5 - 10 * rand(), 0) if(prob(0.75)) src.visible_message("[bicon(src)] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].", 2) - playsound(loc, 'sound/effects/ding.ogg', 25) + playsound(src, 'sound/effects/ding.ogg', 25) last_process_worldtime = world.time /obj/machinery/radiocarbon_spectrometer/proc/stop_scanning() diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm index 9ab39467d3..f4a60f1bfd 100644 --- a/code/modules/xenoarcheaology/tools/suspension_generator.dm +++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm @@ -133,7 +133,7 @@ anchored = 0 else anchored = 1 - playsound(loc, W.usesound, 50, 1) + playsound(src, W.usesound, 50, 1) to_chat(user, "You wrench the stabilising legs [anchored ? "into place" : "up against the body"].") if(anchored) desc = "It is resting securely on four stubby legs." diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm index fddbb13a5e..6368f68e15 100644 --- a/code/modules/xenobio/items/extracts.dm +++ b/code/modules/xenobio/items/extracts.dm @@ -323,7 +323,7 @@ /datum/chemical_reaction/slime/orange_fire/on_reaction(var/datum/reagents/holder) log_and_message_admins("Orange extract reaction (fire) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]") holder.my_atom.visible_message("\The [src] begins to vibrate violently!") - playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 75, 1) + playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1) spawn(5 SECONDS) if(holder && holder.my_atom) var/turf/simulated/T = get_turf(holder.my_atom) @@ -360,11 +360,11 @@ /datum/chemical_reaction/slime/yellow_emp/on_reaction(var/datum/reagents/holder) log_and_message_admins("Yellow extract reaction (emp) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]") holder.my_atom.visible_message("\The [src] begins to vibrate violently!") - playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 75, 1) + playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1) spawn(5 SECONDS) if(holder && holder.my_atom) empulse(get_turf(holder.my_atom), 2, 4, 7, 10) // As strong as a normal EMP grenade. - playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 75, 1) + playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1) ..() @@ -575,7 +575,7 @@ log_and_message_admins("Red extract reaction (enrage) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]") - playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 75, 1) + playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1) ..() @@ -696,7 +696,7 @@ power++ E.uses = 0 - playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 75, 1) + playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1) holder.my_atom.visible_message("\The [holder.my_atom] begins to vibrate violently!") log_and_message_admins("Oil extract reaction (explosion) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]") diff --git a/code/modules/xenobio/machinery/processor.dm b/code/modules/xenobio/machinery/processor.dm index 6d888adb26..216c0cb77b 100644 --- a/code/modules/xenobio/machinery/processor.dm +++ b/code/modules/xenobio/machinery/processor.dm @@ -27,7 +27,7 @@ begin_processing() else to_chat(user, "The processor is empty.") - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) + playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1) return // Verb to remove everything. @@ -54,7 +54,7 @@ return if(!can_insert(AM)) to_chat(user, "\The [src] cannot process \the [AM] at this time.") - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) + playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1) return to_be_processed.Add(AM) AM.forceMove(src) @@ -64,26 +64,26 @@ if(processing) return // Already doing it. processing = TRUE - playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1) + playsound(src, 'sound/machines/juicer.ogg', 50, 1) for(var/atom/movable/AM in to_be_processed) extract(AM) sleep(1 SECONDS) while(monkeys_recycled >= 4) new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(get_turf(src)) - playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) + playsound(src, 'sound/effects/splat.ogg', 50, 1) monkeys_recycled -= 4 sleep(1 SECOND) processing = FALSE - playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + playsound(src, 'sound/machines/ding.ogg', 50, 1) /obj/machinery/processor/proc/extract(var/atom/movable/AM) if(istype(AM, /mob/living/simple_mob/slime)) var/mob/living/simple_mob/slime/S = AM while(S.cores) new S.coretype(get_turf(src)) - playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) + playsound(src, 'sound/effects/splat.ogg', 50, 1) S.cores-- sleep(1 SECOND) to_be_processed.Remove(S) @@ -91,7 +91,7 @@ if(istype(AM, /mob/living/carbon/human)) var/mob/living/carbon/human/M = AM - playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) + playsound(src, 'sound/effects/splat.ogg', 50, 1) to_be_processed.Remove(M) qdel(M) monkeys_recycled++ diff --git a/icons/mob/helmet_vr.dmi b/icons/mob/helmet_vr.dmi new file mode 100644 index 0000000000..b7b5c6d059 Binary files /dev/null and b/icons/mob/helmet_vr.dmi differ diff --git a/icons/mob/spacesuit_vr.dmi b/icons/mob/spacesuit_vr.dmi new file mode 100644 index 0000000000..2f2ead49f5 Binary files /dev/null and b/icons/mob/spacesuit_vr.dmi differ diff --git a/icons/mob/species/akula/mask_vr.dmi b/icons/mob/species/akula/mask_vr.dmi index d45d1a50e7..eb39252fa6 100644 Binary files a/icons/mob/species/akula/mask_vr.dmi and b/icons/mob/species/akula/mask_vr.dmi differ diff --git a/icons/mob/species/skrell/helmet_vr.dmi b/icons/mob/species/skrell/helmet_vr.dmi new file mode 100644 index 0000000000..022e89e36a Binary files /dev/null and b/icons/mob/species/skrell/helmet_vr.dmi differ diff --git a/icons/mob/species/skrell/suit_vr.dmi b/icons/mob/species/skrell/suit_vr.dmi new file mode 100644 index 0000000000..e83e21639d Binary files /dev/null and b/icons/mob/species/skrell/suit_vr.dmi differ diff --git a/icons/mob/species/tajaran/helmet_vr.dmi b/icons/mob/species/tajaran/helmet_vr.dmi new file mode 100644 index 0000000000..8f6f5b2d82 Binary files /dev/null and b/icons/mob/species/tajaran/helmet_vr.dmi differ diff --git a/icons/mob/species/tajaran/suit_vr.dmi b/icons/mob/species/tajaran/suit_vr.dmi new file mode 100644 index 0000000000..c7608880c4 Binary files /dev/null and b/icons/mob/species/tajaran/suit_vr.dmi differ diff --git a/icons/mob/species/unathi/helmet_vr.dmi b/icons/mob/species/unathi/helmet_vr.dmi new file mode 100644 index 0000000000..4c17114730 Binary files /dev/null and b/icons/mob/species/unathi/helmet_vr.dmi differ diff --git a/icons/mob/species/unathi/suit_vr.dmi b/icons/mob/species/unathi/suit_vr.dmi new file mode 100644 index 0000000000..0516cfbac2 Binary files /dev/null and b/icons/mob/species/unathi/suit_vr.dmi differ diff --git a/icons/mob/species/vulpkanin/helmet_vr.dmi b/icons/mob/species/vulpkanin/helmet_vr.dmi new file mode 100644 index 0000000000..5b422f8ccf Binary files /dev/null and b/icons/mob/species/vulpkanin/helmet_vr.dmi differ diff --git a/icons/mob/species/vulpkanin/suit_vr.dmi b/icons/mob/species/vulpkanin/suit_vr.dmi new file mode 100644 index 0000000000..a8836a5a6e Binary files /dev/null and b/icons/mob/species/vulpkanin/suit_vr.dmi differ diff --git a/icons/obj/clothing/helmets_vr.dmi b/icons/obj/clothing/helmets_vr.dmi new file mode 100644 index 0000000000..f635aae960 Binary files /dev/null and b/icons/obj/clothing/helmets_vr.dmi differ diff --git a/icons/obj/clothing/spacesuits_vr.dmi b/icons/obj/clothing/spacesuits_vr.dmi new file mode 100644 index 0000000000..1b3beadd97 Binary files /dev/null and b/icons/obj/clothing/spacesuits_vr.dmi differ diff --git a/icons/obj/clothing/species/skrell/helmets_vr.dmi b/icons/obj/clothing/species/skrell/helmets_vr.dmi new file mode 100644 index 0000000000..df9fbceaa2 Binary files /dev/null and b/icons/obj/clothing/species/skrell/helmets_vr.dmi differ diff --git a/icons/obj/clothing/species/skrell/spacesuits_vr.dmi b/icons/obj/clothing/species/skrell/spacesuits_vr.dmi new file mode 100644 index 0000000000..6510610634 Binary files /dev/null and b/icons/obj/clothing/species/skrell/spacesuits_vr.dmi differ diff --git a/icons/obj/clothing/species/tajaran/helmets_vr.dmi b/icons/obj/clothing/species/tajaran/helmets_vr.dmi new file mode 100644 index 0000000000..a7de0471a5 Binary files /dev/null and b/icons/obj/clothing/species/tajaran/helmets_vr.dmi differ diff --git a/icons/obj/clothing/species/tajaran/spacesuits_vr.dmi b/icons/obj/clothing/species/tajaran/spacesuits_vr.dmi new file mode 100644 index 0000000000..f505178f3d Binary files /dev/null and b/icons/obj/clothing/species/tajaran/spacesuits_vr.dmi differ diff --git a/icons/obj/clothing/species/unathi/helmets_vr.dmi b/icons/obj/clothing/species/unathi/helmets_vr.dmi new file mode 100644 index 0000000000..d311c427ae Binary files /dev/null and b/icons/obj/clothing/species/unathi/helmets_vr.dmi differ diff --git a/icons/obj/clothing/species/unathi/spacesuits_vr.dmi b/icons/obj/clothing/species/unathi/spacesuits_vr.dmi new file mode 100644 index 0000000000..cbe2998f16 Binary files /dev/null and b/icons/obj/clothing/species/unathi/spacesuits_vr.dmi differ diff --git a/icons/obj/clothing/species/vulpkanin/helmets_vr.dmi b/icons/obj/clothing/species/vulpkanin/helmets_vr.dmi new file mode 100644 index 0000000000..cf561b831c Binary files /dev/null and b/icons/obj/clothing/species/vulpkanin/helmets_vr.dmi differ diff --git a/icons/obj/clothing/species/vulpkanin/spacesuits_vr.dmi b/icons/obj/clothing/species/vulpkanin/spacesuits_vr.dmi new file mode 100644 index 0000000000..e2b68e0961 Binary files /dev/null and b/icons/obj/clothing/species/vulpkanin/spacesuits_vr.dmi differ diff --git a/maps/tether/submaps/offmap/talon.dm b/maps/tether/submaps/offmap/talon.dm index 2324d2ddc1..df12eafbaf 100644 --- a/maps/tether/submaps/offmap/talon.dm +++ b/maps/tether/submaps/offmap/talon.dm @@ -263,8 +263,8 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/weapon/melee/telebaton, /obj/item/device/flash, /obj/item/device/radio/headset/talon, - /obj/item/clothing/head/helmet/space/void/captain/talon, - /obj/item/clothing/suit/space/void/captain/talon, + /obj/item/clothing/head/helmet/space/void/refurb/officer/talon, + /obj/item/clothing/suit/space/void/refurb/officer/talon, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, /obj/item/device/gps/command/taloncap @@ -295,8 +295,8 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/weapon/storage/belt/security, /obj/item/device/radio/headset/talon, /obj/item/clothing/accessory/solgov/department/security/marine, - /obj/item/clothing/head/helmet/space/void/security/talon, - /obj/item/clothing/suit/space/void/security/talon, + /obj/item/clothing/head/helmet/space/void/refurb/marine/talon, + /obj/item/clothing/suit/space/void/refurb/marine/talon, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, /obj/item/device/gps/security/talonguard @@ -320,8 +320,8 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/clothing/suit/storage/toggle/fr_jacket, /obj/item/clothing/shoes/white, /obj/item/device/radio/headset/talon, - /obj/item/clothing/head/helmet/space/void/medical/talon, - /obj/item/clothing/suit/space/void/medical/talon, + /obj/item/clothing/head/helmet/space/void/refurb/medical/talon, + /obj/item/clothing/suit/space/void/refurb/medical/talon, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, /obj/item/device/gps/medical/talonmed @@ -347,8 +347,8 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/clothing/mask/gas, /obj/item/taperoll/atmos, /obj/item/weapon/tank/emergency/oxygen/engi, - /obj/item/clothing/head/helmet/space/void/atmos/talon, - /obj/item/clothing/suit/space/void/atmos/talon, + /obj/item/clothing/head/helmet/space/void/refurb/engineering/talon, + /obj/item/clothing/suit/space/void/refurb/engineering/talon, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, /obj/item/device/gps/engineering/taloneng @@ -373,8 +373,8 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/clothing/shoes/boots/jackboots/toeless, /obj/item/device/radio/headset/talon, /obj/item/device/flashlight/color/orange, - /obj/item/clothing/head/helmet/space/void/pilot/talon, - /obj/item/clothing/suit/space/void/pilot/talon, + /obj/item/clothing/head/helmet/space/void/refurb/talon, + /obj/item/clothing/suit/space/void/refurb/talon, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, /obj/item/device/gps/explorer/talonpilot diff --git a/maps/tether/submaps/offmap/talon1.dmm b/maps/tether/submaps/offmap/talon1.dmm index 940a54493e..4ec9125235 100644 --- a/maps/tether/submaps/offmap/talon1.dmm +++ b/maps/tether/submaps/offmap/talon1.dmm @@ -3616,9 +3616,7 @@ /area/talon/deckone/brig) "gt" = ( /obj/effect/floor_decal/borderfloor, -/obj/machinery/suit_cycler/security{ - req_access = list(301) - }, +/obj/machinery/suit_cycler/vintage/tguard, /turf/simulated/floor/tiled/steel, /area/talon/deckone/brig) "gu" = ( @@ -5392,10 +5390,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/suit_cycler/engineering{ - name = "Atmospherics suit cycler"; - req_access = list(301) - }, +/obj/machinery/suit_cycler/vintage/tengi, /turf/simulated/floor/tiled/techmaint, /area/talon/deckone/starboard_eng) "jz" = ( @@ -7565,9 +7560,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/talon/deckone/bridge_hallway) "ZU" = ( -/obj/machinery/suit_cycler/medical{ - req_access = list(301) - }, +/obj/machinery/suit_cycler/vintage/tmedic, /turf/simulated/floor/tiled/white, /area/talon/deckone/medical) "ZV" = ( diff --git a/maps/tether/submaps/offmap/talon2.dmm b/maps/tether/submaps/offmap/talon2.dmm index 86b9c3669f..d5a49f1f1b 100644 --- a/maps/tether/submaps/offmap/talon2.dmm +++ b/maps/tether/submaps/offmap/talon2.dmm @@ -2355,6 +2355,7 @@ dir = 8; pixel_y = 0 }, +/obj/machinery/suit_cycler/vintage/tengi, /turf/simulated/floor/wood, /area/talon/decktwo/eng_room) "ea" = ( @@ -2410,9 +2411,7 @@ dir = 8; pixel_x = 0 }, -/obj/machinery/suit_cycler/pilot{ - req_access = list(301) - }, +/obj/machinery/suit_cycler/vintage/tcrew, /turf/simulated/floor/wood, /area/talon/decktwo/pilot_room) "eh" = ( @@ -3238,6 +3237,7 @@ dir = 4; pixel_y = 0 }, +/obj/machinery/suit_cycler/vintage/tmedic, /turf/simulated/floor/wood, /area/talon/decktwo/med_room) "fC" = ( @@ -3278,6 +3278,7 @@ dir = 8; pixel_x = 0 }, +/obj/machinery/suit_cycler/vintage/tguard, /turf/simulated/floor/wood, /area/talon/decktwo/sec_room) "fG" = ( @@ -4864,6 +4865,10 @@ }, /turf/simulated/floor/reinforced/airless, /area/talon/maintenance/decktwo_solars) +"nR" = ( +/obj/machinery/suit_cycler/vintage/tcaptain, +/turf/simulated/floor/wood, +/area/talon/decktwo/cap_room) "ol" = ( /obj/structure/sign/poster{ icon_state = ""; @@ -14615,7 +14620,7 @@ ap aC az SU -aM +nR WZ aM bu diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 334fb706e2..2de47e9565 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -656,34 +656,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargo/mining) -"abb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cargo/mining) -"abc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance/common{ - name = "Mining Maintenance Access" - }, -/turf/simulated/floor/tiled/techfloor, -/area/tether/surfacebase/cargo/mining) "abd" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/borderfloor{ @@ -749,22 +721,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/rnd/hallway) -"abh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/brown/border, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cargo/mining) "abi" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -784,75 +740,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargo/mining) -"abk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/brown/border, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cargo/mining) -"abl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/brown/border, -/obj/structure/extinguisher_cabinet{ - dir = 1; - icon_state = "extinguisher_closed"; - pixel_y = -32 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cargo/mining) -"abm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/brown/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 9 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_x = 0; - pixel_y = -24 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cargo/mining) -"abn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cargo/mining) "abo" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -932,43 +819,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) -"abv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cargo/mining) -"abw" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cargo/mining) "abx" = ( /obj/effect/floor_decal/industrial/loading{ dir = 8 @@ -1104,18 +954,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) -"abI" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) "abJ" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -1151,23 +989,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) -"abN" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) "abO" = ( /obj/machinery/door/airlock/maintenance/common{ name = "Trash Pit Access"; @@ -1242,17 +1063,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargo/mining) -"abW" = ( -/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" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) "abX" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, @@ -1275,18 +1085,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/tether/surfacebase/cargo/warehouse) -"acb" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/visible/supply, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "acc" = ( /turf/simulated/wall, /area/tether/surfacebase/cargo/warehouse) @@ -1407,21 +1205,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/research) -"acp" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/junction, -/obj/random/junk, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "acq" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -1457,38 +1240,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_dining) -"acu" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) "acv" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 6 @@ -1508,21 +1259,6 @@ /obj/machinery/vending/loadout/clothing, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) -"acx" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 5 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) "acy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -1593,15 +1329,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining_eva) -"acD" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) "acE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -2176,21 +1903,6 @@ /obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining_eva) -"adz" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) "adA" = ( /obj/structure/disposaloutlet{ dir = 8 @@ -2360,27 +2072,6 @@ /obj/machinery/light/small, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) -"adM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) -"adN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) "adO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3574,10 +3265,6 @@ /obj/machinery/camera/network/tether, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) -"afA" = ( -/obj/structure/catwalk, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) "afB" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -3814,18 +3501,6 @@ "afT" = ( /turf/simulated/floor/tiled, /area/storage/primary) -"afU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/camera/network/civilian{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/tram) "afV" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, @@ -3935,9 +3610,6 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, /area/rnd/xenoarch_storage) -"agm" = ( -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cargo/mining) "ago" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 4 @@ -6776,17 +6448,6 @@ }, /turf/simulated/floor/tiled, /area/storage/primary) -"amW" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) "amX" = ( /obj/machinery/power/apc{ cell_type = /obj/item/weapon/cell/super; @@ -6900,16 +6561,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) -"and" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) "anf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, @@ -10204,21 +9855,6 @@ /obj/random/maintenance/medical, /turf/simulated/floor/plating, /area/vacant/vacant_site) -"asG" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/rust, -/obj/structure/closet, -/obj/random/maintenance/clean, -/obj/random/maintenance/engineering, -/obj/random/maintenance/cargo, -/obj/random/maintenance/research, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "asH" = ( /obj/structure/cable{ d1 = 1; @@ -10303,53 +9939,6 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/grass, /area/tether/surfacebase/surface_one_hall) -"asP" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"asQ" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"asR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass{ - name = "Locker Room" - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker) -"asS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker) -"asT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker) "asU" = ( /turf/simulated/floor/tiled, /area/crew_quarters/locker) @@ -10416,14 +10005,6 @@ /obj/item/weapon/pickaxe, /turf/simulated/floor/plating, /area/vacant/vacant_site) -"atc" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "atd" = ( /obj/structure/railing{ dir = 8 @@ -10499,11 +10080,6 @@ }, /turf/simulated/floor/water/pool, /area/tether/surfacebase/surface_one_hall) -"atm" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "atn" = ( /obj/machinery/status_display{ pixel_x = 32; @@ -10563,20 +10139,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/locker) -"atq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/table/standard{ - name = "plastic table frame" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker) "atr" = ( /obj/structure/table/standard{ name = "plastic table frame" @@ -10740,13 +10302,6 @@ "atH" = ( /turf/simulated/wall, /area/maintenance/substation/civ_west) -"atI" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "atJ" = ( /obj/structure/railing{ dir = 8 @@ -10788,79 +10343,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"atN" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"atO" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"atP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass{ - name = "Locker Room" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker) -"atQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker) "atR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11094,21 +10576,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/civ_west) -"auo" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/structure/table/rack, -/obj/random/maintenance/clean, -/obj/random/maintenance/cargo, -/obj/random/maintenance/clean, -/obj/random/maintenance/research, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "aup" = ( /obj/structure/cable{ d1 = 1; @@ -11399,17 +10866,6 @@ "auK" = ( /turf/simulated/wall, /area/maintenance/lower/solars) -"auL" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing, -/obj/random/cutout, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "auM" = ( /obj/structure/table/rack, /obj/random/junk, @@ -11659,31 +11115,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) -"avk" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) -"avl" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) "avm" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -12201,28 +11632,6 @@ "avQ" = ( /turf/simulated/wall, /area/rnd/xenobiology/xenoflora/lab_atmos) -"avR" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) -"avS" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "avT" = ( /turf/simulated/wall/r_wall, /area/maintenance/lower/xenoflora) @@ -12627,39 +12036,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) -"awB" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) -"awC" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "awD" = ( /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, /obj/machinery/atmospherics/pipe/zpipe/up/supply, @@ -12678,55 +12054,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) -"awE" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"awF" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"awG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "awH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -12948,43 +12275,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) -"axc" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) -"axd" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "axe" = ( /obj/machinery/door/airlock/maintenance/engi{ name = "Elevator Maintenance" @@ -13066,23 +12356,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"axj" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/lightgrey/bordercorner, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "axk" = ( /obj/effect/floor_decal/borderfloor, /obj/structure/cable{ @@ -13473,24 +12746,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) -"axQ" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/random/trash_pile, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) -"axR" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "axS" = ( /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) @@ -13636,74 +12891,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"ayd" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aye" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"ayf" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"ayg" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "ayh" = ( /turf/simulated/wall, /area/crew_quarters/locker/laundry_arrival) @@ -13713,62 +12900,6 @@ }, /turf/simulated/wall, /area/crew_quarters/locker/laundry_arrival) -"ayj" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/structure/extinguisher_cabinet{ - dir = 4; - icon_state = "extinguisher_closed"; - pixel_x = -30 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"ayk" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"ayl" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aym" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 @@ -14071,16 +13202,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) -"ayF" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "ayG" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -14096,73 +13217,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"ayK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"ayL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"ayM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"ayN" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"ayO" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"ayP" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "ayQ" = ( /obj/machinery/status_display{ pixel_y = 30 @@ -14262,98 +13316,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) -"ayX" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"ayY" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"ayZ" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aza" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 2 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"azb" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "azc" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -14912,147 +13874,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"azT" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"azU" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/machinery/camera/network/northern_star{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"azV" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"azW" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"azX" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"azY" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "azZ" = ( /obj/machinery/alarm{ dir = 4; @@ -15068,71 +13889,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) -"aAa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) -"aAb" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) -"aAc" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) -"aAd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) -"aAe" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) "aAf" = ( /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/steeldecal/steel_decals_central1{ @@ -15142,114 +13898,6 @@ dir = 1 }, /area/crew_quarters/locker/laundry_arrival) -"aAg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aAh" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aAi" = ( -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aAj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aAk" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aAl" = ( -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aAm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/device/radio/beacon, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aAn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aAo" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/tram) -"aAp" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/landmark/tram, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/tram) -"aAq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/tram) -"aAr" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/landmark/tram, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/tram) "aAs" = ( /obj/structure/cable{ d1 = 2; @@ -15521,455 +14169,6 @@ /obj/random/contraband, /turf/simulated/floor/plating, /area/tether/surfacebase/surface_one_hall) -"aAU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) -"aAV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) -"aAW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) -"aAX" = ( -/obj/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) -"aAY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) -"aAZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) -"aBa" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals_central1, -/obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 1; - dir = 2; - id_tag = null; - name = "Laundry"; - req_access = list() - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/monofloor, -/area/crew_quarters/locker/laundry_arrival) -"aBb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lightgrey/bordercorner, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 6 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aBc" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aBd" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aBe" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aBf" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aBg" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/camera/network/tether{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aBi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aBj" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aBk" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aBl" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aBm" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aBn" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aBo" = ( -/obj/machinery/door/airlock/glass_external/public, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/tether/surfacebase/tram) -"aBp" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/landmark/tram, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/tram) -"aBq" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/landmark/tram, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/tram) -"aBr" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/computer/cryopod{ - name = "asset retention console"; - pixel_y = -30 - }, -/obj/effect/landmark/tram, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/tram) -"aBs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/cryopod/robot/door/tram, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/tether/surfacebase/tram) -"aBt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/tram) "aBu" = ( /obj/structure/cable/heavyduty{ icon_state = "0-2" @@ -16235,36 +14434,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) -"aBW" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central1{ - dir = 8 - }, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4; - name = "Dorms & Cafe" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/monofloor{ - dir = 8 - }, -/area/tether/surfacebase/surface_one_hall) -"aBX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals_central1{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/monofloor{ - dir = 4 - }, -/area/tether/surfacebase/surface_one_hall) "aBY" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -16745,16 +14914,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/vacant/vacant_site/east) -"aCM" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aCN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17072,43 +15231,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) -"aDs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aDt" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/flora/pottedplant, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aDu" = ( /turf/simulated/floor/lino, /area/crew_quarters/visitor_dining) @@ -17342,46 +15464,6 @@ dir = 1 }, /area/tether/surfacebase/surface_one_hall) -"aDU" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aDV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aDW" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lightgrey/bordercorner, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aDX" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -17442,30 +15524,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) -"aEd" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) "aEe" = ( /obj/machinery/light{ dir = 4; @@ -17777,20 +15835,6 @@ }, /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/surface_one_hall) -"aEG" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 6 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aEH" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 10 @@ -18196,83 +16240,6 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_site/east) -"aFt" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 10 - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aFu" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aFv" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aFw" = ( /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/steeldecal/steel_decals_central1, @@ -18540,56 +16507,6 @@ }, /turf/simulated/wall, /area/maintenance/lower/research) -"aFO" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atm{ - pixel_x = 32 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aFP" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aFR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18677,116 +16594,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) -"aFZ" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGa" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGb" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 2 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGc" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) "aGd" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -18796,215 +16603,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) -"aGe" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/camera/network/research, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGf" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGg" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 2 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGi" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGj" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGk" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) "aGm" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -19080,30 +16678,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) -"aGr" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 5 - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) -"aGs" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 10 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "aGt" = ( /turf/simulated/wall, /area/vacant/vacant_site/east) @@ -19116,74 +16690,6 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_site/east) -"aGv" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aGw" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - 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/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aGx" = ( /obj/machinery/power/apc{ cell_type = /obj/item/weapon/cell/super; @@ -19293,189 +16799,17 @@ }, /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) -"aGJ" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGL" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/mauve/bordercorner2, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGM" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - icon_state = "extinguisher_closed"; - pixel_y = -32 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGN" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGP" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/mauve/bordercorner, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGQ" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGR" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGS" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGT" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"aGU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) "aGV" = ( /obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/camera/network/research{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 +/obj/effect/floor_decal/corner/brown/border, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 }, /turf/simulated/floor/tiled, -/area/rnd/hallway) +/area/tether/surfacebase/cargo/mining) "aGW" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -19624,32 +16958,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/research) -"aHh" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) -"aHi" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "aHj" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 @@ -19658,27 +16966,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/vacant/vacant_site/east) -"aHk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aHl" = ( /obj/machinery/camera/network/civilian{ dir = 4 @@ -19807,27 +17094,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/research) -"aHz" = ( -/obj/structure/railing{ - dir = 1; - icon_state = "railing0" - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) -"aHA" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "aHB" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 @@ -19871,30 +17137,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/research) -"aHF" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/computer/timeclock/premade/west, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aHG" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -20205,20 +17447,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"aIq" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - 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/steeldecal/steel_decals6{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aIr" = ( /obj/structure/bed/chair/wood, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -20735,46 +17963,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"aJj" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aJk" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aJl" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aJm" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, @@ -21132,75 +18320,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"aJS" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - 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/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aJT" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) -"aJU" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - 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/borderfloor/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aJV" = ( /obj/structure/bed/chair/wood{ dir = 1 @@ -21607,26 +18726,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"aKG" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aKH" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 @@ -21640,42 +18739,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"aKI" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aKJ" = ( /obj/machinery/light, /turf/simulated/floor/lino, @@ -22317,25 +19380,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rnd/external) -"aLZ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "aMa" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 6 @@ -30401,53 +27445,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) -"bbI" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) -"bbJ" = ( -/obj/structure/catwalk, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) -"bbK" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) "bbL" = ( /obj/machinery/door/airlock/maintenance/common{ name = "Mining Maintenance Access" @@ -30457,14 +27454,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) -"bbM" = ( -/obj/machinery/door/airlock/maintenance/common{ - name = "Mining Maintenance Access" - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/catwalk, -/turf/simulated/floor/tiled/techfloor, -/area/tether/surfacebase/north_stairs_one) "bbN" = ( /obj/structure/cable/green{ d1 = 4; @@ -30587,21 +27576,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) -"bbY" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/effect/floor_decal/rust, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "bbZ" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -30613,32 +27587,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) -"bca" = ( -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) -"bcb" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) -"bcc" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "bcd" = ( /turf/simulated/mineral, /area/maintenance/lower/xenoflora) @@ -31468,15 +28416,362 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) +"beE" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 9 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_x = 0; + pixel_y = -24 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cargo/mining) +"byn" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"byP" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"bMs" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/tram) +"bMP" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"bPt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"bSx" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/landmark/tram, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "bZC" = ( /turf/simulated/floor/looking_glass, /area/looking_glass/lg_1) +"cdO" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5; + icon_state = "intact-supply" + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"cgN" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"cpp" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals_central1, +/obj/machinery/door/airlock/multi_tile/glass{ + autoclose = 1; + dir = 2; + id_tag = null; + name = "Laundry"; + req_access = list() + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/monofloor, +/area/crew_quarters/locker/laundry_arrival) +"cpD" = ( +/obj/structure/catwalk, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) +"cqZ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10; + icon_state = "borderfloorcorner2"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1"; + pixel_y = 0 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"crC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) +"csb" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) "cAR" = ( /turf/simulated/floor/looking_glass/center, /area/looking_glass/lg_1) +"cBf" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) "cGJ" = ( /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) +"cHW" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"cIh" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "cOq" = ( /obj/random/cutout, /turf/simulated/floor/plating, @@ -31500,6 +28795,250 @@ }, /turf/simulated/floor/tiled/techmaint, /area/looking_glass/lg_1) +"cWS" = ( +/obj/item/device/radio/beacon, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"cXW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker/laundry_arrival) +"dCc" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/machinery/camera/network/northern_star{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"dYe" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cargo/mining) +"dZo" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/junction, +/obj/random/junk, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"dZW" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) +"ecq" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) +"efV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker/laundry_arrival) +"eow" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/machinery/atm{ + pixel_x = 32 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"evF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker) +"eGO" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cargo/mining) +"eIb" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"eIL" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/catwalk, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"eQT" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker/laundry_arrival) +"eUS" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/machinery/computer/timeclock/premade/west, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "fcT" = ( /turf/simulated/floor/looking_glass{ dir = 8; @@ -31512,10 +29051,91 @@ icon_state = "origin_arrow" }, /area/looking_glass/lg_1) +"fyp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker/laundry_arrival) +"fAW" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/structure/extinguisher_cabinet{ + dir = 4; + icon_state = "extinguisher_closed"; + pixel_x = -30 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"fBN" = ( +/obj/structure/catwalk, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) +"fFf" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"fGP" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"fXu" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) "fYi" = ( /obj/random/cutout, /turf/simulated/floor/plating, /area/construction/vacant_mining_ops) +"fZA" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) "gaK" = ( /obj/machinery/door/airlock/glass{ name = "Looking Glass" @@ -31527,18 +29147,182 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/public_garden_one) +"ghg" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 + }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"ghr" = ( +/obj/effect/floor_decal/borderfloor, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"glc" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"glH" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "guV" = ( /obj/structure/closet, /obj/random/drinkbottle, /obj/random/maintenance/cargo, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/vacant_site) +"gxa" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker/laundry_arrival) +"gxM" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"gOA" = ( +/obj/structure/railing{ + dir = 1; + icon_state = "railing0" + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"gVe" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "gZN" = ( /turf/simulated/floor/looking_glass{ dir = 9; icon_state = "origin_arrow" }, /area/looking_glass/lg_1) +"hcz" = ( +/obj/structure/catwalk, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "hmx" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -31561,22 +29345,519 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) +"hoH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker) +"hps" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"huE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker/laundry_arrival) "hAe" = ( /turf/simulated/floor/looking_glass{ dir = 5; icon_state = "origin_arrow" }, /area/looking_glass/lg_1) +"hBE" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "hFG" = ( /obj/effect/landmark/looking_glass, /turf/simulated/floor/looking_glass/center, /area/looking_glass/lg_1) +"hQP" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) +"hTz" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"icB" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"imW" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/random/trash_pile, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"iti" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "iue" = ( /turf/simulated/floor/looking_glass{ dir = 1; icon_state = "origin_arrow" }, /area/looking_glass/lg_1) +"iwE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker/laundry_arrival) +"iHP" = ( +/obj/structure/catwalk, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"jkt" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"jnj" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"jva" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/camera/network/civilian{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) +"jDg" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"jKO" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cargo/mining) +"jPk" = ( +/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" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) +"jSU" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/mauve/bordercorner2, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"kbZ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 1 + }, +/obj/structure/flora/pottedplant, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"kgk" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"kxe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cargo/mining) +"kyE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"kAG" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"kCz" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + pixel_x = -30 + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"kKl" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"kMG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass{ + name = "Locker Room" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker) +"kPT" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"ldI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"loc" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"lpK" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 5 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) "lry" = ( /obj/structure/catwalk, /obj/structure/closet, @@ -31586,16 +29867,120 @@ /obj/random/drinkbottle, /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) +"lwN" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/status_display{ + pixel_y = 30 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "lxU" = ( /obj/machinery/holoposter, /turf/simulated/wall, /area/hallway/lower/first_west) +"lDW" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) +"lMf" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/firealarm{ + dir = 2; + layer = 3.3; + pixel_x = 0; + pixel_y = 26 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "lNp" = ( /turf/simulated/floor/looking_glass/optional{ dir = 4; icon_state = "origin_optional_arrow" }, /area/looking_glass/lg_1) +"lNt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"lQQ" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "lWT" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -31626,92 +30011,126 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/public_garden_one) -"nlo" = ( -/obj/structure/railing{ +"mon" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/disposal, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"mrR" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"mCe" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"mGP" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"mHO" = ( /obj/structure/railing{ dir = 4 }, -/obj/random/trash_pile, -/turf/simulated/floor/plating, -/area/maintenance/lower/vacant_site) -"orF" = ( -/obj/machinery/light/small{ - dir = 4; - pixel_y = 0 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/public_garden_one) -"oRz" = ( -/turf/simulated/floor/looking_glass{ - dir = 4; - icon_state = "origin_arrow" - }, -/area/looking_glass/lg_1) -"rIU" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" - }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"mOz" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, +/obj/machinery/computer/cryopod{ + name = "asset retention console"; + pixel_y = -30 + }, +/obj/effect/landmark/tram, /obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_one) -"sya" = ( +/area/tether/surfacebase/tram) +"mRF" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/tether/surfacebase/tram) +"mSz" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/holoposter{ - dir = 4; - pixel_x = -30 - }, -/turf/simulated/floor/lino, -/area/crew_quarters/visitor_dining) -"sIO" = ( -/turf/simulated/floor/looking_glass{ - dir = 6; - icon_state = "origin_arrow" - }, -/area/looking_glass/lg_1) -"tRJ" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 10; - icon_state = "spline_plain" - }, -/obj/machinery/button/remote/airlock{ - dir = 8; - id = "lg_1"; - name = "Looking Glass Lock"; - pixel_x = 28; - pixel_y = 28; - specialfunctions = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/looking_glass/lg_1) -"vNW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"mZO" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -31738,12 +30157,1385 @@ /obj/machinery/holoposter{ pixel_y = -30 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"nis" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/camera/network/research{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"niz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker/laundry_arrival) +"nlo" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) +"nmh" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing, +/obj/random/cutout, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"nmD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2, +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker/laundry_arrival) +"nrX" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"nsp" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"nBm" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/obj/structure/table/rack, +/obj/random/maintenance/clean, +/obj/random/maintenance/cargo, +/obj/random/maintenance/clean, +/obj/random/maintenance/research, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"nDD" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 9; + icon_state = "intact" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) +"ofS" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + icon_state = "extinguisher_closed"; + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"ogk" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"ohi" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"oib" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"oli" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"oog" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"orF" = ( +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/public_garden_one) +"osh" = ( +/obj/effect/floor_decal/borderfloor, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"ovG" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"oKY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"oQm" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"oRz" = ( +/turf/simulated/floor/looking_glass{ + dir = 4; + icon_state = "origin_arrow" + }, +/area/looking_glass/lg_1) +"oVr" = ( +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"pjp" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"poN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"pyD" = ( +/obj/machinery/door/airlock/maintenance/common{ + name = "Mining Maintenance Access" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/tether/surfacebase/north_stairs_one) +"qfJ" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/landmark/tram, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) +"qhq" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"qor" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) +"qwm" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"qIr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance/common{ + name = "Mining Maintenance Access" + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/cargo/mining) +"qKn" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central1{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4; + name = "Dorms & Cafe" + }, +/turf/simulated/floor/tiled/monofloor{ + dir = 8 + }, +/area/tether/surfacebase/surface_one_hall) +"qOA" = ( +/obj/structure/table/standard{ + name = "plastic table frame" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker) +"qRI" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"qWk" = ( +/obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker/laundry_arrival) +"qYW" = ( +/obj/structure/catwalk, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/effect/floor_decal/rust, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"raS" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/landmark/tram, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) +"rtx" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cargo/mining) +"rxq" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"rMk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cargo/mining) +"rRC" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"rVb" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"rYl" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"rYL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/cryopod/robot/door/tram, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/tram) +"rZZ" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"sbD" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) +"svZ" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"sya" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/holoposter{ + dir = 4; + pixel_x = -30 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/visitor_dining) +"szT" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"sEz" = ( +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"sHO" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"sIO" = ( +/turf/simulated/floor/looking_glass{ + dir = 6; + icon_state = "origin_arrow" + }, +/area/looking_glass/lg_1) +"sKe" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"sLi" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) +"sNu" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cargo/mining) +"sQB" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"tbB" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"tpe" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"tvk" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"tvA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"tCV" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) +"tLx" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/landmark/tram, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) +"tMP" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"tNJ" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"tRJ" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 10; + icon_state = "spline_plain" + }, +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "lg_1"; + name = "Looking Glass Lock"; + pixel_x = 28; + pixel_y = 28; + specialfunctions = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/looking_glass/lg_1) +"tVd" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"uqH" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/obj/structure/closet, +/obj/random/maintenance/clean, +/obj/random/maintenance/engineering, +/obj/random/maintenance/cargo, +/obj/random/maintenance/research, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"uuu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker) +"uxF" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass{ + name = "Locker Room" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker) +"uAA" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"uEK" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/camera/network/tether{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"uKS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"uOe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"uRe" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"uUP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/steeldecal/steel_decals_central1{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/monofloor{ + dir = 4 + }, +/area/tether/surfacebase/surface_one_hall) +"vfy" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"vlJ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/camera/network/research, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"vDb" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"vHP" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"wxa" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"wzA" = ( +/obj/structure/catwalk, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) +"wUW" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"wXf" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"xbP" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/structure/extinguisher_cabinet{ + dir = 1; + icon_state = "extinguisher_closed"; + pixel_y = -32 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cargo/mining) +"xgQ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "xnn" = ( /obj/machinery/holoposter, /turf/simulated/wall, /area/crew_quarters/visitor_laundry) +"xzn" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"xAT" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "xOH" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -31759,6 +31551,49 @@ }, /turf/simulated/floor/tiled/techmaint, /area/looking_glass/lg_1) +"xYn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) +"xYK" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) +"ygY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) (1,1,1) = {" aaa @@ -36481,7 +36316,7 @@ bdA bdC akU ali -rIU +sbD gaK orF ajS @@ -36948,8 +36783,8 @@ aDz aEe aET aCe -aFZ -aGJ +cdO +glH aBv aah aah @@ -37090,8 +36925,8 @@ aCX aCX awV awV -aGa -aGN +ygY +aGX aBv aah aah @@ -37232,8 +37067,8 @@ aDA aDA aEU awV -aGb -aGM +xgQ +ofS aBv aah aah @@ -37374,8 +37209,8 @@ azA azA aEV awV -aGc -aGN +lMf +aGX aBv aBv aBv @@ -37516,8 +37351,8 @@ aDB aEf aEW awV -acu -aEd +lwN +icB aFI aFJ aFK @@ -37658,8 +37493,8 @@ aDC aEg aEX aCX -aGe -aGP +vlJ +uAA aHp aHN aIB @@ -37800,8 +37635,8 @@ aDD aEg aEY aCX -aGf -aGN +cIh +aGX awn awn awn @@ -37942,8 +37777,8 @@ aDD aEg aEZ awV -aGg -aGQ +ovG +jkt awn aHO aIC @@ -38084,8 +37919,8 @@ aDD aEh aFa ajc -aGh -aGR +cgN +aGX awn aHP aID @@ -38226,8 +38061,8 @@ aDE aEi aFb awV -aGi -aGN +kyE +aGX aHq aHq aHq @@ -38368,8 +38203,8 @@ aDF aEi aFc aCX -aGa -aGN +ygY +aGX aHq aHQ aHq @@ -38510,8 +38345,8 @@ aDG aEj aFc aCX -aGa -aGS +ygY +oli aHq aHR aHq @@ -38652,8 +38487,8 @@ aDH aEk aFd aCX -aGa -aGT +ygY +hps aHq adn aHq @@ -38794,8 +38629,8 @@ aiW awV aCX aCX -aGj -aGU +gxM +tvA aHr aHS aHr @@ -38936,8 +38771,8 @@ aDI aEl aCV aCV -aGk -aGL +szT +jSU aHs aHT aHs @@ -39078,8 +38913,8 @@ aDJ aDJ aDJ aDJ -aGl -aGV +uOe +nis aHq aHU aHV @@ -40194,18 +40029,18 @@ apu apu apu apu -asG -atc -atI -auo -auL -avk -avR -awB -axc -axQ -ayF -acb +uqH +mHO +csb +nBm +nmh +poN +fGP +kCz +csb +imW +tMP +pjp apu aBH aCt @@ -40336,18 +40171,18 @@ bco bco bcl apu -bbY -bca -bca -bcb -bca -bcc -avS -awC -axd -axR -axR -acp +qYW +xYK +xYK +fXu +fFf +fZA +iHP +uRe +tbB +ogk +nrX +dZo acW aBI aCu @@ -41600,9 +41435,9 @@ abT abT abT abT -afA -afA -bbM +qor +qor +pyD bbR aez aoL @@ -41742,7 +41577,7 @@ bbT bbT bbc aup -avl +sLi ahp ahX anQ @@ -41884,7 +41719,7 @@ abT abT abT abT -bbI +tCV ahq ahX aiS @@ -42026,7 +41861,7 @@ aah aah aah abT -bbJ +wzA ahr ahX anR @@ -42168,7 +42003,7 @@ aah aah aah abT -bbI +tCV ahq ahX anS @@ -42301,7 +42136,7 @@ abT acQ adl ado -adM +xYn abT abT abT @@ -42310,7 +42145,7 @@ abT abT aah abT -bbI +tCV ahs ahZ aiV @@ -42443,7 +42278,7 @@ aar aar aar abT -adN +crC abT agd acC @@ -42452,7 +42287,7 @@ ady abT abT abT -bbI +tCV ahs ahX anT @@ -42583,18 +42418,18 @@ aaG aaM aaP aaY -abc -abI -abN -abW -acx -acD -acD -adz -amW -amW -and -bbK +qIr +ecq +nDD +jPk +lpK +lDW +lDW +cpD +fBN +fBN +cBf +hQP anv aia aiX @@ -42760,8 +42595,8 @@ agM agM agM ayb -ayK -azT +ayG +rYl aAQ aBP aCB @@ -42770,9 +42605,9 @@ aDR aDR aFk aFM -aGr -aHh -aHz +hBE +eIL +gOA aIh aIS aJK @@ -42902,8 +42737,8 @@ bcm atL atj ayc -ayL -azU +ayG +dCc aAR aBQ aCC @@ -42912,9 +42747,9 @@ aDk aEu aFl aFN -aGs -aHi -aHA +ohi +hcz +loc aec aIT aJL @@ -43008,8 +42843,8 @@ aah aah aar aaX -abb -abh +eGO +jKO acc acc acc @@ -43043,9 +42878,9 @@ agM agM agM agM -ayd -ayM -azV +wXf +sQB +byP agM aBO aBO @@ -43150,8 +42985,8 @@ aah aah aar aaX -agm -abk +rMk +aGV acc abZ abZ @@ -43183,11 +43018,11 @@ aus auN avm avV -awE -axi -aye -ayN -azW +jDg +wUW +eIb +sKe +osh agM aah aah @@ -43292,8 +43127,8 @@ aah aah aar aaX -agm -abl +rMk +xbP acc adS adS @@ -43325,11 +43160,11 @@ aoQ aoQ aoQ aoQ -awF +xAT aoQ -ayf -ayO -azX +tvk +aoQ +ghr agM aah aah @@ -43434,8 +43269,8 @@ aah aah aar abd -abn -abm +dYe +beE acc aca adS @@ -43467,11 +43302,11 @@ aoj aoj aoj aoi -awG -axj -ayg -ayP -azY +awH +oQm +gVe +lNt +mon agM aah aah @@ -43576,8 +43411,8 @@ aah aah aar aaX -agm -abv +rMk +rtx acc adS adS @@ -43718,8 +43553,8 @@ aah aah aar aaX -agm -abw +kxe +sNu abK abP acd @@ -44181,8 +44016,8 @@ awH axn ayh ayR -aAa -aAU +iwE +efV aBS aCE aDm @@ -44323,8 +44158,8 @@ awI axo ayh ayS -aAb -aAV +iwE +nmD aBT aCF aDn @@ -44465,8 +44300,8 @@ awH axp ayh ayT -aAb -aAW +iwE +cXW aBT aCG aDo @@ -44607,8 +44442,8 @@ awH axq ayh ayU -aAc -aAX +gxa +qWk ayh ayh ayh @@ -44749,8 +44584,8 @@ awH axm ayi ayV -aAd -aAY +fyp +huE aBU aCH aDp @@ -44891,8 +44726,8 @@ awH axm ayh ayW -aAe -aAZ +eQT +niz aBV aCI aDq @@ -45034,7 +44869,7 @@ axm ayh ayh aAf -aBa +cpp ayh ayh ayh @@ -45173,10 +45008,10 @@ aoj aoi awH axr -ayj -ayX -aAg -aBb +fAW +kKl +xzn +ldI agM aCJ aCJ @@ -45306,19 +45141,19 @@ aok aok ase aok -asP -atm -atN +aok +aok +sEz aut aut avn avW awJ avW -ayk -ayY -aAh -aBc +kgk +mSz +qhq +oib agM aCK aCK @@ -45448,19 +45283,19 @@ arB ajA asf ass -asQ +mGP atn -atO +cHW auu auQ avo avX awK aqh -ayl -ayZ -ayN -aBd +vfy +qwm +ayG +qRI agM aCJ aCK @@ -45590,9 +45425,9 @@ agM agM asg ash -asR +uxF ash -atP +kMG ash auR avp @@ -45600,9 +45435,9 @@ auR awL abx awN -aza -aAi -aBe +bPt +oVr +mrR agM aCJ aCK @@ -45732,9 +45567,9 @@ aah aah ash ast -asS +asU ato -atQ +evF ast auR avq @@ -45742,9 +45577,9 @@ avY awM axs awN -azb -aAj -aBf +azd +ayG +jnj agM cOq aCK @@ -45874,9 +45709,9 @@ aah aah ash ast -asS +asU atp -atR +hoH ast auR avr @@ -45885,8 +45720,8 @@ awN axt awN azc -ayL -aBg +ayG +uEK agM agM agM @@ -46016,9 +45851,9 @@ aah aah ash asu -asT -atq -atR +asU +qOA +uuu ast auR avs @@ -46027,21 +45862,21 @@ awN axt awN azd -aAk -vNW +ayJ +mZO agM -aDt -aFt -aDU -aEG -aGv -aGw -aHF -aJS -aJU -aIq -aJj -aKI +kbZ +cqZ +xzn +lQQ +vHP +bMP +eUS +axi +mCe +xzn +tpe +rxq aMc aLg aLg @@ -46169,21 +46004,21 @@ awN abA auR aze -aAl -aBi -aBW -aCM -aDs -aDV ayG -aFu +oKY +qKn +sHO +uKS ayG ayG ayG ayG ayG -aJk -aJT +ayG +ayG +ayG +oog +nsp aKH aLh aNQ @@ -46311,21 +46146,21 @@ awN axt aym azf -ayL -aBj -aBX -aDW -aFO -aFP -aEH -aFv -aHk -aJl -aJl -aJl -aJl -aKG -aLZ +ayG +byn +uUP +tVd +eow +kAG +rZZ +ghg +wxa +glc +glc +glc +hTz +rVb +kPT bbn aLi aLQ @@ -46453,8 +46288,8 @@ auR awN auR azg -aAm -aBk +cWS +rRC agM aCO aCO @@ -46595,8 +46430,8 @@ awO axu auR azh -ayL -aBl +ayG +vDb aBY aCP aDu @@ -46737,8 +46572,8 @@ awf axv auR azi -ayL -aBl +ayG +vDb aBY aCQ aDu @@ -46879,8 +46714,8 @@ awP axw auR azj -ayN -aBm +ayI +svZ aBY aCR aDv @@ -47021,8 +46856,8 @@ awQ axx auR azk -ayL -aBn +ayG +tNJ agM aCS aCO @@ -47163,8 +46998,8 @@ auR auR ayn azd -ayL -aBl +ayG +vDb aAR agM aCO @@ -47305,8 +47140,8 @@ aah aah agM azl -aAn -aBl +iti +vDb aBZ agM aCO @@ -47447,8 +47282,8 @@ atx atx atx azm -aAo -aBo +mRF +bMs atx atx aCO @@ -47589,8 +47424,8 @@ atx axy ayo azn -aAp -aBp +bSx +raS aCa axy atx @@ -47731,8 +47566,8 @@ atx axy ayo azn -aAq -aBq +auU +tLx aCa axy atx @@ -47873,8 +47708,8 @@ atx atx atx azo -aAr -aBr +qfJ +mOz atx atx atx @@ -48015,8 +47850,8 @@ awR axz ayp azp -aAo -aBs +mRF +rYL ayp aCT aDw @@ -48157,8 +47992,8 @@ awj awj ayq azq -afU -aBt +jva +dZW aCb aCU aCU diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 4970bb3b65..25ddefa9eb 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -1157,15 +1157,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) -"acs" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) "act" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1250,19 +1241,6 @@ "acF" = ( /turf/simulated/wall/r_wall, /area/rnd/rdoffice) -"acG" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 4; - pixel_y = 0 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) "acH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1382,29 +1360,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) -"acZ" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) -"ada" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) "adb" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1569,19 +1524,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/maintenance/lower/north) -"adq" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) "adr" = ( /obj/structure/railing{ dir = 1 @@ -1689,34 +1631,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) -"adE" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) -"adF" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) "adG" = ( /obj/structure/railing{ dir = 4 @@ -1846,24 +1760,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/north) -"adX" = ( -/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 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) "adY" = ( /turf/simulated/wall, /area/tether/surfacebase/surface_two_hall) @@ -1880,33 +1776,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining) -"aea" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/visible/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining) -"aeb" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining) "aec" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -2008,14 +1877,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/north) -"aem" = ( -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) "aen" = ( /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ scrub_id = "atrium" @@ -2047,17 +1908,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining) -"aer" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining) -"aes" = ( -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining) "aet" = ( /obj/structure/railing{ dir = 1 @@ -2183,47 +2033,11 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/north) -"aeI" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/multi_tile/metal/mait{ - name = "Maintenance Access" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/surface_two_hall) -"aeJ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/surface_two_hall) "aeK" = ( /obj/structure/grille, /obj/structure/railing, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"aeL" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/multi_tile/metal/mait{ - name = "Maintenance Access" - }, -/obj/structure/catwalk, -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/surface_two_hall) -"aeM" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/disposalpipe/segment, -/obj/structure/catwalk, -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/surface_two_hall) "aeN" = ( /obj/effect/floor_decal/rust, /obj/effect/decal/cleanable/dirt, @@ -2337,36 +2151,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"afb" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) -"afc" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "afd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 4; @@ -2594,26 +2378,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/evidence) -"afr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) -"afs" = ( -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "aft" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -2724,33 +2488,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"afC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) -"afD" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) -"afE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "afF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -2770,22 +2507,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"afJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) -"afK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "afL" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -2934,37 +2655,6 @@ /obj/structure/window/basic, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"afZ" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/green/bordercorner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) -"aga" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "agb" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -3137,15 +2827,6 @@ }, /turf/simulated/open, /area/tether/surfacebase/surface_two_hall) -"agy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/sortjunction/flipped{ - name = "Trash"; - sortType = "Trash" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "agz" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -4362,16 +4043,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"ajb" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) "ajc" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/visible/supply{ @@ -4487,46 +4158,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"ajo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) -"ajp" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) -"ajq" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) "ajr" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -4707,24 +4338,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/lower/rnd) -"ajO" = ( -/obj/structure/cable{ - icon_state = "16-0" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/up, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) "ajP" = ( /obj/machinery/alarm{ dir = 4; @@ -4749,12 +4362,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"ajR" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "ajS" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -5764,21 +5371,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"alK" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/disposalpipe/junction, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_two_hall) "alL" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -5803,26 +5395,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_staires_two) -"alN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/north_staires_two) "alO" = ( /obj/machinery/firealarm{ dir = 1; @@ -6011,29 +5583,11 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_two_hall) -"amb" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/tether/surfacebase/surface_two_hall) "amc" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/bar) -"amd" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/tether/surfacebase/north_staires_two) "ame" = ( /obj/machinery/light{ dir = 8; @@ -6141,21 +5695,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_two_hall) -"amm" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) -"amn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) "amo" = ( /obj/structure/railing{ dir = 1; @@ -6209,92 +5748,11 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) -"amu" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) -"amv" = ( -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/item/device/radio/intercom{ - pixel_y = -28 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/north_staires_two) -"amw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) -"amx" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) "amy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/lower/rnd) -"amz" = ( -/obj/machinery/alarm{ - dir = 8; - icon_state = "alarm0"; - pixel_x = 24 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) "amA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6545,10 +6003,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"and" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "ane" = ( /obj/structure/table/woodentable, /obj/item/weapon/storage/box/snakesnackbox, @@ -6686,10 +6140,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"ant" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "anu" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -6708,19 +6158,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"anw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "anx" = ( /obj/machinery/door/airlock/maintenance/common, /obj/structure/disposalpipe/segment, @@ -7911,11 +7348,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"apL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "apM" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -8264,23 +7696,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"aqv" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/yellow/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "aqw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8396,15 +7811,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/teleporter) -"aqJ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "aqK" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, @@ -8688,19 +8094,6 @@ "arl" = ( /turf/simulated/wall, /area/tether/surfacebase/east_stairs_two) -"arm" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/north_staires_two) "arn" = ( /obj/machinery/teleport/hub{ dir = 2 @@ -11953,27 +11346,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"awK" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/north_staires_two) "awL" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -13481,38 +12853,6 @@ "azl" = ( /turf/simulated/wall/r_wall, /area/engineering/atmos) -"azm" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 9; - icon_state = "bordercolor" - }, -/obj/machinery/camera/network/engineering, -/turf/simulated/floor/tiled, -/area/engineering/atmos) -"azn" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" - }, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled, -/area/engineering/atmos) "azo" = ( /obj/structure/cable/cyan{ d1 = 2; @@ -14248,33 +13588,6 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor/plating, /area/engineering/lower/breakroom) -"aAf" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 10; - icon_state = "bordercolor" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/engineering/atmos) -"aAg" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/border, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/engineering/atmos) "aAh" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -15115,39 +14428,6 @@ /obj/machinery/recharge_station, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) -"aBA" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/recharge_station, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/plating, -/area/engineering/drone_fabrication) -"aBB" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/engineering/drone_fabrication) "aBC" = ( /obj/machinery/light_switch{ pixel_y = 28 @@ -15417,12 +14697,6 @@ /obj/item/weapon/stool, /turf/simulated/floor/tiled/techmaint, /area/engineering/drone_fabrication) -"aBY" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/drone_fabrication) "aBZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -17975,21 +17249,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"aHH" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) "aHI" = ( /obj/structure/table/steel, /turf/simulated/floor/plating, @@ -18081,13 +17340,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) -"aHU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_slimepens) "aHV" = ( /obj/machinery/power/apc{ dir = 4; @@ -18100,21 +17352,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) -"aHW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_slimepens) -"aHX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_slimepens) "aHY" = ( /obj/machinery/door/window/brigdoor/westright{ name = "Slime Pen 4"; @@ -18879,19 +18116,11 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) -"aJC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_slimepens) "aJD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) -"aJE" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_slimepens) "aJF" = ( /obj/machinery/disposal, /obj/structure/window/reinforced, @@ -21767,6 +20996,14 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) +"aOQ" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/tether/surfacebase/surface_two_hall) "aOR" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced, @@ -22018,28 +21255,6 @@ /obj/machinery/camera/network/interrogation, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/interrogation) -"aPk" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor, -/area/maintenance/lower/security) "aPl" = ( /obj/structure/table/reinforced, /obj/machinery/photocopier/faxmachine{ @@ -24600,18 +23815,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) -"aSZ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 8 - }, -/obj/machinery/camera/network/tether{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "aTa" = ( /obj/machinery/light/small, /obj/effect/floor_decal/borderfloorwhite, @@ -26241,25 +25444,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhallway) -"aVr" = ( -/obj/machinery/door/airlock/maintenance/sec{ - name = "Riot Control"; - req_access = list(1) - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/tether/surfacebase/security/interrogation) "aVs" = ( /obj/structure/railing{ dir = 4 @@ -26276,15 +25460,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) -"aVt" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) "aVu" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Command Subgrid"; @@ -26361,32 +25536,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) -"aVA" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) -"aVB" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) "aVC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -26414,20 +25563,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhallway) -"aVE" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor, -/area/maintenance/lower/security) "aVF" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -26561,23 +25696,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) -"aVO" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/turf/simulated/floor, -/area/maintenance/lower/security) "aVP" = ( /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/interrogation) @@ -26680,40 +25798,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) -"aVX" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, -/turf/simulated/floor, -/area/maintenance/lower/security) -"aVY" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor, -/area/maintenance/lower/security) "aVZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -26940,13 +26024,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) -"aWp" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor, -/area/maintenance/lower/north) "aWq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -27645,57 +26722,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"aXB" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 8 - }, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) -"aXC" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green/bordercorner{ - dir = 1 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) -"aXD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "aXE" = ( /obj/structure/cable, /obj/machinery/power/terminal{ @@ -28788,17 +27814,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) -"aZR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "aZS" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -29260,25 +28275,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/commandmaint) -"baM" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/light/small{ - dir = 8; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "baN" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -29313,15 +28309,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"baW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "baX" = ( /obj/machinery/light/small{ dir = 4 @@ -29349,7 +28336,7 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) -"bbl" = ( +"bcC" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -29357,32 +28344,201 @@ dir = 8 }, /obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"bkW" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/power/apc{ + dir = 2; + name = "south bump"; + pixel_y = -28 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/lower/security) "boO" = ( /obj/random/cutout, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) +"ceC" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/north) "cne" = ( /obj/effect/floor_decal/rust, /obj/effect/decal/cleanable/dirt, /obj/random/cutout, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) +"cHg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/outpost/xenobiology/outpost_slimepens) "cHq" = ( /obj/effect/catwalk_plated/dark, /turf/simulated/open, /area/maintenance/lower/bar) +"cIm" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"cZo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"drH" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"dQd" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/bar) +"dQj" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining) +"exx" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 10 + }, +/turf/simulated/floor, +/area/maintenance/lower/security) +"fGk" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"fHc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/outpost/xenobiology/outpost_slimepens) +"fIH" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/north) +"fXU" = ( +/obj/machinery/door/airlock/maintenance/sec{ + name = "Riot Control"; + req_access = list(1) + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/turf/simulated/floor, +/area/tether/surfacebase/security/interrogation) "fYA" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -29397,6 +28553,24 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining) +"gDW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"gPa" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining) +"hCD" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "hNH" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -29407,6 +28581,90 @@ /obj/structure/disposalpipe/segment, /turf/simulated/open, /area/maintenance/lower/bar) +"iwn" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/structure/disposalpipe/sortjunction/flipped{ + name = "Trash"; + sortType = "Trash" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"iBn" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"iGv" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"iIV" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/machinery/status_display{ + pixel_x = -32 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"iJj" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/tether/surfacebase/surface_two_hall) +"iRp" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/drone_fabrication) +"jfF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "jnL" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -29421,6 +28679,167 @@ /obj/random/cutout, /turf/simulated/floor, /area/maintenance/lower/south) +"knh" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/tether/surfacebase/north_staires_two) +"kuw" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/north) +"kDh" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"kYW" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/firealarm{ + dir = 2; + layer = 3.3; + pixel_x = 0; + pixel_y = 26 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/lower/security) +"ldx" = ( +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"lkN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"lVd" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/bar) +"msI" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/turf/simulated/floor, +/area/maintenance/lower/north) +"mDI" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/north) +"mFg" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/lower/north) +"nGX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"nKP" = ( +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"nOG" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) +"nQX" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "nTp" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -29430,10 +28849,408 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /turf/simulated/open, /area/maintenance/lower/bar) +"nUt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/structure/window/basic{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"nVB" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 9; + icon_state = "bordercolorcorner2" + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"okd" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"olz" = ( +/obj/structure/catwalk, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/turf/simulated/floor/plating, +/area/maintenance/lower/north) +"omx" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"oIf" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/lower/north) +"oWH" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"oXN" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/lower/security) +"pbf" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "peO" = ( /obj/structure/catwalk, /turf/simulated/open, /area/maintenance/lower/bar) +"pkv" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/north_staires_two) +"ppI" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/surfacebase/surface_two_hall) +"prG" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/machinery/camera/network/tether{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"pvh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/power/apc{ + dir = 2; + name = "south bump"; + pixel_y = -28 + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/north_staires_two) +"pGt" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/tether/surfacebase/surface_two_hall) +"pUx" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"qfL" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/north) +"qNo" = ( +/obj/structure/cable{ + icon_state = "16-0" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/up, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"rim" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/north_staires_two) +"rjE" = ( +/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 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/north) +"rGt" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"svN" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"tgA" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/engineering/drone_fabrication) +"toV" = ( +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/recharge_station, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/plating, +/area/engineering/drone_fabrication) +"tKq" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 9; + icon_state = "bordercolor" + }, +/obj/machinery/camera/network/engineering, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) +"tRh" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/lower/north) +"tXA" = ( +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/item/device/radio/intercom{ + pixel_y = -28 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/north_staires_two) +"uch" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/lower/security) +"uin" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"ukB" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/north) "uoL" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -29443,6 +29260,179 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"uEH" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/turf/simulated/floor/plating, +/area/maintenance/lower/north) +"vgb" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1; + icon_state = "borderfloor"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 1; + icon_state = "bordercolor" + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) +"vmO" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/light/small{ + dir = 8; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"vvJ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/junction, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_two_hall) +"wBk" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/obj/structure/catwalk, +/turf/simulated/floor/tiled/techfloor/grid, +/area/tether/surfacebase/surface_two_hall) +"wRZ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 10; + icon_state = "bordercolor" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) +"wVF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/drone_fabrication) +"xiE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"xkH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"xIc" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/bar) +"xPU" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"xUz" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) (1,1,1) = {" aaa @@ -34946,16 +34936,16 @@ aHy aIC aIC aJa -aJE -aHU +aMQ +aJa aID aJa aMQ aJa aID aJa -aJE -aHU +aMQ +aJa aKu aMh aMl @@ -35088,16 +35078,16 @@ aLt aHu aHx aHR -aJa -aHW +fHc +cHg aMf aMk aMR aKm aMf aNU -aJD aMR +aJD aKW aOq aMm @@ -35230,16 +35220,16 @@ aHA aIC aIC aJa -aJC -aHX +aNu +aJa aJb aJa aNu aJa aJb aJa -aJC -aHX +aNu +aJa aKX aMi aNv @@ -38754,8 +38744,8 @@ auu axb aBF auv -azm -aAf +tKq +wRZ aAU aBz aBX @@ -38896,11 +38886,11 @@ auv auv auv auv -azn -aAg +vgb +nOG aAU -aBA -aBY +toV +iRp aCz aDb aDu @@ -39041,8 +39031,8 @@ avA azo aAh aAV -aBB -aBZ +tgA +wVF aBZ aDc aDv @@ -39292,10 +39282,10 @@ agF agO ahI alw -alK -amb -amm -amu +vvJ +ppI +ajN +drH aiR aji ajy @@ -39434,10 +39424,10 @@ age age ahc alx -amv +tXA age aFB -aHH +omx aiS ajj ajy @@ -39576,10 +39566,10 @@ agt agt agt aiD -arm +rim age aik -amw +iBn aiT ail ajz @@ -39696,7 +39686,7 @@ aUl aUv aUI aUQ -aVr +fXU aUQ aUQ aUQ @@ -39718,10 +39708,10 @@ agt agP agt alM -alN +pvh age ail -amx +aiB aiU ail ajA @@ -39838,7 +39828,7 @@ aUk aUw afq aUR -aVE +oXN aUS aac aac @@ -39863,7 +39853,7 @@ ahH alO age aim -amx +aiB aiV ajk aWQ @@ -39980,7 +39970,7 @@ aUk aUx aUI aUR -aVE +oXN aUS aac aac @@ -40005,7 +39995,7 @@ aiA alP age ail -ajO +qNo amy aUE aWR @@ -40122,7 +40112,7 @@ aUk aUy aPg aUR -aVO +uch aUS aap aap @@ -40144,10 +40134,10 @@ age agQ aTM aly -awK -amd -amn -amz +pkv +knh +ail +nKP ail ajf ail @@ -40264,7 +40254,7 @@ aUk aUk aUk aUR -aPk +bkW aUS abD aca @@ -40406,7 +40396,7 @@ aaS aWG aUq aUS -aVX +kYW aUS aVs acb @@ -40420,7 +40410,7 @@ acc ael adY afa -afB +iIV afV agf aRV @@ -40548,21 +40538,21 @@ aaS aUq aUq aUS -aVY -aWp -aVt -aVA -acc -acc -acc -acZ -acc -adE -acc -aem -aeI -afb -afC +exx +msI +olz +kuw +uEH +uEH +uEH +fIH +tRh +mFg +tRh +oIf +iJj +kDh +cZo afW agg agg @@ -40586,8 +40576,8 @@ ajB ajB ajB ajB -apL -aqv +hCD +nVB ard arL asF @@ -40693,18 +40683,18 @@ aan aUT aap abG -aVB -acs -acG -acs -ada -adq -adF -adX -adq -aeJ -afc -afD +qfL +adW +ceC +adW +adW +ukB +mDI +rjE +ukB +pGt +pUx +xUz afX agh agh @@ -40846,7 +40836,7 @@ aap aap adY alv -afE +afF afY agi agv @@ -40988,7 +40978,7 @@ aac aac adY afe -afF +afG afY agj agw @@ -43114,11 +43104,11 @@ aad aad aad acS -aea -aer -aeL -afr -afJ +adf +acy +wBk +rGt +lkN agk anK anK @@ -43256,35 +43246,35 @@ ack acv aad adH -aeb -aes -aeM -afs -afK -afZ -aqJ -aqJ -aqJ -aqJ -aqJ -aqJ -aqJ -aqJ -aqJ -aqJ -aSZ -bbl -baM +dQj +gPa +aOQ +ldx +nQX +cIm +uin +iwn +pbf +pbf +fGk +uin +uin +oWH +oWH +uin +prG +xPU +vmO +okd +xiE aXA -aXA -aXA -aXA -aXA -aXB -aXB -aXB -aXC -aXD +svN +bcC +nUt +nUt +nUt +iGv +nGX aqE adY aac @@ -43403,30 +43393,30 @@ aet adY aft afL -aga -agm -agy -agm -agm -agm -agm -agm -agm -agm -agm -aZR -baW -ajo -ajo -ajR afG -and -ant -ant -ant -ant -ant -anw +afG +gDW +afG +afG +afG +afG +afG +afG +afG +afG +xkH +afG +afG +afG +afF +afG +afL +afG +afG +afG +afG +afG +jfF aqD adY aZw @@ -43840,7 +43830,7 @@ aau aau ahR adu -ajp +lVd aYd ajZ aYt @@ -43982,7 +43972,7 @@ ahP ahP ain adu -ajp +lVd aYd aqT aYu @@ -44124,7 +44114,7 @@ aju aju aip aiI -ajq +xIc aYd aYj aXu @@ -44266,7 +44256,7 @@ aju aju ais adu -ajb +dQd aYd aQW aYv @@ -44408,7 +44398,7 @@ ahQ aid aiq adu -ajb +dQd aYd aYe aYw diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 6f9ecbff4b..3cb6b3807d 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -716,25 +716,6 @@ /obj/random/cigarettes, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) -"aby" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "abz" = ( /obj/structure/lattice, /obj/machinery/door/firedoor/glass, @@ -1070,28 +1051,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/triage) -"acf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock/medical{ - name = "Patient Room A"; - req_one_access = list() - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/patient_a) "acg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1128,25 +1087,6 @@ "acj" = ( /turf/simulated/wall, /area/rnd/outpost/xenobiology/outpost_hallway) -"ack" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "acm" = ( /obj/structure/sink{ dir = 4; @@ -1162,25 +1102,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) -"acn" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aco" = ( /obj/structure/railing{ dir = 1; @@ -1611,28 +1532,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/reading_room) -"acV" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/atm{ - pixel_y = 31 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "acW" = ( /obj/machinery/atmospherics/pipe/cap/visible/scrubbers, /turf/simulated/floor/plating, @@ -1653,18 +1552,6 @@ /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"acZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "ada" = ( /obj/structure/cable/green{ d1 = 4; @@ -2084,23 +1971,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) -"adK" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) "adL" = ( /obj/structure/cable/green{ d1 = 1; @@ -2602,33 +2472,6 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) -"aeE" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/medsec_maintenance) -"aeF" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/light_switch{ - pixel_y = 25 - }, -/obj/random/junk, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/medsec_maintenance) "aeG" = ( /turf/simulated/wall, /area/tether/surfacebase/medical/lobby) @@ -2796,28 +2639,6 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) -"aeU" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aeV" = ( /obj/structure/table/glass, /obj/item/device/flashlight/lamp/green, @@ -2853,27 +2674,6 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) -"aeZ" = ( -/obj/effect/floor_decal/techfloor/corner, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor/hole/right{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/medsec_maintenance) "afa" = ( /obj/machinery/door/airlock/maintenance/medical{ name = "Medical Maintenance Access"; @@ -3050,33 +2850,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) -"afp" = ( -/obj/structure/table/steel, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/processing) -"afq" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/processing) -"afr" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/processing) "afs" = ( /obj/structure/cable/green{ d1 = 4; @@ -3401,39 +3174,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/common) -"afS" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/processing) -"afT" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/green{ - 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/steeldecal/steel_decals4, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/processing) "afU" = ( /obj/machinery/door/airlock/security{ name = "Security Processing"; @@ -3470,41 +3210,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) -"afX" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/medsec_maintenance) -"afY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/medsec_maintenance) -"afZ" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/medsec_maintenance) "aga" = ( /obj/structure/table/glass, /obj/item/weapon/backup_implanter{ @@ -3838,24 +3543,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"agB" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) "agC" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/zpipe/down{ @@ -3908,9 +3595,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"agF" = ( -/turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) "agG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -4313,25 +3997,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) -"ahs" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aht" = ( /obj/machinery/space_heater, /obj/effect/floor_decal/techfloor, @@ -4407,26 +4072,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/frontdesk) -"ahz" = ( -/obj/structure/table/steel, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 5 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 28 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/processing) "ahA" = ( /obj/structure/cable/green{ d1 = 2; @@ -5059,41 +4704,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"ais" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"ait" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aiu" = ( /obj/structure/table/steel, /obj/item/device/integrated_electronics/debugger{ @@ -5443,20 +5053,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/frontdesk) -"aiX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aiY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -5472,15 +5068,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) -"aiZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/medsec_maintenance) "aja" = ( /obj/machinery/computer/crew{ dir = 4 @@ -5517,57 +5104,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"ajc" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"ajd" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"aje" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "ajf" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 1 @@ -5762,25 +5298,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) -"ajv" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"ajw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"ajx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "ajy" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -5826,25 +5343,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge_hallway) -"ajC" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "ajD" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/closet/secure_closet/freezer/kitchen, @@ -5871,22 +5369,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/rnd/research_storage) -"ajF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"ajG" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "ajH" = ( /obj/machinery/computer/secure_data, /obj/structure/fireaxecabinet{ @@ -6050,59 +5532,12 @@ "ajT" = ( /turf/simulated/wall/r_wall, /area/tether/surfacebase/security/lobby) -"ajU" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"ajV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"ajW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "ajX" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"ajY" = ( -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"ajZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aka" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6705,17 +6140,6 @@ dir = 4 }, /area/crew_quarters/pool) -"akW" = ( -/obj/structure/sign/biohazard{ - pixel_y = 32 - }, -/obj/structure/flora/pottedplant/crystal, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/xenobiology/outpost_hallway) "akX" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -7416,32 +6840,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"amt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) -"amu" = ( -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/xenobiology/outpost_hallway) "amv" = ( /turf/simulated/floor/tiled, /area/crew_quarters/pool) @@ -7684,20 +7082,6 @@ }, /turf/simulated/floor/water/pool, /area/crew_quarters/pool) -"amS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) "amT" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -7707,94 +7091,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"amU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/pool) -"amV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) -"amW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/recreation_area) -"amX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) -"amY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) -"amZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) "ana" = ( /obj/structure/table/woodentable, /obj/item/clothing/glasses/threedglasses, @@ -7881,42 +7177,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"ani" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"anj" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "ank" = ( /obj/machinery/door/airlock/maintenance/int{ name = "Fire/Phoron Shelter"; @@ -7936,59 +7196,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/panic_shelter) -"anl" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) -"anm" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor/hole/right{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) -"ann" = ( -/obj/structure/sign/nosmoking_2{ - pixel_x = 29 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 27 - }, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "ano" = ( /obj/machinery/light/small{ dir = 1 @@ -8127,30 +7334,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/pool) -"anC" = ( -/obj/machinery/door/airlock/glass{ - name = "Recreation Area" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_grid, -/area/crew_quarters/recreation_area) -"anD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/hologram/holopad, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) -"anE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) "anF" = ( /obj/structure/table/woodentable, /obj/item/weapon/coin/silver, @@ -8212,72 +7395,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"anM" = ( -/obj/structure/sign/fire{ - name = "\improper PHORON/FIRE SHELTER"; - pixel_x = 33 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"anN" = ( -/obj/machinery/light/small{ - dir = 8; - pixel_x = 0 - }, -/obj/effect/floor_decal/techfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) -"anO" = ( -/obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm{ - dir = 1; - pixel_x = 0; - pixel_y = -25 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) -"anP" = ( -/obj/effect/floor_decal/techfloor, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "anQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8475,13 +7592,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) -"aoe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aof" = ( /obj/structure/bed/padded, /obj/effect/floor_decal/techfloor{ @@ -8526,33 +7636,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aoj" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"aok" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aol" = ( /turf/simulated/wall/r_wall, /area/vacant/vacant_shop) @@ -8724,22 +7807,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aoD" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aoE" = ( /obj/structure/sign/directions/evac{ dir = 1 @@ -8943,13 +8010,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"apa" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "apb" = ( /obj/structure/cable{ icon_state = "4-8" @@ -8975,24 +8035,6 @@ "apc" = ( /turf/simulated/wall, /area/vacant/vacant_shop) -"apd" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "ape" = ( /obj/structure/cable{ icon_state = "4-8" @@ -9466,24 +8508,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"apP" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) "apQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9664,13 +8688,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aqe" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aqf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -10738,67 +9755,6 @@ "arW" = ( /turf/simulated/wall, /area/tether/surfacebase/public_garden_three) -"arX" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"arY" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"arZ" = ( -/obj/machinery/newscaster{ - pixel_x = 0; - pixel_y = 30 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "asa" = ( /obj/machinery/computer/rdconsole/robotics{ dir = 8 @@ -11020,49 +9976,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"asu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"asv" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"asw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"asx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "asy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -11107,67 +10020,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"asB" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - icon_state = "pipe-j1s"; - name = "Kitchen"; - sortType = "Kitchen" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"asC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"asD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"asE" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/beige/bordercorner2{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/flora/pottedplant, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "asF" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -11329,13 +10181,6 @@ "asT" = ( /turf/simulated/wall/r_wall, /area/bridge) -"asU" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "asV" = ( /obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor/glass, @@ -11400,12 +10245,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"atd" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "ate" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11415,30 +10254,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"atf" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/beige/bordercorner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/beige/bordercorner2{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "atg" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -11576,54 +10391,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"atv" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"atw" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"atx" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/crew_quarters/bar) -"aty" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "atz" = ( /obj/machinery/smartfridge{ req_access = list(28) @@ -11692,72 +10459,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge_hallway) -"atJ" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - icon_state = "pipe-j1s"; - name = "Bar"; - sortType = "Bar" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"atK" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"atL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"atM" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/beige/bordercorner2{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/flora/pottedplant, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "atN" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -12232,18 +10933,6 @@ "aux" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) -"auy" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/landmark{ - name = "morphspawn" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) "auz" = ( /obj/item/device/radio/intercom{ dir = 1; @@ -12543,91 +11232,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"avb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"avc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"avd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"ave" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"avf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"avg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"avh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "avj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12644,25 +11248,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"avk" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "avl" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 @@ -12678,11 +11263,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"avm" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "avn" = ( /obj/structure/cable/green{ d1 = 1; @@ -12781,66 +11361,12 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) -"avy" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"avz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"avA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"avB" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "avC" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"avD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"avE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "avF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -12874,28 +11400,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"avI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"avJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "avK" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -13071,18 +11575,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"awc" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lightgrey/bordercorner, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "awd" = ( /obj/machinery/librarycomp{ pixel_y = 0 @@ -13186,12 +11678,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/captain) -"awm" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) "awn" = ( /turf/simulated/wall/r_wall, /area/bridge_hallway) @@ -13236,28 +11722,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aws" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"awt" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "awu" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -13611,12 +12075,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"awT" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "awU" = ( /obj/structure/cable/green{ d1 = 1; @@ -13989,28 +12447,6 @@ /obj/structure/flora/pottedplant, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"axy" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "axz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -14281,33 +12717,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) -"axQ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/blue/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/blue/bordercorner2{ - dir = 10 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "axR" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -14445,13 +12854,6 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"ayd" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aye" = ( /obj/structure/cable/green{ d1 = 1; @@ -14750,9 +13152,6 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"ayG" = ( -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "ayH" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -15701,14 +14100,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"aAe" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aAf" = ( /obj/structure/cable/green{ d1 = 2; @@ -15750,32 +14141,6 @@ /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"aAh" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"aAi" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "aAj" = ( /obj/machinery/light/flamp, /turf/simulated/floor/wood, @@ -15792,16 +14157,6 @@ }, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) -"aAl" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/glass_research{ - name = "Weapons Testing Range"; - req_access = list(47) - }, -/turf/simulated/floor/tiled, -/area/rnd/research/testingrange) "aAm" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -15949,19 +14304,6 @@ /obj/item/device/tape, /turf/simulated/floor/carpet, /area/tether/surfacebase/library/study) -"aAx" = ( -/obj/machinery/door/firedoor/glass/hidden/steel, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aAy" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper_bin{ @@ -16533,14 +14875,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"aBd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/rnd/research/testingrange) "aBe" = ( /obj/machinery/alarm{ dir = 4; @@ -16686,28 +15020,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"aBp" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) "aBq" = ( /obj/item/device/radio/intercom{ pixel_x = 0; @@ -16718,13 +15030,6 @@ }, /turf/simulated/floor/wood, /area/library) -"aBr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, -/area/library) "aBs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -16826,17 +15131,6 @@ /obj/item/weapon/storage/pill_bottle/dice, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"aBE" = ( -/obj/structure/bed/chair/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "aBF" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -17120,26 +15414,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"aBZ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_hallway) -"aCa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/rnd/research/testingrange) "aCb" = ( /obj/structure/table/reinforced, /obj/item/weapon/paper{ @@ -17223,35 +15497,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"aCf" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/camera/network/research{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) -"aCg" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) "aCh" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -17300,36 +15545,6 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"aCk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/bordercorner2{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"aCl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aCm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17341,25 +15556,6 @@ /obj/item/weapon/deck/cards, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"aCp" = ( -/obj/structure/bed/chair/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"aCq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) "aCr" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -17509,57 +15705,6 @@ /obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"aCC" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) -"aCD" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) -"aCE" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/machinery/camera/network/tether{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aCF" = ( /obj/machinery/light/small{ dir = 4; @@ -17583,41 +15728,6 @@ }, /turf/simulated/floor/wood, /area/library) -"aCI" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/airlock/glass_research{ - name = "Weapons Testing Range"; - req_access = list(47) - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/rnd/research/testingrange) -"aCJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, -/area/library) -"aCK" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/mauve/bordercorner2, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) "aCL" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Surface Civilian Substation Bypass" @@ -17709,31 +15819,6 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"aCS" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"aCT" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aCU" = ( /obj/structure/cable/green{ d1 = 1; @@ -17765,20 +15850,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"aCW" = ( -/obj/structure/table/gamblingtable, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"aCX" = ( -/obj/structure/bed/chair/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "aCY" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -18077,26 +16148,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) -"aDC" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_three) "aDD" = ( /obj/structure/table/bench/wooden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18155,15 +16206,6 @@ }, /turf/simulated/open, /area/tether/surfacebase/public_garden_three) -"aDI" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/hole/right{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/medsec_maintenance) "aDJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18193,14 +16235,6 @@ /obj/machinery/light, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) -"aDM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_three) "aDN" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, @@ -18305,39 +16339,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aDX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) -"aDY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) "aDZ" = ( /obj/structure/cable/green{ d1 = 1; @@ -18999,21 +17000,6 @@ /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/atrium) -"aFl" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/rnd/research/testingrange) "aFm" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -19096,12 +17082,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"aFq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/library) "aFr" = ( /obj/structure/cable/green{ d1 = 1; @@ -19132,10 +17112,6 @@ }, /turf/simulated/floor/wood, /area/library) -"aFv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/library) "aFw" = ( /obj/structure/closet/crate, /obj/item/target, @@ -19186,44 +17162,12 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"aFz" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aFA" = ( /obj/structure/bed/chair/wood{ dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"aFB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "aFC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -19348,18 +17292,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"aFK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_hallway) "aFL" = ( /obj/structure/window/reinforced/full, /obj/structure/grille, @@ -19377,23 +17309,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"aFM" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) "aFN" = ( /obj/structure/table/reinforced, /obj/machinery/recharger/wallcharger{ @@ -19412,39 +17327,6 @@ /obj/item/weapon/storage/bag/trash, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"aFO" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) -"aFP" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) "aFQ" = ( /obj/structure/cable/green{ d1 = 4; @@ -19476,32 +17358,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"aFR" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) -"aFS" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) "aFT" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -19625,28 +17481,6 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"aGe" = ( -/obj/structure/extinguisher_cabinet{ - dir = 4; - icon_state = "extinguisher_closed"; - pixel_x = -30 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aGf" = ( /obj/machinery/status_display{ pixel_x = 32; @@ -19671,53 +17505,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"aGg" = ( -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"aGh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"aGi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"aGj" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "aGk" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" @@ -19817,35 +17604,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"aGq" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/mauve/bordercorner, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) -"aGr" = ( -/obj/machinery/door/firedoor/glass/hidden{ - dir = 2; - icon_state = "door_open" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_hallway) "aGs" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/research{ @@ -19869,55 +17627,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) -"aGt" = ( -/obj/machinery/door/firedoor/glass/hidden{ - dir = 2; - icon_state = "door_open" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/xenobiology/outpost_hallway) -"aGu" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) -"aGv" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/sortjunction{ - name = "Research"; - sortType = "Research" - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) "aGw" = ( /obj/structure/bookcase{ name = "bookcase (Non-Fiction)" @@ -20006,29 +17715,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"aGD" = ( -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"aGE" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "aGF" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -20300,13 +17986,6 @@ }, /turf/simulated/floor/wood, /area/library) -"aHe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/library) "aHf" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -20426,21 +18105,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"aHl" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aHm" = ( /obj/machinery/light{ dir = 1 @@ -20487,68 +18151,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"aHp" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass/hidden/steel, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"aHq" = ( -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"aHr" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"aHs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aHt" = ( /obj/structure/cable/green{ d1 = 1; @@ -20569,24 +18171,6 @@ dir = 1 }, /area/crew_quarters/bar) -"aHv" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"aHw" = ( -/obj/item/weapon/stool/padded, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "aHx" = ( /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ @@ -21029,98 +18613,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"aId" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"aIe" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"aIf" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"aIg" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - name = "Bar" - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals_central1, -/turf/simulated/floor/tiled/monofloor, -/area/crew_quarters/bar) -"aIh" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"aIi" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"aIj" = ( -/obj/item/weapon/stool/padded, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "aIk" = ( /obj/structure/table/marble, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -21436,24 +18928,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"aIH" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aII" = ( /obj/structure/sign/department/bar{ pixel_x = 32 @@ -21690,15 +19164,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) -"aJc" = ( -/obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark/start{ - name = "Scientist" - }, -/turf/simulated/floor/tiled, -/area/rnd/research/testingrange) "aJd" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -21812,30 +19277,6 @@ /obj/machinery/door/airlock/glass_external/public, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"aJq" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aJr" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -22015,24 +19456,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"aJJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled, -/area/rnd/research/testingrange) -"aJK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled, -/area/rnd/research/testingrange) "aJL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; @@ -22308,40 +19731,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/tether/surfacebase/shuttle_pad) -"aKl" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"aKm" = ( -/obj/machinery/newscaster{ - pixel_x = 0; - pixel_y = 30 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 2 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aKn" = ( /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ scrub_id = "atrium" @@ -24985,13 +22374,6 @@ }, /turf/simulated/wall, /area/rnd/outpost/xenobiology/outpost_breakroom) -"aPF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/rnd/outpost/xenobiology/outpost_main) "aPG" = ( /obj/random/mob/mouse, /turf/simulated/floor/tiled, @@ -26105,15 +23487,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_main) -"aRX" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/xenobiology/outpost_main) "aRY" = ( /obj/structure/bed/roller, /obj/structure/extinguisher_cabinet{ @@ -26217,18 +23590,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) -"aSh" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/alarm{ - pixel_y = 20 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/xenobiology/outpost_main) "aSi" = ( /obj/structure/window/basic/full, /obj/structure/window/basic{ @@ -26268,13 +23629,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"aSl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/xenobiology/outpost_main) "aSm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -26427,19 +23781,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) -"aSx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/xenobiology/outpost_main) -"aSy" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/xenobiology/outpost_main) "aSz" = ( /obj/structure/window/basic/full, /obj/structure/window/basic, @@ -27089,16 +24430,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"aTw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/floor_decal/techfloor, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/medsec_maintenance) "aTx" = ( /obj/structure/window/basic/full, /obj/structure/grille, @@ -27185,113 +24516,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) -"aTE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) -"aTF" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) -"aTG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) -"aTH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) -"aTI" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 - }, -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) -"aTJ" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) "aTK" = ( /obj/structure/table/glass, /obj/machinery/light{ @@ -27380,18 +24604,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"aTS" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aTT" = ( /obj/machinery/door/morgue{ dir = 2; @@ -27605,22 +24817,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"aUn" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "aUo" = ( /obj/machinery/door/airlock/multi_tile/glass, /obj/effect/floor_decal/industrial/warning/corner{ @@ -27646,32 +24842,6 @@ dir = 4 }, /area/hallway/lower/third_south) -"aUq" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/medsec_maintenance) -"aUr" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/medsec_maintenance) "aUs" = ( /obj/effect/floor_decal/techfloor/corner{ dir = 8 @@ -27784,10 +24954,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"aUB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_three) "aUC" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/lime/bordercorner, @@ -27952,27 +25118,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"aUT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) "aUU" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -28075,14 +25220,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining) -"aVd" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lime/bordercorner, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_three) "aVe" = ( /obj/structure/table/glass, /obj/item/weapon/storage/box/cups, @@ -28301,17 +25438,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"aVw" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/lime/bordercorner2, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_three) "aVx" = ( /obj/machinery/firealarm{ dir = 8; @@ -28319,13 +25445,6 @@ }, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) -"aVy" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Public Garden" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_three) "aVz" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -28344,27 +25463,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aVB" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) "aVC" = ( /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/reinforced, @@ -28533,48 +25631,6 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/security/lobby) -"aVO" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - icon_state = "extinguisher_closed"; - pixel_y = -32 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) -"aVP" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aVQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -28587,31 +25643,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aVR" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 9 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_x = 0; - pixel_y = -25 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) "aVS" = ( /obj/item/device/radio/intercom{ dir = 2; @@ -28856,50 +25887,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"aWk" = ( -/obj/structure/sign/department/sci{ - pixel_x = -32; - pixel_y = 0 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"aWl" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aWm" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -29148,37 +26135,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aWC" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"aWD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"aWE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aWF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -29250,19 +26206,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aWM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aWN" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -29511,43 +26454,6 @@ }, /turf/simulated/floor/wood, /area/library) -"aXg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/library) -"aXh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/library) -"aXi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light/small, -/turf/simulated/floor/wood, -/area/library) -"aXj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/library) "aXk" = ( /obj/structure/sign/directions/medical{ dir = 1; @@ -29717,20 +26623,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"aXv" = ( -/obj/structure/noticeboard{ - pixel_y = -26 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) "aXw" = ( /obj/structure/closet/hydrant{ pixel_x = 32 @@ -29940,28 +26832,6 @@ /obj/item/weapon/locator, /turf/simulated/floor/plating, /area/rnd/research_storage) -"aXK" = ( -/obj/machinery/hologram/holopad, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) "aXL" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -29971,24 +26841,6 @@ }, /turf/simulated/floor/plating, /area/rnd/research_storage) -"aXM" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) "aXN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, @@ -30028,39 +26880,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/rnd/research_storage) -"aXS" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) -"aXT" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) "aXU" = ( /obj/machinery/computer/security/telescreen/entertainment{ desc = "Damn, looks like it's on the clown world channel. I wonder what else is on?"; @@ -31397,29 +28216,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"baI" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/blue/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/blue/bordercorner2{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "baJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -31512,50 +28308,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"baR" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"baT" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "baU" = ( /obj/structure/table/reinforced, /obj/machinery/computer/skills, @@ -31711,14 +28463,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"bbB" = ( -/obj/structure/disposalpipe/sortjunction/flipped{ - dir = 1; - name = "HoP Office"; - sortType = "HoP Office" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "bbC" = ( /obj/item/device/radio/intercom{ dir = 8; @@ -31756,6 +28500,31 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"bbG" = ( +/obj/structure/sign/department/sci{ + pixel_x = -32; + pixel_y = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "bbH" = ( /obj/machinery/alarm{ alarm_id = "pen_nine"; @@ -31770,27 +28539,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"bcY" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/blue/bordercorner{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "bdD" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -31805,12 +28553,137 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"bhu" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"bqs" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"bqy" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"bqA" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"bxH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) +"byo" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"bzK" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/processing) +"bEd" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "bKm" = ( /obj/structure/cable{ icon_state = "1-8" }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"bKS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5; + icon_state = "intact-scrubbers" + }, +/turf/simulated/floor/tiled, +/area/rnd/outpost/xenobiology/outpost_main) "bMK" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -31818,6 +28691,61 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) +"bSe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"ccf" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"ceN" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"cko" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "cmQ" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -31832,6 +28760,119 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"cpd" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"cqA" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"cwI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"cAG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/simulated/floor/wood, +/area/library) +"cFA" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"cGt" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"cGR" = ( +/obj/item/weapon/stool/padded, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) +"cJL" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/camera/network/research{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "cMs" = ( /obj/machinery/power/smes/buildable{ charge = 500000 @@ -31845,6 +28886,56 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/tourbus/engines) +"cRi" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"cSl" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/library) +"cVg" = ( +/obj/structure/table/steel, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 5 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 28 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/processing) +"cWe" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/outpost/xenobiology/outpost_hallway) "cZe" = ( /obj/structure/bed/chair/bay/chair{ dir = 4; @@ -31859,6 +28950,29 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"dfq" = ( +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/crew_quarters/bar) +"dgA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "dhv" = ( /obj/machinery/computer/ship/sensors, /turf/simulated/floor/tiled/white, @@ -31874,6 +28988,91 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"dmH" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"drR" = ( +/obj/machinery/door/firedoor/glass/hidden{ + dir = 2; + icon_state = "door_open" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/outpost/xenobiology/outpost_hallway) +"dsF" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/corner/blue/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"duW" = ( +/obj/structure/table/gamblingtable, +/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"dFb" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "dGZ" = ( /obj/structure/bed/chair/bay/chair{ dir = 4; @@ -31893,28 +29092,129 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) -"dMP" = ( -/obj/effect/floor_decal/borderfloor{ +"dKj" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"dQt" = ( +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/corner/lightgrey/border{ +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + pixel_x = -30 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"dVE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, -/obj/machinery/holoposter{ - pixel_y = 30 +/turf/simulated/floor/tiled/dark, +/area/rnd/outpost/xenobiology/outpost_hallway) +"dYX" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light_switch{ + pixel_y = 25 + }, +/obj/random/junk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) +"ehN" = ( +/obj/effect/floor_decal/techfloor/corner, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) +"epM" = ( +/obj/item/weapon/stool/padded, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) +"erS" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/lime/bordercorner2, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/public_garden_three) "esm" = ( /obj/structure/bed/chair/bay/chair{ dir = 8; @@ -31938,6 +29238,87 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"eAM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + icon_state = "borderfloor"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) +"eFg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + icon_state = "intact-scrubbers" + }, +/turf/simulated/floor/tiled, +/area/rnd/outpost/xenobiology/outpost_main) +"eHk" = ( +/obj/structure/sign/nosmoking_2{ + pixel_x = 29 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 27 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/panic_shelter) +"eIs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) +"eJm" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "eMW" = ( /obj/machinery/computer/ship/engines{ dir = 8; @@ -31967,6 +29348,147 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"eQN" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"feu" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/mauve/bordercorner2, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"fgi" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/structure/flora/pottedplant, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"fgW" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/camera/network/tether{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"frq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) +"fxh" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/glass{ + name = "Recreation Area" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/crew_quarters/recreation_area) +"fyZ" = ( +/obj/machinery/door/firedoor/glass/hidden/steel, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "fNt" = ( /obj/structure/cable/green{ dir = 1; @@ -31977,6 +29499,53 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/engines) +"fOj" = ( +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 1; + name = "HoP Office"; + sortType = "HoP Office" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"fRH" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/machinery/holoposter{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"fXv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/medical{ + name = "Patient Room A"; + req_one_access = list() + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/patient_a) "ghf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -31986,6 +29555,30 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"giR" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) +"gqv" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass/hidden/steel, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "gqX" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -32010,6 +29603,13 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"gtp" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/testingrange) "guv" = ( /obj/structure/bed/chair/bay/chair{ dir = 4; @@ -32034,6 +29634,24 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"gAF" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"gBG" = ( +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "gHh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 @@ -32067,6 +29685,170 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/pool) +"gRX" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 9 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_x = 0; + pixel_y = -25 + }, +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) +"gTN" = ( +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"gVg" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"haS" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Public Garden" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"hcY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"hgf" = ( +/obj/machinery/door/firedoor/glass/hidden{ + dir = 2; + icon_state = "door_open" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/outpost/xenobiology/outpost_hallway) +"hoQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"hvt" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"hxc" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lime/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"hyh" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"hEN" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/library) "hJt" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -32076,6 +29858,39 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) +"hLd" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) +"hPF" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"hYK" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "ieb" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/industrial/danger, @@ -32086,6 +29901,45 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"iiv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"ioG" = ( +/obj/effect/floor_decal/techfloor, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/panic_shelter) +"isl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "isR" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 4; @@ -32110,18 +29964,304 @@ /obj/effect/map_helper/airlock/door/simple, /turf/simulated/floor/tiled/monotile, /area/shuttle/tourbus/general) +"iBA" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"iBG" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"iGj" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/bordercorner{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"iLR" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"iOg" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"iQr" = ( +/obj/machinery/hologram/holopad, +/obj/effect/landmark/start{ + name = "Scientist" + }, +/turf/simulated/floor/tiled, +/area/rnd/research/testingrange) +"iRX" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/outpost/xenobiology/outpost_main) +"iXM" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + icon_state = "map-scrubbers" + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"jjp" = ( +/obj/machinery/newscaster{ + pixel_x = 0; + pixel_y = 30 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "jpB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 6 }, /turf/simulated/wall/shull, /area/shuttle/tourbus/general) +"jri" = ( +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"jrn" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"juj" = ( +/obj/machinery/newscaster{ + pixel_x = 0; + pixel_y = 30 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "jvK" = ( /turf/simulated/wall/shull, /area/shuttle/tourbus/cockpit) +"jvN" = ( +/obj/machinery/firealarm{ + dir = 2; + layer = 3.3; + pixel_x = 0; + pixel_y = 26 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"jAt" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"jBB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/pool) +"jCn" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/panic_shelter) +"jDC" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + icon_state = "extinguisher_closed"; + pixel_y = -32 + }, +/obj/structure/flora/pottedplant/stoutbush, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) +"jFq" = ( +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + icon_state = "pipe-j1s"; + name = "Bar"; + sortType = "Bar" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"jFz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "jHw" = ( /turf/simulated/wall/shull, /area/shuttle/tourbus/general) +"jJd" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "jYd" = ( /obj/structure/cable/green{ d1 = 4; @@ -32137,6 +30277,272 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) +"kcK" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"keX" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"kjn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"knU" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"kuQ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"kuU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/research/testingrange) +"kyb" = ( +/obj/structure/bed/chair/wood, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"kyC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + icon_state = "borderfloor"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"kTn" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/outpost/xenobiology/outpost_main) +"kXo" = ( +/obj/structure/noticeboard{ + pixel_y = -26 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"lcS" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/outpost/xenobiology/outpost_main) +"lgo" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/glass_research{ + name = "Weapons Testing Range"; + req_access = list(47) + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/research/testingrange) +"lpB" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"lqX" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/crew_quarters/recreation_area) +"lsy" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/processing) +"lvH" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"lxa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/wood, +/area/library) +"lSv" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/research/testingrange) +"lXv" = ( +/obj/machinery/light/small{ + dir = 8; + pixel_x = 0 + }, +/obj/effect/floor_decal/techfloor, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/panic_shelter) +"lYT" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"mel" = ( +/obj/machinery/hologram/holopad, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "mfi" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 8; @@ -32165,6 +30571,80 @@ }, /turf/simulated/floor/tiled/monotile, /area/shuttle/tourbus/general) +"mjs" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/atm{ + pixel_y = 31 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"mtF" = ( +/obj/structure/extinguisher_cabinet{ + dir = 4; + icon_state = "extinguisher_closed"; + pixel_x = -30 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"myZ" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/structure/window/basic{ + dir = 8 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"mzz" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "mDr" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -32182,6 +30662,19 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/shuttle/tourbus/general) +"mFq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "mIX" = ( /obj/structure/bed/chair/bay/chair{ dir = 4; @@ -32221,6 +30714,98 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"mRs" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) +"mUE" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"mWX" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/testingrange) +"mXo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/library) +"mXu" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"nbM" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"nfl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"nlf" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/blue/bordercorner2{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "noN" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, @@ -32254,6 +30839,33 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"nui" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"nHF" = ( +/obj/structure/table/gamblingtable, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"nLX" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "nXl" = ( /obj/machinery/door/airlock/glass{ req_one_access = list(19,43,67) @@ -32266,6 +30878,28 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/shuttle/tourbus/cockpit) +"obl" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"olG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "onV" = ( /obj/effect/shuttle_landmark{ base_area = /area/tether/surfacebase/shuttle_pad; @@ -32291,10 +30925,307 @@ dir = 1 }, /area/tether/surfacebase/shuttle_pad) +"opE" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/recreation_area_restroom) +"orc" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) +"orP" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"ovI" = ( +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"oAu" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"oCw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + icon_state = "borderfloor"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) +"oEL" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"oEU" = ( +/obj/structure/table/gamblingtable, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "oMK" = ( /obj/machinery/atmospherics/unary/engine, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/shuttle_pad) +"oRG" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) +"oSv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) +"oUI" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"paT" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"peS" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) +"pgi" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"ple" = ( +/obj/structure/sign/fire{ + name = "\improper PHORON/FIRE SHELTER"; + pixel_x = 33 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"pzH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + icon_state = "borderfloor"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) +"pAh" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"pJL" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/processing) +"pPs" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/alarm{ + pixel_y = 20 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/outpost/xenobiology/outpost_main) "qem" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -32324,19 +31255,129 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"qfz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/library) +"qkf" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/sortjunction{ + name = "Research"; + sortType = "Research" + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "qom" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/engines) +"qqV" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/crew_quarters/recreation_area) +"qvp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 2 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "qwm" = ( /turf/simulated/wall/shull, /area/shuttle/tourbus/engines) +"qCn" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"qIb" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"qOw" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"qQZ" = ( +/obj/effect/floor_decal/techfloor, +/obj/machinery/firealarm{ + dir = 1; + pixel_x = 0; + pixel_y = -25 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/panic_shelter) "qWU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/simulated/wall/shull, /area/shuttle/tourbus/engines) +"qWZ" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"qZs" = ( +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "rjV" = ( /obj/structure/bed/chair/bay/chair{ dir = 8; @@ -32373,6 +31414,89 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) +"rAe" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/landmark{ + name = "morphspawn" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/recreation_area_restroom) +"rEZ" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"rMS" = ( +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"rXW" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/panic_shelter) +"saK" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/machinery/camera/network/security{ + dir = 10; + icon_state = "camera" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) +"sla" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/recreation_area_restroom) "sur" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -32399,6 +31523,27 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/engines) +"suT" = ( +/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, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"sDG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "sEq" = ( /obj/machinery/light/small, /obj/structure/cable{ @@ -32425,6 +31570,100 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) +"sJC" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"sLa" = ( +/obj/machinery/firealarm{ + dir = 2; + layer = 3.3; + pixel_x = 4; + pixel_y = 26 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/outpost/xenobiology/outpost_hallway) +"sPd" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; + name = "Bar" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals_central1, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/monofloor, +/area/crew_quarters/bar) +"sSK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) +"sSW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"sSX" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"sWs" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "sXa" = ( /obj/machinery/holoposter{ pixel_x = -30; @@ -32432,6 +31671,34 @@ }, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) +"sYk" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/flora/pottedplant, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "tdA" = ( /obj/structure/bed/chair/bay/chair{ dir = 4; @@ -32462,6 +31729,79 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/tourbus/cockpit) +"tqY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"trA" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) +"ttH" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"txo" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) +"txO" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "tKs" = ( /obj/structure/cable{ d1 = 1; @@ -32471,6 +31811,30 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"tRg" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "tSk" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -32488,6 +31852,41 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/shuttle/tourbus/cockpit) +"tWn" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"tYE" = ( +/obj/structure/table/steel, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/processing) +"tZw" = ( +/obj/structure/sign/biohazard{ + pixel_y = 32 + }, +/obj/structure/flora/pottedplant/crystal, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/rnd/outpost/xenobiology/outpost_hallway) +"uaN" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/testingrange) "ubn" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -32516,6 +31915,23 @@ /obj/structure/cable, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"ueU" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "uxo" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -32560,6 +31976,26 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"uFI" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"uOc" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "uSA" = ( /obj/effect/shuttle_landmark{ base_area = /area/tether/surfacebase/shuttle_pad; @@ -32581,6 +32017,21 @@ }, /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/shuttle_pad) +"vdE" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/bordercorner{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "vfB" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -32630,6 +32081,22 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"voS" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) +"vrs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "vtN" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -32643,6 +32110,87 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"vun" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"vvA" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/blue/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"vxO" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"vJA" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"vKm" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"vQP" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) +"weK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/hologram/holopad, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "wiX" = ( /obj/machinery/camera/network/civilian{ dir = 9 @@ -32666,6 +32214,20 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/tourbus/cockpit) +"wrA" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "wtd" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -32697,10 +32259,76 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/shuttle/tourbus/general) +"wGK" = ( +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "wNz" = ( /obj/machinery/computer/ship/helm, /turf/simulated/floor/tiled/white, /area/shuttle/tourbus/cockpit) +"wPD" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"wXr" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"xaU" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/processing) +"xbm" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"xbZ" = ( +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + icon_state = "pipe-j1s"; + name = "Kitchen"; + sortType = "Kitchen" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "xdJ" = ( /obj/machinery/computer/shuttle_control/explore/tourbus, /obj/machinery/light/small{ @@ -32728,10 +32356,78 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"xjd" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"xkx" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 2; + layer = 3.3; + pixel_x = 0; + pixel_y = 26 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"xlW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"xmK" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "xoe" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled/white, /area/shuttle/tourbus/cockpit) +"xpJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"xvN" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/recreation_area_restroom) "xxJ" = ( /obj/structure/cable{ d1 = 2; @@ -32747,6 +32443,58 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"xyK" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + icon_state = "borderfloor"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) +"xAV" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + icon_state = "borderfloor"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) +"xEB" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "xHg" = ( /obj/random/cutout, /turf/simulated/floor/plating, @@ -32759,6 +32507,26 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/general) +"xIO" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "xJy" = ( /obj/structure/cable/green{ d1 = 4; @@ -32767,6 +32535,14 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"xUo" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "xZw" = ( /obj/structure/bed/chair{ dir = 8 @@ -32778,6 +32554,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"yet" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) (1,1,1) = {" aaa @@ -37438,8 +37220,8 @@ aOV aPf aNd aRa -aRX -aPF +iRX +kTn aSA aQR aTa @@ -37580,8 +37362,8 @@ aBu aRu aRI aRO -aSx -aSl +eFg +bKS aSD aSQ aTf @@ -38070,12 +37852,12 @@ aDs aDs aUw aVb -aDg -aDg -aDg -aVy -apS -aVP +iiv +tqY +tqY +haS +xpJ +orP aVQ alP aac @@ -38211,13 +37993,13 @@ aDk aDs aDs aUz -aVd -aVw +hxc +erS aDe aDe aDc aVA -apS +sDG akn alP aac @@ -38253,10 +38035,10 @@ aac aac aac acj -amu -aBV +sLa aCc -aGt +aCc +drR aCc aIp aIW @@ -38351,15 +38133,15 @@ aDf aDm aDl aDt -aDC -aUB -aDM +rEZ +dgA +cwI aDf aDT arW arW aVE -apS +aWF akn alP aac @@ -38395,10 +38177,10 @@ aac aac aac acj -akW -aFK -aBZ -aGr +tZw +dVE +cWe +hgf aVp aVp aVp @@ -38501,7 +38283,7 @@ aDc aDz agw air -apS +aWF akn alP aac @@ -38643,7 +38425,7 @@ aDS aac agw air -apS +aWF akn akS alw @@ -38785,7 +38567,7 @@ aac aac agw air -apS +aWF akn akS alx @@ -38927,7 +38709,7 @@ aac aac agw aVG -apS +aWF akn akS aly @@ -39069,7 +38851,7 @@ agw agw agw air -ajv +aWF akn akS ahq @@ -39210,8 +38992,8 @@ aac agw ahd ahS -ais -ajw +cpd +aWF akn akS alA @@ -39284,8 +39066,8 @@ aRr aRF aRp aRe -aSl -aSx +eFg +bKS aSJ aSY aTk @@ -39352,8 +39134,8 @@ aac agw agw agw -ait -ajx +air +aWF akn akS alB @@ -39426,8 +39208,8 @@ aRs aOG aOS aRV -aSh -aSy +pPs +lcS aSI aRM aRt @@ -39494,8 +39276,8 @@ aac agw abz abB -aeU -acZ +jJd +oEL akn akS alC @@ -39636,9 +39418,9 @@ aTV agw agw agw -aby -aDW -akn +xkx +vun +bhu akS alD amq @@ -39816,8 +39598,8 @@ afK afK aoy amT -aBp -aGq +obl +jAt azL aFN aBW @@ -39958,8 +39740,8 @@ ayr aBe afK aAm -aFM -aCf +cGt +cJL azL aBb aBW @@ -40100,8 +39882,8 @@ ayB aBg afK aAY -aFO -aCg +eJm +tRg azL aBc aBW @@ -40242,13 +40024,13 @@ ayB aBh aBj aCs -aFP -aCq -aAl -aBd -aCa -aJc -aJJ +mUE +tWn +aTe +uaN +aBW +iQr +gtp aKG aLl aLS @@ -40351,8 +40133,8 @@ aUe aiJ akT alE -amt -amS +sSK +amN amN amN amN @@ -40384,13 +40166,13 @@ ayN aAT aBw aCt -aCC -aCD -aCI -aFl -aBW -aBW -aJK +oUI +wrA +lgo +lSv +kuU +kuU +mWX aKE aLl aLT @@ -40493,8 +40275,8 @@ aUf akx akT acY +ueU arg -adK arg arg arg @@ -40525,9 +40307,9 @@ axO ayP auc afK -amV -aFR -aCK +kyC +jrn +feu azL aFQ aBW @@ -40635,8 +40417,8 @@ aWF aku akS aMS +jBB amv -amU amv amv amv @@ -40668,8 +40450,8 @@ ayT ayW afK aBi -aFS -aXv +mXu +kXo azL aBI aBW @@ -40772,13 +40554,13 @@ aTW aTW aTW agw -ack -ajF +kuQ +aWF akv akS alJ +jBB amv -amU anB aoa aot @@ -40810,8 +40592,8 @@ azl aFi afK aIq -aFS -aCr +mXu +lvH azL aoQ aCb @@ -40914,14 +40696,14 @@ aTW aTW aTW agw -dMP -ajG +fRH +aWF aWN akY akY -akZ -amW -anC +fxh +lqX +qqV akY akY akY @@ -40952,8 +40734,8 @@ azG afK afK ayR -aGu -aXM +ttH +txO azL azL azL @@ -41056,13 +40838,13 @@ aTW aTW aTW agw -acn -aWD +kuQ +aWF aNE akY alK -amw -aDX +oSv +aDZ aDZ aob aKv @@ -41094,8 +40876,8 @@ aAr ayu aFm aCB -aGv -aXS +qkf +dKj aGR aHI aHj @@ -41198,13 +40980,13 @@ agw agw agw agw -acV -apS +mjs +aWF akx akZ alL +giR amw -aDY amw amw aov @@ -41236,8 +41018,8 @@ aze azJ aze aBX -aXK -aXT +mel +iXM aAo aBL ahf @@ -41331,7 +41113,7 @@ acz abC afc aes -afp +tYE agO agS ahw @@ -41340,13 +41122,13 @@ aiL aiL aiL agw -aWl -aWE -akx +oAu +aWH +aWU akZ alL +giR amw -aDY amw amw aow @@ -41355,8 +41137,8 @@ app ajR aiD afj -auy -agF +rAe +sla afP awM afj @@ -41473,7 +41255,7 @@ acA adh afc aet -afq +xaU age ahv ahw @@ -41487,9 +41269,9 @@ ajM akx akZ amw -amw -amY -anD +txo +peS +weK aod aox aoV @@ -41497,8 +41279,8 @@ apq aiC avj aiH -apP -awm +opE +xvN afj afj afj @@ -41615,7 +41397,7 @@ acB adi afc aeu -afr +pJL age ahv ahw @@ -41630,8 +41412,8 @@ akx akZ alN amw -amX -amw +yet +olG amw amw akZ @@ -41757,7 +41539,7 @@ acC adp afc adg -afS +lsy age ahv ahw @@ -41772,8 +41554,8 @@ akx akZ alN amw -amZ -anE +yet +olG amw amw akZ @@ -41898,8 +41680,8 @@ abX acD adq afc -ahz -afT +cVg +bzK aWW aeJ ahw @@ -42350,8 +42132,8 @@ apT aqI ark ahc -arX -asu +wPD +avG apX agw aac @@ -42492,8 +42274,8 @@ aoX aqJ aoX aoX -arY -ajX +aix +avG apX alP aac @@ -42634,8 +42416,8 @@ apU aqK apv aoX -arZ -asv +juj +avG apX alP aac @@ -42776,30 +42558,30 @@ apV aqL arl aoX -ahs -asw -apX +uFI +isl +keX agw aac aac ats aPD ava -avy awa +cRi awG axc axR aAv aGC -aHl +pAh ayY aBR aBY azb azM aWj -aWk +bbG aXd aHQ aIx @@ -42918,30 +42700,30 @@ apV aqL arm aoX -ajC -asx +aix +avG apX alP aac aac aue auA -avb -avz -aEr +avC +rMS +hoQ aEr axd aEr aEr aEr -aoe +nLX aEr aEr auX azF azI azF -azF +lYT aGU aGV aAs @@ -43068,9 +42850,9 @@ aac aac aue akk -avc -avA -awc +avC +sSW +lpB awH axe awH @@ -43081,9 +42863,9 @@ aAu aBk aFj awC -axy +eQN aXe -aCE +fgW aGW aHR aAs @@ -43183,8 +42965,8 @@ ahZ aia akz akA -aUT -aVO +frq +jDC ajT aWn ajM @@ -43210,8 +42992,8 @@ aac aac ats auB -avd -avB +avC +bSe aff azP azP @@ -43325,8 +43107,8 @@ ahA aiT aiU ahx -aTE -aTI +eAM +oRG ajT aWs ajM @@ -43352,8 +43134,8 @@ ats ats ats auC -ave avC +bSe awe azP axU @@ -43467,8 +43249,8 @@ aef aiW akB aHS -aTF -agB +xAV +saK ajT aWt aWH @@ -43494,8 +43276,8 @@ ats atH auf auD -ave avC +jFz awf azP axV @@ -43609,8 +43391,8 @@ agP ahC aeK akF -aTG -aVR +pzH +gRX ajT aWu aWI @@ -43636,8 +43418,8 @@ ats ats ats auE -avf -avD +qvp +xlW awg azP axW @@ -43647,10 +43429,10 @@ azP aCH azT azT -aFq -aFv -aHe -aXg +aBs +azT +lxa +aEV axg aHa aHR @@ -43751,8 +43533,8 @@ ahF aiQ ajS aQX -aTH -aTJ +oCw +mRs aWc aWv aWJ @@ -43778,8 +43560,8 @@ att aOb aha auF -avg -ajX +nbM +nfl akx azP azP @@ -43789,10 +43571,10 @@ azP aIE aEP aEG -azT +aBs aFU aFU -aXh +aHc axg aHb aHR @@ -43893,7 +43675,7 @@ ahV aiR akw ahx -aVB +xyK aVT aWd aiV @@ -43920,8 +43702,8 @@ alh alh alh auG -avh -avE +kjn +ceN akx axi awd @@ -43931,10 +43713,10 @@ akM azT aEH aAA +aBs azT azT -azT -aXh +aHc axi aGX aHR @@ -44073,10 +43855,10 @@ azV azT aEI aEI -azT +aBs aGw aHg -aXi +cAG axk aXq aXn @@ -44211,14 +43993,14 @@ axS ayz azS ayz -aBr -aCJ -aCJ -aEV -azT -azT -azT -aXj +mXo +qfz +qfz +cSl +hEN +ayz +ayz +eIs axS aXr aXp @@ -44454,8 +44236,8 @@ acw acM adL adZ -aeE -afX +mzz +hLd agK ahE aid @@ -44596,13 +44378,13 @@ abR ada abS aaE -aeF -afY +dYX +orc agL aaE aie -aiZ -aTw +bxH +vQP aaE aaE aaE @@ -44738,14 +44520,14 @@ acy adb adV aaE -aeZ -afZ +ehN +uOc agM aaE aif -aDI -aUq -aUr +sWs +hYK +trA aUs aUt aWA @@ -45032,8 +44814,8 @@ aTK aVF aVW aWh -aWC -aWM +qIb +mFq baz aYV aEj @@ -45174,8 +44956,8 @@ agj agX aVn aeG -ajc -ajU +qIb +avG akn aYO aEv @@ -45316,8 +45098,8 @@ agk agX ahK aUU -ajd -ajV +qIb +avG akn aYO aZs @@ -45458,9 +45240,9 @@ agl agX ahL aUU -aje -ajW -akn +xIO +isl +bhu alo alo alo @@ -45601,7 +45383,7 @@ aVk ahM aVt ajf -ajX +avG akn alk aZt @@ -45743,7 +45525,7 @@ agY ahN aii aiV -ajY +jri akn bbq aZu @@ -45885,7 +45667,7 @@ aVl aVo aij ajg -ajX +avG akn alk bbs @@ -46027,7 +45809,7 @@ aVm aeG aeG ajh -ajX +avG akn alk alk @@ -46153,7 +45935,7 @@ aag aRK aaz abd -acf +fXv aed afy ahO @@ -46169,7 +45951,7 @@ aSP ahd ahS aji -ajX +avG akn alk bbt @@ -46311,7 +46093,7 @@ aSP agw agw aWi -ajX +avG akn bbq aZu @@ -46350,9 +46132,9 @@ aCR ayc aGd awP -aKm -aAx -aUn +jjp +fyZ +aUm aJn aAN aAN @@ -46453,7 +46235,7 @@ aSP aVq aVu aix -ajX +avG akn alk bbs @@ -46492,9 +46274,9 @@ awR awR awP awP -aHq -aId -aIH +jvN +suT +aIC aJn aAN aAN @@ -46595,7 +46377,7 @@ aSP auS aVu aix -ajX +avG akG aha aha @@ -46604,23 +46386,23 @@ aha aks apS aqQ -aqR +cFA aqR aZS aZZ anL axb viF -avk -axQ -aiX -baI -baR -baT -baT -bcY -avI -aws +vKm +nlf +wXr +vvA +myZ +myZ +myZ +dsF +avG +iGj awS axv axv @@ -46629,14 +46411,14 @@ alz aAd aAL aBB -aCk -aCS -aFz -aGe -aHp -aHr -aAe -aJq +hcY +bqy +axv +mtF +gqv +vdE +aHW +knU aJn aAN aAN @@ -46737,48 +46519,48 @@ aSP agw agw aix -ajZ +gTN akH akH akH akH -ani -anL -aoj -anL -apa -anL -aqe -anL -anL -anL -anL -asB -anL -bbB -atd -atJ -anL -anL -avm -avJ -awt -awT -awa -ayd -ayG -ayG -aAe -ayG -ayG -aCl -aCT -ayG -ayG -avZ -aHs -aIe -aKl +xEB +vJA +vJA +vJA +xmK +xUo +bqs +xUo +xUo +xUo +xUo +xbZ +xUo +fOj +ovI +jFq +akH +akH +akH +qZs +hPF +xbm +iBA +nui +aEr +aEr +xjd +aEr +aEr +aEr +hvt +azF +azF +gBG +azF +gAF +pgi aUo aKZ aTQ @@ -46884,27 +46666,27 @@ akI aMX ama amI -anj -anM -aok -aoD -apd +dmH +ple +ali +ali +bEd apC aqf aOT aqU arG apS -asC +ajX apS aEd -aTS -atK +cko +iLR auh auK aOg avn -avn +qWZ awU axw aye @@ -46914,12 +46696,12 @@ aAf axw axw axw -aCU +paT aCU aGf aIc aHt -aIf +gVg aII aUp aOQ @@ -47037,11 +46819,11 @@ aqT apc arH ash -asD +ate ash ate -atv -atL +kcK +ate ash auL avo @@ -47061,7 +46843,7 @@ avK arJ arJ aHu -aIg +sPd arJ arJ arJ @@ -47168,8 +46950,8 @@ akK alp amc aio -anl -anN +rXW +lXv aol alY alY @@ -47179,11 +46961,11 @@ agw apc arI asi -asE -asU -atf -atw -atM +fgi +byo +cqA +ccf +sYk aui auM arJ @@ -47200,10 +46982,10 @@ asX alM asX asX -aGg -aGD -aHv -aIh +iOg +dQt +sJC +hyh aIJ aJs aKn @@ -47310,8 +47092,8 @@ akL alq alq amJ -anm -anO +jCn +qQZ aol alZ alZ @@ -47324,7 +47106,7 @@ arJ asF asV atg -atx +dfq asF arJ arJ @@ -47342,10 +47124,10 @@ aBD aCo aBC aFA -aGh asX asX -aIi +asX +iBG aIK aJt aJt @@ -47452,8 +47234,8 @@ agN alr amd aio -ann -anP +eHk +ioG aom aXZ aYd @@ -47466,7 +47248,7 @@ asj asG asW asG -aty +dFb atN auj auN @@ -47478,16 +47260,16 @@ avp ayf ayI avp -aAh -aAP -aBC -aBC -aCW -aFA -aGi -aGE -aHw -aIj +vxO +kyb +nHF +oEU +duW +wGK +vrs +voS +cGR +epM aro aJt aKo @@ -47620,13 +47402,13 @@ aEk aEN aET aEW -aAi -avp -aBE -aCp -aCX -aFB -aGj +asX +asX +sSX +qOw +qCn +bqA +sJC aGF aHx aIk diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index e44e48a3a2..93ba1a3ff2 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -50,21 +50,6 @@ }, /turf/simulated/wall/r_wall, /area/space) -"aah" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "aai" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -108,22 +93,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"aal" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/door/firedoor/glass/hidden/steel, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "aam" = ( /obj/machinery/light/small{ dir = 8; @@ -662,26 +631,6 @@ "abk" = ( /turf/simulated/floor/reinforced, /area/engineering/engine_room) -"abl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "abm" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -1008,38 +957,6 @@ }, /turf/simulated/floor, /area/maintenance/substation/engineering) -"abO" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "abP" = ( /obj/machinery/light/small{ dir = 8; @@ -1105,24 +1022,6 @@ }, /turf/simulated/wall/r_wall, /area/engineering/engine_monitoring) -"abX" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "abY" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -1155,38 +1054,6 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"acc" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/atm{ - pixel_y = 30 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "acd" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; @@ -1203,37 +1070,6 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"acf" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "acg" = ( /turf/simulated/wall/r_wall, /area/engineering/engine_gas) @@ -1290,22 +1126,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"acq" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "acr" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -1327,21 +1147,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"acu" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "acv" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/cap/visible/scrubbers{ @@ -1349,27 +1154,6 @@ }, /turf/simulated/floor, /area/vacant/vacant_restaurant_lower) -"acw" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/computer/guestpass{ - dir = 4; - pixel_x = -28; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "acx" = ( /obj/structure/cable/green{ d1 = 2; @@ -1637,27 +1421,6 @@ /obj/random/drinkbottle, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"adj" = ( -/obj/structure/extinguisher_cabinet{ - dir = 4; - icon_state = "extinguisher_closed"; - pixel_x = -30 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "adk" = ( /obj/structure/railing{ dir = 1 @@ -1758,32 +1521,6 @@ }, /turf/simulated/floor, /area/vacant/vacant_restaurant_lower) -"adq" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "adr" = ( /obj/structure/flora/pottedplant, /obj/effect/floor_decal/corner/blue/full{ @@ -1795,24 +1532,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary) -"ads" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "adt" = ( /obj/structure/cable/green{ d1 = 1; @@ -2109,40 +1828,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"adU" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/engineering/hallway) -"adV" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "adW" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ @@ -2169,26 +1854,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) -"adZ" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/extinguisher_cabinet{ - dir = 4; - icon_state = "extinguisher_closed"; - pixel_x = -30 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "aea" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) @@ -2196,30 +1861,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"aec" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "aed" = ( /obj/machinery/computer/supplycomp, /turf/simulated/floor/tiled/dark, /area/bridge/secondary) -"aee" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "aef" = ( /obj/random/junk, /obj/random/trash, @@ -2278,27 +1923,6 @@ }, /turf/simulated/floor, /area/hallway/station/docks) -"aem" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "aen" = ( /turf/simulated/floor/tiled, /area/engineering/workshop) @@ -2524,68 +2148,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) -"aeD" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) -"aeE" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "aeF" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -2650,22 +2212,6 @@ /obj/random/tool, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"aeM" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "aeN" = ( /obj/machinery/alarm{ dir = 8; @@ -2743,23 +2289,6 @@ /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"aeV" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "aeW" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) @@ -2775,31 +2304,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary) -"aeZ" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "afa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -2996,27 +2500,6 @@ }, /turf/simulated/floor/tiled, /area/bridge/secondary) -"afm" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/structure/disposalpipe/segment, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = 24 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "afn" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -3489,22 +2972,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"afZ" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "aga" = ( /obj/machinery/floor_light/prebuilt{ on = 1 @@ -4161,16 +3628,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"agV" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "agW" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -4345,18 +3802,6 @@ }, /turf/simulated/floor/tiled, /area/bridge/secondary) -"ahi" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "ahj" = ( /obj/structure/cable{ d1 = 1; @@ -4711,33 +4156,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) -"ahM" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "ahN" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -4750,32 +4168,6 @@ }, /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) -"ahO" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "ahQ" = ( /obj/machinery/light{ dir = 4 @@ -4914,18 +4306,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/office) -"aig" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "aih" = ( /obj/structure/cable/green{ d1 = 4; @@ -5233,30 +4613,6 @@ /obj/item/clothing/glasses/meson, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) -"aiG" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 25; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "aiH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -5532,27 +4888,6 @@ }, /turf/simulated/floor/tiled, /area/gateway/prep_room) -"ajk" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/purple/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/purple/bordercorner2, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 1; - icon_state = "alarm0"; - pixel_y = -22 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "ajl" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1; @@ -5891,17 +5226,6 @@ }, /turf/simulated/floor/tiled, /area/gateway/prep_room) -"ajW" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "ajX" = ( /obj/machinery/light{ dir = 4; @@ -5963,25 +5287,6 @@ /obj/machinery/floodlight, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) -"ake" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "akf" = ( /obj/machinery/button/remote/blast_door{ id = "PubPrep"; @@ -6007,19 +5312,6 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway) -"aki" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "akj" = ( /obj/item/device/radio/intercom{ dir = 2; @@ -6212,17 +5504,6 @@ }, /turf/simulated/floor/tiled, /area/gateway/prep_room) -"akB" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "akC" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6257,15 +5538,6 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway) -"akI" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "akJ" = ( /obj/structure/window/reinforced{ dir = 4 @@ -6311,24 +5583,6 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) -"akN" = ( -/obj/machinery/door/airlock/multi_tile/metal{ - name = "Gateway Prep Room" - }, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "PubPrepFront"; - layer = 3.3; - name = "Gateway Prep Shutter" - }, -/obj/machinery/door/firedoor/glass, -/obj/effect/floor_decal/steeldecal/steel_decals_central1{ - dir = 8 - }, -/turf/simulated/floor/tiled/monofloor{ - dir = 8 - }, -/area/gateway/prep_room) "akO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -6344,39 +5598,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) -"akP" = ( -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "PubPrepFront"; - layer = 3.3; - name = "Gateway Prep Shutter" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/obj/effect/floor_decal/steeldecal/steel_decals_central1{ - dir = 4 - }, -/turf/simulated/floor/tiled/monofloor{ - dir = 4 - }, -/area/gateway/prep_room) -"akQ" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/purple/border, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/machinery/camera/network/tether{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "akR" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/briefcase/inflatable{ @@ -6408,62 +5629,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor, /area/engineering/storage) -"akU" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/button/remote/blast_door{ - id = "PubPrepFront"; - name = "Gateway Shutter"; - pixel_x = 24; - pixel_y = -23; - req_access = list(62) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/steeldecal/steel_decals6, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"akV" = ( -/obj/machinery/button/remote/blast_door{ - id = "PubPrepFront"; - name = "Gateway Shutter"; - pixel_x = -24; - pixel_y = 24; - req_access = list(62) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) -"akW" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "akX" = ( /obj/structure/cable/green{ d1 = 4; @@ -6481,27 +5646,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"akY" = ( -/obj/structure/closet/emcloset, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/purple/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/purple/bordercorner2{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "akZ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/engineering{ @@ -6569,19 +5713,6 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway) -"alf" = ( -/obj/structure/closet/emcloset, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/purple/border{ - dir = 6 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "alg" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass{ @@ -6983,37 +6114,6 @@ "alT" = ( /turf/simulated/wall, /area/storage/emergency_storage/emergency4) -"alU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) -"alV" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "dock_d2a1"; - name = "interior access button"; - pixel_x = -28; - pixel_y = 26; - req_one_access = list(13) - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "alW" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/steeldecal/steel_decals_central6{ @@ -7055,22 +6155,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"alZ" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "ama" = ( /obj/structure/table/marble, /obj/machinery/floor_light/prebuilt{ @@ -7091,15 +6175,6 @@ /obj/item/weapon/reagent_containers/spray/cleaner, /turf/simulated/floor/wood, /area/hallway/station/atrium) -"amb" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "amc" = ( /obj/structure/cable/green{ d1 = 4; @@ -7783,42 +6858,6 @@ "anp" = ( /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) -"anq" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) -"anr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "ans" = ( /obj/item/stack/tile/wood{ amount = 10 @@ -8363,22 +7402,6 @@ }, /turf/simulated/floor, /area/engineering/storage) -"aop" = ( -/obj/machinery/vending/cola{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "aoq" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -8392,15 +7415,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"aor" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "aos" = ( /obj/structure/cable/green{ d1 = 1; @@ -8628,23 +7642,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) -"aoZ" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "apa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -8654,30 +7651,6 @@ /obj/structure/table, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) -"apb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) -"apc" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "apd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8687,12 +7660,6 @@ }, /turf/simulated/floor/carpet, /area/maintenance/abandonedlibrary) -"ape" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/junction, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "apf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -11987,28 +10954,6 @@ }, /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) -"auN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/bridge/secondary/hallway) "auO" = ( /obj/structure/cable/green{ d1 = 1; @@ -12021,28 +10966,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/crew_quarters/sleep/cryo) -"auP" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 25; - pixel_y = 0 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_one) "auQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12093,25 +11016,6 @@ /obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/office) -"auV" = ( -/obj/structure/closet/emcloset, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/blue/bordercorner2{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/bridge/secondary/hallway) "auW" = ( /obj/machinery/atmospherics/omni/mixer{ tag_east = 1; @@ -12777,22 +11681,6 @@ /obj/machinery/camera/network/tether, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) -"awb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "awc" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 @@ -13066,25 +11954,6 @@ /obj/effect/floor_decal/corner/blue/bordercorner2, /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) -"awz" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/blue/border, -/turf/simulated/floor/tiled, -/area/bridge/secondary/hallway) -"awA" = ( -/obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/bridge/secondary/hallway) "awB" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -13117,21 +11986,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"awE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "awF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -13283,26 +12137,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"awP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass/hidden/steel, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "awQ" = ( /turf/simulated/wall/r_wall, /area/bridge/meeting_room) @@ -13592,15 +12426,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary/teleporter) -"axr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/obj/machinery/newscaster{ - pixel_x = -30 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "axs" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight/lamp/green{ @@ -13617,39 +12442,11 @@ /obj/random/trash_pile, /turf/simulated/floor, /area/crew_quarters/sleep/cryo) -"axu" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_one) -"axv" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_one) "axw" = ( /obj/machinery/light/small, /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled, /area/tether/station/stairs_one) -"axx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_one) "axy" = ( /obj/structure/cable/green{ d1 = 1; @@ -14286,24 +13083,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/station/docks) -"ayD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "ayE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14743,16 +13522,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/engineering/workshop) -"azf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "azg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14787,31 +13556,6 @@ /obj/machinery/computer/timeclock/premade/east, /turf/simulated/floor/tiled, /area/storage/tools) -"azj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 8 - }, -/obj/machinery/camera/network/tether{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "azk" = ( /obj/structure/cable/green{ d1 = 1; @@ -15184,14 +13928,6 @@ "azP" = ( /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) -"azQ" = ( -/obj/machinery/door/firedoor/glass/hidden/steel, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/camera/network/tether{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) "azR" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -15568,16 +14304,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"aAA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "aAB" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -15677,19 +14403,6 @@ /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"aAJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) "aAK" = ( /obj/structure/closet/wardrobe/black, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -15904,10 +14617,6 @@ /obj/structure/closet/secure_closet/engineering_chief, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) -"aBh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "aBi" = ( /turf/simulated/floor/tiled, /area/hallway/station/docks) @@ -15946,24 +14655,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_eva) -"aBm" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "dock_d1l"; - name = "interior access button"; - pixel_x = -28; - pixel_y = -26; - req_access = list(13) - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) "aBn" = ( /obj/machinery/alarm{ dir = 4; @@ -16101,17 +14792,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/workshop) -"aBz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) "aBA" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -16385,17 +15065,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) -"aBY" = ( -/obj/structure/bed/chair/comfy/black, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet/purcarpet, -/area/bridge/meeting_room) -"aBZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "aCa" = ( /obj/machinery/recharge_station, /obj/machinery/camera/network/engineering{ @@ -16477,26 +15146,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) -"aCj" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/camera/network/engineering{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "aCk" = ( /obj/effect/floor_decal/borderfloor{ dir = 8; @@ -16573,19 +15222,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"aCr" = ( -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "aCs" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -16745,12 +15381,6 @@ "aCF" = ( /turf/simulated/wall, /area/tether/station/dock_one) -"aCG" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/steel_grid, -/area/tether/station/dock_one) "aCH" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/warning/corner{ @@ -16781,12 +15411,6 @@ "aCK" = ( /turf/simulated/wall, /area/tether/station/dock_two) -"aCL" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/steel_grid, -/area/tether/station/dock_two) "aCM" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_engineering{ @@ -16920,11 +15544,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"aCW" = ( -/obj/structure/bed/chair/comfy/black, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet/purcarpet, -/area/bridge/meeting_room) "aCX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -16969,21 +15588,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/stairs_one) -"aDb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/sign/dock/one, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "aDc" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -17007,18 +15611,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"aDd" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "aDe" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -17039,20 +15631,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"aDf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "aDg" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -17102,97 +15680,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) -"aDk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) -"aDl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/item/device/radio/beacon, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) -"aDm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) -"aDn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) -"aDo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) -"aDp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/sign/dock/two, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "aDq" = ( /obj/structure/cable/green{ d1 = 1; @@ -17201,19 +15688,6 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"aDr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "aDs" = ( /obj/structure/cable/green{ d2 = 4; @@ -17228,25 +15702,6 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor, /area/maintenance/substation/civilian) -"aDt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "aDu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -17332,14 +15787,6 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/bridge/meeting_room) -"aDA" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/book/manual/security_space_law, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/carpet/purcarpet, -/area/bridge/meeting_room) "aDB" = ( /obj/structure/table/rack{ dir = 8; @@ -17350,14 +15797,6 @@ /obj/random/contraband, /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) -"aDC" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/folder/blue, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/carpet/purcarpet, -/area/bridge/meeting_room) "aDD" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/undies_wardrobe, @@ -17367,11 +15806,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"aDF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) "aDG" = ( /turf/simulated/floor/tiled, /area/tether/station/dock_one) @@ -17395,11 +15829,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"aDK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "aDL" = ( /turf/simulated/floor/tiled, /area/tether/station/dock_two) @@ -17436,18 +15865,6 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"aDO" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/tether/station/dock_one) "aDP" = ( /obj/structure/table/rack{ dir = 1 @@ -17473,16 +15890,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/storage/emergency_storage/emergency4) -"aDQ" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/tether/station/dock_two) "aDR" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -17496,16 +15903,6 @@ /obj/random/mre, /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) -"aDT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) "aDU" = ( /obj/machinery/power/apc{ dir = 4; @@ -17518,29 +15915,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"aDV" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) -"aDW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "aDX" = ( /obj/effect/floor_decal/rust, /obj/machinery/alarm{ @@ -17610,17 +15984,6 @@ }, /turf/simulated/floor, /area/bridge/meeting_room) -"aEd" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/turf/simulated/floor/carpet/purcarpet, -/area/bridge/meeting_room) -"aEe" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/folder/red, -/turf/simulated/floor/carpet/purcarpet, -/area/bridge/meeting_room) "aEf" = ( /obj/structure/cable/green{ d1 = 1; @@ -17681,33 +16044,6 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"aEl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) -"aEm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) -"aEn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "aEo" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -18016,14 +16352,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) -"aEN" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) -"aEO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "aEP" = ( /obj/machinery/computer/security/telescreen/entertainment{ desc = "Damn, looks like it's on the clown world channel. I wonder what else is on?"; @@ -18040,18 +16368,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/office) -"aEQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - desc = "Looks like it's set to GNN, I wonder what else is on?"; - icon_state = "frame"; - pixel_x = 0; - pixel_y = -32 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "aER" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -18177,36 +16493,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/storage/emergency_storage/emergency4) -"aFq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) -"aFr" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 25 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) -"aFt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "aFJ" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -18279,19 +16565,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/dock_one) -"aFV" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) -"aFW" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) "aFX" = ( /obj/structure/cable/green{ d1 = 1; @@ -18323,19 +16596,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/dock_two) -"aGa" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) -"aGb" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "aGs" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -18378,29 +16638,9 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"aGz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/floor_decal/sign/dock/one, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) "aGB" = ( /turf/simulated/wall/r_wall, /area/engineering/engineering_airlock) -"aGF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/floor_decal/sign/dock/two, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "aGI" = ( /obj/structure/cable{ d1 = 1; @@ -18438,13 +16678,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/dock_one) -"aHa" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) "aHc" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -18452,42 +16685,11 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/dock_two) -"aHd" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "aHe" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) -"aHt" = ( -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) -"aHv" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass/hidden/steel, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) -"aHw" = ( -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "aHQ" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1379; @@ -18537,15 +16739,6 @@ }, /turf/space, /area/space) -"aIc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "aIf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18637,37 +16830,6 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"aIs" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) -"aIy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/item/device/radio/beacon, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) "aIA" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -18677,34 +16839,9 @@ }, /turf/simulated/floor/plating, /area/tether/station/dock_two) -"aIM" = ( -/obj/effect/floor_decal/sign/dock/one, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) "aIO" = ( /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) -"aIR" = ( -/obj/effect/floor_decal/sign/dock/two, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) -"aIU" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) -"aIY" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) "aJh" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -18826,6 +16963,22 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) +"aJD" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_engineering{ + name = "Engineering Hallway"; + req_one_access = list(10) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/foyer) "aJV" = ( /obj/structure/closet/crate, /obj/item/weapon/circuitboard/smes, @@ -19325,34 +17478,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"aMh" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "aMj" = ( /obj/structure/cable/green{ d1 = 1; @@ -19372,31 +17497,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"aMk" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/structure/disposalpipe/sortjunction{ - dir = 2; - name = "CE Office"; - sortType = "CE Office" - }, -/turf/simulated/floor/tiled, -/area/engineering/hallway) "aMl" = ( /obj/machinery/light/small{ dir = 8; @@ -19458,6 +17558,10 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"aMy" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/floor/carpet/purcarpet, +/area/bridge/meeting_room) "aMB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -19560,30 +17664,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engineering_monitoring) -"aNF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass_engineering{ - name = "Engineering Hallway"; - req_one_access = list(10) - }, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/foyer) -"aNH" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass_engineering{ - name = "Engineering Hallway"; - req_one_access = list(10) - }, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/foyer) "aOj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /obj/structure/railing{ @@ -19683,25 +17763,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) -"aPj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/engineering/foyer) "aPq" = ( /obj/structure/bed/chair, /obj/machinery/light{ @@ -19730,6 +17791,23 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) +"aPU" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "aQa" = ( /obj/structure/table/rack{ dir = 8; @@ -19826,25 +17904,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer) -"aQJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/engineering/foyer) "aQQ" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -19868,18 +17927,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer) -"aQW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/engineering/foyer) "aQX" = ( /obj/structure/cable/green{ d1 = 4; @@ -20088,16 +18135,6 @@ /obj/item/weapon/pen/red, /turf/simulated/floor/tiled, /area/engineering/foyer) -"aSF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/engineering/foyer) "aSL" = ( /obj/machinery/alarm{ dir = 1; @@ -20264,20 +18301,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"aUm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/engineering/foyer) "aUo" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -20427,22 +18450,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) -"aWd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/engineering/foyer) "aWj" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -20537,29 +18544,6 @@ /obj/item/weapon/deck/cards, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) -"aXY" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "englockdown"; - name = "Engineering Lockdown"; - opacity = 0 - }, -/obj/machinery/door/airlock/glass_engineering{ - name = "Engineering Lobby"; - req_one_access = newlist() - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/foyer) "aXZ" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -20594,23 +18578,6 @@ }, /turf/simulated/floor/plating, /area/engineering/foyer) -"aYc" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "englockdown"; - name = "Engineering Lockdown"; - opacity = 0 - }, -/obj/machinery/door/airlock/glass_engineering{ - name = "Engineering Lobby"; - req_one_access = newlist() - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/foyer) "aYf" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/zpipe/down{ @@ -20692,22 +18659,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) -"aZq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "aZr" = ( /obj/machinery/computer/atmos_alert, /obj/structure/window/reinforced{ @@ -20738,16 +18689,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"aZW" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/structure/disposalpipe/junction, -/turf/simulated/floor/tiled, -/area/engineering/foyer) "baA" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/reinforced, @@ -20808,6 +18749,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, /area/crew_quarters/sleep/cryo) +"bbb" = ( +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/station/dock_one) "bbs" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -20836,6 +18790,25 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"bcc" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "bch" = ( /obj/structure/cable/green{ d1 = 1; @@ -20973,25 +18946,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals6, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"bdn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "bdq" = ( /obj/structure/cable{ d1 = 4; @@ -21197,28 +19151,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"bdW" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/structure/cable{ - 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/borderfloor/corner, -/obj/effect/floor_decal/corner/lightgrey/bordercorner, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "bdZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21270,11 +19202,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer) -"beN" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, -/area/engineering/foyer) "beS" = ( /obj/structure/cable/green{ d1 = 1; @@ -21378,69 +19305,10 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer) -"bgE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/engineering/foyer) "bgF" = ( /obj/structure/stairs/east, /turf/simulated/floor/tiled, /area/engineering/foyer) -"bgH" = ( -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_one) -"bgJ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/sign/directions/engineering{ - dir = 1; - pixel_y = 32; - pixel_z = -8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_one) "bhc" = ( /obj/structure/extinguisher_cabinet{ dir = 4; @@ -21598,15 +19466,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/crew_quarters/sleep/cryo) -"biC" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_one) "biK" = ( /obj/structure/table/standard, /obj/random/tech_supply, @@ -21623,15 +19482,6 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled, /area/storage/tools) -"bjb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/holoposter{ - pixel_y = -30 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "bkp" = ( /obj/machinery/vending/assist{ dir = 4 @@ -21704,6 +19554,14 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"bne" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "bnl" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9; @@ -21767,6 +19625,15 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"boV" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "bpd" = ( /obj/structure/cable/green{ d1 = 4; @@ -21907,6 +19774,49 @@ /obj/random/tool, /turf/simulated/floor, /area/hallway/station/docks) +"bqK" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"bqT" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23; + pixel_y = 0 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "brV" = ( /obj/structure/cable/green{ d1 = 1; @@ -21987,23 +19897,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) -"bvu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - dir = 2; - pixel_y = -24 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) -"bvE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "bwb" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -22030,15 +19923,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) -"byE" = ( -/obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) "byP" = ( /obj/machinery/light{ dir = 4; @@ -22065,6 +19949,22 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/dock_two) +"bzw" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "englockdown"; + name = "Engineering Lockdown"; + opacity = 0 + }, +/obj/machinery/door/airlock/glass_engineering{ + name = "Engineering Lobby"; + req_one_access = newlist() + }, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/foyer) "bzR" = ( /obj/structure/flora/pottedplant, /obj/machinery/status_display{ @@ -22072,20 +19972,15 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"bBo" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +"bAM" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/blue/border, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 5 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/bridge/secondary/hallway) "bCg" = ( /obj/machinery/alarm{ pixel_y = 22 @@ -22093,16 +19988,6 @@ /obj/structure/flora/pottedplant, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"bDr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/extinguisher_cabinet{ - dir = 8; - icon_state = "extinguisher_closed"; - pixel_x = 30 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "bEW" = ( /obj/structure/flora/pottedplant, /obj/machinery/newscaster{ @@ -22117,29 +20002,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"bFE" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -23; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) -"bFH" = ( -/obj/machinery/alarm{ - dir = 8; - icon_state = "alarm0"; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "bGo" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -22222,35 +20084,6 @@ /obj/effect/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) -"bHy" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "dock_d1a2"; - name = "interior access button"; - pixel_x = -28; - pixel_y = 26; - req_one_access = list(13) - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) -"bHz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) "bHG" = ( /obj/machinery/door/airlock/glass_external, /obj/machinery/access_button{ @@ -22295,25 +20128,6 @@ /obj/effect/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_two) -"bHV" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" - }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "dock_d2a2"; - name = "interior access button"; - pixel_x = -28; - pixel_y = 26; - req_one_access = list(13) - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "bJl" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -22353,21 +20167,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"bPc" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "bPj" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -22439,22 +20238,6 @@ /obj/effect/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) -"bPs" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "dock_d1a1"; - name = "interior access button"; - pixel_x = -28; - pixel_y = 26; - req_one_access = list(13) - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden, -/turf/simulated/floor/tiled, -/area/tether/station/dock_one) "bPt" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -22519,23 +20302,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/tether/station/dock_two) -"bPF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) -"bPN" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "bPO" = ( /obj/machinery/light{ dir = 4; @@ -22561,12 +20327,6 @@ /obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) -"bPY" = ( -/obj/machinery/door/airlock/glass_external, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/dark, -/area/tether/station/dock_one) "bQa" = ( /turf/simulated/floor, /area/tether/station/stairs_one) @@ -22581,35 +20341,6 @@ /obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"bQe" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" - }, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 8; - frequency = 1380; - id_tag = "dock_d1l"; - pixel_x = 28 - }, -/turf/simulated/floor/tiled/dark, -/area/tether/station/dock_one) -"bQj" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" - }, -/turf/simulated/floor/tiled/dark, -/area/tether/station/dock_one) "bQk" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 4; @@ -22823,16 +20554,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer) -"bXK" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/engineering/foyer) "bYg" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -23043,6 +20764,14 @@ /obj/machinery/power/thermoregulator, /turf/simulated/floor, /area/engineering/storage) +"ceq" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_engineering{ + name = "Engineering Hallway"; + req_one_access = list(10) + }, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/foyer) "chD" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -23057,6 +20786,30 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) +"cix" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "col" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -23087,6 +20840,15 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) +"cuX" = ( +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "cwR" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -23108,6 +20870,11 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) +"cEA" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "cRa" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -23142,6 +20909,48 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/gravity_gen) +"cTd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/holoposter{ + pixel_y = -30 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"cYF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"dbZ" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "dls" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -23237,6 +21046,48 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"dzP" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"dJG" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/purple/border, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/purple/bordercorner2, +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "dJL" = ( /obj/machinery/light{ dir = 4 @@ -23255,6 +21106,14 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"dQD" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/folder/red, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/bridge/meeting_room) "dRy" = ( /obj/machinery/lapvend{ dir = 4 @@ -23270,6 +21129,34 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"dZO" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/book/manual/security_space_law, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet/purcarpet, +/area/bridge/meeting_room) +"ejF" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner{ + dir = 1; + icon_state = "bordercolorcorner" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "ezX" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -23288,6 +21175,28 @@ }, /turf/space, /area/space) +"eKE" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"eMS" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "eYw" = ( /obj/effect/floor_decal/borderfloor{ dir = 8; @@ -23334,6 +21243,111 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) +"fil" = ( +/obj/structure/extinguisher_cabinet{ + dir = 8; + icon_state = "extinguisher_closed"; + pixel_x = 30 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +"fjd" = ( +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/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 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_one) +"fkj" = ( +/obj/machinery/newscaster{ + pixel_x = -30 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"foG" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"fqP" = ( +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/apc; + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"fyk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +"fAr" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "dock_d1a1"; + name = "interior access button"; + pixel_x = -28; + pixel_y = 26; + req_one_access = list(13) + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "fEF" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -23346,6 +21360,71 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) +"fGO" = ( +/obj/item/device/radio/beacon, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"fID" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"fLx" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4; + icon_state = "borderfloorcorner2"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/purple/bordercorner2{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"fMv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) +"fTF" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/camera/network/engineering{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "fUR" = ( /obj/effect/floor_decal/borderfloor{ dir = 1; @@ -23366,6 +21445,29 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) +"fXG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/gateway/prep_room) +"gaW" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "ghJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 8; @@ -23382,6 +21484,65 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) +"gkN" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/structure/disposalpipe/sortjunction{ + dir = 2; + name = "CE Office"; + sortType = "CE Office" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"gnq" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/structure/disposalpipe/junction, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) +"gBl" = ( +/obj/effect/floor_decal/sign/dock/two, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4; + icon_state = "map" + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "gHF" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; @@ -23392,6 +21553,24 @@ }, /turf/simulated/wall/r_wall, /area/engineering/gravity_lobby) +"gOd" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "dock_d2a2"; + name = "interior access button"; + pixel_x = -28; + pixel_y = 26; + req_one_access = list(13) + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "gOT" = ( /obj/effect/floor_decal/borderfloor{ dir = 8; @@ -23418,6 +21597,95 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) +"gSN" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"gUX" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4; + icon_state = "map" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"gVb" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/folder/blue, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/bridge/meeting_room) +"gVL" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"gVQ" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) +"huy" = ( +/obj/machinery/door/airlock/multi_tile/metal{ + name = "Gateway Prep Room" + }, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "PubPrepFront"; + layer = 3.3; + name = "Gateway Prep Shutter" + }, +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/steeldecal/steel_decals_central1{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/monofloor{ + dir = 8 + }, +/area/gateway/prep_room) "hxy" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 9 @@ -23437,6 +21705,45 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"hAh" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/door/firedoor/glass/hidden/steel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"hDB" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 24 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "hGr" = ( /obj/machinery/light, /obj/effect/floor_decal/borderfloor{ @@ -23451,6 +21758,28 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) +"hKn" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) +"hLV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) "hPi" = ( /obj/machinery/light/small, /turf/simulated/floor, @@ -23511,10 +21840,101 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"ipk" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 8; + frequency = 1380; + id_tag = "dock_d1l"; + pixel_x = 28 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4; + icon_state = "map" + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_one) +"iIr" = ( +/obj/machinery/alarm{ + dir = 8; + pixel_x = 25; + pixel_y = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + icon_state = "borderfloor"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_one) "iOq" = ( /obj/effect/floor_decal/techfloor/orange, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/gravity_gen) +"iPb" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/bridge/meeting_room) +"iVA" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/extinguisher_cabinet{ + dir = 4; + icon_state = "extinguisher_closed"; + pixel_x = -30 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"iWU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/bluegrid, +/area/gateway/prep_room) +"jbc" = ( +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "jcJ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 @@ -23528,10 +21948,62 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_lobby) +"jln" = ( +/obj/effect/floor_decal/sign/dock/one, +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) +"jtH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) +"juf" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "juI" = ( /obj/random/cutout, /turf/simulated/floor, /area/maintenance/station/abandonedholodeck) +"jBX" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"jFv" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "jIo" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -23582,6 +22054,84 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) +"jOH" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"jPK" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"jVj" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/purple/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/camera/network/tether{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"jXa" = ( +/obj/effect/floor_decal/sign/dock/two, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4; + icon_state = "map" + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "jXR" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -23589,6 +22139,21 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"jYc" = ( +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "PubPrepFront"; + layer = 3.3; + name = "Gateway Prep Shutter" + }, +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/steeldecal/steel_decals_central1{ + dir = 4 + }, +/turf/simulated/floor/tiled/monofloor{ + dir = 4 + }, +/area/gateway/prep_room) "klO" = ( /obj/structure/window/reinforced{ dir = 8 @@ -23596,6 +22161,13 @@ /obj/machinery/door/window/northleft, /turf/simulated/floor/outdoors/grass/forest, /area/crew_quarters/heads/chief) +"knR" = ( +/obj/machinery/door/firedoor/glass/hidden/steel, +/obj/machinery/camera/network/tether{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "kth" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -23618,6 +22190,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"kzv" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "kCH" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -23625,6 +22203,18 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/tether/station/dock_one) +"kHi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) +"kJJ" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "kLN" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -23647,6 +22237,17 @@ /obj/effect/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) +"kRp" = ( +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "kWQ" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -23668,10 +22269,111 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"kZv" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "dock_d1l"; + name = "interior access button"; + pixel_x = -28; + pixel_y = -26; + req_access = list(13) + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "lfK" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"lhz" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"lnN" = ( +/obj/effect/floor_decal/sign/dock/two, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"lpr" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"lzl" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "dock_d2a1"; + name = "interior access button"; + pixel_x = -28; + pixel_y = 26; + req_one_access = list(13) + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +"lCi" = ( +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_one) "lCO" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -23709,6 +22411,28 @@ }, /turf/simulated/floor/plating, /area/tether/station/dock_one) +"lGX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"lLY" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "lTD" = ( /obj/machinery/light, /obj/effect/floor_decal/borderfloor{ @@ -23753,6 +22477,40 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/gravity_gen) +"mvZ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"mzB" = ( +/obj/item/device/radio/beacon, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) +"mAd" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "mNU" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -23762,6 +22520,24 @@ }, /turf/simulated/floor/plating, /area/tether/station/dock_one) +"mPj" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "dock_d1a2"; + name = "interior access button"; + pixel_x = -28; + pixel_y = 26; + req_one_access = list(13) + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "mPs" = ( /obj/effect/floor_decal/borderfloor{ dir = 8; @@ -23774,6 +22550,40 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) +"mYV" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"nll" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) "nov" = ( /obj/structure/railing, /obj/structure/table/rack{ @@ -23785,6 +22595,18 @@ /obj/random/tech_supply, /turf/simulated/floor, /area/engineering/shaft) +"nqV" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "nCV" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 4 @@ -23802,6 +22624,24 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"nSf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +"nYL" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23; + pixel_y = 0 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "obA" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 8 @@ -23844,6 +22684,35 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) +"oil" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"oqY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "ort" = ( /obj/effect/floor_decal/borderfloor{ dir = 8; @@ -23866,6 +22735,31 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) +"oso" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "oxr" = ( /obj/effect/floor_decal/techfloor, /obj/structure/window/reinforced{ @@ -23873,19 +22767,118 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"oEH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +"oxI" = ( +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/station/dock_two) +"oAK" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/junction/yjunction, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"oFB" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_one) +"oIV" = ( +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) +"oOm" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1; + icon_state = "warningcorner" + }, +/turf/simulated/floor/tiled, +/area/gateway/prep_room) +"oTn" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/station/docks) +"oYk" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "oZb" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/engineering/gravity_lobby) +"pbJ" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "pbR" = ( /obj/effect/floor_decal/borderfloor{ dir = 8; @@ -23918,6 +22911,31 @@ /obj/effect/floor_decal/corner/yellow/border, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) +"pyX" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 25 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) +"pAf" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/gateway/prep_room) "pQN" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -23928,6 +22946,29 @@ }, /turf/space, /area/space) +"pSI" = ( +/obj/structure/extinguisher_cabinet{ + dir = 4; + icon_state = "extinguisher_closed"; + pixel_x = -30 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "pXr" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 @@ -23950,6 +22991,19 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) +"qdM" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_one) "qer" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -23971,6 +23025,42 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) +"qpN" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/computer/guestpass{ + dir = 4; + pixel_x = -28; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"qsp" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "quP" = ( /obj/machinery/light{ dir = 4 @@ -24026,6 +23116,41 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_lobby) +"riO" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"rrD" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"rsp" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "rxE" = ( /obj/structure/sign/department/gravi{ pixel_x = 32 @@ -24092,9 +23217,97 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) +"rCQ" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) "rEb" = ( /turf/simulated/wall/r_wall, /area/engineering/gravity_lobby) +"rFi" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 25; + pixel_y = 0 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"rIz" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) +"rKn" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"rYh" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/atm{ + pixel_y = 30 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"saN" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/bridge/meeting_room) "sbX" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -24141,6 +23354,24 @@ icon_state = "techmaint" }, /area/engineering/gravity_lobby) +"siQ" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "sjw" = ( /obj/structure/cable{ d1 = 4; @@ -24173,6 +23404,91 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"stL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/bridge/secondary/hallway) +"syI" = ( +/obj/structure/bed/chair/comfy/black, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet/purcarpet, +/area/bridge/meeting_room) +"sFB" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_one) +"sFI" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) +"sRG" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "sTb" = ( /obj/effect/floor_decal/borderfloor{ dir = 8; @@ -24184,12 +23500,137 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) +"sUy" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass/hidden/steel, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) "sUY" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"sVZ" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"sXl" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"sYw" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"tal" = ( +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"tlm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) +"tlG" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"tpy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) +"tqW" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_one) "tsV" = ( /obj/machinery/light{ dir = 8 @@ -24199,6 +23640,39 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"tAQ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1; + icon_state = "warning" + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8; + icon_state = "warningcorner" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/gateway/prep_room) +"tCY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) "tCZ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -24229,6 +23703,74 @@ /obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) +"tOr" = ( +/obj/machinery/camera/network/command{ + dir = 9; + icon_state = "camera" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/bridge/secondary/hallway) +"tUh" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/obj/machinery/camera/network/tether{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"ufa" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/vending/cola{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"uhb" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) "uhN" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/yellow/bordercorner, @@ -24240,6 +23782,20 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) +"uMr" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "uOm" = ( /obj/structure/cable{ d1 = 1; @@ -24251,6 +23807,44 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) +"uTq" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "englockdown"; + name = "Engineering Lockdown"; + opacity = 0 + }, +/obj/machinery/door/airlock/glass_engineering{ + name = "Engineering Lobby"; + req_one_access = newlist() + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/foyer) +"uTu" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + id = "PubPrepFront"; + name = "Gateway Shutter"; + pixel_x = 24; + pixel_y = -23; + req_access = list(62) + }, +/obj/effect/floor_decal/steeldecal/steel_decals6, +/turf/simulated/floor/tiled, +/area/gateway/prep_room) "uUL" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -24266,6 +23860,21 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) +"uWX" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) "uZh" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -24289,6 +23898,77 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/tether/station/dock_one) +"vdb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's set to GNN, I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = -32 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"vhV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"vmb" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"vms" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "vmt" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -24317,6 +23997,38 @@ /mob/living/simple_mob/animal/passive/bird/parrot/poly, /turf/simulated/floor/outdoors/grass/forest, /area/crew_quarters/heads/chief) +"vzc" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"vAn" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) "vAQ" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -24370,6 +24082,22 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_lobby) +"vQf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + dir = 2; + pixel_y = -24 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) "vYM" = ( /obj/effect/floor_decal/borderfloor{ dir = 8; @@ -24394,12 +24122,70 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) +"wbY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1"; + pixel_y = 0 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"wlB" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "wlD" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, /obj/structure/window/reinforced/full, /turf/simulated/floor/plating, /area/tether/station/dock_one) +"wAB" = ( +/obj/effect/floor_decal/sign/dock/one, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4; + icon_state = "map" + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) +"wBw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "wDo" = ( /obj/structure/cable{ d1 = 1; @@ -24409,6 +24195,18 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"wHG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) "xdE" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/gravity_gen) @@ -24419,6 +24217,16 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"xgd" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "xiv" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -24429,6 +24237,91 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"xmh" = ( +/obj/machinery/button/remote/blast_door{ + id = "PubPrepFront"; + name = "Gateway Shutter"; + pixel_x = -24; + pixel_y = 24; + req_access = list(62) + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"xpA" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"xqo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"xDA" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass/hidden/steel, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +"xDU" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/sign/directions/engineering{ + dir = 1; + pixel_y = 32; + pixel_z = -8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + icon_state = "borderfloor"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_one) +"xEm" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "xEU" = ( /obj/machinery/door/airlock/maintenance_hatch{ frequency = 1379; @@ -24467,6 +24360,83 @@ /obj/structure/railing, /turf/simulated/floor, /area/engineering/shaft) +"xQP" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) +"xRx" = ( +/obj/effect/floor_decal/sign/dock/one, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"xTB" = ( +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +"ycu" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/bridge/secondary/hallway) +"yiT" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) +"yje" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "ykG" = ( /obj/structure/cable{ d1 = 1; @@ -29826,27 +29796,27 @@ bYj awu aCv btt -axr -aCG -byE -aDE -aDE -aDE -bFE -aFV -bHy -aHa -azQ -aDE -aDE -aDE -bFE -aFV -bPs -aIU -aBm -bPY -bQj +fkj +aCI +eMS +aDG +aDG +aDG +bqT +gVQ +mPj +jFv +knR +aDG +aDG +rIz +nYL +gVQ +fAr +rsp +kZv +bPX +sFB aBQ bQz aaa @@ -29967,28 +29937,28 @@ bYj bYj awu bzR -aDb -aDr -aDO -aDT -aDF -aEl -aEN -aFq -aFW -aGz -aDF -aHt -aDF -aEl -aEN -aIy -aFW -aIM -aDG -aIY -bPX -bQe +xRx +sXl +bbb +vms +fMv +fMv +tlm +xgd +tlm +wAB +fMv +oIV +fMv +fMv +jtH +mzB +aDE +jln +aDE +cEA +tqW +ipk bQm bQx aaa @@ -30109,22 +30079,22 @@ bYl bYj aeF bZZ -aDd -aBZ +rCQ +xqo aCI aDU aDG -aEm -aDF -aFr -aDF -bHz +aDG +aDG +pyX +aDG +aDG aDG bKo aDG -aEm -aDF -bHz +aDG +kJJ +aDG aEk aEo aEp @@ -30251,8 +30221,8 @@ bZD bZm aeF aAV -aDf -bvu +rKn +vQf aCF aCF aDH @@ -30393,8 +30363,8 @@ bZD bYj aeF aAV -aDf -aEQ +rKn +vdb awu aaa aaa @@ -30535,8 +30505,8 @@ bYj bYl awu bCg -aDf -aBZ +rKn +vhV aCJ aaa aaa @@ -30677,8 +30647,8 @@ bYl bZk aeI aBi -aDf -aBZ +rKn +vhV aCJ aaa aaa @@ -30783,8 +30753,8 @@ aiM aac acz anL -aop -aoZ +xQP +ufa apB aqq arE @@ -30819,8 +30789,8 @@ bYj bYj aeR aBi -aDf -aBZ +rKn +vhV aCJ aaa aaa @@ -30925,8 +30895,8 @@ aiM aac acz anP -aor -apc +nqV +mvZ apI aqD arK @@ -30961,8 +30931,8 @@ bYj bYj awu awH -aDf -oEH +rKn +hLV awu aaa aaa @@ -31067,8 +31037,8 @@ aiM aac acz aad -aoq -apb +gVL +atW apJ afG aqN @@ -31103,8 +31073,8 @@ aws aws aws aAZ -aDk -aBZ +rCQ +xqo awu aaa aaa @@ -31209,8 +31179,8 @@ aiM aac acz aow -aoq -apb +gVL +atW apK aqF aqN @@ -31245,8 +31215,8 @@ aCp aCZ aws aBa -aDf -aBZ +rKn +vhV aCJ aaa aaa @@ -31351,8 +31321,8 @@ aiM aac acz alR -aoq -apb +gVL +atW apJ aqE acS @@ -31379,16 +31349,16 @@ agQ adX bdi aEy -axu -axv +qdM +axR aws azN aCm aDa aws aBb -aDl -aBZ +fGO +fID aCJ aaa aaa @@ -31493,8 +31463,8 @@ aiM aac acz alW -aoq -apb +gVL +atW apJ aqQ arV @@ -31521,7 +31491,7 @@ agR adX bdq bfJ -bgJ +xDU axw axQ aws @@ -31529,8 +31499,8 @@ aws aws aws bEW -aDf -aBZ +rKn +wHG aCJ aaa aaa @@ -31635,8 +31605,8 @@ aiM acz anl adA -afZ -apb +ejF +atW apJ aqO arT @@ -31651,28 +31621,28 @@ aEx aCR aIi atW -aMh -aNF -aPj -aQJ -aSF -aUm -aWd -aXY -aZq -aec -bdn +mYV +ceq +vAn +tpy +aoI +kHi +hKn +bzw +jBX +agj +sRG aws -bgH -axx +fjd +oFB axR ayy aws bQa aws aCz -aDf -bjb +rKn +cTd awu aaa aaa @@ -31762,23 +31732,23 @@ acz aaN adv aby -abO -acu -ads -adU -aeE -acu -acu -aah -acu -ahO -adV -adZ -ads -aal -amb -anr -ape +bqK +bcc +bcc +bcc +pbJ +bcc +bcc +lpr +bcc +vmb +bcc +iVA +bcc +hAh +qsp +oAK +aKt apM aqS aqT @@ -31793,28 +31763,28 @@ aKt aKt aKt aKt -aMk -aNH -aZW -aQW -beN -bgE -bXK -aYc -agV -aee -bdu +gkN +aJD +gnq +sFI +uhb +uWX +yiT +uTq +aPU +eKE +jPK aws -auP -biC +iIr +lCi axR ayy aws bQa aws aAV -aDf -oEH +rKn +hLV awu aaa aaa @@ -31904,22 +31874,22 @@ acz acR adu abx -abl -acq -adq -acq -aeD -aeV -afm -aCj -aeV -ahM -aiG -aeV -ake -akW -alZ -anq +uMr +riO +sYw +riO +oil +dbZ +hDB +fTF +dbZ +oso +rFi +dbZ +dbZ +siQ +gaW +juf aoB apL aqR @@ -31955,8 +31925,8 @@ aws aws aws aBd -aDf -aBZ +rKn +vhV aCJ aaa aaa @@ -32097,8 +32067,8 @@ azh azO awt aAV -aDf -aBZ +rKn +vhV aCJ aaa aaa @@ -32239,8 +32209,8 @@ alS azO awt aCY -aDm -aBZ +foG +vhV aCJ aaa aaa @@ -32381,8 +32351,8 @@ azi bpv awt aBf -aDn -aBZ +xpA +fID awu aaa aaa @@ -32523,8 +32493,8 @@ awu awu awu bFf -aDf -bvu +rKn +vQf aCK aCK bzq @@ -32660,30 +32630,30 @@ arf bhc axC awc -ayD -azj -awb -awP -aBh -aDo -bvE -aCL -aDV -aDJ -aDJ -aDJ -aDJ -aGa -bHV -aHd -aHv -aDJ -aDJ -aDJ -aDJ -aGa -alV -bPN +tCY +tUh +gSN +sUy +aBi +rKn +cYF +aCN +xTB +aDL +aDL +aDL +aDL +xEm +gOd +oYk +xDA +aDL +aDL +aDL +aDL +boV +lzl +oYk aCO aFZ bzq @@ -32796,36 +32766,36 @@ aik aik agb agZ -aim -aig +acp +lLY aug auQ avk awd -awE -aAA -aAA -aCr -aAA -aDp -aDt -aDQ -aDW -aDK -aEn -aEO -aFt -aGb -aGF -aDK -aHw -aDK -aEn -aEO -aFt -aGb -aIR -bPF +oTn +nll +nll +tal +nll +lnN +gUX +oxI +wBw +fyk +oqY +bne +bne +wlB +gBl +fyk +cuX +fyk +fyk +fyk +fyk +nSf +jXa +aDJ bXm bQc bQk @@ -32938,8 +32908,8 @@ aUE aqs afC ahb -acp -bdW +aim +vzc ijz awZ aDc @@ -32954,18 +32924,18 @@ aDu aCN byP aDL -bBo -bDr -bFH -aDK -azf +jbc +fil +bPl +kzv +aDL aDL aCA aDL -aIc -bDr -bPc -bPl +aDL +fil +jbc +kRp aDL bPO bPS @@ -34626,24 +34596,24 @@ aOU psh plz afC -abX -acw -adj -aem -aeZ -aIs -aeM -adH -adH -adH -adH -adH -adH -adH -adH -ahi -acp -atM +cix +qpN +pSI +dzP +fqP +wbY +lhz +yje +yje +yje +yje +yje +yje +yje +yje +mAd +lGX +sVZ afI ahQ aif @@ -34768,7 +34738,7 @@ inf fEF plz afC -acc +rYh acN adB aeK @@ -34910,7 +34880,7 @@ mqL cEi plz afC -acf +jOH acn adz acy @@ -36085,10 +36055,10 @@ ayE ayE aAo ayE -aAJ -aBY -aDA -aEd +saN +syI +dZO +iPb aEh aEF aat @@ -36227,10 +36197,10 @@ axh axh aAr aAz -aBz -aCW -aDC -aEe +aBF +aMy +gVb +dQD aEh aEF aat @@ -36502,8 +36472,8 @@ aom aln atc aub -auN -awz +stL +bAM awQ axh axK @@ -36644,8 +36614,8 @@ agt agG azd acV -auV -awA +ycu +tOr awQ azy axL @@ -37033,12 +37003,12 @@ aey ajq ajR adO -ajT -ajW -akI -akN -akV -ajk +iWU +tAQ +pAf +huy +xmh +dJG afC aju act @@ -37175,12 +37145,12 @@ akK ajH ajJ ajN -aki -akB -akU -akP -alU -akQ +fXG +oOm +uTu +jYc +rrD +jVj afC aCt aCx @@ -37321,8 +37291,8 @@ akr ajO akd adO -akY -alf +fLx +tlG afC aAH aCw diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 03bbab7db1..24611e22da 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -305,22 +305,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) -"aH" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 5 - }, -/obj/machinery/camera/network/security, -/turf/simulated/floor/tiled, -/area/security/security_cell_hallway) "aI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -443,41 +427,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/security/brig/visitation) -"aW" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "Cell 4"; - name = "Cell 4 Door"; - pixel_x = -28; - req_access = list(1,2) - }, -/turf/simulated/floor/tiled, -/area/security/security_cell_hallway) "aX" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -812,30 +761,6 @@ /obj/effect/floor_decal/borderfloor/shifted, /turf/simulated/floor/tiled, /area/security/brig) -"bs" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/computer/cryopod{ - pixel_x = 32 - }, -/turf/simulated/floor/tiled, -/area/security/security_cell_hallway) "bt" = ( /obj/structure/bed/chair{ dir = 1 @@ -935,23 +860,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/security/brig) -"bC" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/machinery/door_timer/cell_3{ - id = "Cell 4"; - name = "Cell 4"; - pixel_x = -32 - }, -/turf/simulated/floor/tiled, -/area/security/security_cell_hallway) "bD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -2568,11 +2476,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/exploration/crew) -"dI" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) "dJ" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -3055,17 +2958,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/port) -"ev" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) "ew" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3201,33 +3093,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) -"eE" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/landmark/start{ - name = "Explorer" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) -"eF" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/obj/effect/landmark/start{ - name = "Explorer" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) "eG" = ( /turf/simulated/floor/tiled, /area/tether/exploration/crew) @@ -3431,15 +3296,6 @@ "eT" = ( /turf/simulated/floor, /area/maintenance/station/micro) -"eU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) "eV" = ( /obj/structure/table/wooden_reinforced, /obj/item/weapon/paper_bin{ @@ -3471,18 +3327,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) -"eX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) "eY" = ( /obj/structure/cable/green{ d1 = 4; @@ -4647,36 +4491,6 @@ /obj/random/maintenance/research, /turf/simulated/floor, /area/maintenance/station/exploration) -"gS" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/vending/assist{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/engineering/locker_room) -"gT" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/engineering/locker_room) -"gU" = ( -/obj/effect/floor_decal/corner_steel_grid, -/turf/simulated/floor/tiled, -/area/engineering/locker_room) "gV" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -4939,12 +4753,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/locker_room) -"hq" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/engineering/locker_room) "hr" = ( /turf/simulated/wall, /area/maintenance/station/eng_upper) @@ -5221,36 +5029,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/exploration/crew) -"hL" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -23; - pixel_y = 0 - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/obj/structure/table/reinforced, -/obj/random/maintenance/clean, -/obj/random/powercell, -/obj/item/device/t_scanner, -/turf/simulated/floor/tiled, -/area/engineering/locker_room) -"hM" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 4; - icon_state = "steel_grid" - }, -/turf/simulated/floor/tiled, -/area/engineering/locker_room) "hN" = ( /obj/structure/railing{ dir = 8 @@ -5360,20 +5138,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/interrogation) -"hZ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/table/reinforced, -/obj/random/maintenance/engineering, -/obj/random/maintenance/engineering, -/obj/random/tech_supply, -/turf/simulated/floor/tiled, -/area/engineering/locker_room) "ia" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -5570,31 +5334,6 @@ /obj/random/maintenance/research, /turf/simulated/floor, /area/maintenance/station/exploration) -"iq" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/table/reinforced, -/obj/random/powercell, -/obj/random/tech_supply, -/obj/machinery/camera/network/engineering{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/engineering/locker_room) -"ir" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/engineering/locker_room) "is" = ( /turf/simulated/floor/tiled, /area/engineering/locker_room) @@ -6120,47 +5859,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) -"iZ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/table/reinforced, -/obj/random/toolbox, -/obj/item/device/geiger, -/turf/simulated/floor/tiled, -/area/engineering/locker_room) -"ja" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled, -/area/engineering/locker_room) "jb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7078,24 +6776,6 @@ "kp" = ( /turf/simulated/wall/r_wall, /area/tether/exploration/equipment) -"kq" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 1; - dir = 4; - id_tag = null; - name = "Exploration Equipment Storage"; - req_access = list(); - req_one_access = list(19,43,67) - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) "kr" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Exploration Subgrid"; @@ -7501,15 +7181,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/maintenance/station/eng_upper) -"kY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "kZ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -7609,34 +7280,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) -"le" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "lf" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Exploration Substation Bypass" @@ -8830,41 +8473,10 @@ }, /turf/simulated/open, /area/engineering/foyer_mezzenine) -"mN" = ( -/obj/structure/catwalk, -/obj/structure/disposalpipe/junction, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/open, -/area/engineering/foyer_mezzenine) "mO" = ( /obj/structure/catwalk, /turf/simulated/open, /area/engineering/foyer_mezzenine) -"mP" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/engineering/foyer_mezzenine) "mQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -9184,19 +8796,6 @@ /obj/effect/landmark/free_ai_shell, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) -"nk" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/engineering/foyer_mezzenine) "nl" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -9231,21 +8830,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/ai_cyborg_station) -"no" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "np" = ( /obj/structure/table/standard, /obj/item/weapon/phone, @@ -9254,25 +8838,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_cyborg_station) -"nq" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "nr" = ( /obj/structure/cable/green{ d1 = 4; @@ -9402,45 +8967,6 @@ }, /turf/simulated/floor, /area/storage/tech) -"nA" = ( -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/open, -/area/engineering/foyer_mezzenine) -"nB" = ( -/obj/structure/disposalpipe/junction/yjunction, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled, -/area/engineering/foyer_mezzenine) "nC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9526,24 +9052,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"nK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) -"nL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "nM" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -9628,27 +9136,29 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "nS" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) -"nT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) -"nU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) +"nT" = ( +/obj/structure/closet/emcloset, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_two) "nV" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -9832,10 +9342,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/maintenance/station/exploration) -"on" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "oo" = ( /obj/structure/cable{ d1 = 1; @@ -10033,41 +9539,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"oD" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) -"oE" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - icon_state = "extinguisher_closed"; - pixel_y = -32 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "oF" = ( /obj/structure/table/bench/wooden, /obj/effect/landmark/start{ @@ -10222,35 +9693,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) -"oT" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) -"oU" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "oV" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -10413,44 +9855,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"pl" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) -"pm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lightgrey/bordercorner, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "pn" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/reinforced/polarized/full{ @@ -11075,73 +10479,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/pathfinder_office) -"qr" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) -"qs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) -"qt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) "qu" = ( /obj/machinery/alarm{ pixel_y = 22 @@ -11704,61 +11041,6 @@ }, /turf/simulated/floor/tiled/dark, /area/storage/tech) -"rg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) -"rh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) -"ri" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) -"rj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) "rk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12141,42 +11423,17 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "rT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/hallway/station/port) -"rU" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lightgrey/bordercorner, -/obj/effect/floor_decal/steeldecal/steel_decals7{ +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) -"rV" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ +/obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, +/obj/machinery/vending/assist{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/hallway/station/port) +/area/engineering/locker_room) "rW" = ( /obj/structure/cable{ d1 = 4; @@ -12304,18 +11561,6 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) -"sd" = ( -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_two) "se" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -12573,10 +11818,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/port) -"sA" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_two) "sB" = ( /turf/simulated/wall, /area/maintenance/station/micro) @@ -13266,29 +12507,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/stairs_two) -"tJ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_two) "tK" = ( /turf/simulated/floor/carpet/blue, /area/medical/psych) @@ -13648,12 +12866,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/stairs_two) -"up" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_two) "uq" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -13984,35 +13196,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/stairs_two) -"uS" = ( -/obj/structure/cable, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_two) -"uT" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_two) "uU" = ( /obj/structure/bed/chair/comfy/brown{ dir = 4 @@ -14313,16 +13496,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/stairs_two) -"vu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_two) "vv" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, @@ -15232,30 +14405,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"wT" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "wU" = ( /obj/machinery/power/apc{ dir = 4; @@ -15410,31 +14559,6 @@ "xg" = ( /turf/simulated/wall, /area/maintenance/station/medbay) -"xh" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/camera/network/tether, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "xi" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/door/firedoor/glass/hidden/steel{ @@ -15587,30 +14711,6 @@ /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, /area/tether/station/stairs_two) -"xt" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_two) "xu" = ( /obj/structure/bed/chair, /obj/machinery/power/apc{ @@ -15818,36 +14918,6 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) -"xM" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) -"xN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "xO" = ( /obj/structure/table/standard, /obj/item/weapon/storage/box/syringegun, @@ -16219,6 +15289,37 @@ }, /turf/simulated/floor, /area/medical/surgery_hallway) +"yr" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_two) "ys" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/spray/cleaner{ @@ -17561,6 +16662,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) +"AS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/security/security_cell_hallway) "AT" = ( /obj/structure/cable/green{ d1 = 4; @@ -19068,6 +18176,18 @@ }, /turf/simulated/floor/tiled/white, /area/medical/ward) +"Dh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "Di" = ( /obj/structure/cable/green{ d1 = 4; @@ -19191,50 +18311,6 @@ /obj/structure/closet/wardrobe/orange, /turf/simulated/floor/tiled/dark, /area/security/recstorage) -"Dt" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) -"Du" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Dv" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -19376,35 +18452,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"DJ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "DK" = ( /obj/effect/floor_decal/rust, /obj/effect/decal/cleanable/dirt, @@ -19458,33 +18505,6 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) -"DS" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "DT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -19852,63 +18872,6 @@ "Ey" = ( /turf/simulated/floor/reinforced/airless, /area/space) -"EA" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_two) -"EB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_two) -"EC" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_two) "ED" = ( /obj/structure/table/rack{ dir = 8; @@ -20351,90 +19314,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/port) -"Fl" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) -"Fm" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) -"Fn" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) "Fp" = ( /obj/structure/cable{ d1 = 1; @@ -20627,6 +19506,28 @@ }, /turf/simulated/floor/tiled, /area/tether/station/stairs_two) +"FH" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 1 + }, +/obj/machinery/status_display{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "FI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -20679,6 +19580,26 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) +"Gg" = ( +/obj/structure/disposalpipe/junction/yjunction, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer_mezzenine) "Go" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -20686,6 +19607,22 @@ "Gw" = ( /turf/simulated/floor/tiled/dark, /area/security/brig) +"GD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/engineering/locker_room) "GF" = ( /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 4 @@ -20732,12 +19669,103 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Hi" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_two) +"Hm" = ( +/obj/structure/cable, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 28 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_two) +"Hn" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_two) "Hq" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/public_meeting_room) +"Hv" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/obj/random/tech_supply, +/turf/simulated/floor/tiled, +/area/engineering/locker_room) "Hx" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -20749,6 +19777,28 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"HD" = ( +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_two) +"HE" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer_mezzenine) "HH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -20793,6 +19843,42 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"HQ" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) +"HS" = ( +/obj/effect/floor_decal/corner_steel_grid, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/engineering/locker_room) +"HU" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 6 + }, +/obj/machinery/computer/cryopod{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled, +/area/security/security_cell_hallway) "Ik" = ( /obj/machinery/light/small{ dir = 8 @@ -20825,6 +19911,15 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) +"Iv" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "Iw" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 2 @@ -20867,6 +19962,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/public_meeting_room) +"IC" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_two) "IE" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -20894,6 +19995,22 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/public_meeting_room) +"IK" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + icon_state = "extinguisher_closed"; + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "IO" = ( /obj/structure/disposaloutlet{ dir = 1 @@ -20925,6 +20042,21 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"Jf" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Jh" = ( /obj/effect/floor_decal/rust, /obj/structure/catwalk, @@ -20973,6 +20105,25 @@ /obj/structure/girder, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Jt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) +"Jv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Jz" = ( /obj/machinery/light, /obj/structure/bed/chair/shuttle{ @@ -21047,6 +20198,12 @@ /obj/item/weapon/beach_ball/holoball, /turf/simulated/floor/tiled/dark, /area/security/recstorage) +"KC" = ( +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "KG" = ( /turf/simulated/mineral/floor/cave, /area/maintenance/station/sec_lower) @@ -21089,6 +20246,15 @@ }, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) +"KT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "KU" = ( /obj/structure/table/glass, /obj/item/weapon/storage/box/gloves{ @@ -21134,6 +20300,13 @@ /obj/structure/inflatable, /turf/simulated/mineral/floor/vacuum, /area/mine/explored/upper_level) +"Lk" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Ln" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -21163,6 +20336,23 @@ /obj/random/maintenance/engineering, /turf/simulated/floor/airless, /area/maintenance/station/sec_lower) +"LA" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/junction, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/open, +/area/engineering/foyer_mezzenine) "LB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21188,6 +20378,26 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"LK" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/landmark/start{ + name = "Explorer" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/crew) "LL" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -21199,6 +20409,25 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2, /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) +"LP" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass{ + autoclose = 1; + dir = 4; + id_tag = null; + name = "Exploration Equipment Storage"; + req_access = list(); + req_one_access = list(19,43,67) + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "LW" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, @@ -21235,6 +20464,16 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless, /area/maintenance/station/sec_lower) +"Mu" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/open, +/area/engineering/foyer_mezzenine) "Mw" = ( /obj/machinery/light/small{ dir = 4; @@ -21244,11 +20483,53 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Mx" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/effect/landmark/start{ + name = "Explorer" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/crew) "MC" = ( /obj/structure/railing, /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/monotile, /area/security/brig) +"MF" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "MK" = ( /obj/structure/table/rack{ dir = 8; @@ -21257,6 +20538,16 @@ /obj/random/maintenance/engineering, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"MM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "MN" = ( /turf/simulated/floor/tiled/white, /area/maintenance/station/sec_lower) @@ -21268,6 +20559,23 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"MR" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 5 + }, +/obj/machinery/camera/network/security, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/security/security_cell_hallway) "MT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21318,6 +20626,21 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"Nf" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/random/powercell, +/obj/random/tech_supply, +/obj/machinery/camera/network/engineering{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/locker_room) "Ng" = ( /obj/effect/floor_decal/borderfloor{ dir = 1; @@ -21400,6 +20723,15 @@ /obj/structure/grille, /turf/space, /area/space) +"NT" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "NY" = ( /obj/machinery/light/small{ dir = 8 @@ -21417,6 +20749,18 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Oa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "Ob" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -21444,6 +20788,23 @@ /obj/structure/bed/chair/shuttle, /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod1) +"Of" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "Oj" = ( /obj/machinery/alarm{ dir = 8; @@ -21466,6 +20827,17 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/maintenance/station/sec_lower) +"Ot" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Ov" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -21497,6 +20869,76 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"OL" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/port) +"OP" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10; + icon_state = "borderfloorcorner2"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 10 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "Cell 4"; + name = "Cell 4 Door"; + pixel_x = -28; + req_access = list(1,2) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/security/security_cell_hallway) +"OQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + icon_state = "map-scrubbers" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "OR" = ( /obj/structure/window/reinforced{ dir = 8 @@ -21564,6 +21006,16 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled, /area/security/brig) +"Pn" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 4; + icon_state = "steel_grid" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/locker_room) "Pw" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -21635,6 +21087,27 @@ }, /turf/simulated/floor/tiled, /area/security/brig/visitation) +"PN" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "PR" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -21652,6 +21125,34 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/public_meeting_room) +"PT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "PV" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21691,6 +21192,18 @@ /obj/structure/table/steel, /turf/simulated/floor/airless, /area/maintenance/station/sec_lower) +"Qm" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Qn" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -21710,6 +21223,18 @@ "Qs" = ( /turf/simulated/mineral/vacuum, /area/maintenance/station/sec_lower) +"Qt" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "Qu" = ( /obj/structure/catwalk, /obj/machinery/door/firedoor/glass, @@ -21791,6 +21316,17 @@ /obj/machinery/disposal, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) +"QM" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/locker_room) "QN" = ( /obj/structure/closet, /obj/item/clothing/shoes/boots/winter/medical, @@ -21798,6 +21334,27 @@ /obj/item/clothing/under/rank/medical, /turf/simulated/floor/tiled/white, /area/maintenance/station/sec_lower) +"QO" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "QQ" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -21925,6 +21482,20 @@ /obj/item/weapon/folder, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/public_meeting_room) +"RO" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "RQ" = ( /obj/structure/table/steel, /obj/machinery/microwave{ @@ -22003,15 +21574,6 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) -"Sl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/security/security_cell_hallway) "Sp" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -22031,6 +21593,21 @@ /obj/random/cutout, /turf/simulated/floor, /area/maintenance/station/micro) +"Sv" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer_mezzenine) "Sy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22052,6 +21629,9 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"SQ" = ( +/turf/simulated/floor/tiled, +/area/hallway/station/port) "ST" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/catwalk, @@ -22084,6 +21664,22 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/maintenance/station/sec_lower) +"Tb" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/table/reinforced, +/obj/random/toolbox, +/obj/item/device/geiger, +/turf/simulated/floor/tiled, +/area/engineering/locker_room) "Tc" = ( /obj/structure/cable{ d1 = 4; @@ -22103,6 +21699,19 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/port) +"Td" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/open, +/area/engineering/foyer_mezzenine) "Tj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, @@ -22131,6 +21740,39 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Tn" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) +"Tp" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "Tq" = ( /obj/item/weapon/surgical/cautery, /turf/simulated/floor, @@ -22265,6 +21907,32 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Ul" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "Un" = ( /obj/machinery/door/airlock/multi_tile/glass, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -22302,6 +21970,17 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"UL" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/locker_room) "UO" = ( /obj/effect/floor_decal/rust, /obj/effect/floor_decal/techfloor{ @@ -22362,6 +22041,26 @@ /obj/structure/inflatable, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Va" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/door_timer/cell_3{ + id = "Cell 4"; + name = "Cell 4"; + pixel_x = -32 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/security/security_cell_hallway) "Vb" = ( /obj/structure/lattice, /turf/simulated/mineral/floor/vacuum, @@ -22424,6 +22123,15 @@ }, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) +"Vr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/locker_room) "Vw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -22437,6 +22145,15 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/port) +"Vx" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "VA" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Public Meeting Room" @@ -22497,6 +22214,16 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) +"VP" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/open, +/area/engineering/foyer_mezzenine) "VU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -22523,6 +22250,23 @@ /obj/random/cutout, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"We" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "Wi" = ( /obj/machinery/alarm{ pixel_y = 22 @@ -22539,6 +22283,25 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Wt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/camera/network/tether, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Ww" = ( /obj/effect/floor_decal/rust, /obj/structure/closet, @@ -22567,6 +22330,32 @@ }, /turf/simulated/floor/tiled/dark, /area/security/interrogation) +"WM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/engineering/locker_room) +"WO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_two) "WS" = ( /obj/machinery/light/small{ dir = 8 @@ -22605,6 +22394,12 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Xl" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_two) "Xp" = ( /obj/machinery/atmospherics/pipe/tank/nitrous_oxide{ dir = 1; @@ -22693,6 +22488,34 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"XQ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "XR" = ( /obj/structure/cable/green{ d1 = 4; @@ -22756,6 +22579,25 @@ /obj/structure/catwalk, /turf/simulated/floor/airless, /area/maintenance/station/sec_lower) +"Yk" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "Yq" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/glass, @@ -22782,6 +22624,20 @@ "Yw" = ( /turf/simulated/floor/airless, /area/mine/explored/upper_level) +"Yy" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "YC" = ( /turf/simulated/shuttle/wall, /area/shuttle/large_escape_pod1) @@ -22863,6 +22719,24 @@ /obj/machinery/vending/cola, /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) +"YO" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/open, +/area/engineering/foyer_mezzenine) +"YR" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/folder/yellow, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/tether/exploration/crew) "YU" = ( /obj/effect/floor_decal/rust, /obj/random/trash_pile, @@ -22891,15 +22765,40 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Zk" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/locker_room) "Zl" = ( /obj/structure/closet/crate, /turf/simulated/floor, /area/maintenance/station/sec_lower) -"Zp" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lightgrey/bordercorner, +"Zo" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/hallway/station/starboard) +/area/tether/station/stairs_two) "Zr" = ( /obj/effect/floor_decal/rust, /obj/effect/floor_decal/techfloor{ @@ -22964,6 +22863,28 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"ZN" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23; + pixel_y = 0 + }, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/structure/table/reinforced, +/obj/random/maintenance/clean, +/obj/random/powercell, +/obj/item/device/t_scanner, +/turf/simulated/floor/tiled, +/area/engineering/locker_room) "ZO" = ( /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod1) @@ -22999,6 +22920,22 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"ZZ" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) (1,1,1) = {" aa @@ -28594,11 +28531,11 @@ bW bW fX gs -gS -hZ -hL -iq -iZ +rT +Hv +ZN +Nf +Tb jA fX kK @@ -28736,11 +28673,11 @@ en dK fY gt -gT +UL hp hp -ir -ja +QM +GD jB fX kL @@ -28878,11 +28815,11 @@ DG fx fX gu -gU -hq -hM -is -jb +HS +Zk +Pn +Vr +WM jC fX kM @@ -30308,8 +30245,8 @@ jH kT lC mn -mN -nA +LA +Td of oM oM @@ -30450,8 +30387,8 @@ kf kf kf mo -mO -mM +Mu +YO of oM oM @@ -30592,8 +30529,8 @@ TY ac ac kf -mO -mM +VP +YO of oM oM @@ -30734,21 +30671,21 @@ TY TY ac kf -mO -mM +VP +YO og oM oM pK UU -rg -rT -sd -sA -up -uT -EB -vu +We +SQ +HD +IC +uP +Xl +uP +WO uP sw ux @@ -30876,21 +30813,21 @@ Xp TY ac kf -mP -nB -nk +HE +Gg +Sv oh ox ps -qr -rh -rU -xt -tJ -uS -EA -EC -vv +Of +RO +OL +Hi +Hn +Hm +Zo +yr +nT vv sw uy @@ -31024,9 +30961,9 @@ nm oi pe pK -qs -ri -rV +Ul +MM +Yk KI Hq KI @@ -31166,8 +31103,8 @@ oj oN qx pL -qt -rj +Iv +Oa Tc KI qH @@ -31563,8 +31500,8 @@ OY RS aj Qn -bC -aW +Va +OP XG bH aX @@ -31704,9 +31641,9 @@ Fs YM RS aj -aH -Sl -bs +MR +AS +HU bM cf cz @@ -32302,9 +32239,9 @@ fq jL kj pP -Fl -ev -fO +rW +Dh +Yy pn qK rs @@ -32444,8 +32381,8 @@ fq oR kj eJ -Fm -eU +rW +Qt uz po po @@ -32586,9 +32523,9 @@ fq oS kj eN -Fn -eX -fO +rW +OQ +Tp pp qL ru @@ -32866,8 +32803,8 @@ lI mt mt nJ -on -oT +lJ +XQ pk pT Fp @@ -33007,10 +32944,10 @@ kx lJ lJ lJ -nK -lJ -oU -pl +KT +KC +NT +Ot lK Fr fH @@ -33149,10 +33086,10 @@ lb lJ lJ lJ -nL -pm -DJ -DS +Qm +PN +MF +QO DV FB pU @@ -33417,8 +33354,8 @@ RS bA cF dm -dI -eE +gD +LK fs fV gB @@ -33559,8 +33496,8 @@ cY bA di dy -dm -eF +YR +Mx eG fW Ek @@ -34562,7 +34499,7 @@ hj cZ iI ld -kq +LP Eq lX pu @@ -36556,9 +36493,9 @@ mA ra Dj hh -wT -kY -le +ni +Vx +PT pb ro qf @@ -36698,9 +36635,9 @@ mV mE ng hh -xh -xM -xN +Wt +nS +Tn pc pB qg @@ -36840,9 +36777,9 @@ nd rR Dl hh -no -nS -oD +Jt +Lk +ZZ oZ pC qh @@ -36982,9 +36919,9 @@ hh sy hh hh -nq -nT -oE +nl +Jv +IK oY pD qi @@ -37124,8 +37061,8 @@ ne sV nu hA -Dt -nU +FH +Jv Dw oY pE @@ -37266,8 +37203,8 @@ nf tF Dn DC -Du -Zp +Jf +HQ DN oY pE diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 3370e6cbf9..10ab6af956 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -2157,43 +2157,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"adG" = ( -/obj/machinery/door/airlock/vault/bolted{ - req_access = list(53) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - id = "VaultAc"; - name = "\improper Vault" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/button/remote/blast_door{ - id = "VaultAc"; - name = "Vault Blast Door"; - pixel_x = 0; - pixel_y = -32; - req_access = list(53); - req_one_access = list(53) - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/dark, -/area/security/nuke_storage) "adH" = ( /obj/machinery/light{ dir = 4 @@ -3131,31 +3094,6 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/general) -"afk" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 24 - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/armor/vest/wolftaur{ - pixel_x = -16; - pixel_y = 4 - }, -/obj/item/clothing/suit/armor/vest/wolftaur{ - pixel_x = -12; - pixel_y = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/security/security_equiptment_storage) "afl" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, @@ -3319,29 +3257,6 @@ "afy" = ( /turf/simulated/wall/r_wall, /area/ai) -"afz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/dark, -/area/security/security_equiptment_storage) -"afA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark, -/area/security/security_equiptment_storage) "afB" = ( /obj/structure/cable/green{ d1 = 4; @@ -3560,30 +3475,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"afT" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - dir = 1; - pixel_y = 24; - req_access = list() - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "afU" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -4672,17 +4563,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory/red) -"ahX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "ahY" = ( /obj/structure/table/rack{ dir = 8; @@ -4697,18 +4577,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/eva) -"ahZ" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "aia" = ( /obj/machinery/power/terminal{ dir = 4 @@ -5780,21 +5648,6 @@ }, /turf/simulated/floor/tiled, /area/security/hallwayaux) -"ajJ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "ajK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6120,24 +5973,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai) -"akn" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "ako" = ( /turf/simulated/wall/r_wall, /area/security/security_equiptment_storage) @@ -6231,20 +6066,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) -"akw" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "akx" = ( /obj/machinery/door/airlock/glass_external, /obj/machinery/access_button{ @@ -6314,26 +6135,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) -"akB" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/mask/gas{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/dark, -/area/security/security_equiptment_storage) "akC" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -7933,22 +7734,6 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) -"amX" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "amY" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -8923,19 +8708,6 @@ /obj/item/device/taperecorder, /turf/simulated/floor/tiled, /area/security/security_processing) -"aoC" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/computer/secure_data, -/obj/machinery/camera/network/security, -/turf/simulated/floor/tiled, -/area/security/security_processing) "aoD" = ( /obj/effect/floor_decal/borderfloor{ dir = 1; @@ -8955,18 +8727,6 @@ /obj/item/weapon/pen, /turf/simulated/floor/tiled, /area/security/security_processing) -"aoE" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/table/steel, -/turf/simulated/floor/tiled, -/area/security/security_processing) "aoF" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -9518,34 +9278,6 @@ }, /turf/simulated/floor/carpet, /area/security/breakroom) -"apn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/item/device/flashlight/lamp, -/obj/structure/table/steel, -/turf/simulated/floor/tiled, -/area/security/security_processing) -"apo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/security/security_processing) -"app" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/structure/table/steel, -/turf/simulated/floor/tiled, -/area/security/security_processing) "apq" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -9689,78 +9421,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) -"apD" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" - }, -/obj/machinery/camera/network/security, -/turf/simulated/floor/tiled, -/area/security/hallway) -"apE" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - icon_state = "extinguisher_closed"; - pixel_y = 32 - }, -/turf/simulated/floor/tiled, -/area/security/hallway) -"apF" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/security/hallway) "apG" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -10070,18 +9730,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_processing) -"aql" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/security/hallway) "aqm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -10426,20 +10074,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"aqR" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/security/hallway) "aqS" = ( /obj/effect/floor_decal/spline/plain{ dir = 9; @@ -10656,14 +10290,6 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics) -"arl" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "arm" = ( /obj/structure/cable/green{ d1 = 4; @@ -11063,31 +10689,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) -"arO" = ( -/obj/machinery/door/airlock/glass_mining{ - name = "Delivery Office"; - req_access = list(50); - req_one_access = list() - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/quartermaster/delivery) "arP" = ( /obj/structure/cable/green{ d1 = 4; @@ -11862,34 +11463,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"asY" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/security/hallway) "asZ" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -12110,49 +11683,6 @@ hard_corner = 1 }, /area/tether/elevator) -"ato" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/station_map{ - pixel_y = 32 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/status_display{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"atp" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "atq" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -12300,18 +11830,6 @@ /obj/machinery/status_display/supply_display, /turf/simulated/wall, /area/quartermaster/office) -"atC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "atD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -12533,16 +12051,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/maintenance/station/cargo) -"atV" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/red/bordercorner2, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/security/hallway) "atW" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -12569,54 +12077,6 @@ /obj/effect/floor_decal/corner/red/bordercorner2, /turf/simulated/floor/tiled, /area/security/hallway) -"atZ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled, -/area/security/hallway) -"aua" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/security/hallway) "aub" = ( /obj/structure/mopbucket, /obj/item/weapon/reagent_containers/glass/bucket, @@ -12709,17 +12169,6 @@ "aui" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) -"auj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 2 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"auk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "aul" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -13032,22 +12481,6 @@ "auJ" = ( /turf/simulated/wall/r_wall, /area/security/detectives_office) -"auK" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/paleblue/bordercorner2, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "auL" = ( /obj/machinery/washing_machine, /obj/machinery/light{ @@ -13250,11 +12683,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/maintenance/station/elevator) -"auY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass/hidden/steel, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "auZ" = ( /obj/structure/table/bench/wooden, /turf/simulated/floor/wood, @@ -13832,38 +13260,6 @@ /obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled, /area/quartermaster/delivery) -"avY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/newscaster{ - layer = 3.3; - pixel_x = -27; - pixel_y = 0 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "avZ" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, @@ -14067,13 +13463,6 @@ hard_corner = 1 }, /area/tether/elevator) -"aww" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "awx" = ( /obj/structure/sign/directions/cargo{ dir = 4 @@ -14366,19 +13755,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/station/elevator) -"awY" = ( -/obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"awZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "axa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14431,82 +13807,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/office) -"axd" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"axe" = ( -/obj/machinery/status_display{ - pixel_y = 30 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"axf" = ( -/obj/machinery/atm{ - pixel_y = 30 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "axg" = ( /obj/structure/table/bench/wooden, /obj/machinery/camera/network/tether{ @@ -14531,78 +13831,6 @@ }, /turf/simulated/wall, /area/teleporter/departing) -"axi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"axj" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"axk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) "axl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14618,19 +13846,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"axm" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) "axn" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -14946,32 +14161,6 @@ }, /turf/simulated/floor/tiled, /area/security/lobby) -"axM" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "axN" = ( /obj/structure/lattice, /obj/machinery/door/firedoor/glass, @@ -15005,14 +14194,6 @@ /obj/item/device/megaphone, /turf/simulated/floor/wood, /area/quartermaster/qm) -"axQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "axR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -15034,25 +14215,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"axT" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"axU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "axV" = ( /obj/structure/table/steel, /obj/item/weapon/storage/box/lights/mixed, @@ -15066,28 +14228,6 @@ }, /turf/simulated/floor/tiled, /area/maintenance/station/cargo) -"axW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"axX" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"axY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) "axZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -15525,41 +14665,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"ayG" = ( -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"ayH" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "ayI" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -15641,22 +14746,6 @@ /obj/structure/sign/department/medbay, /turf/simulated/wall, /area/medical/medbay_emt_bay) -"ayO" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "ayP" = ( /obj/machinery/alarm{ dir = 1; @@ -15679,16 +14768,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"ayR" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" - }, -/turf/simulated/floor/tiled/dark, -/area/security/nuke_storage) "ayS" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, @@ -16125,28 +15204,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"azA" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass/hidden/steel, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"azB" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "azC" = ( /obj/machinery/alarm{ dir = 4; @@ -16320,18 +15377,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"azQ" = ( -/obj/machinery/door/airlock/glass_mining{ - name = "Cargo Bay"; - req_access = list(31); - req_one_access = list() - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/glass, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/steel_grid, -/area/quartermaster/office) "azR" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -16395,27 +15440,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"azX" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 9 - }, -/obj/item/device/radio/intercom{ - dir = 2; - pixel_y = -24 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "azY" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -16429,64 +15453,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"azZ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 2 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"aAa" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"aAb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "aAc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16527,47 +15493,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"aAf" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"aAg" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "aAh" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -16709,22 +15634,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"aAs" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "aAt" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -16759,29 +15668,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"aAv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "aAw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -16809,13 +15695,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"aAy" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "aAz" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/full, @@ -17130,33 +16009,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/tether/station/stairs_three) -"aBb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/barricade/cutout/ntsec, -/turf/simulated/floor/tiled/dark, -/area/security/nuke_storage) -"aBc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/security/nuke_storage) -"aBd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/dark, -/area/security/nuke_storage) "aBe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -17271,53 +16123,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"aBk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/door/firedoor/glass/hidden/steel, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"aBl" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"aBm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "aBn" = ( /obj/structure/cable{ icon_state = "2-4" @@ -17351,57 +16156,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"aBp" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"aBq" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) -"aBr" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "aBs" = ( /obj/structure/cable{ d1 = 4; @@ -17790,27 +16544,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) -"aBW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/dark, -/area/security/nuke_storage) -"aBX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/security/nuke_storage) -"aBY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark, -/area/security/nuke_storage) "aBZ" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -18938,29 +17671,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) -"aDO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/bordercorner{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/security/hallway) "aDP" = ( /obj/structure/table/steel, /turf/simulated/floor/tiled, @@ -26087,12 +24797,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/bluegrid, /area/ai_core_foyer) -"aOY" = ( -/obj/effect/landmark{ - name = "morphspawn" - }, -/turf/simulated/floor/tiled/dark, -/area/security/nuke_storage) "aOZ" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -27943,18 +26647,6 @@ }, /turf/simulated/floor/tiled, /area/security/briefing_room) -"aSG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Security Officer" - }, -/turf/simulated/floor/tiled, -/area/security/security_processing) "aSH" = ( /turf/simulated/wall, /area/storage/emergency_storage/emergency3) @@ -31862,6 +30554,15 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) +"bmI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/security/nuke_storage) "boY" = ( /obj/machinery/door/airlock/glass_external, /obj/structure/cable/green{ @@ -31878,6 +30579,37 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/securiship/engines) +"bqt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/security/nuke_storage) +"btu" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "bvH" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -31956,6 +30688,41 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory/blue) +"bWl" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"bYp" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/light, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"cay" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "cwr" = ( /obj/structure/cable/green{ d1 = 4; @@ -31965,6 +30732,49 @@ /obj/structure/table/rack/shelf, /turf/simulated/floor/tiled/techmaint, /area/shuttle/securiship/general) +"cIJ" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"cKx" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/mask/gas{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/dark, +/area/security/security_equiptment_storage) "cNP" = ( /obj/machinery/computer/ship/helm{ req_one_access = list(67,58) @@ -32015,6 +30825,22 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"dvH" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "dCf" = ( /obj/effect/floor_decal/borderfloorblack/full, /obj/machinery/camera/network/security{ @@ -32028,6 +30854,24 @@ /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/dark, /area/security/armory/blue) +"dFr" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "dSk" = ( /obj/effect/floor_decal/borderfloor{ dir = 1; @@ -32060,6 +30904,32 @@ /obj/effect/map_helper/airlock/door/simple, /turf/simulated/floor/tiled, /area/security/hallway) +"ehI" = ( +/obj/machinery/atm{ + pixel_y = 30 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"esK" = ( +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "exP" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -32094,6 +30964,21 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/securiship/engines) +"eWf" = ( +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"eWq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) "eZd" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -32128,6 +31013,32 @@ }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/securiship/general) +"eZE" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"fdX" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"fdY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "fho" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -32142,6 +31053,10 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory/red) +"fkQ" = ( +/obj/machinery/door/firedoor/glass/hidden/steel, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "flc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 @@ -32156,6 +31071,19 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"fox" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass/hidden/steel, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "fuV" = ( /obj/structure/bed/chair/comfy/brown, /obj/machinery/holoposter{ @@ -32176,6 +31104,30 @@ /obj/structure/filingcabinet, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"fyN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"fFS" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "fGQ" = ( /obj/structure/window/reinforced{ dir = 1 @@ -32183,6 +31135,19 @@ /obj/structure/bed/chair/bay/chair, /turf/simulated/floor/tiled/dark, /area/shuttle/securiship/general) +"fKd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "fTy" = ( /obj/effect/floor_decal/borderfloorblack/full, /obj/machinery/light{ @@ -32196,6 +31161,19 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/security/armory/blue) +"gfw" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "gjM" = ( /obj/structure/cable/green{ dir = 1; @@ -32220,6 +31198,17 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/securiship/engines) +"gqZ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/table/steel, +/turf/simulated/floor/tiled, +/area/security/security_processing) "gxX" = ( /obj/structure/cable/cyan{ d2 = 8; @@ -32238,6 +31227,41 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/securiship/engines) +"gBb" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/security/hallway) "gBp" = ( /obj/structure/window/reinforced{ dir = 4 @@ -32296,6 +31320,13 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory/blue) +"gQS" = ( +/obj/effect/landmark{ + name = "morphspawn" + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/dark, +/area/security/nuke_storage) "gSE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 10; @@ -32303,11 +31334,39 @@ }, /turf/simulated/wall/rshull, /area/shuttle/securiship/engines) +"gSZ" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/obj/effect/landmark/start{ + name = "Security Officer" + }, +/turf/simulated/floor/tiled, +/area/security/security_processing) "gUi" = ( /obj/effect/decal/cleanable/dirt, /obj/random/cutout, /turf/simulated/floor, /area/maintenance/station/ai) +"gYC" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "gYV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -32322,6 +31381,18 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory/red) +"hid" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "hoF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 1; @@ -32329,6 +31400,19 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/securiship/engines) +"htW" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/structure/table/steel, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/security/security_processing) "hyn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 6; @@ -32364,6 +31448,16 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory/red) +"hPJ" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/security/hallway) "hTN" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/security{ @@ -32384,6 +31478,31 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"hZs" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/station_map{ + pixel_y = 32 + }, +/obj/machinery/status_display{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "ibu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -32405,6 +31524,42 @@ "isz" = ( /turf/simulated/wall/rshull, /area/shuttle/securiship/general) +"iDH" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/security/hallway) +"iOI" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "iUO" = ( /obj/structure/cable/green{ d1 = 1; @@ -32416,6 +31571,50 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"jbY" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4; + icon_state = "intact-scrubbers" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"jfu" = ( +/obj/machinery/newscaster{ + layer = 3.3; + pixel_x = -27; + pixel_y = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "jjJ" = ( /obj/machinery/power/terminal{ dir = 1; @@ -32462,6 +31661,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"jEX" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "jHa" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -32470,6 +31684,50 @@ }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/securiship/general) +"jHS" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"jRD" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + icon_state = "extinguisher_closed"; + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/security/hallway) "kbY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -32481,6 +31739,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory/blue) +"kcH" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "klB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 5; @@ -32504,6 +31768,20 @@ }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/securiship/general) +"kqY" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) "kAs" = ( /turf/simulated/floor/tiled/techmaint, /area/shuttle/securiship/general) @@ -32523,6 +31801,57 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory/blue) +"kFO" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/status_display{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"kSC" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j1" + }, +/obj/machinery/camera/network/security, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/security/hallway) +"lad" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "lmZ" = ( /obj/machinery/door/airlock/glass_external, /obj/structure/cable/green{ @@ -32533,6 +31862,48 @@ /obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/securiship/general) +"lon" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 9 + }, +/obj/item/device/radio/intercom{ + dir = 2; + pixel_y = -24 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"lug" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "lFr" = ( /obj/structure/cable/green{ dir = 1; @@ -32555,6 +31926,63 @@ }, /turf/simulated/floor, /area/crew_quarters/heads/hos) +"lOS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"meu" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"mgA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/security/hallway) +"mqv" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "mxs" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ @@ -32563,6 +31991,13 @@ /obj/effect/map_helper/airlock/atmos/pump_out_external, /turf/simulated/floor/airless, /area/shuttle/securiship/general) +"mDQ" = ( +/obj/machinery/camera/network/security{ + dir = 5; + icon_state = "camera" + }, +/turf/simulated/floor/tiled/dark, +/area/security/nuke_storage) "mEc" = ( /obj/structure/cable/green{ d1 = 1; @@ -32627,6 +32062,26 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/securiship/general) +"npJ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "nqE" = ( /obj/machinery/computer/ship/sensors{ dir = 8; @@ -32637,6 +32092,27 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/securiship/cockpit) +"nrc" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"nsy" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/security/hallway) "ntp" = ( /obj/machinery/computer/ship/engines{ dir = 4; @@ -32647,12 +32123,51 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/securiship/cockpit) +"nvb" = ( +/obj/machinery/door/airlock/vault/bolted{ + req_access = list(53) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/blast/regular{ + id = "VaultAc"; + name = "\improper Vault" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/button/remote/blast_door{ + id = "VaultAc"; + name = "Vault Blast Door"; + pixel_x = 0; + pixel_y = -32; + req_access = list(53); + req_one_access = list(53) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/dark, +/area/security/nuke_storage) "nym" = ( /obj/machinery/computer/shuttle_control/explore/securiship{ dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/securiship/general) +"nzs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "nDu" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -32679,6 +32194,30 @@ /obj/structure/closet/l3closet/security, /turf/simulated/floor/tiled/dark, /area/security/armory/blue) +"oiV" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/computer/secure_data, +/obj/machinery/camera/network/security, +/turf/simulated/floor/tiled, +/area/security/security_processing) +"ojY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/security/security_processing) "okJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8; @@ -32686,6 +32225,24 @@ }, /turf/simulated/wall/rshull, /area/shuttle/securiship/engines) +"opL" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = 24; + req_access = list() + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "owU" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -32764,6 +32321,20 @@ }, /turf/simulated/wall/rshull, /area/shuttle/securiship/general) +"peF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/security/security_equiptment_storage) "plY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 1; @@ -32798,6 +32369,30 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory/blue) +"pOc" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"pQE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) "pUt" = ( /obj/effect/floor_decal/borderfloorblack/full, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ @@ -32823,6 +32418,18 @@ }, /turf/simulated/floor/plating, /area/shuttle/securiship/general) +"qgj" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/security/nuke_storage) +"qkC" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/security/nuke_storage) "qwY" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -32857,6 +32464,43 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory/red) +"qMb" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/security/hallway) +"qYJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "rfZ" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/map_helper/airlock/door/ext_door, @@ -32930,6 +32574,64 @@ }, /turf/simulated/floor/plating, /area/shuttle/securiship/cockpit) +"rCb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass/hidden/steel, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"rEP" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 24 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/suit/armor/vest/wolftaur{ + pixel_x = -16; + pixel_y = 4 + }, +/obj/item/clothing/suit/armor/vest/wolftaur{ + pixel_x = -12; + pixel_y = 9 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark, +/area/security/security_equiptment_storage) +"rEV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/security/security_equiptment_storage) "rFu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8; @@ -32948,6 +32650,25 @@ }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/securiship/general) +"rIS" = ( +/obj/machinery/door/airlock/glass_mining{ + name = "Delivery Office"; + req_access = list(50); + req_one_access = list() + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/delivery) "rUg" = ( /obj/structure/window/reinforced{ dir = 8; @@ -33065,6 +32786,21 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/securiship/engines) +"tnC" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "tqy" = ( /obj/structure/grille, /obj/structure/cable/green{ @@ -33081,6 +32817,45 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/wall/rshull, /area/shuttle/securiship/general) +"trN" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"tyn" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) +"tzx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"ufq" = ( +/obj/structure/barricade/cutout/ntsec, +/turf/simulated/floor/tiled/dark, +/area/security/nuke_storage) "uiP" = ( /obj/structure/cable/green{ d1 = 2; @@ -33100,6 +32875,21 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory/red) +"upC" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "uzs" = ( /obj/machinery/shipsensors{ dir = 1 @@ -33107,6 +32897,18 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/airless, /area/shuttle/securiship/cockpit) +"uzF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "uDo" = ( /obj/machinery/atmospherics/valve/digital{ dir = 4; @@ -33131,6 +32933,16 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory/red) +"vhP" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "vlw" = ( /obj/machinery/door/window/brigdoor/eastleft, /turf/simulated/floor/tiled/dark, @@ -33151,11 +32963,36 @@ /obj/machinery/atmospherics/binary/pump/fuel, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/securiship/engines) +"vAP" = ( +/obj/item/device/flashlight/lamp, +/obj/structure/table/steel, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/security/security_processing) "vFD" = ( /obj/structure/catwalk, /obj/random/cutout, /turf/simulated/floor, /area/maintenance/station/sec_upper) +"wbZ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "wjz" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -33164,6 +33001,26 @@ }, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"wls" = ( +/obj/machinery/status_display{ + pixel_y = 30 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "wpQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -33181,6 +33038,20 @@ }, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"wFV" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "wIZ" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -33210,6 +33081,35 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/securiship/cockpit) +"wXX" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) +"wZu" = ( +/obj/machinery/door/airlock/glass_mining{ + name = "Cargo Bay"; + req_access = list(31); + req_one_access = list() + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/office) "xaA" = ( /obj/structure/grille, /obj/structure/cable/green, @@ -33290,6 +33190,52 @@ "xqB" = ( /turf/simulated/wall/rshull, /area/shuttle/securiship/engines) +"xwM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) +"xBW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "yau" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -37689,7 +37635,7 @@ axw axw aze azS -ayR +mDQ aBV aCT axw @@ -37831,8 +37777,8 @@ axw axw azf azT -aBb -aBW +ufq +azT aCU axw axw @@ -37972,9 +37918,9 @@ avt axw axw azg -aOY -aBc -aBX +gQS +bmI +qkC aPA axw axw @@ -38115,8 +38061,8 @@ axw axw azh azT -aBd -aBY +bqt +qgj aCW axw axw @@ -38399,7 +38345,7 @@ aJX axw azj axw -adG +nvb axw azj axw @@ -38941,8 +38887,8 @@ kAC bJB aao ako -afk -afz +rEP +rEV afW aeT ame @@ -39083,8 +39029,8 @@ sMv uDo akf ako -akB -afA +cKx +peF afX aly amf @@ -39108,8 +39054,8 @@ awh axz ayj aog -azZ -aBk +hid +rCb aBC aDa aDE @@ -39250,8 +39196,8 @@ awM axA ayk aog -aAa -aBl +aAe +lOS aSI aDa aAY @@ -39392,8 +39338,8 @@ awh axB anZ auO -aAb -aBm +jEX +lOS aCd aDb aDG @@ -39667,8 +39613,8 @@ aaG alA ars alA -aDO -apF +mgA +iDH amJ avA awh @@ -39809,8 +39755,8 @@ aoz aoz aoz aoz -apD -aql +kSC +nsy auM avB awh @@ -39951,8 +39897,8 @@ amg aqK art aoz -asY -atV +qMb +atY anm avC awh @@ -39960,9 +39906,9 @@ awh axF ayo aog -aAf -aBp -azX +wFV +tnC +lon aDf aDf aDf @@ -40102,8 +40048,8 @@ awN axG ayp aog -aAa -aBq +aAe +btu aCh aDg aDK @@ -40244,8 +40190,8 @@ auP auP auP auP -aAg -aBr +kFO +iOI aCi aDh aDL @@ -40654,8 +40600,8 @@ ajk ajk ajk alv -aoC -aSG +oiV +gSZ aRs aqi aqN @@ -40797,7 +40743,7 @@ ajk aQl aof aoD -apn +vAP aDP anu aqN @@ -40938,8 +40884,8 @@ ajk ajk ajk alw -aoE -apo +gqZ +ojY apO aqj aqO @@ -41081,14 +41027,14 @@ ajk ajk alw aoF -app +htW apP aqi amz ary alw -atZ -aua +gBb +hPJ auU avI awo @@ -41096,8 +41042,8 @@ awT axK ayu azq -afT -akn +opL +jbY aQj ayJ aAz @@ -41229,8 +41175,8 @@ aqk alw alw aoA -apE -aqR +jRD +iDH amH auV awp @@ -41238,9 +41184,9 @@ awU axL ayv azq -axM -akw -apN +npJ +upC +bYp ayl ayJ aBJ @@ -41380,8 +41326,8 @@ awn axL ayw afR -ahZ -amX +kcH +jbY apS aDl aAA @@ -42658,8 +42604,8 @@ atn asp ayD azx -aAs -aBz +wbZ +uzF aFT aDl aBh @@ -43217,18 +43163,18 @@ aRd aaI aab asq -ato -auj -auY -auY -aww -awY -avY -ayG -azA -aAv -ahX -atC +hZs +eWf +fkQ +fkQ +esK +meu +jfu +cIJ +fox +xBW +nrc +cay azs aBw aBw @@ -43359,18 +43305,18 @@ aaI aaI aab asq -atp -auk -auk -auk -auk -awZ -axQ -ayH -azB -aAy -axX -auK +dvH +fyN +fdY +qYJ +lad +fKd +vhP +gfw +bWl +mqv +tzx +arC ayT aBx aCv @@ -43502,15 +43448,15 @@ aab aab asq atq +fFS aul -aul -aul +lug aul axa axR aeN afS -ajJ +dFr aoh auN ayT @@ -44358,8 +44304,8 @@ auo avb avR awz -axd -axT +trN +jHS afQ aAH aub @@ -44500,9 +44446,9 @@ aup avc avS aSH -axe -axU -ayO +wls +eZE +gYC aAH aAH aAG @@ -44642,8 +44588,8 @@ auq avd avT aSH -axf -arl +ehI +pOc asX atg avp @@ -45068,8 +45014,8 @@ aus aqr aqr awB -axi -axW +xwM +nzs ayQ azH azL @@ -45210,8 +45156,8 @@ asw avf avV awC -axj -axX +fdX +nzs ayQ azI azL @@ -45352,8 +45298,8 @@ aut avg avW awD -axk -axY +wXX +eWq aAK azJ azL @@ -45636,9 +45582,9 @@ auv avi arY awD -axm -aya -ayS +pQE +tyn +kqY azK aAJ aBM @@ -45771,7 +45717,7 @@ aeM ahs agJ aqr -arO +rIS asA aqr auw @@ -46917,7 +46863,7 @@ auD axr ayf aza -azQ +wZu aAS aBT aEt diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm index be5f14b42f..7ad7472fc6 100644 --- a/maps/tether/tether_shuttles.dm +++ b/maps/tether/tether_shuttles.dm @@ -172,7 +172,7 @@ if(!WT.remove_fuel(0, user)) to_chat(user,"\The [WT] must be on to complete this task.") return 1 - playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) + playsound(src, 'sound/items/Welder.ogg', 50, 1) user.visible_message("\The [user] begins \the [src] overhaul.","You begin an overhaul of \the [src].") if(!do_after(user, wear SECONDS, src)) return 1 diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index c5e5175a8a..fe042ce4c4 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -127,7 +127,7 @@ /obj/effect/step_trigger/lost_in_space/bluespace/Trigger(A) if(world.time - last_sound > 5 SECONDS) last_sound = world.time - playsound(get_turf(src), 'sound/effects/supermatter.ogg', 75, 1) + playsound(src, 'sound/effects/supermatter.ogg', 75, 1) if(ismob(A) && prob(5))//lucky day var/destturf = locate(rand(5,world.maxx-5),rand(5,world.maxy-5),pick(using_map.station_levels)) new /datum/teleport/instant(A, destturf, 0, 1, null, null, null, 'sound/effects/phasein.ogg') @@ -418,7 +418,7 @@ var/global/list/latejoin_tram = list() /obj/structure/dancepole/attackby(var/obj/item/O as obj, var/mob/user as mob) if(O.is_wrench()) anchored = !anchored - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(anchored) to_chat(user, "You secure \the [src].") else diff --git a/vorestation.dme b/vorestation.dme index b5727d5638..8cff6a3849 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1633,6 +1633,7 @@ #include "code\modules\admin\verbs\atmosdebug.dm" #include "code\modules\admin\verbs\BrokenInhands.dm" #include "code\modules\admin\verbs\buildmode.dm" +#include "code\modules\admin\verbs\change_appearance.dm" #include "code\modules\admin\verbs\check_customitem_activity.dm" #include "code\modules\admin\verbs\cinematic.dm" #include "code\modules\admin\verbs\custom_event.dm" @@ -1934,6 +1935,8 @@ #include "code\modules\clothing\spacesuits\rig\suits\robotics.dm" #include "code\modules\clothing\spacesuits\rig\suits\station.dm" #include "code\modules\clothing\spacesuits\rig\suits\station_vr.dm" +#include "code\modules\clothing\spacesuits\void\event.dm" +#include "code\modules\clothing\spacesuits\void\event_vr.dm" #include "code\modules\clothing\spacesuits\void\merc.dm" #include "code\modules\clothing\spacesuits\void\military_vr.dm" #include "code\modules\clothing\spacesuits\void\station.dm"