diff --git a/code/game/gamemodes/technomancer/spells/audible_deception.dm b/code/game/gamemodes/technomancer/spells/audible_deception.dm index 8faff2b4e6..fc67ba1ee3 100644 --- a/code/game/gamemodes/technomancer/spells/audible_deception.dm +++ b/code/game/gamemodes/technomancer/spells/audible_deception.dm @@ -25,8 +25,8 @@ "Glass Shattering" = "shatter", "Grille Damage" = 'sound/effects/grillehit.ogg', "Energy Pulse" = 'sound/effects/EMPulse.ogg', - "Airlock" = 'sound/machines/airlock.ogg', - "Airlock Creak" = 'sound/machines/airlock_creaking.ogg', + "Airlock" = 'sound/machines/door/old_airlock.ogg', + "Airlock Creak" = 'sound/machines/door/airlock_creaking.ogg', "Shotgun Pumping" = 'sound/weapons/shotgunpump.ogg', "Flash" = 'sound/weapons/flash.ogg', diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 03822a6c6d..7eb9e4a342 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -40,11 +40,15 @@ var/datum/wires/airlock/wires = null var/open_sound_powered = 'sound/machines/door/covert1o.ogg' - var/open_sound_unpowered = 'sound/machines/airlockforced.ogg' + var/open_sound_unpowered = 'sound/machines/door/airlockforced.ogg' var/close_sound_powered = 'sound/machines/door/covert1c.ogg' + var/legacy_open_powered = 'sound/machines/door/old_airlock.ogg' + var/legacy_close_powered = 'sound/machines/door/old_airlockclose.ogg' + var/department_open_powered = null + var/department_close_powered = null var/denied_sound = 'sound/machines/deniedbeep.ogg' - var/bolt_up_sound = 'sound/machines/boltsup.ogg' - var/bolt_down_sound = 'sound/machines/boltsdown.ogg' + var/bolt_up_sound = 'sound/machines/door/boltsup.ogg' + var/bolt_down_sound = 'sound/machines/door/boltsdown.ogg' /obj/machinery/door/airlock/attack_generic(var/mob/living/user, var/damage) if(stat & (BROKEN|NOPOWER)) @@ -81,7 +85,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, 'sound/machines/airlock_creaking.ogg', 100, 1, volume_channel = VOLUME_CHANNEL_DOORS) + playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1, volume_channel = VOLUME_CHANNEL_DOORS) src.locked = 0 src.welded = 0 update_icon() @@ -90,7 +94,7 @@ else if(src.density) visible_message("\The [user] begins forcing \the [src] open!") if(do_after(user, 5 SECONDS,src)) - playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1, volume_channel = VOLUME_CHANNEL_DOORS) + playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1, volume_channel = VOLUME_CHANNEL_DOORS) visible_message("\The [user] forces \the [src] open!") open(1) else @@ -112,40 +116,50 @@ icon = 'icons/obj/doors/Doorcom.dmi' req_one_access = list(access_heads) assembly_type = /obj/structure/door_assembly/door_assembly_com - open_sound_powered = 'sound/machines/door/cmd3o.ogg' - close_sound_powered = 'sound/machines/door/cmd3c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/cmd3o.ogg' + department_close_powered = 'sound/machines/door/cmd3c.ogg' /obj/machinery/door/airlock/security name = "Security Airlock" icon = 'icons/obj/doors/Doorsec.dmi' req_one_access = list(access_security) assembly_type = /obj/structure/door_assembly/door_assembly_sec - open_sound_powered = 'sound/machines/door/sec1o.ogg' - close_sound_powered = 'sound/machines/door/sec1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/sec1o.ogg' + department_close_powered = 'sound/machines/door/sec1c.ogg' /obj/machinery/door/airlock/engineering name = "Engineering Airlock" icon = 'icons/obj/doors/Dooreng.dmi' req_one_access = list(access_engine) assembly_type = /obj/structure/door_assembly/door_assembly_eng - open_sound_powered = 'sound/machines/door/eng1o.ogg' - close_sound_powered = 'sound/machines/door/eng1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/eng1o.ogg' + department_close_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/engineeringatmos name = "Atmospherics Airlock" icon = 'icons/obj/doors/Doorengatmos.dmi' req_one_access = list(access_atmospherics) assembly_type = /obj/structure/door_assembly/door_assembly_eat - open_sound_powered = 'sound/machines/door/eng1o.ogg' - close_sound_powered = 'sound/machines/door/eng1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/eng1o.ogg' + department_close_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/medical name = "Medical Airlock" icon = 'icons/obj/doors/Doormed.dmi' req_one_access = list(access_medical) assembly_type = /obj/structure/door_assembly/door_assembly_med - open_sound_powered = 'sound/machines/door/med1o.ogg' - close_sound_powered = 'sound/machines/door/med1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/med1o.ogg' + department_close_powered = 'sound/machines/door/med1c.ogg' /obj/machinery/door/airlock/maintenance name = "Maintenance Access" @@ -158,8 +172,10 @@ /obj/machinery/door/airlock/maintenance/cargo icon = 'icons/obj/doors/Doormaint_cargo.dmi' req_one_access = list(access_cargo) - open_sound_powered = 'sound/machines/door/door2o.ogg' - close_sound_powered = 'sound/machines/door/door2c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/door2o.ogg' + department_close_powered = 'sound/machines/door/door2c.ogg' /obj/machinery/door/airlock/maintenance/command icon = 'icons/obj/doors/Doormaint_command.dmi' @@ -220,6 +236,7 @@ hitsound = 'sound/effects/Glasshit.ogg' open_sound_powered = 'sound/machines/door/hall1o.ogg' close_sound_powered = 'sound/machines/door/hall1c.ogg' + legacy_open_powered = 'sound/machines/door/windowdoor.ogg' maxhealth = 300 explosion_resistance = 5 opacity = 0 @@ -294,8 +311,10 @@ assembly_type = /obj/structure/door_assembly/door_assembly_com glass = 1 req_one_access = list(access_heads) - open_sound_powered = 'sound/machines/door/cmd1o.ogg' - close_sound_powered = 'sound/machines/door/cmd1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/cmd1o.ogg' + department_close_powered = 'sound/machines/door/cmd1c.ogg' /obj/machinery/door/airlock/glass_engineering name = "Engineering Airlock" @@ -307,8 +326,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_eng glass = 1 req_one_access = list(access_engine) - open_sound_powered = 'sound/machines/door/eng1o.ogg' - close_sound_powered = 'sound/machines/door/eng1c.ogg' + department_open_powered = 'sound/machines/door/eng1o.ogg' + department_close_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/glass_engineeringatmos name = "Atmospherics Airlock" @@ -320,8 +339,10 @@ assembly_type = /obj/structure/door_assembly/door_assembly_eat glass = 1 req_one_access = list(access_atmospherics) - open_sound_powered = 'sound/machines/door/eng1o.ogg' - close_sound_powered = 'sound/machines/door/eng1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/eng1o.ogg' + department_close_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/glass_security name = "Security Airlock" @@ -333,8 +354,10 @@ assembly_type = /obj/structure/door_assembly/door_assembly_sec glass = 1 req_one_access = list(access_security) - open_sound_powered = 'sound/machines/door/sec1o.ogg' - close_sound_powered = 'sound/machines/door/sec1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/sec1o.ogg' + department_close_powered = 'sound/machines/door/sec1c.ogg' /obj/machinery/door/airlock/glass_medical name = "Medical Airlock" @@ -346,31 +369,39 @@ assembly_type = /obj/structure/door_assembly/door_assembly_med glass = 1 req_one_access = list(access_medical) - open_sound_powered = 'sound/machines/door/med1o.ogg' - close_sound_powered = 'sound/machines/door/med1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/med1o.ogg' + department_close_powered = 'sound/machines/door/med1c.ogg' /obj/machinery/door/airlock/mining name = "Mining Airlock" icon = 'icons/obj/doors/Doormining.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_min req_one_access = list(access_mining) - open_sound_powered = 'sound/machines/door/cgo1o.ogg' - close_sound_powered = 'sound/machines/door/cgo1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/cgo1o.ogg' + department_close_powered = 'sound/machines/door/cgo1c.ogg' /obj/machinery/door/airlock/atmos name = "Atmospherics Airlock" icon = 'icons/obj/doors/Dooratmo.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_atmo req_one_access = list(access_atmospherics) - open_sound_powered = 'sound/machines/door/eng1o.ogg' - close_sound_powered = 'sound/machines/door/eng1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/eng1o.ogg' + department_close_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/research name = "Research Airlock" icon = 'icons/obj/doors/Doorresearch.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_research - open_sound_powered = 'sound/machines/door/sci1o.ogg' - close_sound_powered = 'sound/machines/door/sci1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/sci1o.ogg' + department_close_powered = 'sound/machines/door/sci1c.ogg' /obj/machinery/door/airlock/glass_research name = "Research Airlock" @@ -382,8 +413,10 @@ assembly_type = /obj/structure/door_assembly/door_assembly_research glass = 1 req_one_access = list(access_research) - open_sound_powered = 'sound/machines/door/sci1o.ogg' - close_sound_powered = 'sound/machines/door/sci1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/sci1o.ogg' + department_close_powered = 'sound/machines/door/sci1c.ogg' /obj/machinery/door/airlock/glass_mining name = "Mining Airlock" @@ -395,8 +428,10 @@ assembly_type = /obj/structure/door_assembly/door_assembly_min glass = 1 req_one_access = list(access_mining) - open_sound_powered = 'sound/machines/door/cgo1o.ogg' - close_sound_powered = 'sound/machines/door/cgo1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/cgo1o.ogg' + department_close_powered = 'sound/machines/door/cgo1c.ogg' /obj/machinery/door/airlock/glass_atmos name = "Atmospherics Airlock" @@ -408,8 +443,10 @@ assembly_type = /obj/structure/door_assembly/door_assembly_atmo glass = 1 req_one_access = list(access_atmospherics) - open_sound_powered = 'sound/machines/door/eng1o.ogg' - close_sound_powered = 'sound/machines/door/eng1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/eng1o.ogg' + department_close_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/gold name = "Gold Airlock" @@ -490,8 +527,10 @@ icon = 'icons/obj/doors/Doorsci.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_science req_one_access = list(access_research) - open_sound_powered = 'sound/machines/door/sci1o.ogg' - close_sound_powered = 'sound/machines/door/sci1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/sci1o.ogg' + department_close_powered = 'sound/machines/door/sci1c.ogg' /obj/machinery/door/airlock/glass_science name = "Glass Airlocks" @@ -500,8 +539,10 @@ assembly_type = /obj/structure/door_assembly/door_assembly_science glass = 1 req_one_access = list(access_research) - open_sound_powered = 'sound/machines/door/sci1o.ogg' - close_sound_powered = 'sound/machines/door/sci1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + department_open_powered = 'sound/machines/door/sci1o.ogg' + department_close_powered = 'sound/machines/door/sci1c.ogg' /obj/machinery/door/airlock/highsecurity name = "Secure Airlock" @@ -1172,10 +1213,41 @@ 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 //if the door is unpowered then it doesn't make sense to hear the woosh of a pneumatic actuator - if(arePowerSystemsOn()) - playsound(src, open_sound_powered, 50, 1, volume_channel = VOLUME_CHANNEL_DOORS) - else - playsound(src, open_sound_unpowered, 75, 1, volume_channel = VOLUME_CHANNEL_DOORS) + for(var/P in player_list) + var/mob/M = P + if(!M || !M.client) + continue + var/old_sounds = M.client.is_preference_enabled(/datum/client_preference/old_door_sounds) + var/department_door_sounds = M.client.is_preference_enabled(/datum/client_preference/department_door_sounds) + var/sound + var/volume + if(old_sounds) // Do we have old sounds enabled? Play these even if we have department door sounds enabled. + if(arePowerSystemsOn()) + sound = legacy_open_powered + volume = 50 + else + sound = open_sound_unpowered + volume = 75 + else if(!old_sounds && department_door_sounds && src.department_open_powered) // Else, we have old sounds disabled, the door has per-department door sounds, and we have chosen to play department door sounds, use these. + if(arePowerSystemsOn()) + sound = department_open_powered + volume = 50 + else + sound = open_sound_unpowered + volume = 75 + else // Else, play these. + if(arePowerSystemsOn()) + sound = open_sound_powered + volume = 50 + else + sound = open_sound_unpowered + volume = 75 + + var/turf/T = get_turf(M) + var/distance = get_dist(T, get_turf(src)) + if(distance <= world.view * 2) + if(T && T.z == get_z(src)) + M.playsound_local(get_turf(src), sound, volume, 1, null, 0, TRUE, sound(sound), volume_channel = VOLUME_CHANNEL_DOORS) if(src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density) src.closeOther.close() @@ -1270,10 +1342,41 @@ 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, close_sound_powered, 50, 1, volume_channel = VOLUME_CHANNEL_DOORS) - else - playsound(src, open_sound_unpowered, 75, 1, volume_channel = VOLUME_CHANNEL_DOORS) + for(var/P in player_list) + var/mob/M = P + if(!M || !M.client) + continue + var/old_sounds = M.client.is_preference_enabled(/datum/client_preference/old_door_sounds) + var/department_door_sounds = M.client.is_preference_enabled(/datum/client_preference/department_door_sounds) + var/sound + var/volume + if(old_sounds) + if(arePowerSystemsOn()) + sound = legacy_close_powered + volume = 50 + else + sound = open_sound_unpowered + volume = 75 + else if(!old_sounds && department_door_sounds && src.department_close_powered) // Else, we have old sounds disabled, the door has per-department door sounds, and we have chosen to play department door sounds, use these. + if(arePowerSystemsOn()) + sound = department_close_powered + volume = 50 + else + sound = open_sound_unpowered + volume = 75 + else + if(arePowerSystemsOn()) + sound = close_sound_powered + volume = 50 + else + sound = open_sound_unpowered + volume = 75 + + var/turf/T = get_turf(M) + var/distance = get_dist(T, get_turf(src)) + if(distance <= world.view * 2) + if(T && T.z == get_z(src)) + M.playsound_local(get_turf(src), sound, volume, 1, null, 0, TRUE, sound(sound), volume_channel = VOLUME_CHANNEL_DOORS) 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 06a4527f7e..dcbcce7fbd 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -25,8 +25,8 @@ var/icon_state_opening = null var/icon_state_closed = null var/icon_state_closing = null - var/open_sound = 'sound/machines/blastdooropen.ogg' - var/close_sound = 'sound/machines/blastdoorclose.ogg' + var/open_sound = 'sound/machines/door/blastdooropen.ogg' + var/close_sound = 'sound/machines/door/blastdoorclose.ogg' var/damage = BLAST_DOOR_CRUSH_DAMAGE var/multiplier = 1 // The multiplier for how powerful our YEET is. @@ -125,7 +125,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, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1) if(src.density) src.force_open() @@ -219,13 +219,13 @@ if(src.density) visible_message("\The [user] begins forcing \the [src] open!") if(do_after(user, 15 SECONDS,src)) - playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/door/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, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1) visible_message("\The [user] forces \the [src] closed!") force_close(1) else diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index e31465168f..6cae2617fd 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, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/door/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, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1) visible_message("\The [user] forces \the [src] open!") open(1) else diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 98fb1c75d8..cfd0b3706c 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, 'sound/machines/windowdoor.ogg', 100, 1) + playsound(src, 'sound/machines/door/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, 'sound/machines/windowdoor.ogg', 100, 1) + playsound(src, 'sound/machines/door/windowdoor.ogg', 100, 1) density = TRUE update_icon() diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 75004ae7be..cab4f5c37f 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -45,10 +45,7 @@ var/list/doppler_arrays = list() /obj/machinery/doppler_array/power_change() ..() - if(stat & BROKEN) - icon_state = "[initial(icon_state)]-broken" + if(!(stat & NOPOWER)) + icon_state = initial(icon_state) else - if(!(stat & NOPOWER)) - icon_state = initial(icon_state) - else - icon_state = "[initial(icon_state)]-off" \ No newline at end of file + icon_state = "[initial(icon_state)]_off" diff --git a/code/game/mecha/equipment/tools/clamp.dm b/code/game/mecha/equipment/tools/clamp.dm index 6091764c2b..0580134f33 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, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(FD, 'sound/machines/door/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, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(FD, 'sound/machines/door/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, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(AD, 'sound/machines/door/airlock_creaking.ogg', 100, 1) AD.visible_message("\The [chassis] tears \the [AD] open!") if(!AD.welded) if(density) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 055016908c..9baabe8f9b 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1891,7 +1891,7 @@ update_cell_alerts() update_damage_alerts() set_dir(dir_in) - playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) + playsound(src, 'sound/machines/door/windowdoor.ogg', 50, 1) if(occupant.client && cloaked_selfimage) occupant.client.images += cloaked_selfimage play_entered_noise(occupant) diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 9b7828f5ac..73d3dd45e7 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -65,7 +65,7 @@ icon_state = "popcorn" /obj/item/trash/tuna - name = "tuna can" + name = "fish flake packet" icon_state = "tuna" /obj/item/trash/sosjerky @@ -110,6 +110,10 @@ name = "candy wrapper" icon_state = "kokobar" +/obj/item/trash/skrellsnax + name = "skrellsnax packet" + icon_state = "skrellsnacks" + /obj/item/trash/gumpack name = "gum packet" icon_state = "gum_pack" diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 83bef1007f..2ac0098203 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -341,6 +341,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/cigarette/cigar name = "premium cigar" desc = "A brown roll of tobacco and... well, you're not quite sure. This thing's huge!" + description_fluff = "While the label does say that this is a 'premium cigar', it really cannot match other types of cigars on the market. Is it a quality cigarette? Perhaps. Was it hand-made with care? No." icon_state = "cigar2" type_butt = /obj/item/trash/cigbutt/cigarbutt throw_speed = 0.5 @@ -358,12 +359,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba name = "\improper Cohiba Robusto cigar" desc = "There's little more you could want from a cigar." + description_fluff = "Cohiba has been a popular cigar company for centuries. They are still based out of Cuba and refuse to expand and therefore have a very limited quantity, making their cigars coveted all through known space. Robusto is one of their most popular shapes of cigars." icon_state = "cigar2" nicotine_amt = 7 /obj/item/clothing/mask/smokable/cigarette/cigar/havana name = "premium Havanian cigar" desc = "A cigar fit for only the best of the best." + description_fluff = "'Havanian' is an umbrella term for any cigar made in the typical handmade style of Cuba. This particular cigar is from Gilthari's cigar manufacturers and produced galaxy-wide. While this way of making quality cigars has become slightly bastardized over the years, overall quality has remained relatively the same, even if there is a large quantity of 'Havanian' cigars." icon_state = "cigar2" max_smoketime = 7200 smoketime = 7200 @@ -403,6 +406,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/pipe name = "smoking pipe" desc = "A pipe, for smoking. Made of fine, stained cherry wood." + description_fluff = "ClassiCo Accessories and Haberdashers, originating out of Mars, claim to produce products 'for the modern gentlefolk'. Most of their items are high-end and expensive, but they pledge to back their prices up with quality, and usually do." icon_state = "pipe" item_state = "pipe" smoketime = 0 diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 7005d07fbb..79816f4b6f 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -59,7 +59,7 @@ //try to crush it if(ispath(trash)) if(contents.len && user.a_intent == I_HURT) // only crumple with things inside on harmintent. - user.visible_message(SPAN_DANGER("You crush \the [src], spilling its contents everywhere!"), SPAN_DANGER("[user] crushes \the [src], spilling its contents everywhere!")) + user.visible_message(SPAN_DANGER("[user] crushes \the [src], spilling its contents everywhere!"), SPAN_DANGER("You crush \the [src], spilling its contents everywhere!")) spill() else to_chat(user, SPAN_NOTICE("You crumple up \the [src].")) //make trash diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 5a28fe245c..704081437e 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -204,6 +204,7 @@ /obj/item/weapon/storage/fancy/cigarettes name = "\improper pack of Trans-Stellar Duty-frees" desc = "A ubiquitous brand of cigarettes, found in every major spacefaring corporation in the universe. As mild and flavorless as it gets." + description_fluff = "The Trans-Stellar Duty-Free Cigarette Company was created as an imprint of NanoTrasen. They are the most boring, tasteless, dry cigarettes on the market, but due to just how unremarkable (not to mention cheap to produce) they are, they sold in vending machines in almost every corner of the galaxy." icon = 'icons/obj/cigarettes.dmi' icon_state = "cigpacket" item_state_slots = list(slot_r_hand_str = "cigpacket", slot_l_hand_str = "cigpacket") @@ -318,7 +319,7 @@ /obj/item/weapon/storage/fancy/cigar name = "cigar case" desc = "A case for holding your cigars when you are not smoking them." - description_fluff = "The tastefully engraved palm tree tells you that these 'Corona Grande' premium cigars are only sold on the luxury cruises and resorts of Oasis, though ten separate companies produce them for that purpose galaxy-wide. The standard is however very high." + description_fluff = "The tastefully engraved palm tree tells you that these 'Palma Grande' premium cigars are only sold on the luxury cruises and resorts of Oasis, though ten separate companies produce them for that purpose galaxy-wide. The standard is however very high." icon_state = "cigarcase" icon = 'icons/obj/cigarettes.dmi' w_class = ITEMSIZE_TINY diff --git a/code/global.dm b/code/global.dm index 48628c5e02..1fde7aca07 100644 --- a/code/global.dm +++ b/code/global.dm @@ -157,7 +157,7 @@ var/static/list/scarySounds = list( 'sound/effects/Glassbr3.ogg', 'sound/items/Welder.ogg', 'sound/items/Welder2.ogg', - 'sound/machines/airlock.ogg', + 'sound/machines/door/old_airlock.ogg', 'sound/effects/clownstep1.ogg', 'sound/effects/clownstep2.ogg' ) diff --git a/code/modules/admin/verbs/debug_vr.dm b/code/modules/admin/verbs/debug_vr.dm index eb8cd37e01..30e48dd81e 100644 --- a/code/modules/admin/verbs/debug_vr.dm +++ b/code/modules/admin/verbs/debug_vr.dm @@ -2,6 +2,8 @@ set category = "Fun" set name = "Quick NIF" set desc = "Spawns a NIF into someone in quick-implant mode." + + var/input_NIF if(!check_rights(R_ADMIN)) return @@ -24,9 +26,27 @@ return if(H.species.flags & NO_SCAN) + var/obj/item/device/nif/S = /obj/item/device/nif/bioadap + input_NIF = initial(S.name) new /obj/item/device/nif/bioadap(H) else - new /obj/item/device/nif(H) + var/list/NIF_types = typesof(/obj/item/device/nif) + var/list/NIFs = list() + + for(var/NIF_type in NIF_types) + var/obj/item/device/nif/S = NIF_type + NIFs[capitalize(initial(S.name))] = NIF_type + + var/list/show_NIFs = sortList(NIFs) // the list that will be shown to the user to pick from + + input_NIF = input("Pick the NIF type","Quick NIF") in show_NIFs + var/chosen_NIF = NIFs[capitalize(input_NIF)] + + if(chosen_NIF) + new chosen_NIF(H) + else + new /obj/item/device/nif(H) + + log_and_message_admins("[key_name(src)] Quick NIF'd [H.real_name] with a [input_NIF].") + feedback_add_details("admin_verb","QNIF") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - log_and_message_admins("[key_name(src)] Quick NIF'd [H.real_name].") - feedback_add_details("admin_verb","QNIF") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/client/preference_setup/global/setting_datums.dm b/code/modules/client/preference_setup/global/setting_datums.dm index 0560f3008b..24cca9ca18 100644 --- a/code/modules/client/preference_setup/global/setting_datums.dm +++ b/code/modules/client/preference_setup/global/setting_datums.dm @@ -152,6 +152,18 @@ var/list/_client_preferences_by_type key = "SOUND_AIRPUMP" enabled_description = "Audible" disabled_description = "Silent" + +/datum/client_preference/old_door_sounds + description ="Old Door Sounds" + key = "SOUND_OLDDOORS" + enabled_description = "Old" + disabled_description = "New" + +/datum/client_preference/department_door_sounds + description ="Department-Specific Door Sounds" + key = "SOUND_DEPARTMENTDOORS" + enabled_description = "Enabled" + disabled_description = "Disabled" /datum/client_preference/pickup_sounds description = "Picked Up Item Sounds" diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm index dc2bec9650..554300d379 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm @@ -18,4 +18,8 @@ /datum/gear/shoes/siren display_name = "boots, Siren" - path = /obj/item/clothing/shoes/boots/fluff/siren \ No newline at end of file + path = /obj/item/clothing/shoes/boots/fluff/siren + +/datum/gear/shoes/toeless + display_name = "toe-less jackboots" + path = /obj/item/clothing/shoes/boots/jackboots/toeless diff --git a/code/modules/client/preferences_toggle_procs.dm b/code/modules/client/preferences_toggle_procs.dm index ddd768a076..bf3d7a3ca7 100644 --- a/code/modules/client/preferences_toggle_procs.dm +++ b/code/modules/client/preferences_toggle_procs.dm @@ -253,6 +253,36 @@ SScharacter_setup.queue_preferences_save(prefs) feedback_add_details("admin_verb","TAirPumpNoise") + +/client/verb/toggle_old_door_sounds() + set name = "Toggle Old Door Sounds" + set category = "Preferences" + set desc = "Toggles New/Old Door Sounds" + + var/pref_path = /datum/client_preference/old_door_sounds + + toggle_preference(pref_path) + + to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear the legacy door sounds.") + + SScharacter_setup.queue_preferences_save(prefs) + + feedback_add_details("admin_verb","TOldDoorSounds") + +/client/verb/toggle_department_door_sounds() + set name = "Toggle Department Door Sounds" + set category = "Preferences" + set desc = "Toggles Department-Specific Door Sounds" + + var/pref_path = /datum/client_preference/department_door_sounds + + toggle_preference(pref_path) + + to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear per-department door sounds.") + + SScharacter_setup.queue_preferences_save(prefs) + + feedback_add_details("admin_verb","TDepartmentDoorSounds") /client/verb/toggle_pickup_sounds() set name = "Toggle Picked Up Item Sounds" diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm index 37979f96c5..4c1890e78a 100644 --- a/code/modules/economy/Accounts.dm +++ b/code/modules/economy/Accounts.dm @@ -35,7 +35,7 @@ T.amount = starting_funds if(!source_db) //set a random date, time and location some time over the past few decades - T.date = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], 25[rand(10,56)]" + T.date = "[num2text(rand(1,28))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], 23[rand(12,19)]" // VOREStation Edit: lore-compliant dates T.time = "[rand(0,24)]:[rand(11,59)]" T.source_terminal = "NTGalaxyNet Terminal #[rand(111,1111)]" diff --git a/code/modules/examine/descriptions/food.dm b/code/modules/examine/descriptions/food.dm deleted file mode 100644 index c5f3e80728..0000000000 --- a/code/modules/examine/descriptions/food.dm +++ /dev/null @@ -1,50 +0,0 @@ -/obj/item/weapon/reagent_containers/food/snacks/candy - description_fluff = "The Candy Bar is a copylefted recipe designed by information freedom activists to bring the delicious taste of nougat to the masses. It's cheap, familiar, and easy to synthesize, so most food vendors stock it." - -/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar - description_fluff = "The SWOLEMAX protien bar is the flagship product of SWOLEMAX, a health foods corporation recently independent of Centauri Provisions. It tastes like a brick of ashes." - -/obj/item/weapon/reagent_containers/food/snacks/candy_corn - description_fluff = "Nobody knows why Nanotrasen keeps making these waxy pieces of sugar and bone glue, but a handful of people swear by them. Purportedly popular with Skrell children, dubiously enough." - -/obj/item/weapon/reagent_containers/food/snacks/chips - description_fluff = "Actual potatos haven't been used in potato chips for centuries. They're mostly a denatured nutrient slurry pressed into a chip-shaped mold and salted. Still tastes the same." - -/obj/item/weapon/reagent_containers/food/snacks/donut - description_fluff = "These donuts claim to be made fresh daily in a boutique bakery in New Reykjavik and delivered to Nanotrasen's hardworking asset protection crew. They're probably synthesized." - -/obj/item/weapon/reagent_containers/food/snacks/donkpocket - description_fluff = "DONKpockets were originally a Nanotrasen product, an attempt to break into the food market controlled by Centauri Provisions. Somehow, Centauri wound up with the rights to the DONK brand, ending Nanotrasen's ambitions. They taste pretty okay." - -/obj/item/weapon/reagent_containers/food/snacks/pie - description_fluff = "One of the more esoteric terms of the Nanotrasen-Centauri Noncompetition Agreement of 2545 was a requirement that Nanotrasen stock these pies on all their stations. They're calibrated for commedic value, not taste." - -/obj/item/weapon/reagent_containers/food/snacks/sosjerky - description_fluff = "Space Cows, here, being an affectionate name given by early colonists to the massive food synthesizers used to sustain independent outposts before the dominance of hydroponics. Tastes like cardboard rubbed in meat seasoning." - -/obj/item/weapon/reagent_containers/food/snacks/no_raisin - description_fluff = "Originally Raisin Blend no. 4, 4noraisins obtained their current name in the Skadi Positronic Exclusion Crisis of 2442, where they were rebranded as part of the protests." //the exclusion crisis, presumably, involved positronic immigration being banned for no raisin - -/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie - description_fluff = "Space Twinkies, a modification of a flagship product of one of Centauri Provision's predecessor corporations, are designed to withstand vacuum, radiation, dehydration, and long periods of acceleration without losing their shape or taste. They're not great, but they have earned their names (and enormous revenue for their parent company)." - -/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers - description_fluff = "Cheesie Honkers, a previously niche line of cheese puffs from a subsidiary of a subsidiary of Centauri Provisions, rose to household-name status when their tell-tale orange dust was used as evidence to convict notorious positronic serial killer Etoid in 2404." - -/obj/item/weapon/reagent_containers/food/snacks/syndicake - description_fluff = "Due to ongoing litigation concerning the business practices of the Cakemakers' Syndicate, access to this product has been removed from all Centauri and Getmore vending machines. This is a shame, because Syndi-Cakes are generally regarded as the most appetizing thing in them." - -/obj/item/weapon/reagent_containers/food/snacks/twobread - description_fluff = "The most popular recipe from the Morpheus Cyberkinetics cookbook 'Calories for Organics'" - -/obj/item/weapon/reagent_containers/food/snacks/liquidfood - description_fluff = "A survival food commonly packed onto short-distance bluespace shuttles and similar vessels. Tastes like chalk, but is packed full of nutrients and will keep you alive." - -/obj/item/weapon/reagent_containers/food/snacks/tastybread - description_fluff = "This is the product that brought Centauri Provisions into the limelight. A product of the earliest extrasolar colony of Heaven, the Bread Tube, while bland, contains all the nutrients a spacer needs to get through the day and is decidedly edible when compared to some of its competitors." - -/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks - description_fluff = "A jerky product made of Go'moa mushrooms native to the Skrellian homeworld of Qerr'balak. SkrellSnaks are actually a product of Natuna, designed to welcome Ue-Katish refugees to their colony. The brand was recreated by Centauri Provisions after Natuna and SolGov broke off diplomatic relations." - -/obj/item/weapon/reagent_containers/food/snacks/unajerky - description_fluff = "Removed from Getmore vendors pending approval from the SolGov Nutrition Council, Sissalik Jerky remains a popular snack for Unathi immigrants and daredevils looking for a meaty, spicy treat that makes Scaredy's look like tofu." diff --git a/code/modules/examine/descriptions/smokeables.dm b/code/modules/examine/descriptions/smokeables.dm deleted file mode 100644 index ddec465368..0000000000 --- a/code/modules/examine/descriptions/smokeables.dm +++ /dev/null @@ -1,39 +0,0 @@ -/obj/item/weapon/storage/fancy/cigarettes - description_fluff = "The Trans-Stellar Duty-Free Cigarette Company was created as an imprint of NanoTrasen. They are the most boring, tasteless, dry cigarettes on the market, but due to how generic they are, they are still the most well-known and widespread cigarettes in the universe." - -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco - description_fluff = "DromedaryCo is one of the oldest companies that produces cigarettes. Being a company that has changed hands and names several times through the years, their cigarettes are now very different from the original, and old-timers tend to complain about the quality of their current product. While their profits have been dwindling over the past few years due to marketing schemes deemed 'unethical', they still remain on the forefront of the smokeable industry." - -/obj/item/weapon/storage/fancy/cigarettes/killthroat - description_fluff = "AcmeCo, a subsidiary of Xion Manufacturing Group, is known for their signature high-tar cigarettes. Some accuse the cigarettes of having harmful things in them beyond tar, but Xion officials refuse to comment on the issue." - -/obj/item/weapon/storage/fancy/cigarettes/luckystars - description_fluff = "Lucky Stars were created on Venus by a researcher seeking to make a good quality cigarette from pod-based tobacco plants. The researcher only managed to make these, but made quite a profit off of them nonetheless." - -/obj/item/weapon/storage/fancy/cigarettes/jerichos - description_fluff = "Stealth Assault Enterprises ex-contractors once decided to make a cigarette that was easy to light and had a waterproof case, specifically tailored for soldiers. They created Jerichos. Jerichos are known for their hickory smoke and warm feeling in your lungs. They are loved by soldiers and people employed in para-military outfits." - -/obj/item/weapon/storage/fancy/cigarettes/menthols - description_fluff = "The Temperamento Menthol Company is a large cigarette company based in Mars. They have been around since the very dawn of human colonization and have remained a favorite for those seeking a more numbing cigarette.
\ -
\ - This is a pack of Temperamento Menthols, the main product of the company. They taste like menthol, surprisingly enough." - -/obj/item/weapon/storage/fancy/cigarettes/carcinomas - description_fluff = "The CarcinoCo was originally destined to fail, as the company blatantly advertized themselves as creating the 'most cancerous cigarette'. The cigarettes became a hit among those rich enough to afford regular lung replacements." - -/obj/item/weapon/storage/fancy/cigarettes/professionals - description_fluff = "Decades ago, probably before you were born, Gilthari Exports created the Professional 120s. They wanted to make a fancy cigarette that would be considered a luxury. Nowadays, they are generally concidered an emblem of the nouveau riche and the elderly. They are, however, very high-quality and made from the very best Solar tobacco." - -/obj/item/clothing/mask/smokable/cigarette/cigar - description_fluff = "While the label does say that this is a 'premium cigar', it really cannot match other types of cigars on the market. Is it a quality cigarette? Perhaps. Was it hand-made with care? No. This is what differentiates between quality products that Gilthari puts out and NanoTrasen 'premium' cigars like this one." - -/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba - description_fluff = "Cohiba has been a popular cigar company for centuries. They are still based out of Cuba and refuse to expand and therefore have a very limited quantity, making their cigars coveted all through known space. Robusto is one of their most popular shapes of cigars." - -/obj/item/clothing/mask/smokable/cigarette/cigar/havana - description_fluff = "'Havanian' is an umbrella term for any cigar made in the typical handmade style of Cuba. This particular cigar is from Gilthari's cigar manufacturers. While this way of making quality cigars has become slightly bastardized over the years, overall quality has remained relatively the same, even if there is a large quantity of 'Havanian' cigars." - -/obj/item/clothing/mask/smokable/pipe - description_fluff = "ClassiCo Accessories and Haberdashers is a widespread company originating out of Mars. They seek to create quality goods to give men a more 'classy' look. Most of their items are high-end and expensive, but they plege to back their prices up with quality.
\ -
\ - This pipe is a ClassiCo pipe. It is made out of fine, stained cherry wood." diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index cca6838836..51cf85b6a2 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -112,7 +112,7 @@ mob/living/carbon/proc/handle_hallucinations() //Strange audio //to_chat(src, "Strange Audio") switch(rand(1,12)) - if(1) src << 'sound/machines/airlock.ogg' + if(1) src << 'sound/machines/door/old_airlock.ogg' if(2) if(prob(50))src << 'sound/effects/Explosion1.ogg' else src << 'sound/effects/Explosion2.ogg' @@ -121,7 +121,7 @@ mob/living/carbon/proc/handle_hallucinations() if(5) src << 'sound/effects/Glassbr2.ogg' if(6) src << 'sound/effects/Glassbr3.ogg' if(7) src << 'sound/machines/twobeep.ogg' - if(8) src << 'sound/machines/windowdoor.ogg' + if(8) src << 'sound/machines/door/windowdoor.ogg' if(9) //To make it more realistic, I added two gunshots (enough to kill) src << 'sound/weapons/Gunshot1.ogg' diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index 01ef9591bc..b876a0e1d1 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -66,7 +66,7 @@ name = "\improper Diet Dr. Gibb" desc = "A delicious mixture of 42 different flavors, one of which is water." description_fluff = "Following a 2490 lawsuit and a spate of deaths, Gilthari Exports reminds customers that the 'Dr.' legally stands for 'Drink'." - icon_state = "diet_dr_gibb" + icon_state = "dr_gibb_diet" center_of_mass = list("x"=16, "y"=8) /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb_diet/Initialize() diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 9c134a90a4..93e0b2c5ab 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -342,7 +342,7 @@ /obj/item/weapon/reagent_containers/food/snacks/candy/gummy name = "\improper AlliCo Gummies" desc = "Somehow, there's never enough cola bottles." - description_fluff = "AlliCo's grab-bags of gummy candies come in over a thousand novelty shapes and dozens of flavours. Shoes, astronauts, bunny rabbits and singularities all made an appearance." + description_fluff = "AlliCo's grab-bags of gummy candies come in over a thousand novelty shapes and dozens of flavours. Shoes, astronauts, bunny rabbits and singularities all make an appearance." icon = 'icons/obj/food_snacks.dmi' icon_state = "candy_gums" trash = /obj/item/trash/candy/gums @@ -369,6 +369,7 @@ /obj/item/weapon/reagent_containers/food/snacks/candy_corn name = "candy corn" desc = "It's a handful of candy corn. Cannot be stored in a detective's hat, alas." + description_fluff = "Nobody knows why Nanotrasen keeps making these waxy pieces of sugar and bone glue, but a handful of people swear by them. Purportedly popular with Skrell children, dubiously enough." icon_state = "candy_corn" filling_color = "#FFFCB0" center_of_mass = list("x"=14, "y"=10) @@ -383,7 +384,7 @@ /obj/item/weapon/reagent_containers/food/snacks/chips name = "\improper What-The-Crisps" desc = "Commander Riker's What-The-Crisps, lightly salted." - description_fluff = "What-The-Crisps' retro-styled starship commander has been a marketing staple for almost 200 years." + description_fluff = "What-The-Crisps' retro-styled starship commander has been a marketing staple for almost 200 years. Actual potatos haven't been used in potato chips for centuries. They're mostly a denatured nutrient slurry pressed into a chip-shaped mold and salted. Still tastes the same." icon = 'icons/obj/food_snacks.dmi' icon_state = "chips" trash = /obj/item/trash/chips @@ -510,6 +511,7 @@ /obj/item/weapon/reagent_containers/food/snacks/donut name = "donut" desc = "Goes great with Robust Coffee." + description_fluff = "These donuts claim to be made fresh daily in a boutique bakery in New Reykjavik and delivered to Nanotrasen's hardworking asset protection crew. They're probably synthesized." icon_state = "donut1" filling_color = "#D9C386" var/overlay_state = "box-donut1" @@ -1146,6 +1148,7 @@ /obj/item/weapon/reagent_containers/food/snacks/donkpocket name = "Donk-pocket" desc = "The food of choice for the seasoned traitor." + description_fluff = "DONKpockets were originally a Nanotrasen product, an attempt to break into the food market controlled by Centauri Provisions. Somehow, Centauri wound up with the rights to the DONK brand, ending Nanotrasen's ambitions. They taste pretty okay." icon_state = "donkpocket" filling_color = "#DEDEAB" center_of_mass = list("x"=16, "y"=10) @@ -1381,6 +1384,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pie name = "Banana Cream Pie" desc = "Just like back home, on clown planet! HONK!" + description_fluff = "One of the more esoteric terms of the Nanotrasen-Centauri Noncompetition Agreement of 2545 was a requirement that Nanotrasen stock these pies on all their stations. They're calibrated for comedic value, not taste." icon_state = "pie" trash = /obj/item/trash/plate filling_color = "#FBFFB8" @@ -1663,7 +1667,7 @@ icon = 'icons/obj/food_snacks.dmi' icon_state = "4no_raisins" desc = "Best raisins in the universe. Not sure why." - description_fluff = "The popularity of dried foods across the galaxy is either a direct result of ease of shipping, or a clever marketing ploy by corporations trying to cut back costs. Whatever it is, there must be SOME reason?" + description_fluff = "Originally Raisin Blend no. 4, 4noraisins obtained their current name in the Skadi Positronic Exclusion Crisis of 2442, where they were rebranded as part of the protests. The exclusion crisis, so the story goes, involved positronic immigration being banned for no raisin." trash = /obj/item/trash/raisins filling_color = "#343834" center_of_mass = list("x"=15, "y"=4) @@ -2653,6 +2657,7 @@ /obj/item/weapon/reagent_containers/food/snacks/twobread name = "Two Bread" desc = "It is very bitter and winy." + description_fluff = "The most popular recipe from the Morpheus Cyberkinetics cookbook 'Calories for Organics'" icon_state = "twobread" filling_color = "#DBCC9A" center_of_mass = list("x"=15, "y"=12) @@ -4056,6 +4061,7 @@ /obj/item/weapon/reagent_containers/food/snacks/liquidfood name = "\improper LiquidFood Ration" desc = "A prepackaged grey slurry of all the essential nutrients for a spacefarer on the go. Should this be crunchy?" + description_fluff = "A survival food commonly packed onto short-distance bluespace shuttles and similar vessels. Tastes like chalk, but is packed full of nutrients and will keep you alive." icon_state = "liquidfood" trash = /obj/item/trash/liquidfood filling_color = "#A8A8A8" @@ -4117,7 +4123,7 @@ /obj/item/weapon/reagent_containers/food/snacks/tastybread name = "bread tube" desc = "Bread in a tube. Chewy...and surprisingly tasty." - description_fluff = "Due to the high-fructose corn syrup content of NanoTrasen's own-brand bread tubes, many jurisdictions classify them as a confectionary." + description_fluff = "This is the product that brought Centauri Provisions into the limelight. A product of the earliest extrasolar colony of Heaven, the Bread Tube, while bland, contains all the nutrients a spacer needs to get through the day and is decidedly edible when compared to some of its competitors. Due to the high-fructose corn syrup content of NanoTrasen's own-brand bread tubes, many jurisdictions classify them as a confectionary." icon = 'icons/obj/food_snacks.dmi' icon_state = "tastybread" trash = /obj/item/trash/tastybread @@ -4133,9 +4139,10 @@ /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks name = "\improper SkrellSnax" desc = "Cured fungus shipped all the way from Qerr'balak, almost like jerky! Almost." - description_fluff = "Despite the packaging, most SkrellSnax sold in Vir are produced using locally-grown fungi in controversial Skrell-owned biodomes on the suface of Sif." + description_fluff = "Despite the packaging, most SkrellSnax sold in Vir are produced using locally-grown, Qerr'Balak-native Go'moa fungi in controversial Skrell-owned biodomes on the suface of Sif. SkrellSnax were originally a product of Natuna, designed to welcome Ue-Katish refugees to their colony. The brand was recreated by Centauri Provisions after Natuna and SolGov broke off diplomatic relations." icon = 'icons/obj/food_snacks.dmi' icon_state = "skrellsnacks" + trash = /obj/item/trash/skrellsnax filling_color = "#A66829" center_of_mass = list("x"=15, "y"=12) nutriment_amt = 10 @@ -4150,7 +4157,7 @@ icon = 'icons/obj/food_snacks.dmi' icon_state = "unathitinred" desc = "An incredibly well made jerky, shipped in all the way from Moghes." - description_fluff = "The exact meat and spices used in the curing of Sissalik Jerky are a well-kept secret, and thought to not exist at all outside of Hegemony space. Many have tried to replicate the flavour, but none have come close, so the brand remains a highly prized import." + description_fluff = "The exact meat and spices used in the curing of Sissalik Jerky are a well-kept secret, and thought to not exist at all outside of Hegemony space. Many have tried to replicate the flavour, but none have come close, so the brand remains a highly prized import. " trash = /obj/item/trash/unajerky filling_color = "#631212" center_of_mass = list("x"=15, "y"=9) diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index fa6bed5c10..63158f9cba 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -250,7 +250,7 @@ //Strange audio //to_chat(src, "Strange Audio") switch(rand(1,12)) - if(1) src << 'sound/machines/airlock.ogg' + if(1) src << 'sound/machines/door/old_airlock.ogg' if(2) if(prob(50))src << 'sound/effects/Explosion1.ogg' else src << 'sound/effects/Explosion2.ogg' @@ -259,7 +259,7 @@ if(5) src << 'sound/effects/Glassbr2.ogg' if(6) src << 'sound/effects/Glassbr3.ogg' if(7) src << 'sound/machines/twobeep.ogg' - if(8) src << 'sound/machines/windowdoor.ogg' + if(8) src << 'sound/machines/door/windowdoor.ogg' if(9) //To make it more realistic, I added two gunshots (enough to kill) src << 'sound/weapons/Gunshot1.ogg' diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 5ba5b7deb8..ad1e767aca 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -686,13 +686,26 @@ add_fingerprint(user) - if(istype(user,/mob/living/carbon/human)) + if(opened && !wiresexposed && (!istype(user, /mob/living/silicon))) + var/datum/robot_component/cell_component = components["power cell"] + if(cell) + cell.update_icon() + cell.add_fingerprint(user) + user.put_in_active_hand(cell) + to_chat(user, "You remove \the [cell].") + cell = null + cell_component.wrapped = null + cell_component.installed = 0 + updateicon() + else if(cell_component.installed == -1) + cell_component.installed = 0 + var/obj/item/broken_device = cell_component.wrapped + to_chat(user, "You remove \the [broken_device].") + user.put_in_active_hand(broken_device) + + if(istype(user,/mob/living/carbon/human) && !opened) var/mob/living/carbon/human/H = user - //VOREStation Removal - //if(H.species.can_shred(H)) - // attack_generic(H, rand(30,50), "slashed") - // return - //Adding borg petting. Help intent pets, Disarm intent taps, Grab should remove the battery for replacement, and Harm is punching(no damage) + //Adding borg petting. Help intent pets, Disarm intent taps and Harm is punching(no damage) switch(H.a_intent) if(I_HELP) visible_message("[H] pets [src].") @@ -712,23 +725,6 @@ visible_message("[H] taps [src].") return - if(opened && !wiresexposed && (!istype(user, /mob/living/silicon))) - var/datum/robot_component/cell_component = components["power cell"] - if(cell) - cell.update_icon() - cell.add_fingerprint(user) - user.put_in_active_hand(cell) - to_chat(user, "You remove \the [cell].") - cell = null - cell_component.wrapped = null - cell_component.installed = 0 - updateicon() - else if(cell_component.installed == -1) - cell_component.installed = 0 - var/obj/item/broken_device = cell_component.wrapped - to_chat(user, "You remove \the [broken_device].") - user.put_in_active_hand(broken_device) - //Robots take half damage from basic attacks. /mob/living/silicon/robot/attack_generic(var/mob/user, var/damage, var/attack_message) return ..(user,FLOOR(damage/2, 1),attack_message) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm index f1f13b832f..a49309e713 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm @@ -6,7 +6,7 @@ /mob/living/simple_mob/vore/rabbit name = "rabbit" desc = "It's a fluffy, smol bunny! Adorable!" - tt_desc = "Vulpes zerda" + tt_desc = "Oryctolagus cuniculus domesticus" icon_state = "rabbit_brown" icon_living = "rabbit_brown" @@ -26,12 +26,12 @@ melee_damage_lower = 1 melee_damage_upper = 3 attacktext = list("nipped") - + movement_cooldown = 3 say_list_type = /datum/say_list/rabbit ai_holder_type = /datum/ai_holder/simple_mob/passive - + // Vore vars vore_active = 1 vore_bump_chance = 10 @@ -40,16 +40,16 @@ vore_pounce_maxhealth = 100 // They won't pounce by default, as they're passive. This is just so the nom check succeeds. :u vore_default_mode = DM_HOLD vore_icons = SA_ICON_LIVING - + var/body_color //brown, black and white, leave blank for random - + var/grumpiness = 0 // This determines how grumpy we are. Pet us to increase it, leave us alone to decrease. var/last_pet // This tracks the last time someone patted us. var/grump_decay = 5 SECONDS // This is how quickly our grumpiness decays. - + /mob/living/simple_mob/vore/rabbit/New() . = ..() - + if(!body_color) body_color = pick( list("brown","black","white") ) icon_state = "rabbit_[body_color]" @@ -57,16 +57,16 @@ icon_living = "rabbit_[body_color]" icon_dead = "rabbit_[body_color]_dead" icon_rest = "rabbit_[body_color]_rest" - + /mob/living/simple_mob/vore/rabbit/Life() . = ..() - + if(grumpiness > 0 && last_pet > (world.time + grump_decay)) grumpiness = max(0, grumpiness-rand(5,10)) // Subtract grumpiness randomly in a range of 5-10 if we've not been PAT in the last 5 seconds. - + /mob/living/simple_mob/vore/rabbit/examine(mob/user) . = ..() - + switch(grumpiness) if(-INFINITY to 25) . += "They appear calm." @@ -76,14 +76,14 @@ . += "They seem very annoyed, perhaps you should stop petting them." if(75 to INFINITY) . += "They are very angry. Petting them will likely result in unpleasant things." - + /mob/living/simple_mob/vore/rabbit/attack_hand(mob/user) . = ..() - + if(user.a_intent == I_HELP) // only patpet on help. :p grumpiness = CLAMP(grumpiness + rand(5, 10), 0, 120) last_pet = world.time - + if(grumpiness > 90) // Annoyed bunbun :U var/pounce_chance = CanPounceTarget(user) if(pounce_chance) @@ -93,58 +93,60 @@ speak = list("chrrrs.") emote_hear = list("screms.") emote_see = list("earflicks","wiggles it's tail", "wiggles its nose") - + /mob/living/simple_mob/vore/rabbit/black icon_state = "rabbit_black" icon_living = "rabbit_black" icon_dead = "rabbit_black_dead" icon_rest = "rabbit_black_rest" body_color = "black" - + /mob/living/simple_mob/vore/rabbit/white icon_state = "rabbit_white" icon_living = "rabbit_white" icon_dead = "rabbit_white_dead" icon_rest = "rabbit_white_rest" body_color = "white" - + /mob/living/simple_mob/vore/rabbit/brown icon_state = "rabbit_brown" icon_living = "rabbit_brown" icon_dead = "rabbit_brown_dead" icon_rest = "rabbit_brown_rest" body_color = "brown" - + /mob/living/simple_mob/vore/rabbit/white/lennie name = "Lennie" desc = "A large but somewhat dumb-looking rabbit. Has a little collar that says 'Lennie'!" - + /mob/living/simple_mob/vore/rabbit/brown/george name = "George" desc = "A small and quick bunny with a restless expression in its eyes. Has a little collar that says 'George'!" - + /mob/living/simple_mob/vore/rabbit/killer + tt_desc = "Oryctolagus cuniculus homicidam" + icon_state = "rabbit_killer" icon_living = "rabbit_killer" icon_dead = "rabbit_killer_dead" icon_rest = "rabbit_killer_rest" - + maxHealth = 2000 health = 2000 harm_intent_damage = 5 melee_damage_lower = 1 melee_damage_upper = 3 attacktext = list("nipped") - + movement_cooldown = 0.5 // very fast bunbun. - + vore_pounce_chance = 100 vore_pounce_falloff = 0.2 - + body_color = "killer" // Set this so New() doesn't try to randomize us. say_list_type = /datum/say_list/rabbit ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive - + /mob/living/simple_mob/vore/rabbit/killer/ex_act() gib() \ No newline at end of file diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index fa276adbfb..8aa649b75f 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -234,22 +234,22 @@ if(isliving(src)) var/mob/living/L = src //VOREStation Edit Start. Flight on mobs. if(L.flying) //Some other checks are done in the wings_toggle proc - if(L.nutrition > 2) - L.adjust_nutrition(-2) //You use up 2 nutrition per TILE and tick of flying above open spaces. If people wanna flap their wings in the hallways, shouldn't penalize them for it. + if(L.nutrition > 0.5) + L.adjust_nutrition(-0.5) //You use up -0.5 nutrition per TILE and tick of flying above open spaces. If people wanna flap their wings in the hallways, shouldn't penalize them for it. if(L.incapacitated(INCAPACITATION_ALL)) L.stop_flying() //Just here to see if the person is KO'd, stunned, etc. If so, it'll move onto can_fall. else if (L.nutrition > 1000) //Eat too much while flying? Get fat and fall. to_chat(L, "You're too heavy! Your wings give out and you plummit to the ground!") L.stop_flying() //womp womp. - else if(L.nutrition < 300 && L.nutrition > 289) //290 would be risky, as metabolism could mess it up. Let's do 289. + else if(L.nutrition < 300 && L.nutrition > 299.4) //290 would be risky, as metabolism could mess it up. Let's do 289. to_chat(L, "You are starting to get fatigued... You probably have a good minute left in the air, if that. Even less if you continue to fly around! You should get to the ground soon!") //Ticks are, on average, 3 seconds. So this would most likely be 90 seconds, but lets just say 60. - L.adjust_nutrition(-10) + L.adjust_nutrition(-0.5) return - else if(L.nutrition < 100 && L.nutrition > 89) + else if(L.nutrition < 100 && L.nutrition > 99.4) to_chat(L, "You're seriously fatigued! You need to get to the ground immediately and eat before you fall!") return - else if(L.nutrition < 2) //Should have listened to the warnings! + else if(L.nutrition < 10) //Should have listened to the warnings! to_chat(L, "You lack the strength to keep yourself up in the air...") L.stop_flying() else diff --git a/code/modules/research/rdconsole_tgui.dm b/code/modules/research/rdconsole_tgui.dm index 7a6d540b8d..6d7d0fb8bf 100644 --- a/code/modules/research/rdconsole_tgui.dm +++ b/code/modules/research/rdconsole_tgui.dm @@ -42,6 +42,9 @@ data["busy_msg"] = busy_msg data["search"] = search + data["builder_page"] = builder_page + data["design_page"] = design_page + data["info"] = null if(!locked && !busy_msg) data["info"] = list( diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index bb0937378d..b3f5013ffd 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -43,6 +43,7 @@ research holder datum. ** Master Types ** ** Includes all the helper procs and basic tech processing. ** ***************************************************************/ +GLOBAL_LIST_INIT(design_datums, list()) /datum/research //Holder for all the existing, archived, and known tech. Individual to console. var/list/known_tech = list() //List of locally known tech. Datum/tech go here. @@ -50,19 +51,25 @@ research holder datum. var/list/known_designs = list() //List of available designs. /datum/research/New() //Insert techs into possible_tech here. Known_tech automatically updated. - for(var/T in typesof(/datum/tech) - /datum/tech) - known_tech += new T(src) - for(var/D in typesof(/datum/design) - /datum/design) - possible_designs += new D(src) -// generate_integrated_circuit_designs() + if(!LAZYLEN(GLOB.design_datums)) + for(var/T in typesof(/datum/design) - /datum/design) + GLOB.design_datums += new T + possible_designs = GLOB.design_datums + + if(!LAZYLEN(known_tech)) + for(var/T in typesof(/datum/tech) - /datum/tech) + known_tech += new T RefreshResearch() /datum/research/techonly - /datum/research/techonly/New() - for(var/T in typesof(/datum/tech) - /datum/tech) - known_tech += new T(src) - RefreshResearch() + . = ..() + possible_designs = list() + known_designs = list() + +/datum/research/techonly/RefreshResearch() + . = ..() + known_designs = list() // Just in case //Checks to see if design has all the required pre-reqs. //Input: datum/design; Output: 0/1 (false/true) @@ -117,21 +124,6 @@ research holder datum. var/datum/tech/check_tech = T if(initial(check_tech.id) == ID) return initial(check_tech.name) -/* -/datum/research/proc/generate_integrated_circuit_designs() - spawn(2 SECONDS) // So the list has time to initialize. - for(var/obj/item/integrated_circuit/IC in all_integrated_circuits) - if(IC.spawn_flags & IC_SPAWN_RESEARCH) - var/datum/design/D = new /datum/design/circuit(src) - D.name = "Custom circuitry \[[IC.category_text]\] ([IC.name])" - D.id = "ic-[lowertext(IC.name)]" - if(IC.origin_tech && IC.origin_tech.len) - D.req_tech = IC.origin_tech.Copy() - else - D.req_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2) - D.build_path = IC.type - possible_designs += D -*/ /*************************************************************** ** Technology Datums ** diff --git a/code/modules/tgui/modules/crew_monitor.dm b/code/modules/tgui/modules/crew_monitor.dm index 86e039222c..9d4af68652 100644 --- a/code/modules/tgui/modules/crew_monitor.dm +++ b/code/modules/tgui/modules/crew_monitor.dm @@ -52,9 +52,15 @@ var/list/map_levels = uniquelist(using_map.get_map_levels(z, TRUE, om_range = DEFAULT_OVERMAP_RANGE)) data["map_levels"] = map_levels - data["crewmembers"] = list() + var/list/crewmembers = list() for(var/zlevel in map_levels) - data["crewmembers"] += crew_repository.health_data(zlevel) + crewmembers += crew_repository.health_data(zlevel) + + // This is apparently necessary, because the above loop produces an emergent behavior + // of telling you what coordinates someone is at even without sensors on, + // because it strictly sorts by zlevel from bottom to top, and by coordinates from top left to bottom right. + shuffle_inplace(crewmembers) + data["crewmembers"] = crewmembers return data diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm index fa1d87c686..9050977e34 100644 --- a/code/modules/xenoarcheaology/tools/tools.dm +++ b/code/modules/xenoarcheaology/tools/tools.dm @@ -215,6 +215,7 @@ current = null else QDEL_LIST_NULL(positive_locations) + positive_locations = list() QDEL_NULL(current) return TRUE diff --git a/icons/mob/hud_jobs_vr.dmi b/icons/mob/hud_jobs_vr.dmi index 4a0eba7d74..f3878ac2d4 100644 Binary files a/icons/mob/hud_jobs_vr.dmi and b/icons/mob/hud_jobs_vr.dmi differ diff --git a/maps/offmap_vr/talon/talon1.dmm b/maps/offmap_vr/talon/talon1.dmm index 7f51d46c22..6ba84708aa 100644 --- a/maps/offmap_vr/talon/talon1.dmm +++ b/maps/offmap_vr/talon/talon1.dmm @@ -511,10 +511,22 @@ /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/brig) "bh" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /obj/structure/table/standard, -/obj/item/device/defib_kit/loaded, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/device/sleevemate, +/obj/item/weapon/storage/firstaid/surgery, +/obj/item/stack/nanopaste{ + pixel_x = -7; + pixel_y = -4 + }, +/obj/item/stack/nanopaste{ + pixel_x = 9; + pixel_y = -4 + }, +/obj/item/device/robotanalyzer{ + pixel_y = -8 + }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/talon/deckone/medical) "bi" = ( @@ -742,7 +754,8 @@ "bE" = ( /obj/machinery/vending/engineering{ products = list(/obj/item/clothing/under/rank/chief_engineer = 4, /obj/item/clothing/under/rank/engineer = 4, /obj/item/clothing/shoes/orange = 4, /obj/item/clothing/head/hardhat = 4, /obj/item/weapon/storage/belt/utility = 4, /obj/item/clothing/glasses/meson = 4, /obj/item/clothing/gloves/yellow = 4, /obj/item/weapon/tool/screwdriver = 12, /obj/item/weapon/tool/crowbar = 12, /obj/item/weapon/tool/wirecutters = 12, /obj/item/device/multitool = 12, /obj/item/weapon/tool/wrench = 12, /obj/item/device/t_scanner = 12, /obj/item/stack/cable_coil/heavyduty = 8, /obj/item/weapon/cell = 8, /obj/item/weapon/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/weapon/light/tube = 10, /obj/item/clothing/head/hardhat/red = 4, /obj/item/clothing/suit/fire = 4, /obj/item/weapon/stock_parts/scanning_module = 5, /obj/item/weapon/stock_parts/micro_laser = 5, /obj/item/weapon/stock_parts/matter_bin = 5, /obj/item/weapon/stock_parts/manipulator = 5, /obj/item/weapon/stock_parts/console_screen = 5); - req_log_access = 301; + req_access = list(301); + req_log_access = list(301); req_one_access = list(301) }, /turf/simulated/floor/tiled/eris/dark/brown_platform, @@ -752,8 +765,8 @@ /obj/item/weapon/storage/toolbox/electrical, /obj/item/stack/marker_beacon/thirty, /obj/item/weapon/pipe_dispenser, -/obj/structure/closet/hydrant{ - pixel_y = 32 +/obj/machinery/alarm/talon{ + pixel_y = 28 }, /turf/simulated/floor/tiled/eris/dark/brown_platform, /area/talon/deckone/port_eng_store) @@ -1170,6 +1183,21 @@ /obj/structure/vehiclecage/spacebike, /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/central_hallway) +"cs" = ( +/obj/structure/closet/hydrant{ + pixel_x = -32; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/eris/dark/brown_platform, +/area/talon/deckone/port_eng_store) +"ct" = ( +/obj/structure/table/standard, +/obj/item/device/defib_kit/jumper_kit/loaded, +/obj/item/device/defib_kit/loaded, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/device/sleevemate, +/turf/simulated/floor/tiled/eris/white/bluecorner, +/area/talon/deckone/medical) "cv" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/tiled/steel_ridged, @@ -1519,14 +1547,6 @@ }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/talon/deckone/brig) -"eV" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/turf/simulated/floor/tiled/eris/white/bluecorner, -/area/talon/deckone/medical) "fi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; @@ -4947,15 +4967,6 @@ /obj/item/weapon/pen, /turf/simulated/floor/tiled/eris/steel/cargo, /area/talon/deckone/workroom) -"Nt" = ( -/obj/machinery/alarm/talon{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/eris/dark/brown_platform, -/area/talon/deckone/port_eng_store) "Nu" = ( /obj/structure/table/standard, /obj/fiftyspawner/glass, @@ -14496,7 +14507,7 @@ dH am gU dR -Nt +cs gU NP ho @@ -17184,7 +17195,7 @@ xH aw Xd be -eV +bh dO uN SI @@ -17610,7 +17621,7 @@ dz Rk Gb bC -bh +ct dO Gt SI diff --git a/maps/offmap_vr/talon/talon2.dmm b/maps/offmap_vr/talon/talon2.dmm index a54d134496..14a3234ed6 100644 --- a/maps/offmap_vr/talon/talon2.dmm +++ b/maps/offmap_vr/talon/talon2.dmm @@ -379,7 +379,6 @@ pixel_y = 0 }, /obj/structure/table/standard, -/obj/item/weapon/paper/talon_shields, /obj/structure/closet/hydrant{ pixel_x = 0; pixel_y = 32; @@ -667,6 +666,20 @@ }, /turf/simulated/floor/wood, /area/talon/decktwo/sec_room) +"bA" = ( +/obj/machinery/power/apc/talon{ + cell_type = /obj/item/weapon/cell/apc; + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/structure/table/standard, +/obj/item/weapon/paper/talon_shields, +/turf/simulated/floor/tiled/eris/dark/violetcorener, +/area/talon/decktwo/tech) "bB" = ( /obj/machinery/alarm/talon{ dir = 4; @@ -2253,19 +2266,6 @@ "pi" = ( /turf/simulated/floor/hull/airless, /area/talon/maintenance/decktwo_solars) -"pp" = ( -/obj/machinery/power/apc/talon{ - cell_type = /obj/item/weapon/cell/apc; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/table/standard, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/talon/decktwo/tech) "pt" = ( /obj/effect/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external{ @@ -14326,7 +14326,7 @@ NT bF ds aZ -pp +bA Db iV ds diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 7561fe8f9c..7efa3849bb 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -3118,6 +3118,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "afJ" = ( @@ -3473,23 +3479,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "agr" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ +/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/corner/lightgrey/bordercorner2{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora_storage) "ags" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4700,35 +4699,21 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ain" = ( -/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/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 }, +/obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora_storage) "aio" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/panic_shelter) @@ -5808,21 +5793,21 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "akd" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora_storage) "ake" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -7484,8 +7469,15 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora_storage) "anm" = ( -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/light, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ann" = ( @@ -8017,12 +8009,19 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aoj" = ( +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 9 + dir = 1 }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 +/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) "aok" = ( @@ -8051,9 +8050,17 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "aoo" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 5 +/obj/machinery/camera/network/tether, +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, +/obj/effect/floor_decal/corner/mauve/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) "aop" = ( @@ -8197,15 +8204,23 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aoD" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/firealarm{ + layer = 3.3; + pixel_x = 4; + pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/surface_three_hall) "aoE" = ( /obj/structure/sign/directions/evac{ dir = 1 @@ -8213,14 +8228,20 @@ /turf/simulated/wall/r_wall, /area/vacant/vacant_shop) "aoF" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 6 +/obj/effect/floor_decal/borderfloor{ + dir = 5 }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 9 +/obj/effect/floor_decal/corner/mauve/border{ + dir = 5 }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) @@ -8442,14 +8463,23 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "apa" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/obj/structure/closet/secure_closet/hydroponics/sci{ + req_access = list(77) }, -/obj/machinery/alarm{ - pixel_y = 22 +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora) "apb" = ( /obj/structure/cable{ icon_state = "4-8" @@ -8888,6 +8918,10 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "apH" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, @@ -9269,26 +9303,41 @@ /turf/simulated/floor/tiled/techfloor, /area/vacant/vacant_shop) "aql" = ( +/obj/structure/closet/l3closet/scientist, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora) "aqm" = ( /obj/machinery/beehive, /turf/simulated/floor/grass, /area/hydroponics) "aqn" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/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 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -9668,45 +9717,39 @@ /turf/simulated/wall, /area/tether/surfacebase/surface_three_hall) "aqU" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 }, -/obj/machinery/newscaster{ - pixel_x = 25 - }, -/obj/effect/floor_decal/borderfloor/corner{ +/obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ +/obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora) "aqV" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/grass, /area/hydroponics) "aqW" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 9 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/structure/closet/secure_closet/hydroponics/sci{ - req_access = list(77) +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "aqX" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/alarm{ + pixel_y = 25 }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 @@ -9721,15 +9764,20 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aqZ" = ( -/obj/structure/closet/firecloset, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ara" = ( -/obj/structure/closet/l3closet/scientist, -/obj/machinery/light{ +/obj/machinery/camera/network/research, +/obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ @@ -9868,33 +9916,34 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside3) "aro" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 }, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d2 = 2; + icon_state = "0-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arp" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, /obj/item/device/radio/intercom{ dir = 1; pixel_y = 24 }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arq" = ( @@ -9933,41 +9982,33 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ars" = ( -/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/vending/hydronutrients, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) +"art" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) -"art" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/surface_three_hall) "aru" = ( /turf/simulated/wall, /area/crew_quarters/kitchen) @@ -10096,12 +10137,25 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "arH" = ( -/obj/machinery/vending/hydronutrients, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 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/machinery/door/firedoor/glass/hidden/steel{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/surface_three_hall) "arI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -10144,16 +10198,26 @@ /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) "arM" = ( -/obj/structure/table/woodentable, -/obj/effect/floor_decal/corner/lime/border, -/obj/machinery/light, -/obj/item/weapon/packageWrap, -/obj/item/device/destTagger{ - pixel_x = 4; - pixel_y = 3 +/obj/structure/disposalpipe/segment{ + dir = 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/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/surface_three_hall) "arN" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -10161,21 +10225,43 @@ /turf/simulated/floor/tiled/techfloor, /area/hydroponics) "arO" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/effect/floor_decal/corner/mauve/border{ +/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/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arP" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/border{ - 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 + }, +/obj/effect/floor_decal/corner/mauve{ + dir = 10 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -10195,15 +10281,31 @@ /area/hydroponics) "arS" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 5 +/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 + }, +/obj/effect/floor_decal/corner/mauve{ + dir = 10 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arT" = ( -/obj/machinery/seed_extractor, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 +/obj/machinery/portable_atmospherics/hydroponics, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/floor_decal/corner/mauve{ + dir = 10 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -10228,17 +10330,20 @@ /turf/simulated/wall, /area/tether/surfacebase/public_garden_three) "arX" = ( -/obj/effect/floor_decal/corner/mauve/border{ +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/corner/mauve{ dir = 10 }, -/obj/structure/closet/secure_closet/hydroponics/sci{ - req_access = list(77) - }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arY" = ( -/obj/structure/closet/firecloset, -/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/seed_extractor, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arZ" = ( @@ -10375,18 +10480,25 @@ /turf/simulated/floor/tiled/steel_grid, /area/assembly/chargebay) "asm" = ( -/obj/structure/closet/l3closet/scientist, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) -"asn" = ( -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/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/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/surface_three_hall) +"asn" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "aso" = ( /obj/structure/cable/green{ d1 = 4; @@ -10419,24 +10531,12 @@ /turf/simulated/floor/grass, /area/hydroponics) "asr" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, /turf/simulated/floor/tiled, @@ -10476,11 +10576,17 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "asv" = ( -/obj/effect/floor_decal/corner/mauve/bordercorner{ +/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/xenobiology/xenoflora) +/area/tether/surfacebase/surface_three_hall) "asw" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/alarm{ @@ -10577,20 +10683,41 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "asE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, /obj/effect/floor_decal/corner/mauve/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"asF" = ( +/obj/structure/closet/secure_closet/hydroponics/sci{ + req_access = list(77) + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"asF" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "asG" = ( /obj/machinery/door/airlock/glass{ name = "Hydroponics Break Room"; @@ -10625,9 +10752,9 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "asJ" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "asK" = ( @@ -10757,16 +10884,9 @@ /turf/simulated/floor/grass, /area/hydroponics) "asW" = ( -/obj/structure/table/standard{ - name = "plastic table frame" - }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/storage/box/botanydisk, -/obj/item/weapon/storage/box/botanydisk, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, +/obj/structure/closet/l3closet/scientist, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "asX" = ( @@ -10853,10 +10973,12 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "atj" = ( -/obj/machinery/botany/editor, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "atk" = ( @@ -10879,9 +11001,11 @@ /turf/simulated/floor/plating, /area/crew_quarters/kitchen) "atm" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -10957,8 +11081,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "atv" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/corner/mauve{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "atw" = ( @@ -10972,10 +11097,9 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atx" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/mauve{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "aty" = ( @@ -10990,9 +11114,18 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "atz" = ( -/obj/machinery/portable_atmospherics/hydroponics, +/obj/structure/table/standard{ + name = "plastic table frame" + }, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/weapon/material/minihoe, +/obj/item/weapon/storage/box/botanydisk, +/obj/item/weapon/storage/box/botanydisk, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 6 + dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -11075,10 +11208,12 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atK" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/machinery/botany/editor, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 4 + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -11156,10 +11291,8 @@ /turf/simulated/floor/grass, /area/hydroponics) "atS" = ( -/obj/machinery/botany/extractor, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/corner/mauve/full, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "atT" = ( @@ -11306,13 +11439,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "auh" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/mauve{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora) "aui" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -11320,12 +11454,12 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "auj" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/corner/mauve/full{ + dir = 4 }, -/obj/machinery/camera/network/tether, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora) "auk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11368,7 +11502,7 @@ "aup" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/weapon/reagent_containers/glass/bucket, -/obj/machinery/light{ +/obj/effect/floor_decal/borderfloor{ dir = 4 }, /obj/effect/floor_decal/corner/mauve/border{ @@ -11485,10 +11619,13 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) "auy" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/obj/machinery/botany/extractor, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 }, -/obj/machinery/camera/network/research, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "auz" = ( @@ -11633,23 +11770,27 @@ /turf/simulated/open, /area/tether/surfacebase/surface_three_hall) "auK" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/reagent_dispensers/watertank, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/machinery/light{ + dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/beige/bordercorner, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora) "auL" = ( /obj/structure/sink{ dir = 4; pixel_x = 11 }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, @@ -11660,6 +11801,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, @@ -11804,11 +11948,15 @@ pixel_x = 4; pixel_y = 4 }, +/obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/mauve/bordercorner, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "avc" = ( -/obj/machinery/smartfridge/drying_rack, +/obj/machinery/seed_storage/xenobotany{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -11822,22 +11970,15 @@ /turf/simulated/floor/plating, /area/crew_quarters/kitchen) "ave" = ( -/obj/machinery/biogenerator, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 6 - }, +/obj/machinery/smartfridge/drying_rack, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "avf" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/obj/machinery/camera/network/research{ - dir = 5 +/obj/machinery/biogenerator, +/obj/effect/floor_decal/borderfloor{ + dir = 6 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -11853,27 +11994,27 @@ /turf/simulated/floor/grass, /area/hydroponics) "avh" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -30 }, -/obj/machinery/alarm{ - alarm_id = "pen_nine"; - breach_detection = 0; - dir = 1; - pixel_y = -22 +/obj/machinery/camera/network/research{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 }, -/obj/structure/table/woodentable, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/rnd/xenobiology/xenoflora) "avi" = ( -/obj/effect/floor_decal/corner/lime/border, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/item/weapon/stool/padded, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/mauve/bordercorner, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/rnd/xenobiology/xenoflora) "avj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12060,8 +12201,10 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "avB" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/structure/table/glass, +/obj/machinery/reagentgrinder, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "avC" = ( @@ -12082,8 +12225,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "avE" = ( -/obj/structure/table/glass, -/obj/machinery/reagentgrinder, +/obj/machinery/chem_master, +/obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -12127,7 +12270,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "avI" = ( -/obj/machinery/chem_master, +/obj/structure/table/glass, +/obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -12475,8 +12619,14 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "awu" = ( +/obj/machinery/reagentgrinder, /obj/structure/table/glass, -/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "awv" = ( @@ -12724,10 +12874,18 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/security/lobby) "awJ" = ( -/obj/machinery/reagentgrinder, -/obj/structure/table/glass, +/obj/machinery/smartfridge, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 6 + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 9 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -13111,17 +13269,27 @@ /turf/simulated/floor/grass, /area/maintenance/lower/xenoflora) "axr" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 }, -/obj/machinery/smartfridge, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "axs" = ( -/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/mauve/bordercorner2, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "axt" = ( @@ -13448,14 +13616,21 @@ /area/rnd/outpost/xenobiology/outpost_north_airlock) "axQ" = ( /obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/structure/disposalpipe/trunk, +/obj/effect/floor_decal/borderfloor{ + dir = 9 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 6 +/obj/effect/floor_decal/corner/lime/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/botanystorage) "axR" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -15094,41 +15269,51 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "aAH" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 9 - }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) -"aAI" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) -"aAJ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) +"aAI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) -"aAK" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) +"aAJ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) +"aAK" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aAL" = ( @@ -15172,14 +15357,30 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) "aAP" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, /obj/effect/floor_decal/corner/lime/border{ - dir = 1 + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aAQ" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 5 +/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 = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -15590,18 +15791,12 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aBl" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/item/weapon/stool/padded, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -15752,9 +15947,24 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aBC" = ( -/obj/item/weapon/stool/padded, +/obj/machinery/alarm{ + alarm_id = "pen_nine"; + breach_detection = 0; + dir = 1; + pixel_y = -22 + }, +/obj/structure/table/woodentable, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, /obj/effect/floor_decal/corner/lime/border{ - dir = 4 + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -15882,17 +16092,15 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aBM" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/item/weapon/stool/padded, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/botanystorage) "aBN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -16057,6 +16265,7 @@ /area/hallway/lower/third_south) "aBZ" = ( /obj/machinery/smartfridge/drying_rack, +/obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -16151,7 +16360,13 @@ /area/crew_quarters/kitchen) "aCg" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/sinpockets, +/obj/machinery/light, +/obj/item/weapon/packageWrap, +/obj/item/device/destTagger{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -16194,12 +16409,9 @@ /area/hydroponics) "aCk" = ( /obj/structure/table/woodentable, -/obj/item/clothing/mask/smokable/pipe/cobpipe, -/obj/item/clothing/mask/smokable/cigarette/joint, -/obj/item/weapon/flame/lighter/random, -/obj/effect/floor_decal/corner/lime/border{ - dir = 6 - }, +/obj/item/weapon/storage/box/sinpockets, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aCl" = ( @@ -16397,51 +16609,42 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aCC" = ( -/obj/machinery/vending/hydronutrients, +/obj/structure/table/woodentable, +/obj/item/clothing/mask/smokable/pipe/cobpipe, +/obj/item/clothing/mask/smokable/cigarette/joint, +/obj/item/weapon/flame/lighter/random, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, /obj/effect/floor_decal/corner/lime/border{ - dir = 9 + dir = 6 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aCD" = ( -/obj/machinery/seed_storage/garden, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/surface_three_hall) "aCE" = ( -/obj/item/bee_pack, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/weapon/tool/crowbar, -/obj/item/bee_smoker, -/obj/item/beehive_assembly, -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 }, -/obj/structure/closet/crate/hydroponics{ - desc = "All you need to start your own honey farm."; - name = "beekeeping crate" +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/item/beehive_assembly, -/obj/item/beehive_assembly, -/obj/item/beehive_assembly, -/obj/item/beehive_assembly, -/obj/item/bee_pack, -/obj/item/bee_pack, -/obj/item/bee_pack, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/effect/floor_decal/corner/lime/border{ +/obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/surface_three_hall) "aCF" = ( /obj/machinery/light/small{ dir = 4 @@ -16633,21 +16836,31 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aCW" = ( -/obj/machinery/seed_extractor, +/obj/machinery/vending/hydronutrients, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) +"aCX" = ( +/obj/machinery/seed_storage/garden, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) -"aCX" = ( -/obj/effect/floor_decal/corner/beige{ - dir = 9 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "aCY" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -16946,10 +17159,35 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDC" = ( +/obj/item/bee_pack, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/weapon/tool/crowbar, +/obj/item/bee_smoker, +/obj/item/beehive_assembly, +/obj/structure/closet/crate/hydroponics{ + desc = "All you need to start your own honey farm."; + name = "beekeeping crate" + }, +/obj/item/beehive_assembly, +/obj/item/beehive_assembly, +/obj/item/beehive_assembly, +/obj/item/beehive_assembly, +/obj/item/bee_pack, +/obj/item/bee_pack, +/obj/item/bee_pack, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, -/obj/machinery/smartfridge, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aDD" = ( @@ -17044,11 +17282,13 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDM" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/effect/floor_decal/corner/lime/border{ - dir = 5 +/obj/machinery/seed_extractor, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 }, -/obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aDN" = ( @@ -17148,13 +17388,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aDX" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/machinery/smartfridge, +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -17201,18 +17440,28 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "aEd" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "DRAMATIC"; + name = "Dramatic Blast Door" }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/structure/window/reinforced/polarized/full{ + id = "draama"; + name = "Mystery Window" }, -/obj/structure/closet/crate/bin, -/turf/simulated/floor/wood, +/obj/structure/window/reinforced/polarized{ + dir = 1; + id = "draama"; + name = "Mystery Window" + }, +/obj/machinery/door/blast/shutters{ + id = "Druma"; + layer = 3.3; + name = "Entertainment Shutters" + }, +/turf/simulated/floor/plating, /area/tether/surfacebase/entertainment) "aEe" = ( /obj/structure/table/reinforced, @@ -17289,8 +17538,13 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "aEk" = ( +/obj/structure/closet/secure_closet/hydroponics, +/obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, /obj/effect/floor_decal/corner/lime/border{ - dir = 8 + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -17312,9 +17566,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aEn" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/effect/floor_decal/corner/lime/border{ - 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/tether/surfacebase/botanystorage) @@ -17546,30 +17802,43 @@ /turf/simulated/floor/wood, /area/library) "aEL" = ( -/obj/structure/table/standard{ - name = "plastic table frame" +/obj/structure/closet/secure_closet/hydroponics, +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/effect/floor_decal/borderfloor, -/obj/item/weapon/tool/wrench, /obj/effect/floor_decal/corner/lime/border{ - dir = 9 + dir = 4 }, -/obj/item/weapon/tool/wrench, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aEM" = ( -/obj/structure/table/standard{ - name = "plastic table frame" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/item/weapon/material/knife, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/knife, -/obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border{ - dir = 5 + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + dir = 10 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -17720,20 +17989,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFb" = ( -/obj/effect/floor_decal/corner/lime/border{ +/obj/structure/table/standard{ + name = "plastic table frame" + }, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/weapon/tool/wrench, +/obj/item/weapon/tool/wrench, +/obj/effect/floor_decal/corner/lime/full{ dir = 8 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-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/botanystorage) "aFc" = ( @@ -17828,32 +18093,24 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aFk" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/structure/table/standard{ + name = "plastic table frame" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/item/weapon/material/knife, +/obj/item/weapon/material/minihoe, +/obj/item/weapon/material/minihoe, +/obj/item/weapon/material/knife, +/obj/effect/floor_decal/corner/lime/full{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFl" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -18072,24 +18329,35 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "aFD" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/alarm{ - alarm_id = "pen_nine"; - breach_detection = 0; - dir = 1; - pixel_y = -22 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFE" = ( -/obj/effect/floor_decal/corner/lime/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 +/obj/structure/reagent_dispensers/watertank, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/cable/green, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/full, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFF" = ( @@ -18102,9 +18370,17 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "aFG" = ( -/obj/effect/floor_decal/corner/lime/bordercorner{ +/obj/structure/reagent_dispensers/watertank, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/floor_decal/corner/lime/full{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFH" = ( @@ -18114,11 +18390,29 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFI" = ( -/obj/effect/floor_decal/corner/lime/border{ +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/newscaster{ + pixel_x = 25 + }, +/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 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/surface_three_hall) "aFJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18240,10 +18534,24 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "aFR" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 +/obj/machinery/alarm{ + alarm_id = "pen_nine"; + breach_detection = 0; + dir = 1; + pixel_y = -22 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + dir = 8 }, -/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFS" = ( @@ -18361,10 +18669,13 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "aGa" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24 }, -/obj/machinery/portable_atmospherics/hydroponics, +/obj/structure/cable/green, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aGb" = ( @@ -18374,10 +18685,12 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "aGc" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, /obj/effect/floor_decal/corner/lime/bordercorner{ dir = 8 }, -/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aGd" = ( @@ -18396,17 +18709,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aGe" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/area/tether/surfacebase/botanystorage) "aGf" = ( /obj/machinery/status_display{ pixel_x = 32 @@ -18462,51 +18773,26 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aGj" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/floor_decal/borderfloor{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/corner/lime/border{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/area/tether/surfacebase/botanystorage) "aGk" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, /obj/structure/cable/green{ - icon_state = "0-4" + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "DRAMATIC"; - name = "Dramatic Blast Door" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "draama"; - name = "Mystery Window" - }, -/obj/machinery/door/blast/shutters{ - id = "Druma"; - layer = 3.3; - name = "Entertainment Shutters" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "aGl" = ( /obj/structure/table/reinforced, @@ -18765,14 +19051,8 @@ "aGE" = ( /obj/structure/grille, /obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, /obj/machinery/door/blast/regular/open{ - dir = 4; + dir = 2; id = "DRAMATIC"; name = "Dramatic Blast Door" }, @@ -18781,11 +19061,12 @@ name = "Mystery Window" }, /obj/structure/window/reinforced/polarized{ - dir = 1; + dir = 4; id = "draama"; name = "Mystery Window" }, /obj/machinery/door/blast/shutters{ + dir = 4; id = "Druma"; layer = 3.3; name = "Entertainment Shutters" @@ -19179,21 +19460,24 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "aHo" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/light, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/camera/network/civilian{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass/hidden/steel, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/area/tether/surfacebase/botanystorage) "aHp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aHq" = ( @@ -19746,18 +20030,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aIk" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/obj/effect/floor_decal/corner/lime/bordercorner{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/botanystorage) "aIl" = ( /obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, @@ -20405,12 +20686,23 @@ /turf/simulated/wall, /area/tether/surfacebase/bar_backroom) "aJu" = ( -/obj/effect/floor_decal/corner/lime/border{ +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/servicebackroom) "aJv" = ( /obj/structure/table/gamblingtable, /obj/item/weapon/storage/pill_bottle/dice_nerd, @@ -20535,10 +20827,20 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "aJJ" = ( -/obj/effect/floor_decal/corner/lime/border, -/obj/machinery/portable_atmospherics/hydroponics, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/servicebackroom) "aJK" = ( /obj/item/weapon/stool/padded, /obj/effect/floor_decal/spline/plain{ @@ -20831,12 +21133,28 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/shuttle_pad) "aKl" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 6 +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + 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 = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 }, -/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/servicebackroom) "aKm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20861,14 +21179,15 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aKp" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/weapon/paper{ - desc = ""; - info = "Yes hello, the goat in the freezer is named 'Spike'. Please do not fuck with Spike. He doesn't have the best temper."; - name = "Important notice from Rancher Jim" +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) "aKq" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -22722,14 +23041,14 @@ /turf/simulated/wall/r_wall, /area/rnd/outpost/xenobiology/outpost_south_airlock) "aOg" = ( -/obj/effect/floor_decal/corner/lime/border, -/obj/machinery/light, -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/camera/network/civilian{ +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/servicebackroom) "aOh" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ @@ -27036,15 +27355,11 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aWk" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/light{ + dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/bed/chair/wood{ + dir = 1 }, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) @@ -27665,12 +27980,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aXi" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 10 }, -/obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/area/tether/surfacebase/botanystorage) "aXj" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -28179,25 +28497,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aXV" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/botanystorage) "aXW" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -28630,9 +28934,15 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "aYN" = ( -/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 6 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/botanystorage) "aYO" = ( /turf/simulated/wall/r_wall, /area/maintenance/commandmaint) @@ -29187,37 +29497,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "aZM" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular/open{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "DRAMATIC"; - name = "Dramatic Blast Door" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "draama"; - name = "Mystery Window" - }, -/obj/machinery/door/blast/shutters{ - id = "Druma"; - layer = 3.3; - name = "Entertainment Shutters" - }, -/turf/simulated/floor/plating, +/obj/structure/closet/crate/bin, +/turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "aZN" = ( /obj/structure/table/reinforced, @@ -29324,10 +29605,34 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "aZW" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tether) +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/camera/network/tether{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "aZX" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/foodcart, @@ -29471,35 +29776,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "bah" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular/open{ - dir = 8 - }, /obj/structure/cable/green{ - icon_state = "0-8" + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "DRAMATIC"; - name = "Dramatic Blast Door" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "draama"; - name = "Mystery Window" - }, -/obj/machinery/door/blast/shutters{ - id = "Druma"; - layer = 3.3; - name = "Entertainment Shutters" - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/entertainment) +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/lino, +/area/tether/surfacebase/entertainment/stage) "bai" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -29640,44 +29924,31 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "baw" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable/green{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "bax" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "DRAMATIC" +/obj/machinery/light{ + dir = 4 }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "draama"; - name = "Mystery Window" - }, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "Druma"; - layer = 3.3; - name = "Entertainment Shutters" - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/turf/simulated/floor/plating, +/obj/structure/bed/chair/wood, +/turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "bay" = ( /obj/machinery/light{ @@ -29866,12 +30137,24 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "baM" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/button/remote/blast_door{ + id = "kitchen2"; + name = "Kitchen shutters"; + pixel_x = -24 }, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tourbus/engines) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "baN" = ( /obj/machinery/papershredder, /obj/machinery/alarm{ @@ -30035,14 +30318,28 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "bbg" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/flame/candle, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced/polarized/full{ + id = "draama"; + name = "Mystery Window" }, -/turf/simulated/floor/wood, +/obj/structure/window/reinforced/polarized{ + id = "draama"; + name = "Mystery Window" + }, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "Druma"; + layer = 3.3; + name = "Entertainment Shutters" + }, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "DRAMATIC"; + name = "Dramatic Blast Door" + }, +/turf/simulated/floor/plating, /area/tether/surfacebase/entertainment) "bbh" = ( /obj/structure/bed/chair/wood{ @@ -30072,16 +30369,18 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "bbm" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/item/weapon/paper{ + desc = ""; + info = "Yes hello, the goat in the freezer is named 'Spike'. Please do not fuck with Spike. He doesn't have the best temper."; + name = "Important notice from Rancher Jim" }, -/obj/machinery/camera/network/tether{ - dir = 9 +/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) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bbn" = ( /obj/structure/sign/directions/evac{ dir = 1 @@ -30605,11 +30904,18 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bch" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 6 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bci" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -30696,28 +31002,24 @@ /obj/structure/grille, /obj/machinery/door/firedoor, /obj/machinery/door/blast/regular/open{ - dir = 2; - id = "DRAMATIC" + dir = 4; + id = "DRAMATIC"; + name = "Dramatic Blast Door" }, /obj/structure/window/reinforced/polarized/full{ id = "draama"; name = "Mystery Window" }, /obj/structure/window/reinforced/polarized{ - dir = 4; id = "draama"; name = "Mystery Window" }, /obj/machinery/door/blast/shutters{ - dir = 4; + dir = 2; id = "Druma"; layer = 3.3; name = "Entertainment Shutters" }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/cable/green, /turf/simulated/floor/plating, /area/tether/surfacebase/entertainment) "bcp" = ( @@ -30748,32 +31050,10 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "bcq" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "DRAMATIC" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "draama"; - name = "Mystery Window" - }, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "Druma"; - layer = 3.3; - name = "Entertainment Shutters" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/entertainment) +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tether) "bcr" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -31031,34 +31311,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/entertainment/stage) "bcL" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/atmospherics/unary/engine{ + dir = 1 }, -/obj/structure/table/woodentable, -/turf/simulated/floor/wood, -/area/tether/surfacebase/entertainment) +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tourbus/engines) "bcM" = ( /obj/structure/bed/chair/wood{ dir = 1 }, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) -"bcN" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/entertainment) "bcO" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -31246,14 +31510,19 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment) "bdc" = ( -/obj/effect/floor_decal/corner/mauve/border{ +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, -/obj/machinery/alarm{ - pixel_y = 25 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/freezer) "bdd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -31275,20 +31544,6 @@ }, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) -"bde" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/bed/chair/wood{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/entertainment) "bdf" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -31666,15 +31921,16 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/freezer) "bdT" = ( -/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/white, -/area/crew_quarters/barrestroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/freezer) "bdU" = ( /obj/machinery/firealarm{ layer = 3.3; @@ -31823,12 +32079,18 @@ /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bej" = ( -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/seed_storage/xenobotany{ - dir = 1 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bek" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/requests_console{ @@ -31904,18 +32166,16 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "bes" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/button/remote/blast_door{ - id = "kitchen2"; - name = "Kitchen shutters"; - pixel_x = -24 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/servicebackroom) "bet" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -32174,20 +32434,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) -"beQ" = ( -/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/spline/plain, -/turf/simulated/floor/lino, -/area/tether/surfacebase/entertainment/stage) "beR" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -32202,81 +32448,6 @@ /obj/structure/bed/chair/wood, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) -"beT" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/bed/chair/wood, -/turf/simulated/floor/wood, -/area/tether/surfacebase/entertainment) -"beU" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "DRAMATIC" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "draama"; - name = "Mystery Window" - }, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "Druma"; - layer = 3.3; - name = "Entertainment Shutters" - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/entertainment) -"beV" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "DRAMATIC" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "draama"; - name = "Mystery Window" - }, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "Druma"; - layer = 3.3; - name = "Entertainment Shutters" - }, -/obj/structure/cable/green, -/turf/simulated/floor/plating, -/area/tether/surfacebase/entertainment) -"beW" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/entertainment) "beX" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -32292,13 +32463,17 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "beZ" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/freezer) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/servicebackroom) "bfa" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -32373,95 +32548,6 @@ }, /turf/simulated/wall, /area/tether/surfacebase/entertainment) -"bfh" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - id = "draama"; - name = "Mystery Window" - }, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "Druma"; - layer = 3.3; - name = "Entertainment Shutters" - }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "DRAMATIC"; - name = "Dramatic Blast Door" - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/entertainment) -"bfi" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "DRAMATIC"; - name = "Dramatic Blast Door" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - id = "draama"; - name = "Mystery Window" - }, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "Druma"; - layer = 3.3; - name = "Entertainment Shutters" - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/entertainment) -"bfj" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "DRAMATIC"; - name = "Dramatic Blast Door" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - id = "draama"; - name = "Mystery Window" - }, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "Druma"; - layer = 3.3; - name = "Entertainment Shutters" - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/entertainment) "bfk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -32472,26 +32558,37 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bfl" = ( -/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/corner/grey/diagonal, +/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_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) +"bfm" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 9 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) -"bfm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bfn" = ( @@ -32526,13 +32623,17 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bfq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/door/firedoor/glass/hidden/steel, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bfr" = ( @@ -32837,10 +32938,20 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "bfZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/freezer) +/obj/effect/floor_decal/corner/beige{ + dir = 9 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bga" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -32890,21 +33001,14 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "bgh" = ( -/obj/effect/floor_decal/corner/lime/border{ +/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/sink{ - dir = 8; - pixel_x = -12 - }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/servicebackroom) "bgi" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -32948,15 +33052,6 @@ }, /turf/simulated/floor/tiled/eris/steel/bar_light, /area/tether/surfacebase/barbackmaintenance) -"bgm" = ( -/obj/effect/floor_decal/spline/plain, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/entertainment/stage) "bgn" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -33032,15 +33127,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"bgu" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/table/woodentable, -/turf/simulated/floor/wood, -/area/tether/surfacebase/entertainment) "bgv" = ( /obj/structure/bed/chair/wood{ dir = 8 @@ -33069,17 +33155,21 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgy" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/door/firedoor/glass/hidden/steel, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/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 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "bgz" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -47696,7 +47786,7 @@ jML jHw jpB qWU -baM +bcL aKU aOI aPb @@ -48548,7 +48638,7 @@ caw jHw gHh qWU -baM +bcL aKU aOI aPb @@ -49654,19 +49744,19 @@ aXB bbF ajR aGA +aEd +bfc aGk -bbg -aWk bcJ bcQ bcW bcT bcR -beQ -bgm -beW +bah +bgk +bbk +bfc bbg -bfh bds aIb aID @@ -49796,7 +49886,7 @@ aXE bbF ajR aGA -aGE +aEd bbh bbk bcK @@ -49808,7 +49898,7 @@ beR bgo bbk bgv -bfi +bco bds aIa aIz @@ -49938,7 +50028,7 @@ asT bbF ajR aGA -aZM +aEd bbk bbk bbk @@ -49950,7 +50040,7 @@ bbk bbk bbk bbk -bfi +bco bds aIa aIB @@ -50080,7 +50170,7 @@ auI bbA ajR aGA -bah +aEd bbl beX beX @@ -50092,7 +50182,7 @@ beS beX beX bcM -bfj +bco bds aIa aIz @@ -50225,13 +50315,13 @@ aLh aYC beY bfc -bcL -bde -bcN -aEd -beW -beT -bgu +beX +aWk +bdq +aZM +bbk +bax +beX bfc bff aYC @@ -50366,15 +50456,15 @@ ajR aGA aYC bbn -bax -bco +aGE +aGE aYC bgK -bcq +aGE bgN aYC -beU -beV +aGE +aGE aYC aYC bey @@ -50533,7 +50623,7 @@ aNk uSA aNJ aNP -aZW +bcq aKU abg aOk @@ -50675,7 +50765,7 @@ aNl aNl aNK aNP -aZW +bcq aKU abg aOk @@ -50777,16 +50867,16 @@ bEd apC aqf aOT -aqU +aFI avP avP avP apS apS ajX -bbm -auh -auK +aZW +baw +baw avn avn aKx @@ -50817,7 +50907,7 @@ aNm aNl aNK aNP -aZW +bcq aKU abg aOk @@ -50914,8 +51004,8 @@ aio ank aio aoE -aoF -aoF +aCD +aCE agw aqg aqT @@ -51069,15 +51159,15 @@ ate ayG aZg bda -bes +baM api atf atw atP avD -awc +bej bfO -aCX +bfZ aHy bee aCT @@ -51327,9 +51417,9 @@ aci aeh aeQ afG -agr -ain -akd +apr +art +asm akI akJ akK @@ -51469,9 +51559,9 @@ aeg aTM aeR abe -aoj -asr -asF +anm +arH +asn aio aio aio @@ -51516,7 +51606,7 @@ bcl aAF bcb bgS -bdT +bgy bdY aGK aGK @@ -51611,9 +51701,9 @@ adD aeh aeS abe -apa +aoj aXU -aYN +asr aio ajl aof @@ -51753,9 +51843,9 @@ adE aei aeT abe -auj +aoo aXU -anm +asv aio ajm akf @@ -51895,9 +51985,9 @@ aeg aTN adC abe -aql +aoD aXU -aYN +asr aio ajn akg @@ -52037,9 +52127,9 @@ adF aek aeV abe -aoo -aXV -bch +aoF +arM +asE aio ajo akf @@ -52321,9 +52411,9 @@ amS anP apj afS -aqW -aro -arX +apa +arO +asF aio ajq akh @@ -52463,9 +52553,9 @@ amV aoe apk afS -aqZ +apH arq -arY +asJ aio ajr aki @@ -52496,7 +52586,7 @@ aGr anj bew bfp -baw +bfl baX amY asB @@ -52605,9 +52695,9 @@ amX afq afq afS -ara +aql arq -asm +asW aio ajs akj @@ -52740,16 +52830,16 @@ ait aeE afI ags -agB +agr agB anC -aBM +ain amU -aoD +akd arb -aIk +aqn bdf -asn +atj acf acf acf @@ -52773,14 +52863,14 @@ atn awQ aru bgt -aKp +bbm baX anj -baq +bch anj aru bge -bcB +bfm bgA aJt aJt @@ -52889,15 +52979,15 @@ alz afS afS afS -apH +aqU arq -asv -atj -atS -atj +atm +atK +auy +atK auM -avf -axr +avh +awJ acf aok aok @@ -53031,7 +53121,7 @@ arI ajY amZ afS -apH +aqW arq acV acV @@ -53039,7 +53129,7 @@ acV acV acV acV -axs +axr ayK axq atg @@ -53051,7 +53141,7 @@ axX aVy aLg aFM -aGe +aJu aLb atb asu @@ -53060,12 +53150,12 @@ aFz asu aoJ aUq -beZ +bdc bfw aoJ beD bfV -aHq +bgh bgJ awm bdt @@ -53173,15 +53263,15 @@ aFZ ako and afS -apH +aqW arr asC asC asC asC asC -avB -axQ +avi +axs arL aop aUr @@ -53315,14 +53405,14 @@ ajC akW anl afS -bdc -bfl -asE -atm +aqX +arP +atv +atS acV acV auN -avE +avB awN azp aop @@ -53345,9 +53435,9 @@ asu aoJ bbJ bfr -bfZ +bdT beq -bfm +bes bcB aLF aJt @@ -53457,14 +53547,14 @@ ajD akX ann afS -aqn -ars +aqZ +arP acV -atv +arX aui acV auP -avI +avE arL avN aop @@ -53489,8 +53579,8 @@ bcv bfs bgb aoJ +beZ bfq -bgy aFM aJt aJt @@ -53599,14 +53689,14 @@ anD akX apl afS -auy -art +ara +arS aon -atx +auh aun aCa auT -awu +avI arL aqm aop @@ -53619,8 +53709,8 @@ aEh aqe aso aFM -aHo -aXi +aJJ +aOg atb asY axv @@ -53741,14 +53831,14 @@ anD akX apF acf -aqX -arO +aro +arT acV -atv +arX auo acV auP -avI +avE arL aqm aop @@ -53761,7 +53851,7 @@ ask arK bfu aCh -aGj +aKl aHw atb atb @@ -53883,14 +53973,14 @@ anE aoK apG afS -apH -arP +aqW +arX acV -atv +arX acV acV avb -awJ +awu arL aop aop @@ -54026,12 +54116,12 @@ aoO apP afS arp -arS -asJ -atz +arX +atx +auj acV acV -bej +avc awN acf aCo @@ -54167,25 +54257,25 @@ afS aoP afS afS -aqn +aqZ acV acV acV acV acV -avc +ave arL adG azY -aAH -aBl -avh +axQ +aAQ +aBC ayg -aCC -aEk -bgh -aFb +aCW +aEn +aEM aFD +aFR aFM aGI aIj @@ -54309,25 +54399,25 @@ amu apd ajG arL -arH -arT -asW -atK +ars +arY +atz aup +auK auL -ave +avf arL adG azY -aAI +aAH aBm -avi +aBM ayg -aCD +aCX aEm aEF aFg -aFE +aGa aFM aFM aIT @@ -54461,16 +54551,16 @@ aAh axm adG azY -aAJ +aAI aBz aBZ aCp -aCE +aDC aEm -aEL -aFk -aFG -aDX +aFb +aFE +aGc +aGj aFM aXS aLF @@ -54603,16 +54693,16 @@ adG adG adG azY -aAK +aAJ aBA -arM +aCg aCp -aCW +aDM aEm -aEM -aFl +aFk +aFG aEm -aOg +aHo aFM aFM aAa @@ -54745,18 +54835,18 @@ aNM aOt adG azY -aAP +aAK aBA -aCg +aCk aCp -aDC +aDX aEm aEN aFB aFH -aGc -aJu -aGa +aIk +aKp +aXi azY adG adG @@ -54887,18 +54977,18 @@ aab aOm adG azY -aAQ -aBC -aCk -aCp aAP +aBl +aCC +aCp +aAK aEm aEm aEm aEm aGJ aGJ -aJJ +aXV azY adG aOF @@ -55033,14 +55123,14 @@ aAR aAR aAR ayg -aDM -aEn -aFI -aFI -aFR -aFR -aFR -aKl +aEk +aEL +aFl +aFl +aGe +aGe +aGe +aYN azY adG aOi diff --git a/sound/machines/airlock_creaking.ogg b/sound/machines/door/airlock_creaking.ogg similarity index 100% rename from sound/machines/airlock_creaking.ogg rename to sound/machines/door/airlock_creaking.ogg diff --git a/sound/machines/airlockcycle.ogg b/sound/machines/door/airlockcycle.ogg similarity index 100% rename from sound/machines/airlockcycle.ogg rename to sound/machines/door/airlockcycle.ogg diff --git a/sound/machines/airlockforced.ogg b/sound/machines/door/airlockforced.ogg similarity index 100% rename from sound/machines/airlockforced.ogg rename to sound/machines/door/airlockforced.ogg diff --git a/sound/machines/blastdoorclose.ogg b/sound/machines/door/blastdoorclose.ogg similarity index 100% rename from sound/machines/blastdoorclose.ogg rename to sound/machines/door/blastdoorclose.ogg diff --git a/sound/machines/blastdooropen.ogg b/sound/machines/door/blastdooropen.ogg similarity index 100% rename from sound/machines/blastdooropen.ogg rename to sound/machines/door/blastdooropen.ogg diff --git a/sound/machines/boltsdown.ogg b/sound/machines/door/boltsdown.ogg similarity index 100% rename from sound/machines/boltsdown.ogg rename to sound/machines/door/boltsdown.ogg diff --git a/sound/machines/boltsup.ogg b/sound/machines/door/boltsup.ogg similarity index 100% rename from sound/machines/boltsup.ogg rename to sound/machines/door/boltsup.ogg diff --git a/sound/machines/airlock.ogg b/sound/machines/door/old_airlock.ogg similarity index 100% rename from sound/machines/airlock.ogg rename to sound/machines/door/old_airlock.ogg diff --git a/sound/machines/airlockclose.ogg b/sound/machines/door/old_airlockclose.ogg similarity index 100% rename from sound/machines/airlockclose.ogg rename to sound/machines/door/old_airlockclose.ogg diff --git a/sound/machines/windowdoor.ogg b/sound/machines/door/windowdoor.ogg similarity index 100% rename from sound/machines/windowdoor.ogg rename to sound/machines/door/windowdoor.ogg diff --git a/tgui/packages/tgui/interfaces/Autolathe.js b/tgui/packages/tgui/interfaces/Autolathe.js index 53d4321fd8..56f1153bbe 100644 --- a/tgui/packages/tgui/interfaces/Autolathe.js +++ b/tgui/packages/tgui/interfaces/Autolathe.js @@ -18,7 +18,7 @@ const canBeMade = (recipe, materials) => { for (let mat_id of recipeRequiredMaterials) { let material = materials.find(val => val.name === mat_id); if (!material) { - return false; + continue; // yes, if we cannot find the material, we just ignore it :V } if (material.amount < recipe.requirements[mat_id]) { return false; diff --git a/tgui/packages/tgui/interfaces/CrewMonitor.js b/tgui/packages/tgui/interfaces/CrewMonitor.js index 1776aa065e..e8372502e3 100644 --- a/tgui/packages/tgui/interfaces/CrewMonitor.js +++ b/tgui/packages/tgui/interfaces/CrewMonitor.js @@ -1,9 +1,9 @@ import { sortBy } from 'common/collections'; +import { flow } from 'common/fp'; import { useBackend, useLocalState } from "../backend"; import { Window } from "../layouts"; import { NanoMap, Box, Table, Button, Tabs, Icon, NumberInput } from "../components"; import { TableCell } from '../components/Table'; -import { COLORS } from '../constants.js'; import { Fragment } from 'inferno'; export const CrewMonitor = () => { @@ -22,9 +22,13 @@ export const CrewMonitor = () => { export const CrewMonitorContent = (props, context) => { const { act, data, config } = useBackend(context); const [tabIndex, setTabIndex] = useLocalState(context, 'tabIndex', 0); - const crew = sortBy( - cm => cm.name, - )(data.crewmembers || []); + + const crew = flow([ + sortBy(cm => cm.name), + sortBy(cm => cm?.x), + sortBy(cm => cm?.y), + sortBy(cm => cm?.realZ), + ])(data.crewmembers || []); const [ mapZoom, diff --git a/tgui/packages/tgui/interfaces/ResearchConsole.js b/tgui/packages/tgui/interfaces/ResearchConsole.js index 6d797c8d47..7a7e2c021b 100644 --- a/tgui/packages/tgui/interfaces/ResearchConsole.js +++ b/tgui/packages/tgui/interfaces/ResearchConsole.js @@ -36,11 +36,26 @@ const ResearchConsoleViewResearch = (props, context) => { ); }; +const PaginationTitle = (props, context) => { + const { data } = useBackend(context); + + const { + title, + target, + } = props; + + let page = data[target]; + if (typeof page === "number") { + return title + " - Page " + (page + 1); + } + + return title; +}; + const PaginationChevrons = (props, context) => { const { act } = useBackend(context); const { - length, target, } = props; @@ -67,14 +82,14 @@ const ResearchConsoleViewDesigns = (props, context) => { } = data; return ( -
} buttons={ - { || null} + { || null} }> { if (saveDialog) { return ( -
-