diff --git a/code/__defines/dcs/signals.dm b/code/__defines/dcs/signals.dm index 26b1d2d44aa..017c92c9222 100644 --- a/code/__defines/dcs/signals.dm +++ b/code/__defines/dcs/signals.dm @@ -80,6 +80,8 @@ #define COMSIG_ATOM_UPDATED_ICON "atom_updated_icon" ///from base of atom/Entered(): (atom/movable/entering, /atom) #define COMSIG_ATOM_ENTERED "atom_entered" +/// Sent from the atom that just Entered src. From base of atom/Entered(): (/atom/entered_atom, /atom/oldLoc) +#define COMSIG_ATOM_ENTERING "atom_entering" ///from base of atom/Exit(): (/atom/movable/exiting, /atom/newloc) #define COMSIG_ATOM_EXIT "atom_exit" #define COMPONENT_ATOM_BLOCK_EXIT (1<<0) diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm index 94600a0d8af..6ed1384429c 100644 --- a/code/__defines/misc_vr.dm +++ b/code/__defines/misc_vr.dm @@ -19,7 +19,7 @@ #define ANNOUNCER_NAME "Facility PA" //For custom species -#define STARTING_SPECIES_POINTS 1 +#define STARTING_SPECIES_POINTS 2 #define MAX_SPECIES_TRAITS 5 // Xenochimera thing mostly @@ -65,4 +65,19 @@ #define MAT_PLASTITANIUM "plastitanium" #define MAT_PLASTITANIUMHULL "plastitanium hull" #define MAT_PLASTITANIUMGLASS "plastitanium glass" -#define MAT_GOLDHULL "gold hull" \ No newline at end of file +#define MAT_GOLDHULL "gold hull" + +#define RESIZE_MINIMUM 0.25 +#define RESIZE_MAXIMUM 2 +#define RESIZE_MINIMUM_DORMS 0.01 +#define RESIZE_MAXIMUM_DORMS 6 + +#define RESIZE_HUGE 2 +#define RESIZE_BIG 1.5 +#define RESIZE_NORMAL 1 +#define RESIZE_SMALL 0.5 +#define RESIZE_TINY 0.25 +#define RESIZE_A_HUGEBIG (RESIZE_HUGE + RESIZE_BIG) / 2 +#define RESIZE_A_BIGNORMAL (RESIZE_BIG + RESIZE_NORMAL) / 2 +#define RESIZE_A_NORMALSMALL (RESIZE_NORMAL + RESIZE_SMALL) / 2 +#define RESIZE_A_SMALLTINY (RESIZE_SMALL + RESIZE_TINY) / 2 \ No newline at end of file diff --git a/code/__defines/sound.dm b/code/__defines/sound.dm index 7db8a2f7608..7be3e688571 100644 --- a/code/__defines/sound.dm +++ b/code/__defines/sound.dm @@ -112,7 +112,7 @@ 'sound/ambience/generic/generic2.ogg',\ 'sound/ambience/generic/generic3.ogg'\ ) -// 'sound/ambience/generic/generic4.ogg'\ +// 'sound/ambience/generic/generic4.ogg' // Sounds of PA announcements, presumably involving shuttles? #define AMBIENCE_ARRIVALS list(\ diff --git a/code/__defines/subsystems.dm b/code/__defines/subsystems.dm index d0a5d72c86f..d24f0bfdd60 100644 --- a/code/__defines/subsystems.dm +++ b/code/__defines/subsystems.dm @@ -57,7 +57,8 @@ var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_G #define INIT_ORDER_SKYBOX 30 #define INIT_ORDER_MAPPING 25 #define INIT_ORDER_DECALS 20 -#define INIT_ORDER_PLANTS 18 // Must initialize before atoms. +#define INIT_ORDER_PLANTS 19 // Must initialize before atoms. +#define INIT_ORDER_PLANETS 18 #define INIT_ORDER_JOB 17 #define INIT_ORDER_ALARM 16 // Must initialize before atoms. #define INIT_ORDER_ATOMS 15 @@ -68,7 +69,6 @@ var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_G #define INIT_ORDER_LIGHTING 0 #define INIT_ORDER_AIR -1 #define INIT_ORDER_ASSETS -3 -#define INIT_ORDER_PLANETS -4 #define INIT_ORDER_HOLOMAPS -5 #define INIT_ORDER_NIGHTSHIFT -6 #define INIT_ORDER_OVERLAY -7 diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 5024a1b1a11..057c96e2044 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -11,7 +11,7 @@ var/global/list/traits_costs = list() // Just path = cost list, saves time in c var/global/list/all_traits = list() // All of 'em at once (same instances) var/global/list/active_ghost_pods = list() -var/global/list/sensorpreflist = list("Off", "Binary", "Vitals", "Tracking", "No Preference") //TFF 5/8/19 - Suit Sensors global list +var/global/list/sensorpreflist = list("Off", "Binary", "Vitals", "Tracking", "No Preference") //stores numeric player size options indexed by name var/global/list/player_sizes_list = list( @@ -173,8 +173,8 @@ var/global/list/tf_vore_egg_types = list( "Spotted pink" = /obj/item/weapon/storage/vore_egg/pinkspots) var/global/list/edible_trash = list(/obj/item/broken_device, - /obj/item/clothing/accessory/collar, //TFF 10/7/19 - add option to nom collars, - /obj/item/device/communicator, //TFF 19/9/19 - add option to nom communicators and commwatches, + /obj/item/clothing/accessory/collar, + /obj/item/device/communicator, /obj/item/clothing/mask, /obj/item/clothing/glasses, /obj/item/clothing/gloves, @@ -490,10 +490,11 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, var/datum/trait/instance = new path() if(!instance.name) continue //A prototype or something + var/category = instance.category var/cost = instance.cost traits_costs[path] = cost all_traits[path] = instance - switch(cost) + switch(category) if(-INFINITY to -0.1) negative_traits[path] = instance if(0) diff --git a/code/controllers/subsystems/planets.dm b/code/controllers/subsystems/planets.dm index 5d1325bba52..4cf72221868 100644 --- a/code/controllers/subsystems/planets.dm +++ b/code/controllers/subsystems/planets.dm @@ -6,9 +6,6 @@ SUBSYSTEM_DEF(planets) flags = SS_BACKGROUND runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME - var/static/list/new_outdoor_turfs = list() - var/static/list/new_outdoor_walls = list() - var/static/list/planets = list() var/static/list/z_to_planet = list() @@ -20,7 +17,6 @@ SUBSYSTEM_DEF(planets) /datum/controller/subsystem/planets/Initialize(timeofday) admin_notice("Initializing planetary weather.", R_DEBUG) createPlanets() - allocateTurfs(TRUE) ..() /datum/controller/subsystem/planets/proc/createPlanets() @@ -36,64 +32,36 @@ SUBSYSTEM_DEF(planets) continue z_to_planet[Z] = NP -/datum/controller/subsystem/planets/proc/addTurf(var/turf/T,var/is_edge) - if(is_edge) - new_outdoor_walls |= T - else - new_outdoor_turfs |= T +// DO NOT CALL THIS DIRECTLY UNLESS IT'S IN INITIALIZE, +// USE turf/simulated/proc/make_indoors() and\ +// tyrf/simulated/proc/make_outdoors() +/datum/controller/subsystem/planets/proc/addTurf(var/turf/T) + if(z_to_planet.len >= T.z && z_to_planet[T.z]) + var/datum/planet/P = z_to_planet[T.z] + if(!istype(P)) + return + if(istype(T, /turf/unsimulated/wall/planetary)) + P.planet_walls += T + else if(istype(T, /turf/simulated) && T.outdoors) + P.planet_floors += T + T.vis_contents |= P.weather_holder.visuals + T.vis_contents |= P.weather_holder.special_visuals + /datum/controller/subsystem/planets/proc/removeTurf(var/turf/T,var/is_edge) - if(is_edge) - new_outdoor_walls -= T - else - new_outdoor_turfs -= T - if(z_to_planet.len >= T.z) var/datum/planet/P = z_to_planet[T.z] if(!P) return - if(is_edge) - P.planet_floors -= T - else + if(istype(T, /turf/unsimulated/wall/planetary)) P.planet_walls -= T - T.vis_contents -= P.weather_holder.visuals - T.vis_contents -= P.weather_holder.special_visuals - -/datum/controller/subsystem/planets/proc/allocateTurfs(var/initial = FALSE) - var/list/currentlist = new_outdoor_turfs - while(currentlist.len) - var/turf/simulated/OT = currentlist[currentlist.len] - currentlist.len-- - if(istype(OT) && OT.outdoors && z_to_planet.len >= OT.z && z_to_planet[OT.z]) - var/datum/planet/P = z_to_planet[OT.z] - P.planet_floors |= OT - OT.vis_contents |= P.weather_holder.visuals - OT.vis_contents |= P.weather_holder.special_visuals - if(!initial && MC_TICK_CHECK) - return - - currentlist = new_outdoor_walls - while(currentlist.len) - var/turf/unsimulated/wall/planetary/PW = currentlist[currentlist.len] - currentlist.len-- - if(istype(PW) && z_to_planet.len >= PW.z && z_to_planet[PW.z]) - var/datum/planet/P = z_to_planet[PW.z] - P.planet_walls |= PW - if(!initial && MC_TICK_CHECK) - return - -/datum/controller/subsystem/planets/proc/unallocateTurf(var/turf/simulated/T) - if(istype(T) && z_to_planet[T.z]) - var/datum/planet/P = z_to_planet[T.z] - P.planet_floors -= T - T.vis_contents -= P.weather_holder.visuals - T.vis_contents -= P.weather_holder.special_visuals + else + P.planet_floors -= T + T.vis_contents -= P.weather_holder.visuals + T.vis_contents -= P.weather_holder.special_visuals /datum/controller/subsystem/planets/fire(resumed = 0) - if(new_outdoor_turfs.len || new_outdoor_walls.len) - allocateTurfs() - if(!resumed) src.currentrun = planets.Copy() @@ -153,8 +121,7 @@ SUBSYSTEM_DEF(planets) var/lum_g = new_brightness * GetGreenPart(new_color) / 255 var/lum_b = new_brightness * GetBluePart (new_color) / 255 var/static/update_gen = -1 // Used to prevent double-processing corners. Otherwise would happen when looping over adjacent turfs. - for(var/I in P.planet_floors) - var/turf/simulated/T = I + for(var/turf/simulated/T as anything in P.planet_floors) if(!T.lighting_corners_initialised) T.generate_missing_corners() for(var/C in T.get_corners()) diff --git a/code/datums/autolathe/autolathe.dm b/code/datums/autolathe/autolathe.dm index 03d1ca0fddb..bf36f2bfabb 100644 --- a/code/datums/autolathe/autolathe.dm +++ b/code/datums/autolathe/autolathe.dm @@ -5,7 +5,7 @@ I = new path() if(!I) // Something has gone horribly wrong, or right. - log_debug("[name] created an Autolathe design without an assigned path. This is expected for only the Material Sheet generation.") + log_debug("[name] created an Autolathe design without an assigned path.") return if(I.matter && !resources) @@ -80,22 +80,12 @@ if(istype(M, /datum/material/alienalloy)) continue - var/obj/item/stack/material/Mat = new M.stack_type() - - if(Mat.name in items_by_name) - qdel(Mat) + var/obj/item/stack/material/S = M.stack_type + if(initial(S.name) in items_by_name) continue - var/datum/category_item/autolathe/materials/WorkDat = new(src) + var/datum/category_item/autolathe/materials/WorkDat = new(src, M) - WorkDat.name = "[Mat.name]" - WorkDat.resources = Mat.matter.Copy() - WorkDat.is_stack = TRUE - WorkDat.no_scale = TRUE - WorkDat.max_stack = Mat.max_amount - WorkDat.path = M.stack_type - - qdel(Mat) items |= WorkDat items_by_name[WorkDat.name] = WorkDat diff --git a/code/datums/autolathe/general.dm b/code/datums/autolathe/general.dm index 00151d6e757..4be460a17d7 100644 --- a/code/datums/autolathe/general.dm +++ b/code/datums/autolathe/general.dm @@ -85,7 +85,6 @@ name = "welding mask" path =/obj/item/clothing/head/welding -//TFF 24/12/19 - Let people print more spray bottles if needed. /datum/category_item/autolathe/general/spraybottle name = "spray bottle" path = /obj/item/weapon/reagent_containers/spray diff --git a/code/datums/autolathe/materials.dm b/code/datums/autolathe/materials.dm index 653fca8222e..eb97d73b65c 100644 --- a/code/datums/autolathe/materials.dm +++ b/code/datums/autolathe/materials.dm @@ -1,38 +1,23 @@ - -/datum/category_item/autolathe/materials/metal - name = "steel sheets" - path =/obj/item/stack/material/steel +/datum/category_item/autolathe/materials is_stack = TRUE - no_scale = TRUE //prevents material duplication exploits + no_scale = TRUE // Prevents material duplaction exploits -/datum/category_item/autolathe/materials/glass - name = "glass sheets" - path =/obj/item/stack/material/glass - is_stack = TRUE - no_scale = TRUE //prevents material duplication exploits +/datum/category_item/autolathe/materials/New(var/loc, var/mat) + if(istype(mat, /obj/item/stack/material)) + var/obj/item/stack/material/M = mat + name = M.name + resources = M.matter.Copy() + max_stack = M.max_amount + path = M.type + else if(istype(mat, /datum/material)) + var/datum/material/M = mat + var/obj/item/stack/material/S = M.stack_type + name = initial(S.name) + resources = M.get_matter() + max_stack = initial(S.max_amount) + path = S + . = ..() -/datum/category_item/autolathe/materials/rglass - name = "reinforced glass sheets" - path =/obj/item/stack/material/glass/reinforced - is_stack = TRUE - no_scale = TRUE //prevents material duplication exploits - -/datum/category_item/autolathe/materials/rods +/datum/category_item/autolathe/materials/rods // Not strictly a material, so they need their own define name = "metal rods" - path =/obj/item/stack/rods - is_stack = TRUE - no_scale = TRUE //prevents material duplication exploits - -/datum/category_item/autolathe/materials/plasteel - name = "plasteel sheets" - path =/obj/item/stack/material/plasteel - is_stack = TRUE - no_scale = TRUE //prevents material duplication exploits - resources = list(MAT_PLASTEEL = 2000) - -/datum/category_item/autolathe/materials/plastic - name = "plastic sheets" - path =/obj/item/stack/material/plastic - is_stack = TRUE - no_scale = TRUE //prevents material duplication exploits - resources = list(MAT_PLASTIC = 2000) + path =/obj/item/stack/rods \ No newline at end of file diff --git a/code/datums/components/resize_guard.dm b/code/datums/components/resize_guard.dm new file mode 100644 index 00000000000..724d2524431 --- /dev/null +++ b/code/datums/components/resize_guard.dm @@ -0,0 +1,19 @@ +/datum/component/resize_guard + +/datum/component/resize_guard/Initialize() + if(!isliving(parent)) + return COMPONENT_INCOMPATIBLE + +/datum/component/resize_guard/RegisterWithParent() + // When our parent mob enters any atom, we check resize + RegisterSignal(parent, COMSIG_ATOM_ENTERING, .proc/check_resize) + +/datum/component/resize_guard/UnregisterFromParent() + UnregisterSignal(parent, COMSIG_ATOM_ENTERING) + +/datum/component/resize_guard/proc/check_resize() + var/area/A = get_area(parent) + if(A?.limit_mob_size) + var/mob/living/L = parent + L.resize(L.size_multiplier) + qdel(src) \ No newline at end of file diff --git a/code/datums/supplypacks/engineering.dm b/code/datums/supplypacks/engineering.dm index 28a7431ec16..f295676402b 100644 --- a/code/datums/supplypacks/engineering.dm +++ b/code/datums/supplypacks/engineering.dm @@ -77,13 +77,19 @@ containertype = /obj/structure/closet/crate/focalpoint containername = "advanced hull shield generator crate" -/datum/supply_pack/eng/pointdefense - name = "Point Defense Turret" - contains = list(/obj/machinery/porta_turret/pointdefense/orderable) - cost = 70 - containertype = /obj/structure/closet/crate/large/secure/heph - containername = "point defense crate" - access = access_security +/datum/supply_pack/eng/point_defense_cannon_circuit + name = "Point Defense Turret Circuit" + contains = list(/obj/item/weapon/circuitboard/pointdefense = 2) + cost = 20 + containertype = /obj/structure/closet/crate/heph + containername = "point defense turret circuit crate" + +/datum/supply_pack/eng/point_defense_control_circuit + name = "Point Defense Controller Circuit" + contains = list(/obj/item/weapon/circuitboard/pointdefense_control = 1) + cost = 30 + containertype = /obj/structure/closet/crate/heph + containername = "point defense mainframe circuit crate" /datum/supply_pack/eng/electrical name = "Electrical maintenance crate" diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index f4078595c89..9b1a751ec67 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -1,4 +1,5 @@ -//TFF 28/8/19 - cleanup of areas placement - removes all but rogueminer_vr stuff. +/area + var/limit_mob_size = TRUE //If mob size is limited in the area. /area/shuttle/belter name = "Belter Shuttle" diff --git a/code/game/atoms.dm b/code/game/atoms.dm index c20c29be7b9..e4ad20f5d48 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -638,6 +638,7 @@ . = ..() GLOB.moved_event.raise_event(AM, old_loc, AM.loc) SEND_SIGNAL(src, COMSIG_ATOM_ENTERED, AM, old_loc) + SEND_SIGNAL(AM, COMSIG_ATOM_ENTERING, src, old_loc) /atom/Exit(atom/movable/AM, atom/new_loc) . = ..() diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm index d250c441ad4..f4b6a24c6a6 100644 --- a/code/game/dna/dna2_helpers.dm +++ b/code/game/dna/dna2_helpers.dm @@ -222,7 +222,7 @@ // Playerscale var/size = dna.GetUIValueRange(DNA_UI_PLAYERSCALE, player_sizes_list.len) if((0 < size) && (size <= player_sizes_list.len)) - H.resize(player_sizes_list[player_sizes_list[size]], FALSE) + H.resize(player_sizes_list[player_sizes_list[size]], TRUE, ignore_prefs = TRUE) // Tail/Taur Color H.r_tail = dna.GetUIValueRange(DNA_UI_TAIL_R, 255) diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index 913b58e23b6..cee83656cb9 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -127,7 +127,7 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t if(8) //Aug switch(DD) // if(10) -// Holiday["S'randarr's Day"] = "A Tajaran holiday that occurs on the longest day of the year in summer, \ +// Holiday["S'randarr's Day"] = "A Tajaran holiday that occurs on the longest day of the year in summer, // on Ahdomai. It is named after the Tajaran deity of Light, and huge celebrations are common." //VOREStation Add - Of course we need this. if(8) @@ -167,8 +167,8 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t Holiday["Kindness Day"] = "Kindness Day is an unofficial holiday to highlight good deeds in the \ community, focusing on the positive power and the common thread of kindness which binds humanity and \ friends together." -// if(28) //Space thanksgiving. -// Holiday["Appreciation Day"] = "Originally an old holiday from Earth, Appreciation Day follows many of the \ + if(28) //Space thanksgiving. + Holiday["Appreciation Day"] = "Originally an old holiday from Earth, Appreciation Day follows many of the \ traditions that its predecessor did, such as having a large feast (turkey often included), gathering with family, and being thankful \ for what one has in life." if(28 > DD > 20) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 18d58a33ae8..a1df0327933 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -310,26 +310,27 @@ var/global/list/additional_antag_types = list() for(var/mob/M in player_list) if(M.client) clients++ + var/M_area_type = (get_turf(M))?.loc?.type if(ishuman(M)) if(M.stat != DEAD) surviving_humans++ - if(M.loc && M.loc.loc && M.loc.loc.type in escape_locations) + if(M_area_type in escape_locations) escaped_humans++ if(M.stat != DEAD) surviving_total++ - if(M.loc && M.loc.loc && M.loc.loc.type in escape_locations) + if(M_area_type in escape_locations) escaped_total++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape/centcom) + if(M_area_type == /area/shuttle/escape/centcom) escaped_on_shuttle++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod1/centcom) + if(M_area_type == /area/shuttle/escape_pod1/centcom) escaped_on_pod_1++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod2/centcom) + if(M_area_type == /area/shuttle/escape_pod2/centcom) escaped_on_pod_2++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod3/centcom) + if(M_area_type == /area/shuttle/escape_pod3/centcom) escaped_on_pod_3++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod5/centcom) + if(M_area_type == /area/shuttle/escape_pod5/centcom) escaped_on_pod_5++ if(isobserver(M)) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index a6ceb219c84..950910fe5fc 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -109,13 +109,13 @@ desc = "You should probably run instead of gawking at this." icon = 'icons/obj/meteor.dmi' icon_state = "small" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/hits = 4 var/hitpwr = 2 //Level of ex_act to be called on hit. var/dest pass_flags = PASSTABLE - var/heavy = 0 + var/heavy = FALSE var/z_original var/meteordrop = /obj/item/weapon/ore/iron @@ -147,7 +147,7 @@ get_hit() /obj/effect/meteor/Destroy() - walk(src,0) //this cancels the walk_towards() proc + walk(src,FALSE) //this cancels the walk_towards() proc GLOB.meteor_list -= src return ..() @@ -162,10 +162,10 @@ ram_turf(get_turf(A)) get_hit() else - die(0) + die(FALSE) /obj/effect/meteor/CanPass(atom/movable/mover, turf/target) - return istype(mover, /obj/effect/meteor) ? 1 : ..() + return istype(mover, /obj/effect/meteor) ? TRUE : ..() /obj/effect/meteor/proc/ram_turf(var/turf/T) //first bust whatever is in the turf @@ -190,9 +190,9 @@ /obj/effect/meteor/proc/get_hit() hits-- if(hits <= 0) - die(1) + die(TRUE) -/obj/effect/meteor/proc/die(var/explode = 1) +/obj/effect/meteor/proc/die(var/explode = TRUE) make_debris() meteor_effect(explode) qdel(src) @@ -209,16 +209,13 @@ /obj/effect/meteor/bullet_act(var/obj/item/projectile/Proj) if(Proj.excavation_amount) get_hit() - if(!QDELETED(src)) - wall_power -= Proj.excavation_amount + Proj.damage + (Proj.hitscan * 25) // Instant-impact projectiles are inherently better at dealing with meteors. - wall_power = max(1, wall_power) - if(wall_power < Proj.excavation_amount) - if(prob(min(90, 100 - Proj.damage))) - die(TRUE) - else - die(FALSE) - return + if(!QDELETED(src)) + wall_power -= Proj.excavation_amount + Proj.damage + (Proj.hitscan * 25) // Instant-impact projectiles are inherently better at dealing with meteors. + + if(wall_power <= 0) + die(FALSE) // If you kill the meteor, then it dies. + return return /obj/effect/meteor/proc/make_debris() diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm index 3912bc6c6b8..2f4d95db9f3 100644 --- a/code/game/gamemodes/technomancer/core_obj.dm +++ b/code/game/gamemodes/technomancer/core_obj.dm @@ -30,7 +30,7 @@ "wizard's cloak" = "wizard_cloak" ) - // Some spell-specific variables go here, since spells themselves are temporary. Cores are more long term and more accessable than \ + // Some spell-specific variables go here, since spells themselves are temporary. Cores are more long term and more accessable than // mind datums. It may also allow creative players to try to pull off a 'soul jar' scenario. var/list/summoned_mobs = list() // Maintained horribly with maintain_summon_list(). var/list/wards_in_use = list() // Wards don't count against the cap for other summons. diff --git a/code/game/gamemodes/technomancer/equipment.dm b/code/game/gamemodes/technomancer/equipment.dm index 8d1fb4c6ad1..940e31f3cd5 100644 --- a/code/game/gamemodes/technomancer/equipment.dm +++ b/code/game/gamemodes/technomancer/equipment.dm @@ -1,8 +1,5 @@ /datum/technomancer/equipment/default_core name = "Manipulation Core" -// desc = "The default core that you most likely already have. This is here in-case you change your mind after buying \ -// another core, don't forget to refund the old core. This has a capacity of 10,000 units of energy, and recharges at a \ -// rate of 50 units. It also reduces incoming instability from functions by 20%." desc = "The default core that you most likely already have. This is here in-case you change your mind after buying \ another core, don't forget to refund the old core.
\ Capacity: 10k
\ diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 08e22f96e0e..d172e0e8dbc 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -257,9 +257,17 @@ for(var/obj/thing in E.implants) var/implantSubData[0] var/obj/item/weapon/implant/I = thing - implantSubData["name"] = I.name - implantSubData["known"] = istype(I) && I.known_implant - implantData.Add(list(implantSubData)) + //VOREStation Block Edit Start + var/obj/item/device/nif/N = thing + if(istype(I)) + implantSubData["name"] = I.name + implantSubData["known"] = istype(I) && I.known_implant + implantData.Add(list(implantSubData)) + else + implantSubData["name"] = N.name + implantSubData["known"] = istype(N) && N.known_implant + implantData.Add(list(implantSubData)) + //VOREStation Block Edit End organData["implants"] = implantData organData["implants_len"] = implantData.len @@ -464,8 +472,11 @@ var/unknown_body = 0 for(var/thing in e.implants) var/obj/item/weapon/implant/I = thing + var/obj/item/device/nif/N = thing //VOREStation Add: NIFs if(istype(I) && I.known_implant) imp += "[I] implanted:" + if(istype(N) && N.known_implant) //VOREStation Add: NIFs + imp += "[N] implanted:" else unknown_body++ diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm index 3c453682b7e..3dd029631ea 100644 --- a/code/game/machinery/doorbell_vr.dm +++ b/code/game/machinery/doorbell_vr.dm @@ -43,7 +43,6 @@ else icon_state = "dbchime-standby" -//TFF 3/6/19 - Port Cit RP fix of infinite frames. ToDo: Make it so that you can completely deconstruct it and reconstruct it. /obj/machinery/doorbell_chime/attackby(obj/item/W as obj, mob/user as mob) src.add_fingerprint(user) if(default_deconstruction_screwdriver(user, W)) diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm index a8f6a387342..8fe0e3b5f01 100644 --- a/code/game/machinery/exonet_node.dm +++ b/code/game/machinery/exonet_node.dm @@ -16,7 +16,6 @@ var/list/logs = list() // Gets written to by exonet's send_message() function. -//TFF 3/6/19 - Port Cit RP fix for infinite frames circuit = /obj/item/weapon/circuitboard/telecomms/exonet_node // Proc: New() // Parameters: None diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index a96ef4ed0aa..e410914bee0 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -428,7 +428,7 @@ Class Procs: for(var/obj/I in contents) if(istype(I,/obj/item/weapon/card/id)) I.forceMove(src.loc) - //TFF 3/6/19 - port Cit RP fix of infinite frames. If it doesn't have a circuit board, don't create a frame. Return a smack instead. BONK! + if(!circuit) return 0 var/obj/structure/frame/A = new /obj/structure/frame(src.loc) diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm index 51f48c416b0..705e2892e92 100644 --- a/code/game/machinery/pointdefense.dm +++ b/code/game/machinery/pointdefense.dm @@ -4,11 +4,12 @@ // GLOBAL_LIST_BOILERPLATE(pointdefense_controllers, /obj/machinery/pointdefense_control) -GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) +GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) /obj/machinery/pointdefense_control name = "fire assist mainframe" desc = "A specialized computer designed to synchronize a variety of weapon systems and a vessel's astronav data." + description_info = "To connect the mainframe to turrets, use a multitool to set the ident tag to that of the turrets." icon = 'icons/obj/pointdefense.dmi' icon_state = "control" density = TRUE @@ -53,7 +54,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) return TRUE if(action == "toggle_active") - var/obj/machinery/power/pointdefense/PD = locate(params["target"]) + var/obj/machinery/pointdefense/PD = locate(params["target"]) if(!istype(PD)) return FALSE @@ -76,7 +77,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) if(id_tag) var/list/connected_z_levels = GetConnectedZlevels(get_z(src)) for(var/i = 1 to LAZYLEN(pointdefense_turrets)) - var/obj/machinery/power/pointdefense/PD = pointdefense_turrets[i] + var/obj/machinery/pointdefense/PD = pointdefense_turrets[i] if(!(PD.id_tag == id_tag && get_z(PD) in connected_z_levels)) continue var/list/turret = list() @@ -117,89 +118,52 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) // The acutal point defense battery // -/obj/machinery/power/pointdefense +/obj/machinery/pointdefense name = "\improper point defense battery" icon = 'icons/obj/pointdefense.dmi' icon_state = "pointdefense2" desc = "A Kuiper pattern anti-meteor battery. Capable of destroying most threats in a single salvo." - description_info = "Must have the same ident tag as a fire assist mainframe on the same facility." + description_info = "Must have the same ident tag as a fire assist mainframe on the same facility. Use a multitool to set the ident tag." density = TRUE anchored = TRUE circuit = /obj/item/weapon/circuitboard/pointdefense idle_power_usage = 0.1 KILOWATTS - active_power_usage = 1 KILOWATTS appearance_flags = PIXEL_SCALE var/active = TRUE var/charge_cooldown = 1 SECOND //time between it can fire at different targets var/last_shot = 0 var/kill_range = 18 var/rotation_speed = 0.25 SECONDS //How quickly we turn to face threats - var/engaging = FALSE + var/weakref/engaging = null // The meteor we're shooting at var/id_tag = null -/obj/machinery/power/pointdefense/Initialize() +/obj/machinery/pointdefense/Initialize() . = ..() // TODO - Remove this bit once machines are converted to Initialize if(ispath(circuit)) circuit = new circuit(src) default_apply_parts() - if(anchored) - connect_to_network() update_icon() - var/image/I = image(icon, icon_state = "[icon_state]_under") - I.appearance_flags |= RESET_TRANSFORM - underlays += I -/obj/machinery/power/pointdefense/examine(mob/user) - . = ..() - if(powernet) - . += "It is connected to a power cable below." - -/obj/machinery/power/pointdefense/get_description_interaction() +/obj/machinery/pointdefense/get_description_interaction() . = ..() if(!id_tag) . += "[desc_panel_image("multitool")]to set ident tag and connect to a mainframe." -/obj/machinery/power/pointdefense/update_icon() +/obj/machinery/pointdefense/update_icon() if(!active || !id_tag || inoperable()) icon_state = "[initial(icon_state)]_off" else icon_state = initial(icon_state) -/obj/machinery/power/pointdefense/default_unfasten_wrench(var/mob/user, var/obj/item/weapon/W, var/time) - if((. = ..())) - src.transform = null // Reset rotation if we're anchored/unanchored - -////////// This machine is willing to take power from cables OR APCs. Handle NOPOWER stat specially here! //////// - -/obj/machinery/power/pointdefense/connect_to_network() - if((. = ..())) - stat &= ~NOPOWER // We now ignore APC power - update_icon() - -/obj/machinery/power/pointdefense/disconnect_from_network() - if((. = ..())) - power_change() // We're back on APC power. - -/obj/machinery/power/pointdefense/power_change() - if(powernet) - return // We don't care, we are cable powered anyway +/obj/machinery/pointdefense/power_change() var/old_stat = stat ..() if(old_stat != stat) update_icon() -// Decide where to get the power to fire from -/obj/machinery/power/pointdefense/use_power_oneoff(var/amount, var/chan = -1) - if(powernet) - return draw_power(amount) - else if(powered(chan)) - use_power(amount, chan) - return amount - return 0 - // Find controller with the same tag on connected z levels (if any) -/obj/machinery/power/pointdefense/proc/get_controller() +/obj/machinery/pointdefense/proc/get_controller() if(!id_tag) return null var/list/connected_z_levels = GetConnectedZlevels(get_z(src)) @@ -208,7 +172,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) if(PDC.id_tag == id_tag && (get_z(PDC) in connected_z_levels)) return PDC -/obj/machinery/power/pointdefense/attackby(var/obj/item/W, var/mob/user) +/obj/machinery/pointdefense/attackby(var/obj/item/W, var/mob/user) if(W?.is_multitool()) var/new_ident = input(user, "Enter a new ident tag.", "[src]", id_tag) as null|text if(new_ident && new_ident != id_tag && user.Adjacent(src) && CanInteract(user, GLOB.tgui_physical_state)) @@ -221,22 +185,21 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) return if(default_part_replacement(user, W)) return - if(default_unfasten_wrench(user, W, 40)) - return return ..() //Guns cannot shoot through hull or generally dense turfs. -/obj/machinery/power/pointdefense/proc/space_los(meteor) +/obj/machinery/pointdefense/proc/space_los(meteor) for(var/turf/T in getline(src,meteor)) if(T.density) return FALSE return TRUE -/obj/machinery/power/pointdefense/proc/Shoot(var/weakref/target) +/obj/machinery/pointdefense/proc/Shoot(var/weakref/target) var/obj/effect/meteor/M = target.resolve() if(!istype(M)) + engaging = null return - engaging = TRUE + engaging = target var/Angle = round(Get_Angle(src,M)) var/matrix/rot_matrix = matrix() rot_matrix.Turn(Angle) @@ -245,80 +208,85 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) set_dir(ATAN2(transform.b, transform.a) > 0 ? NORTH : SOUTH) -/obj/machinery/power/pointdefense/proc/finish_shot(var/weakref/target) - //Cleanup from list - var/obj/machinery/pointdefense_control/PC = get_controller() - if(istype(PC)) - PC.targets -= target +/obj/machinery/pointdefense/proc/finish_shot(var/weakref/target) + + var/obj/machinery/pointdefense_control/PC = get_controller() + engaging = null + PC.targets -= target - engaging = FALSE last_shot = world.time var/obj/effect/meteor/M = target.resolve() if(!istype(M)) return - if(use_power_oneoff(active_power_usage) < active_power_usage) - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(5, 1, src) - s.start() - visible_message("[src] sputters as browns out while attempting to fire.") - flick(src, "[initial(icon_state)]_off") - return //We throw a laser but it doesnt have to hit for meteor to explode var/obj/item/projectile/beam/pointdefense/beam = new(get_turf(src)) playsound(src, 'sound/weapons/mandalorian.ogg', 75, 1) + use_power_oneoff(idle_power_usage * 10) beam.launch_projectile(target = M.loc, user = src) - M.make_debris() - qdel(M) -/obj/machinery/power/pointdefense/process() +/obj/machinery/pointdefense/process() ..() - if(!anchored || stat & (NOPOWER|BROKEN)) + if(stat & (NOPOWER|BROKEN)) return if(!active) return - /* var/desiredir = ATAN2(transform.b, transform.a) > 0 ? NORTH : SOUTH if(dir != desiredir) set_dir(desiredir) - */ + if(LAZYLEN(GLOB.meteor_list) > 0) find_and_shoot() -/obj/machinery/power/pointdefense/proc/find_and_shoot() +/obj/machinery/pointdefense/proc/find_and_shoot() + // There ARE meteors to shoot if(LAZYLEN(GLOB.meteor_list) == 0) return + // We can shoot if(engaging || ((world.time - last_shot) < charge_cooldown)) return var/obj/machinery/pointdefense_control/PC = get_controller() if(!istype(PC)) return + + // Compile list of known targets + var/list/existing_targets = list() + for(var/weakref/WR in PC.targets) + var/obj/effect/meteor/M = WR.resolve() + existing_targets += M - var/list/connected_z_levels = GetConnectedZlevels(get_z(src)) - for(var/obj/effect/meteor/M in GLOB.meteor_list) - var/already_targeted = FALSE - for(var/weakref/WR in PC.targets) - var/obj/effect/meteor/m = WR.resolve() - if(m == M) - already_targeted = TRUE - break - if(!istype(m)) - PC.targets -= WR - - if(already_targeted) - continue - - if(!(M.z in connected_z_levels)) - continue - if(get_dist(M, src) > kill_range) - continue - if(!emagged && space_los(M)) + // First, try and acquire new targets + var/list/potential_targets = GLOB.meteor_list.Copy() - existing_targets + for(var/obj/effect/meteor/M in potential_targets) + if(targeting_check(M)) var/weakref/target = weakref(M) PC.targets += target + engaging = target Shoot(target) return -/obj/machinery/power/pointdefense/RefreshParts() + // Then, focus fire on existing targets + for(var/obj/effect/meteor/M in existing_targets) + if(targeting_check(M)) + var/weakref/target = weakref(M) + engaging = target + Shoot(target) + return + +/obj/machinery/pointdefense/proc/targeting_check(var/obj/effect/meteor/M) + // Target in range + var/list/connected_z_levels = GetConnectedZlevels(get_z(src)) + if(!(M.z in connected_z_levels)) + return FALSE + if(get_dist(M, src) > kill_range) + return FALSE + // If we can shoot it, then shoot + if(emagged || !space_los(M)) + return FALSE + + return TRUE + +/obj/machinery/pointdefense/RefreshParts() . = ..() // Calculates an average rating of components that affect shooting rate var/shootrate_divisor = total_component_rating_of_type(/obj/item/weapon/stock_parts/capacitor) @@ -334,7 +302,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) var/rotation_divisor = total_component_rating_of_type(/obj/item/weapon/stock_parts/manipulator) rotation_speed = 0.5 SECONDS / (rotation_divisor ? rotation_divisor : 1) -/obj/machinery/power/pointdefense/proc/Activate() +/obj/machinery/pointdefense/proc/Activate() if(active) return FALSE @@ -344,7 +312,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) update_icon() return TRUE -/obj/machinery/power/pointdefense/proc/Deactivate() +/obj/machinery/pointdefense/proc/Deactivate() if(!active) return FALSE playsound(src, 'sound/machines/apc_nopower.ogg', 50, 0) @@ -352,32 +320,3 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) active = FALSE update_icon() return TRUE - -// -// Projectile Beam Definitions -// - -/obj/item/projectile/beam/pointdefense - name = "point defense salvo" - icon_state = "laser" - damage = 15 - damage_type = ELECTROCUTE //You should be safe inside a voidsuit - sharp = FALSE //"Wide" spectrum beam - light_color = COLOR_GOLD - - muzzle_type = /obj/effect/projectile/muzzle/pointdefense - tracer_type = /obj/effect/projectile/tracer/pointdefense - impact_type = /obj/effect/projectile/impact/pointdefense - - -/obj/effect/projectile/tracer/pointdefense - icon = 'icons/obj/projectiles_vr.dmi' - icon_state = "beam_pointdef" - -/obj/effect/projectile/muzzle/pointdefense - icon = 'icons/obj/projectiles_vr.dmi' - icon_state = "muzzle_pointdef" - -/obj/effect/projectile/impact/pointdefense - icon = 'icons/obj/projectiles_vr.dmi' - icon_state = "impact_pointdef" diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 8e9e6da8f71..d4068974ae3 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -74,7 +74,6 @@ var/check_anomalies = TRUE //checks if it can shoot at unidentified lifeforms (ie xenos) var/check_synth = FALSE //if active, will shoot at anything not an AI or cyborg var/check_all = FALSE //If active, will fire on anything, including synthetics. - var/fire_at_movement = FALSE // If active, will fire on the most recent thing to move in range, as soon as possible. var/ailock = FALSE // AI cannot use this var/check_down = FALSE //If active, will shoot to kill when lethals are also on var/faction = null //if set, will not fire at people in the same faction for any reason. @@ -96,8 +95,6 @@ var/timeout = 10 // When a turret pops up, then finds nothing to shoot at, this number decrements until 0, when it pops down. var/can_salvage = TRUE // If false, salvaging doesn't give you anything. - var/stay_up = FALSE // If true, the turret will remain open while it is powered. - /obj/machinery/porta_turret/crescent req_one_access = list(access_cent_specops) enabled = FALSE @@ -279,31 +276,6 @@ ) return data -/obj/machinery/porta_turret/pointdefense - name = "point-defense turret" - turret_type = "core" - desc = "A basic ship-mounted rock-breaker." - description_info = "This turret is capable of blasting incoming meteors into gravel, but it is very limited in range." - - installation = /obj/item/weapon/gun/energy/mininglaser - - check_arrest = FALSE - check_records = FALSE - check_weapons = FALSE - check_access = FALSE - check_anomalies = FALSE - check_synth = FALSE - check_all = FALSE - fire_at_movement = TRUE - stay_up = TRUE - ailock = FALSE - check_down = FALSE - -/obj/machinery/porta_turret/pointdefense/orderable - enabled = FALSE - anchored = FALSE - locked = FALSE - /obj/machinery/porta_turret/Initialize() //Sets up a spark system spark_system = new /datum/effect/effect/system/spark_spread @@ -350,8 +322,6 @@ var/obj/item/projectile/P = initial(E.projectile_type) //var/obj/item/ammo_casing/shottype = E.projectile_type - //GLOB.moved_event.register_global(src, /obj/machinery/porta_turret/proc/point_defense) //VOREStation Removal - projectile = P lethal_projectile = projectile shot_sound = initial(P.fire_sound) @@ -407,14 +377,6 @@ lethal_shot_sound = 'sound/weapons/eluger.ogg' shot_sound = 'sound/weapons/Taser.ogg' - if(/obj/item/weapon/gun/energy/mininglaser) - lethal_icon_color = "green" - lethal_projectile = /obj/item/projectile/beam/mininglaser - lethal_shot_sound = 'sound/weapons/eluger.ogg' - icon_color = "red" - projectile = /obj/item/projectile/beam/weaklaser - shot_sound = 'sound/weapons/Laser.ogg' - /obj/machinery/porta_turret/proc/isLocked(mob/user) if(locked && !issilicon(user)) to_chat(user, "Controls locked.") @@ -712,10 +674,6 @@ popDown() return - if(stay_up) - timeout = 10 - popUp() - var/list/targets = list() //list of primary targets var/list/secondarytargets = list() //targets that are least important @@ -738,7 +696,7 @@ if(!tryToShootAt(targets)) if(!tryToShootAt(secondarytargets)) // if no valid targets, go for secondary targets timeout-- - if(timeout <= 0 && !stay_up) + if(timeout <= 0) spawn() popDown() // no valid targets, close the cover @@ -746,14 +704,6 @@ use_power(20000) health = min(health+1, maxhealth) // 1HP for 20kJ -// We're expecting the first arg to be a target, for this we don't care about previous and next turfs. -/obj/machinery/porta_turret/proc/point_defense(var/atom/movable/Targ) - if((stat & (NOPOWER|BROKEN)) || !fire_at_movement) // Are we even able or supposed to fire at non-moving targets? - return - - if((isliving(Targ) && assess_living(Targ)) || ((istype(Targ, /obj/item) || istype(Targ, /obj/effect/meteor)) && Targ.invisibility < INVISIBILITY_LEVEL_ONE && Targ in view(7,src))) // Is the target a living thing, if so, is it a valid target? Or if it's not living, is it in sight? - target(Targ) // Yes? Blast it. - /obj/machinery/porta_turret/proc/assess_and_assign(var/mob/living/L, var/list/targets, var/list/secondarytargets) switch(assess_living(L)) if(TURRET_PRIORITY_TARGET) @@ -780,10 +730,10 @@ if(L.stat == DEAD && !emagged) //if the perp is dead, no need to bother really return TURRET_NOT_TARGET //move onto next potential victim! - if(get_dist(src, get_turf(L)) > 7) //if it's too far away, why bother? + if(get_dist(src, L) > 7) //if it's too far away, why bother? return TURRET_NOT_TARGET - if(!(L in check_trajectory(get_turf(L), src))) //check if we have true line of sight + if(!(L in check_trajectory(L, src))) //check if we have true line of sight return TURRET_NOT_TARGET if(emagged) // If emagged not even the dead get a rest @@ -890,9 +840,8 @@ last_target = target spawn() popUp() //pop the turret up if it's not already up. - if(dir != get_dir(src, target)) - set_dir(get_dir(src, target)) //even if you can't shoot, follow the target - playsound(src, 'sound/machines/turrets/turret_rotate.ogg', 100, 1) // Play rotating sound + set_dir(get_dir(src, target)) //even if you can't shoot, follow the target + playsound(src, 'sound/machines/turrets/turret_rotate.ogg', 100, 1) // Play rotating sound spawn() shootAt(target) return 1 @@ -956,9 +905,6 @@ var/check_weapons var/check_anomalies var/check_all - var/check_down - var/fire_at_movement - var/stay_up var/ailock /obj/machinery/porta_turret/proc/setState(var/datum/turret_checks/TC) @@ -974,9 +920,6 @@ check_weapons = TC.check_weapons check_anomalies = TC.check_anomalies check_all = TC.check_all - check_down = TC.check_down - fire_at_movement = TC.fire_at_movement - stay_up = TC.stay_up ailock = TC.ailock power_change() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 87d2ca9b446..8175ee91dae 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -632,7 +632,7 @@ /obj/machinery/suit_cycler/exploration name = "Explorer suit cycler" model_text = "Exploration" - departments = list("Exploration","Old Exploration","No Change") + departments = list("Exploration","Expedition Medic","Old Exploration","No Change") /obj/machinery/suit_cycler/exploration/Initialize() species -= SPECIES_TESHARI @@ -1113,6 +1113,9 @@ if("Exploration") parent_helmet = /obj/item/clothing/head/helmet/space/void/exploration parent_suit = /obj/item/clothing/suit/space/void/exploration + if("Expedition Medic") + parent_helmet = /obj/item/clothing/head/helmet/space/void/expedition_medical + parent_suit = /obj/item/clothing/suit/space/void/expedition_medical if("Old Exploration") parent_helmet = /obj/item/clothing/head/helmet/space/void/exploration/alt parent_suit = /obj/item/clothing/suit/space/void/exploration/alt diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index 168114844d8..f373f20a9d7 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -4,8 +4,9 @@ // Old Exploration is too WIP to use right now /obj/machinery/suit_cycler/exploration - req_access = list(access_explorer) - departments = list("Exploration","No Change") + req_access = null + req_one_access = list(access_explorer,access_medical_equip) + departments = list("Exploration","Expedition Medic","No Change") /obj/machinery/suit_cycler/pilot req_access = list(access_pilot) diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index 7f5a1d8e567..3477eaea5af 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -196,9 +196,6 @@ TC.check_weapons = check_weapons TC.check_anomalies = check_anomalies TC.check_all = check_all - TC.check_down = check_down - TC.stay_up = stay_up - TC.fire_at_movement = fire_at_movement TC.ailock = ailock if(istype(control_area)) diff --git a/code/game/machinery/vending_machines.dm b/code/game/machinery/vending_machines.dm index a007904776c..ea4c7497e35 100644 --- a/code/game/machinery/vending_machines.dm +++ b/code/game/machinery/vending_machines.dm @@ -590,8 +590,9 @@ desc = "An old sweet water vending machine,how did this end up here?" icon_state = "sovietsoda" product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem." - products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 30) // TODO Russian soda can - contraband = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 20) // TODO Russian cola can + products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/boda = 30, //ADDITION 04/03/2021 + /obj/item/weapon/reagent_containers/food/drinks/cans/kompot = 20) //ADDITION 04/03/2021 + contraband = list(/obj/item/weapon/reagent_containers/food/drinks/cans/kvass = 20) //ADDITION 04/03/2021 idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. vending_sound = "machines/vending/vending_cans.ogg" diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm index 5f30171a8d9..94a55bba1b4 100644 --- a/code/game/machinery/vending_machines_vr.dm +++ b/code/game/machinery/vending_machines_vr.dm @@ -1410,7 +1410,6 @@ contraband = list(/obj/item/clothing/head/syndicatefake = 1, /obj/item/clothing/suit/syndicatefake = 1) -//TFF 19/12/19 - Brig version of a seed storage vendor /obj/machinery/seed_storage/brig name = "Prisoners' food seed storage" starting_seeds = list( @@ -4540,7 +4539,6 @@ /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat = 10) vend_delay = 15 -//TFF 19/12/19 - Brig version of a seed storage vendor /obj/machinery/seed_storage/brig name = "Prisoners' food seed storage" starting_seeds = list( diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index 764cd378e1f..aabb65769ae 100644 --- a/code/game/machinery/wall_frames.dm +++ b/code/game/machinery/wall_frames.dm @@ -105,7 +105,7 @@ desc = "Used for building lights." icon = 'icons/obj/lighting.dmi' icon_state = "tube-construct-item" - refund_amt = 2 //TFF 17/1/20 - Oversight fix for infinite steel produciton. + refund_amt = 2 build_machine_type = /obj/machinery/light_construct reverse = 1 diff --git a/code/game/objects/effects/decals/posters/polarisposters.dm b/code/game/objects/effects/decals/posters/polarisposters.dm index 45cfd8622d1..8835d582423 100644 --- a/code/game/objects/effects/decals/posters/polarisposters.dm +++ b/code/game/objects/effects/decals/posters/polarisposters.dm @@ -291,7 +291,7 @@ The image seems important." listing_name = "Safety - Mech Operation" -//VOREStation Removal Start TFF 17/12/19 - lore not used in our station's own lore. +//VOREStation Removal Start /* /datum/poster/nanotrasen/nt_4 icon_state = "ntposter04" diff --git a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm index e48606a2acd..d750cfc70b1 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm @@ -87,4 +87,6 @@ light_range = 2 light_power = 0.5 light_color = "#80F5FF" -//VOREStation edit ends \ No newline at end of file +//VOREStation edit ends +/obj/effect/projectile/impact/pointdefense + icon_state = "impact_pointdef" diff --git a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm index a5c70aab2c2..64afc049512 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm @@ -99,4 +99,6 @@ light_range = 2 light_power = 0.5 light_color = "#80F5FF" -//VOREStation edit ends \ No newline at end of file +//VOREStation edit ends +/obj/effect/projectile/muzzle/pointdefense + icon_state = "muzzle_pointdef" diff --git a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm index 4326bc536d6..e3ae63cbad0 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm @@ -129,3 +129,5 @@ light_power = 0.5 light_color = "#80F5FF" //VOREStation edit ends +/obj/effect/projectile/tracer/pointdefense + icon_state = "beam_pointdef" diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index d35a7546b74..4d006f162f1 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -294,7 +294,7 @@ icon_state = "lamp" force = 10 center_of_mass = list("x" = 13,"y" = 11) - brightness_on = 10 //TFF 27/11/19 - post refactor fix for intensity levels. + brightness_on = 10 w_class = ITEMSIZE_LARGE power_use = 0 on = 1 diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 4391901918e..ea457f651ef 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -949,7 +949,7 @@ /obj/item/toy/plushie/mouse name = "mouse plush" desc = "A plushie of a delightful mouse! What was once considered a vile rodent is now your very best friend." - icon_state = "mouseplushie" //TFF 12/11/19 - updated icon to show a sprite that doesn't replicate a dead mouse. Heck you for that! >:C + icon_state = "mouseplushie" pokephrase = "Squeak!" /obj/item/toy/plushie/kitten diff --git a/code/game/objects/items/weapons/circuitboards/machinery/ships.dm b/code/game/objects/items/weapons/circuitboards/machinery/ships.dm index b71e7ce37b9..dd37bc2519e 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/ships.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/ships.dm @@ -6,8 +6,8 @@ name = T_BOARD("point defense battery") board_type = new /datum/frame/frame_types/machine desc = "Control systems for a Kuiper pattern point defense battery. Aim away from vessel." - build_path = /obj/machinery/power/pointdefense - origin_tech = list(TECH_ENGINEERING = 3, TECH_COMBAT = 2, TECH_POWER = 2) + build_path = /obj/machinery/pointdefense + origin_tech = list(TECH_ENGINEERING = 3, TECH_COMBAT = 2) req_components = list( /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser = 1, /obj/item/weapon/stock_parts/manipulator = 2, diff --git a/code/game/turfs/simulated/outdoors/outdoors.dm b/code/game/turfs/simulated/outdoors/outdoors.dm index 5f438f698f2..8ca1659d1b1 100644 --- a/code/game/turfs/simulated/outdoors/outdoors.dm +++ b/code/game/turfs/simulated/outdoors/outdoors.dm @@ -31,10 +31,14 @@ var/list/turf_edge_cache = list() return ..() /turf/simulated/proc/make_outdoors() + if(outdoors) + return outdoors = TRUE SSplanets.addTurf(src) /turf/simulated/proc/make_indoors() + if(!outdoors) + return outdoors = FALSE SSplanets.removeTurf(src) diff --git a/code/modules/admin/admin_verb_lists_vr.dm b/code/modules/admin/admin_verb_lists_vr.dm index bc6e620b7a7..597c229478c 100644 --- a/code/modules/admin/admin_verb_lists_vr.dm +++ b/code/modules/admin/admin_verb_lists_vr.dm @@ -155,6 +155,7 @@ var/list/admin_verbs_fun = list( /client/proc/smite, /client/proc/smite_vr, //VOREStation Add, /client/proc/admin_lightning_strike, + /client/proc/resize //VOREStation Add, ) var/list/admin_verbs_spawn = list( diff --git a/code/modules/admin/verbs/resize.dm b/code/modules/admin/verbs/resize.dm new file mode 100644 index 00000000000..140ce75393a --- /dev/null +++ b/code/modules/admin/verbs/resize.dm @@ -0,0 +1,24 @@ +/client/proc/resize(var/mob/living/L in mob_list) + set name = "Resize" + set desc = "Resizes any living mob without any restrictions on size." + set category = "Fun" + if(!check_rights(R_ADMIN, R_FUN)) + return + + var/size_multiplier = input(usr, "Input size multiplier.", "Resize", 1) as num|null + if(!size_multiplier) + return //cancelled + + size_multiplier = clamp(size_multiplier, 0.01, 1000) + var/can_be_big = L.has_large_resize_bounds() + var/very_big = is_extreme_size(size_multiplier) + + if(very_big && can_be_big) // made an extreme size in an area that allows it, don't assume adminbuse + to_chat(src,"[L] will lose this size upon moving into an area where this size is not allowed.") + else if(very_big) // made an extreme size in an area that doesn't allow it, assume adminbuse + to_chat(src,"[L] will retain this normally unallowed size outside this area.") + + L.resize(size_multiplier, animate = TRUE, uncapped = TRUE, ignore_prefs = TRUE) + + log_and_message_admins("has changed [key_name(L)]'s size multiplier to [size_multiplier].") + feedback_add_details("admin_verb","RESIZE") \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 4b56b64c35f..7e21dd3ef8c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -44,7 +44,6 @@ display_name = "collar, holo" path = /obj/item/clothing/accessory/collar/holo -//TFF 17/6/19 - public loadout addition: Indigestible Holocollar /datum/gear/collar/holo/indigestible display_name = "collar, holo (indigestible)" path = /obj/item/clothing/accessory/collar/holo/indigestible diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 821f7b18bff..4e6dcf7cd2d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -741,6 +741,12 @@ ckeywhitelist = list("pimientopyro") character_name = list("Scylla Casmus") +/datum/gear/fluff/kiyoshi_cloak + path = /obj/item/clothing/accessory/poncho/fluff/cloakglowing + display_name = "glowing cloak" + ckeywhitelist = list("pastelprincedan") + character_name = list("Kiyoshi Maki", "Masumi Maki") + // Q CKEYS // R CKEYS diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm index a1149821d2b..5af5db28b23 100644 --- a/code/modules/client/preference_setup/vore/02_size.dm +++ b/code/modules/client/preference_setup/vore/02_size.dm @@ -45,7 +45,7 @@ character.weight_gain = pref.weight_gain character.weight_loss = pref.weight_loss character.fuzzy = pref.fuzzy - character.resize(pref.size_multiplier, animate = FALSE) + character.resize(pref.size_multiplier, animate = FALSE, ignore_prefs = TRUE) /datum/category_item/player_setup_item/vore/size/content(var/mob/user) . += "
" diff --git a/code/modules/client/preference_setup/vore/09_misc.dm b/code/modules/client/preference_setup/vore/09_misc.dm index 1396b4570ff..7018d9342d2 100644 --- a/code/modules/client/preference_setup/vore/09_misc.dm +++ b/code/modules/client/preference_setup/vore/09_misc.dm @@ -1,5 +1,3 @@ -//TFF 5/8/19 - moved /datum/preferences to preferences_vr.dm - /datum/category_item/player_setup_item/vore/misc name = "Misc Settings" sort_order = 9 @@ -9,16 +7,15 @@ S["directory_tag"] >> pref.directory_tag S["directory_erptag"] >> pref.directory_erptag S["directory_ad"] >> pref.directory_ad - S["sensorpref"] >> pref.sensorpref //TFF 5/8/19 - add sensor pref setting to load after saved + S["sensorpref"] >> pref.sensorpref /datum/category_item/player_setup_item/vore/misc/save_character(var/savefile/S) S["show_in_directory"] << pref.show_in_directory S["directory_tag"] << pref.directory_tag S["directory_erptag"] << pref.directory_erptag S["directory_ad"] << pref.directory_ad - S["sensorpref"] << pref.sensorpref //TFF 5/8/19 - add sensor pref setting to be saveable + S["sensorpref"] << pref.sensorpref -//TFF 5/8/19 - add new datum category to allow for setting multiple settings when this is selected in the loadout. /datum/category_item/player_setup_item/vore/misc/copy_to_mob(var/mob/living/carbon/human/character) if(pref.sensorpref > 5 || pref.sensorpref < 1) pref.sensorpref = 5 @@ -28,7 +25,7 @@ pref.show_in_directory = sanitize_integer(pref.show_in_directory, 0, 1, initial(pref.show_in_directory)) pref.directory_tag = sanitize_inlist(pref.directory_tag, GLOB.char_directory_tags, initial(pref.directory_tag)) pref.directory_erptag = sanitize_inlist(pref.directory_erptag, GLOB.char_directory_erptags, initial(pref.directory_erptag)) - pref.sensorpref = sanitize_integer(pref.sensorpref, 1, sensorpreflist.len, initial(pref.sensorpref)) //TFF - 5/8/19 - add santisation for sensor prefs + pref.sensorpref = sanitize_integer(pref.sensorpref, 1, sensorpreflist.len, initial(pref.sensorpref)) /datum/category_item/player_setup_item/vore/misc/content(var/mob/user) . += "
" @@ -36,7 +33,7 @@ . += "Character Directory Vore Tag: [pref.directory_tag]
" . += "Character Directory ERP Tag: [pref.directory_erptag]
" . += "Character Directory Advertisement: Set Directory Ad
" - . += "Suit Sensors Preference: [sensorpreflist[pref.sensorpref]]
" //TFF 5/8/19 - Allow selection of sensor settings from off, binary, vitals, tracking, or random + . += "Suit Sensors Preference: [sensorpreflist[pref.sensorpref]]
" /datum/category_item/player_setup_item/vore/misc/OnTopic(var/href, var/list/href_list, var/mob/user) if(href_list["toggle_show_in_directory"]) @@ -58,7 +55,6 @@ var/msg = sanitize(input(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad)) as message, extra = 0) //VOREStation Edit: separating out OOC notes pref.directory_ad = msg return TOPIC_REFRESH - //TFF 5/8/19 - add new thing so you can choose the sensor setting your character can get. else if(href_list["toggle_sensor_setting"]) var/new_sensorpref = input(user, "Choose your character's sensor preferences:", "Character Preferences", sensorpreflist[pref.sensorpref]) as null|anything in sensorpreflist if (!isnull(new_sensorpref) && CanUseTopic(user)) diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm index 11116baa8ee..2dc6ed7f925 100644 --- a/code/modules/clothing/clothing_vr.dm +++ b/code/modules/clothing/clothing_vr.dm @@ -153,7 +153,6 @@ SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi') -//TFF 5/8/19 - sets Vorestation /obj/item/clothing/under sensor setting default? /obj/item/clothing/under sensor_mode = 3 var/sensorpref = 5 @@ -162,7 +161,6 @@ SPECIES_VOX = 'icons/mob/species/vox/uniform.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/uniform.dmi') -//TFF 5/8/19 - define numbers and specifics for suit sensor settings /obj/item/clothing/under/New(var/mob/living/carbon/human/H) ..() sensorpref = isnull(H) ? 1 : (ishuman(H) ? H.sensorpref : 1) diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index 7b4cf74057d..973b0e5309a 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -329,13 +329,33 @@ /obj/item/clothing/suit/space/void/exploration name = "exploration voidsuit" - desc = "A lightweight, radiation-resistant voidsuit, featuring the Explorer emblem on its chest plate. Designed for exploring unknown planetary environments." + desc = "A hazard and radiation resistant voidsuit, featuring the Explorer emblem on its chest plate. Designed for exploring unknown planetary environments." icon_state = "void_explorer" item_state_slots = list(slot_r_hand_str = "skrell_suit_black", slot_l_hand_str = "skrell_suit_black") armor = list(melee = 40, bullet = 15, laser = 25,energy = 35, bomb = 30, bio = 100, rad = 70) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/device/healthanalyzer,/obj/item/device/gps,/obj/item/device/radio/beacon, \ /obj/item/weapon/shovel,/obj/item/ammo_magazine,/obj/item/weapon/gun) +//SAR +/obj/item/clothing/head/helmet/space/void/expedition_medical + name = "exploration medic\'s voidsuit helmet" + desc = "A radiation-resistant helmet made especially for exploring unknown planetary environments. Has a reinforced high-vis bubble style visor." + icon_state = "helm_exp_medic" + item_state = "helm_exp_medic" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 25, bullet = 10, laser = 20,energy = 30, bomb = 25, bio = 100, rad = 70) + light_overlay = "helmet_light_dual" //explorer_light + +/obj/item/clothing/suit/space/void/expedition_medical + name = "exploration medic\'s voidsuit" + desc = "A hazard and radiation resistant voidsuit, featuring the Explorer emblem and a green cross on its chest plate. Seems to be a little lighter and more flexible than the regular explorer issue." + icon_state = "void_exp_medic" + slowdown = 0.75 + item_state_slots = list(slot_r_hand_str = "skrell_suit_black", slot_l_hand_str = "skrell_suit_black") + armor = list(melee = 25, bullet = 10, laser = 20,energy = 30, bomb = 25, bio = 100, rad = 70) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/device/healthanalyzer,/obj/item/device/gps,/obj/item/device/radio/beacon, \ + /obj/item/weapon/shovel,/obj/item/ammo_magazine,/obj/item/weapon/gun,/obj/item/weapon/storage/firstaid,/obj/item/stack/medical) + /obj/item/clothing/head/helmet/space/void/exploration/alt desc = "A radiation-resistant helmet retrofitted for exploring unknown planetary environments." icon_state = "helm_explorer2" diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 9638a414bd9..b20524a1362 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -30,8 +30,6 @@ icon_state = "grey" rolled_sleeves = 0 -//TFF 5/8/19 - add a non perma-set orange jumpsuit, splits prison into its own obj with override var settings. -//TFF 5/9/19 - add a different icon_state to both jumpsuits, orange and prison. Refactors orange and prison jumpsuit slightly. /obj/item/clothing/under/color/orange name = "orange jumpsuit" icon_state = "orange" diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 762ea621095..67d08d29404 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -79,6 +79,8 @@ return var/new_size = input("Put the desired size (25-200%), or (1-600%) in dormitory areas.", "Set Size", 200) as num|null + if(!new_size) + return //cancelled //Check AGAIN because we accepted user input which is blocking. if (src != H.w_uniform) @@ -88,9 +90,9 @@ if (H.stat || H.restrained()) return - if (isnull(H.size_multiplier)) + if (isnull(H.size_multiplier)) // Why would this ever be the case? to_chat(H,"The uniform panics and corrects your apparently microscopic size.") - H.resize(RESIZE_NORMAL) + H.resize(RESIZE_NORMAL, ignore_prefs = TRUE) H.update_icons() //Just want the matrix transform return @@ -102,7 +104,7 @@ if(new_size != H.size_multiplier) if(!original_size) original_size = H.size_multiplier - H.resize(new_size/100) + H.resize(new_size/100, ignore_prefs = TRUE) // Ignores prefs because you can only resize yourself H.visible_message("The space around [H] distorts as they change size!","The space around you distorts as you change size!") else //They chose their current size. return @@ -111,7 +113,7 @@ . = ..() if(. && ishuman(M) && original_size) var/mob/living/carbon/human/H = M - H.resize(original_size) + H.resize(original_size, ignore_prefs = TRUE) original_size = null H.visible_message("The space around [H] distorts as they return to their original size!","The space around you distorts as you return to your original size!") diff --git a/code/modules/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm index 037ee9dfd5d..f6ac58b1e41 100644 --- a/code/modules/events/rogue_drones.dm +++ b/code/modules/events/rogue_drones.dm @@ -22,7 +22,7 @@ /datum/event/rogue_drone/announce() var/msg var/rng = rand(1,5) - //VOREStation Edit Start TFF 16/12/19 - Sif -> Virgo 3b + //VOREStation Edit Start switch(rng) if(1) msg = "A combat drone wing operating in close orbit above Virgo 3b has failed to return from a anti-piracy sweep. If any are sighted, \ diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index 8f2e135d73a..6b53a966ddc 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -171,3 +171,36 @@ . = ..() reagents.add_reagent("rootbeer", 30) +//ADDITIONS BELOW THIS LINE MADE ON 04/03/2021 + +/obj/item/weapon/reagent_containers/food/drinks/cans/kvass + name = "\improper Kvass" + desc = "A true Slavic soda." + description_fluff = "A classic slavic beverage which many Space Russians still enjoy to this day. Fun fact, it is actually considered a weak beer by non-russians." + icon_state = "kvass" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/kvass/Initialize() + . = ..() + reagents.add_reagent("kvass", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/kompot + name = "\improper Kompot" + desc = "A taste of russia in the summertime - canned for you consumption." + description_fluff = "A sweet and fruity beverage that was traditionally used to preserve frutis in harsh Russian winters that is now available for widespread comsumption." + icon_state = "kompot" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/kompot/Initialize() + . = ..() + reagents.add_reagent("kompot", 30) + +/obj/item/weapon/reagent_containers/food/drinks/cans/boda + name = "\improper Boda" + desc = "State regulated soda beverage. Enjoy comrades." + icon_state = "boda" + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/drinks/cans/boda/Initialize() + . = ..() + reagents.add_reagent("sodawater", 30) \ No newline at end of file diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index d28ea98bef5..89bea231089 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -58,7 +58,7 @@ desc = "It's beef. It's roasted. It's been a staple of dining tradition for centuries." icon = 'icons/obj/food_vr.dmi' icon_state = "roastbeef" - trash = /obj/item/trash/plate //TFF 30/11/19 - Roast beef are put on plates, not waffle trays, you dunce~ + trash = /obj/item/trash/plate nutriment_amt = 8 nutriment_desc = list("cooked meat" = 5) diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 6b866d23bae..a92e17c6da4 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -27,7 +27,7 @@ var/datum/looping_sound/microwave/soundloop -// see code/modules/food/recipes_microwave.dm for recipes +//see code/modules/food/recipes_microwave.dm for recipes /******************* * Initialising @@ -283,68 +283,69 @@ if("dispose") dispose() return TRUE - -// /obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu -// var/dat = "" -// if(src.broken > 0) -// dat = {"Bzzzzttttt"} -// else if(src.operating) -// dat = {"Microwaving in progress!
Please wait...!"} -// else if(src.dirty==100) -// dat = {"This microwave is dirty!
Please clean it before use!"} -// else -// var/list/items_counts = new -// var/list/items_measures = new -// var/list/items_measures_p = new -// for (var/obj/O in ((contents - component_parts) - circuit)) -// var/display_name = O.name -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg)) -// items_measures[display_name] = "egg" -// items_measures_p[display_name] = "eggs" -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/tofu)) -// items_measures[display_name] = "tofu chunk" -// items_measures_p[display_name] = "tofu chunks" -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/meat)) //any meat -// items_measures[display_name] = "slab of meat" -// items_measures_p[display_name] = "slabs of meat" -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/donkpocket)) -// display_name = "Turnovers" -// items_measures[display_name] = "turnover" -// items_measures_p[display_name] = "turnovers" -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/carpmeat)) -// items_measures[display_name] = "fillet of meat" -// items_measures_p[display_name] = "fillets of meat" -// items_counts[display_name]++ -// for (var/O in items_counts) -// var/N = items_counts[O] -// if (!(O in items_measures)) -// dat += {"[capitalize(O)]: [N] [lowertext(O)]\s
"} -// else -// if (N==1) -// dat += {"[capitalize(O)]: [N] [items_measures[O]]
"} -// else -// dat += {"[capitalize(O)]: [N] [items_measures_p[O]]
"} +/* +/obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu + var/dat = "" + if(src.broken > 0) + dat = {"Bzzzzttttt"} + else if(src.operating) + dat = {"Microwaving in progress!
Please wait...!"} + else if(src.dirty==100) + dat = {"This microwave is dirty!
Please clean it before use!"} + else + var/list/items_counts = new + var/list/items_measures = new + var/list/items_measures_p = new + for (var/obj/O in ((contents - component_parts) - circuit)) + var/display_name = O.name + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg)) + items_measures[display_name] = "egg" + items_measures_p[display_name] = "eggs" + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/tofu)) + items_measures[display_name] = "tofu chunk" + items_measures_p[display_name] = "tofu chunks" + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/meat)) //any meat + items_measures[display_name] = "slab of meat" + items_measures_p[display_name] = "slabs of meat" + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/donkpocket)) + display_name = "Turnovers" + items_measures[display_name] = "turnover" + items_measures_p[display_name] = "turnovers" + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/carpmeat)) + items_measures[display_name] = "fillet of meat" + items_measures_p[display_name] = "fillets of meat" + items_counts[display_name]++ + for (var/O in items_counts) + var/N = items_counts[O] + if (!(O in items_measures)) + dat += {"[capitalize(O)]: [N] [lowertext(O)]\s
"} + else + if (N==1) + dat += {"[capitalize(O)]: [N] [items_measures[O]]
"} + else + dat += {"[capitalize(O)]: [N] [items_measures_p[O]]
"} -// for (var/datum/reagent/R in reagents.reagent_list) -// var/display_name = R.name -// if (R.id == "capsaicin") -// display_name = "Hotsauce" -// if (R.id == "frostoil") -// display_name = "Coldsauce" -// dat += {"[display_name]: [R.volume] unit\s
"} + for (var/datum/reagent/R in reagents.reagent_list) + var/display_name = R.name + if (R.id == "capsaicin") + display_name = "Hotsauce" + if (R.id == "frostoil") + display_name = "Coldsauce" + dat += {"[display_name]: [R.volume] unit\s
"} -// if (items_counts.len==0 && reagents.reagent_list.len==0) -// dat = {"The microwave is empty
"} -// else -// dat = {"Ingredients:
[dat]"} -// dat += {"

\ -// Turn on!
\ -// Eject ingredients!
\ -// "} + if (items_counts.len==0 && reagents.reagent_list.len==0) + dat = {"The microwave is empty
"} + else + dat = {"Ingredients:
[dat]"} + dat += {"

\ +Turn on!
\ +Eject ingredients!
\ +"} -// user << browse("Microwave Controls[dat]", "window=microwave") -// onclose(user, "microwave") -// return + user << browse("Microwave Controls[dat]", "window=microwave") + onclose(user, "microwave") + return +*/ /*********************************** * Microwave Menu Handling/Cooking diff --git a/code/modules/holomap/holomap_area.dm b/code/modules/holomap/holomap_area.dm index a9677c562ea..71a762c7fc7 100644 --- a/code/modules/holomap/holomap_area.dm +++ b/code/modules/holomap/holomap_area.dm @@ -33,7 +33,6 @@ /area/engineering holomap_color = HOLOMAP_AREACOLOR_ENGINEERING -//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos. /area/engineering/atmos_intake holomap_color = null /area/maintenance/substation/engineering diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index bec4978201d..66e7875e16d 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -94,7 +94,6 @@ to_chat(user, "You load [W] into [src].") return -//TFF 3/6/19 - fix infinite frame creation, ported from Cit RP - also allow movement of hydroponic-related machines. if(default_deconstruction_screwdriver(user, W)) return if(W.is_wrench()) diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index e71857cacae..b591ee26c54 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -53,9 +53,10 @@ var/list/name_to_material /proc/populate_material_list(force_remake=0) if(name_to_material && !force_remake) return // Already set up! name_to_material = list() - for(var/type in typesof(/datum/material) - /datum/material) + for(var/type in subtypesof(/datum/material)) var/datum/material/new_mineral = new type if(!new_mineral.name) + qdel(new_mineral) continue name_to_material[lowertext(new_mineral.name)] = new_mineral return 1 diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 3172836d447..9334fbbcec2 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -10,7 +10,7 @@ icon_state = "farmbot0" health = 50 maxHealth = 50 - req_one_access = list(access_robotics, access_hydroponics, access_xenobiology) //TFF 11/7/19 - adds Xenobio access on behalf of Nalarac + req_one_access = list(access_robotics, access_hydroponics, access_xenobiology) var/action = "" // Used to update icon var/waters_trays = 1 diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index a23fb2a8008..d8deee8e7bf 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -181,15 +181,6 @@ return FALSE -/mob/living/carbon/human/verb/toggle_resizing_immunity() - set name = "Toggle Resizing Immunity" - set desc = "Toggles your ability to resist resizing attempts" - set category = "IC" - - resizable = !resizable - to_chat(src, "You are now [resizable ? "susceptible" : "immune"] to being resized.") - - /mob/living/carbon/human/proc/handle_flip_vr() var/original_density = density var/original_passflags = pass_flags diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 50b3c9b0537..e024b5bd7ee 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -492,6 +492,7 @@ This function restores all organs. switch(damagetype) if(BRUTE) damageoverlaytemp = 20 + if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){damage *= 0.7} damage = damage*species.brute_mod for(var/datum/modifier/M in modifiers) @@ -504,6 +505,7 @@ This function restores all organs. UpdateDamageIcon() if(BURN) damageoverlaytemp = 20 + if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){damage *= 0.7} damage = damage*species.burn_mod for(var/datum/modifier/M in modifiers) diff --git a/code/modules/mob/living/carbon/human/human_defines_vr.dm b/code/modules/mob/living/carbon/human/human_defines_vr.dm index cdd72768385..494f16fa42a 100644 --- a/code/modules/mob/living/carbon/human/human_defines_vr.dm +++ b/code/modules/mob/living/carbon/human/human_defines_vr.dm @@ -7,7 +7,6 @@ var/impersonate_bodytype //For impersonating a bodytype var/ability_flags = 0 //Shadekin abilities/potentially other species-based? var/sensorpref = 5 //Suit sensor loadout pref - var/unnaturally_resized = FALSE //If one became larger than 200%, or smaller than 25%. This flag is needed for the case when admins want someone to be very big or very small outside of dorms. var/wings_hidden = FALSE /mob/living/carbon/human/proc/shadekin_get_energy() diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 3ac9edc0688..52020b90763 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -97,6 +97,7 @@ var/their_slowdown = max(H.calculate_item_encumbrance(), 1) item_tally = max(item_tally, their_slowdown) // If our slowdown is less than theirs, then we become as slow as them (before species modifires). + item_tally /= 2 //VOREStation Add item_tally *= species.item_slowdown_mod . += item_tally @@ -189,7 +190,7 @@ if(istype(back, /obj/item/weapon/tank/jetpack)) return back else if(istype(rig)) - for(var/obj/item/rig_module/maneuvering_jets.module in rig.installed_modules) + for(var/obj/item/rig_module/maneuvering_jets/module in rig.installed_modules) return module.jets /mob/living/carbon/human/Process_Spacemove(var/check_drift = 0) diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index f2b4a1e5881..4637bde1bd2 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -104,7 +104,8 @@ else if (E.is_dislocated()) stance_damage += 0.5 - if(E) limb_pain = E.organ_can_feel_pain() + if(E && (!E.is_usable() || E.is_broken() || E.is_dislocated())) //VOREStation Edit + limb_pain = E.organ_can_feel_pain() // Canes and crutches help you stand (if the latter is ever added) // One cane mitigates a broken leg+foot, or a missing foot. diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index cebfda00c08..286c257b972 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -62,8 +62,6 @@ //No need to update all of these procs if the guy is dead. fall() //VORESTATION EDIT. Prevents people from floating - if(unnaturally_resized) //VORESTATION EDIT. - handle_unnatural_size() if(stat != DEAD && !stasis) //Updates the number of stored chemicals for powers handle_changeling() @@ -1268,7 +1266,7 @@ //VOREStation Add - Vampire hunger alert else if(get_species() == SPECIES_CUSTOM) var/datum/species/custom/C = species - if(/datum/trait/bloodsucker in C.traits) + if(/datum/trait/neutral/bloodsucker in C.traits) fat_alert = /obj/screen/alert/fat/vampire hungry_alert = /obj/screen/alert/hungry/vampire starving_alert = /obj/screen/alert/starving/vampire diff --git a/code/modules/mob/living/carbon/human/life_vr.dm b/code/modules/mob/living/carbon/human/life_vr.dm index 2440a1ab74d..c5248fc8624 100644 --- a/code/modules/mob/living/carbon/human/life_vr.dm +++ b/code/modules/mob/living/carbon/human/life_vr.dm @@ -78,10 +78,3 @@ // Moving around increases germ_level faster if(germ_level < GERM_LEVEL_MOVE_CAP && prob(8)) germ_level++ - -/mob/living/carbon/human/proc/handle_unnatural_size() - if(!in_dorms()) - if(src.size_multiplier > 2) - src.resize(2) - else if (src.size_multiplier < 0.25) - src.resize(0.25) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 23aa2a57dc1..80ad0763e27 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -413,7 +413,6 @@ H.visible_message( \ "[H] shakes [target]'s hand.", \ "You shake [target]'s hand.", ) - //TFF 15/12/19 - Port nose booping from CHOMPStation else if(H.zone_sel.selecting == "mouth") H.visible_message( \ "[H] boops [target]'s nose.", \ diff --git a/code/modules/mob/living/carbon/human/species/species_vr.dm b/code/modules/mob/living/carbon/human/species/species_vr.dm index fb9beed574b..9777f197b03 100644 --- a/code/modules/mob/living/carbon/human/species/species_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_vr.dm @@ -53,6 +53,9 @@ var/datum/species/new_copy = new to_copy.type() + for(var/organ in to_copy.has_limbs) + var/list/organ_data = to_copy.has_limbs[organ] + new_copy.has_limbs[organ] = organ_data.Copy() new_copy.traits = traits //If you had traits, apply them diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/_protean_defines.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/_protean_defines.dm new file mode 100644 index 00000000000..9c6b5a89d78 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/_protean_defines.dm @@ -0,0 +1 @@ +#define PROTEAN_EDIBLE_MATERIALS list(MAT_STEEL, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_METALHYDROGEN) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index 52918b03bb5..ec0bab797cb 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -267,9 +267,8 @@ if(refactory && istype(A,/obj/item/stack/material)) var/obj/item/stack/material/S = A var/substance = S.material.name - var/list/edible_materials = list("steel", "plasteel", "diamond", "mhydrogen") //Can't eat all materials, just useful ones. var allowed = FALSE - for(var/material in edible_materials) + for(var/material in PROTEAN_EDIBLE_MATERIALS) if(material == substance) allowed = TRUE if(!allowed) return @@ -282,9 +281,8 @@ if(refactory && istype(O,/obj/item/stack/material)) var/obj/item/stack/material/S = O var/substance = S.material.name - var/list/edible_materials = list("steel", "plasteel", "diamond", "mhydrogen") //Can't eat all materials, just useful ones. var allowed = FALSE - for(var/material in edible_materials) + for(var/material in PROTEAN_EDIBLE_MATERIALS) if(material == substance) allowed = TRUE if(!allowed) return @@ -432,7 +430,7 @@ var/global/list/disallowed_protean_accessories = list( var/atom/reform_spot = blob.drop_location() //Size update - resize(blob.size_multiplier, FALSE) + resize(blob.size_multiplier, FALSE, ignore_prefs = TRUE) //Move them back where the blob was forceMove(reform_spot) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm index 8a84a153311..d18ad678df9 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm @@ -201,9 +201,8 @@ var/obj/item/stack/material/matstack = held var/substance = matstack.material.name - var/list/edible_materials = list(MAT_STEEL, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_METALHYDROGEN) //Can't eat all materials, just useful ones. var allowed = FALSE - for(var/material in edible_materials) + for(var/material in PROTEAN_EDIBLE_MATERIALS) if(material == substance) allowed = TRUE if(!allowed) to_chat(src,"You can't process [substance]!") @@ -300,14 +299,14 @@ //Sizing up if(cost > 0) if(refactory.use_stored_material(MAT_STEEL,cost)) - user.resize(size_factor) + user.resize(size_factor, ignore_prefs = TRUE) else to_chat(user,"That size change would cost [cost] steel, which you don't have.") //Sizing down (or not at all) else if(cost <= 0) cost = abs(cost) var/actually_added = refactory.add_stored_material(MAT_STEEL,cost) - user.resize(size_factor) + user.resize(size_factor, ignore_prefs = TRUE) if(actually_added != cost) to_chat(user,"Unfortunately, [cost-actually_added] steel was lost due to lack of storage space.") diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm index 432c9fdc857..087338fd739 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm @@ -201,7 +201,7 @@ if(refactory.get_stored_material(MAT_GOLD) >= METAL_PER_TICK) H.add_modifier(/datum/modifier/protean/gold, origin = refactory) - //Silver adds darksight + //Silver adds accuracy and evasion if(refactory.get_stored_material(MAT_SILVER) >= METAL_PER_TICK) H.add_modifier(/datum/modifier/protean/silver, origin = refactory) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index 3340c627be7..fa822196b10 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -1,31 +1,34 @@ #define ORGANICS 1 #define SYNTHETICS 2 -/datum/trait/speed_slow +/datum/trait/negative + category = -1 + +/datum/trait/negative/speed_slow name = "Slowdown" desc = "Allows you to move slower on average than baseline." cost = -2 var_changes = list("slowdown" = 0.5) -/datum/trait/speed_slow_plus +/datum/trait/negative/speed_slow_plus name = "Major Slowdown" desc = "Allows you to move MUCH slower on average than baseline." cost = -3 var_changes = list("slowdown" = 1.0) -/datum/trait/weakling +/datum/trait/negative/weakling name = "Weakling" desc = "Causes heavy equipment to slow you down more when carried." cost = -1 var_changes = list("item_slowdown_mod" = 1.5) -/datum/trait/weakling_plus +/datum/trait/negative/weakling_plus name = "Major Weakling" desc = "Allows you to carry heavy equipment with much more slowdown." cost = -2 var_changes = list("item_slowdown_mod" = 2.0) -/datum/trait/endurance_low +/datum/trait/negative/endurance_low name = "Low Endurance" desc = "Reduces your maximum total hitpoints to 75." cost = -2 @@ -35,7 +38,7 @@ ..(S,H) H.setMaxHealth(S.total_health) -/datum/trait/endurance_very_low +/datum/trait/negative/endurance_very_low name = "Extremely Low Endurance" desc = "Reduces your maximum total hitpoints to 50." cost = -3 //Teshari HP. This makes the person a lot more suseptable to getting stunned, killed, etc. @@ -45,108 +48,81 @@ ..(S,H) H.setMaxHealth(S.total_health) -/datum/trait/minor_brute_weak +/datum/trait/negative/minor_brute_weak name = "Minor Brute Weakness" desc = "Increases damage from brute damage sources by 15%" cost = -1 var_changes = list("brute_mod" = 1.15) -/datum/trait/brute_weak +/datum/trait/negative/brute_weak name = "Brute Weakness" desc = "Increases damage from brute damage sources by 25%" cost = -2 var_changes = list("brute_mod" = 1.25) -/datum/trait/brute_weak_plus +/datum/trait/negative/brute_weak_plus name = "Major Brute Weakness" desc = "Increases damage from brute damage sources by 50%" cost = -3 var_changes = list("brute_mod" = 1.5) -/datum/trait/minor_burn_weak +/datum/trait/negative/minor_burn_weak name = "Minor Burn Weakness" desc = "Increases damage from burn damage sources by 15%" cost = -1 var_changes = list("burn_mod" = 1.15) -/datum/trait/burn_weak +/datum/trait/negative/burn_weak name = "Burn Weakness" desc = "Increases damage from burn damage sources by 25%" cost = -2 var_changes = list("burn_mod" = 1.25) -/datum/trait/burn_weak_plus +/datum/trait/negative/burn_weak_plus name = "Major Burn Weakness" desc = "Increases damage from burn damage sources by 50%" cost = -3 var_changes = list("burn_mod" = 1.5) -/datum/trait/conductive +/datum/trait/negative/conductive name = "Conductive" desc = "Increases your susceptibility to electric shocks by 50%" cost = -1 var_changes = list("siemens_coefficient" = 1.5) //This makes you a lot weaker to tasers. -/datum/trait/conductive_plus +/datum/trait/negative/conductive_plus name = "Major Conductive" desc = "Increases your susceptibility to electric shocks by 100%" - cost = -2 + cost = -1 var_changes = list("siemens_coefficient" = 2.0) //This makes you extremely weak to tasers. -/datum/trait/haemophilia +/datum/trait/negative/haemophilia name = "Haemophilia - Organics only" desc = "When you bleed, you bleed a LOT." cost = -2 var_changes = list("bloodloss_rate" = 2) can_take = ORGANICS -/datum/trait/hollow +/datum/trait/negative/hollow name = "Hollow Bones/Aluminum Alloy" desc = "Your bones and robot limbs are much easier to break." cost = -2 //I feel like this should be higher, but let's see where it goes -/datum/trait/hollow/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/negative/hollow/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) for(var/obj/item/organ/external/O in H.organs) O.min_broken_damage *= 0.5 O.min_bruised_damage *= 0.5 -/datum/trait/lightweight +/datum/trait/negative/lightweight name = "Lightweight" desc = "Your light weight and poor balance make you very susceptible to unhelpful bumping. Think of it like a bowling ball versus a pin." cost = -2 var_changes = list("lightweight" = 1) - -/datum/trait/colorblind/mono - name = "Colorblindness (Monochromancy)" - desc = "You simply can't see colors at all, period. You are 100% colorblind." - cost = -1 - -/datum/trait/colorblind/mono/apply(var/datum/species/S,var/mob/living/carbon/human/H) - ..(S,H) - H.add_modifier(/datum/modifier/trait/colorblind_monochrome) - -/datum/trait/colorblind/para_vulp - name = "Colorblindness (Para Vulp)" - desc = "You have a severe issue with green colors and have difficulty recognizing them from red colors." - cost = -1 - -/datum/trait/colorblind/para_vulp/apply(var/datum/species/S,var/mob/living/carbon/human/H) - ..(S,H) - H.add_modifier(/datum/modifier/trait/colorblind_vulp) - -/datum/trait/colorblind/para_taj - name = "Colorblindness (Para Taj)" - desc = "You have a minor issue with blue colors and have difficulty recognizing them from red colors." - cost = -1 - -/datum/trait/colorblind/para_taj/apply(var/datum/species/S,var/mob/living/carbon/human/H) - ..(S,H) - H.add_modifier(/datum/modifier/trait/colorblind_taj) -/datum/trait/neural_hypersensitivity +/datum/trait/negative/neural_hypersensitivity name = "Neural Hypersensitivity" desc = "Your nerves are particularly sensitive to physical changes, leading to experiencing twice the intensity of pain and pleasure alike. Doubles traumatic shock." cost = -1 var_changes = list("trauma_mod" = 2) - + can_take = ORGANICS diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index 952bd470069..011059a9e04 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -1,42 +1,42 @@ #define ORGANICS 1 #define SYNTHETICS 2 -/datum/trait/metabolism_up +/datum/trait/neutral/metabolism_up name = "Fast Metabolism" desc = "You process ingested and injected reagents faster, but get hungry faster (Teshari speed)." cost = 0 var_changes = list("metabolic_rate" = 1.2, "hunger_factor" = 0.2, "metabolism" = 0.06) // +20% rate and 4x hunger (Teshari level) - excludes = list(/datum/trait/metabolism_down, /datum/trait/metabolism_apex) + excludes = list(/datum/trait/neutral/metabolism_down, /datum/trait/neutral/metabolism_apex) -/datum/trait/metabolism_down +/datum/trait/neutral/metabolism_down name = "Slow Metabolism" desc = "You process ingested and injected reagents slower, but get hungry slower." cost = 0 var_changes = list("metabolic_rate" = 0.8, "hunger_factor" = 0.04, "metabolism" = 0.0012) // -20% of default. - excludes = list(/datum/trait/metabolism_up, /datum/trait/metabolism_apex) + excludes = list(/datum/trait/neutral/metabolism_up, /datum/trait/neutral/metabolism_apex) -/datum/trait/metabolism_apex +/datum/trait/neutral/metabolism_apex name = "Apex Metabolism" desc = "Finally a proper excuse for your predatory actions. Essentially doubles the fast trait rates. Good for characters with big appetites." cost = 0 var_changes = list("metabolic_rate" = 1.4, "hunger_factor" = 0.4, "metabolism" = 0.012) // +40% rate and 8x hunger (Double Teshari) - excludes = list(/datum/trait/metabolism_up, /datum/trait/metabolism_down) + excludes = list(/datum/trait/neutral/metabolism_up, /datum/trait/neutral/metabolism_down) -/datum/trait/coldadapt +/datum/trait/neutral/coldadapt name = "Cold-Adapted" desc = "You are able to withstand much colder temperatures than other species, and can even be comfortable in extremely cold environments. You are also more vulnerable to hot environments, and have a lower body temperature as a consequence of these adaptations." cost = 0 var_changes = list("cold_level_1" = 200, "cold_level_2" = 150, "cold_level_3" = 90, "breath_cold_level_1" = 180, "breath_cold_level_2" = 100, "breath_cold_level_3" = 60, "cold_discomfort_level" = 210, "heat_level_1" = 330, "heat_level_2" = 380, "heat_level_3" = 700, "breath_heat_level_1" = 360, "breath_heat_level_2" = 400, "breath_heat_level_3" = 850, "heat_discomfort_level" = 295, "body_temperature" = 290) - excludes = list(/datum/trait/hotadapt) + excludes = list(/datum/trait/neutral/hotadapt) -/datum/trait/hotadapt +/datum/trait/neutral/hotadapt name = "Heat-Adapted" desc = "You are able to withstand much hotter temperatures than other species, and can even be comfortable in extremely hot environments. You are also more vulnerable to cold environments, and have a higher body temperature as a consequence of these adaptations." cost = 0 var_changes = list("heat_level_1" = 420, "heat_level_2" = 460, "heat_level_3" = 1100, "breath_heat_level_1" = 440, "breath_heat_level_2" = 510, "breath_heat_level_3" = 1500, "heat_discomfort_level" = 390, "cold_level_1" = 280, "cold_level_2" = 220, "cold_level_3" = 140, "breath_cold_level_1" = 260, "breath_cold_level_2" = 240, "breath_cold_level_3" = 120, "cold_discomfort_level" = 280, "body_temperature" = 330) - excludes = list(/datum/trait/coldadapt) + excludes = list(/datum/trait/neutral/coldadapt) -/datum/trait/autohiss_unathi +/datum/trait/neutral/autohiss_unathi name = "Autohiss (Unathi)" desc = "You roll your S's and x's" cost = 0 @@ -49,9 +49,9 @@ ), autohiss_exempt = list("Sinta'unathi")) - excludes = list(/datum/trait/autohiss_tajaran) + excludes = list(/datum/trait/neutral/autohiss_tajaran) -/datum/trait/autohiss_tajaran +/datum/trait/neutral/autohiss_tajaran name = "Autohiss (Tajaran)" desc = "You roll your R's." cost = 0 @@ -60,74 +60,74 @@ "r" = list("rr", "rrr", "rrrr") ), autohiss_exempt = list("Siik")) - excludes = list(/datum/trait/autohiss_unathi) + excludes = list(/datum/trait/neutral/autohiss_unathi) -/datum/trait/bloodsucker +/datum/trait/neutral/bloodsucker name = "Bloodsucker" desc = "Makes you unable to gain nutrition from anything but blood. To compenstate, you get fangs that can be used to drain blood from prey." cost = 0 custom_only = FALSE var_changes = list("organic_food_coeff" = 0) //The verb is given in human.dm -/datum/trait/bloodsucker/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/bloodsucker/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/carbon/human/proc/bloodsuck -/datum/trait/succubus_drain +/datum/trait/neutral/succubus_drain name = "Succubus Drain" desc = "Makes you able to gain nutrition from draining prey in your grasp." cost = 0 custom_only = FALSE -/datum/trait/succubus_drain/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/succubus_drain/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/carbon/human/proc/succubus_drain H.verbs |= /mob/living/carbon/human/proc/succubus_drain_finalize H.verbs |= /mob/living/carbon/human/proc/succubus_drain_lethal -/datum/trait/feeder +/datum/trait/neutral/feeder name = "Feeder" desc = "Allows you to feed your prey using your own body." cost = 0 custom_only = FALSE -/datum/trait/feeder/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/feeder/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/carbon/human/proc/slime_feed -/datum/trait/hard_vore +/datum/trait/neutral/hard_vore name = "Brutal Predation" desc = "Allows you to tear off limbs & tear out internal organs." cost = 0 custom_only = FALSE -/datum/trait/hard_vore/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/hard_vore/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/proc/shred_limb -/datum/trait/trashcan +/datum/trait/neutral/trashcan name = "Trash Can" desc = "Allows you to dispose of some garbage on the go instead of having to look for a bin or littering like an animal." cost = 0 custom_only = FALSE var_changes = list("trashcan" = 1) -/datum/trait/trashcan/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/trashcan/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/proc/eat_trash -/datum/trait/gem_eater +/datum/trait/neutral/gem_eater name = "Expensive Taste" desc = "You only gain nutrition from raw ore and refined minerals. There's nothing that sates the appetite better than precious gems, exotic or rare minerals and you have damn fine taste. Anything else is beneath you." cost = 0 custom_only = FALSE var_changes = list("organic_food_coeff" = 0, "eat_minerals" = 1) -/datum/trait/gem_eater/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/gem_eater/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/proc/eat_minerals - -/datum/trait/synth_chemfurnace + +/datum/trait/neutral/synth_chemfurnace name = "Biofuel Processor" desc = "You are able to gain energy through consuming and processing normal food. Energy-dense foods such as protein bars and survival food will yield the best results." cost = 0 @@ -135,101 +135,101 @@ can_take = SYNTHETICS var_changes = list("organic_food_coeff" = 0, "synthetic_food_coeff" = 0.25) -/datum/trait/glowing_eyes +/datum/trait/neutral/glowing_eyes name = "Glowing Eyes" desc = "Your eyes show up above darkness. SPOOKY! And kinda edgey too." cost = 0 custom_only = FALSE var_changes = list("has_glowing_eyes" = 1) -/datum/trait/glowing_body +/datum/trait/neutral/glowing_body name = "Glowing Body" desc = "Your body glows about as much as a PDA light! Settable color and toggle in Abilities tab ingame." cost = 0 custom_only = FALSE -/datum/trait/glowing_body/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/glowing_body/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/proc/glow_toggle H.verbs |= /mob/living/proc/glow_color //Allergen traits! Not available to any species with a base allergens var. -/datum/trait/allergy +/datum/trait/neutral/allergy name = "Allergy: Gluten" desc = "You're highly allergic to gluten proteins, which are found in most common grains." cost = 0 custom_only = FALSE var/allergen = GRAINS -/datum/trait/allergy/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/allergy/apply(var/datum/species/S,var/mob/living/carbon/human/H) S.allergens |= allergen ..(S,H) -/datum/trait/allergy/meat +/datum/trait/neutral/allergy/meat name = "Allergy: Meat" desc = "You're highly allergic to just about any form of meat. You're probably better off just sticking to vegetables. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = MEAT -/datum/trait/allergy/fish +/datum/trait/neutral/allergy/fish name = "Allergy: Fish" desc = "You're highly allergic to fish. It's probably best to avoid seafood in general. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = FISH -/datum/trait/allergy/fruit +/datum/trait/neutral/allergy/fruit name = "Allergy: Fruit" desc = "You're highly allergic to fruit. Vegetables are fine, but you should probably read up on how to tell the difference. Remember, tomatoes are a fruit. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = FRUIT -/datum/trait/allergy/vegetable +/datum/trait/neutral/allergy/vegetable name = "Allergy: Vegetable" desc = "You're highly allergic to vegetables. Fruit are fine, but you should probably read up on how to tell the difference. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = VEGETABLE -/datum/trait/allergy/nuts +/datum/trait/neutral/allergy/nuts name = "Allergy: Nuts" desc = "You're highly allergic to hard-shell seeds, such as peanuts. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = SEEDS -/datum/trait/allergy/soy +/datum/trait/neutral/allergy/soy name = "Allergy: Soy" desc = "You're highly allergic to soybeans, and some other kinds of bean. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = BEANS -/datum/trait/allergy/dairy +/datum/trait/neutral/allergy/dairy name = "Allergy: Lactose" desc = "You're highly allergic to lactose, and consequently, just about all forms of dairy. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = DAIRY -/datum/trait/allergy/fungi +/datum/trait/neutral/allergy/fungi name = "Allergy: Fungi" desc = "You're highly allergic to fungi such as mushrooms. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = FUNGI -/datum/trait/allergy/coffee +/datum/trait/neutral/allergy/coffee name = "Allergy: Coffee" desc = "You're highly allergic to coffee in specific. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = COFFEE - -/datum/trait/allergen_reduced_effect + +/datum/trait/neutral/allergen_reduced_effect name = "Reduced Allergen Reaction" desc = "This trait halves the lethality of allergen reactions. If you don't have any allergens set, it does nothing. It does not apply to nonlethal reactions or special reactions (such as unathi drowsiness from sugars)." cost = 0 @@ -237,42 +237,42 @@ var_changes = list("allergen_damage_severity" = 0.6) // Spicy Food Traits, from negative to positive. -/datum/trait/spice_intolerance_extreme +/datum/trait/neutral/spice_intolerance_extreme name = "Extreme Spice Intolerance" desc = "Spicy (and chilly) peppers are three times as strong. (This does not affect pepperspray.)" cost = 0 custom_only = FALSE var_changes = list("spice_mod" = 3) // 300% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/spice_intolerance_basic +/datum/trait/neutral/spice_intolerance_basic name = "Heavy Spice Intolerance" desc = "Spicy (and chilly) peppers are twice as strong. (This does not affect pepperspray.)" cost = 0 custom_only = FALSE var_changes = list("spice_mod" = 2) // 200% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/spice_intolerance_slight +/datum/trait/neutral/spice_intolerance_slight name = "Slight Spice Intolerance" desc = "You have a slight struggle with spicy foods. Spicy (and chilly) peppers are one and a half times stronger. (This does not affect pepperspray.)" cost = 0 custom_only = FALSE var_changes = list("spice_mod" = 1.5) // 150% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/spice_tolerance_basic +/datum/trait/neutral/spice_tolerance_basic name = "Spice Tolerance" desc = "Spicy (and chilly) peppers are only three-quarters as strong. (This does not affect pepperspray.)" cost = 0 custom_only = FALSE var_changes = list("spice_mod" = 0.75) // 75% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/spice_tolerance_advanced +/datum/trait/neutral/spice_tolerance_advanced name = "Strong Spice Tolerance" desc = "Spicy (and chilly) peppers are only half as strong. (This does not affect pepperspray.)" cost = 0 custom_only = FALSE var_changes = list("spice_mod" = 0.5) // 50% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/spice_immunity +/datum/trait/neutral/spice_immunity name = "Extreme Spice Tolerance" desc = "Spicy (and chilly) peppers are basically ineffective! (This does not affect pepperspray.)" cost = 0 @@ -280,42 +280,42 @@ var_changes = list("spice_mod" = 0.25) // 25% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! // Alcohol Traits Start Here, from negative to positive. -/datum/trait/alcohol_intolerance_advanced +/datum/trait/neutral/alcohol_intolerance_advanced name = "Liver of Air" desc = "The only way you can hold a drink is if it's in your own two hands, and even then you'd best not inhale too deeply near it. Drinks are three times as strong." cost = 0 custom_only = FALSE var_changes = list("alcohol_mod" = 3) // 300% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/alcohol_intolerance_basic +/datum/trait/neutral/alcohol_intolerance_basic name = "Liver of Lilies" desc = "You have a hard time with alcohol. Maybe you just never took to it, or maybe it doesn't agree with you... either way, drinks are twice as strong." cost = 0 custom_only = FALSE var_changes = list("alcohol_mod" = 2) // 200% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/alcohol_intolerance_slight +/datum/trait/neutral/alcohol_intolerance_slight name = "Liver of Tulips" desc = "You have a slight struggle with alcohol. Drinks are one and a half times stronger." cost = 0 custom_only = FALSE var_changes = list("alcohol_mod" = 1.5) // 150% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/alcohol_tolerance_basic +/datum/trait/neutral/alcohol_tolerance_basic name = "Liver of Iron" desc = "You can hold drinks much better than those lily-livered land-lubbers! Arr! Drinks are only three-quarters as strong." cost = 0 custom_only = FALSE var_changes = list("alcohol_mod" = 0.75) // 75% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/alcohol_tolerance_advanced +/datum/trait/neutral/alcohol_tolerance_advanced name = "Liver of Steel" desc = "Drinks tremble before your might! You can hold your alcohol twice as well as those blue-bellied barnacle boilers! Drinks are only half as strong." cost = 0 custom_only = FALSE var_changes = list("alcohol_mod" = 0.5) // 50% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/alcohol_immunity +/datum/trait/neutral/alcohol_immunity name = "Liver of Durasteel" desc = "You've drunk so much that most booze doesn't even faze you. It takes something like a Pan-Galactic or a pint of Deathbell for you to even get slightly buzzed." cost = 0 @@ -323,99 +323,126 @@ var_changes = list("alcohol_mod" = 0.25) // 25% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! // Alcohol Traits End Here. +/datum/trait/neutral/colorblind/mono + name = "Colorblindness (Monochromancy)" + desc = "You simply can't see colors at all, period. You are 100% colorblind." + cost = 0 + +/datum/trait/neutral/colorblind/mono/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + H.add_modifier(/datum/modifier/trait/colorblind_monochrome) + +/datum/trait/neutral/colorblind/para_vulp + name = "Colorblindness (Para Vulp)" + desc = "You have a severe issue with green colors and have difficulty recognizing them from red colors." + cost = 0 + +/datum/trait/neutral/colorblind/para_vulp/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + H.add_modifier(/datum/modifier/trait/colorblind_vulp) + +/datum/trait/neutral/colorblind/para_taj + name = "Colorblindness (Para Taj)" + desc = "You have a minor issue with blue colors and have difficulty recognizing them from red colors." + cost = 0 + +/datum/trait/neutral/colorblind/para_taj/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + H.add_modifier(/datum/modifier/trait/colorblind_taj) + // Body shape traits -/datum/trait/taller +/datum/trait/neutral/taller name = "Tall" desc = "Your body is taller than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_y" = 1.09) - excludes = list(/datum/trait/tall, /datum/trait/short, /datum/trait/shorter) + excludes = list(/datum/trait/neutral/tall, /datum/trait/neutral/short, /datum/trait/neutral/shorter) -/datum/trait/taller/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/taller/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() -/datum/trait/tall +/datum/trait/neutral/tall name = "Slightly Tall" desc = "Your body is a bit taller than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_y" = 1.05) - excludes = list(/datum/trait/taller, /datum/trait/short, /datum/trait/shorter) + excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/short, /datum/trait/neutral/shorter) -/datum/trait/tall/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/tall/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() -/datum/trait/short +/datum/trait/neutral/short name = "Slightly Short" desc = "Your body is a bit shorter than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_y" = 0.95) - excludes = list(/datum/trait/taller, /datum/trait/tall, /datum/trait/shorter) + excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/tall, /datum/trait/neutral/shorter) -/datum/trait/short/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/short/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() -/datum/trait/shorter +/datum/trait/neutral/shorter name = "Short" desc = "Your body is shorter than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_y" = 0.915) - excludes = list(/datum/trait/taller, /datum/trait/tall, /datum/trait/short) + excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/tall, /datum/trait/neutral/short) -/datum/trait/shorter/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/shorter/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() -/datum/trait/obese +/datum/trait/neutral/obese name = "Very Bulky" desc = "Your body is much wider than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_x" = 1.095) - excludes = list(/datum/trait/fat, /datum/trait/thin, /datum/trait/thinner) + excludes = list(/datum/trait/neutral/fat, /datum/trait/neutral/thin, /datum/trait/neutral/thinner) -/datum/trait/obese/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/obese/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() -/datum/trait/fat +/datum/trait/neutral/fat name = "Bulky" desc = "Your body is wider than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_x" = 1.054) - excludes = list(/datum/trait/obese, /datum/trait/thin, /datum/trait/thinner) + excludes = list(/datum/trait/neutral/obese, /datum/trait/neutral/thin, /datum/trait/neutral/thinner) -/datum/trait/fat/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/fat/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() -/datum/trait/thin +/datum/trait/neutral/thin name = "Thin" desc = "Your body is thinner than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_x" = 0.945) - excludes = list(/datum/trait/fat, /datum/trait/obese, /datum/trait/thinner) + excludes = list(/datum/trait/neutral/fat, /datum/trait/neutral/obese, /datum/trait/neutral/thinner) -/datum/trait/thin/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/thin/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() -/datum/trait/thinner +/datum/trait/neutral/thinner name = "Very Thin" desc = "Your body is much thinner than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_x" = 0.905) - excludes = list(/datum/trait/fat, /datum/trait/obese, /datum/trait/thin) + excludes = list(/datum/trait/neutral/fat, /datum/trait/neutral/obese, /datum/trait/neutral/thin) -/datum/trait/thinner/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/thinner/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index 4b86afc1416..8e97b78748d 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -1,25 +1,28 @@ #define ORGANICS 1 #define SYNTHETICS 2 -/datum/trait/speed_fast +/datum/trait/positive + category = 1 + +/datum/trait/positive/speed_fast name = "Haste" desc = "Allows you to move faster on average than baseline." cost = 4 var_changes = list("slowdown" = -0.5) -/datum/trait/hardy +/datum/trait/positive/hardy name = "Hardy" desc = "Allows you to carry heavy equipment with less slowdown." cost = 1 var_changes = list("item_slowdown_mod" = 0.5) -/datum/trait/hardy_plus +/datum/trait/positive/hardy_plus name = "Major Hardy" desc = "Allows you to carry heavy equipment with almost no slowdown." cost = 2 - var_changes = list("item_slowdown_mod" = 0.1) + var_changes = list("item_slowdown_mod" = 0.25) -/datum/trait/endurance_high +/datum/trait/positive/endurance_high name = "High Endurance" desc = "Increases your maximum total hitpoints to 125" cost = 4 @@ -29,127 +32,127 @@ ..(S,H) H.setMaxHealth(S.total_health) -/datum/trait/nonconductive +/datum/trait/positive/nonconductive name = "Non-Conductive" + desc = "Decreases your susceptibility to electric shocks by a 10% amount." + cost = 1 //This effects tasers! + var_changes = list("siemens_coefficient" = 0.9) + +/datum/trait/positive/nonconductive_plus + name = "Major Non-Conductive" desc = "Decreases your susceptibility to electric shocks by a 25% amount." - cost = 2 //This effects tasers! + cost = 2 //Let us not forget this effects tasers! var_changes = list("siemens_coefficient" = 0.75) -/datum/trait/nonconductive_plus - name = "Major Non-Conductive" - desc = "Decreases your susceptibility to electric shocks by a 50% amount." - cost = 3 //Let us not forget this effects tasers! - var_changes = list("siemens_coefficient" = 0.5) - -/datum/trait/darksight +/datum/trait/positive/darksight name = "Darksight" desc = "Allows you to see a short distance in the dark." cost = 1 - var_changes = list("darksight" = 5, "flash_mod" = 2.0) + var_changes = list("darksight" = 5, "flash_mod" = 1.1) -/datum/trait/darksight_plus +/datum/trait/positive/darksight_plus name = "Darksight (Major)" desc = "Allows you to see in the dark for the whole screen." cost = 2 - var_changes = list("darksight" = 8, "flash_mod" = 3.0) + var_changes = list("darksight" = 8, "flash_mod" = 1.2) -/datum/trait/melee_attack +/datum/trait/positive/melee_attack name = "Sharp Melee" desc = "Provides sharp melee attacks that do slightly more damage." cost = 1 var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)) -/datum/trait/melee_attack_fangs +/datum/trait/positive/melee_attack_fangs name = "Sharp Melee & Numbing Fangs" desc = "Provides sharp melee attacks that do slightly more damage, along with fangs that makes the person bit unable to feel their body or pain." cost = 2 var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp, /datum/unarmed_attack/bite/sharp/numbing)) -/datum/trait/fangs +/datum/trait/positive/fangs name = "Numbing Fangs" desc = "Provides fangs that makes the person bit unable to feel their body or pain." cost = 1 var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite/sharp/numbing)) -/datum/trait/minor_brute_resist +/datum/trait/positive/minor_brute_resist name = "Minor Brute Resist" desc = "Adds 15% resistance to brute damage sources." cost = 2 var_changes = list("brute_mod" = 0.85) -/datum/trait/brute_resist +/datum/trait/positive/brute_resist name = "Brute Resist" desc = "Adds 25% resistance to brute damage sources." cost = 3 var_changes = list("brute_mod" = 0.75) - excludes = list(/datum/trait/minor_burn_resist,/datum/trait/burn_resist) + excludes = list(/datum/trait/positive/minor_burn_resist,/datum/trait/positive/burn_resist) -/datum/trait/minor_burn_resist +/datum/trait/positive/minor_burn_resist name = "Minor Burn Resist" desc = "Adds 15% resistance to burn damage sources." cost = 2 var_changes = list("burn_mod" = 0.85) -/datum/trait/burn_resist +/datum/trait/positive/burn_resist name = "Burn Resist" desc = "Adds 25% resistance to burn damage sources." cost = 3 var_changes = list("burn_mod" = 0.75) - excludes = list(/datum/trait/minor_brute_resist,/datum/trait/brute_resist) + excludes = list(/datum/trait/positive/minor_brute_resist,/datum/trait/positive/brute_resist) -/datum/trait/photoresistant +/datum/trait/positive/photoresistant name = "Photoresistant" - desc = "Decreases stun duration from flashes and other light-based stuns and disabilities by 50%" + desc = "Decreases stun duration from flashes and other light-based stuns and disabilities by 20%" cost = 1 - var_changes = list("flash_mod" = 0.5) + var_changes = list("flash_mod" = 0.8) -/datum/trait/winged_flight +/datum/trait/positive/winged_flight name = "Winged Flight" desc = "Allows you to fly by using your wings. Don't forget to bring them!" - cost = 1 + cost = 0 -/datum/trait/winged_flight/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/positive/winged_flight/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/proc/flying_toggle H.verbs |= /mob/living/proc/start_wings_hovering -/datum/trait/hardfeet +/datum/trait/positive/hardfeet name = "Hard Feet" desc = "Makes your nice clawed, scaled, hooved, armored, or otherwise just awfully calloused feet immune to glass shards." - cost = 1 + cost = 0 var_changes = list("flags" = NO_MINOR_CUT) //Checked the flag is only used by shard stepping. -/datum/trait/antiseptic_saliva +/datum/trait/positive/antiseptic_saliva name = "Antiseptic Saliva" desc = "Your saliva has especially strong antiseptic properties that can be used to heal small wounds." cost = 1 -/datum/trait/antiseptic_saliva/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/positive/antiseptic_saliva/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..() H.verbs |= /mob/living/carbon/human/proc/lick_wounds -/datum/trait/traceur +/datum/trait/positive/traceur name = "Traceur" desc = "You're capable of parkour and can *flip over low objects (most of the time)." cost = 2 var_changes = list("agility" = 90) -/datum/trait/snowwalker +/datum/trait/positive/snowwalker name = "Snow Walker" desc = "You are able to move unhindered on snow." cost = 1 var_changes = list("snow_movement" = -2) -/datum/trait/weaver +/datum/trait/positive/weaver name = "Weaver" desc = "You can produce silk and create various articles of clothing and objects." cost = 2 var_changes = list("is_weaver" = 1) -/datum/trait/weaver/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/positive/weaver/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..() H.verbs |= /mob/living/carbon/human/proc/check_silk_amount H.verbs |= /mob/living/carbon/human/proc/toggle_silk_production H.verbs |= /mob/living/carbon/human/proc/weave_structure H.verbs |= /mob/living/carbon/human/proc/weave_item - H.verbs |= /mob/living/carbon/human/proc/set_silk_color \ No newline at end of file + H.verbs |= /mob/living/carbon/human/proc/set_silk_color diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm index 52b2e3b9f52..9c841429d03 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm @@ -5,7 +5,8 @@ var/name var/desc = "Contact a developer if you see this trait." - var/cost = 0 // 0 is neutral, negative cost means negative, positive cost means positive. + var/cost = 0 + var/category = 0 // What category this trait is. -1 is Negative, 0 is Neutral, 1 is Positive var/list/var_changes // A list to apply to the custom species vars. var/list/excludes // Store a list of paths of traits to exclude, but done automatically if they change the same vars. var/can_take = ORGANICS|SYNTHETICS // Can freaking synths use those. diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index fc9ee91e9f7..bfb4856017b 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1120,13 +1120,13 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() return //If you are FBP with wing style and didn't set a custom one - if(synthetic && synthetic.includes_wing && !wing_style) + if(synthetic && synthetic.includes_wing && !wing_style && !wings_hidden) //VOREStation Edit var/icon/wing_s = new/icon("icon" = synthetic.icon, "icon_state" = "wing") //I dunno. If synths have some custom wing? wing_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) return image(wing_s) //If you have custom wings selected - if(wing_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL)) + if(wing_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL) && !wings_hidden) //VOREStation Edit var/icon/wing_s = new/icon("icon" = wing_style.icon, "icon_state" = flapping && wing_style.ani_state ? wing_style.ani_state : wing_style.icon_state) if(wing_style.do_colouration) wing_s.Blend(rgb(src.r_wing, src.g_wing, src.b_wing), wing_style.color_blend_mode) diff --git a/code/modules/mob/living/living_defines_vr.dm b/code/modules/mob/living/living_defines_vr.dm index f06406bc868..5a50c6fda59 100644 --- a/code/modules/mob/living/living_defines_vr.dm +++ b/code/modules/mob/living/living_defines_vr.dm @@ -5,8 +5,6 @@ var/ooc_notes = null appearance_flags = TILE_BOUND|PIXEL_SCALE|KEEP_TOGETHER var/hunger_rate = DEFAULT_HUNGER_FACTOR - var/resizable = TRUE - //custom say verbs var/custom_say = null var/custom_ask = null diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 64495ca48c4..877e8542767 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -8,7 +8,7 @@ var/list/department_radio_keys = list( ":n" = "Science", ".n" = "Science", ":m" = "Medical", ".m" = "Medical", ":e" = "Engineering", ".e" = "Engineering", - ":k" = "Response Team", ".k" = "Response Team", //TFF 11/3/20 - Add Response Team to channels usable rather than resorting to :H or such., + ":k" = "Response Team", ".k" = "Response Team", ":s" = "Security", ".s" = "Security", ":w" = "whisper", ".w" = "whisper", ":t" = "Mercenary", ".t" = "Mercenary", @@ -27,7 +27,7 @@ var/list/department_radio_keys = list( ":N" = "Science", ".N" = "Science", ":M" = "Medical", ".M" = "Medical", ":E" = "Engineering", ".E" = "Engineering", - ":k" = "Response Team", ".k" = "Response Team", //TFF 11/3/20 - Add Response Team to channels usable rather than resorting to :H or such., + ":k" = "Response Team", ".k" = "Response Team", ":S" = "Security", ".S" = "Security", ":W" = "whisper", ".W" = "whisper", ":T" = "Mercenary", ".T" = "Mercenary", diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index cf135f9d559..6ade1a65216 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -53,7 +53,7 @@ "Chirp" = list("chirps","chirrups","cheeps"), "Feline" = list("purrs","yowls","meows"), "Canine" = list("yaps","barks","woofs"), - "Rodent" = list("squeaks", "SQUEAKS", "sqiks") //VOREStation Edit - TFF 22/11/19 - CHOMPStation port of pAI additions, + "Rodent" = list("squeaks", "SQUEAKS", "sqiks") //VOREStation Edit ) var/obj/item/weapon/pai_cable/cable // The cable we produce and use when door or camera jacking @@ -330,8 +330,7 @@ close_up() -//VOREStation Removal Start - TFF 22/11/19 - Refactored in pai_vr.dm -/* +/* //VOREStation Removal Start /mob/living/silicon/pai/proc/choose_chassis() set category = "pAI Commands" set name = "Choose Chassis" diff --git a/code/modules/mob/living/silicon/pai/pai_vr.dm b/code/modules/mob/living/silicon/pai/pai_vr.dm index f44d39f460c..b8eb2283265 100644 --- a/code/modules/mob/living/silicon/pai/pai_vr.dm +++ b/code/modules/mob/living/silicon/pai/pai_vr.dm @@ -1,7 +1,6 @@ /mob/living/silicon/pai var/people_eaten = 0 icon = 'icons/mob/pai_vr.dmi' - //TFF 22/11/19 - CHOMPStation port of pAI additions. var/global/list/wide_chassis = list( "rat", "panther" @@ -36,7 +35,6 @@ else if(people_eaten && resting) icon_state = "[chassis]_rest_full" - //TFF 22/11/19 - CHOMPStation port of pAI additions. if(chassis in wide_chassis) icon = 'icons/mob/pai_vr64x64.dmi' pixel_x = -16 @@ -58,7 +56,6 @@ else if(people_eaten && resting) icon_state = "[chassis]_rest_full" - //TFF 22/11/19 - CHOMPStation port of pAI additions. if(chassis in wide_chassis) icon = 'icons/mob/pai_vr64x64.dmi' pixel_x = -16 diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm index a846b560d6f..09bf26f05da 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm @@ -89,7 +89,7 @@ // Close to mid-ranged shooter that arcs over other things, ideal if allies are in front of it. -// Difference from siege hivebots is that siege hivebots have limited charges for their attacks, are very long range, and \ +// Difference from siege hivebots is that siege hivebots have limited charges for their attacks, are very long range, and // the projectiles have an AoE component, where as backline hivebots do not. /mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline name = "backline hivebot" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm index 7b2da460081..4a843eed80e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm @@ -121,7 +121,7 @@ else if(ismob(target)) var/mob/living/M = target - resize(M.size_multiplier) + resize(M.size_multiplier, ignore_prefs = TRUE) //Morphed is weaker melee_damage_lower = melee_damage_disguised @@ -165,7 +165,7 @@ maptext = null size_multiplier = our_size_multiplier - resize(size_multiplier) + resize(size_multiplier, ignore_prefs = TRUE) //Baseline stats melee_damage_lower = initial(melee_damage_lower) @@ -183,7 +183,7 @@ /mob/living/simple_mob/vore/hostile/morph/will_show_tooltip() return (!morphed) -/mob/living/simple_mob/vore/hostile/morph/resize(var/new_size, var/animate = TRUE) +/mob/living/simple_mob/vore/hostile/morph/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE) if(morphed && !ismob(form)) return return ..() diff --git a/code/modules/mob/new_player/preferences_setup_vr.dm b/code/modules/mob/new_player/preferences_setup_vr.dm index dca0ff56ecf..d15ec88af50 100644 --- a/code/modules/mob/new_player/preferences_setup_vr.dm +++ b/code/modules/mob/new_player/preferences_setup_vr.dm @@ -1,3 +1,2 @@ -//TFF 5/8/19 - add randomised sensor setting for random button clicking /datum/preferences/randomize_appearance_and_body_for(var/mob/living/carbon/human/H) sensorpref = rand(1,5) \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm index f69ec4a5748..52d1d1923b6 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm @@ -728,3 +728,9 @@ icon_state = "unathilongfrills" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/thunderthighs + name = "Boosted Thighs" + icon_state = "thunderthighs" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_L_LEG,BP_R_LEG) \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index 748a6904b46..db2394f84af 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -146,7 +146,6 @@ suit_sprites = 'icons/mob/taursuits_wolf.dmi' icon_sprite_tag = "wolf" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatwolf name = "Fat Wolf (Taur)" icon_state = "fatwolf_s" @@ -158,7 +157,6 @@ extra_overlay = "wolf_markings" //icon_sprite_tag = "wolf2c" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c name = "Fat Wolf dual-color (Taur)" icon_state = "fatwolf_s" @@ -245,7 +243,6 @@ suit_sprites = 'icons/mob/taursuits_feline.dmi' icon_sprite_tag = "feline" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatfeline name = "Fat Feline (Taur)" icon_state = "fatfeline_s" @@ -262,7 +259,6 @@ extra_overlay = "feline_markings" //icon_sprite_tag = "feline2c" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/feline/fatfeline_2c name = "Fat Feline dual-color (Taur)" icon_state = "fatfeline_s" diff --git a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm index 04642145186..4bc79e1629b 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm @@ -57,7 +57,6 @@ suit_sprites = 'icons/mob/taursuits_wolf_vr.dmi' icon_sprite_tag = "wolf" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatwolf name = "Fat Wolf (Taur)" icon_state = "fatwolf_s" @@ -70,7 +69,6 @@ extra_overlay2 = "wolf_markings_2" //icon_sprite_tag = "wolf2c" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c name = "Fat Wolf 3-color (Taur)" icon_state = "fatwolf_s" @@ -276,7 +274,6 @@ suit_sprites = 'icons/mob/taursuits_feline_vr.dmi' icon_sprite_tag = "feline" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatfeline name = "Fat Feline (Taur)" icon_state = "fatfeline_s" @@ -294,7 +291,6 @@ extra_overlay2 = "feline_markings_2" //icon_sprite_tag = "feline2c" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/feline/fatfeline_2c name = "Fat Feline 3-color (Taur)" icon_state = "fatfeline_s" diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index bd7c1d0d499..fc0c3bebdd2 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -192,7 +192,7 @@ var/datum/preferences/B = O.client.prefs for(var/language in B.alternate_languages) O.add_language(language) - O.resize(B.size_multiplier, animate = TRUE) //VOREStation Addition: add size prefs to borgs + O.resize(B.size_multiplier, animate = TRUE, ignore_prefs = TRUE) //VOREStation Addition: add size prefs to borgs O.fuzzy = B.fuzzy //VOREStation Addition: add size prefs to borgs callHook("borgify", list(O)) diff --git a/code/modules/nifsoft/software/10_combat.dm b/code/modules/nifsoft/software/10_combat.dm index a63e323792d..d44b4bc3b2c 100644 --- a/code/modules/nifsoft/software/10_combat.dm +++ b/code/modules/nifsoft/software/10_combat.dm @@ -7,7 +7,6 @@ illegal = TRUE wear = 3 access = 999 //Prevents anyone from buying it without an emag. - activates = FALSE //It's armor. combat_flags = (NIF_C_BRUTEARMOR) // Default on when installed, clear when uninstalled /datum/nifsoft/burn_armor @@ -19,7 +18,6 @@ illegal = TRUE wear = 3 access = 999 //Prevents anyone from buying it without an emag. - activates = FALSE //It's armor. combat_flags = (NIF_C_BURNARMOR) // Default on when installed, clear when uninstalled /datum/nifsoft/painkillers diff --git a/code/modules/nifsoft/software/15_misc.dm b/code/modules/nifsoft/software/15_misc.dm index 2b173346ce0..79592fa030a 100644 --- a/code/modules/nifsoft/software/15_misc.dm +++ b/code/modules/nifsoft/software/15_misc.dm @@ -134,7 +134,7 @@ to_chat(nif.human,"The safety features of the NIF Program prevent you from choosing this size.") return else - if(nif.human.resize(new_size/100)) + if(nif.human.resize(new_size/100, uncapped=nif.human.has_large_resize_bounds(), ignore_prefs = TRUE)) to_chat(nif.human,"You set the size to [new_size]%") nif.human.visible_message("Swirling grey mist envelops [nif.human] as they change size!","Swirling streams of nanites wrap around you as you change size!") spawn(0) diff --git a/code/modules/planet/sif.dm b/code/modules/planet/sif.dm index 921142812d3..798cebcaac2 100644 --- a/code/modules/planet/sif.dm +++ b/code/modules/planet/sif.dm @@ -216,15 +216,17 @@ var/datum/planet/sif/planet_sif = null outdoor_sounds_type = /datum/looping_sound/weather/outside_snow indoor_sounds_type = /datum/looping_sound/weather/inside_snow +/* /datum/weather/sif/snow/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(33)) T.chill() +*/ /datum/weather/sif/blizzard name = "blizzard" @@ -249,15 +251,17 @@ var/datum/planet/sif/planet_sif = null outdoor_sounds_type = /datum/looping_sound/weather/outside_blizzard indoor_sounds_type = /datum/looping_sound/weather/inside_blizzard +/* /datum/weather/sif/blizzard/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(50)) T.chill() +*/ /datum/weather/sif/rain name = "rain" @@ -283,25 +287,21 @@ var/datum/planet/sif/planet_sif = null /datum/weather/sif/rain/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain patters softly onto your umbrella.") + continue L.water_act(1) if(show_message) @@ -340,24 +340,21 @@ var/datum/planet/sif/planet_sif = null /datum/weather/sif/storm/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. + // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain showers loudly onto your umbrella!") + continue L.water_act(2) @@ -401,20 +398,18 @@ var/datum/planet/sif/planet_sif = null /datum/weather/sif/hail/process_effects() ..() - for(var/humie in human_mob_list) - var/mob/living/carbon/human/H = humie + for(var/mob/living/carbon/H as anything in human_mob_list) if(H.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(H) if(!T.outdoors) continue // They're indoors, so no need to pelt them with ice. // If they have an open umbrella, it'll guard from hail - var/obj/item/weapon/melee/umbrella/U - if(istype(H.get_active_hand(), /obj/item/weapon/melee/umbrella)) - U = H.get_active_hand() - else if(istype(H.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) + var/obj/item/weapon/melee/umbrella/U = H.get_active_hand() + if(!istype(U) || !U.open) U = H.get_inactive_hand() - if(U && U.open) + + if(istype(U) && U.open) if(show_message) to_chat(H, "Hail patters onto your umbrella.") continue diff --git a/code/modules/planet/virgo3b_better_vr.dm b/code/modules/planet/virgo3b_better_vr.dm index 80fbdc2a894..219788e3dec 100644 --- a/code/modules/planet/virgo3b_better_vr.dm +++ b/code/modules/planet/virgo3b_better_vr.dm @@ -156,15 +156,17 @@ var/datum/planet/virgo3b_better/planet_virgo3b_better = null outdoor_sounds_type = /datum/looping_sound/weather/outside_snow indoor_sounds_type = /datum/looping_sound/weather/inside_snow +/* /datum/weather/virgo3b_better/snow/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(33)) T.chill() +*/ /datum/weather/virgo3b_better/blizzard name = "blizzard" @@ -189,15 +191,17 @@ var/datum/planet/virgo3b_better/planet_virgo3b_better = null outdoor_sounds_type = /datum/looping_sound/weather/outside_blizzard indoor_sounds_type = /datum/looping_sound/weather/inside_blizzard +/* /datum/weather/virgo3b_better/blizzard/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(50)) T.chill() +*/ /datum/weather/virgo3b_better/rain name = "rain" @@ -220,25 +224,21 @@ var/datum/planet/virgo3b_better/planet_virgo3b_better = null /datum/weather/virgo3b_better/rain/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain patters softly onto your umbrella.") + continue L.water_act(1) if(show_message) @@ -275,25 +275,21 @@ var/datum/planet/virgo3b_better/planet_virgo3b_better = null /datum/weather/virgo3b_better/storm/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain showers loudly onto your umbrella!") + continue L.water_act(2) @@ -335,20 +331,18 @@ var/datum/planet/virgo3b_better/planet_virgo3b_better = null /datum/weather/virgo3b_better/hail/process_effects() ..() - for(var/humie in human_mob_list) - var/mob/living/carbon/human/H = humie + for(var/mob/living/carbon/H as anything in human_mob_list) if(H.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(H) if(!T.outdoors) continue // They're indoors, so no need to pelt them with ice. // If they have an open umbrella, it'll guard from hail - var/obj/item/weapon/melee/umbrella/U - if(istype(H.get_active_hand(), /obj/item/weapon/melee/umbrella)) - U = H.get_active_hand() - else if(istype(H.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) + var/obj/item/weapon/melee/umbrella/U = H.get_active_hand() + if(!istype(U) || !U.open) U = H.get_inactive_hand() - if(U && U.open) + + if(istype(U) && U.open) if(show_message) to_chat(H, "Hail patters onto your umbrella.") continue diff --git a/code/modules/planet/virgo3b_vr.dm b/code/modules/planet/virgo3b_vr.dm index 710f2698c0b..f9cc58ca0ce 100644 --- a/code/modules/planet/virgo3b_vr.dm +++ b/code/modules/planet/virgo3b_vr.dm @@ -203,15 +203,17 @@ var/datum/planet/virgo3b/planet_virgo3b = null outdoor_sounds_type = /datum/looping_sound/weather/outside_snow indoor_sounds_type = /datum/looping_sound/weather/inside_snow +/* /datum/weather/virgo3b/snow/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(33)) T.chill() +*/ /datum/weather/virgo3b/blizzard name = "blizzard" @@ -236,15 +238,17 @@ var/datum/planet/virgo3b/planet_virgo3b = null outdoor_sounds_type = /datum/looping_sound/weather/outside_blizzard indoor_sounds_type = /datum/looping_sound/weather/inside_blizzard +/* /datum/weather/virgo3b/blizzard/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(50)) T.chill() +*/ /datum/weather/virgo3b/rain name = "rain" @@ -270,25 +274,21 @@ var/datum/planet/virgo3b/planet_virgo3b = null /datum/weather/virgo3b/rain/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain patters softly onto your umbrella.") + continue L.water_act(1) if(show_message) @@ -325,25 +325,21 @@ var/datum/planet/virgo3b/planet_virgo3b = null /datum/weather/virgo3b/storm/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain patters softly onto your umbrella.") + continue L.water_act(2) @@ -385,20 +381,18 @@ var/datum/planet/virgo3b/planet_virgo3b = null /datum/weather/virgo3b/hail/process_effects() ..() - for(var/humie in human_mob_list) - var/mob/living/carbon/human/H = humie + for(var/mob/living/carbon/H as anything in human_mob_list) if(H.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(H) if(!T.outdoors) continue // They're indoors, so no need to pelt them with ice. // If they have an open umbrella, it'll guard from hail - var/obj/item/weapon/melee/umbrella/U - if(istype(H.get_active_hand(), /obj/item/weapon/melee/umbrella)) - U = H.get_active_hand() - else if(istype(H.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) + var/obj/item/weapon/melee/umbrella/U = H.get_active_hand() + if(!istype(U) || !U.open) U = H.get_inactive_hand() - if(U && U.open) + + if(istype(U) && U.open) if(show_message) to_chat(H, "Hail patters onto your umbrella.") continue diff --git a/code/modules/planet/virgo4_vr.dm b/code/modules/planet/virgo4_vr.dm index 50c0b8426ee..3909b9e6cd7 100644 --- a/code/modules/planet/virgo4_vr.dm +++ b/code/modules/planet/virgo4_vr.dm @@ -32,35 +32,35 @@ var/datum/planet/virgo4/planet_virgo4 = null var/min = 0 switch(sun_position) - if(0 to 0.30) // Night - low_brightness = 0.1 + if(0 to 0.20) // Night + low_brightness = 0.3 low_color = "#000066" - high_brightness = 0.2 + high_brightness = 0.5 high_color = "#66004D" min = 0 - if(0.30 to 0.40) // Twilight - low_brightness = 0.4 + if(0.20 to 0.30) // Twilight + low_brightness = 0.5 low_color = "#66004D" - high_brightness = 0.6 + high_brightness = 0.9 high_color = "#CC3300" min = 0.40 - if(0.40 to 0.50) // Sunrise/set - low_brightness = 0.7 + if(0.30 to 0.40) // Sunrise/set + low_brightness = 0.9 low_color = "#CC3300" - high_brightness = 0.9 + high_brightness = 3.0 high_color = "#FF9933" min = 0.50 - if(0.50 to 1.00) // Noon - low_brightness = 1 + if(0.40 to 1.00) // Noon + low_brightness = 3.0 low_color = "#DDDDDD" - high_brightness = 2 + high_brightness = 10.0 high_color = "#FFFFFF" min = 0.70 @@ -187,15 +187,17 @@ var/datum/planet/virgo4/planet_virgo4 = null outdoor_sounds_type = /datum/looping_sound/weather/outside_snow indoor_sounds_type = /datum/looping_sound/weather/inside_snow +/* /datum/weather/virgo4/snow/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(33)) T.chill() +*/ /datum/weather/virgo4/blizzard name = "blizzard" @@ -217,15 +219,17 @@ var/datum/planet/virgo4/planet_virgo4 = null outdoor_sounds_type = /datum/looping_sound/weather/outside_blizzard indoor_sounds_type = /datum/looping_sound/weather/inside_blizzard +/* /datum/weather/virgo4/blizzard/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(50)) T.chill() +*/ /datum/weather/virgo4/rain name = "rain" @@ -248,25 +252,21 @@ var/datum/planet/virgo4/planet_virgo4 = null /datum/weather/virgo4/rain/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain patters softly onto your umbrella.") + continue L.water_act(1) if(show_message) @@ -298,25 +298,21 @@ var/datum/planet/virgo4/planet_virgo4 = null /datum/weather/virgo4/storm/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain showers loudly onto your umbrella!") + continue L.water_act(2) @@ -355,20 +351,18 @@ var/datum/planet/virgo4/planet_virgo4 = null /datum/weather/virgo4/hail/process_effects() ..() - for(var/humie in human_mob_list) - var/mob/living/carbon/human/H = humie + for(var/mob/living/carbon/H as anything in human_mob_list) if(H.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(H) if(!T.outdoors) continue // They're indoors, so no need to pelt them with ice. // If they have an open umbrella, it'll guard from hail - var/obj/item/weapon/melee/umbrella/U - if(istype(H.get_active_hand(), /obj/item/weapon/melee/umbrella)) - U = H.get_active_hand() - else if(istype(H.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) + var/obj/item/weapon/melee/umbrella/U = H.get_active_hand() + if(!istype(U) || !U.open) U = H.get_inactive_hand() - if(U && U.open) + + if(istype(U) && U.open) if(show_message) to_chat(H, "Hail patters onto your umbrella.") continue diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 28835d7fddc..2657b34a0a3 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -95,7 +95,6 @@ playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5) tesla_zap(src, 10, power/(coeff/2)) -//TFF 3/6/19 - Port Cit RP fix for infinite frames /obj/machinery/power/grounding_rod name = "grounding rod" desc = "Keep an area from being fried from Edison's Bane." diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 1612e1cab37..12f2cf09e60 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -279,3 +279,22 @@ /obj/item/projectile/beam/shock/weak damage = 5 agony = 10 + + +// +// Projectile Beam Definitions +// + +/obj/item/projectile/beam/pointdefense + name = "point defense salvo" + icon_state = "laser" + damage = 15 + damage_type = ELECTROCUTE //You should be safe inside a voidsuit + sharp = FALSE //"Wide" spectrum beam + light_color = COLOR_GOLD + + excavation_amount = 200 // Good at shooting rocks + + muzzle_type = /obj/effect/projectile/muzzle/pointdefense + tracer_type = /obj/effect/projectile/tracer/pointdefense + impact_type = /obj/effect/projectile/impact/pointdefense diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index a3a1af83fed..a921f410640 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1700,7 +1700,7 @@ glass_name = "Rewriter" glass_desc = "The secret of the sanctuary of the Libarian..." - allergen_type = FRUIT|COFFEE //Made with space mountain wind (Fruit) + allergen_type = FRUIT|COFFEE //Made with space mountain wind (Fruit) /datum/reagent/drink/rewriter/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -2720,7 +2720,7 @@ glass_name = "Banana Honk" glass_desc = "A drink from Banana Heaven." - allergen_type = FRUIT|DAIRY //Made from banana juice(fruit) and cream(dairy) + allergen_type = FRUIT|DAIRY //Made from banana juice(fruit) and cream(dairy) /datum/reagent/ethanol/barefoot name = "Barefoot" @@ -4156,3 +4156,28 @@ reagent_state = LIQUID nutriment_factor = 40 //very filling color = "#d169b2" + +//ADDITIONS BELOW THIS LINE MADE ON 04/03/2021 + +/datum/reagent/drink/soda/kompot + name = "Kompot" + id = "kompot" + description = "A traditional Eastern European beverage once used to preserve fruit in the 1980s" + taste_description = "refreshuingly sweet and fruity" + color = "#ed9415" // rgb: 237, 148, 21 + adj_drowsy = -1 + adj_temp = -6 + glass_name = "kompot" + glass_desc = "A glass of refreshing kompot." + glass_special = list(DRINK_FIZZ) + +/datum/reagent/ethanol/kvass + name = "Kvass" + id = "kvass" + description = "A traditional fermented Slavic and Baltic beverage commonly made from rye bread." + taste_description = "a warm summer day at babushka's cabin" + color = "#b78315" // rgb: 183, 131, 21 + strength = 95 //It's just soda to Russians + nutriment_factor = 2 + glass_name = "kvass" + glass_desc = "A hearty glass of Slavic brew." diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index ea23d01a0a6..98b8f9c841a 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1450,7 +1450,7 @@ /datum/reagent/qerr_quem name = "Qerr-quem" - id = "querr_quem" + id = "qerr_quem" description = "A potent stimulant and anti-anxiety medication, made for the Qerr-Katish." taste_description = "mint" reagent_state = LIQUID diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm index 3cf6276998e..20af3a57e3f 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm @@ -13,8 +13,7 @@ mrate_static = TRUE /datum/reagent/macrocillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(M.size_range_check(M.size_multiplier)) - M.resize(M.size_multiplier+0.01)//Incrrease 1% per tick. + M.resize(M.size_multiplier+0.01, uncapped = M.has_large_resize_bounds()) //Incrrease 1% per tick. return /datum/reagent/microcillin @@ -27,8 +26,7 @@ mrate_static = TRUE /datum/reagent/microcillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(M.size_range_check(M.size_multiplier)) - M.resize(M.size_multiplier-0.01) //Decrease 1% per tick. + M.resize(M.size_multiplier-0.01, uncapped = M.has_large_resize_bounds()) //Decrease 1% per tick. return diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index fe0a4c1381e..1098c5e713d 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -6,7 +6,6 @@ item_state = "cleaner" center_of_mass = list("x" = 16,"y" = 10) flags = OPENCONTAINER|NOBLUDGEON - //TFF 24/12/19 - Let people print more spray bottles if needed. matter = list("glass" = 300, DEFAULT_WALL_MATERIAL = 300) slot_flags = SLOT_BELT throwforce = 3 diff --git a/code/modules/research/designs/circuits/circuits.dm b/code/modules/research/designs/circuits/circuits.dm index 017a3010af2..f2cdb7d3898 100644 --- a/code/modules/research/designs/circuits/circuits.dm +++ b/code/modules/research/designs/circuits/circuits.dm @@ -662,6 +662,19 @@ CIRCUITS BELOW build_path = /obj/item/weapon/circuitboard/microwave/advanced sort_string = "HACAA" +/datum/design/circuit/pointdefense + name = "point defense battery" + id = "pointdefense" + req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 3, TECH_COMBAT = 4) + build_path = /obj/item/weapon/circuitboard/pointdefense + sort_string = "OAABA" + +/datum/design/circuit/pointdefense_control + name = "point defense control" + id = "pointdefense_control" + req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_COMBAT = 2) + build_path = /obj/item/weapon/circuitboard/pointdefense_control + sort_string = "OAABB" /datum/design/circuit/shield_generator name = "shield generator" diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index a6a9a87386f..06dd35434c8 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -466,20 +466,3 @@ user.visible_message("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!", \ "Your hand slips, damaging [target]'s [affected.name] with \the [tool]!") affected.createwound(BRUISE, 20) - -////////////////////////////////////////////////////////////////// -// HEART SURGERY // -////////////////////////////////////////////////////////////////// -// To be finished after some tests. -// /datum/surgery_step/ribcage/heart/cut -// allowed_tools = list( -// /obj/item/weapon/surgical/scalpel = 100, \ -// /obj/item/weapon/material/knife = 75, \ -// /obj/item/weapon/material/shard = 50, \ -// ) - -// min_duration = 30 -// max_duration = 40 - -// /datum/surgery_step/ribcage/heart/cut/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) -// return ..() && target.op_stage.ribcage == 2 \ No newline at end of file diff --git a/code/modules/turbolift/turbolift_console_vr.dm b/code/modules/turbolift/turbolift_console_vr.dm index a02730c08d9..d2444186930 100644 --- a/code/modules/turbolift/turbolift_console_vr.dm +++ b/code/modules/turbolift/turbolift_console_vr.dm @@ -1,5 +1,3 @@ -// TFF 6/10/20 - Just a little thing to prevent the button - // and console from being destroyed by explosions. /obj/structure/lift/button/ex_act() return diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index 1de6b05e369..46949c188ad 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -23,7 +23,7 @@ var/car_limit = 0 //how many cars an engine can pull before performance degrades. This should be 0 to prevent trailers from unhitching. active_engines = 1 - var/obj/item/weapon/key/key //TFF 19/1/20 - Bugfix for key being prevented from getting used again + var/obj/item/weapon/key/key var/key_type = /obj/item/weapon/key/security var/siren = 0 //This is for eventually getting the siren sprite to work. @@ -62,7 +62,7 @@ /obj/vehicle/train/security/engine/New() ..() cell = new /obj/item/weapon/cell/high(src) - key = new key_type(src) //TFF 19/1/20 - Bugfix for key being prevented from getting used again + key = new key_type(src) var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs overlays += I turn_off() //so engine verbs are correctly set @@ -91,7 +91,7 @@ ..() /obj/vehicle/train/security/engine/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, key_type)) //TFF 19/1/20 - Bugfix for key being prevented from getting used again + if(istype(W, key_type)) if(!key) user.drop_item() W.forceMove(src) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index f9f485219db..a0bdeaca351 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -3,7 +3,8 @@ var/digestable = TRUE // Can the mob be digested inside a belly? var/devourable = TRUE // Can the mob be devoured at all? var/feeding = TRUE // Can the mob be vorishly force fed or fed to others? - var/absorbable = TRUE // Are you allowed to absorb this person? TFF addition 14/12/19 + var/absorbable = TRUE // Are you allowed to absorb this person? + var/resizable = TRUE // Can other people resize you? (Usually ignored for self-resizes) var/digest_leave_remains = FALSE // Will this mob leave bones/skull/etc after the melty demise? var/allowmobvore = TRUE // Will simplemobs attempt to eat the mob? var/showvoreprefs = TRUE // Determines if the mechanical vore preferences button will be displayed on the mob or not. @@ -225,7 +226,8 @@ P.digestable = src.digestable P.devourable = src.devourable P.feeding = src.feeding - P.absorbable = src.absorbable //TFF 14/12/19 - choose whether allowing absorbing + P.absorbable = src.absorbable + P.resizable = src.resizable P.digest_leave_remains = src.digest_leave_remains P.allowmobvore = src.allowmobvore P.vore_taste = src.vore_taste @@ -259,7 +261,8 @@ digestable = P.digestable devourable = P.devourable feeding = P.feeding - absorbable = P.absorbable //TFF 14/12/19 - choose whether allowing absorbing + absorbable = P.absorbable + resizable = P.resizable digest_leave_remains = P.digest_leave_remains allowmobvore = P.allowmobvore vore_taste = P.vore_taste @@ -683,7 +686,6 @@ to_chat(src, "You can taste the flavor of garbage and leftovers. Delicious?") else to_chat(src, "You can taste the flavor of gluttonous waste of food.") - //TFF 10/7/19 - Add custom flavour for collars for trash can trait. else if (istype(I,/obj/item/clothing/accessory/collar)) visible_message("[src] demonstrates their voracious capabilities by swallowing [I] whole!") to_chat(src, "You can taste the submissiveness in the wearer of [I]!") diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index 2985b7c489f..82df33ccf2a 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -45,19 +45,22 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE //Actual preferences var/digestable = TRUE var/devourable = TRUE + var/absorbable = TRUE var/feeding = TRUE - var/absorbable = TRUE //TFF 14/12/19 - choose whether allowing absorbing + var/can_be_drop_prey = FALSE + var/can_be_drop_pred = FALSE var/digest_leave_remains = FALSE var/allowmobvore = TRUE + var/permit_healbelly = TRUE + + var/resizable = TRUE + var/show_vore_fx = TRUE + var/step_mechanics_pref = FALSE + var/pickup_pref = TRUE + var/list/belly_prefs = list() var/vore_taste = "nothing in particular" var/vore_smell = "nothing in particular" - var/permit_healbelly = TRUE - var/show_vore_fx = TRUE - var/can_be_drop_prey = FALSE - var/can_be_drop_pred = FALSE - var/step_mechanics_pref = FALSE - var/pickup_pref = TRUE //Mechanically required var/path @@ -122,8 +125,9 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE digestable = json_from_file["digestable"] devourable = json_from_file["devourable"] + resizable = json_from_file["resizable"] feeding = json_from_file["feeding"] - absorbable = json_from_file["absorbable"] //TFF 14/12/19 - choose whether allowing absorbing + absorbable = json_from_file["absorbable"] digest_leave_remains = json_from_file["digest_leave_remains"] allowmobvore = json_from_file["allowmobvore"] vore_taste = json_from_file["vore_taste"] @@ -141,6 +145,8 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE digestable = TRUE if(isnull(devourable)) devourable = TRUE + if(isnull(resizable)) + resizable = TRUE if(isnull(feeding)) feeding = TRUE if(isnull(absorbable)) @@ -175,6 +181,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE "version" = version, "digestable" = digestable, "devourable" = devourable, + "resizable" = resizable, "absorbable" = absorbable, "feeding" = feeding, "digest_leave_remains" = digest_leave_remains, diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 2d5e4d36e96..b5b29fa7dfe 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -208,6 +208,7 @@ data["prefs"] = list( "digestable" = host.digestable, "devourable" = host.devourable, + "resizable" = host.resizable, "feeding" = host.feeding, "absorbable" = host.absorbable, "digest_leave_remains" = host.digest_leave_remains, @@ -358,6 +359,12 @@ host.client.prefs_vr.devourable = host.devourable unsaved_changes = TRUE return TRUE + if("toggle_resize") + host.resizable = !host.resizable + if(host.client.prefs_vr) + host.client.prefs_vr.resizable = host.resizable + unsaved_changes = TRUE + return TRUE if("toggle_feed") host.feeding = !host.feeding if(host.client.prefs_vr) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 2c3ac9641b4..14d75133bb2 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -2287,4 +2287,47 @@ Departamental Swimsuits, for general use body_parts_covered = UPPER_TORSO|LOWER_TORSO|FEET|ARMS|HANDS +//PastelPrinceDan: Kiyoshi Maki +/obj/item/clothing/accessory/poncho/fluff/cloakglowing + name = "glowing cloak" + desc = "A fancy cloak with a RGB LED color strip along the trim, cycling through the colors of the rainbow." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "rgb" + item_state = "rgb" + overlay_state = "rgb" + icon_override = 'icons/vore/custom_onmob_vr.dmi' + var/is_dark = FALSE +/obj/item/clothing/accessory/poncho/fluff/cloakglowing/equipped() + ..() + var/mob/living/carbon/human/H = loc + if(istype(H) && H.wear_suit == src) + icon_override = 'icons/vore/custom_onmob_vr.dmi' + update_clothing_icon() + +/obj/item/clothing/accessory/poncho/fluff/cloakglowing/dropped() + icon_override = 'icons/vore/custom_onmob_vr.dmi' + +/obj/item/clothing/accessory/poncho/fluff/cloakglowing/proc/colorswap(mob/user) + if(user.canmove && !user.stat) + src.is_dark = !src.is_dark + if (src.is_dark) + icon_state = "rgbd" + item_state = "rgbd" + overlay_state = "rgbd" + to_chat(user, "The polychromic plates in your cloak activate, turning it black.") + else + icon_state = "rgb" + item_state = "rgb" + overlay_state = "rgb" + to_chat(user, "The polychromic plates in your cloak activate, turning it white.") + has_suit.update_clothing_icon() + +/obj/item/clothing/accessory/poncho/fluff/cloakglowing/verb/color_verb() + set name = "Swap color" + set category = "Object" + set src in usr + if(!istype(usr, /mob/living)) return + if(usr.stat) return + + colorswap(usr) \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 9f8b72770bf..9138377b392 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -337,7 +337,7 @@ name = "Mouse Plushie" desc = "A plushie of a delightful mouse! What was once considered a vile rodent is now your very best friend." slot_flags = SLOT_HEAD - icon_state = "mouse_brown" //TFF 12/11/19 - Change sprite to not look dead. Heck you for that choice! >:C + icon_state = "mouse_brown" item_state = "mouse_brown_head" icon = 'icons/vore/custom_items_vr.dmi' icon_override = 'icons/vore/custom_items_vr.dmi' diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index eb14ffb20eb..04c3e47dba2 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -1,17 +1,3 @@ - -//these aren't defines so they can stay in this file -var/const/RESIZE_HUGE = 2 -var/const/RESIZE_BIG = 1.5 -var/const/RESIZE_NORMAL = 1 -var/const/RESIZE_SMALL = 0.5 -var/const/RESIZE_TINY = 0.25 - -//average -var/const/RESIZE_A_HUGEBIG = (RESIZE_HUGE + RESIZE_BIG) / 2 -var/const/RESIZE_A_BIGNORMAL = (RESIZE_BIG + RESIZE_NORMAL) / 2 -var/const/RESIZE_A_NORMALSMALL = (RESIZE_NORMAL + RESIZE_SMALL) / 2 -var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 - // Adding needed defines to /mob/living // Note: Polaris had this on /mob/living/carbon/human We need it higher up for animals and stuff. /mob/living @@ -60,32 +46,45 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 /mob/living/get_effective_size() return size_multiplier +/atom/movable/proc/size_range_check(size_select) //both objects and mobs needs to have that + var/area/A = get_area(src) //Get the atom's area to check for size limit. + if((A.limit_mob_size && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1)) + return FALSE + return TRUE + +/atom/movable/proc/has_large_resize_bounds() + var/area/A = get_area(src) //Get the atom's area to check for size limit. + return !A.limit_mob_size + +/proc/is_extreme_size(size) + return (size < RESIZE_MINIMUM || size > RESIZE_MAXIMUM) + + /** * Resizes the mob immediately to the desired mod, animating it growing/shrinking. * It can be used by anything that calls it. */ -/atom/movable/proc/in_dorms() - var/area/A = get_area(src) - return istype(A, /area/crew_quarters/sleep) -/atom/movable/proc/size_range_check(size_select) //both objects and mobs needs to have that - if((!in_dorms() && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1)) - return FALSE - return TRUE -/mob/living/proc/resize(var/new_size, var/animate = TRUE, var/mark_unnatural_size = TRUE) +/mob/living/proc/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE) + if(!uncapped) + new_size = clamp(new_size, RESIZE_MINIMUM, RESIZE_MAXIMUM) + var/datum/component/resize_guard/guard = GetComponent(/datum/component/resize_guard) + if(guard) + qdel(guard) + else if(has_large_resize_bounds()) + if(is_extreme_size(new_size)) + AddComponent(/datum/component/resize_guard) + else + var/datum/component/resize_guard/guard = GetComponent(/datum/component/resize_guard) + if(guard) + qdel(guard) + if(size_multiplier == new_size) return 1 size_multiplier = new_size //Change size_multiplier so that other items can interact with them - if(ishuman(src)) - var/mob/living/carbon/human/H = src - if(new_size > 2 || new_size < 0.25) - if(mark_unnatural_size) //Will target size be reverted to ordinary bounds when out of dorms or not? - H.unnaturally_resized = TRUE - else - H.unnaturally_resized = FALSE if(animate) var/change = new_size - size_multiplier var/duration = (abs(change)+0.25) SECONDS @@ -111,8 +110,8 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 else update_transform() //Lame way -/mob/living/carbon/human/resize(var/new_size, var/animate = TRUE) - if(!resizable) +/mob/living/carbon/human/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE) + if(!resizable && !ignore_prefs) return 1 if(species) vis_height = species.icon_height @@ -125,7 +124,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 apply_hud(index, HI) // Optimize mannequins - never a point to animating or doing HUDs on these. -/mob/living/carbon/human/dummy/mannequin/resize(var/new_size, var/animate = TRUE) +/mob/living/carbon/human/dummy/mannequin/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE) size_multiplier = new_size /** @@ -175,10 +174,10 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 var/mob/living/simple_mob/SA = M if(!SA.has_hands) return 0 - if(buckled) - to_chat(usr,"You have to unbuckle \the [M] before you pick them up.") - return 0 if(size_diff >= 0.50 || mob_size < MOB_SMALL) + if(buckled) + to_chat(usr,"You have to unbuckle \the [src] before you pick them up.") + return 0 holder_type = /obj/item/weapon/holder/micro var/obj/item/weapon/holder/m_holder = get_scooped(M, G) holder_type = holder_default diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index e30c218fbb4..41775af2a52 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -44,12 +44,15 @@ set category = "Object" set src in view(1) - var/size_select = input("Put the desired size (25-200%), (1-600%) in dormitory areas.", "Set Size", size_set_to * 100) as num - if(!size_range_check(size_select)) - to_chat(usr, "Invalid size.") - return - size_set_to = (size_select/100) + var/size_select = input("Put the desired size (25-200%), (1-600%) in dormitory areas.", "Set Size", size_set_to * 100) as num|null + if(!size_select) + return //cancelled + //We do valid resize testing in actual firings because people move after setting these things. + //Just a basic clamp here to the valid ranges. + size_set_to = clamp((size_select/100), RESIZE_MINIMUM_DORMS, RESIZE_MAXIMUM_DORMS) to_chat(usr, "You set the size to [size_select]%") + if(size_set_to < RESIZE_MINIMUM || size_set_to > RESIZE_MAXIMUM) + to_chat(usr, "Note: Resizing limited to 25-200% automatically while outside dormatory areas.") //hint that we clamp it in resize /obj/item/weapon/gun/energy/sizegun/examine(mob/user) . = ..() @@ -66,8 +69,10 @@ set category = "Object" set src in view(1) - var/size_select = input("Put the desired size", "Set Size", size_set_to * 100) as num - size_set_to = max(1,size_select/100) //No negative numbers + var/size_select = input("Put the desired size (1-600%)", "Set Size", size_set_to * 100) as num|null + if(!size_select) + return //cancelled + size_set_to = clamp((size_select/100), 0, 1000) //eheh to_chat(usr, "You set the size to [size_select]%") // @@ -88,21 +93,30 @@ /obj/item/projectile/beam/sizelaser/on_hit(var/atom/target) var/mob/living/M = target + var/ignoring_prefs = (target == firer ? TRUE : FALSE) // Resizing yourself + if(istype(M)) - if(!M.in_dorms() || !istype(M, /mob/living/carbon/human)) - if(!M.resize(clamp(set_size,0.25,2))) - to_chat(M, "The beam fires into your body, changing your size!") - else - if(!M.resize(clamp(set_size,0.01,6))) - to_chat(M, "The beam fires into your body, changing your size!") + if(!M.resize(set_size, uncapped = M.has_large_resize_bounds(), ignore_prefs = ignoring_prefs)) + to_chat(M, "The beam fires into your body, changing your size!") M.updateicon() return return 1 /obj/item/projectile/beam/sizelaser/admin/on_hit(var/atom/target) var/mob/living/M = target + if(istype(M)) - M.resize(set_size, TRUE, FALSE) + + var/can_be_big = M.has_large_resize_bounds() + var/very_big = is_extreme_size(set_size) + + if(very_big && can_be_big) // made an extreme size in an area that allows it, don't assume adminbuse + to_chat(firer, "[M] will lose this size upon moving into an area where this size is not allowed.") + else if(very_big) // made an extreme size in an area that doesn't allow it, assume adminbuse + to_chat(firer, "[M] will retain this normally unallowed size outside this area.") + + M.resize(set_size, uncapped = TRUE, ignore_prefs = TRUE) // Always ignores prefs, caution is advisable + to_chat(M, "The beam fires into your body, changing your size!") M.updateicon() return diff --git a/code/modules/xenoarcheaology/finds/finds.dm b/code/modules/xenoarcheaology/finds/finds.dm index 4713ac0e768..aa620393dd5 100644 --- a/code/modules/xenoarcheaology/finds/finds.dm +++ b/code/modules/xenoarcheaology/finds/finds.dm @@ -21,7 +21,7 @@ icon_state = "strange" var/datum/geosample/geologic_data origin_tech = list(TECH_MATERIAL = 5) - w_class = ITEMSIZE_SMALL //TFF 25/11/19 - fixes the strange rocks to be small size like before and not normal. + w_class = ITEMSIZE_SMALL /obj/item/weapon/strangerock/New(loc, var/inside_item_type = 0) pixel_x = rand(0,16)-8 diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index 92dc014f84c..ccee935d168 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -31,6 +31,7 @@ idcaboutaname - Protean inuzari - Diona jademanique - Black-Eyed Shadekin jademanique - Xenochimera +joltze - Black-Eyed Shadekin khanivore - Protean killjaden - Protean ktccd - Diona diff --git a/config/jobwhitelist.txt b/config/jobwhitelist.txt index 6b113f77e88..ac4a862fba1 100644 --- a/config/jobwhitelist.txt +++ b/config/jobwhitelist.txt @@ -1,5 +1,6 @@ # Job whitelist in format ckey - jobname # Like arokha - clown +awkwarddryad - mime akram - clown amshaegaar - mime seiga - mime diff --git a/icons/_nanomaps/tether_nanomap_z6.png b/icons/_nanomaps/tether_nanomap_z6.png index 283c20c90c9..f64e2192646 100644 Binary files a/icons/_nanomaps/tether_nanomap_z6.png and b/icons/_nanomaps/tether_nanomap_z6.png differ diff --git a/icons/_nanomaps/tether_nanomap_z7.png b/icons/_nanomaps/tether_nanomap_z7.png index 526a173d192..06bd760d7ba 100644 Binary files a/icons/_nanomaps/tether_nanomap_z7.png and b/icons/_nanomaps/tether_nanomap_z7.png differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 4a5e549c7de..d89dafc9093 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/human_races/markings_vr.dmi b/icons/mob/human_races/markings_vr.dmi index 175e5387c69..6a96c246895 100644 Binary files a/icons/mob/human_races/markings_vr.dmi and b/icons/mob/human_races/markings_vr.dmi differ diff --git a/icons/mob/spacesuit.dmi b/icons/mob/spacesuit.dmi index aa6d753ef88..7d7c0c61cf1 100644 Binary files a/icons/mob/spacesuit.dmi and b/icons/mob/spacesuit.dmi differ diff --git a/icons/mob/species/akula/helmet_vr.dmi b/icons/mob/species/akula/helmet_vr.dmi index 5d9d848ff26..5f74f6930cd 100644 Binary files a/icons/mob/species/akula/helmet_vr.dmi and b/icons/mob/species/akula/helmet_vr.dmi differ diff --git a/icons/mob/species/akula/suit_vr.dmi b/icons/mob/species/akula/suit_vr.dmi index 9fb0807138b..98767384b31 100644 Binary files a/icons/mob/species/akula/suit_vr.dmi and b/icons/mob/species/akula/suit_vr.dmi differ diff --git a/icons/mob/species/sergal/helmet_vr.dmi b/icons/mob/species/sergal/helmet_vr.dmi index 900f1adfd9c..a890d2bb7d3 100644 Binary files a/icons/mob/species/sergal/helmet_vr.dmi and b/icons/mob/species/sergal/helmet_vr.dmi differ diff --git a/icons/mob/species/sergal/suit_vr.dmi b/icons/mob/species/sergal/suit_vr.dmi index dc770a2fef9..8cdc3c2da07 100644 Binary files a/icons/mob/species/sergal/suit_vr.dmi and b/icons/mob/species/sergal/suit_vr.dmi differ diff --git a/icons/mob/species/skrell/helmet.dmi b/icons/mob/species/skrell/helmet.dmi index 8cda9900851..f518f8fb704 100644 Binary files a/icons/mob/species/skrell/helmet.dmi and b/icons/mob/species/skrell/helmet.dmi differ diff --git a/icons/mob/species/skrell/suit.dmi b/icons/mob/species/skrell/suit.dmi index 1185d99d7f2..45b47bb1df9 100644 Binary files a/icons/mob/species/skrell/suit.dmi and b/icons/mob/species/skrell/suit.dmi differ diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi index 4003c1b508d..24901a33b37 100644 Binary files a/icons/mob/species/tajaran/helmet.dmi and b/icons/mob/species/tajaran/helmet.dmi differ diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/species/tajaran/suit.dmi index 2453efcbaf4..22afb1bd853 100644 Binary files a/icons/mob/species/tajaran/suit.dmi and b/icons/mob/species/tajaran/suit.dmi differ diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/species/unathi/helmet.dmi index dc98094bb55..2a113796d72 100644 Binary files a/icons/mob/species/unathi/helmet.dmi and b/icons/mob/species/unathi/helmet.dmi differ diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/species/unathi/suit.dmi index 08f1ed49387..1fd3aaba970 100644 Binary files a/icons/mob/species/unathi/suit.dmi and b/icons/mob/species/unathi/suit.dmi differ diff --git a/icons/mob/species/vulpkanin/helmet.dmi b/icons/mob/species/vulpkanin/helmet.dmi index 180942e678e..a800f5f951c 100644 Binary files a/icons/mob/species/vulpkanin/helmet.dmi and b/icons/mob/species/vulpkanin/helmet.dmi differ diff --git a/icons/mob/species/vulpkanin/suit.dmi b/icons/mob/species/vulpkanin/suit.dmi index 1a18c3dbfa1..10604dc0b3a 100644 Binary files a/icons/mob/species/vulpkanin/suit.dmi and b/icons/mob/species/vulpkanin/suit.dmi differ diff --git a/icons/mob/vore.dmi b/icons/mob/vore.dmi index b272992a6ac..ac57632b8c2 100644 Binary files a/icons/mob/vore.dmi and b/icons/mob/vore.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index ea1d7579d8e..e1c5517021d 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/spacesuits.dmi b/icons/obj/clothing/spacesuits.dmi index 71bd5463f78..ae9cc5764f1 100644 Binary files a/icons/obj/clothing/spacesuits.dmi and b/icons/obj/clothing/spacesuits.dmi differ diff --git a/icons/obj/clothing/species/akula/hats.dmi b/icons/obj/clothing/species/akula/hats.dmi index 53ef19b53f5..729050c5f5d 100644 Binary files a/icons/obj/clothing/species/akula/hats.dmi and b/icons/obj/clothing/species/akula/hats.dmi differ diff --git a/icons/obj/clothing/species/akula/suits.dmi b/icons/obj/clothing/species/akula/suits.dmi index 193650e5ab9..60fb367009e 100644 Binary files a/icons/obj/clothing/species/akula/suits.dmi and b/icons/obj/clothing/species/akula/suits.dmi differ diff --git a/icons/obj/clothing/species/sergal/hats.dmi b/icons/obj/clothing/species/sergal/hats.dmi index 0af7d29863f..9a412ee16a3 100644 Binary files a/icons/obj/clothing/species/sergal/hats.dmi and b/icons/obj/clothing/species/sergal/hats.dmi differ diff --git a/icons/obj/clothing/species/sergal/suits.dmi b/icons/obj/clothing/species/sergal/suits.dmi index 1c44cd7002c..589c5a4a96d 100644 Binary files a/icons/obj/clothing/species/sergal/suits.dmi and b/icons/obj/clothing/species/sergal/suits.dmi differ diff --git a/icons/obj/clothing/species/skrell/hats.dmi b/icons/obj/clothing/species/skrell/hats.dmi index a69a4e51dd1..def79846d36 100644 Binary files a/icons/obj/clothing/species/skrell/hats.dmi and b/icons/obj/clothing/species/skrell/hats.dmi differ diff --git a/icons/obj/clothing/species/skrell/suits.dmi b/icons/obj/clothing/species/skrell/suits.dmi index 01ccf8f8d01..d0ac340426f 100644 Binary files a/icons/obj/clothing/species/skrell/suits.dmi and b/icons/obj/clothing/species/skrell/suits.dmi differ diff --git a/icons/obj/clothing/species/tajaran/hats.dmi b/icons/obj/clothing/species/tajaran/hats.dmi index 362fae9f46b..b4fd4241e0e 100644 Binary files a/icons/obj/clothing/species/tajaran/hats.dmi and b/icons/obj/clothing/species/tajaran/hats.dmi differ diff --git a/icons/obj/clothing/species/tajaran/suits.dmi b/icons/obj/clothing/species/tajaran/suits.dmi index d935a4096cf..6b12d49204e 100644 Binary files a/icons/obj/clothing/species/tajaran/suits.dmi and b/icons/obj/clothing/species/tajaran/suits.dmi differ diff --git a/icons/obj/clothing/species/unathi/hats.dmi b/icons/obj/clothing/species/unathi/hats.dmi index 28c8700a39d..a3a6bf1fff9 100644 Binary files a/icons/obj/clothing/species/unathi/hats.dmi and b/icons/obj/clothing/species/unathi/hats.dmi differ diff --git a/icons/obj/clothing/species/unathi/suits.dmi b/icons/obj/clothing/species/unathi/suits.dmi index 08abbe309a6..e9870c4f97b 100644 Binary files a/icons/obj/clothing/species/unathi/suits.dmi and b/icons/obj/clothing/species/unathi/suits.dmi differ diff --git a/icons/obj/clothing/species/vulpkanin/hats.dmi b/icons/obj/clothing/species/vulpkanin/hats.dmi index eec5b5ca3c9..f2dc0386289 100644 Binary files a/icons/obj/clothing/species/vulpkanin/hats.dmi and b/icons/obj/clothing/species/vulpkanin/hats.dmi differ diff --git a/icons/obj/clothing/species/vulpkanin/suits.dmi b/icons/obj/clothing/species/vulpkanin/suits.dmi index b87b02edfed..3df33763a0c 100644 Binary files a/icons/obj/clothing/species/vulpkanin/suits.dmi and b/icons/obj/clothing/species/vulpkanin/suits.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 68188dd88a8..250c191c730 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index d9b172cd5ad..0c8f06b8592 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ diff --git a/icons/vore/custom_onmob_vr.dmi b/icons/vore/custom_onmob_vr.dmi index aaf141e83f7..94dd3212530 100644 Binary files a/icons/vore/custom_onmob_vr.dmi and b/icons/vore/custom_onmob_vr.dmi differ diff --git a/maps/expedition_vr/space/_debrisfield.dm b/maps/expedition_vr/space/_debrisfield.dm index e8ffd87a0bc..f1b36da15ad 100644 --- a/maps/expedition_vr/space/_debrisfield.dm +++ b/maps/expedition_vr/space/_debrisfield.dm @@ -71,8 +71,6 @@ icon_state = "debrisexplored" forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg') -//TFF 26/12/19 - Sub-areas for the APCs. - /area/submap/debrisfield/derelict/ai_access_port name = "POI - Abandoned Derelict AI Acess Port" diff --git a/maps/gateway_archive_vr/fileList.txt b/maps/gateway_archive_vr/fileList.txt index 00581eaa269..30e08aff3ef 100644 --- a/maps/gateway_archive_vr/fileList.txt +++ b/maps/gateway_archive_vr/fileList.txt @@ -12,6 +12,3 @@ #maps/RandomZLevels/blackmarketpackers.dmm #maps/RandomZLevels/beach.dmm #maps/RandomZLevels/zoo.dmm - -#This one works with the Tether, uncomment when gateway code is unfucked -#maps/RandomZLevels/snow_outpost.dmm \ No newline at end of file diff --git a/maps/gateway_vr/listeningpost.dm b/maps/gateway_vr/listeningpost.dm index 52caafffb35..0c031d3436e 100644 --- a/maps/gateway_vr/listeningpost.dm +++ b/maps/gateway_vr/listeningpost.dm @@ -2,30 +2,29 @@ initial_generic_waypoints = list("tether_excursion_listeningpost") scanner_name = "Strange Asteroid" scanner_desc = @{"[i]Registration[/i]: UNKNOWN -[i]Class[/i]: Installation -[i]Transponder[/i]: None Detected -[b]Notice[/b]: Emitting encrypted radio-frequency traffic"} +[i]Class[/i]: Wreckage +[i]Transponder[/i]: None Detected"} -/obj/item/weapon/paper/listneningpost/mission +/obj/item/weapon/paper/listeningpost/mission name = "\improper Operation: Watchtower" info = {"Mission Details: You have been assigned to a newly constructed listening post - constructed within an asteroid in Nanotrasen space to monitor their plasma mining operations. + constructed within an asteroid in Nanotrasen space to monitor their phoron mining operations. Accurate intel is crucial to the success of our operatives onboard, do not fail us."} -/obj/item/weapon/paper/listneningpost/reciept +/obj/item/weapon/paper/listeningpost/reciept name = "\improper SpacEx reciept" info = {"1 x Stechtkin pistol plus ammo - $600
1 x silencer - $200
shipping charge - $4360
total - $5160"} //////// 2558 //////// -/obj/item/weapon/paper/listneningpost/year2558/april +/obj/item/weapon/paper/listeningpost/year2558/april name = "\improper April 2558 report" info = {"A good start to the operation: intercepted Nanotrasen military communications. A convoy is scheduled to transfer nuclear warheads to a new military base. This is as good a chance as any to get our hands on some heavy weaponry, I suggest we take it."} -/obj/item/weapon/paper/listneningpost/year2558/may +/obj/item/weapon/paper/listeningpost/year2558/may name = "\improper May 2558 report" info = {"I have intercepted faint transmissions from what appears to be some sort of pirate radio station. They do not appear to be relevant to my assignment. I also learned that @@ -33,34 +32,34 @@ attack in March. Ever since Townes got killed, we've lost our eyes on the inside at Nanotrasen. Hence my being here..."} -/obj/item/weapon/paper/listneningpost/year2558/june +/obj/item/weapon/paper/listeningpost/year2558/june name = "\improper June 2558 Report" info = {"Sounds like Nanotrasen stepped up their recruitment efforts. Virgo is no longer a secluded research station, and its scientists are no longer hand-picked. This could be a major oppertunity for us to start snooping around."} -/obj/item/weapon/paper/listneningpost/year2558/july +/obj/item/weapon/paper/listeningpost/year2558/july name = "\improper July 2558 Report" info = {"The crew has at least tripled in size since NT got rid of the application-based process of recruitment. We've managed to find a few people interested in aiding our cause. From atmospherics sabotoge to straight up bombing the place, we've got several people ready to go in posing as nothing but more grey tide. It's perfect."} -/obj/item/weapon/paper/listneningpost/year2558/august +/obj/item/weapon/paper/listeningpost/year2558/august name = "\improper August 2558 Report" info = {"Sounds like our agents have been successful in rattling things up. With their recuitment policies laxed, we've been able to carry out several attacks on the VORE. It sounds like we're the least of their problems, though. They've discovered a new technology. Something they're calling Redspace."} -/obj/item/weapon/paper/listneningpost/year2558/september +/obj/item/weapon/paper/listeningpost/year2558/september name = "\improper September 2558 Report" info = {"Something REALLY BAD is brewing at the VORE. This Redspace shit seems to have attracted the attention of the cult of Nar-Sie. I think Nanotrasen is trying to weaponize it. We need to put a stop to this before Nanotrasen can use these weapons against innocent people and rival companies."} -/obj/item/weapon/paper/listneningpost/year2558/october +/obj/item/weapon/paper/listeningpost/year2558/october name = "\improper October 2558 Report" info = {"Oh my god, if it weren't for the impending doom, I'd be laughing my ass off at all the hell VORE has put up with this month. Near mutiny over a retarded clown, @@ -71,7 +70,7 @@ in an army from another dimension. We have no time left. We have to strike while there's still something worth saving."} -/obj/item/weapon/paper/listneningpost/year2558/november +/obj/item/weapon/paper/listeningpost/year2558/november name = "\improper November 2558 Report" info = {"Maybe these VORE people aren't so bad after all. Mike says they actually HELPED during our (apparently failed) attack on the Citadel. Shame they work for an evil corporation @@ -80,7 +79,7 @@ crazy guy showed up on the station claiming he's from 1945. The crew seems to think it's legit though. Maybe he is. I don't think he is though. I'll keep monitoring the situation."} -/obj/item/weapon/paper/listneningpost/year2558/december +/obj/item/weapon/paper/listeningpost/year2558/december name = "\improper December 2558 Report" info = {"We hired a merc to capture their top Redspace scientist Kisuke Gema. Unfortunately, Colonel Morgan was a fucking idiot as usual and turned his back for half a second, and the nerd cut @@ -92,7 +91,7 @@ //////// 2559 //////// -/obj/item/weapon/paper/listneningpost/year2559/january +/obj/item/weapon/paper/listeningpost/year2559/january name = "\improper January 2559 Report" info = {"So, this guy from 1945 is legit. His name is Chase Monroe and he's a former Seargent in the USCM or something. Although I feel like the USCM didn't exist in 1945. Also a pirate @@ -101,7 +100,7 @@ blow several bombs on the station, and even steal the nuke. VORE's security forces are showing serious signs of weakness. Maybe we could exploit this."} -/obj/item/weapon/paper/listneningpost/year2559/february +/obj/item/weapon/paper/listeningpost/year2559/february name = "\improper February 2559 Report" info = {"Sounds like the World War 2 guy from Earth brought some unwanted friends along. Early in the month, a battlecruiser showed up out of nowhere and started shooting up the station @@ -110,7 +109,7 @@ the Soviets got a beef with these guys too. Sounds like they jacked one of the Soviet's ships. Makes sense, because a battleship like that doesn't just appear out of nowhere."} -/obj/item/weapon/paper/listneningpost/year2559/march +/obj/item/weapon/paper/listeningpost/year2559/march name = "\improper March 2559 Report" info = {"Hard to believe it's already been a year. NT's private navy has been running exercises more often than usual. They also replaced the Icarus with a new and more heavily armed cruiser called @@ -121,7 +120,7 @@ say about Nanotrasen. The Truth will set us free. The truth about all the atrocities Nanotrasen has done over the years."} -/obj/item/weapon/paper/listneningpost/year2559/april +/obj/item/weapon/paper/listeningpost/year2559/april name = "\improper April 2559 Report" info = {"We were approached today by a man calling himself the 'Werwolf', alleged to be part of that group that attacked Nanotrasen in early February. We never understood his motives WHY he attacked them. @@ -131,13 +130,13 @@ I think we're going to take the deal. When I get confirmation, I'll forward a line to Mike and Dave to make the trade."} -/obj/item/weapon/paper/listneningpost/year2559/may +/obj/item/weapon/paper/listeningpost/year2559/may name = "\improper May 2559 Report" info = {"V.O.R.E. found something. An abandoned space station with a weapon called a mind flayer. There's also rumor about some sort of a secret weapon NT was developing; a singularity bomb. Nothing of else of real interest to report."} -/obj/item/weapon/paper/listneningpost/year2559/june +/obj/item/weapon/paper/listeningpost/year2559/june name = "\improper June 2559 Report" info = {"The WW2 guy is dead. Went out in a blaze of glory killing Space Nazis. Mike and Dave are pissed. They apparently broke protocol and went to help the V.O.R.E. crew in the attack, and they want to @@ -146,7 +145,7 @@ NanoTrasen to deal with. Curiously, NanoTrasen refuses to officially support helping to remove this threat. Possible collaberation?"} -/obj/item/weapon/paper/listneningpost/year2559/july +/obj/item/weapon/paper/listeningpost/year2559/july name = "\improper July 2559 Report" info = {"USDF ships have been spotted in the area. Admiral Glenn Pink is on board. This guy went MIA almost ten years ago, and now he's back? Why? Apparently he's got some kind of connection with V.O.R.E.'s @@ -154,7 +153,7 @@ plot. I don't know who this Admiral Pink is, but I guess Ace has at least a couple friends in high places."} -/obj/item/weapon/paper/listneningpost/year2559/august +/obj/item/weapon/paper/listeningpost/year2559/august name = "\improper August 2559 Report" info = {"So, the reason Admiral Pink showed up in the last report was because these Space Nazis hijacked one of his vessels; the USDF Jormungandr or something. Well, the crazy bastards took it back. @@ -166,27 +165,27 @@ arm was destroyed, and with it, all of his genetic information to get around his cloning disorder. So he's finally out of our hair."} -/obj/item/weapon/paper/listneningpost/year2559/september +/obj/item/weapon/paper/listeningpost/year2559/september name = "\improper September 2559 Report" info = {"Of course it's not that simple. The nerd is back from the dead. Wonderful. I don't know how but he's back, or they have a fake Kisuke Gema, or whatever bullshit. In other news, the station has been slated for demolition. They're shipping a new Mark-3 Exodus-class station from Bay Shipyards all the way from the NanoTrasen branch in Nyx. The demolition keeps getting delayed."} -/obj/item/weapon/paper/listneningpost/year2559/october +/obj/item/weapon/paper/listeningpost/year2559/october name = "\improper October 2559 Report" info = {"Station was demolished and operations were put on pause for a whole week. In other news, captain Ace reportedly got a promotion to CentCom but something went wrong. The stronger loyalty implant had a negative effect on him and almost killed him. He was quickly demoted back to Captain. This could be useful information later. Recommend command investigate thoroughly."} -/obj/item/weapon/paper/listneningpost/year2559/november +/obj/item/weapon/paper/listeningpost/year2559/november name = "\improper November 2559 Report" info = {"A clown federation owned vessel called the Calypso was discovered in the Virgo system. It was a ghost ship. Allegedly everyone on board perished due to a joke so funny that everyone laughed themselves to madness, then death. NanoTrasen is trying to cover it up. No one knows why."} -/obj/item/weapon/paper/listneningpost/year2559/december +/obj/item/weapon/paper/listeningpost/year2559/december name = "\improper December 2559 Report" info = {"The V.O.R.E. discovered a new gateway location; a clown temple. We need to send someone to see this. Reportedly it's full of tunnel clowns and these mutants called cluwnes. A clown researcher @@ -199,31 +198,35 @@ and see if he wants a job. Ask our contacts on station. Surely one of them knows who's behind the heist."} -/obj/item/weapon/paper/listneningpost/year2560/january +/obj/item/weapon/paper/listeningpost/year2560/january name = "\improper January 2560 Report" info = {"A group of Akula pirates tried to kidnap Kisuke Gema. They succeded, but their leader died of his injuries soon after. The other pirates defected. I wonder why?"} -/obj/item/weapon/paper/listneningpost/year2560/february +/obj/item/weapon/paper/listeningpost/year2560/february name = "\improper February 2560 Report" info = {"There were a few incidents regarding a redspace anomaly in the chapel but the effects have long since subsided. Nothing of major interest otherwise."} -/obj/item/weapon/paper/listneningpost/year2560/march +/obj/item/weapon/paper/listeningpost/year2560/march name = "\improper March 2560 Report" info = {"Very quiet month. Nothing of interest to report. Perhaps the calm before the storm?"} -/obj/item/weapon/paper/listneningpost/year2560/april +/obj/item/weapon/paper/listeningpost/year2560/april name = "\improper April 2560 Report" info = {"A loud, painfully high pitched SSTV signal came across global comms. It seems to be a distress signal of some kind. To what, I have no idea. Efforts to trace the signal's origin have fallen inconclusive."} -/obj/item/weapon/paper/listneningpost/oddreport - name = "\improper Odd Report" - info = {"I wonder how much longer they will accept my empty reports. They will cancel the case soon without - results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic - solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. - If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space - will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that - stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should - it ever rear it's ugly head again. -Donk Co. Operative #451"} \ No newline at end of file +/obj/item/weapon/paper/crumpled/listeningpost/fanfiction + name = "\improper Regarding Latest Report" + info = {"I swear to god, Dave, if you send us your stupid 'Futuristic version of VORE' fanfiction instead of actual + report again 'on accident' even one more time, I'm sending you there myself, and you know better than most + what they do there. Your writing is trash anyway, I bet even those freaks wouldn't like it."} + +/obj/item/weapon/paper/listeningpost/departure + name = "\improper Notice To All Facilities" + info = {"After recent developments and Nanotrasen deal, we're pulling back resources from the Virgo-Erigone system. + Any facility recieving this notice is to collect all valuable equipment and data, then fly to the closest general facility + for debrief and reassignment. And to those outdated trashy outposts specifically: all data must be digital. If it's not already, + make it so. Most importantly, remember: we're at a truce now. No shooting NT goons unless they start getting frisky with restricted areas. + And don't fucking forget to debrief Dave's listening post again."} \ No newline at end of file diff --git a/maps/gateway_vr/listeningpost.dmm b/maps/gateway_vr/listeningpost.dmm index 930ef2e428d..63084cda974 100644 --- a/maps/gateway_vr/listeningpost.dmm +++ b/maps/gateway_vr/listeningpost.dmm @@ -1,315 +1,287 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( +"aa" = ( /turf/space, /area/space) -"c" = ( +"ab" = ( +/turf/simulated/mineral, +/area/space) +"ac" = ( /turf/simulated/wall/r_wall, /area/awaymission/listeningpost) -"d" = ( -/obj/machinery/power/smes/buildable/point_of_interest{ - desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; - name = "power storage unit" - }, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"e" = ( -/obj/machinery/door/airlock/external, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"f" = ( -/obj/machinery/door/airlock, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"g" = ( +"ad" = ( +/turf/simulated/wall/rthull, +/area/space) +"ae" = ( +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"af" = ( +/obj/structure/shuttle/engine/heater, +/turf/simulated/wall/rthull, +/area/space) +"ag" = ( /turf/simulated/wall, /area/awaymission/listeningpost) -"h" = ( +"ah" = ( /turf/simulated/mineral, /area/mine/unexplored) -"i" = ( -/turf/simulated/floor, +"ai" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"aj" = ( +/obj/item/broken_device/random, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"j" = ( -/obj/structure/table/standard, -/obj/item/weapon/paper/monitorkey, -/obj/item/device/radio/intercom{ - desc = "Talk through this. Evilly"; - frequency = 1213; - name = "Syndicate Intercom"; - pixel_x = 32; - subspace_transmission = 1; - syndie = 1 - }, -/obj/item/clothing/glasses/regular, -/turf/simulated/floor, +"ak" = ( +/obj/structure/frame, +/obj/effect/decal/cleanable/cobweb2, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"k" = ( -/obj/structure/table/standard, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"l" = ( +"al" = ( /turf/simulated/mineral/floor/vacuum, /area/mine/explored) -"m" = ( -/obj/machinery/computer/message_monitor{ - dir = 4 - }, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"n" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/mob/living/simple_mob/humanoid/merc{ - desc = "A weary looking syndicate operative."; - faction = "syndicate" - }, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"o" = ( -/obj/structure/table/standard, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "november report" - }, -/obj/item/weapon/pen, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"p" = ( -/obj/item/device/radio/intercom{ - desc = "Talk through this. Evilly"; - frequency = 1213; - name = "Syndicate Intercom"; - pixel_x = 32; - subspace_transmission = 1; - syndie = 1 - }, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"q" = ( -/obj/structure/table/rack, -/obj/item/clothing/suit/space/syndicate, -/obj/item/clothing/mask/gas, -/obj/item/clothing/head/helmet/space/syndicate, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"r" = ( +"am" = ( /obj/machinery/door/airlock, -/obj/item/weapon/paper{ - info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear it's ugly head again. -Donk Co. Operative #451"; - name = "odd report" - }, -/obj/item/weapon/gun/projectile/pistol, -/obj/item/weapon/silencer, -/turf/simulated/floor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"s" = ( +"an" = ( +/obj/effect/decal/remains/human, +/obj/item/clothing/suit/space/void/merc, +/obj/item/clothing/head/helmet/space/void/merc, +/obj/item/clothing/glasses/regular, +/turf/simulated/mineral/floor/vacuum, +/area/space) +"ao" = ( +/obj/structure/table/standard, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"ap" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"aq" = ( +/obj/item/weapon/pen, +/obj/item/weapon/paper/listeningpost/departure, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"ar" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"as" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, /turf/simulated/mineral, /area/mine/unexplored) -"t" = ( +"at" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/mineral, /area/mine/unexplored) -"u" = ( -/obj/structure/disposaloutlet{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, +"au" = ( +/obj/machinery/door/airlock/external, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless, -/area) -"v" = ( -/obj/structure/bed, -/obj/item/weapon/bedsheet/brown, -/turf/simulated/floor, /area/awaymission/listeningpost) -"w" = ( -/obj/structure/table/standard, -/obj/item/device/flashlight/lamp, -/turf/simulated/floor, +"av" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/item/weapon/paper/listeningpost/year2558/april, +/obj/item/weapon/paper/listeningpost/year2558/may, +/obj/item/weapon/paper/listeningpost/year2558/june, +/obj/item/weapon/paper/listeningpost/year2558/july, +/obj/item/weapon/paper/listeningpost/year2558/august, +/obj/item/weapon/paper/listeningpost/year2558/september, +/obj/item/weapon/paper/listeningpost/year2558/october, +/obj/item/weapon/paper/listeningpost/year2558/november, +/obj/item/weapon/paper/listeningpost/year2558/december, +/obj/item/weapon/paper/listeningpost/year2559/january, +/obj/item/weapon/paper/listeningpost/year2559/february, +/obj/item/weapon/paper/listeningpost/year2559/march, +/obj/item/weapon/paper/listeningpost/year2559/april, +/obj/item/weapon/paper/listeningpost/year2559/may, +/obj/item/weapon/paper/listeningpost/year2559/june, +/obj/item/weapon/paper/listeningpost/year2559/july, +/obj/item/weapon/paper/listeningpost/year2559/august, +/obj/item/weapon/paper/listeningpost/year2559/september, +/obj/item/weapon/paper/listeningpost/year2559/october, +/obj/item/weapon/paper/listeningpost/year2559/november, +/obj/item/weapon/paper/listeningpost/year2559/december, +/obj/item/weapon/paper/listeningpost/year2560/january, +/obj/item/weapon/paper/listeningpost/year2560/february, +/obj/item/weapon/paper/listeningpost/year2560/march, +/obj/item/weapon/paper/listeningpost/year2560/april, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"aw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"x" = ( -/obj/machinery/vending/snack, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"y" = ( +"ax" = ( +/obj/structure/bed/chair/bay/comfy/red{ + dir = 1 + }, +/obj/item/weapon/tank/oxygen, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"ay" = ( /obj/structure/disposalpipe/segment, /turf/simulated/mineral, /area/mine/unexplored) -"z" = ( -/obj/machinery/vending/cola, -/turf/simulated/floor, +"az" = ( +/obj/structure/door_assembly/door_assembly_ext, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"A" = ( -/obj/structure/closet, -/obj/item/clothing/gloves/boxing, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"B" = ( -/obj/structure/filingcabinet, -/obj/item/weapon/paper{ - info = "A good start to the operation: intercepted Nanotrasen military communications. A convoy is scheduled to transfer nuclear warheads to a new military base. This is as good a chance as any to get our hands on some heavy weaponry, I suggest we take it."; - name = "april report" - }, -/obj/item/weapon/paper{ - info = "Nothing of real interest to report this month. I have intercepted faint transmissions from what appears to be some sort of pirate radio station. They do not appear to be relevant to my assignment."; - name = "may report" - }, -/obj/item/weapon/paper{ - info = "Nanotrasen communications have been noticably less frequent recently. The pirate radio station I found last month has been transmitting pro-Nanotrasen propaganda. I will continue to monitor it."; - name = "june report" - }, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "july report" - }, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "august report" - }, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "september report" - }, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "october report" - }, -/obj/item/weapon/paper{ - info = "1 x Stechtkin pistol - $600
1 x silencer - $200
shipping charge - $4360
total - $5160"; - name = "receipt" - }, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"C" = ( -/obj/structure/table/standard, -/obj/item/weapon/paper{ - info = "Mission Details: You have been assigned to a newly constructed listening post constructed within an asteroid in Nanotrasen space to monitor their plasma mining operations. Accurate intel is crucial to the success of our operatives onboard, do not fail us."; - name = "mission briefing" - }, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"D" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ +"aA" = ( +/obj/structure/frame/computer{ dir = 4 }, -/turf/simulated/floor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"E" = ( +"aB" = ( +/obj/item/weapon/gun/projectile/pistol, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"aC" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"aD" = ( +/obj/item/weapon/circuitboard/broken, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"aE" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/wall/r_wall, /area/awaymission/listeningpost) -"F" = ( +"aF" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, /turf/simulated/mineral, /area/mine/unexplored) -"G" = ( -/obj/machinery/door/airlock{ - name = "Toilet" - }, -/turf/simulated/floor, +"aG" = ( +/obj/structure/table/standard, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"H" = ( -/turf/simulated/floor/tiled/freezer, +"aH" = ( +/obj/structure/salvageable/server, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"I" = ( -/obj/machinery/shower{ - icon_state = "shower"; - dir = 8 - }, -/turf/simulated/floor/tiled/freezer, +"aI" = ( +/obj/structure/table/rack, +/obj/item/weapon/paper/listeningpost/reciept, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"J" = ( -/obj/structure/toilet{ - icon_state = "toilet00"; - dir = 8 - }, -/turf/simulated/floor/tiled/freezer, +"aJ" = ( +/obj/machinery/door/airlock, +/obj/item/weapon/silencer, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"K" = ( +"aK" = ( /turf/simulated/mineral/floor, /area/mine/unexplored) -"L" = ( +"aL" = ( /turf/simulated/floor/greengrid, /area/mine/explored) -"M" = ( +"aM" = ( /turf/simulated/mineral/floor, /area/mine/explored) -"N" = ( +"aN" = ( /obj/machinery/gateway{ icon_state = "off"; dir = 9 }, /turf/simulated/floor/greengrid, /area/mine/explored) -"O" = ( +"aO" = ( /obj/machinery/gateway{ icon_state = "off"; dir = 1 }, /turf/simulated/floor/greengrid, /area/mine/explored) -"P" = ( +"aP" = ( /obj/machinery/gateway{ icon_state = "off"; dir = 5 }, /turf/simulated/floor/greengrid, /area/mine/explored) -"Q" = ( +"aQ" = ( /obj/machinery/gateway{ icon_state = "off"; dir = 8 }, /turf/simulated/floor/greengrid, /area/mine/explored) -"R" = ( +"aR" = ( /obj/machinery/gateway/centeraway, /turf/simulated/floor/greengrid, /area/mine/explored) -"S" = ( +"aS" = ( /obj/machinery/gateway{ icon_state = "off"; dir = 4 }, /turf/simulated/floor/greengrid, /area/mine/explored) -"T" = ( +"aT" = ( /obj/machinery/gateway{ icon_state = "off"; dir = 10 }, /turf/simulated/floor/greengrid, /area/mine/explored) -"U" = ( +"aU" = ( /obj/machinery/gateway, /turf/simulated/floor/greengrid, /area/mine/explored) -"V" = ( +"aV" = ( /obj/machinery/gateway{ icon_state = "off"; dir = 6 }, /turf/simulated/floor/greengrid, /area/mine/explored) -"W" = ( +"aW" = ( /obj/effect/overmap/visitable/sector/tether_gateway/listeningpost, /turf/space, /area/space) -"Y" = ( +"aX" = ( +/obj/structure/frame/computer, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"aY" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; base_turf = /turf/space; @@ -319,19884 +291,20016 @@ }, /turf/space, /area/space) +"aZ" = ( +/obj/structure/disposalpipe/broken{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area) +"ba" = ( +/obj/structure/bed, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bb" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/cobweb2, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bc" = ( +/obj/item/weapon/card/emag_broken, +/turf/space, +/area/space) +"bd" = ( +/obj/structure/salvageable/implant_container_os, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"be" = ( +/obj/structure/salvageable/data, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"bf" = ( +/obj/structure/salvageable/machine, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"bg" = ( +/obj/structure/door_assembly/door_assembly_ext, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"bh" = ( +/obj/item/broken_device/random, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bi" = ( +/obj/structure/salvageable/data, +/obj/effect/decal/cleanable/cobweb2, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bj" = ( +/obj/item/broken_device/random, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bk" = ( +/obj/machinery/door/airlock, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bl" = ( +/obj/structure/salvageable/machine, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bm" = ( +/obj/structure/closet, +/obj/item/weapon/paper/listeningpost/mission, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bn" = ( +/obj/structure/filingcabinet, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bo" = ( +/obj/structure/salvageable/computer, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bp" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bq" = ( +/obj/structure/door_assembly, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"br" = ( +/obj/effect/decal/cleanable/vomit, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bs" = ( +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 4 + }, +/obj/item/weapon/broken_bottle, +/obj/effect/decal/cleanable/cobweb2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bt" = ( +/obj/effect/floor_decal/techfloor/hole/right, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bu" = ( +/obj/structure/toilet{ + icon_state = "toilet00"; + dir = 8 + }, +/obj/item/weapon/tool/crowbar, +/obj/item/weapon/paper/crumpled/listeningpost/fanfiction, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) (1,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (2,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -W -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aW +aa "} (3,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (4,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (5,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (6,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (7,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (8,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (9,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (10,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (11,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (12,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (13,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (14,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (15,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (16,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (17,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (18,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (19,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (20,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (21,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (22,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (23,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (24,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (25,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (26,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (27,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (28,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (29,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (30,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (31,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (32,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (33,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (34,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (35,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (36,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (37,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (38,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -l -l -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +al +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (39,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -l -l -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +al +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (40,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (41,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (42,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (43,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (44,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (45,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (46,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (47,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (48,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (49,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -l -l -l -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +al +al +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (50,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (51,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -K -K -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aK +aK +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (52,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -K -L -M -h -h -h -h -M -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aK +aL +aM +ah +ah +ah +ah +aM +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (53,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -K -L -L -L -h -L -M -M -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aK +aL +aL +aL +ah +aL +aM +aM +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (54,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -K -L -L -N -Q -T -L -L -K -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aK +aL +aL +aN +aQ +aT +aL +aL +aK +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (55,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -L -L -O -R -U -L -L -K -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aL +aL +aO +aR +aU +aL +aL +aK +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (56,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -M -L -P -S -V -L -L -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aM +aL +aP +aS +aV +aL +aL +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (57,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -M -L -L -L -L -L -M -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aM +aL +aL +aL +aL +aL +aM +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (58,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -M -M -L -M -M -M -M -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aM +aM +aL +aM +aM +aM +aM +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (59,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -K -K -K -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aK +aK +aK +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (60,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (61,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (62,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -a -a -h -h -h -h -a -a -a -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +aa +aa +ah +ah +ah +ah +aa +aa +aa +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (63,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -l -l -l -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +al +al +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (64,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (65,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (66,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (67,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (68,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (69,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -l -l -l -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +al +al +al +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (70,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -l -l -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +al +al +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (71,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (72,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -a -a -a -a -h -h -h -h -h -h -h -h -h -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (73,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -h -h -h -h -h -h -h -h -h -l -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (74,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -h -h -h -h -h -h -h -h -h -h -l -a -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +aa +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (75,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -a -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +aa +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (76,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (77,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (78,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (79,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (80,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -c -c -c -c -c -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ac +ac +ac +ac +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (81,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -c -v -i -A -c -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ac +ba +ar +bm +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (82,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -c -c -c -h -c -w -i -B -c -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ac +ac +ac +ah +ac +bb +bj +bn +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (83,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -c -c -m -c -c -c -g -f -g -c -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ac +ac +aA +ac +ac +ac +ag +bk +ag +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (84,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -c -j -n -p -i -r -i -i -C -c -c -c -c -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ac +ao +aC +aD +aw +aJ +aw +ar +bo +ac +ac +ac +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (85,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -c -c -c -k -o -k -i -g -i -i -i -G -H -H -c -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ac +ac +ac +ap +ap +aG +aw +ag +bh +aw +ar +bq +br +bt +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (86,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -c -i -f -i -i -i -i -g -i -i -D -g -I -J -c -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ac +aj +am +aq +aw +ar +ar +ag +ar +aw +bp +ag +bs +bu +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (87,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -c -d -g -i -i -i -q -g -x -z -E -c -c -c -c -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ac +ak +ag +ar +aw +aH +aI +ag +bi +bl +aE +ac +ac +ac +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (88,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -c -c -c -e -e -c -c -c -c -c -E -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ac +ac +ac +au +az +ac +ac +ac +ac +ac +aE +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (89,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -c -i -i -c -h -h -h -h -t -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ac +aw +ar +ac +ah +ah +ah +ah +at +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (90,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -c -i -i -c -h -s -y -y -F -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ac +ar +aw +ac +ah +as +ay +ay +aF +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (91,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -c -e -e -c -h -t -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ac +az +au +ac +ah +at +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (92,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -a -a -a -a -h -t -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +aa +aa +aa +aa +ah +at +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (93,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -a -a -a -a -a -u -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +aa +aa +aa +aa +aa +aZ +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (94,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +bc +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (95,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (96,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -a -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (97,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -a -a -a -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (98,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (99,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (100,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ad +ad +ad +ad +ad +ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (101,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +an +av +bd +bf +af +ai +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (102,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ax +aB +ae +ae +bg +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (103,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ad +aX +ae +be +be +be +af +ai +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (104,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ad +ad +ad +ad +ad +ad +ad +ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (105,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (106,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (107,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (108,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (109,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (110,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (111,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (112,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (113,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -Y -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aY +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (114,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (115,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (116,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (117,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (118,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (119,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (120,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (121,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (122,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (123,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (124,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (125,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (126,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (127,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (128,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (129,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (130,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (131,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (132,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (133,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (134,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (135,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (136,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (137,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (138,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (139,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (140,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index 97e99eb5100..85fa6982413 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -88,12 +88,27 @@ /area/ship/ert/barracks) "ao" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -188,12 +203,27 @@ "br" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "bt" = ( @@ -227,16 +257,43 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/device/suit_cooling_unit{ + pixel_x = -10; + pixel_y = -10 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = -8; + pixel_y = -8 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = 8; + pixel_y = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "bJ" = ( @@ -401,22 +458,52 @@ "do" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/mask/gas{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "dp" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/assetprotection{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/rig/ert/assetprotection{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, +/obj/item/weapon/rig/ert/assetprotection{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rig/ert/assetprotection{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/rig/ert/assetprotection{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -455,35 +542,75 @@ /area/ship/ert/hangar) "dB" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/suit/armor/swat{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/suit/armor/swat{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/mask/gas/commando, -/obj/item/clothing/mask/gas/commando, -/obj/item/clothing/mask/gas/commando, -/obj/item/clothing/mask/gas/commando, -/obj/item/clothing/mask/gas/commando, +/obj/item/clothing/suit/armor/swat{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/suit/armor/swat{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/suit/armor/swat{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/mask/gas/commando{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas/commando{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/mask/gas/commando, +/obj/item/clothing/mask/gas/commando{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/mask/gas/commando{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas/commando{ + pixel_x = 6; + pixel_y = 6 + }, /obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" + name = "swat helmet"; + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/head/helmet/space/deathsquad{ + name = "swat helmet"; + pixel_x = -2; + pixel_y = -2 }, /obj/item/clothing/head/helmet/space/deathsquad{ name = "swat helmet" }, /obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" + name = "swat helmet"; + pixel_x = 2; + pixel_y = 2 }, /obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" + name = "swat helmet"; + pixel_x = 4; + pixel_y = 4 }, /obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" - }, -/obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" + name = "swat helmet"; + pixel_x = 6; + pixel_y = 6 }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, @@ -505,12 +632,27 @@ /area/shuttle/ert_ship_boat) "dV" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/glasses/thermal{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -548,12 +690,27 @@ /area/ship/ert/dock_port) "ef" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/glasses/night{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 6; + pixel_y = 6 + }, /obj/machinery/firealarm/alarms_hidden{ pixel_y = 26 }, @@ -562,12 +719,27 @@ /area/ship/ert/barracks) "eg" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/glasses/night{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 6; + pixel_y = 6 + }, /obj/machinery/atm{ pixel_y = 26 }, @@ -640,6 +812,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/eng_storage) +"eL" = ( +/mob/living/simple_mob/animal/passive/mimepet, +/turf/simulated/floor/wood, +/area/ship/ert/commander) "eO" = ( /obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/effect/map_helper/airlock/sensor/chamber_sensor, @@ -660,15 +836,27 @@ "eP" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/storage/box/cdeathalarm_kit, -/obj/item/weapon/storage/box/cdeathalarm_kit, +/obj/item/weapon/storage/box/cdeathalarm_kit{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/item/weapon/storage/box/cdeathalarm_kit{ + pixel_x = 1; + pixel_y = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "eX" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/weapon/storage/box/backup_kit, -/obj/item/weapon/storage/box/backup_kit, +/obj/item/weapon/storage/box/backup_kit{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/item/weapon/storage/box/backup_kit{ + pixel_x = 1; + pixel_y = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "ff" = ( @@ -702,7 +890,6 @@ /area/ship/ert/dock_star) "fx" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/sprinter, /obj/machinery/light/no_nightshift{ dir = 8 }, @@ -713,17 +900,38 @@ dir = 4; pixel_x = -23 }, -/obj/item/rig_module/sprinter, -/obj/item/rig_module/rescue_pharm, +/obj/item/rig_module/sprinter{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/rig_module/sprinter{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/rig_module/rescue_pharm{ + pixel_y = -2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "fE" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/mounted, -/obj/item/rig_module/mounted/egun, -/obj/item/rig_module/mounted/egun, -/obj/item/rig_module/mounted/egun, +/obj/item/rig_module/mounted{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/rig_module/mounted/egun{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/rig_module/mounted/egun, +/obj/item/rig_module/mounted/egun{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/rig_module/mounted/egun{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "fP" = ( @@ -740,22 +948,50 @@ /area/ship/ert/mech_bay) "fU" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/device/rcd, -/obj/item/rig_module/device/rcd, -/obj/item/rig_module/device/plasmacutter, -/obj/item/rig_module/device/plasmacutter, +/obj/item/rig_module/device/rcd{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/rig_module/device/rcd{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/rig_module/device/plasmacutter{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/rig_module/device/plasmacutter{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "fZ" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/device/drill, -/obj/item/rig_module/device/drill, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, +/obj/item/rig_module/device/drill{ + pixel_y = -4 + }, +/obj/item/rig_module/device/drill{ + pixel_y = 4 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = -5 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = -2 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 1 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 4 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 7 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "ga" = ( @@ -805,14 +1041,30 @@ /area/ship/ert/atmos) "gx" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/melee/baton, -/obj/item/weapon/melee/baton, -/obj/item/weapon/melee/baton, -/obj/item/weapon/melee/baton, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, +/obj/item/weapon/melee/baton{ + pixel_x = -6 + }, +/obj/item/weapon/melee/baton{ + pixel_x = -2 + }, +/obj/item/weapon/melee/baton{ + pixel_x = 2 + }, +/obj/item/weapon/melee/baton{ + pixel_x = 6 + }, +/obj/item/weapon/shield/riot{ + pixel_x = -6 + }, +/obj/item/weapon/shield/riot{ + pixel_x = -2 + }, +/obj/item/weapon/shield/riot{ + pixel_x = 2 + }, +/obj/item/weapon/shield/riot{ + pixel_x = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/recharger/wallcharger{ pixel_x = -23; @@ -881,8 +1133,14 @@ /area/ship/ert/gunnery) "gX" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/emps, -/obj/item/weapon/storage/box/emps, +/obj/item/weapon/storage/box/emps{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/emps{ + pixel_x = 2; + pixel_y = 2 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) @@ -1038,12 +1296,27 @@ /area/ship/ert/dock_star) "ia" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -1100,9 +1373,15 @@ /turf/simulated/wall/shull, /area/ship/ert/dock_port) "iC" = ( +/obj/item/device/healthanalyzer/advanced{ + pixel_x = 2; + pixel_y = 2 + }, /obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/advanced{ + pixel_x = -2; + pixel_y = -2 + }, /obj/structure/table/rack/steel, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -1182,24 +1461,56 @@ /area/ship/ert/mech_bay) "kf" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = 6 + }, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = 2 + }, /obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = -4 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 10 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 8 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 2 + }, /obj/item/ammo_magazine/m9mml, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -4 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -8 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -10 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -12 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) @@ -1438,18 +1749,48 @@ /area/ship/ert/engine) "mb" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/sunglasses/sechud/tactical, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -1658,8 +1999,12 @@ /area/ship/ert/dock_star) "nb" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/xray, -/obj/item/weapon/gun/energy/xray, +/obj/item/weapon/gun/energy/xray{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/xray{ + pixel_y = 3 + }, /obj/machinery/light/no_nightshift, /obj/machinery/firealarm/alarms_hidden{ dir = 1; @@ -1832,9 +2177,12 @@ /obj/item/weapon/hand_tele, /obj/item/device/perfect_tele, /obj/item/device/binoculars, -/obj/item/device/survivalcapsule, -/obj/item/device/survivalcapsule, -/mob/living/simple_mob/animal/passive/mimepet, +/obj/item/device/survivalcapsule{ + pixel_x = 3 + }, +/obj/item/device/survivalcapsule{ + pixel_x = -3 + }, /turf/simulated/floor/wood, /area/ship/ert/commander) "og" = ( @@ -1943,12 +2291,27 @@ /area/ship/ert/dock_port) "oW" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 6; + pixel_y = 6 + }, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 4; @@ -1962,37 +2325,77 @@ "oX" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/gloves/yellow{ + pixel_y = -3 + }, /obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, +/obj/item/clothing/gloves/yellow{ + pixel_y = 3 + }, +/obj/item/weapon/storage/backpack/ert/engineer{ + pixel_y = -3 + }, /obj/item/weapon/storage/backpack/ert/engineer, +/obj/item/weapon/storage/backpack/ert/engineer{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/engineer{ + pixel_y = -3 + }, /obj/item/clothing/suit/space/void/responseteam/engineer, -/obj/item/clothing/suit/space/void/responseteam/engineer, -/obj/item/clothing/suit/space/void/responseteam/engineer, -/obj/item/clothing/head/helmet/ert/engineer, -/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/suit/space/void/responseteam/engineer{ + pixel_y = 3 + }, +/obj/item/clothing/head/helmet/ert/engineer{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/engineer{ + pixel_y = -3 + }, /obj/item/clothing/suit/armor/vest/ert/engineer, -/obj/item/clothing/suit/armor/vest/ert/engineer, -/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pa" = ( /obj/structure/table/steel_reinforced, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = -4 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = -2 + }, /obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 6 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = -2 + }, /obj/item/clothing/accessory/storage/white_vest, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 6 + }, /obj/machinery/alarm/alarms_hidden{ dir = 1; pixel_y = -26 @@ -2010,20 +2413,36 @@ /area/ship/ert/med_surg) "pd" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = -3 + }, /obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/medical{ + pixel_y = -3 + }, /obj/item/clothing/suit/space/void/responseteam/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, -/obj/machinery/light/no_nightshift, +/obj/item/clothing/suit/space/void/responseteam/medical{ + pixel_y = 3 + }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/head/helmet/ert/medical{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/head/helmet/ert/medical{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/medical{ + pixel_y = -3 + }, /obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical{ + pixel_y = 3 + }, +/obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pf" = ( @@ -2044,19 +2463,35 @@ /area/ship/ert/med) "pn" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = -3 + }, /obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/medical{ + pixel_y = -3 + }, /obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical{ + pixel_y = 3 + }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/head/helmet/ert/medical{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/head/helmet/ert/medical{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/medical{ + pixel_y = -3 + }, /obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "po" = ( @@ -2079,12 +2514,27 @@ /area/ship/ert/med_surg) "pq" = ( /obj/structure/table/steel_reinforced, +/obj/item/bodybag/cryobag{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/bodybag/cryobag{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "pr" = ( @@ -2101,14 +2551,26 @@ /area/ship/ert/gunnery) "pt" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/suit/space/void/responseteam/janitor{ + pixel_y = -2 + }, /obj/item/clothing/suit/space/void/responseteam/janitor, -/obj/item/clothing/suit/space/void/responseteam/janitor, -/obj/item/clothing/suit/space/void/responseteam/janitor, -/obj/item/clothing/suit/space/void/responseteam/janitor, -/obj/item/weapon/storage/belt/janitor, -/obj/item/weapon/storage/belt/janitor, -/obj/item/weapon/storage/belt/janitor, +/obj/item/clothing/suit/space/void/responseteam/janitor{ + pixel_y = 2 + }, +/obj/item/clothing/suit/space/void/responseteam/janitor{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/janitor{ + pixel_y = -2 + }, /obj/item/weapon/storage/belt/janitor, +/obj/item/weapon/storage/belt/janitor{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/janitor{ + pixel_y = 4 + }, /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -2153,35 +2615,79 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, -/obj/item/weapon/mop, -/obj/item/weapon/mop, -/obj/item/weapon/mop, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = -6 + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = -2 + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = 2 + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = 6 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = 6 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = 2 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = -2 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = -6 + }, +/obj/item/weapon/mop{ + pixel_x = 6 + }, +/obj/item/weapon/mop{ + pixel_x = 2 + }, +/obj/item/weapon/mop{ + pixel_x = -2 + }, +/obj/item/weapon/mop{ + pixel_x = -6 + }, /obj/item/weapon/rig/ert/janitor, -/obj/item/device/lightreplacer, -/obj/item/device/lightreplacer, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/device/lightreplacer{ + pixel_y = -2 + }, +/obj/item/device/lightreplacer{ + pixel_y = 2 + }, +/obj/item/weapon/storage/box/lights/mixed{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/item/weapon/storage/box/lights/mixed{ + pixel_x = 1; + pixel_y = 1 + }, /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pI" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = 2 + }, /obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "pK" = ( @@ -2192,8 +2698,14 @@ /area/ship/ert/mech_bay) "pM" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/mounted/taser, -/obj/item/rig_module/mounted/taser, +/obj/item/rig_module/mounted/taser{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/rig_module/mounted/taser{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/rig_module/mounted/taser, /obj/machinery/light/no_nightshift{ dir = 8 @@ -2202,9 +2714,18 @@ dir = 1; pixel_y = -26 }, -/obj/item/rig_module/mounted/taser, -/obj/item/rig_module/mounted/taser, -/obj/item/rig_module/mounted/taser, +/obj/item/rig_module/mounted/taser{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/rig_module/mounted/taser{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/rig_module/mounted/taser{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "pN" = ( @@ -2234,8 +2755,12 @@ /area/ship/ert/atmos) "pW" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/plasmastun, -/obj/item/weapon/gun/energy/plasmastun, +/obj/item/weapon/gun/energy/plasmastun{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/plasmastun{ + pixel_y = 3 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) @@ -2261,18 +2786,36 @@ /area/ship/ert/mech_bay) "qa" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/security{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rig/ert/security{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "qd" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/engineer{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rig/ert/engineer{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "ql" = ( @@ -2288,10 +2831,19 @@ /area/ship/ert/med) "qo" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/medical{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rig/ert/medical{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "qt" = ( @@ -2361,6 +2913,35 @@ }, /turf/simulated/floor/reinforced/airless, /area/ship/ert/eng_storage) +"qJ" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/ammo_magazine/m545{ + pixel_x = -8 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -5 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 1 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 7 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = 2 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) "qP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2487,26 +3068,42 @@ /area/ship/ert/med) "sf" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/machinery/chemical_dispenser/ert, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "so" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = -3 + }, /obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/clothing/suit/space/void/responseteam/security, -/obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/security{ + pixel_y = -3 + }, /obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/clothing/suit/space/void/responseteam/security{ + pixel_y = 3 + }, /obj/machinery/light/no_nightshift, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/head/helmet/ert/security{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/head/helmet/ert/security{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/security{ + pixel_y = -3 + }, /obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "sp" = ( @@ -2575,10 +3172,19 @@ /area/ship/ert/dock_star) "sF" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/glasses/graviton{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/graviton, -/obj/item/clothing/glasses/graviton, -/obj/item/clothing/glasses/graviton, -/obj/item/clothing/glasses/graviton, +/obj/item/clothing/glasses/graviton{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/graviton{ + pixel_x = 4; + pixel_y = 4 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -2594,12 +3200,27 @@ /area/ship/ert/bridge) "sJ" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 6; + pixel_y = 6 + }, /obj/machinery/alarm/alarms_hidden{ dir = 1; pixel_y = -26 @@ -2753,9 +3374,15 @@ /turf/simulated/floor/airless, /area/ship/ert/gunnery) "ug" = ( +/obj/item/device/healthanalyzer/advanced{ + pixel_x = 2; + pixel_y = 2 + }, /obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/advanced{ + pixel_x = -2; + pixel_y = -2 + }, /obj/structure/table/rack/steel, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -2980,12 +3607,22 @@ /area/ship/ert/hallways) "wl" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 2 + }, /obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = -4 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) @@ -3013,13 +3650,22 @@ /area/ship/ert/atmos) "wt" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/bonemed, -/obj/item/weapon/storage/firstaid/clotting, +/obj/item/weapon/storage/firstaid/bonemed{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/clotting{ + pixel_x = 2; + pixel_y = 2 + }, /obj/effect/floor_decal/corner/yellow{ dir = 1 }, /obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/weapon/storage/firstaid/combat{ + pixel_x = -2; + pixel_y = -2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "wO" = ( @@ -3069,12 +3715,22 @@ "xg" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = 2 + }, /obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xh" = ( @@ -3083,37 +3739,85 @@ pixel_y = 23 }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -12 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -10 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -8 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -4 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 2 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 8 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 10 + }, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = 2 + }, /obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = -4 + }, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = -6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xi" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545{ + pixel_x = 7 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 1 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -5 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -8 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = 2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xt" = ( @@ -3137,10 +3841,16 @@ /area/ship/ert/armoury_st) "xv" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/ionrifle/pistol{ + pixel_y = 4 + }, /obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/weapon/gun/energy/ionrifle{ + pixel_y = -4 + }, +/obj/item/weapon/gun/energy/ionrifle{ + pixel_y = -8 + }, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 4; @@ -3162,31 +3872,75 @@ /obj/structure/closet/medical_wall{ pixel_x = 32 }, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/fire{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/storage/firstaid/fire{ + pixel_x = 2; + pixel_y = 2 + }, /obj/item/weapon/storage/firstaid/o2, /obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/toxin{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/firstaid/toxin{ + pixel_x = -2; + pixel_y = -2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "xA" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "xC" = ( -/obj/machinery/portable_atmospherics/powered/scrubber, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/table/steel_reinforced, +/obj/item/weapon/rcd/advanced/loaded{ + desc = "A device used to rapidly build and deconstruct. This version works faster, and has a much larger capacity than a standard model, but doesn't work at range. Reload with compressed matter cartridges."; + name = "emergency rapid construction device"; + pixel_y = 3; + ranged = 0 + }, +/obj/item/weapon/rcd/advanced/loaded{ + desc = "A device used to rapidly build and deconstruct. This version works faster, and has a much larger capacity than a standard model, but doesn't work at range. Reload with compressed matter cartridges."; + name = "emergency rapid construction device"; + pixel_y = -3; + ranged = 0 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "xG" = ( @@ -3228,8 +3982,12 @@ /area/ship/ert/med_surg) "xZ" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/launcher/grenade, -/obj/item/weapon/gun/launcher/grenade, +/obj/item/weapon/gun/launcher/grenade{ + pixel_y = 3 + }, +/obj/item/weapon/gun/launcher/grenade{ + pixel_y = -3 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) @@ -3300,15 +4058,18 @@ "yp" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/firstaid/fire{ - pixel_x = 2; - pixel_y = 2 + pixel_x = 4; + pixel_y = 4 }, /obj/item/weapon/storage/firstaid/fire{ pixel_x = 2; pixel_y = 2 }, /obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = -2; + pixel_y = -2 + }, /obj/effect/floor_decal/corner/yellow{ dir = 8 }, @@ -3374,8 +4135,8 @@ "yJ" = ( /obj/structure/table/steel_reinforced, /obj/machinery/chemical_dispenser/biochemistry/full, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/machinery/light/no_nightshift, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "yR" = ( @@ -3646,6 +4407,7 @@ "AL" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/box/pillbottles, +/obj/item/weapon/storage/box/pillbottles, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "AS" = ( @@ -3736,8 +4498,12 @@ /area/ship/ert/barracks) "Bp" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = -3 + }, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, @@ -3777,6 +4543,10 @@ "Br" = ( /turf/simulated/floor/tiled/techmaint, /area/ship/ert/eng_storage) +"Bx" = ( +/obj/structure/bed/chair/bay/chair/padded/blue, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) "BE" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -4100,23 +4870,35 @@ /area/ship/ert/hallways_aft) "Ec" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = -3 + }, /obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/security{ + pixel_y = -3 + }, /obj/item/clothing/suit/space/void/responseteam/security, -/obj/item/clothing/suit/space/void/responseteam/security, -/obj/item/clothing/suit/space/void/responseteam/security, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; - pixel_y = -26 +/obj/item/clothing/suit/space/void/responseteam/security{ + pixel_y = 3 }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/head/helmet/ert/security{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/head/helmet/ert/security{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/security{ + pixel_y = -3 + }, /obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "Ed" = ( @@ -4285,8 +5067,14 @@ /area/ship/ert/engineering) "Fq" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/frags, +/obj/item/weapon/storage/box/frags{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/frags{ + pixel_x = 2; + pixel_y = 2 + }, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 4; @@ -4412,36 +5200,134 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2 + }, /obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_st) "FY" = ( @@ -4462,10 +5348,25 @@ /area/ship/ert/armoury_st) "Gl" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/heavysniper, -/obj/item/weapon/storage/box/sniperammo, -/obj/item/weapon/storage/box/sniperammo, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = -3 + }, +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = 3 + }, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Gr" = ( @@ -4615,10 +5516,18 @@ /area/shuttle/ert_ship_boat) "HB" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/lasershotgun, -/obj/item/weapon/gun/energy/lasershotgun, +/obj/item/weapon/gun/energy/gun/burst{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/gun/burst{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/lasershotgun{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/lasershotgun{ + pixel_y = 3 + }, /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/recharger/wallcharger{ pixel_x = -23; @@ -4817,6 +5726,7 @@ "IF" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline, +/obj/item/weapon/hand_labeler, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "IK" = ( @@ -4876,15 +5786,18 @@ "Jc" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/firstaid/toxin{ - pixel_x = 2; - pixel_y = 2 + pixel_x = 4; + pixel_y = 4 }, /obj/item/weapon/storage/firstaid/toxin{ pixel_x = 2; pixel_y = 2 }, /obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/storage/firstaid/o2{ + pixel_x = -2; + pixel_y = -2 + }, /obj/machinery/light/no_nightshift{ dir = 1 }, @@ -4952,8 +5865,14 @@ /area/ship/ert/hallways) "Jw" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/weapon/storage/box/handcuffs{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/handcuffs{ + pixel_x = 2; + pixel_y = 2 + }, /obj/effect/floor_decal/corner/red{ dir = 4 }, @@ -5049,26 +5968,15 @@ /area/ship/ert/engine) "JZ" = ( /obj/structure/table/rack/steel, -/obj/machinery/light/no_nightshift, +/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/weapon/storage/box/sniperammo, +/obj/item/weapon/storage/box/sniperammo, +/obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/alarm/alarms_hidden{ dir = 1; pixel_y = -26 }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, +/obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Kb" = ( @@ -5164,25 +6072,37 @@ /area/ship/ert/eng_storage) "KG" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/weapon/storage/toolbox/electrical{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/weapon/storage/toolbox/electrical{ + pixel_x = -4; + pixel_y = 6 }, /obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 + pixel_x = 4; + pixel_y = -6 }, /obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 + pixel_x = 4; + pixel_y = -2 }, /obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/weapon/storage/briefcase/inflatable{ + pixel_x = 4; + pixel_y = 6 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, @@ -5265,10 +6185,22 @@ /area/ship/ert/bridge) "Lg" = ( /obj/structure/table/rack/steel, -/obj/item/taperoll/engineering, -/obj/item/taperoll/engineering, -/obj/item/taperoll/engineering, -/obj/item/taperoll/engineering, +/obj/item/taperoll/engineering{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/taperoll/engineering{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/taperoll/engineering{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/taperoll/engineering{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) @@ -5288,12 +6220,24 @@ /area/ship/ert/med) "Lk" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -7 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -4 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -1 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 2 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 5 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 8 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways) @@ -5304,18 +6248,26 @@ "Lq" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = 2 + }, /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "LA" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunammo/large, @@ -5326,6 +6278,12 @@ /obj/item/weapon/storage/box/beanbags/large, /obj/item/weapon/storage/box/stunshells/large, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = -3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "LB" = ( @@ -5350,13 +6308,23 @@ /obj/machinery/firealarm/alarms_hidden{ pixel_y = 26 }, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 4 + }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 2 + }, /obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/energy/laser{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/laser{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "LH" = ( @@ -5410,17 +6378,23 @@ /area/ship/ert/med_surg) "Md" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, +/obj/item/weapon/gun/energy/taser{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/taser{ + pixel_y = 1 + }, +/obj/item/weapon/gun/energy/taser{ + pixel_y = -1 + }, +/obj/item/weapon/gun/energy/taser{ + pixel_y = -3 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "Me" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/as24, -/obj/item/weapon/gun/projectile/automatic/as24, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunammo/large, @@ -5431,6 +6405,12 @@ /obj/item/weapon/storage/box/beanbags/large, /obj/item/weapon/storage/box/stunshells/large, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/automatic/as24{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/automatic/as24{ + pixel_y = -3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Mm" = ( @@ -5441,10 +6421,13 @@ /area/ship/ert/teleporter) "Mt" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/netgun, +/obj/item/weapon/gun/energy/netgun{ + pixel_y = -4 + }, /obj/effect/floor_decal/industrial/outline/grey, /obj/item/weapon/gun/energy/sniperrifle{ - battery_lock = 0 + battery_lock = 0; + pixel_y = 6 }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) @@ -5537,18 +6520,38 @@ /area/shuttle/ert_ship_boat) "MX" = ( /obj/structure/table/steel_reinforced, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = -2 + }, /obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 6 + }, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = -4 + }, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = -2 + }, /obj/item/weapon/storage/belt/utility/chief/full, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "MZ" = ( @@ -5915,10 +6918,12 @@ "OO" = ( /obj/structure/table/rack/steel, /obj/item/weapon/gun/energy/sniperrifle{ - battery_lock = 0 + battery_lock = 0; + pixel_y = -3 }, /obj/item/weapon/gun/energy/sniperrifle{ - battery_lock = 0 + battery_lock = 0; + pixel_y = 3 }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, @@ -6010,21 +7015,41 @@ /area/space) "OZ" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, -/obj/item/weapon/soap, -/obj/item/weapon/soap, -/obj/item/weapon/soap, -/obj/item/weapon/towel{ - color = "#0000FF" +/obj/item/weapon/soap{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/soap{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/soap{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/soap{ + pixel_x = 6; + pixel_y = 6 }, /obj/item/weapon/towel{ - color = "#0000FF" + color = "#0000FF"; + pixel_x = -6; + pixel_y = -6 }, /obj/item/weapon/towel{ - color = "#0000FF" + color = "#0000FF"; + pixel_x = -2; + pixel_y = -2 }, /obj/item/weapon/towel{ - color = "#0000FF" + color = "#0000FF"; + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/towel{ + color = "#0000FF"; + pixel_x = 6; + pixel_y = 6 }, /obj/effect/floor_decal/corner/white, /obj/machinery/light/no_nightshift{ @@ -6201,8 +7226,12 @@ /obj/structure/table/steel_reinforced, /obj/item/weapon/smes_coil, /obj/item/weapon/smes_coil, -/obj/item/device/t_scanner/advanced, -/obj/item/device/t_scanner/advanced, +/obj/item/device/t_scanner/advanced{ + pixel_x = -3 + }, +/obj/item/device/t_scanner/advanced{ + pixel_x = 3 + }, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; name = "VB APC - South"; @@ -6443,44 +7472,101 @@ /area/ship/ert/barracks) "St" = ( /obj/structure/table/rack/steel, +/obj/item/device/flash{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/flash{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/device/flash{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/flash{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/device/flash{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways) "Sx" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 12 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 10 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 8 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 2 + }, /obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -4 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -8 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -10 + }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = -6 + }, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = 2 + }, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Sy" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/l6_saw, -/obj/item/weapon/gun/projectile/automatic/l6_saw, -/obj/item/ammo_magazine/m545saw, -/obj/item/ammo_magazine/m545saw, -/obj/item/ammo_magazine/m545saw, -/obj/item/ammo_magazine/m545saw, +/obj/item/weapon/gun/projectile/automatic/l6_saw{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/automatic/l6_saw{ + pixel_y = -3 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = 2 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = -6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) @@ -6513,9 +7599,13 @@ /area/ship/ert/med_surg) "SD" = ( /obj/structure/table/rack, +/obj/item/ammo_magazine/m44{ + pixel_x = -3 + }, +/obj/item/ammo_magazine/m44{ + pixel_x = 3 + }, /obj/item/weapon/gun/projectile/deagle, -/obj/item/ammo_magazine/m44, -/obj/item/ammo_magazine/m44, /turf/simulated/floor/wood, /area/ship/ert/commander) "SE" = ( @@ -6547,9 +7637,37 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "SI" = ( -/obj/machinery/portable_atmospherics/powered/scrubber, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/table/steel_reinforced, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -8; + pixel_y = -8 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/rcd_ammo/large, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "SJ" = ( @@ -6569,16 +7687,26 @@ /area/ship/ert/gunnery) "SV" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = 6 + }, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = 3 + }, /obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -3 + }, /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, /obj/effect/floor_decal/industrial/outline, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -6 + }, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "SZ" = ( @@ -6842,12 +7970,27 @@ "VQ" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/corner/red, +/obj/item/device/radio/off{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/radio/off{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/device/radio/off{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/radio/off{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/device/radio/off{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways) @@ -6876,8 +8019,12 @@ /obj/machinery/light/no_nightshift{ dir = 1 }, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/device/defib_kit/compact/combat/loaded, +/obj/item/device/defib_kit/compact/combat/loaded{ + pixel_y = -3 + }, +/obj/item/device/defib_kit/compact/combat/loaded{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "Wq" = ( @@ -15080,7 +16227,7 @@ iB Na JB Wa -Iv +eL zT Ez IK @@ -18346,7 +19493,7 @@ ip mV pa tH -xi +qJ BU GK FR @@ -18362,7 +19509,7 @@ SV DJ QT jn -Pq +Bx sf kx TU diff --git a/maps/submaps/admin_use_vr/guttersite.dm b/maps/submaps/admin_use_vr/guttersite.dm index 23c54af9801..3d99c8ef0b6 100644 --- a/maps/submaps/admin_use_vr/guttersite.dm +++ b/maps/submaps/admin_use_vr/guttersite.dm @@ -47,7 +47,6 @@ icon_state = "debrisexplored" forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg') -//TFF 26/12/19 - Sub-areas for the APCs. /area/tether_away/guttersite/engines name = "Gutter - Gutter Engineering" diff --git a/maps/submaps/admin_use_vr/kk_mercship.dmm b/maps/submaps/admin_use_vr/kk_mercship.dmm index a5a215cf4af..362023e72c4 100644 --- a/maps/submaps/admin_use_vr/kk_mercship.dmm +++ b/maps/submaps/admin_use_vr/kk_mercship.dmm @@ -186,25 +186,135 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "aS" = ( -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /obj/structure/table/steel_reinforced, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2 + }, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "aU" = ( @@ -241,17 +351,21 @@ /area/ship/manta/armoury_st) "aZ" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, +/obj/item/weapon/gun/energy/sizegun{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/sizegun{ + pixel_y = 2 + }, +/obj/item/weapon/gun/energy/sizegun{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/sizegun{ + pixel_y = -6 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "bc" = ( @@ -459,10 +573,22 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, +/obj/item/device/binoculars{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/device/binoculars{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/device/binoculars{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/binoculars{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "bL" = ( @@ -476,12 +602,27 @@ /obj/machinery/light_switch{ pixel_y = 23 }, +/obj/item/clothing/glasses/thermal{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "bP" = ( @@ -578,16 +719,24 @@ /turf/space, /area/space) "cn" = ( -/obj/structure/table/rack, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/machinery/recharger/wallcharger{ - pixel_x = 5; - pixel_y = -32 +/obj/structure/table/rack/steel, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -7 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -4 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -1 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 2 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 5 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 8 }, /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, @@ -617,11 +766,23 @@ /area/ship/manta/med) "ct" = ( /obj/structure/table/rack, +/obj/item/device/radio{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/radio{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/device/radio{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/radio{ + pixel_x = 4; + pixel_y = 4 + }, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 @@ -691,12 +852,22 @@ /area/ship/manta/holding) "cP" = ( /obj/structure/table/rack, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = -4 + }, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = -2 + }, /obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -714,17 +885,35 @@ /area/ship/manta/armoury_st) "cQ" = ( /obj/structure/table/rack, +/obj/item/weapon/tool/crowbar/red{ + pixel_x = -4 + }, +/obj/item/weapon/tool/crowbar/red{ + pixel_x = 2 + }, /obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/weapon/tool/crowbar/red{ + pixel_x = 2 + }, +/obj/item/weapon/tool/crowbar/red{ + pixel_x = 4 + }, +/obj/item/device/flashlight/maglight{ + pixel_y = 6 + }, +/obj/item/device/flashlight/maglight{ + pixel_y = 4 + }, +/obj/item/device/flashlight/maglight{ + pixel_y = 2 + }, /obj/item/device/flashlight/maglight, +/obj/item/device/flashlight/maglight{ + pixel_y = -2 + }, +/obj/item/device/flashlight/maglight{ + pixel_y = -4 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -898,6 +1087,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) +"dM" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, +/obj/item/mecha_parts/mecha_equipment/runningboard/limited, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/mech_bay) "dO" = ( /obj/machinery/shipsensors{ dir = 1 @@ -1020,10 +1218,10 @@ "ep" = ( /obj/machinery/chemical_dispenser/full, /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "er" = ( @@ -1049,22 +1247,22 @@ "eB" = ( /obj/machinery/chemical_dispenser/ert, /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/effect/floor_decal/techfloor{ dir = 1 }, /obj/machinery/light/no_nightshift{ dir = 1 }, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "eF" = ( /obj/machinery/chemical_dispenser/biochemistry/full, /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/effect/floor_decal/techfloor{ dir = 5 }, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "eG" = ( @@ -1383,6 +1581,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) +"gu" = ( +/obj/effect/floor_decal/techfloor, +/obj/structure/table/steel_reinforced, +/obj/item/weapon/storage/belt/utility/full, +/obj/item/device/multitool, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/engineering) "gB" = ( /obj/effect/floor_decal/techfloor, /obj/structure/cable/orange{ @@ -1702,7 +1907,9 @@ /area/ship/manta/hallways_aft) "hU" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/weapon/gun/projectile/automatic/c20r{ + pixel_y = 4 + }, /obj/item/weapon/gun/projectile/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, @@ -1714,7 +1921,9 @@ /obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/weapon/gun/projectile/automatic/c20r{ + pixel_y = -4 + }, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /turf/simulated/floor/tiled/techfloor, @@ -1770,8 +1979,12 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/obj/item/weapon/gun/projectile/sec/wood, -/obj/item/weapon/gun/projectile/sec/wood, +/obj/item/weapon/gun/projectile/sec/wood{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/sec/wood{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "ik" = ( @@ -2409,7 +2622,6 @@ /turf/simulated/floor/plating, /area/ship/manta/hallways_port) "kT" = ( -/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, /turf/simulated/floor/plating, /area/ship/manta/hallways_port) "kW" = ( @@ -2484,7 +2696,9 @@ /area/ship/manta/hallways_aft) "lj" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/weapon/gun/projectile/automatic/c20r{ + pixel_y = 4 + }, /obj/item/weapon/gun/projectile/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, @@ -2493,7 +2707,9 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/weapon/gun/projectile/automatic/c20r{ + pixel_y = -4 + }, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /turf/simulated/floor/tiled/techfloor, @@ -2506,8 +2722,12 @@ dir = 4 }, /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = -3 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = 3 + }, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, @@ -2752,14 +2972,13 @@ /area/ship/manta/hallways_aft) "mp" = ( /obj/structure/table/rack, -/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/mortar, /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/item/mecha_parts/mecha_equipment/cloak, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "ms" = ( @@ -3174,6 +3393,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) +"ou" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/mech_bay) "ov" = ( /obj/machinery/power/apc/hyper{ alarms_hidden = 1; @@ -3202,46 +3429,47 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/tool/passenger{ + pixel_x = -4 + }, +/obj/item/mecha_parts/mecha_equipment/tool/passenger{ + pixel_x = 4 + }, +/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "oD" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/laser{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "oE" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/structure/table/rack, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = 3 }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 10 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 9 +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = -3 }, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545/ap, /turf/simulated/floor/tiled/techfloor, -/area/ship/manta/engineering) +/area/ship/manta/armoury_st) "oF" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -3271,8 +3499,12 @@ dir = 8; pixel_x = 26 }, -/obj/item/weapon/gun/projectile/sec/wood, -/obj/item/weapon/gun/projectile/sec/wood, +/obj/item/weapon/gun/projectile/sec/wood{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/sec/wood{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "oP" = ( @@ -3301,11 +3533,14 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "oT" = ( -/obj/mecha/combat/gygax/dark, -/obj/machinery/mech_recharger, /obj/effect/floor_decal/techfloor{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/mech_recharger, +/obj/mecha/combat/gygax/dark{ + desc = "A lightweight combat exosuit, based off the standard Gygax chassis but no doubt thoroughly customized and upgraded." + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "oU" = ( @@ -3371,6 +3606,13 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang{ + pixel_y = 4 + }, +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/concussion{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "py" = ( @@ -3402,8 +3644,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "pE" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/binary/pump/on{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/manta/atmos) "pH" = ( @@ -3452,13 +3695,7 @@ /turf/simulated/floor/plating, /area/ship/manta/atmos) "pW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/catwalk, +/obj/machinery/atmospherics/binary/pump/on, /turf/simulated/floor/plating, /area/ship/manta/atmos) "pX" = ( @@ -3714,12 +3951,13 @@ /obj/effect/floor_decal/techfloor{ dir = 10 }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "ry" = ( /obj/structure/table/rack, /obj/item/mecha_parts/mecha_equipment/tool/jetpack, -/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray, /obj/effect/floor_decal/techfloor{ dir = 6 }, @@ -3768,9 +4006,6 @@ /turf/simulated/floor/tiled/white, /area/ship/manta/med) "rH" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -4141,6 +4376,7 @@ /obj/effect/floor_decal/techfloor{ dir = 10 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "tN" = ( @@ -4405,6 +4641,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "uV" = ( @@ -4521,6 +4758,10 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/grille, /obj/structure/window/titanium/full, +/obj/structure/window/titanium, +/obj/structure/window/titanium{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "vH" = ( @@ -4802,11 +5043,21 @@ /area/ship/manta/engineering) "ww" = ( /obj/structure/table/rack, +/obj/item/weapon/storage/firstaid/combat{ + pixel_x = -4; + pixel_y = -4 + }, /obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/weapon/storage/firstaid/combat{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = 3 + }, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -5064,7 +5315,6 @@ /turf/simulated/floor/plating, /area/ship/manta/dock_star) "xE" = ( -/obj/structure/catwalk, /obj/machinery/light_switch{ pixel_y = 23 }, @@ -5155,26 +5405,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "xQ" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/glass_engineeringatmos{ - req_one_access = list(150) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, +/obj/structure/catwalk, +/obj/structure/railing, +/turf/simulated/floor/plating, /area/ship/manta/atmos) "xT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, @@ -5186,6 +5419,10 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/grille, /obj/structure/window/titanium/full, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium, /turf/simulated/floor/plating, /area/ship/manta/engine) "xW" = ( @@ -5230,8 +5467,26 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "yh" = ( -/obj/structure/railing, -/turf/simulated/floor/plating, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass_engineeringatmos{ + req_one_access = list(150) + }, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, /area/ship/manta/atmos) "yj" = ( /obj/machinery/power/port_gen/pacman/super/potato, @@ -5371,6 +5626,7 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "yy" = ( @@ -5419,6 +5675,7 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "yO" = ( @@ -5482,12 +5739,14 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "yW" = ( -/obj/structure/railing{ +/obj/structure/railing, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/catwalk, -/obj/structure/railing, /turf/simulated/floor/plating, /area/ship/manta/atmos) "yY" = ( @@ -5601,12 +5860,12 @@ dir = 4; pixel_x = -23 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/gun/energy/netgun, +/obj/item/weapon/gun/energy/netgun{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/netgun{ + pixel_y = 3 + }, /obj/item/weapon/gun/energy/plasmastun, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) @@ -5623,22 +5882,42 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "zy" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = 2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -5706,7 +5985,7 @@ /turf/simulated/floor/plating, /area/ship/manta/engine) "zR" = ( -/turf/simulated/wall/shull, +/turf/simulated/wall/rshull, /area/ship/manta/engineering) "zS" = ( /obj/structure/bed/chair/comfy/black{ @@ -5766,6 +6045,11 @@ }, /turf/simulated/floor/reinforced/airless, /area/ship/manta/gunnery) +"Ah" = ( +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/plating, +/area/ship/manta/atmos) "Aj" = ( /obj/effect/floor_decal/techfloor, /obj/structure/cable/orange{ @@ -6010,6 +6294,9 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, +/obj/structure/table/steel_reinforced, +/obj/item/clothing/suit/space/void/refurb/engineering, +/obj/item/clothing/head/helmet/space/void/refurb/engineering, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "BN" = ( @@ -6178,8 +6465,12 @@ /area/ship/manta/recreation) "CT" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/plasmastun, -/obj/item/weapon/gun/energy/plasmastun, +/obj/item/weapon/gun/energy/plasmastun{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/plasmastun{ + pixel_y = 3 + }, /obj/effect/floor_decal/techfloor{ dir = 10 }, @@ -6194,6 +6485,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) +"Da" = ( +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/plating, +/area/ship/manta/atmos) "Db" = ( /obj/structure/table/standard, /obj/item/device/radio/headset/syndicate, @@ -6248,8 +6544,14 @@ /area/ship/manta/dock_port) "Dg" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/frags, +/obj/item/weapon/storage/box/frags{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/frags{ + pixel_x = 2; + pixel_y = 2 + }, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -6361,10 +6663,22 @@ /area/ship/manta/bridge) "Dy" = ( /obj/structure/table/steel_reinforced, -/obj/item/clothing/suit/storage/vest/heavy/merc, -/obj/item/clothing/suit/storage/vest/heavy/merc, -/obj/item/clothing/suit/storage/vest/heavy/merc, -/obj/item/clothing/suit/storage/vest/heavy/merc, +/obj/item/clothing/suit/storage/vest/heavy/merc{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/suit/storage/vest/heavy/merc{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/suit/storage/vest/heavy/merc{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/suit/storage/vest/heavy/merc{ + pixel_x = -6; + pixel_y = -6 + }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -6387,10 +6701,6 @@ dir = 4; pixel_x = 26 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "DB" = ( @@ -6580,14 +6890,38 @@ /area/ship/manta/hallways_aft) "EE" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie, -/obj/item/weapon/storage/backpack/dufflebag/syndie, -/obj/item/weapon/storage/backpack/dufflebag/syndie, -/obj/item/weapon/storage/backpack/dufflebag/syndie, +/obj/item/weapon/storage/backpack/dufflebag/syndie/med{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie/med{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie{ + pixel_x = -4; + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -6732,9 +7066,15 @@ "Fx" = ( /obj/structure/table/rack, /obj/item/weapon/gun/launcher/rocket, -/obj/item/ammo_casing/rocket, -/obj/item/ammo_casing/rocket, -/obj/item/ammo_casing/rocket, +/obj/item/ammo_casing/rocket{ + pixel_y = -3 + }, +/obj/item/ammo_casing/rocket{ + pixel_y = -6 + }, +/obj/item/ammo_casing/rocket{ + pixel_y = -9 + }, /obj/effect/floor_decal/techfloor{ dir = 6 }, @@ -6875,8 +7215,11 @@ /turf/simulated/floor/wood, /area/ship/manta/barracks) "Gr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -6976,15 +7319,22 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 }, /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "GY" = ( @@ -7104,12 +7454,28 @@ /area/ship/manta/bridge) "HS" = ( /obj/structure/table/rack, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = -6; + pixel_y = -4 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = -6 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = 6 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = 6; + pixel_y = 4 + }, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 @@ -7212,8 +7578,12 @@ /area/ship/manta/teleporter) "Iq" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/xray, -/obj/item/weapon/gun/energy/xray, +/obj/item/weapon/gun/energy/xray{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/xray{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -7274,13 +7644,15 @@ /area/ship/manta/engine) "IJ" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "IK" = ( @@ -7333,8 +7705,6 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "Jd" = ( @@ -7444,10 +7814,22 @@ /area/ship/manta/bridge) "Jt" = ( /obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -7656,21 +8038,21 @@ /area/ship/manta/dock_star) "KA" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/under/saare, -/obj/item/clothing/under/saare, -/obj/item/clothing/under/saare, -/obj/item/clothing/under/saare, -/obj/item/clothing/accessory/armor/helmcover/saare, -/obj/item/clothing/accessory/armor/helmcover/saare, -/obj/item/clothing/accessory/armor/helmcover/saare, -/obj/item/clothing/accessory/armor/helmcover/saare, -/obj/item/clothing/accessory/storage/pouches/large/green, -/obj/item/clothing/accessory/storage/pouches/large/green, -/obj/item/clothing/accessory/storage/pouches/large/green, -/obj/item/clothing/accessory/storage/pouches/large/green, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/item/clothing/under/saare/service, +/obj/item/clothing/under/saare/service, +/obj/item/clothing/under/saare/service, +/obj/item/clothing/under/saare/service, +/obj/item/clothing/accessory/armor/helmcover/saare, +/obj/item/clothing/accessory/armor/helmcover/saare, +/obj/item/clothing/accessory/armor/helmcover/saare, +/obj/item/clothing/accessory/armor/helmcover/saare, +/obj/item/clothing/accessory/storage/pouches/large/green, +/obj/item/clothing/accessory/storage/pouches/large/green, +/obj/item/clothing/accessory/storage/pouches/large/green, +/obj/item/clothing/accessory/storage/pouches/large/green, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "KE" = ( @@ -7801,6 +8183,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Le" = ( @@ -7872,13 +8255,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "LH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/catwalk, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/ship/manta/atmos) "LI" = ( @@ -7917,6 +8294,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, +/obj/machinery/meter, /turf/simulated/floor/plating, /area/ship/manta/atmos) "LT" = ( @@ -7998,10 +8376,13 @@ /area/ship/manta/hallways_aft) "Mg" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall/shull, +/turf/simulated/wall/rshull, /area/ship/manta/engineering) "Mh" = ( /obj/effect/floor_decal/techfloor, +/obj/structure/table/steel_reinforced, +/obj/item/clothing/gloves/yellow, +/obj/item/clothing/glasses/meson/aviator, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "Mk" = ( @@ -8089,6 +8470,11 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) +"Mz" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/turf/simulated/floor/plating, +/area/ship/manta/atmos) "ME" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -8152,35 +8538,64 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Nb" = ( /obj/structure/table/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = -7 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = -1 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = 8 + }, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 }, /obj/effect/floor_decal/techfloor, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = -7 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = -1 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "Nc" = ( /obj/structure/table/rack, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunammo/large, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = -4 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -8224,8 +8639,12 @@ /area/ship/manta/barracks) "Nq" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/sniperrifle, -/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/weapon/gun/energy/sniperrifle{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/sniperrifle{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -8266,16 +8685,18 @@ /area/ship/manta/dock_port) "Ny" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 10 }, /obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NA" = ( @@ -8302,16 +8723,26 @@ /obj/machinery/light/no_nightshift{ dir = 4 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NH" = ( /obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 10 }, @@ -8363,9 +8794,18 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NV" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 23 +/obj/structure/railing, +/obj/structure/catwalk, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plating, /area/ship/manta/atmos) @@ -8515,7 +8955,7 @@ /area/ship/manta/holding) "OO" = ( /obj/structure/sign/warning/radioactive, -/turf/simulated/wall/shull, +/turf/simulated/wall/rshull, /area/ship/manta/engineering) "OQ" = ( /obj/machinery/recharge_station, @@ -8971,8 +9411,12 @@ /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm, -/obj/item/weapon/gun/projectile/luger, -/obj/item/weapon/gun/projectile/luger/brown, +/obj/item/weapon/gun/projectile/luger{ + pixel_y = 6 + }, +/obj/item/weapon/gun/projectile/luger/brown{ + pixel_y = -6 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -9051,8 +9495,12 @@ /area/ship/manta/holding) "RM" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/lasercannon, -/obj/item/weapon/gun/energy/lasercannon, +/obj/item/weapon/gun/energy/lasercannon{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/lasercannon{ + pixel_y = -3 + }, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon, @@ -9111,14 +9559,35 @@ dir = 1; pixel_y = -23 }, +/obj/item/clothing/mask/gas/half{ + pixel_x = -8; + pixel_y = -8 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "RY" = ( @@ -9148,6 +9617,10 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/grille, /obj/structure/window/titanium/full, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium, /turf/simulated/floor/plating, /area/ship/manta/engine) "Sb" = ( @@ -9197,9 +9670,10 @@ /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, -/obj/structure/catwalk, /obj/structure/railing, -/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor/plating, /area/ship/manta/magazine) "Sq" = ( @@ -9502,6 +9976,12 @@ }, /turf/simulated/floor/wood, /area/ship/manta/barracks/bed_2) +"TD" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/plating, +/area/ship/manta/atmos) "TH" = ( /obj/structure/ship_munition/disperser_charge/emp, /obj/structure/railing{ @@ -9515,12 +9995,28 @@ /area/ship/manta/hallways_port) "TM" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = -4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = 4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = 4; + pixel_y = 4 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -9813,8 +10309,12 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/gun/energy/darkmatter, -/obj/item/weapon/gun/energy/darkmatter, +/obj/item/weapon/gun/energy/darkmatter{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/darkmatter{ + pixel_y = -3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_as) "Vk" = ( @@ -9836,10 +10336,18 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, +/obj/item/weapon/gun/projectile/automatic/bullpup{ + pixel_y = 6 + }, +/obj/item/weapon/gun/projectile/automatic/bullpup{ + pixel_y = 2 + }, +/obj/item/weapon/gun/projectile/automatic/bullpup{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/bullpup{ + pixel_y = -6 + }, /obj/item/ammo_magazine/m762m, /obj/item/ammo_magazine/m762m, /obj/item/ammo_magazine/m762m, @@ -9880,12 +10388,22 @@ /area/ship/manta/engineering) "VA" = ( /obj/structure/table/rack, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = 6 + }, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = 4 + }, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = 2 + }, /obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = -2 + }, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = -4 + }, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -9911,17 +10429,41 @@ /area/ship/manta/bridge) "VF" = ( /obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, +/obj/item/weapon/shield/energy{ + pixel_x = -8; + pixel_y = 8 + }, +/obj/item/weapon/shield/energy{ + pixel_x = -8 + }, +/obj/item/weapon/shield/energy{ + pixel_y = 8 + }, +/obj/item/weapon/shield/energy{ + pixel_x = 8 + }, +/obj/item/weapon/shield/energy{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 18 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 15 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 12 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 9 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 6 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 3 + }, /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -9960,6 +10502,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/item/weapon/storage/firstaid/fire, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "VM" = ( @@ -10021,6 +10564,7 @@ /area/ship/manta/armoury_st) "Wi" = ( /obj/machinery/light/small, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/ship/manta/atmos) "Wn" = ( @@ -10213,19 +10757,16 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "Xp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 23 }, +/obj/structure/catwalk, /obj/structure/cable/orange{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/railing, -/obj/structure/catwalk, /turf/simulated/floor/plating, /area/ship/manta/atmos) "Xq" = ( @@ -10279,13 +10820,6 @@ /area/ship/manta/barracks) "XB" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 @@ -10296,6 +10830,14 @@ /obj/machinery/light/no_nightshift{ dir = 4 }, +/obj/item/weapon/storage/box/flare{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/flare{ + pixel_x = 2; + pixel_y = 2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "XC" = ( @@ -10506,6 +11048,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "YA" = ( @@ -10672,7 +11215,6 @@ /area/ship/manta/holding) "Zn" = ( /obj/structure/table/rack, -/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag, /obj/effect/floor_decal/techfloor{ dir = 10 @@ -18580,7 +19122,7 @@ Aw zo lm mp -Oq +ou rs PW PW @@ -18724,7 +19266,7 @@ lm RS JL ZS -Oq +dM zr PW PW @@ -19125,7 +19667,7 @@ ZT ih lo oO -lo +oE by wp zx @@ -19861,11 +20403,11 @@ AC ZU VG VG +qM +qM +xQ SI -yh -SI -SI -SI +LH ZU Va vB @@ -20149,7 +20691,7 @@ qM qM rK SI -SI +Da ZU UH vM @@ -20287,11 +20829,11 @@ VP ZU AA Dn -BU pW +BU Gr SI -SI +Mz ZU Oi vO @@ -20430,10 +20972,10 @@ ZU bw Qb qM -LH +qM yW HD -Wi +TD ZU Ni RK @@ -20575,7 +21117,7 @@ pV Xp NV SI -SI +Ah ZU Ni LU @@ -20714,8 +21256,8 @@ ZU ZU ZU ZU -xQ ZU +yh ZU ZU ZU @@ -20856,7 +21398,7 @@ WN Xa LM LM -oE +LM GS UR xp @@ -21853,7 +22395,7 @@ qw Vz wM Gk -Mh +gu Mg Va vK diff --git a/maps/submaps/pois_vr/aerostat/virgo2.dm b/maps/submaps/pois_vr/aerostat/virgo2.dm index 0a1ae17b40e..d2122ca2a8a 100644 --- a/maps/submaps/pois_vr/aerostat/virgo2.dm +++ b/maps/submaps/pois_vr/aerostat/virgo2.dm @@ -9,7 +9,7 @@ #include "Mudpit.dmm" #include "Snowrock1.dmm" #include "Boombase.dmm" -#include "Blackshuttledown.dmm" +//include "Blackshuttledown.dmm" #include "Lab1.dmm" #include "Rocky4.dmm" #include "DJOutpost1.dmm" @@ -18,7 +18,7 @@ #include "MHR.dmm" #include "GovPatrol.dmm" #include "DecoupledEngine.dmm" -#include "DoomP.dmm" +//include "DoomP.dmm" #include "CaveS.dmm" #include "Drugden.dmm" #include "Musk.dmm" @@ -108,11 +108,13 @@ mappath = 'Boombase.dmm' cost = 5 +/* /datum/map_template/virgo2/BSD name = "Black Shuttle Down" desc = "You REALLY shouldn't be near this." mappath = 'Blackshuttledown.dmm' cost = 30 +*/ /datum/map_template/virgo2/Rockybase name = "Rocky Base" @@ -138,11 +140,13 @@ mappath = 'DecoupledEngine.dmm' cost = 15 +/* /datum/map_template/virgo2/DoomP name = "DoomP" desc = "Witty description here." mappath = 'DoomP.dmm' cost = 30 +*/ /datum/map_template/virgo2/Cave name = "CaveS" diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm index a7b7fac5f9e..257474a8496 100644 --- a/maps/tether/submaps/_tether_submaps.dm +++ b/maps/tether/submaps/_tether_submaps.dm @@ -267,14 +267,14 @@ /datum/map_z_level/tether_lateload/gateway_destination name = "Gateway Destination" z = Z_LEVEL_GATEWAY - +/* // Removed due to heavy merc presence #include "../../gateway_vr/snow_outpost.dm" /datum/map_template/tether_lateload/gateway/snow_outpost name = "Snow Outpost" desc = "Big snowy area with various outposts." mappath = 'maps/gateway_vr/snow_outpost.dmm' associated_map_datum = /datum/map_z_level/tether_lateload/gateway_destination - +*/ #include "../../gateway_vr/zoo.dm" /datum/map_template/tether_lateload/gateway/zoo name = "Zoo" diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 4b015e675d2..8883a9e18e2 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -15,7 +15,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /obj/vehicle/train/trolley, @@ -23,16 +22,13 @@ /area/engineering/hallway) "aae" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4; - icon_state = "intact-supply" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled, @@ -44,9 +40,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/space) @@ -63,7 +57,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/cable/green{ @@ -120,23 +113,20 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 4; - pixel_x = -35; - pixel_y = 0 + pixel_x = -35 }, /turf/simulated/floor, /area/maintenance/station/eng_lower) "aam" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -144,9 +134,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/engineering/engine_room) @@ -217,8 +205,7 @@ }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/simulated/floor/tiled/dark, /area/tether/station/burial) @@ -227,8 +214,7 @@ dir = 6 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/tether/station/burial) @@ -279,8 +265,7 @@ /area/engineering/engine_smes) "aaA" = ( /obj/machinery/power/terminal{ - dir = 8; - icon_state = "term" + dir = 8 }, /obj/structure/cable/yellow{ d2 = 2; @@ -292,8 +277,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance_hatch{ name = "SMES Access"; @@ -457,7 +441,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /turf/simulated/floor/tiled, @@ -475,10 +458,8 @@ "aaQ" = ( /obj/machinery/door/blast/regular{ dir = 4; - icon_state = "pdoor1"; id = "EngineVent"; - name = "Reactor Vent"; - p_open = 0 + name = "Reactor Vent" }, /turf/simulated/floor/reinforced/nitrogen{ nitrogen = 82.1472 @@ -497,7 +478,6 @@ id = "engine_electrical_maintenance"; name = "Door Bolt Control"; pixel_x = -25; - pixel_y = 0; req_access = list(10); specialfunctions = 4 }, @@ -562,8 +542,7 @@ /area/maintenance/station/eng_lower) "aaZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -625,8 +604,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/engineering/engine_smes) @@ -637,8 +615,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) @@ -670,9 +647,7 @@ /area/engineering/engine_room) "abl" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 1 @@ -708,7 +683,6 @@ "abp" = ( /obj/machinery/mass_driver{ dir = 4; - icon_state = "mass_driver"; id = "chapelgun" }, /obj/machinery/door/window{ @@ -721,9 +695,7 @@ "abq" = ( /obj/machinery/door/airlock/maintenance_hatch{ frequency = 1379; - icon_state = "door_closed"; id_tag = "engine_airlock_interior"; - locked = 0; name = "Engine Airlock Interior"; req_access = list(11) }, @@ -741,9 +713,7 @@ "abs" = ( /obj/machinery/door/airlock/maintenance_hatch{ frequency = 1379; - icon_state = "door_closed"; id_tag = "engine_airlock_exterior"; - locked = 0; name = "Engine Airlock Exterior"; req_access = list(11) }, @@ -800,9 +770,7 @@ dir = 6 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -832,7 +800,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/floor_decal/industrial/warning{ @@ -892,7 +859,6 @@ id = "EngineEmitterPortWest2"; name = "Engine Room Blast Doors"; pixel_x = 25; - pixel_y = 0; req_access = null; req_one_access = list(11,24) }, @@ -925,7 +891,6 @@ }, /obj/machinery/light/small, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -953,7 +918,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled/techmaint, @@ -988,7 +952,6 @@ dir = 4 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -1001,7 +964,6 @@ "abN" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor, @@ -1018,8 +980,7 @@ /area/engineering/gravity_gen) "abP" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/random/trash, /turf/simulated/floor, @@ -1048,7 +1009,6 @@ /area/maintenance/station/eng_lower) "abU" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28; req_access = list(67) @@ -1076,8 +1036,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/engineering/engine_monitoring) @@ -1134,9 +1093,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/engineering/engine_monitoring) @@ -1201,8 +1158,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -1251,8 +1207,7 @@ "acu" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -1369,8 +1324,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1391,9 +1345,7 @@ "acO" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Engineering"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green{ d2 = 4; @@ -1451,8 +1403,7 @@ dir = 9 }, /obj/effect/floor_decal/industrial/danger{ - dir = 9; - icon_state = "danger" + dir = 9 }, /obj/machinery/status_display{ pixel_y = 32 @@ -1530,8 +1481,7 @@ }, /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 0 + icon_state = "0-2" }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -1623,8 +1573,7 @@ "ado" = ( /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -1672,8 +1621,7 @@ dir = 8 }, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary) @@ -1809,15 +1757,13 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0 }, /obj/machinery/door/airlock/maintenance/engi{ - name = "Engineering Substation"; - req_one_access = list(10) + name = "Engineering Substation" }, /turf/simulated/floor, /area/maintenance/substation/engineering) @@ -1842,8 +1788,7 @@ /area/hallway/station/atrium) "adF" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable{ d2 = 4; @@ -1871,12 +1816,10 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/engi{ - name = "Engineering Substation"; - req_one_access = list(10) + name = "Engineering Substation" }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -1937,8 +1880,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/danger{ - dir = 8; - icon_state = "danger" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) @@ -2006,7 +1948,6 @@ "adW" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -2062,15 +2003,10 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "aec" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/random/junk, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "aed" = ( /obj/machinery/computer/supplycomp, /turf/simulated/floor/tiled/dark, @@ -2087,8 +2023,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -2140,8 +2075,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -2160,8 +2094,7 @@ /area/engineering/workshop) "aeo" = ( /obj/machinery/computer/station_alert/all{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/machinery/ai_status_display{ pixel_x = -32 @@ -2191,8 +2124,7 @@ /area/crew_quarters/sleep/cryo) "aer" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -2206,7 +2138,6 @@ dir = 1 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -2250,8 +2181,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/danger{ - dir = 8; - icon_state = "danger" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) @@ -2325,8 +2255,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/effect/floor_decal/steeldecal/steel_decals_central5{ - dir = 8; - icon_state = "steel_decals_central5" + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/engineering/engine_monitoring) @@ -2392,8 +2321,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -2436,8 +2364,7 @@ department = "Secondary Bridge"; departmentType = 5; name = "Secondary Bridge RC"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/table/reinforced, /obj/item/weapon/book/codex, @@ -2482,7 +2409,6 @@ "aeN" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/table/reinforced, @@ -2510,8 +2436,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/danger{ - dir = 8; - icon_state = "danger" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) @@ -2579,8 +2504,7 @@ /area/bridge/secondary) "aeZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -2679,8 +2603,7 @@ dir = 10 }, /obj/effect/floor_decal/industrial/danger{ - dir = 10; - icon_state = "danger" + dir = 10 }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) @@ -2724,7 +2647,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/floor_decal/borderfloor, @@ -2735,7 +2657,6 @@ /obj/machinery/light, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = 0; pixel_y = -32 }, /obj/effect/floor_decal/borderfloor, @@ -2750,7 +2671,6 @@ /area/engineering/engine_monitoring) "afk" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -2772,8 +2692,7 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ dir = 1 @@ -2813,9 +2732,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -2829,9 +2746,7 @@ /area/hallway/station/atrium) "afp" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor, @@ -2844,9 +2759,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -2860,8 +2773,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/camera/network/engineering, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -2870,9 +2782,7 @@ "afs" = ( /obj/effect/floor_decal/rust, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/structure/closet/crate/solar, /obj/effect/floor_decal/industrial/outline/yellow, @@ -2880,8 +2790,7 @@ /area/engineering/storage) "aft" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2913,8 +2822,7 @@ /area/engineering/hallway) "afu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -2927,7 +2835,6 @@ /obj/machinery/light, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled, @@ -2988,8 +2895,7 @@ /area/hallway/station/atrium) "afB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -3010,8 +2916,7 @@ "afD" = ( /obj/structure/table/reinforced, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) @@ -3037,8 +2942,7 @@ /area/hallway/station/atrium) "afG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -3194,8 +3098,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance_hatch{ - icon_state = "door_closed"; - locked = 0; name = "Engine Access"; req_one_access = list(11) }, @@ -3375,7 +3277,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -3522,8 +3423,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled, /area/bridge/secondary) @@ -3623,7 +3523,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/floor_decal/industrial/warning, @@ -3635,7 +3534,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/effect/landmark{ @@ -3676,8 +3574,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -3687,8 +3584,7 @@ "agC" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -3731,17 +3627,14 @@ /area/bridge/secondary) "agF" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /obj/machinery/light/small{ dir = 1 }, /obj/machinery/airlock_sensor{ - frequency = 1379; id_tag = "eng_al_c_snsr"; - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; @@ -3753,7 +3646,6 @@ "agG" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/papershredder, @@ -3779,12 +3671,10 @@ /area/engineering/break_room) "agI" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 5; - icon_state = "warning" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -3811,8 +3701,7 @@ dir = 4 }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) @@ -4090,8 +3979,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -4100,8 +3988,7 @@ RCon_tag = "Secondary Command Substation Bypass" }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor, /area/maintenance/substation/spacecommand) @@ -4131,8 +4018,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/camera/network/engineering{ dir = 8 @@ -4154,9 +4040,7 @@ dir = 5 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 4 @@ -4267,8 +4151,7 @@ /area/hallway/station/atrium) "ahs" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/plating, /area/engineering/engine_airlock) @@ -4288,8 +4171,7 @@ dir = 8 }, /obj/machinery/status_display{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary) @@ -4307,13 +4189,10 @@ dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 4 @@ -4335,12 +4214,10 @@ /area/gateway) "ahy" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/plating, /area/engineering/engine_airlock) @@ -4358,19 +4235,16 @@ /area/gateway) "ahB" = ( /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) "ahC" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -4385,8 +4259,6 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance_hatch{ - icon_state = "door_closed"; - locked = 0; name = "Engine Access"; req_one_access = list(11) }, @@ -4398,12 +4270,10 @@ "ahE" = ( /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -4526,8 +4396,7 @@ }, /obj/effect/floor_decal/rust, /obj/structure/disposalpipe/broken{ - dir = 4; - icon_state = "pipe-b" + dir = 4 }, /turf/simulated/floor, /area/vacant/vacant_restaurant_lower) @@ -4571,9 +4440,7 @@ /area/engineering/storage) "ahU" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -4619,9 +4486,7 @@ "aia" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Secondary Command"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green, /obj/structure/cable/green{ @@ -4717,7 +4582,6 @@ /obj/effect/floor_decal/industrial/warning, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled/dark, @@ -4804,8 +4668,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4834,7 +4697,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor, @@ -4918,8 +4780,7 @@ "aiB" = ( /obj/machinery/light_switch{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -4952,12 +4813,10 @@ layer = 3.3; master_tag = "engine_room_airlock"; pixel_x = -22; - pixel_y = 0; req_access = list(10) }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/portables_connector{ @@ -4982,7 +4841,6 @@ /obj/structure/cable/green, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/closet/radiation, @@ -5076,8 +4934,7 @@ /area/engineering/engine_monitoring) "aiR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/meter{ frequency = 1443; @@ -5086,9 +4943,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor, /area/hallway/station/docks) @@ -5197,9 +5052,7 @@ /area/gateway) "ajd" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 30 }, /obj/effect/floor_decal/industrial/warning{ @@ -5217,8 +5070,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) @@ -5231,8 +5083,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -5274,8 +5125,7 @@ /area/gateway/prep_room) "ajj" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5284,15 +5134,13 @@ /area/gateway/prep_room) "ajk" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor, /area/hallway/station/docks) "ajl" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -5308,8 +5156,7 @@ }, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) @@ -5330,8 +5177,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/engineering/engine_room) @@ -5349,9 +5195,7 @@ icon_state = "4-8" }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5396,8 +5240,7 @@ }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -5505,9 +5348,7 @@ "ajG" = ( /obj/effect/floor_decal/rust, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/shield_gen/external, /obj/effect/floor_decal/industrial/outline/yellow, @@ -5515,8 +5356,7 @@ /area/engineering/storage) "ajH" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5527,9 +5367,7 @@ /area/gateway/prep_room) "ajI" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/structure/closet/crate/radiation, /obj/item/clothing/glasses/meson, @@ -5559,8 +5397,7 @@ /area/hallway/station/atrium) "ajL" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/gateway/prep_room) @@ -5571,12 +5408,10 @@ /area/gateway/prep_room) "ajN" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5622,8 +5457,7 @@ "ajV" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled, /area/gateway/prep_room) @@ -5633,8 +5467,7 @@ /area/hallway/station/docks) "ajX" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark, @@ -5662,8 +5495,7 @@ req_access = null }, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) @@ -5734,7 +5566,6 @@ /area/maintenance/abandonedlibrary) "akj" = ( /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/machinery/shield_capacitor, @@ -5743,7 +5574,6 @@ /area/engineering/storage) "akk" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -5788,7 +5618,6 @@ "akp" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/light_switch{ @@ -5915,12 +5744,10 @@ "akA" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/gateway/prep_room) @@ -5941,7 +5768,6 @@ "akE" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/dark, @@ -5957,8 +5783,7 @@ "akH" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/dark, /area/gateway) @@ -5982,12 +5807,10 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/gateway) @@ -6003,8 +5826,7 @@ }, /obj/machinery/light, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/gateway) @@ -6013,7 +5835,6 @@ /obj/machinery/recharger, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /turf/simulated/floor/tiled/dark, @@ -6081,13 +5902,10 @@ pixel_y = 3 }, /obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = -3; - pixel_y = 0 + pixel_x = -3 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -6203,8 +6021,7 @@ "ale" = ( /obj/structure/closet/crate, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/gateway) @@ -6248,8 +6065,7 @@ icon_state = "2-4" }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/gateway/prep_room) @@ -6304,8 +6120,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/bridge/secondary) @@ -6314,8 +6129,7 @@ /area/maintenance/station/abandonedholodeck) "alp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/meter{ frequency = 1443; @@ -6394,7 +6208,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ dir = 4; - icon_state = "pdoor1"; id = "EngineEmitterPortWest2"; layer = 3.3; name = "Engine Gas Storage" @@ -6407,9 +6220,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/engineering/atmos/backup) @@ -6426,7 +6237,6 @@ }, /obj/machinery/door/blast/regular{ dir = 4; - icon_state = "pdoor1"; id = "EngineEmitterPortWest2"; layer = 3.3; name = "Engine Gas Storage" @@ -6511,12 +6321,10 @@ "alL" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/corner/yellow/bordercorner, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -6540,8 +6348,7 @@ /area/engineering/hallway) "alM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6607,9 +6414,7 @@ "alR" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/vehicle/train/trolley, @@ -6644,8 +6449,7 @@ "alW" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/steeldecal/steel_decals_central6{ - dir = 8; - icon_state = "steel_decals_central6" + dir = 8 }, /obj/machinery/alarm{ pixel_y = 22 @@ -6703,7 +6507,6 @@ name = "Cafe Shutters"; pixel_x = -10; pixel_y = 36; - req_access = list(); req_one_access = list(25) }, /obj/item/weapon/hand_labeler, @@ -6730,8 +6533,7 @@ }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -6742,8 +6544,7 @@ /obj/structure/table/reinforced, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/item/device/gps/engineering{ pixel_x = 3; @@ -6765,8 +6566,7 @@ /area/bridge/secondary) "amf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -6900,8 +6700,7 @@ dir = 1 }, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/water/pool, /area/hallway/station/atrium) @@ -6910,7 +6709,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's set to the science channel, the show is talking about modern aliens. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/carpet, @@ -6918,7 +6716,6 @@ "amt" = ( /obj/machinery/door/window{ dir = 1; - icon_state = "left"; name = "Cafe"; req_one_access = list(25) }, @@ -6938,8 +6735,7 @@ "amw" = ( /obj/structure/railing, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/water/pool, /area/hallway/station/atrium) @@ -7110,9 +6906,7 @@ dir = 5 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -7250,8 +7044,7 @@ "anc" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/engineering/shaft) @@ -7318,8 +7111,7 @@ icon_state = "cobweb2" }, /obj/machinery/light_construct{ - dir = 1; - icon_state = "tube-construct-stage1" + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) @@ -7403,7 +7195,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /obj/machinery/door/firedoor/glass/hidden/steel{ @@ -7569,7 +7360,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -7696,7 +7486,6 @@ "anT" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/wood/broken, @@ -7718,7 +7507,6 @@ "anW" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -7726,8 +7514,7 @@ "anX" = ( /obj/structure/bookcase, /obj/machinery/light_construct/small{ - dir = 8; - icon_state = "bulb-construct-stage1" + dir = 8 }, /obj/effect/decal/cleanable/cobweb{ icon_state = "cobweb2" @@ -7764,8 +7551,7 @@ /area/maintenance/abandonedlibrary) "aoc" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/bookcase, /obj/effect/decal/cleanable/cobweb{ @@ -7804,7 +7590,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -7826,15 +7611,13 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "aok" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4; - icon_state = "intact-supply" + dir = 4 }, /obj/machinery/light{ dir = 1 @@ -7846,8 +7629,7 @@ /area/engineering/atmos/backup) "aol" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4; - icon_state = "intact-supply" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -7855,8 +7637,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -7876,17 +7657,14 @@ /area/bridge/secondary) "aon" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4; - icon_state = "intact-supply" + dir = 4 }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -7942,8 +7720,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance/engi{ - name = "Engineering Electrical Shaft"; - req_one_access = list(10) + name = "Engineering Electrical Shaft" }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor, @@ -7976,8 +7753,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/engineering/hallway) @@ -8040,8 +7816,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -8204,8 +7979,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8233,12 +8007,10 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -8256,8 +8028,7 @@ /area/engineering/atmos/backup) "apv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -8289,8 +8060,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8309,8 +8079,7 @@ /area/engineering/hallway) "apx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -8329,9 +8098,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/green{ @@ -8377,8 +8144,7 @@ /area/maintenance/abandonedlibrary) "apB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8436,8 +8202,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/table/woodentable, /obj/random/junk, @@ -8450,8 +8215,7 @@ /area/maintenance/abandonedlibrary) "apG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -8466,8 +8230,7 @@ /area/maintenance/abandonedlibrary) "apI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -8479,8 +8242,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 @@ -8497,8 +8259,7 @@ /area/engineering/hallway) "apJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8515,8 +8276,7 @@ /area/engineering/hallway) "apK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8558,8 +8318,7 @@ /area/engineering/hallway) "apM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -8614,9 +8373,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -8625,8 +8382,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -8692,7 +8448,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -8704,16 +8459,14 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor, /area/engineering/atmos/backup) "aqf" = ( /obj/machinery/pipedispenser/disposal, /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 10; - icon_state = "intact" + dir = 10 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -8739,8 +8492,7 @@ /area/tether/station/visitorhallway) "aqh" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 6; - icon_state = "intact" + dir = 6 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -8748,19 +8500,16 @@ /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/engineering/atmos/backup) "aqj" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -8788,15 +8537,13 @@ dir = 10 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) "aql" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -8808,8 +8555,7 @@ /area/engineering/hallway) "aqm" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -8823,8 +8569,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) @@ -8881,8 +8626,7 @@ /area/maintenance/abandonedlibraryconference) "aqq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 @@ -9011,15 +8755,13 @@ /obj/machinery/light, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled, /area/engineering/hallway) "aqD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -9039,8 +8781,7 @@ /area/engineering/hallway) "aqE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -9058,8 +8799,7 @@ /area/engineering/hallway) "aqF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -9119,8 +8859,7 @@ /area/engineering/workshop) "aqO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -9129,8 +8868,7 @@ /area/engineering/hallway) "aqQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -9211,9 +8949,7 @@ /area/engineering/hallway) "aqU" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -9231,8 +8967,7 @@ /area/maintenance/abandonedlibraryconference) "aqW" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/abandonedlibraryconference) @@ -9260,8 +8995,7 @@ }, /obj/structure/reagent_dispensers/watertank, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -9295,8 +9029,7 @@ dir = 8 }, /obj/machinery/light_construct/small{ - dir = 4; - icon_state = "bulb-construct-stage1" + dir = 4 }, /obj/effect/decal/cleanable/cobweb{ icon_state = "cobweb2" @@ -9411,23 +9144,20 @@ /area/engineering/workshop) "ary" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "arz" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "arB" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/meter, /turf/simulated/floor/tiled, @@ -9523,12 +9253,10 @@ /area/engineering/break_room) "arO" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 10; - icon_state = "intact-supply" + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 10; - icon_state = "intact-scrubbers" + dir = 10 }, /obj/machinery/camera/network/engineering{ dir = 8 @@ -9548,8 +9276,7 @@ /area/engineering/atmos/backup) "arT" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/red{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -9722,7 +9449,6 @@ /obj/effect/floor_decal/techfloor/hole, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled/techfloor, @@ -9799,8 +9525,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -9947,7 +9672,6 @@ /area/crew_quarters/sleep/cryo) "asM" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28; req_access = list(67) @@ -10037,8 +9761,7 @@ name_tag = "Secondary Command Subgrid" }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor, /area/maintenance/substation/spacecommand) @@ -10054,8 +9777,7 @@ }, /obj/random/junk, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/structure/cable/green{ d1 = 2; @@ -10185,8 +9907,7 @@ /obj/structure/table/reinforced, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/item/device/radio/off{ pixel_y = 6 @@ -10325,9 +10046,7 @@ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -10357,8 +10076,7 @@ /area/maintenance/station/spacecommandmaint) "atA" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/workshop) @@ -10566,15 +10284,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/random/junk, /turf/simulated/floor, @@ -10703,8 +10419,7 @@ icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -10774,13 +10489,11 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; - dir = 1; icon_state = "pdoor0"; id = "secondary_bridge_blast"; layer = 1; @@ -10792,8 +10505,7 @@ /area/bridge/secondary/hallway) "auq" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -10928,7 +10640,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/borderfloor{ @@ -10947,8 +10658,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -10997,20 +10707,16 @@ icon_state = "2-4" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "auG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11029,20 +10735,16 @@ icon_state = "1-4" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "auH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11056,9 +10758,7 @@ icon_state = "4-8" }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/green{ @@ -11067,20 +10767,16 @@ icon_state = "2-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "auI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11094,13 +10790,10 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) @@ -11113,7 +10806,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/random/tech_supply, @@ -11147,13 +10839,10 @@ icon_state = "2-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) @@ -11171,8 +10860,7 @@ /area/tether/station/visitorhallway/office) "auM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11186,13 +10874,10 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -11221,8 +10906,7 @@ /area/hallway/station/docks) "auR" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -11240,16 +10924,14 @@ dir = 4 }, /obj/machinery/ai_status_display{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/tiled, /area/storage/tools) "auT" = ( /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/machinery/computer/communications, /obj/structure/cable/green{ @@ -11465,15 +11147,13 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/workshop) "avr" = ( /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, @@ -11526,7 +11206,6 @@ /area/tether/station/visitorhallway/office) "avv" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -11537,8 +11216,7 @@ /area/bridge/secondary/hallway) "avw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/red{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/meter, /turf/simulated/floor/tiled, @@ -11687,16 +11365,13 @@ icon_state = "pipe-c" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 4 @@ -11712,8 +11387,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -11732,7 +11406,6 @@ /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /turf/simulated/floor/tiled, @@ -11744,8 +11417,7 @@ sortType = "Visitor Office" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -11787,16 +11459,13 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 4 @@ -12050,8 +11719,7 @@ /area/tether/station/visitorhallway) "awk" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -12204,13 +11872,10 @@ dir = 1 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /turf/simulated/floor/tiled/techmaint, @@ -12220,8 +11885,7 @@ /area/bridge/secondary/teleporter) "awD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -12230,9 +11894,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -12269,9 +11931,7 @@ "awH" = ( /obj/structure/flora/pottedplant, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -12320,9 +11980,7 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/tiled{ @@ -12370,9 +12028,7 @@ dir = 10 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -12414,15 +12070,13 @@ /obj/effect/floor_decal/corner/white/diagonal, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled, /area/engineering/break_room) "awU" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -12431,8 +12085,7 @@ dir = 10 }, /obj/machinery/vending/fitness{ - dir = 4; - icon_state = "fitness" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/office) @@ -12449,7 +12102,6 @@ icon_state = "1-4" }, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; pixel_x = 20; pixel_y = 30 @@ -12464,13 +12116,11 @@ /area/bridge/secondary/teleporter) "awX" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -12508,7 +12158,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -12552,9 +12201,7 @@ /area/bridge/meeting_room) "axe" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 30 }, /turf/simulated/floor/wood, @@ -12597,7 +12244,6 @@ "axj" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/wood, @@ -12605,8 +12251,7 @@ "axk" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary/teleporter) @@ -12618,15 +12263,13 @@ "axm" = ( /obj/item/weapon/stool/padded, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/bridge/secondary/teleporter) "axn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -12651,7 +12294,6 @@ /obj/structure/table/woodentable, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -12672,8 +12314,7 @@ pixel_y = 5 }, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -12717,8 +12358,7 @@ /area/storage/tools) "axA" = ( /obj/machinery/atmospherics/pipe/tank/oxygen{ - dir = 1; - icon_state = "o2_map" + dir = 1 }, /obj/machinery/light, /turf/simulated/floor/tiled, @@ -12726,7 +12366,6 @@ "axB" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -12781,15 +12420,13 @@ "axG" = ( /obj/machinery/atmospherics/pipe/tank{ dir = 1; - icon_state = "air_map"; name = "Waste Tank" }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "axH" = ( /obj/machinery/atmospherics/pipe/tank/nitrogen{ - dir = 1; - icon_state = "n2_map" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -12829,8 +12466,7 @@ dir = 8 }, /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -12861,7 +12497,6 @@ /obj/fiftyspawner/glass, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/light, @@ -12889,8 +12524,7 @@ /area/tether/station/stairs_one) "axS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /obj/structure/cable/green{ d1 = 1; @@ -12910,8 +12544,7 @@ /area/crew_quarters/sleep/spacedorm1) "axU" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/workshop) @@ -12920,8 +12553,7 @@ phorontanks = 0 }, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -12950,8 +12582,7 @@ /area/crew_quarters/sleep/spacedorm2) "axY" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, @@ -12963,9 +12594,7 @@ /area/hallway/station/docks) "aya" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -13069,8 +12698,7 @@ icon_state = "2-8" }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/spacedorm3) @@ -13106,8 +12734,7 @@ /area/bridge/secondary/teleporter) "aym" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/bridge/secondary/teleporter) @@ -13121,8 +12748,7 @@ icon_state = "2-4" }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/spacedorm4) @@ -13262,9 +12888,7 @@ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -13317,15 +12941,13 @@ /obj/structure/table/woodentable, /obj/item/weapon/storage/box/cups, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) "ayG" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled, @@ -13338,7 +12960,6 @@ "ayI" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/wood, @@ -13370,7 +12991,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13394,9 +13014,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -13425,7 +13043,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -13456,12 +13073,10 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -13493,8 +13108,7 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -13542,16 +13156,13 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 4 @@ -13578,8 +13189,7 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -13608,8 +13218,7 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -13654,9 +13263,7 @@ dir = 5 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 4 @@ -13686,8 +13293,7 @@ /area/tether/station/visitorhallway) "aza" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /turf/simulated/floor/tiled, /area/bridge/secondary/teleporter) @@ -13741,8 +13347,7 @@ /area/bridge/secondary) "aze" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central5{ - dir = 4; - icon_state = "steel_decals_central5" + dir = 4 }, /mob/living/simple_mob/animal/passive/opossum/poppy, /turf/simulated/floor/tiled/monotile, @@ -13791,8 +13396,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/engineering{ - name = "Engineering Washroom"; - req_one_access = list(10) + name = "Engineering Washroom" }, /turf/simulated/floor/tiled/white, /area/engineering/break_room) @@ -13961,8 +13565,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary/teleporter) @@ -13992,9 +13595,7 @@ /area/maintenance/station/spacecommandmaint) "azA" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -14015,7 +13616,6 @@ dir = 4 }, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; pixel_x = 6; pixel_y = 32 @@ -14057,7 +13657,6 @@ "azG" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/vending/cigarette, @@ -14103,7 +13702,6 @@ /area/tether/station/visitorhallway/laundry) "azL" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; pixel_x = -6; pixel_y = 32 @@ -14119,8 +13717,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/station/stairs_one) @@ -14169,8 +13766,7 @@ "azT" = ( /obj/machinery/washing_machine, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/laundry) @@ -14259,8 +13855,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -14314,8 +13909,7 @@ dir = 4 }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) @@ -14383,8 +13977,7 @@ icon_state = "pipe-c" }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) @@ -14402,15 +13995,13 @@ /area/bridge/meeting_room) "aAp" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) "aAr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -14430,8 +14021,7 @@ /area/bridge/meeting_room) "aAu" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/bridge/secondary/teleporter) @@ -14485,7 +14075,6 @@ }, /obj/machinery/computer/id_restorer{ dir = 1; - icon_state = "restorer"; pixel_y = -32 }, /obj/effect/floor_decal/corner/lightgrey/border, @@ -14649,14 +14238,11 @@ "aAM" = ( /obj/structure/mirror{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/effect/landmark{ name = "morphspawn" @@ -14690,7 +14276,6 @@ frequency = 1379; master_tag = "eng_starboard_airlock"; name = "exterior access button"; - pixel_x = 0; pixel_y = -25; req_one_access = list(11,24) }, @@ -14800,7 +14385,6 @@ /obj/structure/table/bench/standard, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled, @@ -14869,7 +14453,6 @@ "aBn" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/wood, @@ -14890,7 +14473,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -14906,8 +14488,7 @@ pixel_y = 3 }, /obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = -3; - pixel_y = 0 + pixel_x = -3 }, /turf/simulated/floor/tiled, /area/engineering/engine_eva) @@ -15030,8 +14611,7 @@ /area/engineering/hallway) "aBB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -15043,8 +14623,7 @@ dir = 4 }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/effect/landmark{ name = "xeno_spawn"; @@ -15072,7 +14651,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -15106,8 +14684,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/maintenance/substation/civilian) @@ -15359,9 +14936,7 @@ /area/engineering/atmos/backup) "aCk" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -15382,7 +14957,6 @@ "aCm" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/landmark{ @@ -15399,8 +14973,7 @@ "aCo" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) @@ -15469,9 +15042,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -15599,7 +15170,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /obj/machinery/camera/network/tether{ @@ -15668,9 +15238,7 @@ /obj/structure/table/reinforced, /obj/machinery/recharger, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 1 @@ -15685,8 +15253,7 @@ /area/engineering/workshop) "aCR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/structure/cable{ d1 = 1; @@ -15714,9 +15281,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/powered/pump/filled, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled{ icon_state = "monotile" @@ -15754,9 +15319,7 @@ dir = 10 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -15772,7 +15335,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -15789,8 +15351,7 @@ /obj/item/weapon/storage/box/lights/mixed, /obj/item/weapon/storage/box/lights/mixed, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/station/stairs_one) @@ -15819,8 +15380,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -15833,8 +15393,7 @@ }, /obj/machinery/status_display{ layer = 4; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -15877,8 +15436,7 @@ "aDi" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/window/reinforced{ dir = 1 @@ -15890,9 +15448,7 @@ dir = 9 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) @@ -15910,7 +15466,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -15991,8 +15546,7 @@ /area/tether/station/visitorhallway) "aDy" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -16065,8 +15619,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/maintenance/substation/civilian) @@ -16098,7 +15651,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/random/junk, @@ -16169,7 +15721,6 @@ /area/hallway/station/atrium) "aEa" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; frequency = 1379; id_tag = "eng_starboard_pump" }, @@ -16179,8 +15730,7 @@ "aEb" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/tiled, /area/engineering/engine_eva) @@ -16190,7 +15740,6 @@ /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; - dir = 1; icon_state = "pdoor0"; id = "secondary_bridge_blast"; layer = 1; @@ -16280,8 +15829,7 @@ /area/tether/station/dock_one) "aEp" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) @@ -16375,8 +15923,7 @@ /area/engineering/foyer) "aEv" = ( /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -16389,8 +15936,7 @@ /area/bridge/meeting_room) "aEx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/meter, /obj/structure/cable{ @@ -16404,8 +15950,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16447,22 +15992,18 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled, /area/engineering/hallway) "aEB" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/effect/landmark{ name = "morphspawn" @@ -16484,8 +16025,7 @@ "aED" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 22; - pixel_y = 0 + pixel_x = 22 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -16494,8 +16034,7 @@ dir = 4 }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) @@ -16525,8 +16064,7 @@ "aEI" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -16577,12 +16115,10 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Damn, looks like it's on the clown world channel. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -16606,8 +16142,7 @@ dir = 8 }, /obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() + name = "Shower" }, /obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/tiled, @@ -16616,8 +16151,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like its Fawkes News, I wonder what else is on?"; icon_state = "frame"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) @@ -16638,8 +16172,7 @@ dir = 4 }, /obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() + name = "Shower" }, /obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/tiled, @@ -16647,9 +16180,7 @@ "aEX" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Civilian"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green{ d2 = 2; @@ -16661,8 +16192,7 @@ "aFc" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor, /area/storage/emergency_storage/emergency4) @@ -16685,7 +16215,6 @@ id_tag = "eng_starboard_pump" }, /obj/machinery/airlock_sensor{ - frequency = 1379; id_tag = "eng_starboard_sensor"; pixel_x = 24; pixel_y = 10 @@ -16815,8 +16344,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -16919,8 +16447,7 @@ /area/engineering/workshop) "aIi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/structure/cable{ d1 = 1; @@ -16949,7 +16476,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /turf/simulated/floor/tiled, @@ -16960,14 +16486,11 @@ }, /obj/structure/mirror{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) @@ -16975,7 +16498,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable{ @@ -17034,8 +16556,7 @@ /area/tether/station/dock_two) "aJk" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) @@ -17044,12 +16565,10 @@ dir = 4 }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ dir = 4 @@ -17067,7 +16586,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -17139,8 +16657,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_engineering{ - name = "Engineering Hallway"; - req_one_access = list(10) + name = "Engineering Hallway" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -17193,9 +16710,7 @@ /obj/structure/bedsheetbin, /obj/random/soap, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) @@ -17210,8 +16725,7 @@ /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, /obj/machinery/atmospherics/pipe/zpipe/up/supply, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/cable{ icon_state = "16-0" @@ -17287,7 +16801,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -17504,7 +17017,6 @@ dir = 4 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -17660,8 +17172,7 @@ /area/engineering/hallway) "aMl" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/machinery/recharge_station, /turf/simulated/floor/tiled/white, @@ -17669,7 +17180,6 @@ "aMp" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/washing_machine, @@ -17701,8 +17211,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -17757,26 +17266,22 @@ /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, /obj/structure/cable/green, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) "aNe" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -17788,8 +17293,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) @@ -17851,9 +17355,7 @@ /area/crew_quarters/heads/chief) "aOU" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 1 @@ -17883,8 +17385,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/weapon/storage/toolbox/emergency, /obj/item/weapon/storage/toolbox/electrical, @@ -17912,9 +17413,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/carpet, @@ -18017,9 +17516,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) @@ -18141,13 +17638,10 @@ /area/crew_quarters/sleep/engi_wash) "aSa" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/computer/station_alert/all{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/structure/window/reinforced{ dir = 1 @@ -18209,9 +17703,7 @@ "aSu" = ( /obj/structure/table/reinforced, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/machinery/firealarm{ dir = 4; @@ -18263,7 +17755,6 @@ "aSL" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/item/device/radio/intercom{ @@ -18281,8 +17772,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -18306,8 +17796,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18450,8 +17939,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -18473,7 +17961,6 @@ department = "Chief Engineer's Desk"; departmentType = 6; name = "Chief Engineer RC"; - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -18486,15 +17973,13 @@ /area/crew_quarters/heads/chief) "aVH" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -18502,7 +17987,6 @@ "aVK" = ( /obj/structure/table/reinforced, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/random/tech_supply, @@ -18516,8 +18000,7 @@ }, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/random/tech_supply, /obj/random/tech_supply, @@ -18525,16 +18008,14 @@ /area/engineering/engineering_monitoring) "aVP" = ( /obj/machinery/computer/power_monitor{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/machinery/light, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) "aVW" = ( /obj/machinery/computer/rcon{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/machinery/requests_console/preset/engineering{ pixel_y = -30 @@ -18546,8 +18027,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -18565,9 +18045,7 @@ dir = 6 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -18625,7 +18103,6 @@ /obj/machinery/button/remote/driver{ id = "enginecore"; name = "Emergency Core Eject"; - pixel_x = 0; pixel_y = -21 }, /turf/simulated/floor/tiled/freezer, @@ -18711,9 +18188,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/door/firedoor/glass, @@ -18775,8 +18250,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -18822,8 +18296,7 @@ /area/hallway/station/atrium) "baQ" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/techfloor{ dir = 4 @@ -18869,8 +18342,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -18891,8 +18363,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -18992,7 +18463,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/effect/floor_decal/techfloor{ @@ -19030,8 +18500,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19071,8 +18540,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19116,8 +18584,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19135,7 +18602,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -19298,7 +18764,6 @@ "beY" = ( /obj/machinery/door/airlock/multi_tile/metal{ dir = 2; - icon_state = "door_closed"; name = "Cryogenic Storage" }, /obj/machinery/door/firedoor/glass, @@ -19388,7 +18853,6 @@ "bhc" = ( /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /obj/effect/floor_decal/borderfloor{ @@ -19426,8 +18890,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) @@ -19499,8 +18962,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -19516,8 +18978,7 @@ /obj/random/tech_supply, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/tech_supply, @@ -19529,8 +18990,7 @@ dir = 4 }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/storage/tools) @@ -19597,12 +19057,10 @@ /area/tether/station/dock_two) "bnl" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/table/rack{ dir = 8; @@ -19615,8 +19073,7 @@ /area/hallway/station/docks) "bno" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -19641,7 +19098,6 @@ "boc" = ( /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /obj/effect/floor_decal/borderfloor{ @@ -19809,8 +19265,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable/green{ d1 = 4; @@ -19834,8 +19289,7 @@ "bqT" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -19861,17 +19315,14 @@ "brX" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/light{ dir = 1 }, /obj/structure/mirror{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) @@ -19892,8 +19343,7 @@ "btr" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -19903,22 +19353,18 @@ "btt" = ( /obj/machinery/computer/guestpass{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/simulated/floor/tiled, /area/hallway/station/docks) "bvs" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) @@ -19935,27 +19381,17 @@ "byy" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "byA" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) -"byP" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "bzn" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -20039,8 +19475,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /obj/structure/window/reinforced{ dir = 1 @@ -20058,8 +19493,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /obj/structure/window/reinforced{ dir = 1 @@ -20102,7 +19536,6 @@ /obj/machinery/airlock_sensor{ frequency = 1380; id_tag = "dock_d1a2_sensor"; - pixel_x = 0; pixel_y = -25 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ @@ -20151,7 +19584,6 @@ /obj/machinery/airlock_sensor{ frequency = 1380; id_tag = "dock_d2a2_sensor"; - pixel_x = 0; pixel_y = -25 }, /obj/effect/map_helper/airlock/atmos/chamber_pump, @@ -20179,8 +19611,7 @@ /area/tether/station/dock_two) "bKo" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 8 @@ -20202,8 +19633,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -20219,7 +19649,6 @@ "bPl" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -20256,7 +19685,6 @@ /obj/machinery/airlock_sensor{ frequency = 1380; id_tag = "dock_d1a1_sensor"; - pixel_x = 0; pixel_y = -25 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -20300,7 +19728,6 @@ /obj/machinery/airlock_sensor{ frequency = 1380; id_tag = "dock_d2a1_sensor"; - pixel_x = 0; pixel_y = -25 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ @@ -20334,8 +19761,7 @@ /area/tether/station/dock_two) "bPO" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) @@ -20382,15 +19808,13 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_two) "bQl" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/machinery/light/small{ dir = 4 @@ -20457,8 +19881,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -20512,8 +19935,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/simulated/floor/plating, /area/tether/station/dock_two) @@ -20754,8 +20176,7 @@ "ceq" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_engineering{ - name = "Engineering Hallway"; - req_one_access = list(10) + name = "Engineering Hallway" }, /obj/structure/cable{ d1 = 1; @@ -20773,8 +20194,7 @@ }, /obj/structure/closet/radiation, /obj/effect/floor_decal/corner_steel_grid{ - dir = 1; - icon_state = "steel_grid" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) @@ -20885,8 +20305,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -20978,8 +20397,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/simulated/floor/plating, /area/tether/station/dock_one) @@ -21065,7 +20483,6 @@ /obj/effect/floor_decal/corner/purple/bordercorner2, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -21131,8 +20548,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 @@ -21179,17 +20595,13 @@ /area/hallway/station/atrium) "eMS" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) "eYw" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -21222,9 +20634,7 @@ /area/hallway/station/atrium) "fgA" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 1 @@ -21234,7 +20644,6 @@ "fil" = ( /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /turf/simulated/floor/tiled, @@ -21247,13 +20656,10 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -21287,7 +20693,6 @@ /area/hallway/station/docks) "fqP" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -21343,7 +20748,6 @@ alarm_id = null; breach_detection = 0; dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled, @@ -21377,9 +20781,7 @@ dir = 5 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 4 @@ -21426,9 +20828,7 @@ /area/engineering/hallway) "fUR" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 1 @@ -21463,17 +20863,14 @@ /area/engineering/hallway) "ghJ" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, /obj/machinery/alarm{ dir = 4; - pixel_x = -35; - pixel_y = 0 + pixel_x = -35 }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) @@ -21531,8 +20928,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) @@ -21540,9 +20936,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/engineering/gravity_lobby) @@ -21566,9 +20960,7 @@ /area/tether/station/dock_two) "gOT" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -21619,8 +21011,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/station/docks) @@ -21708,8 +21099,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/firedoor/glass/hidden/steel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21746,8 +21136,7 @@ dir = 10 }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 4; - icon_state = "steel_grid" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) @@ -21825,8 +21214,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -21849,21 +21237,17 @@ pixel_x = 28 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "iIr" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -21901,14 +21285,12 @@ }, /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -22012,8 +21394,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/cable/green{ @@ -22023,9 +21404,7 @@ /area/engineering/gravity_gen) "jNX" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -22040,8 +21419,7 @@ /area/engineering/gravity_lobby) "jOe" = ( /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -22089,8 +21467,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -22127,8 +21504,7 @@ "jXa" = ( /obj/effect/floor_decal/sign/dock/two, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) @@ -22176,8 +21552,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) @@ -22230,7 +21605,6 @@ /obj/machinery/airlock_sensor{ frequency = 1380; id_tag = "dock_d1a3_sensor"; - pixel_x = 0; pixel_y = -25 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ @@ -22245,7 +21619,6 @@ "kRp" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -22337,8 +21710,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -22448,8 +21820,7 @@ }, /obj/structure/closet/emcloset, /obj/effect/floor_decal/corner_steel_grid{ - dir = 1; - icon_state = "steel_grid" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) @@ -22467,12 +21838,10 @@ dir = 4 }, /obj/effect/floor_decal/industrial/danger{ - dir = 4; - icon_state = "danger" + dir = 4 }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) @@ -22545,9 +21914,7 @@ /area/tether/station/dock_one) "mPs" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -22647,8 +22014,7 @@ "nYL" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) @@ -22689,8 +22055,7 @@ }, /obj/structure/closet/radiation, /obj/effect/floor_decal/corner_steel_grid{ - dir = 8; - icon_state = "steel_grid" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) @@ -22725,9 +22090,7 @@ /area/tether/station/dock_two) "ort" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -22760,9 +22123,7 @@ dir = 6 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -22819,8 +22180,7 @@ "oOm" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -22876,8 +22236,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -22892,9 +22251,7 @@ /area/engineering/hallway) "pbR" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -22912,8 +22269,7 @@ /area/engineering/gravity_gen) "pny" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) @@ -22960,7 +22316,6 @@ "pSI" = ( /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /obj/effect/floor_decal/borderfloor{ @@ -22985,8 +22340,7 @@ dir = 6 }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 6; - icon_state = "steel_grid" + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23026,8 +22380,7 @@ }, /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/effect/floor_decal/corner_steel_grid{ - dir = 8; - icon_state = "steel_grid" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) @@ -23051,8 +22404,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/computer/guestpass{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -23062,8 +22414,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -23189,9 +22540,7 @@ /area/engineering/gravity_lobby) "rys" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -23268,8 +22617,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -23347,12 +22695,10 @@ dir = 4 }, /obj/effect/floor_decal/industrial/danger{ - dir = 4; - icon_state = "danger" + dir = 4 }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 9; - icon_state = "steel_grid" + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23364,8 +22710,7 @@ /area/engineering/gravity_gen) "scB" = ( /obj/machinery/computer/shuttle_control/tether_backup{ - dir = 8; - icon_state = "computer" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) @@ -23414,8 +22759,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) @@ -23493,8 +22837,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23511,9 +22854,7 @@ /area/hallway/station/atrium) "sTb" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -23658,12 +22999,10 @@ /area/tether/station/dock_one) "tAQ" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 @@ -23724,8 +23063,7 @@ /area/tether/station/dock_one) "tOr" = ( /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -23871,8 +23209,7 @@ dir = 10 }, /obj/effect/floor_decal/corner_steel_grid{ - dir = 4; - icon_state = "steel_grid" + dir = 4 }, /obj/item/device/geiger, /obj/structure/table/standard, @@ -23923,7 +23260,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's set to GNN, I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -23967,8 +23303,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -24112,7 +23447,6 @@ dir = 4 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24125,9 +23459,7 @@ /area/hallway/station/docks) "vYM" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -24158,9 +23490,7 @@ dir = 6 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -24192,8 +23522,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) @@ -24254,8 +23583,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) @@ -24314,9 +23642,7 @@ pixel_z = -8 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -32943,7 +32269,7 @@ aBi aBi aDu aCN -byP +bPO aDL jbc fil @@ -33061,7 +32387,7 @@ aDj aER aaV aIo -aec +aeh aMr aqt amB @@ -37586,7 +36912,7 @@ aac aac aac adO -ajx +aec ajS alJ ali diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 8d0015ec8f9..5b3b9de6584 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -99,17 +99,14 @@ /area/maintenance/station/sec_lower) "an" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -126,16 +123,13 @@ /area/security/brig/visitation) "ao" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 4; - icon_state = "borderfloor_shifted" + dir = 4 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 4; - icon_state = "bordercolor_shifted" + dir = 4 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/structure/table/reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -151,16 +145,13 @@ /area/security/brig/visitation) "ap" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 4; - icon_state = "borderfloor_shifted" + dir = 4 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 4; - icon_state = "bordercolor_shifted" + dir = 4 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -188,8 +179,7 @@ /obj/structure/bed/chair, /obj/effect/floor_decal/borderfloor/corner, /obj/machinery/atmospherics/pipe/manifold/hidden/green{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/bordercorner, /turf/simulated/floor/tiled, @@ -210,12 +200,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/corner/lightorange/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/brig) @@ -250,7 +238,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/freezer, @@ -274,8 +261,7 @@ dir = 1 }, /obj/structure/holohoop{ - dir = 4; - icon_state = "hoop" + dir = 4 }, /turf/simulated/floor/tiled/monotile, /area/security/brig) @@ -305,8 +291,7 @@ }, /obj/effect/floor_decal/corner/white/border, /obj/structure/holohoop{ - dir = 8; - icon_state = "hoop" + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/security/brig) @@ -387,8 +372,7 @@ dir = 10 }, /obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 8; - icon_state = "borderfloorcorner2_black" + dir = 8 }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -436,9 +420,7 @@ "aT" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/simulated/floor/tiled/freezer, /area/security/brig/bathroom) @@ -489,9 +471,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -519,16 +499,13 @@ /area/security/security_cell_hallway) "aY" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/structure/table/steel, /obj/machinery/alarm{ @@ -562,8 +539,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/lightorange/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled/steel_dirty, /area/security/brig) @@ -576,8 +552,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/lightorange/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /turf/simulated/floor/tiled/steel_dirty, /area/security/brig) @@ -589,9 +564,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -620,8 +593,7 @@ req_access = list(1,2) }, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, @@ -675,9 +647,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -685,9 +655,7 @@ "bj" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor, /area/maintenance/station/sec_lower) @@ -719,8 +687,7 @@ "bm" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/spline/plain{ - dir = 8; - icon_state = "spline_plain" + dir = 8 }, /obj/structure/railing{ dir = 8 @@ -730,8 +697,7 @@ /area/security/brig) "bn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/machinery/power/apc{ dir = 8; @@ -758,8 +724,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -787,7 +752,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -846,8 +810,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/green, /obj/effect/floor_decal/corner/lightorange/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/security/brig) @@ -862,8 +825,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/lightorange/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /turf/simulated/floor/tiled/steel_dirty, /area/security/brig) @@ -881,12 +843,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/corner/lightorange/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/brig) @@ -905,8 +865,7 @@ /area/maintenance/station/exploration) "bz" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor, /area/maintenance/station/exploration) @@ -928,8 +887,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/lightorange/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled/steel_dirty, /area/security/brig) @@ -966,8 +924,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/lightorange/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/brig) @@ -1007,8 +964,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/lightorange/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /turf/simulated/floor/tiled, /area/security/brig) @@ -1041,8 +997,6 @@ icon_state = "1-2" }, /obj/machinery/door_timer/cell_3{ - id = "Cell 3"; - name = "Cell 3"; pixel_x = -32 }, /turf/simulated/floor/tiled, @@ -1062,7 +1016,6 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -1110,7 +1063,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -1141,8 +1093,7 @@ /area/security/security_cell_hallway) "bN" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -1232,8 +1183,7 @@ /area/maintenance/station/sec_lower) "bS" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/brig) @@ -1243,7 +1193,6 @@ "bU" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor, @@ -1253,8 +1202,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/machinery/camera/network/exploration, /turf/simulated/floor/tiled, @@ -1268,8 +1216,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 @@ -1308,20 +1255,16 @@ /area/tether/exploration/crew) "bY" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/bed/padded, /turf/simulated/floor/tiled, @@ -1338,7 +1281,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; frequency = 1442; - icon_state = "map_injector"; id = "riot_inject" }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -1346,20 +1288,16 @@ /area/security/brig) "ca" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/security/brig) @@ -1368,7 +1306,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1442; - icon_state = "map_injector"; id = "riot_inject" }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -1376,20 +1313,16 @@ /area/security/brig) "cc" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/bed/padded, /obj/item/weapon/bedsheet, @@ -1440,13 +1373,10 @@ /area/security/brig) "cj" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -1596,8 +1526,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -1623,8 +1552,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -1660,16 +1588,13 @@ /area/security/security_cell_hallway) "cw" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/cryopod{ @@ -1699,7 +1624,6 @@ }, /obj/machinery/door/airlock/maintenance/sec{ name = "Riot Control"; - req_access = list(); req_one_access = list(2,63) }, /obj/structure/disposalpipe/segment, @@ -1747,8 +1671,7 @@ dir = 4 }, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) @@ -1760,13 +1683,10 @@ /area/security/brig) "cE" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -1783,13 +1703,10 @@ /area/tether/exploration/crew) "cF" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -1800,25 +1717,20 @@ name = "Explorer" }, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "cG" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 8; - icon_state = "borderfloor_shifted" + dir = 8 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 8; - icon_state = "bordercolor_shifted" + dir = 8 }, /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/structure/table/reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -1829,13 +1741,10 @@ /area/security/brig/visitation) "cH" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -1893,16 +1802,13 @@ /area/maintenance/station/sec_lower) "cM" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, @@ -1960,8 +1866,7 @@ icon_state = "4-8" }, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/security/brig) @@ -1994,7 +1899,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -2003,7 +1907,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/window/brigdoor/southleft{ dir = 4; - icon_state = "leftsecure"; id = "Cell 3"; name = "Cell 3"; req_access = list(2) @@ -2059,7 +1962,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -2165,13 +2067,10 @@ /area/tether/exploration/showers) "de" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -2214,13 +2113,10 @@ /area/engineering/shaft) "di" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -2237,16 +2133,13 @@ /area/security/brig/visitation) "dk" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 4; - icon_state = "borderfloor_shifted" + dir = 4 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 4; - icon_state = "bordercolor_shifted" + dir = 4 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -2296,16 +2189,13 @@ /area/engineering/shaft) "do" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 8; - icon_state = "borderfloor_shifted" + dir = 8 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 8; - icon_state = "bordercolor_shifted" + dir = 8 }, /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -2321,7 +2211,6 @@ "dp" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/vending/hydronutrients/brig{ @@ -2331,16 +2220,13 @@ /area/security/brig) "dq" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/closet/secure_closet/brig{ @@ -2375,16 +2261,13 @@ /area/security/security_cell_hallway) "dt" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 8; - icon_state = "borderfloor_shifted" + dir = 8 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 8; - icon_state = "bordercolor_shifted" + dir = 8 }, /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -2396,8 +2279,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 10; - icon_state = "borderfloorcorner2_black" + dir = 10 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -2427,16 +2309,13 @@ /area/security/recstorage) "dw" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/closet/secure_closet/brig{ @@ -2448,8 +2327,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/red/border/shifted, /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -2503,7 +2381,6 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -2515,7 +2392,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled/white, @@ -2543,7 +2419,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -2568,7 +2443,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1442; - icon_state = "map_injector"; id = "riot_inject" }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -2587,8 +2461,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/red/border/shifted, /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -2614,7 +2487,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; frequency = 1442; - icon_state = "map_injector"; id = "riot_inject" }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -2622,16 +2494,13 @@ /area/security/brig) "dO" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/closet/secure_closet/brig{ @@ -2686,9 +2555,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -2764,8 +2631,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 @@ -2837,12 +2703,10 @@ "ef" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled/dark, @@ -2883,8 +2747,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/dark, /area/storage/tech) @@ -2939,8 +2802,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/security/brig/visitation) @@ -2980,8 +2842,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/green, /obj/effect/floor_decal/corner/lightorange/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /obj/structure/bed/chair{ dir = 1 @@ -2990,8 +2851,7 @@ /area/security/brig) "et" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/alarm{ dir = 1; @@ -3040,7 +2900,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -3057,13 +2916,10 @@ /area/security/brig) "ex" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, @@ -3103,13 +2959,10 @@ /area/ai_upload) "eB" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -3122,7 +2975,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -3172,14 +3024,11 @@ dir = 1 }, /obj/effect/floor_decal/corner/white/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -3189,8 +3038,7 @@ dir = 10 }, /obj/effect/floor_decal/corner/white/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -3202,8 +3050,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 @@ -3232,13 +3079,10 @@ dir = 9 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 10 @@ -3279,13 +3123,10 @@ /area/tether/exploration/hallway) "eL" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -3297,8 +3138,7 @@ dir = 4 }, /obj/machinery/camera/network/exploration{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) @@ -3378,16 +3218,14 @@ /area/tether/exploration/staircase) "eS" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/sign/deathsposal{ pixel_x = -32 @@ -3477,8 +3315,7 @@ id = "interrogation" }, /obj/structure/window/reinforced/tinted{ - dir = 8; - icon_state = "twindow" + dir = 8 }, /obj/structure/window/reinforced/tinted, /obj/structure/window/reinforced/tinted{ @@ -3505,8 +3342,7 @@ /obj/structure/table/steel, /obj/item/toy/stickhorse, /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/security/recstorage) @@ -3520,8 +3356,7 @@ id = "interrogation" }, /obj/structure/window/reinforced/tinted{ - dir = 4; - icon_state = "twindow" + dir = 4 }, /obj/structure/window/reinforced/tinted, /obj/structure/window/reinforced/tinted{ @@ -3562,7 +3397,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -3570,9 +3404,7 @@ "fi" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/catwalk, /turf/simulated/floor, @@ -3687,8 +3519,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 @@ -3706,18 +3537,13 @@ /area/tether/exploration/hallway) "fz" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 10 @@ -3733,7 +3559,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -3768,8 +3593,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 @@ -3833,8 +3657,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -3885,13 +3708,10 @@ /area/security/interrogation) "fL" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -3948,8 +3768,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4014,8 +3833,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance/engi{ - name = "Engineering Electrical Shaft"; - req_one_access = list(10) + name = "Engineering Electrical Shaft" }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, @@ -4035,7 +3853,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -4077,7 +3894,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/dark, @@ -4087,8 +3903,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 6 @@ -4110,13 +3925,10 @@ /area/tether/exploration/crew) "ge" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 8 @@ -4131,8 +3943,7 @@ dir = 5 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -4185,8 +3996,7 @@ dir = 10 }, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/bluegrid, /area/ai_upload) @@ -4243,7 +4053,6 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -4301,8 +4110,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/locker_room) @@ -4334,8 +4142,7 @@ /area/hallway/station/starboard) "gy" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4348,13 +4155,10 @@ /area/security/security_cell_hallway) "gz" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -4366,8 +4170,7 @@ /obj/item/weapon/paper_bin, /obj/item/device/taperecorder, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) @@ -4411,8 +4214,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -4434,13 +4236,10 @@ /area/tether/exploration/crew) "gH" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -4458,8 +4257,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 6 @@ -4481,13 +4279,10 @@ /area/tether/exploration/hallway) "gJ" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 8 @@ -4506,7 +4301,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled, @@ -4519,8 +4313,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) @@ -4623,8 +4416,7 @@ dir = 8 }, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled, /area/security/brig) @@ -4650,8 +4442,7 @@ /area/security/security_cell_hallway) "gW" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4702,8 +4493,7 @@ icon_state = "comfychair_preview" }, /obj/machinery/camera/network/exploration{ - dir = 1; - icon_state = "camera" + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) @@ -4753,13 +4543,10 @@ /area/tether/exploration/crew) "hf" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -4790,8 +4577,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -4806,8 +4592,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -4853,8 +4638,7 @@ /area/maintenance/station/exploration) "hn" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4973,7 +4757,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/dark, @@ -5049,14 +4832,9 @@ /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "hC" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/purple/bordercorner, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -5076,8 +4854,7 @@ /area/tether/exploration/hallway) "hD" = ( /obj/machinery/ai_status_display{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/porta_turret, /turf/simulated/floor/bluegrid, @@ -5096,7 +4873,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /turf/simulated/floor/tiled/techfloor, @@ -5128,17 +4904,14 @@ }, /obj/item/device/radio/intercom/locked/ai_private{ dir = 1; - icon_state = "intercom"; pixel_y = 32 }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "hH" = ( /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/porta_turret, /turf/simulated/floor/bluegrid, @@ -5208,8 +4981,7 @@ "hP" = ( /obj/structure/railing, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/open, /area/engineering/locker_room) @@ -5218,13 +4990,10 @@ /area/engineering/foyer_mezzenine) "hR" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 @@ -5233,13 +5002,10 @@ /area/tether/exploration/hallway) "hS" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -5380,9 +5146,7 @@ "if" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/bluegrid, /area/ai_upload) @@ -5455,26 +5219,21 @@ dir = 9 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "in" = ( /obj/structure/disposalpipe/sortjunction{ dir = 8; - icon_state = "pipe-j1s"; name = "Exploration Hangar"; sortType = "Exploration Hangar" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -5488,13 +5247,10 @@ icon_state = "pipe-c" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -5573,8 +5329,7 @@ icon_state = "4-8" }, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/security/interrogation) @@ -5592,18 +5347,13 @@ /area/tether/exploration/staircase) "iy" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 4 @@ -5640,13 +5390,10 @@ /area/security/riot_control) "iA" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -5657,13 +5404,10 @@ /area/tether/exploration/hallway) "iB" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -5689,13 +5433,10 @@ /area/security/security_cell_hallway) "iE" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -5704,7 +5445,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -5751,13 +5491,10 @@ icon_state = "1-2" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 @@ -5767,13 +5504,10 @@ /area/tether/exploration/hallway) "iI" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -5786,22 +5520,17 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "iJ" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -5831,8 +5560,7 @@ }, /obj/structure/flora/pottedplant/crystal, /obj/machinery/camera/network/exploration{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -6026,20 +5754,16 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/bluegrid, /area/ai_upload) "iY" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -6051,8 +5775,7 @@ dir = 4 }, /obj/machinery/camera/network/exploration{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -6115,7 +5838,6 @@ "jc" = ( /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -6266,7 +5988,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -6284,14 +6005,6 @@ /turf/simulated/floor/bluegrid, /area/ai_upload) "jn" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/purple/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -6304,6 +6017,14 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/purple/bordercorner, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "jo" = ( @@ -6384,8 +6105,7 @@ dir = 4 }, /obj/machinery/camera/network/exploration{ - dir = 1; - icon_state = "camera" + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -6444,8 +6164,7 @@ /area/tether/exploration/crew) "ju" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/railing, /turf/simulated/floor, @@ -6559,7 +6278,6 @@ /obj/effect/floor_decal/corner/yellow/border, /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -6609,8 +6327,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) @@ -6783,7 +6500,6 @@ /area/storage/tech) "jS" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -6866,33 +6582,32 @@ /area/ai_upload) "kb" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/bluegrid, /area/ai_upload) "kc" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, /obj/structure/table/rack/shelf, -/obj/item/device/multitool/tether_buffered{ - pixel_y = 2 +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = 24 }, -/obj/item/weapon/storage/toolbox/mechanical{ - pixel_y = -4 - }, -/obj/item/weapon/hand_labeler, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "kd" = ( @@ -6905,13 +6620,10 @@ /area/ai_upload) "ke" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -6923,8 +6635,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -6988,24 +6699,25 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "km" = ( +/obj/item/clothing/under/gladiator, +/obj/item/clothing/head/helmet/gladiator, +/turf/simulated/floor, +/area/tether/exploration/hallway) +"kn" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) -"kn" = ( -/turf/simulated/wall, -/area/tether/exploration/hallway) "ko" = ( /obj/structure/catwalk, /turf/simulated/floor, @@ -7073,8 +6785,7 @@ }, /obj/effect/floor_decal/techfloor/hole/right, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) @@ -7134,55 +6845,63 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "kA" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/purple/border{ - dir = 6 - }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/purple/border, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/purple/bordercorner2, -/obj/structure/flora/pottedplant/unusual, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "kB" = ( -/obj/item/clothing/under/gladiator, -/obj/item/clothing/head/helmet/gladiator, -/turf/simulated/floor, -/area/tether/exploration/hallway) -"kC" = ( /obj/item/weapon/material/twohanded/spear/foam, /turf/simulated/floor, /area/tether/exploration/hallway) -"kD" = ( -/obj/structure/table/rack/shelf, +"kC" = ( /obj/effect/floor_decal/borderfloor{ - dir = 9 + dir = 6 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 9; - icon_state = "bordercolor" + dir = 6 }, +/obj/structure/flora/pottedplant/unusual, +/turf/simulated/floor/tiled, +/area/tether/exploration/hallway) +"kD" = ( +/obj/structure/table/rack/shelf, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, /obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, /obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, /obj/item/clothing/head/helmet/space/void/exploration, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "kE" = ( /obj/structure/table/rack/shelf, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -7190,18 +6909,14 @@ }, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "kF" = ( @@ -7233,14 +6948,11 @@ "kH" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Exploration"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 0 + icon_state = "0-2" }, /obj/structure/cable/green, /obj/machinery/camera/network/engineering{ @@ -7305,15 +7017,11 @@ /turf/simulated/floor, /area/storage/tech) "kR" = ( -/obj/structure/table/rack/shelf, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -7325,19 +7033,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/machinery/suit_cycler/exploration, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "kS" = ( @@ -7351,8 +7047,7 @@ dir = 9 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) @@ -7402,8 +7097,7 @@ /area/maintenance/station/eng_upper) "kX" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/zpipe/down, /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers, @@ -7486,13 +7180,11 @@ /area/hallway/station/starboard) "lc" = ( /obj/machinery/power/terminal{ - dir = 8; - icon_state = "term" + dir = 8 }, /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 0 + icon_state = "0-2" }, /obj/machinery/light/small{ dir = 4 @@ -7538,15 +7230,16 @@ /turf/simulated/floor, /area/maintenance/substation/exploration) "lg" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, -/area/hallway/station/starboard) +/area/tether/exploration/equipment) "lh" = ( /obj/structure/cable{ d1 = 4; @@ -7575,24 +7268,27 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "lk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "ll" = ( @@ -7637,18 +7333,13 @@ /area/maintenance/station/exploration) "lo" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 4 @@ -7657,26 +7348,18 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/item/device/radio/intercom{ - dir = 1; - pixel_y = 24; - req_access = list() - }, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/flora/pottedplant/unusual, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "lp" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/steel, @@ -7694,7 +7377,13 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 5 }, -/obj/machinery/suit_cycler/exploration, +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "lr" = ( @@ -7707,8 +7396,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/catwalk, /turf/simulated/floor, @@ -7721,7 +7409,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/catwalk, @@ -7806,8 +7493,7 @@ "ly" = ( /obj/machinery/status_display{ layer = 4; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor, @@ -7930,8 +7616,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -7978,42 +7663,24 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "lM" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, /obj/effect/floor_decal/borderfloor{ - dir = 4 + dir = 5 }, /obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = 24 + dir = 5 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "lN" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 4 @@ -8023,9 +7690,7 @@ dir = 4 }, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/photocopier, @@ -8109,51 +7774,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"lU" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 - }, -/obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) -"lV" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) "lW" = ( /obj/structure/cable/green{ d1 = 4; @@ -8163,9 +7783,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "lX" = ( @@ -8175,11 +7792,10 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) @@ -8188,8 +7804,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -8212,13 +7827,10 @@ /area/tether/exploration/pathfinder_office) "ma" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -8294,7 +7906,6 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -8405,12 +8016,10 @@ "ml" = ( /obj/structure/table/steel, /obj/item/device/integrated_electronics/debugger{ - pixel_x = -5; - pixel_y = 0 + pixel_x = -5 }, /obj/item/device/integrated_electronics/wirer{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /turf/simulated/floor, /area/storage/tech) @@ -8508,8 +8117,7 @@ /obj/structure/cable, /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 0 + icon_state = "0-2" }, /obj/structure/cable{ d2 = 8; @@ -8526,20 +8134,22 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "mv" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/lightgrey/border{ +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/hallway/station/starboard) +/area/tether/exploration/hallway) "mw" = ( /obj/structure/railing, /obj/random/junk, @@ -8558,8 +8168,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -8817,7 +8426,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -8892,9 +8500,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/green{ @@ -9037,7 +8643,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -9047,13 +8652,11 @@ /obj/machinery/turretid/stun{ control_area = /area/ai_upload; name = "AI Upload turret control"; - pixel_x = 0; pixel_y = 30 }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) @@ -9166,8 +8769,7 @@ /area/hallway/station/starboard) "nm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) @@ -9179,7 +8781,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -9376,7 +8977,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; @@ -9398,7 +8998,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor, @@ -9556,7 +9155,6 @@ /area/tether/station/stairs_two) "nU" = ( /obj/machinery/ai_status_display{ - pixel_x = 0; pixel_y = -32 }, /obj/structure/table/rack/steel, @@ -9630,8 +9228,7 @@ "nZ" = ( /obj/machinery/status_display{ layer = 4; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/floor_decal/rust, /turf/simulated/floor, @@ -9679,8 +9276,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/open, /area/engineering/foyer_mezzenine) @@ -9727,8 +9323,7 @@ dir = 10 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -9762,8 +9357,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/catwalk, /obj/structure/disposalpipe/segment, @@ -9785,8 +9379,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -9816,13 +9409,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/catwalk, /obj/structure/disposalpipe/segment, @@ -9839,8 +9430,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/catwalk, /obj/structure/disposalpipe/segment, @@ -9951,33 +9541,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"oB" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 - }, -/obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/structure/table/bench/wooden, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 - }, -/obj/effect/landmark/start{ - name = "Field Medic" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) "oC" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -10045,8 +9608,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) @@ -10121,7 +9683,6 @@ /obj/machinery/door/airlock/glass_command{ id_tag = "evadoors"; name = "E.V.A."; - req_access = list(); req_one_access = list(18,19,43,67) }, /obj/machinery/door/firedoor/glass, @@ -10143,7 +9704,6 @@ /obj/machinery/door/airlock/glass_command{ id_tag = "evadoors"; name = "E.V.A."; - req_access = list(); req_one_access = list(18,19,43,67) }, /obj/machinery/door/firedoor/glass, @@ -10311,7 +9871,7 @@ "pu" = ( /obj/structure/table/bench/wooden, /obj/effect/landmark/start{ - name = "Field Medic" + name = "Explorer" }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) @@ -10364,8 +9924,7 @@ }, /obj/machinery/requests_console{ department = "EVA"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -10403,8 +9962,7 @@ /area/ai_monitored/storage/eva) "pC" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -10436,13 +9994,6 @@ /obj/item/clothing/head/helmet/space/void/security, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) -"pF" = ( -/obj/structure/table/bench/wooden, -/obj/effect/landmark/start{ - name = "Explorer" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) "pG" = ( /turf/simulated/floor/plating, /area/vacant/vacant_restaurant_upper) @@ -10507,8 +10058,7 @@ "pN" = ( /obj/machinery/requests_console{ department = "Tech storage"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/simulated/floor, /area/storage/tech) @@ -10551,7 +10101,6 @@ /area/hallway/station/starboard) "pR" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -10595,8 +10144,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -10612,9 +10160,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -10656,8 +10202,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -10667,7 +10212,7 @@ }, /obj/structure/table/bench/wooden, /obj/effect/landmark/start{ - name = "Explorer" + name = "Field Medic" }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) @@ -10676,8 +10221,7 @@ /area/ai_monitored/storage/eva) "qd" = ( /obj/machinery/door/airlock/glass_medical{ - name = "Medical Hardsuits"; - req_one_access = list(5) + name = "Medical Hardsuits" }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, @@ -10703,8 +10247,7 @@ /area/ai_monitored/storage/eva) "qh" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -10827,7 +10370,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable{ @@ -10874,8 +10416,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -10902,7 +10443,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /obj/structure/disposalpipe/segment{ @@ -11007,6 +10547,29 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) +"qJ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/table/bench/wooden, +/obj/effect/landmark/start{ + name = "Explorer" + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "qL" = ( /obj/structure/sign/nosmoking_1{ pixel_y = 32 @@ -11050,9 +10613,7 @@ /area/medical/surgery_hallway) "qP" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/item/device/radio/intercom{ @@ -11116,15 +10677,13 @@ /area/ai_monitored/storage/eva) "qU" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/table/rack, /obj/item/device/suit_cooling_unit, /obj/item/device/suit_cooling_unit, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -11157,8 +10716,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -11171,8 +10729,7 @@ department = "Pathfinder's Office" }, /obj/machinery/camera/network/exploration{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/exploration/pathfinder_office) @@ -11187,8 +10744,7 @@ /area/ai_server_room) "rb" = ( /obj/structure/disposalpipe/broken{ - dir = 4; - icon_state = "pipe-b" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -11323,7 +10879,6 @@ desc = "A remote control switch for exiting EVA."; id = "evadoors"; name = "EVA Door Control"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11336,9 +10891,7 @@ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -11361,8 +10914,7 @@ "ry" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -11383,8 +10935,7 @@ /area/medical/surgery_hallway) "rE" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11461,8 +11012,7 @@ dir = 4 }, /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -11568,8 +11118,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -11602,7 +11151,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -11623,7 +11171,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /obj/effect/floor_decal/borderfloor/corner2{ @@ -11636,8 +11183,7 @@ /area/hallway/station/port) "rZ" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/table/reinforced, /obj/fiftyspawner/rglass, @@ -11694,8 +11240,7 @@ scrub_id = "sec_riot_control" }, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/plating, /area/security/brig) @@ -11824,8 +11369,7 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -11835,14 +11379,11 @@ /area/medical/psych) "sJ" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -11872,8 +11413,7 @@ /area/medical/surgery_hallway) "sP" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/table/reinforced, /obj/item/weapon/storage/toolbox/electrical{ @@ -11965,8 +11505,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) @@ -12068,8 +11607,7 @@ "tr" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -12214,8 +11752,7 @@ /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, @@ -12238,18 +11775,14 @@ /area/ai_upload_foyer) "tH" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/open, /area/vacant/vacant_restaurant_upper) "tI" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -12275,8 +11808,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 @@ -12336,9 +11868,7 @@ pixel_y = -3 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -12403,8 +11933,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/cable/green{ d1 = 1; @@ -12447,8 +11976,7 @@ /area/ai_monitored/storage/eva) "uh" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12475,8 +12003,7 @@ "uk" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) @@ -12512,9 +12039,7 @@ "ur" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; - pixel_x = 2; - pixel_y = 0 + pixel_x = 2 }, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 5 @@ -12527,8 +12052,7 @@ /area/medical/resleeving) "us" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/effect/floor_decal/techfloor{ dir = 1 @@ -12539,9 +12063,7 @@ "ut" = ( /obj/machinery/washing_machine, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -12593,8 +12115,7 @@ /obj/item/weapon/storage/box/syringes, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -12672,15 +12193,13 @@ "uG" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "uH" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -12717,8 +12236,7 @@ req_one_access = list(18) }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -12733,7 +12251,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /obj/effect/map_helper/airlock/door/int_door, @@ -12908,8 +12425,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) @@ -12919,8 +12435,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) @@ -12932,8 +12447,7 @@ /area/ai_monitored/storage/eva) "vj" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/table/reinforced, /obj/item/weapon/storage/toolbox/mechanical{ @@ -12948,8 +12462,7 @@ /area/ai_monitored/storage/eva) "vk" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/tiled, @@ -12969,8 +12482,7 @@ /area/vacant/vacant_restaurant_upper) "vn" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -12979,8 +12491,7 @@ /area/tether/station/stairs_two) "vo" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12995,8 +12506,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13011,8 +12521,7 @@ /area/tether/station/stairs_two) "vq" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13024,8 +12533,7 @@ /area/tether/station/stairs_two) "vr" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13050,8 +12558,7 @@ }, /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /turf/simulated/floor/tiled/monofloor{ dir = 1 @@ -13083,8 +12590,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) @@ -13093,8 +12599,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -13115,8 +12620,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) @@ -13125,8 +12629,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/techfloor{ dir = 10 @@ -13138,8 +12641,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/dark, @@ -13147,9 +12649,7 @@ "vB" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -13193,7 +12693,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13248,7 +12747,6 @@ /obj/effect/floor_decal/industrial/warning, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -13266,7 +12764,6 @@ /obj/effect/floor_decal/industrial/warning/corner, /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -13406,8 +12903,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -13431,8 +12927,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) @@ -13446,8 +12941,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -13478,8 +12972,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) @@ -13523,8 +13016,7 @@ pixel_y = -2 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -13586,10 +13078,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/o2{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/storage/firstaid/o2, /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, @@ -13626,9 +13115,7 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -13678,7 +13165,6 @@ }, /obj/machinery/light_switch{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/simulated/floor/tiled/white, @@ -13692,7 +13178,6 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/computer/guestpass{ dir = 1; - icon_state = "guest"; pixel_y = -28 }, /turf/simulated/floor/tiled/white, @@ -13702,7 +13187,6 @@ dir = 1 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -13760,7 +13244,6 @@ /obj/structure/table/glass, /obj/item/weapon/book/manual/resleeving, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/structure/sign/nosmoking_1{ @@ -13798,10 +13281,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/toxin{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/storage/firstaid/toxin, /obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/tiled/white, /area/medical/biostorage) @@ -13811,10 +13291,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/fire{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/storage/firstaid/fire, /obj/effect/floor_decal/corner/yellow/full{ dir = 4 }, @@ -13822,8 +13299,7 @@ /area/medical/biostorage) "wP" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -13875,8 +13351,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ @@ -13907,7 +13382,6 @@ "wV" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor, @@ -13915,15 +13389,13 @@ "wW" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ scrub_id = "sec_riot_control" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/plating, /area/security/brig) @@ -13940,12 +13412,10 @@ /area/medical/surgery_hallway) "wY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/techfloor, /obj/effect/landmark{ @@ -14010,8 +13480,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -14052,8 +13521,7 @@ "xk" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/cable/green{ d1 = 1; @@ -14131,8 +13599,7 @@ dir = 4 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/biostorage) @@ -14156,8 +13623,7 @@ /obj/item/device/healthanalyzer, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -14194,7 +13660,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -14215,9 +13680,7 @@ "xv" = ( /obj/structure/bed/chair, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -14269,8 +13732,7 @@ dir = 8 }, /obj/machinery/camera/network/medbay{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -14339,8 +13801,7 @@ }, /obj/structure/closet/crate{ icon_state = "crate"; - name = "Grenade Crate"; - opened = 0 + name = "Grenade Crate" }, /obj/item/weapon/grenade/chem_grenade, /obj/item/weapon/grenade/chem_grenade, @@ -14401,8 +13862,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/biostorage) @@ -14416,8 +13876,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -14465,8 +13924,7 @@ dir = 4 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -14477,15 +13935,13 @@ dir = 10 }, /obj/effect/floor_decal/corner/white/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/effect/floor_decal/borderfloorwhite/corner2{ dir = 9 }, /obj/effect/floor_decal/corner/white/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -14532,7 +13988,6 @@ "ye" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 12; pixel_y = 8 }, @@ -14546,8 +14001,7 @@ dir = 5 }, /obj/effect/floor_decal/corner/white/bordercorner2{ - dir = 5; - icon_state = "bordercolorcorner2" + dir = 5 }, /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -14596,7 +14050,6 @@ icon_state = "pipe-c" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -14641,8 +14094,7 @@ /area/medical/surgery_hallway) "yr" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -14672,8 +14124,7 @@ /area/tether/station/stairs_two) "yt" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/landmark{ name = "JoinLateCyborg" @@ -14703,17 +14154,15 @@ /turf/simulated/floor, /area/maintenance/station/medbay) "yA" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/purple/border, +/obj/structure/closet/secure_closet/explorer, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 }, -/obj/effect/floor_decal/corner/purple/border{ - dir = 10 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/obj/structure/closet/secure_closet/sar, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "yB" = ( @@ -14729,7 +14178,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/structure/closet/secure_closet/sar, +/obj/structure/closet/secure_closet/explorer, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "yJ" = ( @@ -14740,8 +14189,7 @@ dir = 4 }, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/security/brig) @@ -14804,8 +14252,7 @@ "yZ" = ( /obj/machinery/optable, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/white, @@ -14870,8 +14317,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -14908,8 +14354,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/door/airlock/maintenance/medical, /turf/simulated/floor/tiled/white, @@ -14999,8 +14444,7 @@ dir = 6 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -15012,10 +14456,8 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -15027,8 +14469,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor, /area/maintenance/station/medbay) @@ -15076,8 +14517,7 @@ /obj/structure/closet/secure_closet/personal/patient, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -15107,13 +14547,11 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/button/windowtint{ id = "patient_room_a"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/green{ d2 = 2; @@ -15191,8 +14629,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/disposalpipe/segment, /obj/random/junk, @@ -15226,8 +14663,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 @@ -15250,8 +14686,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/patient_a) @@ -15269,8 +14704,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -15293,8 +14727,7 @@ "zZ" = ( /obj/machinery/door/firedoor/glass/hidden/steel, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -15367,9 +14800,7 @@ "Af" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop{ - dir = 8; - pixel_x = 0; - pixel_y = 0 + dir = 8 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -15401,9 +14832,7 @@ /area/medical/surgery_hallway) "Ah" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -15421,8 +14850,7 @@ /obj/structure/table/woodentable, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/machinery/light{ dir = 4 @@ -15492,8 +14920,7 @@ icon_state = "0-4" }, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /obj/random/junk, /obj/structure/table/rack{ @@ -15503,7 +14930,6 @@ /turf/simulated/floor, /area/maintenance/station/medbay) "As" = ( -/obj/structure/closet/secure_closet/explorer, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -15512,6 +14938,14 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/structure/table/rack/shelf, +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_y = -4 + }, +/obj/item/device/multitool/tether_buffered{ + pixel_y = 2 + }, +/obj/item/weapon/hand_labeler, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "At" = ( @@ -15574,8 +15008,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -15590,16 +15023,14 @@ /area/medical/surgery_hallway) "AC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "AD" = ( /obj/structure/railing, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /obj/random/trash_pile, /turf/simulated/floor, @@ -15619,8 +15050,7 @@ "AF" = ( /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -15643,13 +15073,11 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/button/windowtint{ id = "patient_room_b"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/green{ d2 = 2; @@ -15822,8 +15250,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 @@ -15846,8 +15273,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/patient_b) @@ -15888,8 +15314,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -15905,8 +15330,7 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -15930,8 +15354,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -15955,8 +15378,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/junction{ dir = 4; @@ -16150,7 +15572,6 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "Bt" = ( -/obj/structure/closet/secure_closet/explorer, /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -16160,6 +15581,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/closet/secure_closet/sar, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Bu" = ( @@ -16206,7 +15628,6 @@ "By" = ( /obj/structure/closet/crate/freezer, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -16220,7 +15641,6 @@ /obj/item/weapon/storage/box/bloodpacks, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /obj/effect/floor_decal/borderfloorwhite, @@ -16233,8 +15653,7 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -16264,7 +15683,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -16380,7 +15798,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/recharger/wallcharger{ @@ -16401,8 +15818,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 @@ -16514,16 +15930,14 @@ pixel_y = 6 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/tiled/white, /area/medical/recoveryrestroom) "Cg" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/medical/recoveryrestroom) @@ -16543,7 +15957,6 @@ }, /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -16626,8 +16039,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -16679,8 +16091,7 @@ "Cy" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/light, /turf/simulated/floor/tiled/white, @@ -16729,8 +16140,7 @@ dir = 6 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) @@ -16798,8 +16208,7 @@ "CM" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/tiled/white, /area/medical/recoveryrestroom) @@ -16887,8 +16296,7 @@ dir = 8 }, /obj/machinery/camera/network/medbay{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -16908,8 +16316,7 @@ /obj/item/weapon/bedsheet/medical, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -16939,9 +16346,7 @@ /obj/structure/table/standard, /obj/random/soap, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -16959,14 +16364,11 @@ "Da" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/simulated/floor/tiled/white, /area/medical/recoveryrestroom) @@ -17001,8 +16403,7 @@ "De" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/cable/green{ d1 = 1; @@ -17028,8 +16429,7 @@ }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -17074,8 +16474,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -17151,8 +16550,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -17167,12 +16565,10 @@ }, /obj/item/device/radio/intercom/locked/ai_private{ dir = 4; - icon_state = "intercom"; pixel_x = 32 }, /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) @@ -17187,6 +16583,28 @@ /obj/structure/closet/wardrobe/orange, /turf/simulated/floor/tiled/dark, /area/security/recstorage) +"Dt" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Dv" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -17374,7 +16792,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -17477,9 +16894,7 @@ /area/maintenance/station/exploration) "Ec" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/railing{ @@ -17511,8 +16926,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -17531,13 +16945,10 @@ /area/maintenance/station/sec_lower) "Eh" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -17575,6 +16986,9 @@ /area/tether/exploration/crew) "El" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "En" = ( @@ -17594,8 +17008,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 @@ -17658,8 +17071,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/cable/green{ d1 = 2; @@ -17719,8 +17131,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/recoveryrestroom) @@ -17735,17 +17146,13 @@ "EI" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -17768,7 +17175,6 @@ }, /obj/machinery/light_switch{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -17839,8 +17245,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/security/brig/visitation) @@ -17884,8 +17289,7 @@ /area/medical/ward) "ET" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -17922,8 +17326,7 @@ }, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 @@ -17948,8 +17351,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -17970,8 +17372,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/security/brig/visitation) @@ -17987,8 +17388,7 @@ /area/medical/ward) "Fb" = ( /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled, /area/security/brig/visitation) @@ -17996,7 +17396,6 @@ /obj/structure/bed/padded, /obj/item/weapon/bedsheet/medical, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -18048,9 +17447,7 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -18065,10 +17462,8 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/tiled/white, /area/medical/ward) @@ -18076,8 +17471,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/status_display{ pixel_y = 30 @@ -18161,8 +17555,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -18184,7 +17577,6 @@ /turf/simulated/floor, /area/maintenance/station/sec_lower) "Fy" = ( -/obj/structure/closet/secure_closet/explorer, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -18194,9 +17586,9 @@ dir = 8 }, /obj/machinery/camera/network/exploration{ - dir = 1; - icon_state = "camera" + dir = 1 }, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Fz" = ( @@ -18267,7 +17659,6 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_two) "FE" = ( -/obj/structure/table/bench/wooden, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "FH" = ( @@ -18371,6 +17762,19 @@ "Gw" = ( /turf/simulated/floor/tiled/dark, /area/security/brig) +"GC" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 10 + }, +/obj/structure/closet/secure_closet/explorer, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "GD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18443,8 +17847,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -18494,8 +17897,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -18750,9 +18152,7 @@ /area/hallway/station/starboard) "IG" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/carpet/bcarpet, @@ -18768,7 +18168,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -18816,8 +18215,7 @@ "Jp" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/structure/cable/green{ d1 = 1; @@ -18882,8 +18280,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -18929,6 +18326,32 @@ /obj/structure/inflatable/door, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Kq" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/purple/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/hallway) +"Kt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Kv" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 6 @@ -19130,11 +18553,8 @@ "LP" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 1; - dir = 4; id_tag = null; name = "Exploration Equipment Storage"; - req_access = list(); req_one_access = list(19,43,67) }, /obj/structure/cable/green{ @@ -19150,6 +18570,12 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod1) +"Mf" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "Mn" = ( /obj/structure/table/steel, /turf/simulated/floor, @@ -19179,8 +18605,7 @@ /area/engineering/foyer_mezzenine) "Mw" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/closet/crate, /obj/random/junk, @@ -19207,13 +18632,10 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -19292,8 +18714,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/structure/cable/green{ d1 = 4; @@ -19323,8 +18744,7 @@ /area/engineering/locker_room) "Ng" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -19470,8 +18890,7 @@ "Oj" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/table/steel, /obj/random/maintenance/engineering, @@ -19486,8 +18905,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -19557,9 +18975,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -19585,8 +19001,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - icon_state = "map-scrubbers" + dir = 1 }, /turf/simulated/floor/tiled, /area/hallway/station/port) @@ -19651,16 +19066,14 @@ /area/hallway/station/starboard) "Pm" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/recharge_station, /turf/simulated/floor/tiled, /area/security/brig) "Pn" = ( /obj/effect/floor_decal/corner_steel_grid{ - dir = 4; - icon_state = "steel_grid" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -19687,8 +19100,7 @@ /area/maintenance/station/sec_lower) "PJ" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -19714,12 +19126,10 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/light_switch{ dir = 4; - icon_state = "light1"; pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -19733,8 +19143,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -19918,7 +19327,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -20020,8 +19428,7 @@ /area/maintenance/station/sec_lower) "Rg" = ( /obj/effect/floor_decal/corner/white/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled/monotile, /area/security/brig) @@ -20138,9 +19545,7 @@ /area/hallway/station/starboard) "Sb" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -20165,9 +19570,7 @@ icon_state = "pipe-c" }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -20218,13 +19621,10 @@ "SW" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -20295,6 +19695,13 @@ }, /turf/simulated/floor/tiled, /area/security/brig/visitation) +"Tl" = ( +/obj/structure/table/bench/wooden, +/obj/effect/landmark/start{ + name = "Field Medic" + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "Tm" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -20436,7 +19843,6 @@ icon_state = "1-4" }, /obj/machinery/door/blast/regular{ - dir = 1; id = "Cell 1"; name = "Cell 1" }, @@ -20610,6 +20016,30 @@ /obj/structure/bed/chair/shuttle, /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod1) +"Vi" = ( +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "Vk" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -20669,8 +20099,7 @@ dir = 4 }, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" + dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/station/port) @@ -20703,7 +20132,6 @@ icon_state = "1-4" }, /obj/machinery/door/blast/regular{ - dir = 1; id = "Cell 3"; name = "Cell 3" }, @@ -20838,7 +20266,6 @@ "WE" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 8 }, @@ -20880,12 +20307,34 @@ }, /turf/simulated/floor/tiled, /area/tether/station/stairs_two) +"WR" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/purple/border, +/turf/simulated/floor/tiled, +/area/tether/exploration/hallway) "WU" = ( /obj/machinery/vending/wallmed1{ layer = 3.3; name = "Emergency NanoMed"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/closet/walllocker/emerglocker/north, /obj/structure/bed/chair/shuttle, @@ -20914,8 +20363,7 @@ /area/tether/station/stairs_two) "Xp" = ( /obj/machinery/atmospherics/pipe/tank/nitrous_oxide{ - dir = 1; - icon_state = "n2o_map" + dir = 1 }, /turf/simulated/floor, /area/security/riot_control) @@ -20977,6 +20425,18 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"XP" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/purple/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/closet/secure_closet/sar, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "XQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -21018,16 +20478,13 @@ /area/security/brig/visitation) "XT" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/alarm{ pixel_y = 22 @@ -21064,8 +20521,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/catwalk, /turf/simulated/floor/airless, @@ -21146,9 +20602,7 @@ /area/security/brig) "YH" = ( /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = -32 }, /obj/structure/bed/chair/shuttle{ @@ -21279,6 +20733,27 @@ "Zy" = ( /turf/simulated/floor/plating, /area/engineering/shaft) +"ZA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "ZE" = ( /obj/structure/table/steel, /obj/random/maintenance/engineering, @@ -21290,6 +20765,22 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"ZI" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 9 + }, +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/turf/simulated/floor/tiled, +/area/tether/exploration/equipment) "ZJ" = ( /obj/structure/table/steel, /obj/item/weapon/storage/briefcase/inflatable, @@ -21317,12 +20808,10 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/table/reinforced, /obj/random/maintenance/clean, @@ -21341,7 +20830,6 @@ icon_state = "1-4" }, /obj/machinery/door/blast/regular{ - dir = 1; id = "Cell 2"; name = "Cell 2" }, @@ -31797,7 +31285,7 @@ jt hK jO hC -km +fv kA ea hz @@ -31938,11 +31426,11 @@ Ek gZ bA iy -jK -kn -kn +mv +fv +Kq ea -nl +kx lJ lJ li @@ -32082,12 +31570,12 @@ gG iA jn kn -kB +kC ea -nl -lJ -lJ -li +lM +Dt +Kt +ZA nN pQ DL @@ -32222,13 +31710,13 @@ gF he gG iB -jo -kn -kC -ea -lg -lM -mv +WR +kp +kp +kp +kp +kp +kp lj nO pR @@ -32366,10 +31854,10 @@ bA iE jp kp -kp -kp -kp -kp +ZI +Vi +qJ +GC kp lm nQ @@ -32496,8 +31984,8 @@ ac ac ac ac -ac -ac +ea +km ea eI gh @@ -32509,8 +31997,8 @@ iF jq kp kD -lU -oB +lg +pu yA kp lT @@ -32638,8 +32126,8 @@ ac ac ac ac -ac -ac +ea +kB ea eK fy @@ -32651,7 +32139,7 @@ iG jr kp kE -lV +lW pu yH kp @@ -33078,7 +32566,7 @@ lL ks Es El -pF +FE Fy kp na @@ -33220,7 +32708,7 @@ jx kp lo lk -pF +FE As kp nb @@ -33361,9 +32849,9 @@ iJ jy kp kc -lk -pF -As +Mf +Tl +XP kp nb nR diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 3e3f6256213..aeb496cda4e 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -40,8 +40,7 @@ req_one_access = list(13) }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -63,8 +62,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/landmark{ name = "morphspawn" @@ -107,13 +105,11 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor, @@ -128,8 +124,7 @@ /area/security/eva) "aao" = ( /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /obj/machinery/atmospherics/binary/passive_gate/on{ dir = 4 @@ -146,8 +141,7 @@ /area/maintenance/station/ai) "aar" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/meter{ frequency = 1443; @@ -155,8 +149,7 @@ name = "Distribution Loop" }, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/security/eva) @@ -210,8 +203,7 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/glass_external, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor, @@ -256,7 +248,6 @@ "aaB" = ( /obj/effect/floor_decal/rust, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -433,8 +424,7 @@ icon_state = "4-8" }, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -443,8 +433,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/firealarm{ dir = 4; @@ -459,8 +448,7 @@ }, /obj/machinery/portable_atmospherics/canister/phoron, /obj/machinery/atmospherics/portables_connector/fuel{ - dir = 4; - icon_state = "map_connector-fuel" + dir = 4 }, /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, @@ -473,8 +461,7 @@ icon_state = "1-4" }, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -544,9 +531,7 @@ /obj/structure/catwalk, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor, /area/maintenance/station/sec_upper) @@ -596,8 +581,7 @@ "abj" = ( /obj/structure/catwalk, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -622,7 +606,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -635,8 +618,7 @@ dir = 8 }, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/floor, /area/maintenance/station/sec_upper) @@ -657,8 +639,7 @@ /area/maintenance/station/elevator) "abr" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -686,8 +667,7 @@ /area/security/hallwayaux) "abs" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -716,8 +696,7 @@ /area/security/hallwayaux) "abt" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -737,8 +716,7 @@ /area/security/hallwayaux) "abu" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -779,16 +757,14 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ icon_state = "2-8" }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/maintenance/substation/security) @@ -810,9 +786,7 @@ "abA" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Security"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green{ d2 = 4; @@ -844,9 +818,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/effect/floor_decal/rust, /turf/simulated/floor, @@ -868,7 +840,6 @@ icon_state = "1-4" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -885,9 +856,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -916,7 +885,6 @@ /obj/effect/floor_decal/corner/red/border, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -953,8 +921,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/hallwayaux) @@ -975,8 +942,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor, /area/maintenance/cargo) @@ -1018,8 +984,7 @@ /area/maintenance/station/ai) "abW" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable{ icon_state = "0-4" @@ -1050,9 +1015,7 @@ "abZ" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 2 - }, +/obj/effect/floor_decal/borderfloor/corner2, /turf/simulated/floor/tiled, /area/security/hallway) "aca" = ( @@ -1142,8 +1105,7 @@ /area/maintenance/station/elevator) "aci" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -1166,8 +1128,7 @@ /area/security/hallwayaux) "acj" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -1223,8 +1184,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor, @@ -1287,7 +1247,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -1337,9 +1296,7 @@ "acy" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -1411,8 +1368,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/danger/corner{ - dir = 1; - icon_state = "dangercorner" + dir = 1 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -1441,9 +1397,7 @@ "acL" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -1486,9 +1440,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -1655,9 +1607,7 @@ }, /obj/item/device/radio/intercom/department/security{ dir = 4; - icon_state = "secintercom"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/simulated/floor/wood, /area/security/breakroom) @@ -1702,15 +1652,13 @@ "adl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "adm" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1720,7 +1668,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable{ @@ -1791,8 +1738,7 @@ name = "tripai" }, /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/bluegrid, /area/ai) @@ -1815,8 +1761,7 @@ dir = 8 }, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -1854,9 +1799,7 @@ "adA" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/cable{ d1 = 1; @@ -1877,8 +1820,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/simulated/wall/r_wall, /area/quartermaster/belterdock) @@ -1887,8 +1829,7 @@ /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "adE" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/machinery/recharge_station, /turf/simulated/floor/tiled, @@ -1977,8 +1918,7 @@ "adN" = ( /obj/random/trash_pile, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -2038,8 +1978,7 @@ /obj/structure/bed/chair/shuttle, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/mining_outpost/shuttle) @@ -2071,8 +2010,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/maintenance/substation/cargo) @@ -2086,7 +2024,6 @@ "aea" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plating, @@ -2142,8 +2079,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2264,7 +2200,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -2280,8 +2215,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1; - icon_state = "map-fuel" + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) @@ -2302,20 +2236,17 @@ }, /obj/structure/closet/secure_closet/security, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/item/device/holowarrant, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "aev" = ( /obj/effect/floor_decal/borderfloorblack/corner{ - dir = 8; - icon_state = "borderfloorcorner_black" + dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /obj/structure/table/bench/steel, /obj/effect/landmark/start{ @@ -2352,8 +2283,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) @@ -2362,8 +2292,7 @@ /area/security/breakroom) "aez" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6; - icon_state = "intact-fuel" + dir = 6 }, /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -2373,12 +2302,10 @@ /area/shuttle/excursion/general) "aeA" = ( /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/effect/floor_decal/corner/red{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -2394,19 +2321,16 @@ dir = 1 }, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled, /area/security/hallwayaux) "aeB" = ( /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/effect/floor_decal/corner/red{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -2481,8 +2405,7 @@ /area/security/breakroom) "aeG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1; - icon_state = "map-fuel" + dir = 1 }, /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -2492,8 +2415,7 @@ /area/shuttle/excursion/general) "aeH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10; - icon_state = "intact-fuel" + dir = 10 }, /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -2640,7 +2562,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/effect/floor_decal/corner/lightgrey/border, @@ -2660,14 +2581,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor, /area/maintenance/station/sec_upper) @@ -2763,7 +2681,6 @@ "afb" = ( /obj/machinery/light_switch{ dir = 4; - icon_state = "light1"; pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -2803,7 +2720,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -2821,8 +2737,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -2848,7 +2763,6 @@ alarms_hidden = 1; dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28; req_access = list(); req_one_access = list(11,67) @@ -2900,8 +2814,7 @@ req_one_access = list(11,67) }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/structure/cable{ icon_state = "0-4" @@ -2949,7 +2862,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -2968,8 +2880,7 @@ /area/maintenance/station/ai) "afq" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/railing{ dir = 4 @@ -2979,7 +2890,6 @@ "afr" = ( /obj/machinery/power/apc{ alarms_hidden = 1; - dir = 2; name = "south bump"; pixel_y = -28; req_access = list(); @@ -2999,8 +2909,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) @@ -3056,7 +2965,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -3148,7 +3056,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /obj/machinery/door/firedoor/glass/hidden/steel{ @@ -3164,8 +3071,7 @@ dir = 9 }, /obj/machinery/shower{ - dir = 1; - icon_state = "shower" + dir = 1 }, /obj/structure/curtain/open/shower/security, /turf/simulated/floor/tiled, @@ -3218,13 +3124,11 @@ /obj/structure/table/steel, /obj/item/device/camera, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/item/device/retail_scanner/security, /turf/simulated/floor/tiled, @@ -3243,7 +3147,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "shuttle blast"; name = "Shuttle Blast Doors"; @@ -3325,11 +3228,13 @@ /turf/simulated/floor/bluegrid, /area/ai) "afV" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/wall/rshull, /area/shuttle/excursion/general) "afW" = ( /obj/effect/floor_decal/borderfloorblack, @@ -3413,20 +3318,21 @@ /turf/simulated/open, /area/security/brig) "agc" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_l" +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 }, -/turf/simulated/floor/tiled/asteroid_steel/airless, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/mining_outpost/shuttle) +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/wall/rshull, +/area/shuttle/excursion/general) "agd" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 +/obj/machinery/atmospherics/unary/engine{ + dir = 1 }, -/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/mining_outpost/shuttle) +/area/shuttle/excursion/general) "age" = ( /obj/structure/window/reinforced{ dir = 8 @@ -3435,7 +3341,6 @@ alarms_hidden = 1; dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28; req_access = list(); req_one_access = list(11,67) @@ -3451,7 +3356,7 @@ "agf" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; - icon_state = "propulsion_r" + icon_state = "propulsion_l" }, /turf/simulated/floor/tiled/asteroid_steel/airless, /turf/simulated/shuttle/plating/airless/carry, @@ -3459,6 +3364,21 @@ "agg" = ( /turf/simulated/floor/airless, /area/space) +"agh" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/mining_outpost/shuttle) +"agi" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_r" + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/mining_outpost/shuttle) "agj" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -3483,7 +3403,6 @@ /area/space) "agx" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; frequency = 1379; id_tag = "sec_fore_pump" }, @@ -3505,15 +3424,13 @@ "agY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d2 = 8; icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -3528,8 +3445,7 @@ /area/security/eva) "aha" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/machinery/meter, /turf/simulated/floor/tiled, @@ -3602,7 +3518,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; @@ -3661,8 +3576,7 @@ pixel_y = -2 }, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/item/weapon/storage/box/holowarrants, /turf/simulated/floor/tiled/dark, @@ -3672,7 +3586,6 @@ dir = 1 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -3687,8 +3600,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/red/border/shifted, /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/structure/cable/green, /turf/simulated/floor/tiled, @@ -3849,9 +3761,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -3874,8 +3784,7 @@ icon_state = "1-4" }, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/security/hallway) @@ -3889,8 +3798,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/sec_upper) @@ -3908,8 +3816,7 @@ /area/ai) "aiz" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -3951,8 +3858,7 @@ /area/security/hallwayaux) "aiB" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -3981,8 +3887,7 @@ /area/security/hallwayaux) "aiC" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4003,15 +3908,13 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled, /area/security/hallwayaux) "aiD" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4045,8 +3948,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4080,15 +3982,13 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled, /area/security/hallwayaux) "aiG" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -4137,7 +4037,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; @@ -4185,15 +4084,13 @@ /area/maintenance/cargo) "aiX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6; - icon_state = "intact-fuel" + dir = 6 }, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) "aiY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/shuttle_sensor{ dir = 5; @@ -4202,9 +4099,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/handrail{ dir = 1 @@ -4247,9 +4142,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -4345,8 +4238,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/hallway) @@ -4447,8 +4339,7 @@ /area/ai) "ajQ" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/bluegrid, /area/ai) @@ -4563,16 +4454,13 @@ }, /obj/item/device/radio/intercom/locked/ai_private{ dir = 4; - icon_state = "intercom"; pixel_x = 32 }, /obj/item/device/radio/intercom{ broadcasting = 1; dir = 8; - listening = 1; name = "Common Channel"; - pixel_x = -21; - pixel_y = 0 + pixel_x = -21 }, /obj/item/device/radio/intercom{ dir = 1; @@ -4593,7 +4481,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled, @@ -4622,14 +4509,12 @@ /obj/structure/catwalk, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/sec_upper) @@ -4650,8 +4535,7 @@ "akx" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4682,8 +4566,7 @@ }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) @@ -4775,8 +4658,7 @@ name = "tripai" }, /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/bluegrid, /area/ai) @@ -4788,19 +4670,15 @@ /area/security/security_equiptment_storage) "akN" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/red{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/computer/area_atmos/tag{ - dir = 2; scrub_id = "sec_riot_control" }, /turf/simulated/floor/tiled, @@ -4841,8 +4719,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -4906,7 +4783,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -5138,7 +5014,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -5266,7 +5141,6 @@ "alR" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/bluegrid, @@ -5276,8 +5150,7 @@ dir = 4 }, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/bluegrid, /area/ai) @@ -5309,9 +5182,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -5399,13 +5270,10 @@ }, /obj/item/device/radio/intercom/department/security{ dir = 8; - icon_state = "secintercom"; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled/dark, @@ -5490,15 +5358,13 @@ dir = 8 }, /obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 8; - icon_state = "borderfloorcorner2_black" + dir = 8 }, /obj/structure/closet{ name = "Evidence Closet" }, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/security/evidence_storage) @@ -5522,8 +5388,7 @@ /area/security/hallway) "amj" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -5575,9 +5440,7 @@ /area/tether/exploration) "ams" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/industrial/danger{ dir = 1 @@ -5589,8 +5452,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/danger/corner{ - dir = 8; - icon_state = "dangercorner" + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -5600,8 +5462,7 @@ dir = 8 }, /obj/machinery/camera/network/exploration{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -5706,9 +5567,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/disposalpipe/segment, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) @@ -5736,9 +5595,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) @@ -5756,7 +5613,6 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -5829,7 +5685,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /turf/simulated/floor/bluegrid, @@ -5864,7 +5719,6 @@ }, /obj/item/device/radio/intercom/locked/ai_private{ dir = 1; - icon_state = "intercom"; pixel_y = 32 }, /turf/simulated/floor/bluegrid, @@ -5907,29 +5761,10 @@ "ane" = ( /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/wood, /area/security/breakroom) -"anf" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "ang" = ( /obj/structure/cable{ d1 = 4; @@ -5985,7 +5820,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/item/device/holowarrant, @@ -6078,8 +5912,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -6097,7 +5930,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -6124,8 +5956,7 @@ /obj/structure/closet/secure_closet/security, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/item/device/holowarrant, /turf/simulated/floor/tiled/dark, @@ -6271,8 +6102,7 @@ /obj/structure/closet/secure_closet/security, /obj/machinery/light_switch{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/item/device/holowarrant, /turf/simulated/floor/tiled/dark, @@ -6345,7 +6175,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled, @@ -6409,7 +6238,6 @@ /obj/structure/table/steel, /obj/machinery/light_switch{ dir = 4; - icon_state = "light1"; pixel_x = -24 }, /obj/item/device/taperecorder, @@ -6417,8 +6245,7 @@ /area/security/security_processing) "aoD" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -6471,7 +6298,6 @@ /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; - pixel_x = 0; pixel_y = 30 }, /obj/structure/table/standard, @@ -6515,7 +6341,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -6554,7 +6379,6 @@ /obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /turf/simulated/floor/tiled, @@ -6569,8 +6393,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -6599,8 +6422,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -6644,8 +6466,7 @@ /area/security/hallway) "apd" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -6687,8 +6508,7 @@ /area/security/hallway) "apf" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -6714,8 +6534,7 @@ /area/security/hallway) "apg" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -6741,8 +6560,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -6797,8 +6615,7 @@ dir = 9 }, /obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 10; - icon_state = "borderfloorcorner2_black" + dir = 10 }, /obj/structure/closet{ name = "Evidence Closet" @@ -6951,8 +6768,7 @@ /area/security/hallway) "apH" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -6978,8 +6794,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -7058,9 +6873,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -7299,9 +7112,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 @@ -7349,7 +7160,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/dark, @@ -7371,8 +7181,7 @@ /area/security/security_processing) "aqP" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -7389,8 +7198,7 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -7539,7 +7347,6 @@ }, /obj/machinery/light_switch{ dir = 4; - icon_state = "light1"; pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -7563,7 +7370,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/structure/filingcabinet/chestdrawer, @@ -7631,7 +7437,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; @@ -7698,8 +7503,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) @@ -7729,9 +7533,7 @@ icon_state = "4-8" }, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/borderfloor{ @@ -7890,8 +7692,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/tiled, /area/security/hallway) @@ -8047,8 +7848,7 @@ "asE" = ( /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -8082,7 +7882,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -8159,7 +7958,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; @@ -8176,13 +7974,11 @@ /obj/machinery/recharger, /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/red/border/shifted, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /turf/simulated/floor/tiled, /area/security/lobby) @@ -8220,8 +8016,7 @@ /area/security/hallway) "ata" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -8253,8 +8048,7 @@ /area/security/hallway) "atb" = ( /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/mineral/floor/vacuum, /area/security/nuke_storage) @@ -8278,8 +8072,7 @@ /area/hallway/station/upper) "atd" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -8351,8 +8144,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8398,8 +8190,7 @@ pixel_x = -16 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/structure/table/steel, /obj/item/roller, @@ -8438,9 +8229,7 @@ dir = 5 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/flora/pottedplant/stoutbush, @@ -8535,7 +8324,6 @@ /obj/item/weapon/storage/box, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/borderfloor{ @@ -8589,8 +8377,7 @@ /obj/structure/table/standard, /obj/item/weapon/material/ashtray/glass, /obj/machinery/newscaster{ - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/item/weapon/deck/cards, /obj/effect/floor_decal/borderfloor{ @@ -8720,8 +8507,7 @@ /obj/structure/railing, /obj/random/tool, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor, /area/maintenance/station/elevator) @@ -8813,8 +8599,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor, /area/storage/emergency_storage/emergency3) @@ -8831,7 +8616,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable{ @@ -8987,8 +8771,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -9028,7 +8811,6 @@ "auN" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/borderfloor, @@ -9127,7 +8909,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Damn, looks like it's on the clown world channel. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled, @@ -9184,8 +8965,7 @@ /obj/random/maintenance/cargo, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/item/weapon/storage/box/lights/mixed, /obj/item/weapon/storage/box/lights/mixed, @@ -9382,7 +9162,6 @@ /obj/machinery/recharge_station, /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /turf/simulated/floor/tiled, @@ -9419,8 +9198,7 @@ }, /obj/machinery/computer/security, /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/lobby) @@ -9432,21 +9210,17 @@ dir = 9 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 }, /obj/structure/bed/chair, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /turf/simulated/floor/tiled, @@ -9476,7 +9250,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like its set to the cooking channel. Wait did I just see one of those hot dogs moving? I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled, @@ -9676,7 +9449,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; @@ -9836,7 +9608,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Damn, looks like it's on the clown world channel. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -9877,7 +9648,6 @@ /obj/item/device/multitool, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/borderfloor{ @@ -9901,8 +9671,7 @@ }, /obj/machinery/papershredder, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/newscaster/security_unit{ pixel_x = -32 @@ -9945,7 +9714,6 @@ id = "BrigFoyer"; name = "Brig Foyer"; pixel_x = -6; - pixel_y = 0; req_access = list(1) }, /turf/simulated/floor/tiled, @@ -9954,8 +9722,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/red/border/shifted, /obj/effect/floor_decal/corner/red{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/machinery/computer/security{ dir = 1 @@ -9986,7 +9753,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -10057,13 +9823,10 @@ }, /obj/structure/sign/directions/security{ dir = 1; - icon_state = "direction_sec"; pixel_y = 8 }, /obj/structure/sign/directions/medical{ - dir = 4; - pixel_x = 0; - pixel_y = 0 + dir = 4 }, /turf/simulated/wall, /area/tether/station/stairs_three) @@ -10151,8 +9914,7 @@ /obj/structure/table/standard, /obj/item/weapon/folder/yellow, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -10170,7 +9932,6 @@ "axu" = ( /obj/structure/sign/directions/security{ dir = 1; - icon_state = "direction_sec"; pixel_y = 8 }, /obj/structure/sign/directions/cargo{ @@ -10178,9 +9939,7 @@ pixel_y = -8 }, /obj/structure/sign/directions/medical{ - dir = 4; - pixel_x = 0; - pixel_y = 0 + dir = 4 }, /turf/simulated/wall/r_wall, /area/tether/station/stairs_three) @@ -10231,8 +9990,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/tiled, /area/security/lobby) @@ -10255,7 +10013,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; @@ -10344,8 +10101,7 @@ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /turf/simulated/floor/tiled, /area/maintenance/station/cargo) @@ -10460,8 +10216,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -10518,7 +10273,6 @@ /obj/machinery/disposal, /obj/machinery/light_switch{ dir = 4; - icon_state = "light1"; pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -10554,7 +10308,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -10576,8 +10329,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/security/lobby) @@ -10653,8 +10405,7 @@ /area/hallway/station/upper) "ayB" = ( /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/space, /area/security/nuke_storage) @@ -10703,7 +10454,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable{ @@ -10810,7 +10560,6 @@ "ayP" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -10889,7 +10638,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -11231,8 +10979,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/hallway/station/upper) @@ -11256,8 +11003,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled, /area/maintenance/station/cargo) @@ -11342,10 +11088,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/upper) "azJ" = ( -/obj/structure/sign/poster{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/structure/sign/poster, /turf/simulated/wall, /area/quartermaster/qm) "azK" = ( @@ -11402,7 +11145,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Oh, hey look it's a shopping channel! Are... Are they selling acid resistant underwear? I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled, @@ -11416,9 +11158,7 @@ "azS" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) @@ -11442,18 +11182,14 @@ dir = 9 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 10 }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled, /area/hallway/station/upper) @@ -11596,9 +11332,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -11708,7 +11442,6 @@ department = "Medical Department"; departmentType = 3; name = "Medical RC"; - pixel_x = 0; pixel_y = 30 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -11718,8 +11451,7 @@ dir = 5 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) @@ -11727,9 +11459,7 @@ /obj/machinery/disposal, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -11754,7 +11484,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's on the fishing channel. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled/white, @@ -11827,8 +11556,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/maintenance/station/cargo) @@ -11898,9 +11626,7 @@ /area/quartermaster/storage) "aAQ" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /obj/structure/closet/secure_closet/cargotech, @@ -11948,7 +11674,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/closet/secure_closet/cargotech, @@ -12060,8 +11785,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/industrial/danger{ - dir = 8; - icon_state = "danger" + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/station/upper) @@ -12244,8 +11968,7 @@ /obj/item/weapon/reagent_containers/dropper, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -12295,8 +12018,7 @@ /area/medical/chemistry) "aBL" = ( /obj/machinery/camera/network/cargo{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled, @@ -12363,7 +12085,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /turf/simulated/floor/tiled/white, @@ -12451,7 +12172,6 @@ /obj/effect/floor_decal/corner/lightgrey/border, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -12494,8 +12214,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 @@ -12541,8 +12260,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/steeldecal/steel_decals6, @@ -12656,8 +12374,7 @@ "aCx" = ( /obj/effect/floor_decal/rust, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /obj/structure/closet/crate, /obj/random/maintenance/clean, @@ -12727,8 +12444,7 @@ pixel_x = 28 }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled, @@ -12798,8 +12514,7 @@ }, /obj/structure/table/standard, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/cable/green{ d1 = 1; @@ -12818,7 +12533,6 @@ "aCL" = ( /obj/structure/disposalpipe/sortjunction{ dir = 1; - icon_state = "pipe-j1s"; name = "Cargo Bay"; sortType = "Cargo Bay" }, @@ -12842,8 +12556,7 @@ id = "QMLoad2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -12873,8 +12586,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /obj/structure/window/reinforced{ dir = 4 @@ -12923,19 +12635,16 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "aCW" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -12983,8 +12692,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13011,8 +12719,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13053,8 +12760,7 @@ /area/medical/reception) "aDn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) @@ -13161,8 +12867,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/wood, /area/quartermaster/qm) @@ -13246,8 +12951,7 @@ dir = 9 }, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/reception) @@ -13268,8 +12972,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor, /area/tether/station/stairs_three) @@ -13326,9 +13029,7 @@ "aDU" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Medical"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green{ d2 = 2; @@ -13391,9 +13092,7 @@ /area/quartermaster/warehouse) "aEe" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/green{ @@ -13546,7 +13245,6 @@ /obj/item/weapon/coin/silver, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/light, @@ -13632,8 +13330,7 @@ "aEA" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor, /area/tether/station/stairs_three) @@ -13667,7 +13364,6 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = -26; - pixel_y = 0; req_access = list(31) }, /turf/simulated/floor/tiled, @@ -13725,7 +13421,6 @@ "aEQ" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/rust, @@ -13763,7 +13458,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -13805,9 +13499,7 @@ /obj/item/clothing/glasses/science, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -13943,8 +13635,7 @@ "aFl" = ( /obj/structure/filingcabinet/filingcabinet, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/cable/green{ d1 = 1; @@ -13981,8 +13672,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /obj/structure/window/reinforced{ dir = 4 @@ -13996,7 +13686,6 @@ "aFo" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/table, @@ -14024,9 +13713,7 @@ "aFt" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/open, /area/tether/station/stairs_three) @@ -14072,8 +13759,7 @@ /area/maintenance/substation/cargo) "aFD" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/machinery/power/apc{ dir = 4; @@ -14123,8 +13809,7 @@ "aFH" = ( /obj/structure/closet/secure_closet/medical1, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -14211,7 +13896,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -14232,9 +13916,7 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -14255,8 +13937,7 @@ }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) @@ -14296,9 +13977,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/cable/green{ d1 = 1; @@ -14372,7 +14051,6 @@ dir = 1 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/item/device/radio/intercom/department/medbay{ @@ -14393,7 +14071,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -14422,8 +14099,7 @@ /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/reception) @@ -14506,7 +14182,6 @@ /area/medical/reception) "aGv" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -14667,7 +14342,6 @@ "aGP" = ( /obj/machinery/conveyor{ dir = 10; - icon_state = "conveyor0"; id = "QMLoad" }, /turf/simulated/floor, @@ -14694,7 +14368,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -14702,8 +14375,7 @@ icon_state = "0-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -14721,7 +14393,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_medical{ name = "Chemistry"; - req_access = list(); req_one_access = list(33) }, /obj/structure/cable/green{ @@ -14792,7 +14463,6 @@ "aHg" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -14819,8 +14489,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 4 @@ -14855,9 +14524,7 @@ /obj/item/device/flashlight/pen, /obj/item/device/flashlight/pen, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -14883,9 +14550,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks{ - pixel_y = 0 - }, +/obj/item/weapon/storage/box/masks, /obj/structure/table/glass, /obj/item/device/radio/intercom/department/medbay{ dir = 1; @@ -14916,8 +14581,7 @@ /obj/structure/table/glass, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -14948,9 +14612,7 @@ dir = 9 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -15000,9 +14662,7 @@ pixel_y = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -15028,8 +14688,7 @@ "aHu" = ( /obj/structure/table/glass, /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /obj/machinery/light{ dir = 1 @@ -15211,8 +14870,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /obj/structure/window/reinforced{ dir = 4 @@ -15223,7 +14881,6 @@ "aHI" = ( /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /obj/structure/cable/green{ @@ -15249,7 +14906,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -15276,14 +14932,11 @@ dir = 9 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/camera/network/medbay{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -15297,8 +14950,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -15325,9 +14977,7 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -15352,8 +15002,7 @@ dir = 8 }, /obj/machinery/camera/network/medbay{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -15373,8 +15022,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -15403,8 +15051,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -15506,8 +15153,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -15516,8 +15162,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite/corner, /obj/effect/floor_decal/corner/paleblue/bordercorner, @@ -15528,8 +15173,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -15540,8 +15184,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 8 @@ -15556,8 +15199,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -15669,7 +15311,6 @@ /area/quartermaster/storage) "aIv" = ( /obj/machinery/conveyor_switch/oneway{ - convdir = 1; id = "QMLoad" }, /obj/effect/floor_decal/industrial/warning{ @@ -15705,8 +15346,7 @@ /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -15721,8 +15361,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -15737,8 +15376,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -15752,8 +15390,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -15767,12 +15404,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -15790,12 +15425,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 @@ -15821,12 +15454,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -15843,12 +15474,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -15871,12 +15500,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -15893,12 +15520,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -15931,9 +15556,7 @@ "aIP" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Cargo"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green{ d2 = 4; @@ -15950,8 +15573,7 @@ /area/maintenance/substation/cargo) "aIQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -15959,9 +15581,7 @@ /obj/structure/closet/crate, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/steel, @@ -15977,7 +15597,6 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = 26; - pixel_y = 0; req_access = list(31) }, /turf/simulated/floor/tiled, @@ -15996,7 +15615,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -16021,8 +15639,7 @@ /area/quartermaster/storage) "aIZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -16092,8 +15709,7 @@ dir = 4 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) @@ -16113,8 +15729,7 @@ }, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -16123,8 +15738,7 @@ /obj/structure/sign/goldenplaque{ desc = "Done No Harm."; name = "Best Doctor 2552"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -16240,8 +15854,7 @@ "aJx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/steeldecal/steel_decals10, @@ -16295,8 +15908,7 @@ dir = 4 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -16326,8 +15938,7 @@ /area/maintenance/station/cargo) "aJH" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/freezer, @@ -16351,7 +15962,6 @@ "aJM" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled, @@ -16422,23 +16032,19 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/light_switch{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "aJW" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/space, /area/security/nuke_storage) "aJX" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/mineral/floor/vacuum, /area/security/nuke_storage) @@ -16467,7 +16073,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/floor_decal/borderfloorwhite, @@ -16542,8 +16147,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/corner_steel_grid{ dir = 5 @@ -16555,8 +16159,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 @@ -16565,12 +16168,10 @@ /area/medical/sleeper) "aKo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -16600,8 +16201,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/security/hallway) @@ -16639,8 +16239,7 @@ dir = 8 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -16658,9 +16257,7 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -16685,8 +16282,7 @@ name = "Scan Records" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -16745,9 +16341,7 @@ "aKO" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -16781,7 +16375,6 @@ "aKR" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/railing{ @@ -16851,7 +16444,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -17030,10 +16622,8 @@ }, /obj/effect/floor_decal/spline/plain, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -17088,8 +16678,7 @@ /area/maintenance/station/cargo) "aLy" = ( /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /obj/structure/railing, /obj/structure/closet/crate, @@ -17187,8 +16776,7 @@ /area/medical/sleeper) "aLJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -17237,7 +16825,6 @@ "aLP" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/cable/green{ @@ -17291,8 +16878,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -17308,8 +16894,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 1; @@ -17492,8 +17077,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -17521,8 +17105,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -17538,8 +17121,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -17554,8 +17136,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -17574,8 +17155,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -17602,8 +17182,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -17620,8 +17199,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -17630,8 +17208,7 @@ dir = 6 }, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -17645,8 +17222,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -17668,8 +17244,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -17728,8 +17303,7 @@ "aMx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -17781,8 +17355,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -17793,12 +17366,10 @@ /area/quartermaster/storage) "aMB" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/light_switch{ dir = 4; - icon_state = "light1"; pixel_x = -24 }, /obj/structure/reagent_dispensers/water_cooler/full{ @@ -17850,9 +17421,7 @@ "aMI" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -17910,15 +17479,13 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) @@ -17927,8 +17494,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -17951,8 +17517,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -17971,8 +17536,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 @@ -17990,8 +17554,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -18109,9 +17672,7 @@ "aNj" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -18135,8 +17696,7 @@ dir = 4 }, /obj/machinery/camera/network/exploration{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -18164,8 +17724,7 @@ /obj/item/weapon/storage/box/cups, /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/camera/network/medbay{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medbreak) @@ -18285,8 +17844,7 @@ pixel_x = -16 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/structure/table/steel, /obj/item/bodybag/cryobag{ @@ -18306,8 +17864,7 @@ }, /obj/item/weapon/reagent_containers/spray/cleaner, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled, /area/security/hallway) @@ -18337,8 +17894,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled, /area/security/hallwayaux) @@ -18392,8 +17948,7 @@ /area/quartermaster/storage) "aNY" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -18467,8 +18022,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -18515,8 +18069,7 @@ /area/quartermaster/belterdock) "aOO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/camera/network/mining{ dir = 8 @@ -18534,8 +18087,7 @@ }, /obj/machinery/disposal, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medbreak) @@ -18545,8 +18097,7 @@ }, /obj/machinery/disposal, /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/wood, /area/security/breakroom) @@ -18601,16 +18152,14 @@ /area/ai_core_foyer) "aPq" = ( /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/open, /area/security/hallway) "aPr" = ( /obj/effect/floor_decal/techfloor, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/ai_core_foyer) @@ -18621,15 +18170,13 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "aPx" = ( /obj/machinery/camera/network/exploration{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -18656,8 +18203,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/bluegrid, @@ -18684,8 +18230,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera/network/exploration{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -18695,8 +18240,7 @@ /area/maintenance/station/cargo) "aQb" = ( /obj/machinery/camera/network/exploration{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/open, /area/tether/exploration) @@ -18733,8 +18277,7 @@ id = "QMLoad" }, /obj/machinery/camera/network/cargo{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor, /area/quartermaster/storage) @@ -18806,8 +18349,7 @@ /area/hallway/station/upper) "aQl" = ( /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/open, /area/security/brig) @@ -18863,8 +18405,7 @@ /area/ai_core_foyer) "aQx" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) @@ -18921,7 +18462,6 @@ "aQH" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -19006,23 +18546,19 @@ "aQV" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/machinery/alarm{ pixel_y = 22 }, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/red{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /turf/simulated/floor/tiled, /area/security/observation) @@ -19056,8 +18592,7 @@ /area/maintenance/station/sec_upper) "aRb" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/catwalk, /turf/simulated/floor, @@ -19067,9 +18602,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 8 @@ -19158,13 +18691,11 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/tether/exploration) @@ -19186,12 +18717,10 @@ /area/quartermaster/office) "aRv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10; - icon_state = "intact-fuel" + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6; - icon_state = "intact" + dir = 6 }, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) @@ -19225,8 +18754,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -19236,8 +18764,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -19248,8 +18775,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/sec_upper) @@ -19258,8 +18784,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ icon_state = "2-8" @@ -19271,8 +18796,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/station/sec_upper) @@ -19467,8 +18991,7 @@ "aSs" = ( /obj/effect/floor_decal/rust, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor, /area/maintenance/station/ai) @@ -19507,7 +19030,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor, @@ -19546,15 +19068,13 @@ "aSA" = ( /obj/machinery/door/airlock/maintenance/cargo{ name = "Belter Shuttle Access"; - req_access = list(); req_one_access = list(48,65,66) }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) "aSB" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6; - icon_state = "intact" + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -19604,7 +19124,6 @@ "aSJ" = ( /obj/machinery/door/airlock/maintenance/cargo{ name = "Belter Shuttle Access"; - req_access = list(); req_one_access = list(48,65,66) }, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -19680,7 +19199,6 @@ "aSU" = ( /obj/machinery/door/airlock/maintenance/cargo{ name = "Belter Shuttle Access"; - req_access = list(); req_one_access = list(48,65,66) }, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -19718,20 +19236,17 @@ /area/maintenance/station/cargo) "aSZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/machinery/meter, /turf/simulated/floor/plating, /area/maintenance/station/cargo) "aTa" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -19815,7 +19330,6 @@ pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; frequency = 1379; id_tag = "belter_access_pump" }, @@ -19829,7 +19343,6 @@ pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; frequency = 1379; id_tag = "belter_access_pump" }, @@ -19838,8 +19351,7 @@ /area/quartermaster/belterdock) "aTo" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -19847,8 +19359,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/catwalk, /turf/simulated/floor, @@ -19941,15 +19452,13 @@ /obj/machinery/mineral/equipment_vendor, /obj/machinery/alarm{ dir = 4; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "aTC" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -19959,15 +19468,13 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) "aTF" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -19981,7 +19488,6 @@ "aTI" = ( /obj/machinery/door/airlock/glass_mining{ name = "Belter Control Room"; - req_access = list(); req_one_access = list(48,66) }, /obj/structure/cable/green{ @@ -20043,12 +19549,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) @@ -20105,7 +19609,6 @@ "aTX" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/white, @@ -20117,8 +19620,7 @@ /area/quartermaster/belterdock) "aUa" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/outdoors/grass/forest, /area/quartermaster/qm) @@ -20156,15 +19658,13 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "aUg" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/structure/table/rack, @@ -20202,8 +19702,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /obj/machinery/door/airlock/hatch{ req_one_access = list() @@ -20236,7 +19735,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Doors"; @@ -20267,7 +19765,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /turf/simulated/floor/wood, @@ -20280,9 +19777,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) @@ -20346,8 +19841,7 @@ /area/quartermaster/belterdock) "aUG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) @@ -20368,8 +19862,7 @@ /area/quartermaster/belterdock) "aUJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/structure/cable/cyan{ d1 = 1; @@ -20381,8 +19874,7 @@ /area/shuttle/excursion/cockpit) "aUN" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 5; - icon_state = "warning" + dir = 5 }, /obj/structure/window/reinforced{ dir = 1 @@ -20471,8 +19963,7 @@ /obj/machinery/portable_atmospherics/canister/phoron, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/atmospherics/portables_connector/fuel{ - dir = 8; - icon_state = "map_connector-fuel" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) @@ -20551,8 +20042,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/structure/mirror{ pixel_y = 32 @@ -20561,7 +20051,6 @@ /area/crew_quarters/medical_restroom) "aVx" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -20654,8 +20143,7 @@ /area/shuttle/belter) "aVP" = ( /obj/machinery/atmospherics/unary/engine{ - dir = 4; - icon_state = "nozzle" + dir = 4 }, /turf/simulated/floor/airless, /area/shuttle/medivac/engines) @@ -20732,8 +20220,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall, /area/maintenance/substation/cargo) @@ -20751,8 +20238,7 @@ /obj/structure/closet/emcloset, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) @@ -20796,8 +20282,7 @@ /area/shuttle/excursion/cockpit) "aWq" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /turf/simulated/floor/airless, /area/quartermaster/belterdock) @@ -20819,8 +20304,7 @@ }, /obj/structure/handrail, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/effect/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -20832,16 +20316,13 @@ "aWv" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "aWz" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) @@ -20851,9 +20332,7 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 25 @@ -20879,8 +20358,7 @@ /area/crew_quarters/medical_restroom) "aWG" = ( /obj/machinery/computer/shuttle_control/explore/excursion{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/item/device/radio/intercom{ pixel_y = -24 @@ -20898,7 +20376,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/light_switch{ @@ -20920,15 +20397,12 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) "aWO" = ( /obj/machinery/conveyor{ - dir = 2; id = "miningops" }, /turf/simulated/floor/plating, @@ -20943,7 +20417,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_mining{ name = "Mining Gear Storage"; - req_access = list(); req_one_access = list(48,66) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -20971,8 +20444,7 @@ /area/quartermaster/belterdock/gear) "aWT" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ - dir = 1; - icon_state = "warningcorner_dust" + dir = 1 }, /turf/simulated/floor/airless, /area/mine/explored/upper_level) @@ -20983,9 +20455,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -21092,9 +20562,7 @@ icon_state = "pipe-c" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -21152,8 +20620,7 @@ /area/quartermaster/belterdock/refinery) "aXA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -21163,17 +20630,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) -"aXC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5; - icon_state = "intact-fuel" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) "aXD" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -21248,8 +20704,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/structure/handrail, /turf/simulated/floor/tiled/techfloor, @@ -21271,8 +20726,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/hallway/station/upper) @@ -21316,13 +20770,10 @@ "aYh" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) @@ -21333,9 +20784,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -21353,11 +20802,6 @@ /obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) -"aYp" = ( -/turf/simulated/wall{ - can_open = 0 - }, -/area/crew_quarters/medical_restroom) "aYt" = ( /obj/structure/dispenser/oxygen, /obj/effect/floor_decal/borderfloor, @@ -21372,7 +20816,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "shuttle blast"; name = "Shuttle Blast Doors"; @@ -21423,7 +20866,6 @@ "aYG" = ( /obj/machinery/mineral/input, /obj/machinery/conveyor{ - dir = 2; id = "miningops" }, /turf/simulated/floor/plating, @@ -21453,7 +20895,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/light_switch{ @@ -21473,8 +20914,7 @@ "aYQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -21492,8 +20932,7 @@ /area/security/breakroom) "aZf" = ( /obj/effect/floor_decal/industrial/loading{ - dir = 8; - icon_state = "loadingarea" + dir = 8 }, /obj/structure/sign/warning/moving_parts{ pixel_y = -32 @@ -21509,7 +20948,6 @@ "aZh" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ - dir = 2; id = "miningops" }, /turf/simulated/floor/plating, @@ -21517,7 +20955,6 @@ "aZi" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -21542,8 +20979,7 @@ /area/quartermaster/qm) "aZp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/outdoors/grass/forest, /area/quartermaster/qm) @@ -21584,8 +21020,7 @@ }, /obj/item/stack/flag/red, /obj/item/stack/flag/green{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /obj/item/weapon/storage/box/nifsofts_mining, /obj/effect/floor_decal/borderfloor, @@ -21606,18 +21041,11 @@ "aZC" = ( /obj/machinery/conveyor{ dir = 5; - icon_state = "conveyor0"; id = "miningops" }, /obj/machinery/mineral/input, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) -"aZD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 9 - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) "aZH" = ( /obj/machinery/conveyor{ dir = 8; @@ -21670,8 +21098,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/wood, /area/quartermaster/qm) @@ -21703,8 +21130,7 @@ "bad" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -21713,8 +21139,7 @@ /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "bae" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -21723,8 +21148,7 @@ /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "baf" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -21742,8 +21166,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) @@ -21767,8 +21190,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /turf/simulated/floor/airless, /area/quartermaster/belterdock) @@ -21787,9 +21209,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "bao" = ( @@ -21816,8 +21236,7 @@ /area/shuttle/belter) "bar" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/airless, /area/quartermaster/belterdock) @@ -21861,8 +21280,7 @@ "baA" = ( /obj/structure/closet/emcloset, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/mining_outpost/shuttle) @@ -21889,8 +21307,7 @@ /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 8; id_tag = "belter_docking"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/simulated/shuttle/floor/yellow/airless, /area/shuttle/belter) @@ -21952,15 +21369,13 @@ /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 8; id_tag = "mining_docking"; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/mining_outpost/shuttle) "baP" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -21969,8 +21384,7 @@ /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "baQ" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -22020,8 +21434,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -22095,8 +21508,7 @@ /area/mine/explored/upper_level) "bDD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5; - icon_state = "intact-fuel" + dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -22136,12 +21548,10 @@ /area/shuttle/securiship/engines) "bNj" = ( /obj/effect/floor_decal/corner/blue{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/effect/floor_decal/corner/blue{ - dir = 4; - icon_state = "corner_white" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -22245,9 +21655,7 @@ /area/hallway/station/upper) "ccy" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/structure/cable/cyan{ d1 = 1; @@ -22315,15 +21723,13 @@ /area/shuttle/securiship/general) "cGX" = ( /obj/machinery/computer/ship/sensors{ - dir = 8; - icon_state = "computer" + dir = 8 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/cockpit) "cIJ" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/cable{ d1 = 2; @@ -22365,8 +21771,7 @@ /area/security/security_equiptment_storage) "cNv" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable/green{ icon_state = "0-2" @@ -22378,7 +21783,6 @@ /obj/effect/map_helper/airlock/door/ext_door, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 4; - pixel_x = 0; pixel_y = -28 }, /obj/effect/map_helper/airlock/sensor/ext_sensor, @@ -22392,8 +21796,7 @@ /area/shuttle/medivac/engines) "daI" = ( /obj/machinery/computer/shuttle_control/explore/medivac{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/eris/steel/cyancorner, @@ -22457,8 +21860,7 @@ /area/hallway/station/upper) "dAo" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable/green{ d2 = 4; @@ -22513,8 +21915,7 @@ /area/shuttle/medivac/engines) "dSk" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -22535,8 +21936,7 @@ /area/security/hallway) "dYt" = ( /obj/machinery/computer/ship/helm{ - dir = 8; - icon_state = "computer" + dir = 8 }, /obj/machinery/light{ dir = 1 @@ -22617,27 +22017,18 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) "eof" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/light, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"esH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) "esK" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 @@ -22650,7 +22041,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled/techfloor, @@ -22659,7 +22049,6 @@ /obj/machinery/light/small, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -22679,8 +22068,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/item/device/radio/intercom{ dir = 4; @@ -22690,8 +22078,7 @@ /area/shuttle/excursion/general) "ewT" = ( /obj/machinery/atmospherics/portables_connector/fuel{ - dir = 8; - icon_state = "map_connector-fuel" + dir = 8 }, /obj/machinery/portable_atmospherics/canister/phoron, /obj/effect/floor_decal/industrial/outline/red, @@ -22719,7 +22106,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "shuttle blast"; name = "Shuttle Blast Doors"; @@ -22824,13 +22210,6 @@ /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"fmc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6; - icon_state = "intact" - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) "fox" = ( /obj/structure/cable{ icon_state = "1-2" @@ -22953,8 +22332,7 @@ /area/tether/exploration) "gqZ" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -22978,8 +22356,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/eris/white, /area/shuttle/medivac/general) @@ -22994,8 +22371,7 @@ /area/shuttle/excursion/general) "gBb" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -23093,12 +22469,10 @@ }, /obj/effect/overmap/visitable/ship/landable/excursion, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -23115,8 +22489,7 @@ /area/security/nuke_storage) "gSE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10; - icon_state = "intact-fuel" + dir = 10 }, /turf/simulated/wall/rshull, /area/shuttle/securiship/engines) @@ -23226,8 +22599,7 @@ /area/security/security_processing) "hyn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6; - icon_state = "intact-fuel" + dir = 6 }, /turf/simulated/wall/rshull, /area/shuttle/securiship/engines) @@ -23246,8 +22618,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/cable{ icon_state = "2-4" @@ -23272,8 +22643,7 @@ /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/portable_atmospherics/canister/phoron, /obj/machinery/atmospherics/portables_connector/fuel{ - dir = 8; - icon_state = "map_connector-fuel" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) @@ -23310,8 +22680,7 @@ /area/security/hallway) "ijU" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/cable/yellow, /obj/machinery/power/port_gen/pacman/mrs{ @@ -23322,12 +22691,10 @@ /area/shuttle/excursion/general) "ikk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 @@ -23338,7 +22705,6 @@ "imZ" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/catwalk, @@ -23354,8 +22720,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/blue{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/effect/floor_decal/corner/blue, /turf/simulated/floor/tiled/eris/white, @@ -23418,19 +22783,16 @@ pixel_x = -32 }, /obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/medivac/engines) "iEV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/techmaint, @@ -23483,8 +22845,7 @@ dir = 8 }, /obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 4; - icon_state = "bay_chair_preview" + dir = 4 }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) @@ -23498,8 +22859,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -23514,8 +22874,7 @@ "jfu" = ( /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -23544,8 +22903,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5; - icon_state = "intact-aux" + dir = 5 }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) @@ -23602,19 +22960,16 @@ "jQx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "jRD" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -23635,7 +22990,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -23667,7 +23021,6 @@ "kkg" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/landmark/start{ @@ -23726,8 +23079,7 @@ /area/shuttle/excursion/cockpit) "kDC" = ( /obj/structure/bed/chair/bay/chair/padded/blue{ - dir = 4; - icon_state = "bay_chair_preview" + dir = 4 }, /obj/machinery/button/remote/blast_door{ dir = 8; @@ -23786,8 +23138,7 @@ /area/shuttle/excursion/general) "kSC" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -23859,12 +23210,10 @@ /area/hallway/station/upper) "ldH" = ( /obj/structure/bed/chair/bay/chair/padded/blue{ - dir = 4; - icon_state = "bay_chair_preview" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /turf/simulated/floor/tiled/eris/steel/cyancorner, /area/shuttle/medivac/cockpit) @@ -23894,7 +23243,6 @@ dir = 9 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -23934,8 +23282,7 @@ /area/shuttle/medivac/general) "lyg" = ( /obj/machinery/computer/ship/engines{ - dir = 4; - icon_state = "computer" + dir = 4 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/cockpit) @@ -24079,8 +23426,7 @@ /area/shuttle/medivac/cockpit) "mDQ" = ( /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) @@ -24089,7 +23435,6 @@ pixel_x = 28 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; frequency = 1380; id_tag = "medivac_docker_pump_out_internal" }, @@ -24099,8 +23444,7 @@ /area/shuttle/medivac/general) "mLa" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -24128,12 +23472,10 @@ /area/tether/exploration/pilot_office) "ndd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5; - icon_state = "intact-fuel" + dir = 5 }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, @@ -24166,25 +23508,21 @@ pixel_y = 28 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/map_helper/airlock/door/ext_door, /obj/effect/map_helper/airlock/sensor/ext_sensor, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) "nlX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /obj/machinery/airlock_sensor{ pixel_y = 28 @@ -24246,7 +23584,6 @@ /obj/machinery/button/remote/blast_door{ id = "VaultAc"; name = "Vault Blast Door"; - pixel_x = 0; pixel_y = -32; req_access = list(53); req_one_access = list(53) @@ -24266,15 +23603,13 @@ /area/shuttle/securiship/general) "nvV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1; - icon_state = "map-fuel" + dir = 1 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/engines) "nzo" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -24326,8 +23661,7 @@ /area/shuttle/securiship/general) "oiV" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -24350,8 +23684,7 @@ /area/security/security_processing) "okJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /turf/simulated/wall/rshull, /area/shuttle/securiship/engines) @@ -24368,6 +23701,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) "opL" = ( @@ -24383,8 +23717,7 @@ }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled, /area/hallway/station/upper) @@ -24395,8 +23728,7 @@ /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) @@ -24454,8 +23786,7 @@ /area/security/hallwayaux) "ozS" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) @@ -24467,8 +23798,7 @@ /area/shuttle/medivac/general) "oDB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24491,8 +23821,7 @@ /area/security/hallway) "oJa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 6; - icon_state = "intact-aux" + dir = 6 }, /turf/simulated/wall/rshull, /area/shuttle/securiship/general) @@ -24536,9 +23865,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) @@ -24561,8 +23888,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled/eris/white, /area/shuttle/medivac/general) @@ -24583,8 +23909,7 @@ /area/shuttle/medivac/general) "plY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1; - icon_state = "map-fuel" + dir = 1 }, /turf/simulated/wall/rshull, /area/shuttle/securiship/engines) @@ -24593,8 +23918,7 @@ dir = 1 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/effect/map_helper/airlock/atmos/pump_out_internal, /obj/machinery/oxygen_pump{ @@ -24641,7 +23965,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "medivac blast"; name = "Shuttle Blast Doors"; @@ -24657,8 +23980,7 @@ /area/shuttle/medivac/general) "pUV" = ( /obj/structure/bed/chair/bay/chair{ - dir = 1; - icon_state = "bay_chair_preview" + dir = 1 }, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/shuttle/securiship/general) @@ -24717,8 +24039,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5; - icon_state = "intact-aux" + dir = 5 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) @@ -24731,8 +24052,7 @@ /area/shuttle/excursion/cargo) "qJK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) @@ -24742,8 +24062,7 @@ /area/maintenance/station/sec_upper) "qMb" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -24776,7 +24095,6 @@ "qOY" = ( /obj/machinery/door/airlock/multi_tile/metal/mait{ dir = 2; - icon_state = "door_closed"; req_one_access = list(5,67) }, /obj/machinery/door/firedoor/glass, @@ -24830,15 +24148,13 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 6; - icon_state = "intact-aux" + dir = 6 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "rhv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24900,7 +24216,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -24984,19 +24299,16 @@ }, /obj/effect/map_helper/airlock/sensor/int_sensor, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "scI" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/cable/green{ @@ -25022,8 +24334,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6; - icon_state = "intact-fuel" + dir = 6 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/engines) @@ -25043,7 +24354,6 @@ /obj/machinery/alarm{ breach_detection = 0; dir = 8; - icon_state = "alarm0"; pixel_x = 25; rcon_setting = 3; report_danger_level = 0 @@ -25142,12 +24452,10 @@ /area/shuttle/excursion/general) "tTA" = ( /obj/effect/floor_decal/corner/blue{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/effect/floor_decal/corner/blue{ - dir = 1; - icon_state = "corner_white" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -25170,11 +24478,9 @@ /area/maintenance/station/cargo) "ukN" = ( /obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 1; - icon_state = "bay_chair_preview" + dir = 1 }, /obj/machinery/button/remote/blast_door{ - dir = 2; id = "securiship blast"; name = "Shuttle Blast Doors"; pixel_x = -28; @@ -25260,7 +24566,6 @@ "uQo" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -25302,8 +24607,7 @@ /area/shuttle/medivac/general) "uVS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/structure/extinguisher_cabinet{ dir = 8; @@ -25316,8 +24620,7 @@ /area/shuttle/excursion/general) "uZd" = ( /obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 4; - icon_state = "bay_chair_preview" + dir = 4 }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) @@ -25356,8 +24659,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 9; - icon_state = "intact-aux" + dir = 9 }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) @@ -25394,8 +24696,7 @@ /area/shuttle/excursion/general) "vQT" = ( /obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 4; - icon_state = "bay_chair_preview" + dir = 4 }, /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/securiship/general) @@ -25421,23 +24722,20 @@ dir = 4 }, /obj/structure/bed/chair/bay/chair{ - dir = 1; - icon_state = "bay_chair_preview" + dir = 1 }, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/shuttle/securiship/general) "wcZ" = ( /obj/machinery/computer/ship/sensors{ - dir = 8; - icon_state = "computer" + dir = 8 }, /obj/machinery/light, /turf/simulated/floor/tiled/eris/steel/cyancorner, /area/shuttle/medivac/cockpit) "wiE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10; - icon_state = "intact-fuel" + dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -25483,12 +24781,10 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/eris/white, /area/shuttle/medivac/general) @@ -25552,12 +24848,10 @@ }, /obj/effect/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8; - icon_state = "intact-fuel" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) @@ -25639,12 +24933,10 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/blue{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/effect/floor_decal/corner/blue{ - dir = 8; - icon_state = "corner_white" + dir = 8 }, /turf/simulated/floor/tiled/eris/white, /area/shuttle/medivac/general) @@ -25662,8 +24954,7 @@ pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/effect/map_helper/airlock/sensor/int_sensor, /turf/simulated/floor/tiled/eris/white, @@ -25777,8 +25068,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8; - icon_state = "intact-aux" + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) @@ -25795,8 +25085,7 @@ /area/maintenance/station/sec_upper) "ygj" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -25813,7 +25102,6 @@ icon_state = "4-8" }, /obj/machinery/embedded_controller/radio/simple_docking_controller{ - dir = 2; frequency = 1380; id_tag = "securiship_bay"; pixel_x = -22; @@ -25829,8 +25117,7 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/tiled/eris/techmaint_cargo, /area/shuttle/securiship/general) @@ -31901,7 +31188,7 @@ aab aab aab aKE -aYp +aKE aKE aKE aMO @@ -34155,7 +33442,7 @@ auP auP azt ayA -anf +aBs aCh ayM aAC @@ -36827,7 +36114,7 @@ aUJ aXb afT aez -afV +agd ams aXq abe @@ -36969,7 +36256,7 @@ wRt eug afT aeG -afV +agd ams aXq abe @@ -37110,8 +36397,8 @@ wOI afO wOI aiX -aZD -acK +afV +vJd ams aXq abe @@ -37252,8 +36539,8 @@ hNx kTn ckU aiY -fmc -vJd +xiw +acK ams ghy abe @@ -37820,8 +37107,8 @@ aXS rLd opv uVS -esH -vJd +xiw +acK ams eof abe @@ -37962,8 +37249,8 @@ uGF wPw xvO aRv -aXC -acK +agc +vJd ams amq abe @@ -38105,7 +37392,7 @@ ikk efQ wPF aeG -afV +agd ams aSx krj @@ -38247,7 +37534,7 @@ iEV tEV xiw aeH -afV +agd ams eAm abe @@ -40284,11 +39571,11 @@ avt avt adD aZS -agc -agd -agd -agd agf +agh +agh +agh +agi baB adD avt diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index d44b9348379..1389266ce85 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -250,7 +250,6 @@ name = "\improper Vacant Prep Area" /area/vacant/vacant_site/gateway/lower name = "\improper Lower Vacant Prep Area" -//TFF 5/4/20 - Mining Ops move TODO Change all Vacant areas to construction_site per vermin event location announcement. /area/construction/vacant_mining_ops name = "\improper Vacant Mining Operations" @@ -267,7 +266,6 @@ /area/tether/surfacebase/emergency_storage/atrium name = "\improper Atrium Emergency Storage" -//TFF 7/4/20 - New areas for Surface Cargo bits as well as the Mining Outpost. Some former ones deleted. Others renamed. // Surface Cargo/Mining EVA/Warehouse/Mining Outpost adadditions /area/tether/surfacebase/cargo name = "Surface Cargo Foyer" @@ -650,7 +648,6 @@ name = "Atmospherics Gas Storage" icon_state = "atmos" -//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos. /area/engineering/atmos_intake name = "\improper Atmospherics Intake" icon_state = "atmos" @@ -776,7 +773,6 @@ /area/rnd/robotics/resleeving name = "\improper Robotics Resleeving" -//TFF 28/8/19 - cleanup of areas placement /area/rnd/research/testingrange name = "\improper Weapons Testing Range" icon_state = "firingrange" @@ -787,7 +783,6 @@ //Outpost areas -//TFF 28/8/19 - cleanup of areas placement /area/rnd/outpost name = "\improper Research Outpost Hallway" icon_state = "research" @@ -939,7 +934,6 @@ name = "Public Meeting Room" icon_state = "blue" sound_env = SMALL_SOFTFLOOR -//TFF 28/8/19 - cleanup of areas placement /area/chapel/observation name = "\improper Chapel Observation" icon_state = "chapel" @@ -979,6 +973,9 @@ icon_state = "recreation_area_restroom" sound_env = SMALL_ENCLOSED +/area/crew_quarters/sleep + limit_mob_size = FALSE + /area/crew_quarters/sleep/maintDorm1 name = "\improper Construction Dorm 1" icon_state = "Sleep" @@ -1003,7 +1000,6 @@ flags = RAD_SHIELDED soundproofed = TRUE -//TFF 28/8/19 - cleanup of areas placement /area/crew_quarters/sleep/vistor_room_1 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE @@ -1141,6 +1137,9 @@ flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE +/area/holodeck/holodorm + limit_mob_size = FALSE + /area/holodeck/holodorm/source_basic name = "\improper Holodeck Source" flags = RAD_SHIELDED | BLUE_SHIELDED @@ -1412,7 +1411,6 @@ /area/shuttle/securiship/engines name = "\improper Securiship Engines" -//TFF 5/4/20 - Mining Ops move // Asteroid Mining belter and Mining Outpost shuttles and refinery/gear areas /area/quartermaster/belterdock name = "\improper Cargo Belter Access" @@ -1463,7 +1461,6 @@ area/shuttle/mining_outpost/shuttle name = "\improper Ninjacraft" icon_state = "shuttle2" -//TFF 28/8/19 - cleanup of areas placement /area/teleporter/departing name = "\improper Long-Range Teleporter" icon_state = "teleporter" @@ -1537,6 +1534,7 @@ area/shuttle/mining_outpost/shuttle requires_power = 0 flags = RAD_SHIELDED icon_state = "red2" + limit_mob_size = FALSE /area/unknown/dorm1 name = "Unknown Dorm 1" diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index b7c7fcfc90a..17ad40190a0 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -143,7 +143,6 @@ /area/rnd/miscellaneous_lab ) -//TFF 5/4/20 - Mining Ops move, airlock path change unit_test_exempt_from_atmos = list( /area/engineering/atmos_intake, // Outside, /area/rnd/external, // Outside, @@ -165,7 +164,6 @@ ) lateload_single_pick = list( - list("Snow Outpost"), list("Carp Farm"), list("Snow Field"), list("Listening Post") @@ -191,7 +189,6 @@ belter_belt_z = list(Z_LEVEL_ROGUEMINE_1, Z_LEVEL_ROGUEMINE_2) -//TFF 16/4/20 - mining outpost shuttle defines mining_station_z = list(Z_LEVEL_SPACE_HIGH) mining_outpost_z = list(Z_LEVEL_SURFACE_MINE) diff --git a/maps/tether/tether_shuttle_defs.dm b/maps/tether/tether_shuttle_defs.dm index 29489eea93c..847cd0e4808 100644 --- a/maps/tether/tether_shuttle_defs.dm +++ b/maps/tether/tether_shuttle_defs.dm @@ -212,7 +212,7 @@ ..() ////////////////////////////////////////////////////////////// -//TFF 12/4/20 Surface Mining Outpost Shuttle +// Surface Mining Outpost Shuttle /datum/shuttle/autodock/ferry/surface_mining_outpost name = "Mining Outpost" diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm index 6ec0c4bc628..e380c18003a 100644 --- a/maps/tether/tether_shuttles.dm +++ b/maps/tether/tether_shuttles.dm @@ -32,7 +32,6 @@ shuttle_tag = "Trade" req_one_access = list(access_trader) -//TFF 12/4/20 - Add console for Mining Outpost Shuttle /obj/machinery/computer/shuttle_control/surface_mining_outpost name = "surface mining outpost shuttle control console" shuttle_tag = "Mining Outpost" diff --git a/maps/tether_better/submaps/_tether_submaps.dm b/maps/tether_better/submaps/_tether_submaps.dm index 9d76b0f4d30..7ad00d5fa27 100644 --- a/maps/tether_better/submaps/_tether_submaps.dm +++ b/maps/tether_better/submaps/_tether_submaps.dm @@ -267,14 +267,14 @@ /datum/map_z_level/tether_lateload/gateway_destination name = "Gateway Destination" z = Z_LEVEL_GATEWAY - +/* //Disabled because mercs #include "../../gateway_vr/snow_outpost.dm" /datum/map_template/tether_lateload/gateway/snow_outpost name = "Snow Outpost" desc = "Big snowy area with various outposts." mappath = 'maps/gateway_vr/snow_outpost.dmm' associated_map_datum = /datum/map_z_level/tether_lateload/gateway_destination - +*/ //Disabled because mercs #include "../../gateway_vr/zoo.dm" /datum/map_template/tether_lateload/gateway/zoo name = "Zoo" diff --git a/maps/tether_better/tether_areas.dm b/maps/tether_better/tether_areas.dm index 68a3d8db836..bbac67466f4 100644 --- a/maps/tether_better/tether_areas.dm +++ b/maps/tether_better/tether_areas.dm @@ -250,7 +250,6 @@ name = "\improper Vacant Prep Area" /area/vacant/vacant_site/gateway/lower name = "\improper Lower Vacant Prep Area" -//TFF 5/4/20 - Mining Ops move TODO Change all Vacant areas to construction_site per vermin event location announcement. /area/construction/vacant_mining_ops name = "\improper Vacant Mining Operations" @@ -267,7 +266,6 @@ /area/tether/surfacebase/emergency_storage/atrium name = "\improper Atrium Emergency Storage" -//TFF 7/4/20 - New areas for Surface Cargo bits as well as the Mining Outpost. Some former ones deleted. Others renamed. // Surface Cargo/Mining EVA/Warehouse/Mining Outpost adadditions /area/tether/surfacebase/cargo name = "Surface Cargo Foyer" @@ -650,7 +648,6 @@ name = "Atmospherics Gas Storage" icon_state = "atmos" -//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos. /area/engineering/atmos_intake name = "\improper Atmospherics Intake" icon_state = "atmos" @@ -776,7 +773,6 @@ /area/rnd/robotics/resleeving name = "\improper Robotics Resleeving" -//TFF 28/8/19 - cleanup of areas placement /area/rnd/research/testingrange name = "\improper Weapons Testing Range" icon_state = "firingrange" @@ -787,7 +783,6 @@ //Outpost areas -//TFF 28/8/19 - cleanup of areas placement /area/rnd/outpost name = "\improper Research Outpost Hallway" icon_state = "research" @@ -939,7 +934,6 @@ name = "Public Meeting Room" icon_state = "blue" sound_env = SMALL_SOFTFLOOR -//TFF 28/8/19 - cleanup of areas placement /area/chapel/observation name = "\improper Chapel Observation" icon_state = "chapel" @@ -1003,7 +997,6 @@ flags = RAD_SHIELDED soundproofed = TRUE -//TFF 28/8/19 - cleanup of areas placement /area/crew_quarters/sleep/vistor_room_1 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE @@ -1412,7 +1405,6 @@ /area/shuttle/securiship/engines name = "\improper Securiship Engines" -//TFF 5/4/20 - Mining Ops move // Asteroid Mining belter and Mining Outpost shuttles and refinery/gear areas /area/quartermaster/belterdock name = "\improper Cargo Belter Access" @@ -1460,7 +1452,6 @@ area/shuttle/mining_outpost/shuttle name = "\improper Ninjacraft" icon_state = "shuttle2" -//TFF 28/8/19 - cleanup of areas placement /area/teleporter/departing name = "\improper Long-Range Teleporter" icon_state = "teleporter" diff --git a/maps/tether_better/tether_defines.dm b/maps/tether_better/tether_defines.dm index 5529983b94f..3d36aad0201 100644 --- a/maps/tether_better/tether_defines.dm +++ b/maps/tether_better/tether_defines.dm @@ -138,7 +138,6 @@ /area/rnd/miscellaneous_lab ) -//TFF 5/4/20 - Mining Ops move, airlock path change unit_test_exempt_from_atmos = list( /area/engineering/atmos_intake, // Outside, /area/rnd/external, // Outside, @@ -160,7 +159,6 @@ ) lateload_single_pick = list( - list("Snow Outpost"), list("Carp Farm"), list("Snow Field"), list("Listening Post") @@ -186,7 +184,6 @@ belter_belt_z = list(Z_LEVEL_ROGUEMINE_1, Z_LEVEL_ROGUEMINE_2) -//TFF 16/4/20 - mining outpost shuttle defines mining_station_z = list(Z_LEVEL_SPACE_HIGH) mining_outpost_z = list(Z_LEVEL_SURFACE_MINE) diff --git a/maps/tether_better/tether_shuttle_defs.dm b/maps/tether_better/tether_shuttle_defs.dm index 29489eea93c..847cd0e4808 100644 --- a/maps/tether_better/tether_shuttle_defs.dm +++ b/maps/tether_better/tether_shuttle_defs.dm @@ -212,7 +212,7 @@ ..() ////////////////////////////////////////////////////////////// -//TFF 12/4/20 Surface Mining Outpost Shuttle +// Surface Mining Outpost Shuttle /datum/shuttle/autodock/ferry/surface_mining_outpost name = "Mining Outpost" diff --git a/maps/tether_better/tether_shuttles.dm b/maps/tether_better/tether_shuttles.dm index 6ec0c4bc628..e380c18003a 100644 --- a/maps/tether_better/tether_shuttles.dm +++ b/maps/tether_better/tether_shuttles.dm @@ -32,7 +32,6 @@ shuttle_tag = "Trade" req_one_access = list(access_trader) -//TFF 12/4/20 - Add console for Mining Outpost Shuttle /obj/machinery/computer/shuttle_control/surface_mining_outpost name = "surface mining outpost shuttle control console" shuttle_tag = "Mining Outpost" diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm index 055efc9c155..07c72230261 100644 --- a/maps/~map_system/maps.dm +++ b/maps/~map_system/maps.dm @@ -67,7 +67,7 @@ var/list/all_maps = list() var/ai_shell_restricted = FALSE //VOREStation Addition - are there z-levels restricted? var/ai_shell_allowed_levels = list() //VOREStation Addition - which z-levels ARE we allowed to visit? - //VOREStation Addition Start - belter stuff TFF 16/4/20 - Mining Outpost Shuttle + //VOREStation Addition Start var/list/belter_docked_z = list() var/list/belter_transit_z = list() var/list/belter_belt_z = list() diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js index 60cd967d75c..b0a87f20985 100644 --- a/tgui/packages/tgui/interfaces/VorePanel.js +++ b/tgui/packages/tgui/interfaces/VorePanel.js @@ -592,6 +592,7 @@ const VoreUserPreferences = (props, context) => { const { digestable, devourable, + resizable, feeding, absorbable, digest_leave_remains, @@ -722,6 +723,44 @@ const VoreUserPreferences = (props, context) => { : "Click here to turn on hunger noises.")} content={noisy ? "Hunger Noises Enabled" : "Hunger Noises Disabled"} /> + +