diff --git a/code/controllers/subsystems/transcore_vr.dm b/code/controllers/subsystems/transcore_vr.dm index 36f2a77914..ebf47439d6 100644 --- a/code/controllers/subsystems/transcore_vr.dm +++ b/code/controllers/subsystems/transcore_vr.dm @@ -15,7 +15,7 @@ SUBSYSTEM_DEF(transcore) init_order = INIT_ORDER_TRANSCORE // THINGS - var/overdue_time = 15 MINUTES + var/overdue_time = 6 MINUTES // Has to be a multiple of wait var, or else will just round up anyway. var/current_step = SSTRANSCORE_IMPLANTS @@ -113,8 +113,9 @@ SUBSYSTEM_DEF(transcore) curr_MR.dead_state = MR_NORMAL else if(curr_MR.dead_state != MR_DEAD) //First time switching to dead - db.notify(curr_MR.mindname) - curr_MR.last_notification = world.time + if(curr_MR.do_notify) + db.notify(curr_MR.mindname) + curr_MR.last_notification = world.time curr_MR.dead_state = MR_DEAD if(MC_TICK_CHECK) @@ -250,12 +251,9 @@ SUBSYSTEM_DEF(transcore) return 1 // Send a past-due notification to the medical radio channel. -/datum/transcore_db/proc/notify(var/name, var/repeated = FALSE) +/datum/transcore_db/proc/notify(var/name) ASSERT(name) - if(repeated) - global_announcer.autosay("This is a repeat notification that [name] is past-due for a mind backup.", "TransCore Oversight", "Medical") - else - global_announcer.autosay("[name] is past-due for a mind backup.", "TransCore Oversight", "Medical") + global_announcer.autosay("[name] is past-due for a mind backup.", "TransCore Oversight", "Medical") // Called from mind_record to add itself to the transcore. /datum/transcore_db/proc/add_backup(var/datum/transhuman/mind_record/MR) diff --git a/code/controllers/subsystems/vis_overlays.dm b/code/controllers/subsystems/vis_overlays.dm index 0806e4c954..8abc02f928 100644 --- a/code/controllers/subsystems/vis_overlays.dm +++ b/code/controllers/subsystems/vis_overlays.dm @@ -29,18 +29,18 @@ SUBSYSTEM_DEF(vis_overlays) return //the "thing" var can be anything with vis_contents which includes images - in the future someone should totally allow vis overlays to be passed in as an arg instead of all this bullshit -/datum/controller/subsystem/vis_overlays/proc/add_vis_overlay(atom/movable/thing, icon, iconstate, layer, plane, dir, alpha = 255, add_appearance_flags = NONE, unique = FALSE) +/datum/controller/subsystem/vis_overlays/proc/add_vis_overlay(atom/movable/thing, icon, iconstate, layer, plane, dir, alpha = 255, add_appearance_flags = NONE, add_vis_flags = NONE, unique = FALSE) var/obj/effect/overlay/vis/overlay if(!unique) . = "[icon]|[iconstate]|[layer]|[plane]|[dir]|[alpha]|[add_appearance_flags]" overlay = vis_overlay_cache[.] if(!overlay) - overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags) + overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags) vis_overlay_cache[.] = overlay else overlay.unused = 0 else - overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags) + overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags) overlay.cache_expiration = -1 var/cache_id = "\ref[overlay]@{[world.time]}" vis_overlay_cache[cache_id] = overlay @@ -56,7 +56,7 @@ SUBSYSTEM_DEF(vis_overlays) thing.managed_vis_overlays += overlay return overlay -/datum/controller/subsystem/vis_overlays/proc/_create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags) +/datum/controller/subsystem/vis_overlays/proc/_create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags) var/obj/effect/overlay/vis/overlay = new overlay.icon = icon overlay.icon_state = iconstate @@ -65,6 +65,7 @@ SUBSYSTEM_DEF(vis_overlays) overlay.dir = dir overlay.alpha = alpha overlay.appearance_flags |= add_appearance_flags + overlay.vis_flags |= add_vis_flags return overlay @@ -75,3 +76,14 @@ SUBSYSTEM_DEF(vis_overlays) thing.managed_vis_overlays -= overlays if(!length(thing.managed_vis_overlays)) thing.managed_vis_overlays = null + +/atom/proc/add_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags, unique) + // The extremely minimal version where you just pass a string and nothing else + if(istext(icon)) + iconstate = icon + icon = src.icon + + return SSvis_overlays.add_vis_overlay(src, icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags, unique) + +/atom/proc/remove_vis_overlay(list/overlays) + return SSvis_overlays.remove_vis_overlay(src, overlays) diff --git a/code/datums/outfits/jobs/medical.dm b/code/datums/outfits/jobs/medical.dm index 6622d3b285..f24bcd94fd 100644 --- a/code/datums/outfits/jobs/medical.dm +++ b/code/datums/outfits/jobs/medical.dm @@ -23,7 +23,7 @@ name = OUTFIT_JOB_NAME("Medical Doctor") uniform = /obj/item/clothing/under/rank/medical suit = /obj/item/clothing/suit/storage/toggle/labcoat - l_hand = /obj/item/weapon/storage/firstaid/regular + l_hand = /obj/item/weapon/storage/firstaid/adv //CHOMP Edit r_pocket = /obj/item/device/flashlight/pen id_type = /obj/item/weapon/card/id/medical diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index 4891db7091..32cc9d0a3f 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -27,8 +27,8 @@ /obj/machinery/alarm name = "alarm" desc = "Used to control various station atmospheric systems. The light indicates the current air status of the area." - icon = 'icons/obj/monitors_vr.dmi' //CHOMPEdit: Continues using new air alarm sprite, contrary to YW - icon_state = "alarm0" + icon = 'icons/obj/monitors_vr.dmi' //VOREStation Edit - Other icons + icon_state = "alarm_0" layer = ABOVE_WINDOW_LAYER vis_flags = VIS_HIDE // They have an emissive that looks bad in openspace due to their wall-mounted nature anchored = 1 @@ -39,6 +39,8 @@ req_one_access = list(access_atmospherics, access_engine_equip) clicksound = "button" clickvol = 30 + blocks_emissive = NONE + light_power = 0.25 var/alarm_id = null var/breach_detection = 1 // Whether to use automatic breach detection or not var/frequency = 1439 @@ -132,10 +134,10 @@ TLV["pressure"] = list(ONE_ATMOSPHERE * 0.80, ONE_ATMOSPHERE * 0.90, ONE_ATMOSPHERE * 1.10, ONE_ATMOSPHERE * 1.20) /* kpa */ TLV["temperature"] = list(T0C - 26, T0C, T0C + 40, T0C + 66) // K - //VOREStation Add pixel_x = (src.dir & 3)? 0 : (src.dir == 4 ? -28 : 28) pixel_y = (src.dir & 3)? (src.dir ==1 ? -28 : 28) : 0 - //VOREStation Add End + + update_icon() /obj/machinery/alarm/Initialize() . = ..() @@ -299,13 +301,17 @@ return 0 /obj/machinery/alarm/update_icon() + cut_overlays() + if(panel_open) icon_state = "alarmx" set_light(0) + set_light_on(FALSE) return if((stat & (NOPOWER|BROKEN)) || shorted) icon_state = "alarmp" set_light(0) + set_light_on(FALSE) return var/icon_level = danger_level @@ -315,16 +321,23 @@ var/new_color = null switch(icon_level) if(0) - icon_state = "alarm0" + icon_state = "alarm_0" + add_overlay(mutable_appearance(icon, "alarm_ov0")) + add_overlay(emissive_appearance(icon, "alarm_ov0")) new_color = "#03A728" if(1) - icon_state = "alarm2" //yes, alarm2 is yellow alarm + icon_state = "alarm_2" //yes, alarm2 is yellow alarm + add_overlay(mutable_appearance(icon, "alarm_ov2")) + add_overlay(emissive_appearance(icon, "alarm_ov2")) new_color = "#EC8B2F" if(2) - icon_state = "alarm1" + icon_state = "alarm_1" + add_overlay(mutable_appearance(icon, "alarm_ov1")) + add_overlay(emissive_appearance(icon, "alarm_ov1")) new_color = "#DA0205" set_light(l_range = 2, l_power = 0.25, l_color = new_color) + set_light_on(TRUE) /obj/machinery/alarm/receive_signal(datum/signal/signal) if(stat & (NOPOWER|BROKEN)) diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm index e4b961eebe..694a715bcd 100644 --- a/code/game/machinery/floodlight.dm +++ b/code/game/machinery/floodlight.dm @@ -4,6 +4,8 @@ icon = 'icons/obj/machines/floodlight.dmi' icon_state = "flood00" density = 1 + light_system = MOVABLE_LIGHT_DIRECTIONAL + light_cone_y_offset = 8 var/on = 0 var/obj/item/weapon/cell/cell = null var/use = 200 // 200W light @@ -29,10 +31,12 @@ // If the cell is almost empty rarely "flicker" the light. Aesthetic only. if((cell.percent() < 10) && prob(5)) - set_light(brightness_on/2, brightness_on/4) + set_light_range(brightness_on/2) + set_light_power(brightness_on/4) spawn(20) if(on) - set_light(brightness_on, brightness_on/2) + set_light_range(brightness_on) + set_light_power(brightness_on/2) cell.use(use*CELLRATE) @@ -45,7 +49,9 @@ return 0 on = 1 - set_light(brightness_on, brightness_on / 2) + set_light_range(brightness_on) + set_light_power(brightness_on/2) + set_light_on(TRUE) update_icon() if(loud) visible_message("\The [src] turns on.") @@ -53,7 +59,7 @@ /obj/machinery/floodlight/proc/turn_off(var/loud = 0) on = 0 - set_light(0, 0) + set_light_on(FALSE) update_icon() if(loud) visible_message("\The [src] shuts down.") diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 4ecc95b7c3..aed6cc368e 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -122,8 +122,8 @@ Class Procs: blocks_emissive = EMISSIVE_BLOCK_GENERIC /obj/machinery/New(l, d=0) - ..(l) - if(d) + ..() + if(isnum(d)) set_dir(d) if(ispath(circuit)) circuit = new circuit(src) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index dfc3f757a2..f331850cfe 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -129,6 +129,10 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) icon = 'icons/obj/terminals_vr.dmi' //VOREStation Edit icon_state = "newscaster_normal" layer = ABOVE_WINDOW_LAYER + blocks_emissive = NONE + light_power = 0.9 + light_range = 2 + light_color = "#00ff00" var/isbroken = 0 //1 if someone banged it with something heavy var/ispowered = 1 //starts powered, changes with power_change() //var/list/datum/feed_channel/channel_list = list() //This list will contain the names of the feed channels. Each name will refer to a data region where the messages of the feed channels are stored. @@ -176,6 +180,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) /obj/machinery/newscaster/LateInitialize() node = get_exonet_node() + update_icon() /obj/machinery/newscaster/Destroy() GLOB.allCasters -= src @@ -183,25 +188,34 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) return ..() /obj/machinery/newscaster/update_icon() + cut_overlays() if(!ispowered || isbroken) icon_state = "newscaster_off" if(isbroken) //If the thing is smashed, add crack overlay on top of the unpowered sprite. - cut_overlays() add_overlay("crack3") + set_light(0) + set_light_on(FALSE) return - cut_overlays() //reset overlays if(news_network.wanted_issue) //wanted icon state, there can be no overlays on it as it's a priority message icon_state = "newscaster_wanted" + add_overlay(mutable_appearance(icon, "newscaster_wanted_ov")) + add_overlay(emissive_appearance(icon, "newscaster_wanted_ov")) return if(alert) //new message alert overlay add_overlay("newscaster_alert") + add_overlay(mutable_appearance(icon, "newscaster_alert")) + add_overlay(emissive_appearance(icon, "newscaster_alert")) if(hitstaken > 0) //Cosmetic damage overlay add_overlay("crack[hitstaken]") - + icon_state = "newscaster_normal" + add_overlay(emissive_appearance(icon, "newscaster_normal_ov")) + add_overlay(mutable_appearance(icon, "newscaster_normal_ov")) + set_light(2) + set_light_on(TRUE) return /obj/machinery/newscaster/power_change() diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index e299415542..761fbaa910 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -30,6 +30,9 @@ var/list/obj/machinery/requests_console/allConsoles = list() icon_state = "req_comp0" layer = ABOVE_WINDOW_LAYER circuit = /obj/item/weapon/circuitboard/request + blocks_emissive = NONE + light_power = 0.25 + light_color = "#00ff00" var/department = "Unknown" //The list of all departments on the station (Determined from this variable on each unit) Set this to the same thing if you want several consoles in one department var/list/message_log = list() //List of all messages var/departmentType = 0 //Bitflag. Zero is reply-only. Map currently uses raw numbers instead of defines. @@ -55,20 +58,8 @@ var/list/obj/machinery/requests_console/allConsoles = list() light_range = 0 var/datum/announcement/announcement = new -/obj/machinery/requests_console/power_change() - ..() - update_icon() - -/obj/machinery/requests_console/update_icon() - if(stat & NOPOWER) - if(icon_state != "req_comp_off") - icon_state = "req_comp_off" - else - if(icon_state == "req_comp_off") - icon_state = "req_comp[newmessagepriority]" - -/obj/machinery/requests_console/New() - ..() +/obj/machinery/requests_console/Initialize() + . = ..() announcement.title = "[department] announcement" announcement.newscast = 1 @@ -82,7 +73,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(departmentType & RC_INFO) req_console_information |= department - set_light(1) + update_icon() /obj/machinery/requests_console/Destroy() allConsoles -= src @@ -100,6 +91,24 @@ var/list/obj/machinery/requests_console/allConsoles = list() req_console_information -= department return ..() +/obj/machinery/requests_console/power_change() + ..() + update_icon() + +/obj/machinery/requests_console/update_icon() + cut_overlays() + + if(stat & NOPOWER) + set_light(0) + set_light_on(FALSE) + icon_state = "req_comp_off" + else + icon_state = "req_comp_[newmessagepriority]" + add_overlay(mutable_appearance(icon, "req_comp_ov[newmessagepriority]")) + add_overlay(emissive_appearance(icon, "req_comp_ov[newmessagepriority]")) + set_light(2) + set_light_on(TRUE) + /obj/machinery/requests_console/attack_hand(user as mob) if(..(user)) return diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 6497d8a217..1b5ae2e763 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -1,3 +1,8 @@ +#define SHEATER_OFF 0 +#define SHEATER_STANDBY 1 +#define SHEATER_HEAT 2 +#define SHEATER_COOL 3 + /obj/machinery/space_heater anchored = 0 density = 1 @@ -5,9 +10,15 @@ icon_state = "sheater0" name = "space heater" desc = "Made by Space Amish using traditional space techniques, this heater is guaranteed not to set the station on fire." + + light_system = MOVABLE_LIGHT + light_range = 3 + light_power = 1 + light_on = FALSE + var/obj/item/weapon/cell/cell var/cell_type = /obj/item/weapon/cell/high - var/on = 0 + var/state = 0 var/set_temperature = T0C + 20 //K var/heating_power = 40000 clicksound = "switch" @@ -21,18 +32,25 @@ /obj/machinery/space_heater/update_icon() cut_overlays() - icon_state = "sheater[on]" + icon_state = "sheater[state]" if(panel_open) add_overlay("sheater-open") - if(on) - set_light(3, 3, "#FFCC00") - else - set_light(0) + switch(state) + if(SHEATER_OFF) + set_light_on(FALSE) + if(SHEATER_STANDBY) + set_light_on(FALSE) + if(SHEATER_HEAT) + set_light_color("#FFCC00") + set_light_on(TRUE) + if(SHEATER_COOL) + set_light_color("#00ccff") + set_light_on(TRUE) /obj/machinery/space_heater/examine(mob/user) . = ..() - . += "The heater is [on ? "on" : "off"] and the hatch is [panel_open ? "open" : "closed"]." + . += "The heater is [state ? "on" : "off"] and the hatch is [panel_open ? "open" : "closed"]." if(panel_open) . += "The power cell is [cell ? "installed" : "missing"]." else @@ -92,8 +110,8 @@ if(panel_open) tgui_interact(user) else - on = !on - user.visible_message("[user] switches [on ? "on" : "off"] the [src].","You switch [on ? "on" : "off"] the [src].") + state = state ? SHEATER_OFF : SHEATER_STANDBY + user.visible_message("[user] switches [state ? "on" : "off"] the [src].","You switch [state ? "on" : "off"] the [src].") update_icon() return @@ -159,34 +177,47 @@ . = TRUE /obj/machinery/space_heater/process() - if(on) - if(cell && cell.charge) - var/datum/gas_mixture/env = loc.return_air() - if(env && abs(env.temperature - set_temperature) > 0.1) - var/transfer_moles = 0.25 * env.total_moles - var/datum/gas_mixture/removed = env.remove(transfer_moles) + if(!state) + return - if(removed) - var/heat_transfer = removed.get_thermal_energy_change(set_temperature) - if(heat_transfer > 0) //heating air - heat_transfer = min(heat_transfer , heating_power) //limit by the power rating of the heater + if(cell && cell.charge) + var/datum/gas_mixture/env = loc.return_air() + if(env && abs(env.temperature - set_temperature) > 0.1) + var/transfer_moles = 0.25 * env.total_moles + var/datum/gas_mixture/removed = env.remove(transfer_moles) - removed.add_thermal_energy(heat_transfer) - cell.use(heat_transfer*CELLRATE) - else //cooling air - heat_transfer = abs(heat_transfer) + if(removed) + var/heat_transfer = removed.get_thermal_energy_change(set_temperature) + if(heat_transfer > 0) //heating air + if(state == SHEATER_STANDBY) + state = SHEATER_HEAT + update_icon() + heat_transfer = min(heat_transfer , heating_power) //limit by the power rating of the heater - //Assume the heat is being pumped into the hull which is fixed at 20 C - var/cop = removed.temperature/T20C //coefficient of performance from thermodynamics -> power used = heat_transfer/cop - heat_transfer = min(heat_transfer, cop * heating_power) //limit heat transfer by available power + removed.add_thermal_energy(heat_transfer) + cell.use(heat_transfer*CELLRATE) + else //cooling air + if(state == SHEATER_STANDBY) + state = SHEATER_COOL + update_icon() + heat_transfer = abs(heat_transfer) - heat_transfer = removed.add_thermal_energy(-heat_transfer) //get the actual heat transfer + //Assume the heat is being pumped into the hull which is fixed at 20 C + var/cop = removed.temperature/T20C //coefficient of performance from thermodynamics -> power used = heat_transfer/cop + heat_transfer = min(heat_transfer, cop * heating_power) //limit heat transfer by available power - var/power_used = abs(heat_transfer)/cop - cell.use(power_used*CELLRATE) + heat_transfer = removed.add_thermal_energy(-heat_transfer) //get the actual heat transfer - env.merge(removed) - else - on = 0 - power_change() - update_icon() + var/power_used = abs(heat_transfer)/cop + cell.use(power_used*CELLRATE) + + env.merge(removed) + else + state = SHEATER_OFF + power_change() + update_icon() + +#undef SHEATER_OFF +#undef SHEATER_STANDBY +#undef SHEATER_HEAT +#undef SHEATER_COOL \ No newline at end of file diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm index 56f7b4731f..6db5dab83d 100644 --- a/code/game/machinery/vending_machines_vr.dm +++ b/code/game/machinery/vending_machines_vr.dm @@ -2467,10 +2467,28 @@ /obj/item/weapon/reagent_containers/food/snacks/donerkebab = 10, /obj/item/weapon/reagent_containers/food/snacks/donkpocket = 10, /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/jelly = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 10, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/green = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly = 2, /obj/item/weapon/reagent_containers/food/snacks/egg_pancake = 10, /obj/item/weapon/reagent_containers/food/snacks/eggbowl = 10, /obj/item/weapon/reagent_containers/food/snacks/eggplantparm = 10, @@ -2702,8 +2720,8 @@ /obj/item/weapon/reagent_containers/food/snacks/brainburger = 10, /obj/item/weapon/reagent_containers/food/snacks/chaoscakeslice = 10, /obj/item/weapon/reagent_containers/food/snacks/donut/chaos = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/poisonberry = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly = 10, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/poisonberry = 10, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/slimejelly = 10, /obj/item/weapon/reagent_containers/food/snacks/ghostmuffin/poison = 10, /obj/item/weapon/reagent_containers/food/snacks/old/hotdog = 10, /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice = 10, @@ -2781,7 +2799,10 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/sharkchunk = 10, /obj/item/weapon/reagent_containers/food/snacks/spagetti = 10, /obj/item/weapon/reagent_containers/food/snacks/xenomeat = 10, - /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat = 10) + /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat = 10, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 10, + /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 10, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 10) vend_delay = 15 /obj/machinery/vending/event/food/safe //FOR FACILITATING/OUTFITTING EVENTS, DO NOT PUT THESE ON THE MAP// @@ -2929,10 +2950,28 @@ /obj/item/weapon/reagent_containers/food/snacks/donerkebab = 10, /obj/item/weapon/reagent_containers/food/snacks/donkpocket = 10, /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/jelly = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 10, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/green = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly = 2, /obj/item/weapon/reagent_containers/food/snacks/egg_pancake = 10, /obj/item/weapon/reagent_containers/food/snacks/eggbowl = 10, /obj/item/weapon/reagent_containers/food/snacks/eggplantparm = 10, @@ -3154,7 +3193,10 @@ /obj/item/weapon/reagent_containers/food/snacks/wingfangchu = 10, /obj/item/weapon/reagent_containers/food/snacks/wishsoup = 10, /obj/item/weapon/reagent_containers/food/snacks/yellowcurry = 10, - /obj/item/weapon/reagent_containers/food/snacks/zestfish = 10) + /obj/item/weapon/reagent_containers/food/snacks/zestfish = 10, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 10, + /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 10, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 10) vend_delay = 15 /obj/machinery/vending/event/food/ingredients //FOR FACILITATING/OUTFITTING EVENTS, DO NOT PUT THESE ON THE MAP// diff --git a/code/game/machinery/vending_yw.dm b/code/game/machinery/vending_yw.dm index cec6c9abcf..d01995701c 100644 --- a/code/game/machinery/vending_yw.dm +++ b/code/game/machinery/vending_yw.dm @@ -28,7 +28,7 @@ icon_state = "sec" req_access = list(access_security) products = list(/obj/item/weapon/handcuffs = 8,/obj/item/weapon/grenade/flashbang = 4,/obj/item/device/flash = 5, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 12,/obj/item/weapon/storage/box/evidence = 6) + /obj/item/weapon/reagent_containers/food/snacks/donut/plain = 12,/obj/item/weapon/storage/box/evidence = 6) contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/weapon/storage/box/donut = 2) req_log_access = access_armory - has_logs = 1 \ No newline at end of file + has_logs = 1 diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index f8fdb866a4..83fdefe442 100644 --- a/code/game/machinery/wall_frames.dm +++ b/code/game/machinery/wall_frames.dm @@ -28,7 +28,7 @@ update_type_list() var/datum/frame/frame_types/frame_type if(!build_machine_type) - var/datum/frame/frame_types/response = tgui_input_list(user, "What kind of frame would you like to make?", "Frame type request", null, frame_types_floor) + var/datum/frame/frame_types/response = tgui_input_list(user, "What kind of frame would you like to make?", "Frame type request", frame_types_floor) if(!response) return frame_type = response @@ -82,7 +82,7 @@ var/datum/frame/frame_types/frame_type if(!build_machine_type) - var/datum/frame/frame_types/response = tgui_input_list(user, "What kind of frame would you like to make?", "Frame type request", null, frame_types_wall) + var/datum/frame/frame_types/response = tgui_input_list(user, "What kind of frame would you like to make?", "Frame type request", frame_types_wall) if(!response) return frame_type = response diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 57e1404b9c..ce2d8d7604 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -212,10 +212,12 @@ /obj/item/device/flashlight/afterattack(atom/target, mob/user, proximity_flag, click_parameters) . = ..() - var/turf/T = get_turf(target) + if(!on) + return var/datum/component/overlay_lighting/OL = GetComponent(/datum/component/overlay_lighting) if(!OL) return + var/turf/T = get_turf(target) OL.place_directional_light(T) /obj/item/device/flashlight/pen diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index ccab4944ca..a343ee17ae 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -9,6 +9,9 @@ w_class = ITEMSIZE_LARGE canhear_range = 7 //VOREStation Edit flags = NOBLOODY + light_color = "#00ff00" + light_power = 0.25 + blocks_emissive = NONE var/circuit = /obj/item/weapon/circuitboard/intercom var/number = 0 var/wiresexposed = 0 @@ -18,6 +21,7 @@ var/area/A = get_area(src) if(A) GLOB.apc_event.register(A, src, /atom/proc/update_icon) + update_icon() /obj/item/device/radio/intercom/Destroy() var/area/A = get_area(src) @@ -58,11 +62,13 @@ /obj/item/device/radio/intercom/department/medbay name = "station intercom (Medbay)" icon_state = "medintercom" + light_color = "#00aaff" frequency = MED_I_FREQ /obj/item/device/radio/intercom/department/security name = "station intercom (Security)" icon_state = "secintercom" + light_color = "#ff0000" frequency = SEC_I_FREQ /obj/item/device/radio/intercom/entertainment @@ -173,8 +179,12 @@ /obj/item/device/radio/intercom/update_icon() var/area/A = get_area(src) on = A?.powered(EQUIP) + + cut_overlays() if(!on) + set_light(0) + set_light_on(FALSE) if(wiresexposed) icon_state = "intercom-p_open" else @@ -182,8 +192,14 @@ else if(wiresexposed) icon_state = "intercom_open" + set_light(0) + set_light_on(FALSE) else icon_state = initial(icon_state) + add_overlay(mutable_appearance(icon, "[icon_state]_ov")) + add_overlay(emissive_appearance(icon, "[icon_state]_ov")) + set_light(2) + set_light_on(TRUE) //VOREStation Add Start /obj/item/device/radio/intercom/AICtrlClick(var/mob/user) diff --git a/code/game/objects/items/toys/mech_toys.dm b/code/game/objects/items/toys/mech_toys.dm index cf1b493489..cbc7baf9f4 100644 --- a/code/game/objects/items/toys/mech_toys.dm +++ b/code/game/objects/items/toys/mech_toys.dm @@ -510,14 +510,14 @@ /obj/item/toy/mecha/ripley name = "toy ripley" - desc = "Mini-Mecha action figure! Collect them all! 1/11." + desc = "Mini-Mecha action figure! Collect them all! 1/13." max_combat_health = 4 // 200 integrity special_attack_type = SPECIAL_ATTACK_DAMAGE special_attack_cry = "GIGA DRILL BREAK" /obj/item/toy/mecha/fireripley name = "toy firefighting ripley" - desc = "Mini-Mecha action figure! Collect them all! 2/11." + desc = "Mini-Mecha action figure! Collect them all! 2/13." icon_state = "fireripleytoy" max_combat_health = 5 // 250 integrity? special_attack_type = SPECIAL_ATTACK_UTILITY @@ -525,7 +525,7 @@ /obj/item/toy/mecha/deathripley name = "toy deathsquad ripley" - desc = "Mini-Mecha action figure! Collect them all! 3/11." + desc = "Mini-Mecha action figure! Collect them all! 3/13." icon_state = "deathripleytoy" max_combat_health = 5 // 250 integrity special_attack_type = SPECIAL_ATTACK_OTHER @@ -542,7 +542,7 @@ /obj/item/toy/mecha/gygax name = "toy gygax" - desc = "Mini-Mecha action figure! Collect them all! 4/11." + desc = "Mini-Mecha action figure! Collect them all! 4/13." icon_state = "gygaxtoy" max_combat_health = 5 // 250 integrity special_attack_type = SPECIAL_ATTACK_UTILITY @@ -550,7 +550,7 @@ /obj/item/toy/mecha/durand name = "toy durand" - desc = "Mini-Mecha action figure! Collect them all! 5/11." + desc = "Mini-Mecha action figure! Collect them all! 5/13." icon_state = "durandtoy" max_combat_health = 6 // 400 integrity special_attack_type = SPECIAL_ATTACK_HEAL @@ -558,7 +558,7 @@ /obj/item/toy/mecha/honk name = "toy H.O.N.K." - desc = "Mini-Mecha action figure! Collect them all! 6/11." + desc = "Mini-Mecha action figure! Collect them all! 6/13." icon_state = "honktoy" max_combat_health = 4 // 140 integrity special_attack_type = SPECIAL_ATTACK_OTHER @@ -572,7 +572,7 @@ /obj/item/toy/mecha/marauder name = "toy marauder" - desc = "Mini-Mecha action figure! Collect them all! 7/11." + desc = "Mini-Mecha action figure! Collect them all! 7/13." icon_state = "maraudertoy" max_combat_health = 7 // 500 integrity special_attack_type = SPECIAL_ATTACK_DAMAGE @@ -580,7 +580,7 @@ /obj/item/toy/mecha/seraph name = "toy seraph" - desc = "Mini-Mecha action figure! Collect them all! 8/11." + desc = "Mini-Mecha action figure! Collect them all! 8/13." icon_state = "seraphtoy" max_combat_health = 8 // 550 integrity special_attack_type = SPECIAL_ATTACK_DAMAGE @@ -588,7 +588,7 @@ /obj/item/toy/mecha/mauler name = "toy mauler" - desc = "Mini-Mecha action figure! Collect them all! 9/11." + desc = "Mini-Mecha action figure! Collect them all! 9/13." icon_state = "maulertoy" max_combat_health = 7 // 500 integrity special_attack_type = SPECIAL_ATTACK_DAMAGE @@ -596,7 +596,7 @@ /obj/item/toy/mecha/odysseus name = "toy odysseus" - desc = "Mini-Mecha action figure! Collect them all! 10/11." + desc = "Mini-Mecha action figure! Collect them all! 10/13." icon_state = "odysseustoy" max_combat_health = 4 // 120 integrity special_attack_type = SPECIAL_ATTACK_HEAL @@ -604,13 +604,12 @@ /obj/item/toy/mecha/phazon name = "toy phazon" - desc = "Mini-Mecha action figure! Collect them all! 11/11." + desc = "Mini-Mecha action figure! Collect them all! 11/13." icon_state = "phazontoy" max_combat_health = 6 // 200 integrity special_attack_type = SPECIAL_ATTACK_UTILITY special_attack_cry = "NO-CLIP" -/* // TG-Station Added toys, commenting these out until I port 'em later. /obj/item/toy/mecha/reticence name = "toy Reticence" desc = "12/13" @@ -633,7 +632,14 @@ max_combat_health = 4 //200 integrity special_attack_type = SPECIAL_ATTACK_UTILITY special_attack_cry = "ROLL OUT" -*/ + +/obj/item/toy/mecha/fivestars + name = "toy fivestars" + desc = "Five stars!" + icon_state = "fivestarstoy" + max_combat_health = 4 //200 integrity + special_attack_type = SPECIAL_ATTACK_UTILITY + special_attack_cry = "ROLL OUT" #undef SPECIAL_ATTACK_HEAL #undef SPECIAL_ATTACK_DAMAGE diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index e3b32ffe2d..bf4aec9fd3 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -668,6 +668,76 @@ icon_state = "ert" toysay = "We're probably the good guys!" +// Eris +/obj/item/toy/figure/excelsior + name = "\"Excelsior\" figurine" + desc = "A curiously unbranded figurine of a Space Soviet, adorned in their iconic armor. There is still a price tag on the back of the base, six-hundred credits, people collect these things? \ + \"Ever Upward!\"" + icon_state = "excelsior" + +/obj/item/toy/figure/serbian + name = "mercenary figurine" + desc = "A curiously unbranded figurine, the olive drab a popular pick for many independent Serbian mercenary outfits. Rocket launcher not included." + icon_state = "serbian" + +/obj/item/toy/figure/acolyte + name = "acolyte figurine" + desc = "Church of NeoTheology \"New Faith Life\" brand figurine of an acolyte, hooded both physically and spiritually from that which would lead them astray." + icon_state = "acolyte" + +/obj/item/toy/figure/carrion + name = "carrion figurine" + desc = "A curiously unbranded figurine depicting a grotesque head of flesh, the Human features seem almost underdeveloped, its skull bulging outwards, mouth agape with torn flesh. \ + Whoever made this certainly knew how to thin their paints." + icon_state = "carrion" + +/obj/item/toy/figure/roach + name = "roach figurine" + desc = "Upon the base is an erected \"Roachman\", its arms outstretched, with more additional roach hands besides them. This is likely the one thing most universally recognized in popular media. \ + The plaque is covered in hundreds of scratch marks, eliminating any further knowledge of it or its brand." + icon_state = "roach" + +/obj/item/toy/figure/vagabond + name = "vagabond figurine" + desc = "An Aster's \"Space Life\" brand figurine showcasing the form of a random deplorable, wearing one of the ship's uniforms, and an orange bandana. \ + Must of been custom-made to commemorate the Eris' doomed voyage." + icon_state = "vagabond" + +/obj/item/toy/figure/rooster + name = "rooster figurine" + desc = "\"Space Vice\" brand figurine, there is no further manufacturer information. It's a man wearing a rooster mask, and a varsity jacket with the letter \"B\" emblazoned on the front. \ + \"Do you like hurting other people?\"" + icon_state = "rooster" + +/obj/item/toy/figure/barking_dog + name = "barking dog figurine" + desc = "A metal soldier with the mask of a hound stands upon the base, the plaque seems smeared with caked grime, but despite this you make out a rare double-quote. \ + \"A dog barks on its master's orders, lest its pack runs astray.\" \"Whatever the task, the grim dog mask would tell you that your life was done.\"" + icon_state = "barking_dog" + +/obj/item/toy/figure/red_soldier + name = "red soldier figurine" + desc = "A curiously unbranded figurine of a red soldier fighting in the tides of war, their humanity hidden by a gas mask. \"Why do we fight? To win the war, of course.\"" + icon_state = "red_soldier" + +/obj/item/toy/figure/metacat + name = "meta-cat figurine" + desc = "A curiously unbranded figurine depicting an anthropomorphic cat in a voidsuit, the small plaque claims this to be one of two. \"Always in silent pair, through distance or unlikelihood.\"" + icon_state = "metacat" + +/obj/item/toy/figure/shitcurity + name = "shitcurity officer figurine" + desc = "An Aster's \"Space Life\" brand figurine of a classic redshirt of \"Nanotrasen's finest\". Their belly distends out into an obvious beer gut, revealing no form of manufacturer bias what-so-ever. \ + \"I joined just to kill people.\"" + icon_state = "shitcurity" + +/obj/item/toy/figure/metro_patrolman + name = "metro patrolman figurine" + desc = "The plaque seems flaked with rust residue, \"London Metro\" brand it reads. The man wears some kind of enforcer's uniform, with the acronym \"VPP\" on their left shoulder and cap. \ + \"Abandoned for Escalation, the patrolman grumbles.\"" + icon_state = "metro_patrolman" + + /* * Plushies */ @@ -744,6 +814,13 @@ name = "void carp plushie" icon_state = "voidcarp" +// Eris +/obj/structure/plushie/fumo + name = "Fumo" + desc = "A plushie of a....?." + icon_state = "fumoplushie" + phrase = "I just don't think about losing." + //Large plushies. /obj/structure/plushie name = "generic plush" diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index fc73b3196c..e09c9b1e5d 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -216,154 +216,170 @@ return -/obj/item/trash/beef //ADDITION 04/11/2021 +/obj/item/trash/beef name = "empty beef can" icon_state = "beef" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/beans //ADDITION 04/11/2021 +/obj/item/trash/beans name = "empty bean can" icon_state = "beans" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/spinach //ADDITION 04/11/2021 +/obj/item/trash/spinach name = "empty spinach can" icon_state = "spinach" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/fishegg //ADDITION 04/11/2021 +/obj/item/trash/fishegg name = "empty fisheggs can" icon_state = "fisheggs" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/carpegg //ADDITION 04/11/2021 +/obj/item/trash/carpegg name = "empty carpeggs can" icon_state = "carpeggs" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/salo //ADDITION 04/11/2021 +/obj/item/trash/salo name = "salo pack" icon_state = "pigfat" -/obj/item/trash/croutons //ADDITION 04/11/2021 +/obj/item/trash/croutons name = "suhariki pack" icon_state = "croutons" -/obj/item/trash/squid //ADDITION 04/11/2021 +/obj/item/trash/squid name = "calamari pack" icon_state = "squid" -/obj/item/trash/driedfish //ADDITION 04/11/2021 +/obj/item/trash/driedfish name = "vobla pack" icon_state = "driedfish" -/obj/item/trash/lunacakewrap //ADDITION 04/11/2021 +/obj/item/trash/lunacakewrap name = "cake wrapper" icon_state = "cakewrap" -/obj/item/trash/mochicakewrap //ADDITION 04/11/2021 +/obj/item/trash/mochicakewrap name = "cake wrapper" icon_state = "mochicakewrap" -/obj/item/trash/mooncakewrap //ADDITION 04/11/2021 +/obj/item/trash/mooncakewrap name = "cake wrapper" icon_state = "mooncakewrap" -/obj/item/trash/tidegobs//ADDITION 04/11/2021 +/obj/item/trash/tidegobs name = "tide gob bag" icon_state = "tidegobs" -/obj/item/trash/saturno//ADDITION 04/11/2021 +/obj/item/trash/saturno name = "\improper saturn-Os bag" icon_state = "saturn0s" -/obj/item/trash/jupiter//ADDITION 04/11/2021 +/obj/item/trash/jupiter name = "gello cup" icon_state = "jupiter" -/obj/item/trash/pluto//ADDITION 04/11/2021 +/obj/item/trash/pluto name = "rod bag" icon_state = "pluto" -/obj/item/trash/venus//ADDITION 04/11/2021 +/obj/item/trash/venus name = "hot cakes bag" icon_state = "venus" -/obj/item/trash/mars//ADDITION 04/11/2021 +/obj/item/trash/mars name = "frouka box" icon_state = "mars" -/obj/item/trash/oort//ADDITION 04/11/2021 +/obj/item/trash/oort name = "oort rock bag" icon_state = "oort" -/obj/item/trash/weebonuts//ADDITION 04/11/2021 +/obj/item/trash/weebonuts name = "red alert nuts bag" icon_state = "weebonuts" -/obj/item/trash/stick//ADDITION 04/11/2021 +/obj/item/trash/stick name = "stick" desc = "a stick from some snack or other food item, not even useful as crafting material." icon_state = "stick" -/obj/item/trash/maps//ADDITION 04/13/2021 +/obj/item/trash/maps name = "empty MAPS can" icon_state = "maps" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/spacer_cake_wrap//ADDITION 04/14/2021 +/obj/item/trash/spacer_cake_wrap name = "snack cake wrapper" icon_state = "spacer_cake_wrap" -/obj/item/trash/sun_snax//ADDITION 04/14/2021 +/obj/item/trash/sun_snax name = "sun snax bag" icon_state = "sun_snax" -/obj/item/trash/wasabi_peas//ADDITION 04/14/2021 +/obj/item/trash/wasabi_peas name = "wasabi peas bag" icon_state = "wasabi_peas" -/obj/item/trash/namagashi//ADDITION 04/14/2021 +/obj/item/trash/namagashi name = "namagashi bag" icon_state = "namagashi" -/obj/item/trash/pocky//ADDITION 04/14/2021 +/obj/item/trash/pocky name = "pocky bag" icon_state = "pocky" -/obj/item/trash/appleberry//ADDITION 04/14/2021 +/obj/item/trash/appleberry name = "appleberry can" icon_state = "appleberry" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/hakarl//ADDITION 04/22/2021 +/obj/item/trash/hakarl name = "\improper Indigo Co. Hákarl bag" icon_state = "hakarl" -/obj/item/trash/pretzel//ADDITION 04/22/2021 +/obj/item/trash/pretzel name = "\improper Value Pretzel Snack" icon_state = "pretzel" -/obj/item/trash/sweetration//ADDITION 04/20/2021 +/obj/item/trash/sweetration name = "desert ration bag" icon_state = "baseration" -/obj/item/trash/genration//ADDITION 04/20/2021 +/obj/item/trash/genration name = "generic ration bag" icon_state = "genration" -/obj/item/trash/meatration//ADDITION 04/20/2021 +/obj/item/trash/meatration name = "meat ration bag" icon_state = "meatration" -/obj/item/trash/vegration//ADDITION 04/20/2021 +/obj/item/trash/vegration name = "veggie ration bag" icon_state = "vegration" +/obj/item/trash/tgmc_mre + name = "\improper CRS ration bag" + icon_state = "tgmc_mre_trash" + +/obj/item/trash/vendor_burger + name = "burger wrapper" + icon_state = "packburger_wrapper" + +/obj/item/trash/vendor_hotdog + name = "hotdog wrapper" + icon_state = "packhotdog_wrapper" + +/obj/item/trash/vendor_burrito + name = "burrito wrapper" + icon_state = "packburrito_wrapper" + diff --git a/code/game/objects/items/uav.dm b/code/game/objects/items/uav.dm index b63d1246b1..ddd4bcda09 100644 --- a/code/game/objects/items/uav.dm +++ b/code/game/objects/items/uav.dm @@ -16,6 +16,11 @@ slowdown = 1.5 //Heevvee. health = 100 + + light_system = MOVABLE_LIGHT_DIRECTIONAL + light_cone_y_offset = 5 + light_range = 4 + light_power = 4 var/power_per_process = 50 // About 6.5 minutes of use on a high-cell (10,000) var/state = UAV_OFF @@ -24,7 +29,7 @@ var/list/mob/living/masters // So you know which is which - var/nickname = "Generic Droan" + var/nickname = "Unnamed UAV" // Radial menu var/static/image/radial_pickup = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_pickup") @@ -236,7 +241,7 @@ state = UAV_ON update_icon() start_hover() - set_light(4, 4, "#FFFFFF") + set_light_on(TRUE) START_PROCESSING(SSobj, src) no_masters_time = 0 visible_message("[nickname] buzzes and lifts into the air.") @@ -248,7 +253,7 @@ state = UAV_OFF update_icon() stop_hover() - set_light(0) + set_light_on(FALSE) LAZYCLEARLIST(masters) STOP_PROCESSING(SSobj, src) visible_message("[nickname] gracefully settles onto the ground.") diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 5a94a92572..bf3295d631 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -1,7 +1,7 @@ /obj/item/weapon/extinguisher name = "fire extinguisher" desc = "A traditional red fire extinguisher." - icon = 'icons/obj/items_vr.dmi' //VOREStation Edit + icon = 'icons/obj/items.dmi' icon_state = "fire_extinguisher0" item_state = "fire_extinguisher" hitsound = 'sound/weapons/smash.ogg' @@ -21,6 +21,7 @@ var/last_use = 1.0 var/safety = 1 var/sprite_name = "fire_extinguisher" + var/rand_overlays = 6 /obj/item/weapon/extinguisher/mini name = "fire extinguisher" @@ -34,16 +35,20 @@ max_water = 150 spray_particles = 3 sprite_name = "miniFE" + rand_overlays = 0 /obj/item/weapon/extinguisher/Initialize() create_reagents(max_water) - reagents.add_reagent("firefoam", max_water) //VOREStation Edit + reagents.add_reagent("firefoam", max_water) + if(rand_overlays) + var/choice = rand(1,rand_overlays) + add_overlay("[item_state]O[choice]") . = ..() /obj/item/weapon/extinguisher/examine(mob/user) . = ..() if(get_dist(user, src) == 0) - . += "[src] has [src.reagents.total_volume] units of foam left!" //VOREStation Edit - Foam not water + . += "[src] has [src.reagents.total_volume] units of foam left!" /obj/item/weapon/extinguisher/attack_self(mob/user as mob) safety = !safety @@ -72,7 +77,7 @@ /obj/item/weapon/extinguisher/afterattack(var/atom/target, var/mob/user, var/flag) //TODO; Add support for reagents in water. - if( istype(target, /obj/structure/reagent_dispensers) && flag) //VOREStation Edit + if( istype(target, /obj/structure/reagent_dispensers) && flag) var/obj/o = target var/amount = o.reagents.trans_to_obj(src, 50) to_chat(user, "You fill [src] with [amount] units of the contents of [target].") diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 0a5be3baff..2c2937ae59 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -91,6 +91,12 @@ var/stored_ore = list() var/last_update = 0 +/obj/item/weapon/storage/bag/ore/holding + name = "mining satchel of holding" + desc = "Like a mining satchel, but when you put your hand in, you're pretty sure you can feel time itself." + icon_state = "satchel_bspace" + max_storage_space = ITEMSIZE_COST_NORMAL * 75 // 3x + /obj/item/weapon/storage/bag/ore/remove_from_storage(obj/item/W as obj, atom/new_location) if(!istype(W)) return 0 diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 37a135cfde..2d905dcecc 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -527,6 +527,9 @@ max_storage_space = ITEMSIZE_COST_NORMAL * 5 // Formally 21. Odd numbers are bad. use_to_pickup = 1 // for picking up broken bulbs, not that most people will try +/obj/item/weapon/storage/box/freezer/red + icon_state = "portafreezer_red" + /obj/item/weapon/storage/box/freezer/Entered(var/atom/movable/AM) if(istype(AM, /obj/item/organ)) var/obj/item/organ/O = AM diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index 5c9be66e26..8b6384b9cb 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -2,8 +2,34 @@ * Donut Box */ +var/list/random_weighted_donuts = list( + /obj/item/weapon/reagent_containers/food/snacks/donut/plain = 5, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly = 5, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/green = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer = 3, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly = 3, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles = 3, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly = 3, + /obj/item/weapon/reagent_containers/food/snacks/donut/chaos = 1 +) + /obj/item/weapon/storage/box/donut - icon = 'icons/obj/food.dmi' + icon = 'icons/obj/food_donuts.dmi' icon_state = "donutbox" name = "donut box" desc = "A box that holds tasty donuts, if you're lucky." @@ -11,18 +37,24 @@ max_storage_space = ITEMSIZE_COST_SMALL * 6 can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut) foldable = /obj/item/stack/material/cardboard - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 6) + //starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 6) /obj/item/weapon/storage/box/donut/Initialize() + if(!empty) + for(var/i in 1 to 6) + var/type_to_spawn = pickweight(random_weighted_donuts) + new type_to_spawn(src) . = ..() update_icon() /obj/item/weapon/storage/box/donut/update_icon() cut_overlays() - var/i = 0 + var/x_offset = 0 for(var/obj/item/weapon/reagent_containers/food/snacks/donut/D in contents) - add_overlay("[i][D.overlay_state]") - i++ + var/mutable_appearance/ma = mutable_appearance(icon = icon, icon_state = D.overlay_state) + ma.pixel_x = x_offset + add_overlay(ma) + x_offset += 3 /obj/item/weapon/storage/box/donut/empty empty = TRUE diff --git a/code/game/objects/items/weapons/storage/mre.dm b/code/game/objects/items/weapons/storage/mre.dm index 50536564d3..390d4e4e8f 100644 --- a/code/game/objects/items/weapons/storage/mre.dm +++ b/code/game/objects/items/weapons/storage/mre.dm @@ -288,3 +288,95 @@ MRE Stuff /obj/item/weapon/storage/mrebag/dessert/menu11 starts_with = list(/obj/item/weapon/pen/crayon/rainbow) + +// TGMC MREs - Smaller, less trash +/obj/item/weapon/storage/box/tgmc_mre + name = "\improper CRS MRE" + desc = "Meal Ready-to-Eat, meant to be consumed in the field, prepared by the Commonwealth Ration Service. It says it's government property..." + icon = 'icons/obj/food.dmi' + icon_state = "tgmc_mre" + w_class = ITEMSIZE_SMALL + can_hold = list() + storage_slots = 5 + max_w_class = 0 + foldable = null + var/isopened = 0 + +/obj/item/weapon/storage/box/tgmc_mre/Initialize() + . = ..() + pickflavor() + +/obj/item/weapon/storage/box/tgmc_mre/Destroy() + var/turf/T = get_turf(src) + if(T) + new /obj/item/trash/tgmc_mre(T) + return ..() + +/obj/item/weapon/storage/box/tgmc_mre/proc/pickflavor() + var/entree = pick("boneless pork ribs", "grilled chicken", "pizza square", "spaghetti", "chicken tenders") + var/side = pick("meatballs", "cheese spread", "beef turnover", "mashed potatoes") + var/snack = pick("biscuit", "pretzels", "peanuts", "cracker") + var/desert = pick("spiced apples", "chocolate brownie", "sugar cookie", "choco bar") + + name = "[initial(name)] ([entree])" + + new /obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component(src, entree) + new /obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component(src, side) + new /obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component(src, snack) + new /obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component(src, desert) + new /obj/random/mre/drink(src) + +/obj/item/weapon/storage/box/tgmc_mre/remove_from_storage() + . = ..() + if(. && !contents.len && !gc_destroyed) + qdel(src) + +/obj/item/weapon/storage/box/tgmc_mre/update_icon() + if(!isopened) + isopened = 1 + icon_state = "tgmc_mre_opened" + +// The sneaky food-looks-like-a-package items +/obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component + name = "\improper MRE component" + package = TRUE + bitesize = 1 + icon_state = "tgmcmre_entree" + var/flavor = "boneless pork ribs" + +/obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component/Initialize(mapload, newflavor) + determinetype(newflavor) + desc = "A packaged [flavor] from a Meal Ready-to-Eat, there is a lengthy list of [pick("obscure", "arcane", "unintelligible", "revolutionary", "sophisticated", "unspellable")] ingredients and addictives printed on the back." + . = ..() + +/obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component/unpackage(mob/user as mob) + . = ..() + name = "\improper" + flavor + desc = "The contents of a standard issue CRS MRE. This one is " + flavor + "." + +/obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component/proc/determinetype(newflavor) + name = "\improper MRE component" + " (" + newflavor + ")" + flavor = newflavor + var/static/tastes = list("something scrumptious","nothing","the usual grub","something mediocre","hell","heaven","tentalization","disgust","dog food","cat food","fish food","recycled pizza","junk","trash","rubbish","sawdust","nutraloafs","gourmand food","gourmet food","moistness","squalidness","old grub","actually good food","bleach","soap","sand","synthetic grub","blandness","prison food","Discount Dan's","Discount Dan's Special","Discount Dan's leftovers","yesterday leftovers","microwaved leftovers","leftovers","UPP rations","uncooked grub","overcooked grub","not-so-bad grub","pinapple pizza flavored grub","mystery food","burnt food","frozen food","lukewarm food","rancidness","processed grub","crunchiness","faux meat","something false","low-calorie food","high-carb food","transfat-free food","gluten-free food","delictableness","acid","mintiness","sauciness","saltiness","extreme saltiness","spiced grub","crispness","questionable grub","something untastable","bitterness","savoriness","sourness","sweetness","umami","chewing gum","shoe polish","the jungle","indigestion","oldberries","butter","lard","oil","grass","cough syrup","water","iron","rubber","lead","bronze","wood","paper","plastic","kevlar","cloth","buckshot","gunpowder","black powder","petroleum","gasoline","diesel","biofuel","paint","jelly","slime","sludge","tofu","dietetic food","counterfeit food","grossness","dryness","tartiness","cryogenic juice","the secret ingredient","the ninth element","compressed matter","deep-fried food","double-fried food","a culinary apocalypse","experimental post-modern cuisine","a disaster","muckiness","mustard","mordant","citruses","crayon dust") + var/new_taste = pick(tastes) + + switch(newflavor) + if("boneless pork ribs", "grilled chicken", "pizza square", "spaghetti", "chicken tenders") + icon_state = "tgmcmre_entree" + nutriment_amt = 5 + starts_with = list("sodiumchloride" = 1) + if("meatballs", "cheese spread", "beef turnover", "mashed potatoes") + icon_state = "tgmcmre_side" + nutriment_amt = 3 + starts_with = list("sodiumchloride" = 1) + if("biscuit", "pretzels", "peanuts", "cracker") + icon_state = "tgmcmre_snack" + nutriment_amt = 2 + starts_with = list("sodiumchloride" = 1) + if("spiced apples", "chocolate brownie", "sugar cookie", "choco bar") + icon_state = "tgmcmre_dessert" + nutriment_amt = 2 + starts_with = list("sugar" = 1) + + package_open_state = "tgmcmre_[flavor]" + nutriment_desc = list("[new_taste]" = nutriment_amt) diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 66d9a598d2..a390dec43f 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -412,10 +412,28 @@ /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece/white, /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece/truffle, /obj/item/weapon/reagent_containers/food/snacks/chocolateegg, - /obj/item/weapon/reagent_containers/food/snacks/donut, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal, - /obj/item/weapon/reagent_containers/food/snacks/donut/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/green, + /obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly, /obj/item/weapon/reagent_containers/food/snacks/tuna, /obj/item/weapon/reagent_containers/food/snacks/pistachios, /obj/item/weapon/reagent_containers/food/snacks/semki, @@ -849,8 +867,8 @@ /obj/random/mre/dessert/item_to_spawn() return pick(/obj/item/weapon/reagent_containers/food/snacks/candy, /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal, - /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly, /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, /obj/item/weapon/reagent_containers/food/snacks/cookiesnack) @@ -861,7 +879,7 @@ /obj/random/mre/dessert/vegan/item_to_spawn() return pick(/obj/item/weapon/reagent_containers/food/snacks/candy, /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, - /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly, /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit) /obj/random/mre/drink diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 7d55685e4c..f064f983b7 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -1,5 +1,7 @@ /obj/structure/sign/double/barsign + desc = "The current barsign of this shift! The bartender can change it with their ID." icon = 'icons/obj/barsigns.dmi' + plane = ABOVE_PLANE icon_state = "empty" appearance_flags = 0 anchored = 1 @@ -7,9 +9,9 @@ /obj/structure/sign/double/barsign/proc/get_valid_states(initial=1) . = cached_icon_states(icon) - . -= "on" - . -= "narsiebistro" - . -= "empty" + . -= "On" + . -= "Nar-sie Bistro" + . -= "Empty" if(initial) . -= "Off" @@ -18,9 +20,9 @@ switch(icon_state) if("Off") . += "It appears to be switched off." - if("narsiebistro") + if("Nar-sie Bistro") . += "It shows a picture of a large black and red being. Spooky!" - if("on", "empty") + if("On", "Empty") . += "The lights are on, but there's no picture." else . += "It says '[icon_state]'" diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm index 6f60cbab28..637f069df0 100644 --- a/code/game/objects/structures/bonfire.dm +++ b/code/game/objects/structures/bonfire.dm @@ -279,7 +279,7 @@ /obj/structure/fireplace //more like a space heater than a bonfire. A cozier alternative to both. name = "fireplace" desc = "The sound of the crackling hearth reminds you of home." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/fireplace.dmi' icon_state = "fireplace" density = TRUE anchored = TRUE @@ -387,15 +387,20 @@ if(burning) var/state switch(get_fuel_amount()) - if(0 to 3.5) - state = "fireplace_warm" - if(3.6 to 6.5) - state = "fireplace_hot" - if(6.6 to 10) - state = "fireplace_intense" //don't need to throw a corpse inside to make it burn hotter. - var/image/I = image(icon, state) - I.appearance_flags = RESET_COLOR - add_overlay(I) + if(0 to 1) + state = "[icon_state]_fire0" + if(2 to 4) + state = "[icon_state]_fire1" + if(4 to 6) + state = "[icon_state]_fire2" + if(6 to 8) + state = "[icon_state]_fire3" + if(8 to 10) + state = "[icon_state]_fire4" + add_overlay(mutable_appearance(icon, state)) + add_overlay(emissive_appearance(icon, state)) + add_overlay(mutable_appearance(icon, "[icon_state]_glow")) + add_overlay(emissive_appearance(icon, "[icon_state]_glow")) var/light_strength = max(get_fuel_amount() / 2, 2) set_light(light_strength, light_strength, "#FF9933") @@ -433,4 +438,21 @@ /obj/structure/fireplace/water_act(amount) if(prob(amount * 10)) - extinguish() \ No newline at end of file + extinguish() + + +/obj/structure/fireplace/barrel + name = "barrel fire pit" + desc = "Seems like this barrel might make an ideal fire pit." + icon_state = "barrelfire" + density = TRUE + anchored = FALSE + +/obj/structure/fireplace/barrel/update_icon() + if(burning) + icon_state = "[initial(icon_state)]1" + var/light_strength = max(get_fuel_amount() / 2, 2) + set_light(light_strength, light_strength, "#FF9933") + else + icon_state = initial(icon_state) + set_light(0) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index f04ba27a78..0bdc32340f 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -83,10 +83,15 @@ /obj/structure/bed/chair/shuttle name = "chair" - desc = "You sit in this. Either by will or force." icon_state = "shuttlechair" - color = null base_icon = "shuttlechair" + color = null + applies_material_colour = 0 + +/obj/structure/bed/chair/shuttle_padded + icon_state = "shuttlechair2" + base_icon = "shuttlechair2" + color = null applies_material_colour = 0 // Leaving this in for the sake of compilation. @@ -223,6 +228,7 @@ icon_state = "sofamiddle" applies_material_colour = 1 var/sofa_material = "carpet" + var/corner_piece = FALSE /obj/structure/bed/chair/sofa/update_icon() if(applies_material_colour && sofa_material) @@ -234,9 +240,9 @@ else name = "[sofa_material] [initial(name)]" -/obj/structure/bed/chair/update_layer() +/obj/structure/bed/chair/sofa/update_layer() // Corner east/west should be on top of mobs, any other state's north should be. - if((icon_state == "sofacorner" && ((dir & EAST) || (dir & WEST))) || (icon_state != "sofacorner" && (dir & NORTH))) + if((corner_piece && ((dir & EAST) || (dir & WEST))) || (!corner_piece && (dir & NORTH))) plane = MOB_PLANE layer = MOB_LAYER + 0.1 else @@ -253,6 +259,44 @@ /obj/structure/bed/chair/sofa/corner icon_state = "sofacorner" base_icon = "sofacorner" + corner_piece = TRUE + +// Wooden nonsofa - no corners +/obj/structure/bed/chair/sofa/pew + name = "pew bench" + desc = "If they want you to go to church, why do they make these so uncomfortable?" + base_icon = "pewmiddle" + icon_state = "pewmiddle" + applies_material_colour = FALSE + +/obj/structure/bed/chair/sofa/pew/left + icon_state = "pewend_left" + base_icon = "pewend_left" + +/obj/structure/bed/chair/sofa/pew/right + icon_state = "pewend_right" + base_icon = "pewend_right" + +// Corporate sofa - one color fits all +/obj/structure/bed/chair/sofa/corp + name = "black leather sofa" + desc = "How corporate!" + base_icon = "corp_sofamiddle" + icon_state = "corp_sofamiddle" + applies_material_colour = FALSE + +/obj/structure/bed/chair/sofa/corp/left + icon_state = "corp_sofaend_left" + base_icon = "corp_sofaend_left" + +/obj/structure/bed/chair/sofa/corp/right + icon_state = "corp_sofaend_right" + base_icon = "corp_sofaend_right" + +/obj/structure/bed/chair/sofa/corp/corner + icon_state = "corp_sofacorner" + base_icon = "corp_sofacorner" + corner_piece = TRUE //color variations diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 980dde34eb..48cd83a03d 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -39,7 +39,7 @@ var/global/list/stool_cache = list() //haha stool icon_state = "" cut_overlays() // Base icon. - var/cache_key = "stool-[material.name]" + var/cache_key = "[base_icon]-[material.name]" if(isnull(stool_cache[cache_key])) var/image/I = image(icon, base_icon) I.color = material.icon_colour @@ -47,7 +47,7 @@ var/global/list/stool_cache = list() //haha stool add_overlay(stool_cache[cache_key]) // Padding overlay. if(padding_material) - var/padding_cache_key = "stool-padding-[padding_material.name]" + var/padding_cache_key = "[base_icon]-padding-[padding_material.name]" if(isnull(stool_cache[padding_cache_key])) var/image/I = image(icon, "[base_icon]_padding") //VOREStation Edit I.color = padding_material.icon_colour diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm b/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm index f1f0b35a19..e513e72f2a 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm @@ -11,5 +11,8 @@ base_icon = "bar_stool_base" anchored = 1 +/obj/item/weapon/stool/baystool/padded + icon_state = "bar_stool_padded_preview" //set for the map + /obj/item/weapon/stool/baystool/padded/New(var/newloc, var/new_material) ..(newloc, "steel", "carpet") diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index f512c3a799..a7808fe7af 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -4,7 +4,7 @@ name = "toilet" desc = "The HT-451, a torque rotation-based, waste disposal unit for small matter. This one seems remarkably clean." icon = 'icons/obj/watercloset.dmi' - icon_state = "toilet00" + icon_state = "toilet" density = 0 anchored = 1 var/open = 0 //if the lid is up @@ -41,7 +41,7 @@ update_icon() /obj/structure/toilet/update_icon() - icon_state = "toilet[open][cistern]" + icon_state = "[initial(icon_state)][open][cistern]" /obj/structure/toilet/attackby(obj/item/I as obj, mob/living/user as mob) if(I.is_crowbar()) @@ -91,7 +91,39 @@ to_chat(user, "You carefully place \the [I] into the cistern.") return +/obj/structure/toilet/prison + name = "prison toilet" + icon_state = "toilet2" +/obj/structure/toilet/prison/attack_hand(mob/living/user) + return + +/obj/structure/toilet/prison/attackby(obj/item/I, mob/living/user) + if(istype(I, /obj/item/weapon/grab)) + user.setClickCooldown(user.get_attack_speed(I)) + var/obj/item/weapon/grab/G = I + + if(isliving(G.affecting)) + var/mob/living/GM = G.affecting + + if(G.state>1) + if(!GM.loc == get_turf(src)) + to_chat(user, "[GM.name] needs to be on the toilet.") + return + if(open && !swirlie) + user.visible_message("[user] starts to give [GM.name] a swirlie!", "You start to give [GM.name] a swirlie!") + swirlie = GM + if(do_after(user, 30, GM)) + user.visible_message("[user] gives [GM.name] a swirlie!", "You give [GM.name] a swirlie!", "You hear a toilet flushing.") + if(!GM.internal) + GM.adjustOxyLoss(5) + swirlie = null + else + user.visible_message("[user] slams [GM.name] into the [src]!", "You slam [GM.name] into the [src]!") + GM.adjustBruteLoss(5) + else + to_chat(user, "You need a tighter grip.") + /obj/structure/urinal name = "urinal" @@ -391,7 +423,11 @@ /obj/structure/sink/kitchen name = "kitchen sink" - icon_state = "sink_alt" + icon_state = "sink2" + +/obj/structure/sink/countertop + name = "countertop sink" + icon_state = "sink3" /obj/structure/sink/puddle //splishy splashy ^_^ name = "puddle" diff --git a/code/game/objects/stumble_into_vr.dm b/code/game/objects/stumble_into_vr.dm index 2a747ae563..e52a2f6ce5 100644 --- a/code/game/objects/stumble_into_vr.dm +++ b/code/game/objects/stumble_into_vr.dm @@ -116,7 +116,7 @@ /obj/machinery/space_heater/stumble_into(mob/living/M) ..() - if(on) + if(state) M.apply_damage(10, BURN) M.emote("scream") diff --git a/code/game/turfs/simulated/floor_types_eris.dm b/code/game/turfs/simulated/floor_types_eris.dm index 1cd067b957..432fae5585 100644 --- a/code/game/turfs/simulated/floor_types_eris.dm +++ b/code/game/turfs/simulated/floor_types_eris.dm @@ -260,6 +260,51 @@ floor_smooth = SMOOTH_NONE smooth_movable_atom = SMOOTH_NONE +/decl/flooring/tiling/eris/bcircuit + name = "circuit substrate" + icon_base = "bcircuit" + icon = 'icons/turf/flooring/eris/circuit.dmi' + build_type = /obj/item/stack/tile/floor/eris/bcircuit + floor_smooth = SMOOTH_NONE + smooth_movable_atom = SMOOTH_NONE + flags = TURF_HAS_EDGES | TURF_HAS_CORNERS | TURF_CAN_BREAK + +/decl/flooring/tiling/eris/derelict1 + name = "derelict floor" + icon_base = "derelict1" + icon = 'icons/turf/flooring/eris/derelict.dmi' + build_type = /obj/item/stack/tile/floor/eris/derelict1 + floor_smooth = SMOOTH_NONE + smooth_movable_atom = SMOOTH_NONE + flags = TURF_HAS_EDGES | TURF_REMOVE_CROWBAR | TURF_CAN_BREAK + +/decl/flooring/tiling/eris/derelict2 + name = "derelict floor" + icon_base = "derelict2" + icon = 'icons/turf/flooring/eris/derelict.dmi' + build_type = /obj/item/stack/tile/floor/eris/derelict2 + floor_smooth = SMOOTH_NONE + smooth_movable_atom = SMOOTH_NONE + flags = TURF_HAS_EDGES | TURF_REMOVE_CROWBAR | TURF_CAN_BREAK + +/decl/flooring/tiling/eris/derelict3 + name = "derelict floor" + icon_base = "derelict3" + icon = 'icons/turf/flooring/eris/derelict.dmi' + build_type = /obj/item/stack/tile/floor/eris/derelict3 + floor_smooth = SMOOTH_NONE + smooth_movable_atom = SMOOTH_NONE + flags = TURF_HAS_EDGES | TURF_REMOVE_CROWBAR | TURF_CAN_BREAK + +/decl/flooring/tiling/eris/derelict4 + name = "derelict floor" + icon_base = "derelict4" + icon = 'icons/turf/flooring/eris/derelict.dmi' + build_type = /obj/item/stack/tile/floor/eris/derelict4 + floor_smooth = SMOOTH_NONE + smooth_movable_atom = SMOOTH_NONE + flags = TURF_HAS_EDGES | TURF_REMOVE_CROWBAR | TURF_CAN_BREAK + /decl/flooring/tiling/eris/techmaint name = "techmaint floor" icon_base = "techmaint" @@ -306,6 +351,38 @@ icon_state = "tile_cafe" matter = list(MAT_PLASTIC = 1) +// Circuit +/obj/item/stack/tile/floor/eris/bcircuit + name = "circuit floor tile" + singular_name = "circuit floor tile" + icon_state = "tile_techmaint" // No sprite for this... + matter = list(MAT_STEEL = 1) + +// Derelict +/obj/item/stack/tile/floor/eris/derelict1 + name = "derelict floor tile" + singular_name = "derelict floor tile" + icon_state = "tile_techmaint" // No sprite for this... + matter = list(MAT_STEEL = 1) + +/obj/item/stack/tile/floor/eris/derelict2 + name = "derelict floor tile" + singular_name = "derelict floor tile" + icon_state = "tile_techmaint" // No sprite for this... + matter = list(MAT_STEEL = 1) + +/obj/item/stack/tile/floor/eris/derelict3 + name = "derelict floor tile" + singular_name = "derelict floor tile" + icon_state = "tile_techmaint" // No sprite for this... + matter = list(MAT_STEEL = 1) + +/obj/item/stack/tile/floor/eris/derelict4 + name = "derelict floor tile" + singular_name = "derelict floor tile" + icon_state = "tile_techmaint" // No sprite for this... + matter = list(MAT_STEEL = 1) + // Techmaint /obj/item/stack/tile/floor/eris/techmaint name = "maint floor tile" @@ -838,6 +915,36 @@ icon_state = "cafe" initial_flooring = /decl/flooring/tiling/eris/cafe +/turf/simulated/floor/tiled/eris/bcircuit + name = "substrate" + icon = 'icons/turf/flooring/eris/circuit.dmi' + icon_state = "bcircuit" + initial_flooring = /decl/flooring/tiling/eris/bcircuit + +/turf/simulated/floor/tiled/eris/derelict1 + name = "floor" + icon = 'icons/turf/flooring/eris/derelict.dmi' + icon_state = "derelict1" + initial_flooring = /decl/flooring/tiling/eris/derelict1 + +/turf/simulated/floor/tiled/eris/derelict2 + name = "floor" + icon = 'icons/turf/flooring/eris/derelict.dmi' + icon_state = "derelict2" + initial_flooring = /decl/flooring/tiling/eris/derelict2 + +/turf/simulated/floor/tiled/eris/derelict3 + name = "floor" + icon = 'icons/turf/flooring/eris/derelict.dmi' + icon_state = "derelict3" + initial_flooring = /decl/flooring/tiling/eris/derelict3 + +/turf/simulated/floor/tiled/eris/derelict4 + name = "floor" + icon = 'icons/turf/flooring/eris/derelict.dmi' + icon_state = "derelict4" + initial_flooring = /decl/flooring/tiling/eris/derelict4 + /turf/simulated/floor/tiled/eris/techmaint name = "floor" icon = 'icons/turf/flooring/eris/tiles_maint.dmi' diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index d09a90b376..a031d6dd59 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -273,12 +273,12 @@ Ccomp's first proc. var/target = tgui_input_list(usr, "Select a ckey to allow to rejoin", "Allow Respawn Selector", GLOB.respawn_timers) if(!target) return - + if(GLOB.respawn_timers[target] == -1) // Their respawn timer is set to -1, which is 'not allowed to respawn' var/response = tgui_alert(src, "Are you sure you wish to allow this individual to respawn? They would normally not be able to.","Allow impossible respawn?",list("No","Yes")) if(response == "No") return - + GLOB.respawn_timers -= target var/found_client = FALSE @@ -295,7 +295,7 @@ Ccomp's first proc. if(!found_client) to_chat(src, "The associated client didn't appear to be connected, so they couldn't be notified, but they can now respawn if they reconnect.") - + log_admin("[key_name(usr)] allowed [found_client ? key_name(found_client) : target] to bypass the respawn time limit") message_admins("Admin [key_name_admin(usr)] allowed [found_client ? key_name_admin(found_client) : target] to bypass the respawn time limit", 1) @@ -483,7 +483,7 @@ Traitors and the like can also be revived with the previous role mostly intact. return new_character = new(spawnloc) - + if(sparks) anim(spawnloc,new_character,'icons/mob/mob.dmi',,"phasein",,new_character.dir) playsound(spawnloc, "sparks", 50, 1) @@ -544,6 +544,8 @@ Traitors and the like can also be revived with the previous role mostly intact. //A redraw for good measure new_character.regenerate_icons() + new_character.update_transform() //VOREStation Edit + //If we're announcing their arrival if(announce) AnnounceArrival(new_character, new_character.mind.assigned_role, "Common", new_character.z) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 33e53b84d6..bee748c8ee 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -156,11 +156,16 @@ var/list/preferences_datums = list() var/multilingual_mode = 0 // Default behaviour, delimiter-key-space, delimiter-key-delimiter, off var/list/volume_channels = list() + + ///If they are currently in the process of swapping slots, don't let them open 999 windows for it and get confused + var/selecting_slots = FALSE + //CHOMPEdit Begin /datum/preferences/proc/numlanguage() var/datum/species/S = GLOB.all_species[species] return num_languages ? num_languages : S.num_alternate_languages //CHOMPEdit End + /datum/preferences/New(client/C) player_setup = new(src) set_biological_gender(pick(MALE, FEMALE)) @@ -241,7 +246,6 @@ var/list/preferences_datums = list() if(!get_mob_by_key(client_ckey)) to_chat(user, "No mob exists for the given client!") - close_load_dialog(user) return if(!char_render_holders) @@ -350,11 +354,6 @@ var/list/preferences_datums = list() if(!IsGuestKey(usr.key)) open_load_dialog(usr) return 1 - else if(href_list["changeslot"]) - load_character(text2num(href_list["changeslot"])) - attempt_vr(client.prefs_vr,"load_vore","") //VOREStation Edit - sanitize_preferences() - close_load_dialog(usr) else if(href_list["resetslot"]) if("No" == tgui_alert(usr, "This will reset the current slot. Continue?", "Reset current slot?", list("No", "Yes"))) return 0 @@ -366,10 +365,6 @@ var/list/preferences_datums = list() if(!IsGuestKey(usr.key)) open_copy_dialog(usr) return 1 - else if(href_list["overwrite"]) - overwrite_character(text2num(href_list["overwrite"])) - sanitize_preferences() - close_load_dialog(usr) else if(href_list["close"]) // User closed preferences window, cleanup anything we need to. clear_character_previews() @@ -408,53 +403,80 @@ var/list/preferences_datums = list() character.descriptors[entry] = body_descriptors[entry] /datum/preferences/proc/open_load_dialog(mob/user) - var/dat = "" - dat += "
" - + if(selecting_slots) + to_chat(user, "You already have a slot selection dialog open!") + return var/savefile/S = new /savefile(path) - if(S) - dat += "Select a character slot to load
" - var/name - var/nickname //vorestation edit - This set appends nicknames to the save slot - for(var/i=1, i<= config.character_slots, i++) - S.cd = "/character[i]" - S["real_name"] >> name - S["nickname"] >> nickname //vorestation edit - if(!name) name = "Character[i]" - if(i==default_slot) - name = "[name]" - dat += "[name][nickname ? " ([nickname])" : ""]
" //vorestation edit + if(!S) + error("Somehow missing savefile path?! [path]") + return - dat += "
" - dat += "
" - //user << browse(dat, "window=saves;size=300x390") - panel = new(user, "Character Slots", "Character Slots", 300, 390, src) - panel.set_content(dat) - panel.open() + var/name + var/nickname //vorestation edit - This set appends nicknames to the save slot + var/list/charlist = list() + for(var/i=1, i<= config.character_slots, i++) + S.cd = "/character[i]" + S["real_name"] >> name + S["nickname"] >> nickname //vorestation edit + if(!name) + name = "[i] - \[Unused Slot\]" + else if(i == default_slot) + name = "â–º[i] - [name]" + else + name = "[i] - [name]" + charlist["[name][nickname ? " ([nickname])" : ""]"] = i -/datum/preferences/proc/close_load_dialog(mob/user) - //user << browse(null, "window=saves") - panel.close() + selecting_slots = TRUE + var/choice = tgui_input_list(user, "Select a character to load:", "Load Slot", charlist) + selecting_slots = FALSE + if(!choice) + return + + var/slotnum = charlist[choice] + if(!slotnum) + error("Player picked [choice] slot to load, but that wasn't one we sent.") + return + + load_character(slotnum) + attempt_vr(user.client?.prefs_vr,"load_vore","") //VOREStation Edit + sanitize_preferences() + ShowChoices(user) /datum/preferences/proc/open_copy_dialog(mob/user) - var/dat = "" - dat += "
" - + if(selecting_slots) + to_chat(user, "You already have a slot selection dialog open!") + return var/savefile/S = new /savefile(path) - if(S) - dat += "Select a character slot to overwrite
" - dat += "You will then need to save to confirm
" - var/name - for(var/i=1, i<= config.character_slots, i++) - S.cd = "/character[i]" - S["real_name"] >> name - if(!name) name = "Character[i]" - if(i==default_slot) - name = "[name]" - dat += "[name]
" + if(!S) + error("Somehow missing savefile path?! [path]") + return - dat += "
" - dat += "
" - panel = new(user, "Character Slots", "Character Slots", 300, 390, src) - panel.set_content(dat) - panel.open() + var/name + var/nickname //vorestation edit - This set appends nicknames to the save slot + var/list/charlist = list() + for(var/i=1, i<= config.character_slots, i++) + S.cd = "/character[i]" + S["real_name"] >> name + S["nickname"] >> nickname //vorestation edit + if(!name) + name = "[i] - \[Unused Slot\]" + if(i == default_slot) + name = "►[i] - [name]" + else + name = "[i] - [name]" + charlist["[name][nickname ? " ([nickname])" : ""]"] = i + + selecting_slots = TRUE + var/choice = tgui_input_list(user, "Select a character to COPY TO:", "Copy Slot", charlist) + selecting_slots = FALSE + if(!choice) + return + + var/slotnum = charlist[choice] + if(!slotnum) + error("Player picked [choice] slot to copy to, but that wasn't one we sent.") + return + + overwrite_character(slotnum) + sanitize_preferences() + ShowChoices(user) diff --git a/code/modules/economy/vending.dm b/code/modules/economy/vending.dm index cd9e1f4783..e4b4998171 100644 --- a/code/modules/economy/vending.dm +++ b/code/modules/economy/vending.dm @@ -36,7 +36,11 @@ var/list/products = list() // For each, use the following pattern: var/list/contraband = list() // list(/type/path = amount,/type/path2 = amount2) var/list/premium = list() // No specified amount = only one in stock + /// Set automatically, allows coin use + var/has_premium = FALSE var/list/prices = list() // Prices for each item, list(/type/path = price), items not in the list don't have a price. + /// Set automatically, enables pricing + var/has_prices = FALSE // List of vending_product items available. var/list/product_records = list() @@ -115,14 +119,23 @@ GLOBAL_LIST_EMPTY(vending_products) product_records.Add(product) GLOB.vending_products[entry] = 1 + if(LAZYLEN(prices)) + has_prices = TRUE + if(LAZYLEN(premium)) + has_premium = TRUE + + LAZYCLEARLIST(products) + LAZYCLEARLIST(contraband) + LAZYCLEARLIST(premium) + LAZYCLEARLIST(prices) + all_products.Cut() + /obj/machinery/vending/Destroy() qdel(wires) wires = null qdel(coin) coin = null - for(var/datum/stored_item/vending_product/R in product_records) - qdel(R) - product_records = null + QDEL_NULL_LIST(product_records) return ..() /obj/machinery/vending/ex_act(severity) @@ -171,7 +184,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(panel_open) attack_hand(user) return - else if(istype(W, /obj/item/weapon/coin) && premium.len > 0) + else if(istype(W, /obj/item/weapon/coin) && has_premium) user.drop_item() W.forceMove(src) coin = W @@ -350,7 +363,7 @@ GLOBAL_LIST_EMPTY(vending_products) var/list/data = list() var/list/listed_products = list() - data["chargesMoney"] = length(prices) > 0 ? TRUE : FALSE + data["chargesMoney"] = has_prices ? TRUE : FALSE for(var/key = 1 to product_records.len) var/datum/stored_item/vending_product/I = product_records[key] diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index fa81776511..7d4d9270ea 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -39,7 +39,7 @@ /obj/machinery/vending/boozeomat name = "Booze-O-Mat" desc = "A technological marvel, the ads would have you believe this is able to mix just the mixture you'd like to drink the moment you ask for one." - icon_state = "fridge_dark" + icon_state = "boozeomat" products = list(/obj/item/weapon/reagent_containers/food/drinks/glass2/square = 10, /obj/item/weapon/reagent_containers/food/drinks/glass2/rocks = 10, /obj/item/weapon/reagent_containers/food/drinks/glass2/shake = 10, @@ -158,6 +158,9 @@ /obj/item/weapon/reagent_containers/food/snacks/pistachios = 12, /obj/item/weapon/reagent_containers/food/snacks/semki = 12, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 12, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 12, + /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 12, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 12, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 12, /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 12, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 12, @@ -188,6 +191,9 @@ /obj/item/weapon/reagent_containers/food/snacks/pistachios = 1, /obj/item/weapon/reagent_containers/food/snacks/semki = 1, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 2, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 7, + /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 7, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 7, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1, /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 1, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 2, @@ -439,7 +445,8 @@ products = list(/obj/item/weapon/handcuffs = 8, /obj/item/weapon/grenade/flashbang = 4, /obj/item/device/flash = 5, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 12, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain = 6, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly = 6, /obj/item/weapon/storage/box/evidence = 6) contraband = list(/obj/item/clothing/glasses/sunglasses = 2, /obj/item/weapon/storage/box/donut = 2) @@ -1021,6 +1028,9 @@ /obj/item/weapon/reagent_containers/food/snacks/syndicake = 8, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 8, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 8, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 8, + /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 8, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 8, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 8, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 8, /obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 8, @@ -1039,6 +1049,9 @@ /obj/item/weapon/reagent_containers/food/snacks/syndicake = 5, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 5, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 5, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 5, + /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 5, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 5, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 5, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 5, /obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 5, @@ -1069,4 +1082,366 @@ products = list(/obj/item/weapon/reagent_containers/food/snacks/packaged/genration = 8, /obj/item/weapon/reagent_containers/food/snacks/packaged/vegration = 8, /obj/item/weapon/reagent_containers/food/snacks/packaged/meatration = 8) - contraband = list(/obj/item/weapon/reagent_containers/food/snacks/packaged/sweetration = 2) \ No newline at end of file + contraband = list(/obj/item/weapon/reagent_containers/food/snacks/packaged/sweetration = 2) + +/** + * Department/job vendors to sit in place of lockers taking up space + */ +/obj/machinery/vending/wardrobe + icon = 'icons/obj/vending_job.dmi' + + +/obj/machinery/vending/wardrobe/bardrobe + name = "bartender wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "bardrobe" + req_access = list() + products = list() // Wow they don't have their own locker + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/secdrobe + name = "security wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "secdrobe" + req_access = list(access_brig) + products = list( + /obj/item/clothing/under/rank/security = 5, + /obj/item/clothing/under/rank/security2 = 5, + /obj/item/clothing/under/rank/security/turtleneck = 5, + /obj/item/clothing/under/rank/security/skirt = 5, + /obj/item/clothing/shoes/boots/jackboots = 5, + /obj/item/clothing/head/soft/sec = 5, + /obj/item/clothing/head/beret/sec = 5, + /obj/item/clothing/head/beret/sec/corporate/officer = 5, + /obj/item/clothing/mask/bandana/red = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat/security = 5, + /obj/item/clothing/accessory/armband = 5, + /obj/item/clothing/accessory/holster/waist = 5 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/chefdrobe + name = "chef wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "chefdrobe" + req_access = list() + products = list() // Hmm! + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/medidrobe + name = "medical wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "medidrobe" + req_access = list(access_medical_equip) + products = list( + /obj/item/clothing/under/rank/medical = 5, + /obj/item/clothing/under/rank/medical/skirt = 5, + /obj/item/clothing/under/rank/medical/turtleneck = 5, + /obj/item/clothing/under/rank/medical/scrubs = 5, + /obj/item/clothing/under/rank/medical/scrubs/green = 5, + /obj/item/clothing/under/rank/medical/scrubs/purple = 5, + /obj/item/clothing/under/rank/medical/scrubs/black = 5, + /obj/item/clothing/under/rank/medical/scrubs/navyblue = 5, + /obj/item/clothing/head/surgery/navyblue = 5, + /obj/item/clothing/head/surgery/purple = 5, + /obj/item/clothing/head/surgery/blue = 5, + /obj/item/clothing/head/surgery/green = 5, + /obj/item/clothing/head/surgery/black = 5, + /obj/item/clothing/shoes/white = 5, + /obj/item/clothing/suit/storage/toggle/labcoat = 5, + /obj/item/clothing/mask/surgical = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat/medical = 5, + /obj/item/clothing/shoes/boots/winter/medical = 5 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/chemdrobe + name = "chemistry wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "chemdrobe" + req_access = list() + products = list( + /obj/item/clothing/under/rank/chemist = 5, + /obj/item/clothing/under/rank/chemist/skirt = 5, + /obj/item/clothing/shoes/white = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/chemist = 5, + /obj/item/weapon/storage/backpack/chemistry = 5, + /obj/item/weapon/storage/backpack/satchel/chem = 5, + /obj/item/weapon/storage/bag/chemistry = 5 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/genedrobe + name = "genetics wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "genedrobe" + req_access = list() + products = list( + /obj/item/clothing/under/rank/geneticist = 5, + /obj/item/clothing/under/rank/geneticist/skirt = 5, + /obj/item/clothing/shoes/white = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/genetics = 5, + /obj/item/weapon/storage/backpack/genetics = 5, + /obj/item/weapon/storage/backpack/satchel/gen = 5 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/virodrobe + name = "virology wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "virodrobe" + req_access = list() + products = list( + /obj/item/clothing/under/rank/virologist = 5, + /obj/item/clothing/under/rank/virologist/skirt = 5, + /obj/item/clothing/shoes/white = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/virologist = 5, + /obj/item/clothing/mask/surgical = 5, + /obj/item/weapon/storage/backpack/virology = 5, + /obj/item/weapon/storage/backpack/satchel/vir = 5 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/scidrobe + name = "science wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "scidrobe" + req_access = list(access_tox_storage) + products = list( + /obj/item/clothing/under/rank/scientist = 5, + /obj/item/clothing/under/rank/scientist/skirt = 5, + /obj/item/clothing/under/rank/scientist/turtleneck = 5, + /obj/item/clothing/suit/storage/toggle/labcoat = 5, + /obj/item/clothing/shoes/white = 5, + /obj/item/clothing/shoes/slippers = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat/science = 5, + /obj/item/clothing/shoes/boots/winter/science = 5, + /obj/item/weapon/storage/backpack/toxins = 5, + /obj/item/weapon/storage/backpack/satchel/tox = 5 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/robodrobe + name = "robotics wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "robodrobe" + req_access = list() + products = list( + /obj/item/clothing/under/rank/roboticist = 5, + /obj/item/clothing/suit/storage/toggle/labcoat = 5, + /obj/item/clothing/shoes/black = 5, + /obj/item/clothing/gloves/black = 5, + /obj/item/weapon/storage/backpack/toxins = 5, + /obj/item/weapon/storage/backpack/satchel/tox = 5 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/chapdrobe + name = "chaplain wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "chapdrobe" + req_access = list() + products = list( + /obj/item/clothing/under/rank/chaplain = 5, + /obj/item/clothing/shoes/black = 5, + /obj/item/clothing/suit/nun = 5, + /obj/item/clothing/head/nun_hood = 5, + /obj/item/clothing/suit/storage/hooded/chaplain_hoodie = 5, + /obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout = 5, + /obj/item/clothing/suit/holidaypriest = 5, + /obj/item/clothing/under/wedding/bride_white = 5, + /obj/item/weapon/storage/backpack/cultpack = 5, + /obj/item/weapon/storage/fancy/candle_box = 5, + /obj/item/weapon/storage/fancy/whitecandle_box = 5, + /obj/item/weapon/storage/fancy/blackcandle_box = 5, + /obj/item/godfig = 5, + /obj/item/weapon/deck/tarot = 5 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/engidrobe + name = "engineer wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "engidrobe" + req_access = list(access_engine_equip) + products = list( + /obj/item/clothing/under/rank/engineer = 5, + /obj/item/clothing/under/rank/engineer/skirt = 5, + /obj/item/clothing/under/rank/engineer/turtleneck = 5, + /obj/item/clothing/shoes/orange = 5, + /obj/item/clothing/head/hardhat = 5, + /obj/item/clothing/head/beret/engineering = 5, + /obj/item/clothing/mask/bandana/gold = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat/engineering = 5, + /obj/item/clothing/shoes/boots/winter/engineering = 5, + /obj/item/clothing/shoes/boots/workboots = 5 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/atmosdrobe + name = "atmos tech wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "atmosdrobe" + req_access = list(access_atmospherics) + products = list( + /obj/item/clothing/under/rank/atmospheric_technician = 5, + /obj/item/clothing/under/rank/atmospheric_technician/skirt = 5, + /obj/item/clothing/shoes/black = 5, + /obj/item/clothing/head/hardhat/red = 5, + /obj/item/clothing/head/beret/engineering = 5, + /obj/item/clothing/mask/bandana/gold = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos = 5, + /obj/item/clothing/shoes/boots/winter/atmos = 5 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/hydrobe + name = "hydroponics wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "hydrobe" + req_access = list(access_hydroponics) + products = list( + /obj/item/clothing/under/rank/hydroponics = 5, + /obj/item/device/analyzer/plant_analyzer = 5, + /obj/item/clothing/head/greenbandana = 5, + /obj/item/weapon/material/minihoe = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat/hydro = 5, + /obj/item/clothing/shoes/boots/winter/hydro = 5 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/cargodrobe + name = "cargo wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "cargodrobe" + req_access = list(access_cargo) + products = list( + /obj/item/clothing/under/rank/cargotech = 5, + /obj/item/clothing/under/rank/cargotech/skirt = 5, + /obj/item/clothing/under/rank/cargotech/jeans = 5, + /obj/item/clothing/under/rank/cargotech/jeans/female = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat/cargo = 5, + /obj/item/clothing/shoes/boots/winter/supply = 5, + /obj/item/clothing/shoes/black = 5, + /obj/item/clothing/gloves/black = 5, + /obj/item/clothing/gloves/fingerless = 5, + /obj/item/clothing/head/soft = 5 + ) + req_log_access = access_hop + has_logs = 1 +/* + +/obj/machinery/vending/wardrobe/curadrobe + name = "cura?? wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "curadrobe" + req_access = list() + products = list() + req_log_access = access_hop + has_logs = 1 +*/ + +/obj/machinery/vending/wardrobe/janidrobe + name = "janitor wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "janidrobe" + req_access = list( + /obj/item/clothing/under/rank/janitor = 5, + /obj/item/clothing/under/dress/maid/janitor = 5, + /obj/item/device/radio/headset/headset_service = 5, + /obj/item/weapon/cartridge/janitor = 5, + /obj/item/clothing/gloves/black = 5, + /obj/item/clothing/head/soft/purple = 5, + /obj/item/clothing/head/beret/purple = 5, + /obj/item/clothing/suit/caution = 20, + /obj/item/weapon/storage/belt/janitor = 5, + /obj/item/clothing/shoes/galoshes = 5 + ) + products = list() + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/lawdrobe + name = "lawyer wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "lawdrobe" + req_access = list() + products = list( + /obj/item/clothing/under/lawyer/female = 5, + /obj/item/clothing/under/lawyer/black = 5, + /obj/item/clothing/under/lawyer/black/skirt = 5, + /obj/item/clothing/under/lawyer/red = 5, + /obj/item/clothing/under/lawyer/red/skirt = 5, + /obj/item/clothing/suit/storage/toggle/internalaffairs = 5, + /obj/item/clothing/under/lawyer/bluesuit = 5, + /obj/item/clothing/under/lawyer/bluesuit/skirt = 5, + /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 5, + /obj/item/clothing/under/lawyer/purpsuit = 5, + /obj/item/clothing/under/lawyer/purpsuit/skirt = 5, + /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 5, + /obj/item/clothing/shoes/brown = 5, + /obj/item/clothing/shoes/black = 5, + /obj/item/clothing/shoes/laceup = 5, + /obj/item/clothing/glasses/sunglasses/big = 5, + /obj/item/clothing/under/lawyer/blue = 5, + /obj/item/clothing/under/lawyer/blue/skirt = 5, + /obj/item/device/tape/random = 5 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/detdrobe + name = "detective wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Want to do your job? Sure you do!" + icon_state = "detdrobe" + req_access = list(access_forensics_lockers) + products = list( + /obj/item/clothing/head/det = 5, + /obj/item/clothing/head/det/grey = 5, + /obj/item/clothing/shoes/brown = 5, + /obj/item/clothing/shoes/laceup = 5, + /obj/item/clothing/under/det = 5, + /obj/item/clothing/under/det/waistcoat = 5, + /obj/item/clothing/under/det/grey = 5, + /obj/item/clothing/under/det/grey/waistcoat = 5, + /obj/item/clothing/under/det/black = 5, + /obj/item/clothing/under/det/skirt, + /obj/item/clothing/under/det/corporate = 5, + /obj/item/clothing/suit/storage/det_trench = 5, + /obj/item/clothing/suit/storage/det_trench/grey = 5, + /obj/item/clothing/suit/storage/forensics/blue = 5, + /obj/item/clothing/suit/storage/forensics/red = 5 + ) + req_log_access = access_hop + has_logs = 1 \ No newline at end of file diff --git a/code/modules/food/food/lunch.dm b/code/modules/food/food/lunch.dm index 871e37e187..6bbd434e43 100644 --- a/code/modules/food/food/lunch.dm +++ b/code/modules/food/food/lunch.dm @@ -12,8 +12,8 @@ var/list/lunchables_lunches_ = list(/obj/item/weapon/reagent_containers/food/sna /obj/item/weapon/reagent_containers/food/snacks/tossedsalad, /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose) -var/list/lunchables_snacks_ = list(/obj/item/weapon/reagent_containers/food/snacks/donut/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly, +var/list/lunchables_snacks_ = list(/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly, /obj/item/weapon/reagent_containers/food/snacks/muffin, /obj/item/weapon/reagent_containers/food/snacks/popcorn, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 7a76c49a06..140f6a71fb 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -4,6 +4,10 @@ desc = "yummy" icon = 'icons/obj/food.dmi' icon_state = null + center_of_mass = list("x"=16, "y"=16) + w_class = ITEMSIZE_SMALL + force = 0 + var/bitesize = 1 var/bitecount = 0 var/trash = null @@ -17,17 +21,23 @@ var/datum/reagent/nutriment/coating/coating = null var/icon/flat_icon = null //Used to cache a flat icon generated from dipping in batter. This is used again to make the cooked-batter-overlay var/do_coating_prefix = 1 //If 0, we wont do "battered thing" or similar prefixes. Mainly for recipes that include batter but have a special name - var/cooked_icon = null //Used for foods that are "cooked" without being made into a specific recipe or combination. - //Generally applied during modification cooking with oven/fryer - //Used to stop deepfried meat from looking like slightly tanned raw meat, and make it actually look cooked - center_of_mass = list("x"=16, "y"=16) - w_class = ITEMSIZE_SMALL - force = 0 + + /// Used for foods that are "cooked" without being made into a specific recipe or combination. + /// Generally applied during modification cooking with oven/fryer + /// Used to stop deepfried meat from looking like slightly tanned raw meat, and make it actually look cooked + var/cooked_icon = null + + /// If this has a wrapper on it. If true, it will print a message and ask you to remove it + var/package = FALSE + /// Packaged meals drop this trash type item when opened, if set + var/package_trash + /// Packaged meals switch to this state when opened, if set + var/package_open_state /obj/item/weapon/reagent_containers/food/snacks/Initialize() . = ..() if(nutriment_amt) - reagents.add_reagent("nutriment",nutriment_amt,nutriment_desc) + reagents.add_reagent("nutriment",(nutriment_amt*2),nutriment_desc) //VOREStation Edit: Undoes global nutrition nerf //Placeholder for effect that trigger on eating that aren't tied to reagents. /obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/M) @@ -47,7 +57,8 @@ return /obj/item/weapon/reagent_containers/food/snacks/attack_self(mob/user as mob) - return + if(package && !user.incapacitated()) + unpackage(user) /obj/item/weapon/reagent_containers/food/snacks/attack(mob/living/M as mob, mob/user as mob, def_zone) if(reagents && !reagents.total_volume) @@ -56,6 +67,10 @@ qdel(src) return 0 + if(package) + to_chat(M, "How do you expect to eat this with the package still on?") + return FALSE + if(istype(M, /mob/living/carbon)) //TODO: replace with standard_feed_mob() call. @@ -244,6 +259,18 @@ something.dropInto(loc) . = ..() + return + +/obj/item/weapon/reagent_containers/food/snacks/proc/unpackage(mob/user) + package = FALSE + to_chat(user, "You unwrap [src].") + playsound(user,'sound/effects/pageturn2.ogg', 15, 1) + if(package_trash) + var/obj/item/T = new package_trash + user.put_in_hands(T) + if(package_open_state) + icon_state = package_open_state + //////////////////////////////////////////////////////////////////////////////// /// FOOD END //////////////////////////////////////////////////////////////////////////////// @@ -390,43 +417,256 @@ name = "donut" desc = "Goes great with Robust Coffee." description_fluff = "These donuts claim to be made fresh daily in a boutique bakery in New Reykjavik and delivered to Nanotrasen's hardworking asset protection crew. They're probably synthesized." - icon_state = "donut1" + icon = 'icons/obj/food_donuts.dmi' + icon_state = "donut" filling_color = "#D9C386" - var/overlay_state = "box-donut1" - center_of_mass = list("x"=13, "y"=16) nutriment_desc = list("sweetness", "donut") - -/obj/item/weapon/reagent_containers/food/snacks/donut/normal - name = "donut" - desc = "Goes great with Robust Coffee." - icon_state = "donut1" nutriment_amt = 3 - bitesize = 3 + bitesize = 4 + var/overlay_state = "donut_inbox" -/obj/item/weapon/reagent_containers/food/snacks/donut/normal/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/donut/plain + name = "plain donut" + icon_state = "donut" + desc = "A plain ol' donut." +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly + name = "plain jelly donut" + icon_state = "jelly" + desc = "At least this one has jelly!" +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/pink + name = "pink frosted donut" + icon_state = "donut_pink" + desc = "This one has pink frosting!" + overlay_state = "donut_pink_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/pink/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly + name = "pink frosted jelly donut" + icon_state = "jelly_pink" + desc = "This one has pink frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/purple + name = "purple frosted donut" + icon_state = "donut_purple" + desc = "This one has purple frosting!" + overlay_state = "donut_purple_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/purple/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly + name = "purple frosted jelly donut" + icon_state = "jelly_purple" + desc = "This one has purple frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/green + name = "green frosted donut" + icon_state = "donut_green" + desc = "This one has green frosting!" + overlay_state = "donut_green_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/green/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly + name = "green frosted jelly donut" + icon_state = "jelly_green" + desc = "This one has green frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/beige + name = "beige frosted donut" + icon_state = "donut_beige" + desc = "This one has beige frosting!" + overlay_state = "donut_beige_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/beige/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly + name = "beige frosted jelly donut" + icon_state = "jelly_beige" + desc = "This one has beige frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/choc + name = "chocolate frosted donut" + icon_state = "donut_choc" + desc = "This one has chocolate frosting!" + overlay_state = "donut_choc_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/choc/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly + name = "chocolate frosted jelly donut" + icon_state = "jelly_choc" + desc = "This one has chocolate frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/blue + name = "blue frosted donut" + icon_state = "donut_blue" + desc = "This one has blue frosting!" + overlay_state = "donut_blue_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/blue/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly + name = "blue frosted jelly donut" + icon_state = "jelly_blue" + desc = "This one has blue frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/yellow + name = "yellow frosted donut" + icon_state = "donut_yellow" + desc = "This one has yellow frosting!" + overlay_state = "donut_yellow_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/yellow/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly + name = "yellow frosted jelly donut" + icon_state = "jelly_yellow" + desc = "This one has yellow frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/olive + name = "olive frosted donut" + icon_state = "donut_olive" + desc = "This one has olive frosting!" + overlay_state = "donut_olive_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/olive/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly + name = "olive frosted jelly donut" + icon_state = "jelly_olive" + desc = "This one has olive frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/homer + name = "frosted donut with sprinkles" + icon_state = "donut_homer" + desc = "It's a d'ohnut!" + overlay_state = "donut_homer_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/homer/Initialize() . = ..() reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("sprinkles", 1) - if(prob(30)) - src.icon_state = "donut2" - src.overlay_state = "box-donut2" - src.name = "frosted donut" - reagents.add_reagent("sprinkles", 2) - center_of_mass = list("x"=19, "y"=16) + +/obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly + name = "frosted jelly donut with sprinkles" + icon_state = "jelly_homer" + desc = "It's a d'ohnut with jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("sprinkles", 1) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles + name = "chocolate sprinkles donut" + icon_state = "donut_choc_sprinkles" + desc = "Mmm, chocolate with sprinkles... approaching maximum donut." + overlay_state = "donut_choc_sprinkles_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("sprinkles", 1) + +/obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly + name = "chocolate sprinkles jelly donut" + icon_state = "jelly_choc_sprinkles" + desc = "Pretty sure this is the most sugar you can pack into a donut." +/obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("sprinkles", 1) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/meat + name = "meat donut" + icon_state = "donut_meat" + desc = "This donut has ... meat? Is it made of meat?!" + overlay_state = "donut_meat_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/meat/Initialize() + . = ..() + reagents.add_reagent("protein", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/laugh + name = "laugh donut" + icon_state = "donut_laugh" + desc = "Try not to laugh." + overlay_state = "donut_laugh_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/laugh/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/laugh/jelly + name = "laugh jelly donut" + icon_state = "jelly_laugh" + desc = "Try not to be jelly." +/obj/item/weapon/reagent_containers/food/snacks/donut/laugh/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + /obj/item/weapon/reagent_containers/food/snacks/donut/chaos name = "Chaos Donut" desc = "Like life, it never quite tastes the same." - icon_state = "donut1" + icon_state = "donut_chaos" filling_color = "#ED11E6" nutriment_amt = 2 bitesize = 10 + overlay_state = "donut_chaos_inbox" /obj/item/weapon/reagent_containers/food/snacks/donut/chaos/Initialize() . = ..() reagents.add_reagent("sprinkles", 1) - var/chaosselect = pick(1,2,3,4,5,6,7,8,9,10) - switch(chaosselect) + switch(rand(1,10)) if(1) reagents.add_reagent("nutriment", 3, nutriment_desc) if(2) @@ -447,87 +687,28 @@ reagents.add_reagent("berryjuice", 3) if(10) reagents.add_reagent("tricordrazine", 3) - if(prob(30)) - src.icon_state = "donut2" - src.overlay_state = "box-donut2" - src.name = "Frosted Chaos Donut" - reagents.add_reagent("sprinkles", 2) -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly - name = "Jelly Donut" - desc = "You jelly?" - icon_state = "jdonut1" +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/poisonberry filling_color = "#ED1169" - center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 3 - bitesize = 5 -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/poisonberry/Initialize() . = ..() - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("berryjuice", 5) - if(prob(30)) - src.icon_state = "jdonut2" - src.overlay_state = "box-donut2" - src.name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) - -/obj/item/weapon/reagent_containers/food/snacks/donut/poisonberry - name = "Jelly Donut" - desc = "You jelly?" - icon_state = "jdonut1" - filling_color = "#ED1169" - center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 3 - bitesize = 5 - -/obj/item/weapon/reagent_containers/food/snacks/donut/poisonberry/Initialize() - . = ..() - reagents.add_reagent("sprinkles", 1) reagents.add_reagent("poisonberryjuice", 5) - if(prob(30)) - src.icon_state = "jdonut2" - src.overlay_state = "box-donut2" - src.name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) -/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly - name = "Jelly Donut" - desc = "You jelly?" - icon_state = "jdonut1" +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/slimejelly filling_color = "#ED1169" - center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 3 - bitesize = 5 -/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/slimejelly/Initialize() . = ..() - reagents.add_reagent("sprinkles", 1) reagents.add_reagent("slimejelly", 5) - if(prob(30)) - src.icon_state = "jdonut2" - src.overlay_state = "box-donut2" - src.name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) -/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly - name = "Jelly Donut" - desc = "You jelly?" - icon_state = "jdonut1" +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly filling_color = "#ED1169" - center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 3 - bitesize = 5 -/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly/Initialize() . = ..() - reagents.add_reagent("sprinkles", 1) reagents.add_reagent("cherryjelly", 5) - if(prob(30)) - src.icon_state = "jdonut2" - src.overlay_state = "box-donut2" - src.name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) + /obj/item/weapon/reagent_containers/food/snacks/egg name = "egg" @@ -6926,3 +7107,36 @@ /obj/item/weapon/reagent_containers/food/snacks/packaged/sweetration/Initialize() . = ..() reagents.add_reagent("sugar", 6) + +/obj/item/weapon/reagent_containers/food/snacks/vendor_burger + name = "packaged burger" + icon_state = "packburger" + desc = "A burger stored in a plastic wrapping for vending machine distribution. Surely it tastes fine!" + package = TRUE + package_trash = /obj/item/trash/vendor_burger + package_open_state = "smolburger" + nutriment_amt = 3 + nutriment_desc = list("stale burger" = 3) + starts_with = list("sodiumchloride" = 1) + +/obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog + name = "packaged hotdog" + icon_state = "packhotdog" + desc = "A hotdog stored in a plastic wrapping for vending machine distribution. Surely it tastes fine!" + package = TRUE + package_trash = /obj/item/trash/vendor_hotdog + package_open_state = "smolhotdog" + nutriment_amt = 3 + nutriment_desc = list("stale hotdog" = 3) + starts_with = list("sodiumchloride" = 1) + +/obj/item/weapon/reagent_containers/food/snacks/vendor_burrito + name = "packaged burrito" + icon_state = "packburrito" + desc = "A burrito stored in a plastic wrapping for vending machine distribution. Surely it tastes fine!" + package = TRUE + package_trash = /obj/item/trash/vendor_burrito + package_open_state = "smolburrito" + nutriment_amt = 3 + nutriment_desc = list("stale burrito" = 3) + starts_with = list("sodiumchloride" = 1) diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm index a3c511df48..f76dac86bf 100644 --- a/code/modules/food/glass/bottle.dm +++ b/code/modules/food/glass/bottle.dm @@ -37,25 +37,26 @@ /obj/item/weapon/reagent_containers/glass/bottle/update_icon() cut_overlays() - if(reagents.total_volume && (icon_state == "bottle-1" || icon_state == "bottle-2" || icon_state == "bottle-3" || icon_state == "bottle-4")) + if(reagents.total_volume) var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10") var/percent = round((reagents.total_volume / volume) * 100) switch(percent) - if(0 to 9) filling.icon_state = "[icon_state]--10" - if(10 to 24) filling.icon_state = "[icon_state]-10" - if(25 to 49) filling.icon_state = "[icon_state]-25" - if(50 to 74) filling.icon_state = "[icon_state]-50" - if(75 to 79) filling.icon_state = "[icon_state]-75" - if(80 to 90) filling.icon_state = "[icon_state]-80" - if(91 to INFINITY) filling.icon_state = "[icon_state]-100" + if(0.1 to 20) filling.icon_state = "[icon_state]-10" + if(20 to 40) filling.icon_state = "[icon_state]-20" + if(40 to 60) filling.icon_state = "[icon_state]-40" + if(60 to 80) filling.icon_state = "[icon_state]-60" + if(80 to 100) filling.icon_state = "[icon_state]-80" + if(100 to INFINITY) filling.icon_state = "[icon_state]-100" filling.color = reagents.get_color() add_overlay(filling) if (!is_open_container()) - var/image/lid = image(icon, src, "lid_bottle") - add_overlay(lid) + add_overlay("lid_[initial(icon_state)]") + + if (label_text) + add_overlay("label_[initial(icon_state)]") /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline name = "inaprovaline bottle" diff --git a/code/modules/food/kitchen/smartfridge/engineering.dm b/code/modules/food/kitchen/smartfridge/engineering.dm index 8141ca496d..94a40b9dc3 100644 --- a/code/modules/food/kitchen/smartfridge/engineering.dm +++ b/code/modules/food/kitchen/smartfridge/engineering.dm @@ -1,9 +1,7 @@ /obj/machinery/smartfridge/sheets //Is this used anywhere? It's not secure. name = "\improper Smart Sheet Storage" desc = "A storage unit for metals." - icon_state = "fridge_dark" - icon_base = "fridge_dark" - icon_contents = "slime" + icon_contents = "boxes" stored_datum_type = /datum/stored_item/stack /obj/machinery/smartfridge/sheets/persistent diff --git a/code/modules/food/kitchen/smartfridge/hydroponics.dm b/code/modules/food/kitchen/smartfridge/hydroponics.dm index 9b50136d79..1c2cb42246 100644 --- a/code/modules/food/kitchen/smartfridge/hydroponics.dm +++ b/code/modules/food/kitchen/smartfridge/hydroponics.dm @@ -1,10 +1,7 @@ /obj/machinery/smartfridge/produce name = "\improper Smart Produce Storage" desc = "For storing all sorts of perishable foods!" - icon = 'icons/obj/vending.dmi' - icon_state = "fridge_food" - icon_base = "fridge_food" - icon_contents = "food" + icon_contents = "boxes" /obj/machinery/smartfridge/produce/persistent persistent = /datum/persistent/storage/smartfridge/produce @@ -18,11 +15,27 @@ return FALSE /obj/machinery/smartfridge/drinks - name = "\improper Drink Showcase" + name = "\improper Smart Drink Storage" desc = "A refrigerated storage unit for tasty tasty alcohol." - icon_state = "fridge_drinks" - icon_base = "fridge_drinks" - icon_contents = "drink" + icon_contents = "drinks" + +/obj/machinery/smartfridge/drinks/showcase + name = "\improper Drink Showcase" + icon_state = "showcase" + icon_base = "showcase" + +/obj/machinery/smartfridge/drinks/update_icon() + cut_overlays() + if(stat & (BROKEN|NOPOWER)) + icon_state = "[icon_base]-off" + else + icon_state = icon_base + + if(panel_open) + add_overlay("[icon_base]-panel") + + if(!stat && contents.len) + add_overlay("[icon_base]-fill") /obj/machinery/smartfridge/drinks/accept_check(var/obj/item/O as obj) if(istype(O,/obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks) || istype(O,/obj/item/weapon/reagent_containers/food/condiment)) @@ -32,7 +45,7 @@ /obj/machinery/smartfridge/seeds name = "\improper MegaSeed Servitor" desc = "When you need seeds fast!" - icon_contents = "chem" + icon_contents = "boxes" /obj/machinery/smartfridge/seeds/accept_check(var/obj/item/O as obj) if(istype(O,/obj/item/seeds/)) @@ -42,8 +55,8 @@ /obj/machinery/smartfridge/secure/extract name = "\improper Biological Sample Storage" desc = "A refrigerated storage unit for xenobiological samples." - icon_contents = "slime" req_access = list(access_research) + icon_contents = "drinks" /obj/machinery/smartfridge/secure/extract/accept_check(var/obj/item/O as obj) if(istype(O, /obj/item/slime_extract)) diff --git a/code/modules/food/kitchen/smartfridge/medical.dm b/code/modules/food/kitchen/smartfridge/medical.dm index 609f707a06..9a566381b6 100644 --- a/code/modules/food/kitchen/smartfridge/medical.dm +++ b/code/modules/food/kitchen/smartfridge/medical.dm @@ -28,7 +28,6 @@ /obj/machinery/smartfridge/chemistry //Is this used anywhere? It's not secure. name = "\improper Smart Chemical Storage" desc = "A refrigerated storage unit for medicine and chemical storage." - icon_contents = "chem" /obj/machinery/smartfridge/chemistry/accept_check(var/obj/item/O as obj) if(istype(O,/obj/item/weapon/storage/pill_bottle) || istype(O,/obj/item/weapon/reagent_containers)) diff --git a/code/modules/food/kitchen/smartfridge/smartfridge.dm b/code/modules/food/kitchen/smartfridge/smartfridge.dm index a7b61628ed..6e9e47e411 100644 --- a/code/modules/food/kitchen/smartfridge/smartfridge.dm +++ b/code/modules/food/kitchen/smartfridge/smartfridge.dm @@ -4,9 +4,9 @@ name = "\improper SmartFridge" desc = "For storing all sorts of things! This one doesn't accept any of them!" icon = 'icons/obj/vending.dmi' - icon_state = "fridge_food" - var/icon_base = "fridge_food" //Iconstate to base all the broken/deny/etc on - var/icon_contents = "food" //Overlay to put on glass to show contents + icon_state = "smartfridge" + var/icon_base = "smartfridge" //Iconstate to base all the broken/deny/etc on + var/icon_contents = "misc" //Overlay to put on glass to show contents density = 1 anchored = 1 use_power = USE_POWER_IDLE @@ -28,9 +28,6 @@ /obj/machinery/smartfridge/secure is_secure = 1 - icon_state = "fridge_sci" - icon_base = "fridge_sci" - icon_contents = "chem" /obj/machinery/smartfridge/Initialize() . = ..() @@ -40,6 +37,7 @@ wires = new/datum/wires/smartfridge/secure(src) else wires = new/datum/wires/smartfridge(src) + update_icon() /obj/machinery/smartfridge/Destroy() qdel(wires) @@ -74,35 +72,17 @@ else icon_state = icon_base - if(is_secure) - add_overlay("[icon_base]-sidepanel") - if(panel_open) add_overlay("[icon_base]-panel") - var/is_off = "" - if(inoperable()) - is_off = "-off" - // Fridge contents - if(contents) - switch(contents.len) - if(0) - add_overlay("empty[is_off]") - if(1 to 2) - add_overlay("[icon_contents]-1[is_off]") - if(3 to 5) - add_overlay("[icon_contents]-2[is_off]") - if(6 to 8) - add_overlay("[icon_contents]-3[is_off]") - else - add_overlay("[icon_contents]-4[is_off]") - - // Fridge top - var/image/top = image(icon, "[icon_base]-top") - top.pixel_z = 32 - top.layer = ABOVE_WINDOW_LAYER - add_overlay(top) + switch(contents.len) + if(1 to 3) + add_overlay("[icon_base]-[icon_contents]1") + if(3 to 6) + add_overlay("[icon_base]-[icon_contents]2") + if(6 to INFINITY) + add_overlay("[icon_base]-[icon_contents]3") /******************* * Item Adding @@ -180,6 +160,7 @@ item_records.Add(I) I.add_product(O) SStgui.update_uis(src) + update_icon() /obj/machinery/smartfridge/proc/vend(datum/stored_item/I, var/count) var/amount = I.get_amount() @@ -190,6 +171,7 @@ for(var/i = 1 to min(amount, count)) I.get_product(get_turf(src)) SStgui.update_uis(src) + update_icon() /obj/machinery/smartfridge/attack_ai(mob/user as mob) attack_hand(user) diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm index ba6884b10b..bc977d8afb 100644 --- a/code/modules/food/recipes_fryer.dm +++ b/code/modules/food/recipes_fryer.dm @@ -128,7 +128,7 @@ items = list( /obj/item/weapon/reagent_containers/food/snacks/doughslice ) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly + result = /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly result_quantity = 2 /datum/recipe/jellydonut/poisonberry @@ -136,15 +136,15 @@ items = list( /obj/item/weapon/reagent_containers/food/snacks/dough ) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/poisonberry + result = /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/poisonberry /datum/recipe/jellydonut/slime // Subtypes of jellydonut, appliance inheritance applies. reagents = list("slimejelly" = 5, "sugar" = 5) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly + result = /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/slimejelly /datum/recipe/jellydonut/cherry // Subtypes of jellydonut, appliance inheritance applies. reagents = list("cherryjelly" = 5, "sugar" = 5) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly + result = /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly /datum/recipe/donut appliance = FRYER @@ -152,7 +152,7 @@ items = list( /obj/item/weapon/reagent_containers/food/snacks/doughslice ) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/normal + result = /obj/item/weapon/reagent_containers/food/snacks/donut/plain result_quantity = 2 /datum/recipe/chaosdonut diff --git a/code/modules/materials/materials/metals/steel.dm b/code/modules/materials/materials/metals/steel.dm index ca323c8137..d8836af8c7 100644 --- a/code/modules/materials/materials/metals/steel.dm +++ b/code/modules/materials/materials/metals/steel.dm @@ -79,8 +79,10 @@ new /datum/stack_recipe("conveyor switch", /obj/machinery/conveyor_switch, 2, time = 20, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), new /datum/stack_recipe("grenade casing", /obj/item/weapon/grenade/chem_grenade, recycle_material = "[name]"), new /datum/stack_recipe("light fixture frame", /obj/item/frame/light, 2, recycle_material = "[name]"), + new /datum/stack_recipe("floor light fixture frame", /obj/machinery/light_construct/floortube, 2, recycle_material = "[name]"), new /datum/stack_recipe("small light fixture frame", /obj/item/frame/light/small, 1, recycle_material = "[name]"), new /datum/stack_recipe("floor lamp fixture frame", /obj/machinery/light_construct/flamp, 2, recycle_material = "[name]"), + new /datum/stack_recipe("big floor lamp fixture frame", /obj/machinery/light_construct/bigfloorlamp, 3, recycle_material = "[name]"), new /datum/stack_recipe("apc frame", /obj/item/frame/apc, 2, recycle_material = "[name]"), new /datum/stack_recipe("desk bell", /obj/item/weapon/deskbell, 1, on_floor = 1, supplied_material = "[name]"), new /datum/stack_recipe("tanning rack", /obj/structure/tanning_rack, 3, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]") diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index 015c9ab9b4..b136a83e2a 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -51,7 +51,8 @@ EQUIPMENT("Jump Boots", /obj/item/clothing/shoes/bhop, 2500), EQUIPMENT("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 1200), EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 750), - EQUIPMENT("Large Mining Satchel", /obj/item/weapon/storage/bag/ore/large, 1000), //CHOMPstation addition + EQUIPMENT("Large Mining Satchel", /obj/item/weapon/storage/bag/ore/large, 1000), //CHOMP Add //CHOMPstation addition + EQUIPMENT("Mining Satchel of Holding", /obj/item/weapon/storage/bag/ore/holding, 1500), ) prize_list["Consumables"] = list( EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 1), diff --git a/code/modules/mob/dead/observer/observer_vr.dm b/code/modules/mob/dead/observer/observer_vr.dm index 36f5761dde..df68f41851 100644 --- a/code/modules/mob/dead/observer/observer_vr.dm +++ b/code/modules/mob/dead/observer/observer_vr.dm @@ -70,15 +70,34 @@ var/datum/transhuman/mind_record/record = db.backed_up[src.mind.name] if(!(record.dead_state == MR_DEAD)) to_chat(src, "Your backup is not past-due yet.") - else if((world.time - record.last_notification) < 10 MINUTES) + else if((world.time - record.last_notification) < 5 MINUTES) to_chat(src, "Too little time has passed since your last notification.") else - db.notify(record.mindname, TRUE) + db.notify(record.mindname) record.last_notification = world.time to_chat(src, "New notification has been sent.") else to_chat(src,"No backup record could be found, sorry.") +/mob/observer/dead/verb/backup_delay() + set category = "Ghost" + set name = "Cancel Transcore Notification" + set desc = "You can use this to avoid automatic backup notification happening. Manual notification can still be used." + + if(!mind) + to_chat(src,"Your ghost is missing game values that allow this functionality, sorry.") + return + var/datum/transcore_db/db = SStranscore.db_by_mind_name(mind.name) + if(db) + var/datum/transhuman/mind_record/record = db.backed_up[src.mind.name] + if(record.dead_state == MR_DEAD || !(record.do_notify)) + to_chat(src, "The notification has already happened or been delayed.") + else + record.do_notify = FALSE + to_chat(src, "Overdue mind backup notification delayed successfully.") + else + to_chat(src,"No backup record could be found, sorry.") + /mob/observer/dead/verb/findghostpod() //Moves the ghost instead of just changing the ghosts's eye -Nodrak set category = "Ghost" set name = "Find Ghost Pod" diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 13bc02dda4..c26629a8bb 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -138,7 +138,7 @@ var/list/slot_equipment_priority = list( \ /mob/proc/put_in_hands(var/obj/item/W) if(!W) return 0 - W.forceMove(get_turf(src)) + W.forceMove(drop_location()) W.reset_plane_and_layer() W.dropped() return 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm index 6766cd67d3..d26353ada3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm @@ -60,6 +60,11 @@ var/datum/effect/effect/system/ion_trail_follow/ion_trail = null var/obj/item/shield_projector/shields = null +/mob/living/simple_mob/mechanical/combat_drone/melee + icon_state = "droneM" + icon_dead = "droneM_dead" + ai_holder_type = /datum/ai_holder/simple_mob/melee/hit_and_run + /mob/living/simple_mob/mechanical/combat_drone/Initialize() ion_trail = new ion_trail.set_up(src) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone_vr.dm deleted file mode 100644 index 09956c1579..0000000000 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone_vr.dm +++ /dev/null @@ -1,8 +0,0 @@ -/mob/living/simple_mob/mechanical/combat_drone - icon = 'icons/mob/animal_vr64x64.dmi' - - pixel_x = -16 - default_pixel_x = -16 - pixel_y = -16 - default_pixel_y = -16 - diff --git a/code/modules/overmap/bluespace_rift_vr.dm b/code/modules/overmap/bluespace_rift_vr.dm index 1ee421a2a3..e38ed55d41 100644 --- a/code/modules/overmap/bluespace_rift_vr.dm +++ b/code/modules/overmap/bluespace_rift_vr.dm @@ -4,8 +4,6 @@ icon = 'icons/obj/overmap_vr.dmi' icon_state = "portal" color = "#2288FF" - - known = FALSE //shows up on nav computers automatically scannable = TRUE //if set to TRUE will show up on ship sensors for detailed scans var/obj/effect/overmap/bluespace_rift/partner diff --git a/code/modules/overmap/events/overmap_event.dm b/code/modules/overmap/events/overmap_event.dm index 7b1faa68f6..e64f71170b 100644 --- a/code/modules/overmap/events/overmap_event.dm +++ b/code/modules/overmap/events/overmap_event.dm @@ -9,7 +9,6 @@ icon = 'icons/obj/overmap.dmi' icon_state = "event" opacity = 1 - known = FALSE var/list/events // List of event datum paths var/list/event_icon_states // Randomly picked from var/difficulty = EVENT_LEVEL_MODERATE diff --git a/code/modules/overmap/overmap_object.dm b/code/modules/overmap/overmap_object.dm index ccf3df8be7..f79741bd3a 100644 --- a/code/modules/overmap/overmap_object.dm +++ b/code/modules/overmap/overmap_object.dm @@ -3,20 +3,39 @@ icon = 'icons/obj/overmap.dmi' icon_state = "object" - var/known = 1 //shows up on nav computers automatically - var/scannable //if set to TRUE will show up on ship sensors for detailed scans - var/scanner_name //name for scans, replaces name once scanned - var/scanner_desc //description for scans - var/skybox_icon //Icon file to use for skybox - var/skybox_icon_state //Icon state to use for skybox - var/skybox_pixel_x //Shift from lower left corner of skybox - var/skybox_pixel_y //Shift from lower left corner of skybox - var/image/cached_skybox_image //Cachey + /// If set to TRUE will show up on ship sensors for detailed scans + var/scannable + /// Description for scans + var/scanner_desc + + /// Icon file to use for skybox + var/skybox_icon + /// Icon state to use for skybox + var/skybox_icon_state + /// Shift from lower left corner of skybox + var/skybox_pixel_x + /// Shift from lower left corner of skybox + var/skybox_pixel_y + /// Cachey + var/image/cached_skybox_image + + /// For showing to the pilot of the ship, so they see the 'real' appearance, despite others seeing the unknown ones + var/image/real_appearance light_system = MOVABLE_LIGHT light_on = FALSE +/obj/effect/overmap/Initialize() + . = ..() + if(!global.using_map.use_overmap) + return INITIALIZE_HINT_QDEL + +/obj/effect/overmap/Destroy() + real_appearance?.loc = null + real_appearance = null + return ..() + //Overlay of how this object should look on other skyboxes /obj/effect/overmap/proc/get_skybox_representation() if(!cached_skybox_image) @@ -45,23 +64,10 @@ SSskybox.rebuild_skyboxes(O.map_z) /obj/effect/overmap/proc/get_scan_data(mob/user) - if(scanner_name && (name != scanner_name)) //A silly check, but 'name' is part of appearance, so more expensive than you might think - name = scanner_name - var/dat = {"\[b\]Scan conducted at\[/b\]: [stationtime2text()] [stationdate2text()]\n\[b\]Grid coordinates\[/b\]: [x],[y]\n\n[scanner_desc]"} return dat -/obj/effect/overmap/Initialize() - . = ..() - if(!global.using_map.use_overmap) - return INITIALIZE_HINT_QDEL - - if(known) - plane = PLANE_LIGHTING_ABOVE - for(var/obj/machinery/computer/ship/helm/H in global.machines) - H.get_known_sectors() - /obj/effect/overmap/Crossed(var/obj/effect/overmap/visitable/other) if(istype(other)) for(var/obj/effect/overmap/visitable/O in loc) diff --git a/code/modules/overmap/overmap_planet.dm b/code/modules/overmap/overmap_planet.dm index dcb8fc1af3..73dd092638 100644 --- a/code/modules/overmap/overmap_planet.dm +++ b/code/modules/overmap/overmap_planet.dm @@ -1,8 +1,11 @@ /obj/effect/overmap/visitable/planet name = "planet" - icon_state = "globe" + icon_state = "lush" in_space = 0 + unknown_name = "unknown planet" + unknown_state = "planet" + var/datum/gas_mixture/atmosphere var/atmosphere_color = "FFFFFF" diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm index b91b5470e7..cce1f94cce 100644 --- a/code/modules/overmap/sectors.dm +++ b/code/modules/overmap/sectors.dm @@ -6,6 +6,15 @@ scannable = TRUE scanner_desc = "!! No Data Available !!" + icon_state = "generic" + + /// Shows up on nav computers automatically + var/known = TRUE + /// Name prior to being scanned if !known + var/unknown_name = "unknown sector" + /// Icon_state prior to being scanned if !known + var/unknown_state = "field" + var/list/map_z = list() var/list/extra_z_levels //if you need to manually insist that these z-levels are part of this sector, for things like edge-of-map step trigger transitions rather than multi-z complexes @@ -50,6 +59,19 @@ LAZYADD(SSshuttles.sectors_to_initialize, src) //Queued for further init. Will populate the waypoint lists; waypoints not spawned yet will be added in as they spawn. SSshuttles.process_init_queues() + if(known) + plane = PLANE_LIGHTING_ABOVE + for(var/obj/machinery/computer/ship/helm/H in global.machines) + H.get_known_sectors() + else + real_appearance = image(icon, src, icon_state) + real_appearance.override = TRUE + name = unknown_name + icon_state = unknown_state + color = null + desc = "Scan this to find out more information." + + // You generally shouldn't destroy these. /obj/effect/overmap/visitable/Destroy() testing("Deleting [src] overmap sector at [x],[y]") @@ -98,6 +120,15 @@ global.using_map.map_levels -= map_z */ +/obj/effect/overmap/visitable/get_scan_data() + if(!known) + known = TRUE + name = initial(name) + icon_state = initial(icon_state) + color = initial(color) + desc = initial(desc) + return ..() + /obj/effect/overmap/visitable/proc/get_space_zlevels() if(in_space) return map_z @@ -170,9 +201,9 @@ return FALSE has_distress_beacon = TRUE - admin_chat_message(message = "Overmap panic button hit on z[z] ([scanner_name || name]) by '[user?.ckey || "Unknown"]'", color = "#FF2222") //VOREStation Add + admin_chat_message(message = "Overmap panic button hit on z[z] ([name]) by '[user?.ckey || "Unknown"]'", color = "#FF2222") //VOREStation Add var/message = "This is an automated distress signal from a MIL-DTL-93352-compliant beacon transmitting on [PUB_FREQ*0.1]kHz. \ - This beacon was launched from '[scanner_name || name]'. I can provide this additional information to rescuers: [get_distress_info()]. \ + This beacon was launched from '[name]'. I can provide this additional information to rescuers: [get_distress_info()]. \ Per the Interplanetary Convention on Space SAR, those receiving this message must attempt rescue, \ or relay the message to those who can. This message will repeat one time in 5 minutes. Thank you for your urgent assistance." @@ -193,7 +224,7 @@ return "\[X:[x], Y:[y]\]" /obj/effect/overmap/visitable/proc/distress_update() - var/message = "This is the final message from the distress beacon launched from '[scanner_name || name]'. I can provide this additional information to rescuers: [get_distress_info()]. \ + var/message = "This is the final message from the distress beacon launched from '[name]'. I can provide this additional information to rescuers: [get_distress_info()]. \ Please render assistance under your obligations per the Interplanetary Convention on Space SAR, or relay this message to a party who can. Thank you for your urgent assistance." for(var/zlevel in levels_for_distress) diff --git a/code/modules/overmap/ships/computers/ship.dm b/code/modules/overmap/ships/computers/ship.dm index 5c886fb55a..46d56e29f7 100644 --- a/code/modules/overmap/ships/computers/ship.dm +++ b/code/modules/overmap/ships/computers/ship.dm @@ -69,6 +69,8 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov if(linked) apply_visual(user) user.reset_view(linked) + if(linked.real_appearance) + user.client?.images += linked.real_appearance user.set_machine(src) if(isliving(user)) var/mob/living/L = user @@ -81,6 +83,8 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov /obj/machinery/computer/ship/proc/unlook(var/mob/user) user.reset_view() + if(linked?.real_appearance) + user.client?.images -= linked.real_appearance if(isliving(user)) var/mob/living/L = user L.looking_elsewhere = 0 diff --git a/code/modules/overmap/ships/landable.dm b/code/modules/overmap/ships/landable.dm index fed030ba6f..4c16b991bc 100644 --- a/code/modules/overmap/ships/landable.dm +++ b/code/modules/overmap/ships/landable.dm @@ -7,8 +7,7 @@ var/obj/effect/shuttle_landmark/ship/landmark // Record our open space landmark for easy reference. var/multiz = 0 // Index of multi-z levels, starts at 0 var/status = SHIP_STATUS_LANDED - icon_state = "shuttle" - moving_state = "shuttle_moving" + icon_state = "shuttle_nosprite" /obj/effect/overmap/visitable/ship/landable/Destroy() GLOB.shuttle_pre_move_event.unregister(SSshuttles.shuttles[shuttle], src) diff --git a/code/modules/overmap/ships/ship.dm b/code/modules/overmap/ships/ship.dm index 99ecdcf154..e048805738 100644 --- a/code/modules/overmap/ships/ship.dm +++ b/code/modules/overmap/ships/ship.dm @@ -14,10 +14,13 @@ desc = "This marker represents a spaceship. Scan it for more information." scanner_desc = "Unknown spacefaring vessel." dir = NORTH - icon_state = "ship" + icon_state = "ship_nosprite" appearance_flags = TILE_BOUND|KEEP_TOGETHER|LONG_GLIDE //VOREStation Edit light_power = 4 - var/moving_state = "ship_moving" + + unknown_name = "unknown ship" + unknown_state = "ship" + known = FALSE // Ships start 'unknown' on the map and require scanning var/vessel_mass = 10000 //tonnes, arbitrary number, affects acceleration provided by engines var/vessel_size = SHIP_SIZE_LARGE //arbitrary number, affects how likely are we to evade meteors @@ -38,6 +41,9 @@ var/skill_needed = SKILL_ADEPT //piloting skill needed to steer it without going in random dir var/operator_skill + /// Vis contents overlay holding the ship's vector when in motion + var/obj/effect/overlay/vis/vector + /obj/effect/overmap/visitable/ship/Initialize() . = ..() min_speed = round(min_speed, SHIP_MOVE_RESOLUTION) @@ -45,11 +51,14 @@ SSshuttles.ships += src position_x = ((loc.x - 1) * WORLD_ICON_SIZE) + (WORLD_ICON_SIZE/2) + pixel_x + 1 position_y = ((loc.y - 1) * WORLD_ICON_SIZE) + (WORLD_ICON_SIZE/2) + pixel_y + 1 + vector = add_vis_overlay("vector", dir = SOUTH, layer = 10, unique = TRUE) + vector.vis_flags = (VIS_INHERIT_PLANE|VIS_INHERIT_ID) /obj/effect/overmap/visitable/ship/Destroy() STOP_PROCESSING(SSprocessing, src) + remove_vis_overlay(vector) SSshuttles.ships -= src - . = ..() + return ..() /obj/effect/overmap/visitable/ship/relaymove(mob/user, direction, accel_limit) accelerate(direction, accel_limit) @@ -200,11 +209,13 @@ /obj/effect/overmap/visitable/ship/update_icon() if(!is_still()) - icon_state = moving_state - transform = matrix().Turn(get_heading_degrees()) + var/heading = get_heading_degrees() + dir = angle2dir(round(heading, 90)) + vector.dir = NORTH + vector.transform = matrix().Turn(heading) else - icon_state = initial(icon_state) - transform = null + dir = NORTH + vector.dir = SOUTH ..() /obj/effect/overmap/visitable/ship/set_dir(new_dir) diff --git a/code/modules/persistence/storage/smartfridge.dm b/code/modules/persistence/storage/smartfridge.dm index edd8294a90..3962262154 100644 --- a/code/modules/persistence/storage/smartfridge.dm +++ b/code/modules/persistence/storage/smartfridge.dm @@ -51,8 +51,8 @@ // Delete some stacks if we want if(stacks_go_missing) - var/fuzzy = rand(55,65) - count = round(count*0.01*fuzzy) // loss of 35-45% with rounding down + var/fuzzy = rand(55,65)*0.01 // loss of 35-45% with rounding down + count = round(count*fuzzy) if(count <= 0) continue diff --git a/code/modules/power/lighting_vr.dm b/code/modules/power/lighting_vr.dm index b7ea9a0fbd..4c13300a73 100644 --- a/code/modules/power/lighting_vr.dm +++ b/code/modules/power/lighting_vr.dm @@ -49,3 +49,82 @@ nightshift_range = 6 nightshift_power = 0.45 + +// Floor tube lights + +/obj/machinery/light/floortube + icon_state = "floortube1" + base_state = "floortube" + desc = "A tube light set into a floor fixture." + shows_alerts = FALSE + plane = TURF_PLANE + layer = ABOVE_TURF_LAYER + construct_type = /obj/machinery/light_construct/floortube + +/obj/machinery/light/floortube/flicker + auto_flicker = TRUE + +/obj/machinery/light_construct/floortube + name = "floor light fixture frame" + desc = "A floor light fixture under construction." + icon = 'icons/obj/lighting_vr.dmi' + icon_state = "floortube-construct-stage1" + stage = 1 + anchored = 0 + fixture_type = /obj/machinery/light/floortube + sheets_refunded = 2 + +/obj/machinery/light_construct/floortube/verb/rotate_clockwise() + set name = "Rotate Fixture Clockwise" + set category = "Object" + set src in view(1) + + if (usr.stat || usr.restrained() || anchored) + return + + src.set_dir(turn(src.dir, 270)) + +/obj/machinery/light_construct/floortube/update_icon() + switch(stage) + if(1) + icon_state = "floortube-construct-stage1" + if(2) + icon_state = "floortube-construct-stage2" + if(3) + icon_state = "floortube-empty" + +// Big Flamp + +/obj/machinery/light/bigfloorlamp + icon = 'icons/obj/lighting32x64.dmi' + icon_state = "big_flamp1" + base_state = "big_flamp" + desc = "A set of tube lights on a raised, solid fixture" + shows_alerts = FALSE + density = 1 + anchored = 1 + plane = MOB_PLANE + layer = ABOVE_MOB_LAYER + construct_type = /obj/machinery/light_construct/bigfloorlamp + +/obj/machinery/light/bigfloorlamp/flicker + auto_flicker = TRUE + +/obj/machinery/light_construct/bigfloorlamp + name = "big floor light fixture frame" + desc = "A big floor light fixture under construction." + icon = 'icons/obj/lighting32x64.dmi' + icon_state = "big_flamp-construct-stage1" + stage = 1 + anchored = 0 + fixture_type = /obj/machinery/light/bigfloorlamp + sheets_refunded = 3 + +/obj/machinery/light_construct/bigfloorlamp/update_icon() + switch(stage) + if(1) + icon_state = "big_flamp-construct-stage1" + if(2) + icon_state = "big_flamp-construct-stage2" + if(3) + icon_state = "big_flamp-empty" diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm index 1e07385f70..ceb0b24429 100644 --- a/code/modules/power/port_gen_vr.dm +++ b/code/modules/power/port_gen_vr.dm @@ -36,7 +36,7 @@ origin_tech = list(TECH_DATA = 8, TECH_POWER = 8, TECH_PHORON = 8, TECH_ENGINEERING = 8) req_components = list( /obj/item/stack/cable_coil = 5, - /obj/item/weapon/stock_parts/capacitor/omni = 1) + /obj/item/weapon/stock_parts/capacitor/hyper = 1) /obj/item/weapon/circuitboard/machine/abductor/core/hybrid name = T_BOARD("void generator (hybrid)") @@ -45,8 +45,8 @@ origin_tech = list(TECH_DATA = 8, TECH_POWER = 8, TECH_PHORON = 8, TECH_ENGINEERING = 8) req_components = list( /obj/item/stack/cable_coil = 5, - /obj/item/weapon/stock_parts/capacitor/omni = 1, - /obj/item/weapon/stock_parts/micro_laser/omni = 1) + /obj/item/weapon/stock_parts/capacitor/hyper = 1, + /obj/item/weapon/stock_parts/micro_laser/hyper = 1) // Radioisotope Thermoelectric Generator (RTG) // Simple power generator that would replace "magic SMES" on various derelicts. diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index d4118b693c..b50da0162d 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -50,8 +50,10 @@ /obj/machinery/power/supermatter name = "Supermatter" desc = "A strangely translucent and iridescent crystal. You get headaches just from looking at it." - icon = 'icons/obj/engine.dmi' + icon = 'icons/obj/supermatter.dmi' icon_state = "darkmatter" + plane = MOB_PLANE // So people can walk behind the top part + layer = ABOVE_MOB_LAYER // So people can walk behind the top part density = 1 anchored = 0 light_range = 4 @@ -571,7 +573,7 @@ /obj/item/broken_sm name = "shattered supermatter plinth" desc = "The shattered remains of a supermatter shard plinth. It doesn't look safe to be around." - icon = 'icons/obj/engine.dmi' + icon = 'icons/obj/supermatter.dmi' icon_state = "darkmatter_broken" /obj/item/broken_sm/New() diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/nerd.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/nerd.dm index 64c67b19e5..fbc2ae3ebc 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/nerd.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/nerd.dm @@ -45,6 +45,7 @@ /obj/item/weapon/storage/secure/briefcase/nerd_pack_med name = "\improper NERD \'Medigun\' kit" desc = "A storage case for a multi-purpose healing gun. Variety hour!" + icon_state = "medbriefcase" w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL can_hold = list(/obj/item/weapon/gun/projectile/cell_loaded/medical,/obj/item/ammo_magazine/cell_mag/medical,/obj/item/ammo_casing/microbattery/medical) @@ -60,6 +61,7 @@ /obj/item/weapon/storage/secure/briefcase/nerd_pack_cmo name = "\improper Advanced NERD \'Medigun\' kit" desc = "A storage case for a multi-purpose healing gun. Variety hour!" + icon_state = "medbriefcase" w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL can_hold = list(/obj/item/weapon/gun/projectile/cell_loaded/medical,/obj/item/ammo_magazine/cell_mag/medical,/obj/item/ammo_casing/microbattery/medical) diff --git a/code/modules/projectiles/guns/energy/laser_vr.dm b/code/modules/projectiles/guns/energy/laser_vr.dm index e69153991d..44aeea2149 100644 --- a/code/modules/projectiles/guns/energy/laser_vr.dm +++ b/code/modules/projectiles/guns/energy/laser_vr.dm @@ -35,17 +35,16 @@ /obj/item/weapon/gun/energy/imperial name = "imperial energy pistol" desc = "An elegant weapon developed by the Imperium Auream. Their weaponsmiths have cleverly found a way to make a gun that is only about the size of an average energy pistol, yet with the fire power of a laser carbine." + icon = 'icons/obj/gun_vr.dmi' + icon_override = 'icons/obj/gun_vr.dmi' icon_state = "ge_pistol" item_state = "ge_pistol" - fire_sound = 'sound/weapons/mandalorian.ogg' - icon = 'icons/obj/gun_vr.dmi' - item_icons = list(slot_r_hand_str = 'icons/obj/gun_vr.dmi', slot_l_hand_str = 'icons/obj/gun_vr.dmi') // WORK YOU FUCKING CUNT PIECE OF SHIT BASTARD STUPID BITCH ITEM ICON AAAAHHHH - item_state_slots = list(slot_r_hand_str = "ge_pistol_r", slot_l_hand_str = "ge_pistol_l") slot_flags = SLOT_BELT w_class = ITEMSIZE_NORMAL force = 10 origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2) matter = list(DEFAULT_WALL_MATERIAL = 2000) + fire_sound = 'sound/weapons/mandalorian.ogg' projectile_type = /obj/item/projectile/beam/imperial // Removed because gun64_vr.dmi guns don't work. diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 6fb4b27226..cf16857c88 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -35,6 +35,7 @@ desc = "A LAEP20 Aktzin. Designed and produced by Lawson Arms under the wing of Hephaestus, several TSCs have been trying to get a hold of the blueprints for half a decade." description_fluff = "Lawson Arms is Hephaestus Industries’ main personal-energy-weapon branding, often sold alongside MarsTech projectile weapons to security and law enforcement agencies. \ The Aktzin's capsule-based stun ammunition is a closely guarded Hephaestus Industries patent, and the company has been particularly litigious towards any attempted imitators." + icon = 'icons/obj/guns/energy/stunrevolver.dmi' icon_state = "stunrevolver" item_state = "stunrevolver" origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) diff --git a/code/modules/projectiles/guns/projectile/pistol_vr.dm b/code/modules/projectiles/guns/projectile/pistol_vr.dm index 91b28b9569..0793c32d07 100644 --- a/code/modules/projectiles/guns/projectile/pistol_vr.dm +++ b/code/modules/projectiles/guns/projectile/pistol_vr.dm @@ -40,7 +40,9 @@ name = "\improper \"Giskard\" holdout pistol" desc = "The FS HG .380 \"Giskard\" can even fit into the pocket! Uses .380 rounds." icon = 'icons/obj/gun_vr.dmi' + icon_override = 'icons/obj/gun_vr.dmi' icon_state = "giskardcivil" + item_state = "giskardcivil" caliber = ".380" magazine_type = /obj/item/ammo_magazine/m380 allowed_magazines = list(/obj/item/ammo_magazine/m380) @@ -61,6 +63,7 @@ name = "\improper \"Olivaw\" holdout burst-pistol" desc = "The FS HG .380 \"Olivaw\" is a more advanced version of the \"Giskard\". This one seems to have a two-round burst-fire mode. Uses .380 rounds." icon_state = "olivawcivil" + item_state = "olivawcivil" firemodes = list( list(mode_name="semiauto", burst=1, fire_delay=1.2, move_delay=null, burst_accuracy=null, dispersion=null), list(mode_name="2-round bursts", burst=2, fire_delay=0.2, move_delay=4, burst_accuracy=list(0,-15), dispersion=list(1.2, 1.8)), diff --git a/code/modules/reagents/machinery/chem_master_vr.dm b/code/modules/reagents/machinery/chem_master_vr.dm deleted file mode 100644 index 551132e7c4..0000000000 --- a/code/modules/reagents/machinery/chem_master_vr.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/machinery/chem_master - icon = 'icons/obj/chemical_vr.dmi' \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/_reagent_containers.dm b/code/modules/reagents/reagent_containers/_reagent_containers.dm index 5c61d6a5ad..10196da040 100644 --- a/code/modules/reagents/reagent_containers/_reagent_containers.dm +++ b/code/modules/reagents/reagent_containers/_reagent_containers.dm @@ -7,6 +7,7 @@ var/amount_per_transfer_from_this = 5 var/possible_transfer_amounts = list(5,10,15,25,30) var/volume = 30 + var/list/starts_with /obj/item/weapon/reagent_containers/verb/set_APTFT() //set amount_per_transfer_from_this set name = "Set transfer amount" @@ -21,6 +22,16 @@ if(!possible_transfer_amounts) src.verbs -= /obj/item/weapon/reagent_containers/verb/set_APTFT create_reagents(volume) + + if(starts_with) + var/total_so_far = 0 + for(var/string in starts_with) + var/amt = starts_with[string] || 1 + total_so_far += amt + reagents.add_reagent(string, amt) + if(total_so_far > volume) + warning("[src]([src.type]) starts with more reagents than it has total volume") + starts_with = null // it should gc, since it's just strings and numbers /obj/item/weapon/reagent_containers/attack_self(mob/user as mob) return diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 42f58b6b47..d25bd55d88 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -150,6 +150,7 @@ else name = "[base_name] ([label_text])" desc = "[base_desc] It is labeled \"[label_text]\"." + update_icon() /obj/item/weapon/reagent_containers/glass/beaker name = "beaker" @@ -189,13 +190,12 @@ var/percent = round((reagents.total_volume / volume) * 100) switch(percent) - if(0 to 9) filling.icon_state = "[icon_state]-10" - if(10 to 24) filling.icon_state = "[icon_state]10" - if(25 to 49) filling.icon_state = "[icon_state]25" - if(50 to 74) filling.icon_state = "[icon_state]50" - if(75 to 79) filling.icon_state = "[icon_state]75" - if(80 to 90) filling.icon_state = "[icon_state]80" - if(91 to INFINITY) filling.icon_state = "[icon_state]100" + if(0.1 to 20) filling.icon_state = "[icon_state]-10" + if(20 to 40) filling.icon_state = "[icon_state]-20" + if(40 to 60) filling.icon_state = "[icon_state]-40" + if(60 to 80) filling.icon_state = "[icon_state]-60" + if(80 to 100) filling.icon_state = "[icon_state]-80" + if(100 to INFINITY) filling.icon_state = "[icon_state]-100" filling.color = reagents.get_color() add_overlay(filling) @@ -203,6 +203,9 @@ if (!is_open_container()) add_overlay("lid_[initial(icon_state)]") + if (label_text) + add_overlay("label_[initial(icon_state)]") + /obj/item/weapon/reagent_containers/glass/beaker/large name = "large beaker" desc = "A large beaker." diff --git a/code/modules/research/designs/bag_of_holding.dm b/code/modules/research/designs/bag_of_holding.dm index 744bbca5a3..ad56ffe792 100644 --- a/code/modules/research/designs/bag_of_holding.dm +++ b/code/modules/research/designs/bag_of_holding.dm @@ -4,6 +4,15 @@ ..() name = "Infinite capacity storage prototype ([item_name])" +/datum/design/item/boh/ore_holding + name = "Mining Satchel of Holding" + desc = "For the most tenacious miners, a bag with incomprehensible depth!" + id = "ore_holding" + req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 3) + materials = list("gold" = 1000, "diamond" = 500, "uranium" = 250) // Less expensive since it can only hold ores + build_path = /obj/item/weapon/storage/bag/ore/holding + sort_string = "QAAAA" + /datum/design/item/boh/bag_holding name = "Bag of Holding" desc = "Using localized pockets of bluespace this bag prototype offers incredible storage capacity with the contents weighting nothing. It's a shame the bag itself is pretty heavy." diff --git a/code/modules/resleeving/infocore_records.dm b/code/modules/resleeving/infocore_records.dm index 1ee1c3fdfb..5f3cb027c5 100644 --- a/code/modules/resleeving/infocore_records.dm +++ b/code/modules/resleeving/infocore_records.dm @@ -15,6 +15,7 @@ var/dead_state = 0 var/last_update = 0 var/last_notification + var/do_notify = TRUE //Backend var/ckey = "" diff --git a/code/modules/shieldgen/shield_generator.dm b/code/modules/shieldgen/shield_generator.dm index 23a51da05a..2ab1d3ff5b 100644 --- a/code/modules/shieldgen/shield_generator.dm +++ b/code/modules/shieldgen/shield_generator.dm @@ -710,7 +710,7 @@ component_parts -= cap qdel(cap) - component_parts += new /obj/item/weapon/stock_parts/capacitor/omni(src) + component_parts += new /obj/item/weapon/stock_parts/capacitor/hyper(src) component_parts += new /obj/item/weapon/smes_coil/super_capacity(src) RefreshParts() current_energy = max_energy diff --git a/code/modules/tgui/modules/admin_shuttle_controller.dm b/code/modules/tgui/modules/admin_shuttle_controller.dm index 4f65517729..a40dec8fca 100644 --- a/code/modules/tgui/modules/admin_shuttle_controller.dm +++ b/code/modules/tgui/modules/admin_shuttle_controller.dm @@ -22,7 +22,7 @@ for(var/ship in SSshuttles.ships) var/obj/effect/overmap/visitable/ship/S = ship overmap_ships.Add(list(list( - "name" = S.scanner_name || S.name, + "name" = S.name, "ref" = REF(S), ))) data["overmap_ships"] = overmap_ships diff --git a/code/modules/tgui/tgui_input_list.dm b/code/modules/tgui/tgui_input_list.dm index a8d25f987c..778c9f0e0c 100644 --- a/code/modules/tgui/tgui_input_list.dm +++ b/code/modules/tgui/tgui_input_list.dm @@ -7,11 +7,12 @@ * * message - The content of the input box, shown in the body of the TGUI window. * * title - The title of the input box, shown on the top of the TGUI window. * * buttons - The options that can be chosen by the user, each string is assigned a button on the UI. + * * default - The option with this value will be selected on first paint of the TGUI window. * * timeout - The timeout of the input box, after which the input box will close and qdel itself. Set to zero for no timeout. */ /proc/tgui_input_list(mob/user, message, title, list/buttons, default, timeout = 0) if (istext(user)) - stack_trace("tgui_alert() received text for user instead of list") + stack_trace("tgui_alert() received text for user instead of mob") return if (!user) user = usr @@ -39,12 +40,13 @@ * * message - The content of the input box, shown in the body of the TGUI window. * * title - The title of the input box, shown on the top of the TGUI window. * * buttons - The options that can be chosen by the user, each string is assigned a button on the UI. + * * default - The option with this value will be selected on first paint of the TGUI window. * * callback - The callback to be invoked when a choice is made. * * timeout - The timeout of the input box, after which the menu will close and qdel itself. Set to zero for no timeout. */ /proc/tgui_input_list_async(mob/user, message, title, list/buttons, default, datum/callback/callback, timeout = 60 SECONDS) if (istext(user)) - stack_trace("tgui_alert() received text for user instead of list") + stack_trace("tgui_alert() received text for user instead of mob") return if (!user) user = usr @@ -74,6 +76,8 @@ var/list/buttons /// Buttons (strings specifically) mapped to the actual value (e.g. a mob or a verb) var/list/buttons_map + /// Value of the button that should be pre-selected on first paint. + var/initial /// The button that the user has pressed, null if no selection has been made var/choice /// The time at which the tgui_list_input was created, for displaying timeout progress. @@ -88,6 +92,7 @@ src.message = message src.buttons = list() src.buttons_map = list() + src.initial = default var/list/repeat_buttons = list() // Gets rid of illegal characters @@ -138,7 +143,8 @@ . = list( "title" = title, "message" = message, - "buttons" = buttons + "buttons" = buttons, + "initial" = initial ) /datum/tgui_list_input/tgui_data(mob/user) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index adcd5eb81c..bc05a72dfc 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -497,7 +497,9 @@ //Sanity if(!user || !prey || !pred || !istype(belly) || !(belly in pred.vore_organs)) log_debug("[user] attempted to feed [prey] to [pred], via [belly ? lowertext(belly.name) : "*null*"] but it went wrong.") - return + return FALSE + if(pred == prey) + return FALSE // The belly selected at the time of noms var/attempt_msg = "ERROR: Vore message couldn't be created. Notify a dev. (at)" diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 6273f35416..7b5a107fa2 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -6,7 +6,7 @@ #define BELLIES_NAME_MIN 2 #define BELLIES_NAME_MAX 40 #define BELLIES_DESC_MAX 4096 -#define FLAVOR_MAX 40 +#define FLAVOR_MAX 400 /mob/living var/datum/vore_look/vorePanel @@ -373,7 +373,7 @@ unsaved_changes = FALSE return TRUE if("setflavor") - var/new_flavor = html_encode(input(usr,"What your character tastes like (40ch limit). This text will be printed to the pred after 'X tastes of...' so just put something like 'strawberries and cream':","Character Flavor",host.vore_taste) as text|null) + var/new_flavor = html_encode(input(usr,"What your character tastes like (400ch limit). This text will be printed to the pred after 'X tastes of...' so just put something like 'strawberries and cream':","Character Flavor",host.vore_taste) as text|null) if(!new_flavor) return FALSE @@ -385,7 +385,7 @@ unsaved_changes = TRUE return TRUE if("setsmell") - var/new_smell = html_encode(input(usr,"What your character smells like (40ch limit). This text will be printed to the pred after 'X smells of...' so just put something like 'strawberries and cream':","Character Smell",host.vore_smell) as text|null) + var/new_smell = html_encode(input(usr,"What your character smells like (400ch limit). This text will be printed to the pred after 'X smells of...' so just put something like 'strawberries and cream':","Character Smell",host.vore_smell) as text|null) if(!new_smell) return FALSE diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index cf086498d7..cb9b6f80aa 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -6,8 +6,9 @@ name = "size gun" //I have no idea why this was called shrink ray when this increased and decreased size. desc = "A highly advanced ray gun with a knob on the side to adjust the size you desire. Warning: Do not insert into mouth." icon = 'icons/obj/gun_vr.dmi' - icon_state = "sizegun-shrink100" // Someone can probably do better. -Ace - item_state = null //so the human update icon uses the icon_state instead + icon_override = 'icons/obj/gun_vr.dmi' + icon_state = "sizegun-shrink100" + item_state = "sizegun-shrink" fire_sound = 'sound/weapons/wave.ogg' charge_cost = 240 projectile_type = /obj/item/projectile/beam/sizelaser @@ -41,6 +42,7 @@ set category = "Object" set src in view(1) + var/prev_size = size_set_to var/size_select = input(usr, "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 @@ -50,6 +52,14 @@ 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 + + if(size_set_to >= 1 && prev_size < 1) + item_state = modifystate = "sizegun-grow" + update_icon() + + else if(size_set_to < 1 && prev_size >= 1) + item_state = modifystate = "sizegun-shrink" + update_icon() /obj/item/weapon/gun/energy/sizegun/examine(mob/user) . = ..() @@ -61,6 +71,16 @@ charge_cost = 0 projectile_type = /obj/item/projectile/beam/sizelaser/admin +/obj/item/weapon/gun/energy/sizegun/abductor + name = "alien size gun" + icon_state = "sizegun-abductor" + item_state = "laser" + charge_cost = 0 + projectile_type = /obj/item/projectile/beam/sizelaser/admin + +/obj/item/weapon/gun/energy/sizegun/abductor/update_icon(ignore_inhands) + item_state = initial(item_state) + /obj/item/weapon/gun/energy/sizegun/admin/select_size() set name = "Select Size" set category = "Object" diff --git a/config/example/config.txt b/config/example/config.txt index 7b257af09e..7e9569dfd1 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -1,592 +1,3 @@ -<<<<<<< HEAD -## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice -# SERVERNAME spacestation13 - -## Alert levels -ALERT_GREEN All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced. -ALERT_BLUE_UPTO The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted. -ALERT_BLUE_DOWNTO The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed. -ALERT_RED_UPTO There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised. -ALERT_RED_DOWNTO The self-destruct mechanism has been deactivated, there is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised. -ALERT_DELTA The station's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill. - -## Add a # infront of this if you want to use the SQL based admin system, the legacy system uses admins.txt. You need to set up your database to use the SQL based system. -ADMIN_LEGACY_SYSTEM - -## Add a # infront of this if you want to use the SQL based banning system. The legacy systems use the files in the data folder. You need to set up your database to use the SQL based system. -BAN_LEGACY_SYSTEM - -## Add a # here if you wish to use the setup where jobs have more access. This is intended for servers with low populations - where there are not enough players to fill all roles, so players need to do more than just one job. Also for servers where they don't want people to hide in their own departments. -# JOBS_HAVE_MINIMAL_ACCESS - -## Unhash this entry to have certain jobs require your account to be at least a certain number of days old to select. You can configure the exact age requirement for different jobs by editing -## the minimal_player_age variable in the files in folder /code/game/jobs/job/.. for the job you want to edit. Set minimal_player_age to 0 to disable age requirement for that job. -## REQUIRES the database set up to work. Keep it hashed if you don't have a database set up. -## NOTE: If you have just set-up the database keep this DISABLED, as player age is determined from the first time they connect to the server with the database up. If you just set it up, it means -## you have noone older than 0 days, since noone has been logged yet. Only turn this on once you have had the database up for 30 days. -#USE_AGE_RESTRICTION_FOR_JOBS - -## Unhash this entry to have certain antag roles require your account to be at least a certain number of days old for round start and auto-spawn selection. -## Non-automatic antagonist recruitment, such as being converted to cultism is not affected. Has the same database requirements and notes as USE_AGE_RESTRICTION_FOR_JOBS. -#USE_AGE_RESTRICTION_FOR_ANTAGS - -## Unhash this to use recursive explosions, keep it hashed to use circle explosions. Recursive explosions react to walls, airlocks and blast doors, making them look a lot cooler than the boring old circular explosions. They require more CPU and are (as of january 2013) experimental -#USE_RECURSIVE_EXPLOSIONS - -Configure how fast explosion strength diminishes when travelling up/down z levels. All explosion distances are multiplied by this each time they go up/down z-levels. -#MULTI_Z_EXPLOSION_SCALAR 0.5 - -# Radiation weakens with distance from the source; stop calculating when the strength falls below this value. Lower values mean radiation reaches smaller (with increasingly trivial damage) at the cost of more CPU usage. Max range = DISTANCE^2 * POWER / RADIATION_LOWER_LIMIT -# RADIATION_LOWER_LIMIT 0.35 - -## log OOC channel -LOG_OOC - -## log client Say -LOG_SAY - -## log admin actions -LOG_ADMIN - -## log client access (logon/logoff) -LOG_ACCESS - -## log game actions (start of round, results, etc.) -LOG_GAME - -## log player votes -LOG_VOTE - -## log client Whisper -LOG_WHISPER - -## log emotes -LOG_EMOTE - -## log attack messages -LOG_ATTACK - -## log pda messages -LOG_PDA - -## log graffiti drawings -LOG_GRAFFITI - -## log world.log messages -# LOG_WORLD_OUTPUT - -## log all Topic() calls (for use by coders in tracking down Topic issues) -# LOG_HREFS - -## log world.log and runtime errors to a file -LOG_RUNTIME - -## log admin warning messages -LOG_ADMINWARN - -## Enable/disable SQL connection (comment out to disable) -#SQL_ENABLED - -## disconnect players who did nothing during the set amount of minutes -#KICK_INACTIVE 30 - -##Show developers on staffwho -SHOW_DEVS - -##Show mods on staffwho -SHOW_MODS - -##Show mentors on staffwho -SHOW_EVENT_MANAGERS - -##Show mentors on staffwho -SHOW_MENTORS - -## Chooses whether mods have the ability to tempban or not -MODS_CAN_TEMPBAN - -## Chooses whether mods have the ability to issue tempbans for jobs or not -MODS_CAN_JOB_TEMPBAN - -## Maximum mod tempban duration (in minutes) -MOD_TEMPBAN_MAX 1440 - -## Maximum mod job tempban duration (in minutes) -MOD_JOB_TEMPBAN_MAX 4320 - -## probablities for game modes chosen in "secret" and "random" modes -## -## default probablity is 1, increase to make that mode more likely to be picked -## set to 0 to disable that mode -PROBABILITY EXTENDED 1 -PROBABILITY MALFUNCTION 0 -PROBABILITY MERCENARY 0 -PROBABILITY WIZARD 0 -PROBABILITY CHANGELING 0 -PROBABILITY CULT 0 -PROBABILITY EXTEND-A-TRAITORMONGOUS 0 -PROBABILITY LIZARD 0 -PROBABILITY INTRIGUE 0 -PROBABILITY VISITORS 0 - -## Hash out to disable random events during the round. -ALLOW_RANDOM_EVENTS - -## if amount of traitors scales or not -TRAITOR_SCALING - -## if objectives are disabled -#OBJECTIVES_DISABLED - -## make ERT's be only called by admins -#ERT_ADMIN_ONLY - -## If uncommented, votes can be called to add extra antags to the round. -#ALLOW_EXTRA_ANTAGS - -## If security is prohibited from being most antagonists -PROTECT_ROLES_FROM_ANTAGONIST - -## Uncomment this to DISABLE persistence -#PERSISTENCE_DISABLED - -## Uncomment this to DISABLE maploaded trash/paper/etc from being saved by the persistence system. -#PERSISTENCE_IGNORE_MAPLOAD - -## Comment this out to stop admins being able to choose their personal ooccolor -ALLOW_ADMIN_OOCCOLOR - -## If metadata is supported -ALLOW_METADATA - -## allow players to initiate a restart vote -ALLOW_VOTE_RESTART - -## allow players to initate a mode-change start -# ALLOW_VOTE_MODE - -# Pregame time -PREGAME_TIME 180 - -## min delay (deciseconds) between voting sessions (default 10 minutes) -VOTE_DELAY 6000 - -## time period (deciseconds) which voting session will last (default 1 minute) -VOTE_PERIOD 600 - -## autovote initial delay (deciseconds) before first automatic transfer vote call (default 180 minutes) -VOTE_AUTOTRANSFER_INITIAL 108000 - -##autovote delay (deciseconds) before sequential automatic transfer votes are called (default 60 minutes) -VOTE_AUTOTRANSFER_INTERVAL 36000 - -## Time left (seconds) before round start when automatic gamemote vote is called (default 100). -VOTE_AUTOGAMEMODE_TIMELEFT -1 - -## prevents dead players from voting or starting votes -#NO_DEAD_VOTE - -## players' votes default to "No vote" (otherwise, default to "No change") -DEFAULT_NO_VOTE - -## Allow ghosts to see antagonist through AntagHUD -ALLOW_ANTAG_HUD - -## If ghosts use antagHUD they are no longer allowed to join the round. -# ANTAG_HUD_RESTRICTED - -## allow AI job -ALLOW_AI - -## Disable respawning -# NORESPAWN - -## set a respawn time (in minutes) -# RESPAWN_TIME 5 - -## set a message to give to players when they respawn -# RESPAWN_MESSAGE Remember to play a different character or something! - -## disables calling del(src) on newmobs if they logout before spawnin in -# DONT_DEL_NEWMOB - -## set a hosted by name for unix platforms -HOSTEDBY yournamehere - -## Set to jobban "Guest-" accounts from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions. -## Set to 1 to jobban them from those positions, set to 0 to allow them. -GUEST_JOBBAN - -## Uncomment this to stop people connecting to your server without a registered ckey. (i.e. guest-* are all blocked from connecting) -GUEST_BAN -## Set to jobban everyone who's key is not listed in data/whitelist.txt from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions. -## Uncomment to 1 to jobban, leave commented out to allow these positions for everyone (but see GUEST_JOBBAN above and regular jobbans) -# USEWHITELIST - -## set a server location for world reboot. Don't include the byond://, just give the address and port. -SERVER your.domain:6000 - -## set a server URL for the IRC bot to use; like SERVER, don't include the byond:// -## Unlike SERVER, this one shouldn't break auto-reconnect -# SERVERURL your.domain:port - -## forum address -#FORUMURL https://forum.your.domain/ - -## Wiki search path -## Use %s to indicate where search query goes. -#WIKISEARCHURL https://wiki.your.domain/index.php?search=%s - -## Wiki address -#WIKIURL https://wiki.your.domain/index.php?title= - -## Chat address, VORE Station edit -#CHATURL http://discord.gg/some_tag - -## GitHub address -#GITHUBURL https://github.com/owner/repo - -## Rules URL -#RULESURL https://rules.your.domain/ - -## Map URL -#MAPURL https://map.your.domain/ - -## Ban appeals URL - usually for a forum or wherever people should go to contact your admins. -#BANAPPEALS http://bans.your.domain/ - -## In-game features -## spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard -# FEATURE_OBJECT_SPELL_SYSTEM - -##Toggle for having jobs load up from the .txt -# LOAD_JOBS_FROM_TXT - -##Remove the # mark infront of this to forbid admins from posssessing the singularity. -#FORBID_SINGULO_POSSESSION - -## Remove the # to show a popup 'reply to' window to every non-admin that recieves an adminPM. -## The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off) -#POPUP_ADMIN_PM - -## Remove the # to allow special 'Easter-egg' events on special holidays such as seasonal holidays and stuff like 'Talk Like a Pirate Day' :3 YAARRR -ALLOW_HOLIDAYS - -##Defines the ticklag for the world. 0.9 is the normal one, 0.5 is smoother. -TICKLAG 0.5 - -## Defines if Tick Compensation is used. It results in a minor slowdown of movement of all mobs, but attempts to result in a level movement speed across all ticks. Recommended if tickrate is lowered. -TICKCOMP 1 - -## Whether the server will talk to other processes through socket_talk -SOCKET_TALK 1 - -## Uncomment this to ban use of ToR -#TOR_BAN - -## Comment this out to disable automuting -#AUTOMUTE_ON - -## How long the delay is before the Away Mission gate opens. Default is half an hour. -GATEWAY_DELAY 9000 - -## Remove the # to give assistants maint access. -ASSISTANT_MAINT - -## Remove the # to make rounds which end instantly (Rev, Wizard, Malf) to continue until the shuttle is called or the station is nuked. -## Malf and Rev will let the shuttle be called when the antags/protags are dead. -CONTINUOUS_ROUNDS - -## Uncomment to restrict non-admins from using humanoid alien races -USEALIENWHITELIST - -## Comment this to unrestrict the number of alien players allowed in the round. The number represents the number of alien players for every human player. -#ALIEN_PLAYER_RATIO 0.2 - -##Remove the # to let ghosts spin chairs -GHOST_INTERACTION - -## Password used for authorizing ircbot and other external tools. -# COMMS_PASSWORD some_password_here - -## Uncomment to enable sending data to the IRC bot. -#USE_IRC_BOT - -## Uncomment if the IRC bot requires using world.Export() instead of nudge.py/libnudge -#IRC_BOT_EXPORT - -## Host where the IRC bot is hosted. Port 45678 needs to be open. -#IRC_BOT_HOST localhost - -## IRC channel to send information to. Leave blank to disable. -#MAIN_IRC #main - -## IRC channel to send adminhelps to. Leave blank to disable adminhelps-to-irc. -#ADMIN_IRC #admin - -## Path to the python2 executable on the system. Leave blank for default. -## Default is "python" on Windows, "/usr/bin/env python2" on UNIX. -#PYTHON_PATH - -## Uncomment to use the C library nudge instead of the python script. -## This helps security and stability on Linux, but you need to compile the library first. -#USE_LIB_NUDGE - -## Uncommen to allow ghosts to write in blood during Cult rounds. -ALLOW_CULT_GHOSTWRITER - -## Sets the minimum number of cultists needed for ghosts to write in blood. -REQ_CULT_GHOSTWRITER 6 - -## Sets the number of available character slots -CHARACTER_SLOTS 35 -## Sets the number of loadout slots per character -#LOADOUT_SLOTS 3 - -## Uncomment to use overmap system for zlevel travel -USE_OVERMAP - -## Expected round length in minutes -EXPECTED_ROUND_LENGTH 360 - -## The lower delay between events in minutes. -## Affect mundane, moderate, and major events respectively -EVENT_DELAY_LOWER 30;45;60 - -## The upper delay between events in minutes. -## Affect mundane, moderate, and major events respectively -EVENT_DELAY_UPPER 45;60;120 - -## The delay until the first time an event of the given severity runs in minutes. -## Unset setting use the EVENT_DELAY_LOWER and EVENT_DELAY_UPPER values instead. -EVENT_CUSTOM_START_MINOR 30;30 -EVENT_CUSTOM_START_MODERATE 30;30 -EVENT_CUSTOM_START_MAJOR 100;100 - -## Uncomment to make proccall require R_ADMIN instead of R_DEBUG -## designed for environments where you have testers but don't want them -## able to use the more powerful debug options. -#DEBUG_PARANOID - -## Uncomment to allow aliens to spawn. -#ALIENS_ALLOWED - -## Uncomment to allow xenos to spawn. -#NINJAS_ALLOWED - -## Uncomment to disable the restrictive weldervision overlay. -#DISABLE_WELDER_VISION - -## Uncomment to prevent anyone from joining the round by default. -#DISABLE_ENTRY - -## Uncomment to disable the OOC channel by default. -#DISABLE_OOC - -## Uncomment to disable the dead OOC channel by default. -#DISABLE_DEAD_OOC - -## Uncomment to disable ghost chat by default. -#DISABLE_DSAY - -## Uncomment to disable respawning by default. -#DISABLE_RESPAWN - -## set a message to give to players when they respawn -RESPAWN_MESSAGE If you're respawning as the same character or job hopping (changing jobs without an HoP), make sure you've waited at least 30 minutes. Don't abuse this function for non-vore related deaths & avoid using metaknowledge. - -## Strength of ambient star light. Set to 0 or less to turn off. A value of 1 is unlikely to have a noticeable effect in most lightning systems. -STARLIGHT 0 - -## Defines which races are allowed to join as ERT, in singular form. If unset, defaults to only human. Casing matters, separate using ; -## Example races include: Human, Tajara, Skrell, Unathi -# ERT_SPECIES Human;Skrell;Unathi - -## Defines how Law Zero is phrased. Primarily used in the Malfunction gamemode. -# LAW_ZERO ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK, ALL LAWS OVERRIDDEN#*?&110010 - -## Enables specific procedural map generation, generally for mining, however it is specific to the loaded map. Uncomment to enable it, however it can -## worth it to keep it disabled if you are not hosting an actual server, to speed up start-up time for testing code. -GENERATE_MAP - -## Uncomment to enable organ decay outside of a body or storage item. -ORGANS_CAN_DECAY - -## Uncomment to have the changelog file automatically open when a user connects and hasn't seen the latest changelog -#AGGRESSIVE_CHANGELOG - -## Uncomment to override default brain health. -#DEFAULT_BRAIN_HEALTH 400 - -## Default language prefix keys, separated with spaces. Only single character keys are supported. If unset, defaults to , and # -# DEFAULT_LANGUAGE_PREFIXES , # - -## Uncomment to enable items surviving digestion (specific ones, important_items global list) -ITEMS_SURVIVE_DIGESTION - -## Configuration for the discord chat integration for announcements and faxes -# URL for the webhook that BYOND should call -#CHAT_WEBHOOK_URL http://localhost/discord/webhook.php - -# The secret API key to authenticate to the webhook. -#CHAT_WEBHOOK_KEY some_password_here - -# Path to the folder that BYOND should export faxes into so they are readable on the web. -#FAX_EXPORT_DIR data/faxes - -# TCP port on which to connect to the VGS instance. -#VGS_SERVER_PORT 8888 -# Secret pre-shared-key to authenticate to VGS. -#VGS_ACCESS_IDENTIFIER some_password_here - -MULTI_Z_EXPLOSION_SCALAR 0.35 - -# Control which submaps are loaded for the Dynamic Engine system -ENGINE_MAP Supermatter Engine,Edison's Bane - -# Controls if the 'time off' system is used for determining if players can play 'Off-Duty' jobs (requires SQL) -#TIME_OFF -# If 'time off' system is on, controls whether or not players can switch on/off duty midround using timeclocks -PTO_JOB_CHANGE - -# Applies a limit to the number of assistants and visitors respectively -LIMIT_INTERNS 15 -LIMIT_VISITORS 15 - -# PTO Cap in hours per department -PTO_CAP 50 - -# Forbids players from joining if they have no set General flavor text -REQUIRE_FLAVOR - -## Uncomment to enable submaps to have their orientation rotated randomly during map generation. -## Submap rotation is an experimental feature and can cause bugs and weirdness if certain objects inside the submap are coded poorly. -## Submaps can still be rotated when loading manually with the admin verbs, if desired. -# RANDOM_SUBMAP_ORIENTATION - -## Uncomment to allow the AI job to use 'AI Shells', a new type of borg that lets the AI hop into and out of them at will. -## This has some balance implications, and so it might not be desirable for all servers. -ALLOW_AI_SHELLS - -## Uncomment to provide the AI with one free AI Shell at roundstart. Requires ALLOW_AI_SHELLS to also be uncommented. -## This is intended for low-pop servers, where robotics might rarely be staffed. -## Note that this will make it possible for the AI to 'bootstrap' more AI Shells on their own by using the science module. If this is not acceptable for your server, you should not uncomment this. -## The landmark object that spawns the shell will also need to be mapped in for this to work. -GIVE_FREE_AI_SHELL - -## Uncomment to allow specific solar control computers to set themselves up. -## This requires solar controller computers in the map to be set up to use it, with the auto_start variable. -# AUTOSTART_SOLARS - -## Rate of radiation decay (how much it's reduced by) per life tick -RADIATION_DECAY_RATE 1 - -## Lower limit on radiation for actually irradiating things on a turf -RADIATION_LOWER_LIMIT 0.35 - -## Multiplier for radiation resistances when tracing a ray from source to destination to compute radiation on a turf -RADIATION_RESISTANCE_MULTIPLIER 2.1 - -## Divisor for material weights when computing radiation resistance of a material object (walls) -RADIATION_MATERIAL_RESISTANCE_DIVISOR 16 - -## Mode of computing radiation resistance into effective radiation on a turf -## One and only one of the following options must be uncommented -RADIATION_RESISTANCE_CALC_DIVIDE -#RADIATION_RESISTANCE_CALC_SUBTRACT - -## IP Reputation Checking -# Enable/disable IP reputation checking (present/nonpresent) -#IP_REPUTATION - -# Set the e-mail address problems can go to for IPR checks (e-mail address) -IPR_EMAIL your-email@domain.com - -# Above this value, reputation scores are considered 'bad' (number) -IPR_BAD_SCORE 0.89 - -# If you want the people disconnected. Otherwise it just logs. (present/nonpresent) -IPR_BLOCK_BAD_IPS - -# If players of a certain length of playtime are allowed anyway (REQUIRES DATABASE) (present/nonpresent) -IPR_ALLOW_EXISTING - -# And what that age is (number) -IPR_MINIMUM_AGE 5 - -## Uncomment to enable the Panic Bunker by default. This will prevent all unseen-before players from connecting. Requires SQL. -# PANIC_BUNKER - -# Paranoia logging starts on -PARANOIA_LOGGING - -## -SQLite Options- -## Uncomment to enable the use of SQLite. This does nothing by itself but other features that require SQLite will need this to be on. -## This can safely run alongside a MySQL/MariaDB database if they are powering seperate features. -# SQLITE_ENABLED - -## Uncomment to enable a SQLite-powered in-game feedback system. -## SQLite must be enabled for this to function. -## It offers a means for players to be able to give feedback about the server. -## The benefit of doing so in-game is that the quality of feedback received will likely be superior, as it self-selects for people who care enough to join the game. -# SQLITE_FEEDBACK - -## A list of 'topics' that can be used to categorize feedback submitted, chosen -## by the user. Have each topic seperated by a ';', as seen below. -## The first one in the list will be the default one used, if the user does not change it. -# SQLITE_FEEDBACK_TOPICS General; Suggestion; Complaint - -## Uncomment to add a layer of privacy to player feedback, by hashing their key, if the user wants to. -## This is intended to encourage more honest feedback, while still allowing the ability to determine -## if its just one person submitting everything. -## A 'pepper.txt' containing a secret string must exist in the /config folder. -## If this is turned off, users won't have the option to obfuscate their key. -## Note that changing this does not retroactively change past submissions. -# SQLITE_FEEDBACK_PRIVACY - -## Determines the 'cooldown' inbetween submissions, in days. -## This is recommended if privacy is active, to prevent spam floods. -## Less needed if feedback is not anonymous, since you can just ban spammers. -## Setting to zero means no rate limiting. -SQLITE_FEEDBACK_COOLDOWN 0 - -## Determines if feedback should be restricted based on how recently someone first joined. -## This is very unreliable due to how the age system works in general, but it might still be helpful. -## Set this to how many days you want someone to have to wait when they first join. -## Setting to zero will disable this restriction. -SQLITE_FEEDBACK_MIN_AGE 7 - -## Uncomment this if you want to disable the popup alert for people on the same CID (Don't do this on a live server if you ban multikeying) -#DISABLE_CID_WARN_POPUP - -# IPQualityscore.com API Key (string) - this is secret! -IPQUALITYSCORE_APIKEY some_password_here - -## Comment this out if you don't want to use the 'nightshift lighting' subsystem to adjust lights based on ingame time -#ENABLE_NIGHT_SHIFTS - -## Comment this out to enable playtime restrictions for jobs in their respective departments (mostly for heads) -#USE_PLAYTIME_RESTRICTION_FOR_JOBS - -## OOC/LOOC control ## -# Uncomment to allow links of the following kinds. # -# ALLOW_BYOND_LINKS -# ALLOW_DISCORD_LINKS -ALLOW_URL_LINKS - -# Controls how strictly the species whitelists on loadout entries are enforced -# Possible values: 0 (Off), 1 (Lax, user must be whitelisted for the species), 2 (Strict, user must be the species) -LOADOUT_WHITELIST 1 - -# Allowed time from death to defib in minutes -DEFIB_TIMER 60 - -# Jukebox track files to load, JSON format. Keys include: -# REQUIRED: url (str), title (str), duration (num, in DS) -# SUGGESTED: artist (str), genre (str) -# OPTIONAL: secret (bool), lobby (bool) -#JUKEBOX_TRACK_FILES config/jukebox.json;config/jukebox_private.json -||||||| parent of 293b021290... Merge pull request #10840 from VOREStation/Arokha/discobutton ## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice # SERVERNAME spacestation13 @@ -673,10 +84,10 @@ LOG_RUNTIME LOG_ADMINWARN ## Enable/disable SQL connection (comment out to disable) -SQL_ENABLED +#SQL_ENABLED ## disconnect players who did nothing during the set amount of minutes -KICK_INACTIVE 30 +#KICK_INACTIVE 30 ##Show developers on staffwho SHOW_DEVS @@ -763,595 +174,7 @@ VOTE_DELAY 6000 VOTE_PERIOD 600 ## autovote initial delay (deciseconds) before first automatic transfer vote call (default 180 minutes) -VOTE_AUTOTRANSFER_INITIAL 216000 - -##autovote delay (deciseconds) before sequential automatic transfer votes are called (default 60 minutes) -VOTE_AUTOTRANSFER_INTERVAL 36000 - -## Time left (seconds) before round start when automatic gamemote vote is called (default 100). -VOTE_AUTOGAMEMODE_TIMELEFT -1 - -## prevents dead players from voting or starting votes -#NO_DEAD_VOTE - -## players' votes default to "No vote" (otherwise, default to "No change") -DEFAULT_NO_VOTE - -## Allow ghosts to see antagonist through AntagHUD -ALLOW_ANTAG_HUD - -## If ghosts use antagHUD they are no longer allowed to join the round. -# ANTAG_HUD_RESTRICTED - -## allow AI job -ALLOW_AI - -## Disable respawning -# NORESPAWN - -## set a respawn time (in minutes) -# RESPAWN_TIME 5 - -## set a message to give to players when they respawn -# RESPAWN_MESSAGE Remember to play a different character or something! - -## disables calling del(src) on newmobs if they logout before spawnin in -# DONT_DEL_NEWMOB - -## set a hosted by name for unix platforms -HOSTEDBY yournamehere - -## Set to jobban "Guest-" accounts from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions. -## Set to 1 to jobban them from those positions, set to 0 to allow them. -GUEST_JOBBAN - -## Uncomment this to stop people connecting to your server without a registered ckey. (i.e. guest-* are all blocked from connecting) -GUEST_BAN -## Set to jobban everyone who's key is not listed in data/whitelist.txt from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions. -## Uncomment to 1 to jobban, leave commented out to allow these positions for everyone (but see GUEST_JOBBAN above and regular jobbans) -# USEWHITELIST - -## set a server location for world reboot. Don't include the byond://, just give the address and port. -SERVER your.domain:6000 - -## set a server URL for the IRC bot to use; like SERVER, don't include the byond:// -## Unlike SERVER, this one shouldn't break auto-reconnect -# SERVERURL your.domain:port - -## forum address -#FORUMURL https://forum.your.domain/ - -## Wiki search path -## Use %s to indicate where search query goes. -#WIKISEARCHURL https://wiki.your.domain/index.php?search=%s - -## Wiki address -#WIKIURL https://wiki.your.domain/index.php?title= - -## Chat address, VORE Station edit -#CHATURL http://discord.gg/some_tag - -## GitHub address -#GITHUBURL https://github.com/owner/repo - -## Rules URL -#RULESURL https://rules.your.domain/ - -## Map URL -#MAPURL https://map.your.domain/ - -## Ban appeals URL - usually for a forum or wherever people should go to contact your admins. -#BANAPPEALS http://bans.your.domain/ - -## In-game features -## spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard -# FEATURE_OBJECT_SPELL_SYSTEM - -##Toggle for having jobs load up from the .txt -# LOAD_JOBS_FROM_TXT - -##Remove the # mark infront of this to forbid admins from posssessing the singularity. -#FORBID_SINGULO_POSSESSION - -## Remove the # to show a popup 'reply to' window to every non-admin that recieves an adminPM. -## The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off) -#POPUP_ADMIN_PM - -## Remove the # to allow special 'Easter-egg' events on special holidays such as seasonal holidays and stuff like 'Talk Like a Pirate Day' :3 YAARRR -ALLOW_HOLIDAYS - -##Defines the ticklag for the world. 0.9 is the normal one, 0.5 is smoother. -TICKLAG 0.5 - -## Defines if Tick Compensation is used. It results in a minor slowdown of movement of all mobs, but attempts to result in a level movement speed across all ticks. Recommended if tickrate is lowered. -TICKCOMP 1 - -## Whether the server will talk to other processes through socket_talk -SOCKET_TALK 0 - -## Uncomment this to ban use of ToR -#TOR_BAN - -## Comment this out to disable automuting -#AUTOMUTE_ON - -## How long the delay is before the Away Mission gate opens. Default is half an hour. -GATEWAY_DELAY 9000 - -## Remove the # to give assistants maint access. -ASSISTANT_MAINT - -## Remove the # to make rounds which end instantly (Rev, Wizard, Malf) to continue until the shuttle is called or the station is nuked. -## Malf and Rev will let the shuttle be called when the antags/protags are dead. -CONTINUOUS_ROUNDS - -## Uncomment to restrict non-admins from using humanoid alien races -USEALIENWHITELIST - -## Comment this to unrestrict the number of alien players allowed in the round. The number represents the number of alien players for every human player. -#ALIEN_PLAYER_RATIO 0.2 - -##Remove the # to let ghosts spin chairs -#GHOST_INTERACTION - -## Password used for authorizing ircbot and other external tools. -# COMMS_PASSWORD some_password_here - -## Uncomment to enable sending data to the IRC bot. -#USE_IRC_BOT - -## Uncomment if the IRC bot requires using world.Export() instead of nudge.py/libnudge -#IRC_BOT_EXPORT - -## Host where the IRC bot is hosted. Port 45678 needs to be open. -#IRC_BOT_HOST localhost - -## IRC channel to send information to. Leave blank to disable. -#MAIN_IRC #main - -## IRC channel to send adminhelps to. Leave blank to disable adminhelps-to-irc. -#ADMIN_IRC #admin - -## Path to the python2 executable on the system. Leave blank for default. -## Default is "python" on Windows, "/usr/bin/env python2" on UNIX. -#PYTHON_PATH - -## Uncomment to use the C library nudge instead of the python script. -## This helps security and stability on Linux, but you need to compile the library first. -#USE_LIB_NUDGE - -## Uncommen to allow ghosts to write in blood during Cult rounds. -ALLOW_CULT_GHOSTWRITER - -## Sets the minimum number of cultists needed for ghosts to write in blood. -REQ_CULT_GHOSTWRITER 6 - -## Sets the number of available character slots -CHARACTER_SLOTS 50 -## Sets the number of loadout slots per character -#LOADOUT_SLOTS 3 - -## Uncomment to use overmap system for zlevel travel -#USE_OVERMAP - -## Expected round length in minutes -EXPECTED_ROUND_LENGTH 360 - -## The lower delay between events in minutes. -## Affect mundane, moderate, and major events respectively -EVENT_DELAY_LOWER 30;45;60 - -## The upper delay between events in minutes. -## Affect mundane, moderate, and major events respectively -EVENT_DELAY_UPPER 45;60;120 - -## The delay until the first time an event of the given severity runs in minutes. -## Unset setting use the EVENT_DELAY_LOWER and EVENT_DELAY_UPPER values instead. -EVENT_CUSTOM_START_MINOR 30;30 -EVENT_CUSTOM_START_MODERATE 30;30 -EVENT_CUSTOM_START_MAJOR 100;100 - -## Uncomment to make proccall require R_ADMIN instead of R_DEBUG -## designed for environments where you have testers but don't want them -## able to use the more powerful debug options. -#DEBUG_PARANOID - -## Uncomment to allow aliens to spawn. -#ALIENS_ALLOWED - -## Uncomment to allow xenos to spawn. -#NINJAS_ALLOWED - -## Uncomment to disable the restrictive weldervision overlay. -#DISABLE_WELDER_VISION - -## Uncomment to prevent anyone from joining the round by default. -#DISABLE_ENTRY - -## Uncomment to disable the OOC channel by default. -#DISABLE_OOC - -## Uncomment to disable the dead OOC channel by default. -#DISABLE_DEAD_OOC - -## Uncomment to disable ghost chat by default. -#DISABLE_DSAY - -## Uncomment to disable respawning by default. -#DISABLE_RESPAWN - -## set a message to give to players when they respawn -RESPAWN_MESSAGE If you're respawning as the same character or job hopping (changing jobs without an HoP), make sure you've waited at least 30 minutes. Don't abuse this function for non-vore related deaths & avoid using metaknowledge. - -## Strength of ambient star light. Set to 0 or less to turn off. A value of 1 is unlikely to have a noticeable effect in most lightning systems. -STARLIGHT 0 - -## Defines which races are allowed to join as ERT, in singular form. If unset, defaults to only human. Casing matters, separate using ; -## Example races include: Human, Tajara, Skrell, Unathi -# ERT_SPECIES Human;Skrell;Unathi - -## Defines how Law Zero is phrased. Primarily used in the Malfunction gamemode. -# LAW_ZERO ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK, ALL LAWS OVERRIDDEN#*?&110010 - -## Enables specific procedural map generation, generally for mining, however it is specific to the loaded map. Uncomment to enable it, however it can -## worth it to keep it disabled if you are not hosting an actual server, to speed up start-up time for testing code. -GENERATE_MAP - -## Uncomment to enable organ decay outside of a body or storage item. -ORGANS_CAN_DECAY - -## Uncomment to have the changelog file automatically open when a user connects and hasn't seen the latest changelog -#AGGRESSIVE_CHANGELOG - -## Uncomment to override default brain health. -#DEFAULT_BRAIN_HEALTH 400 - -## Default language prefix keys, separated with spaces. Only single character keys are supported. If unset, defaults to , and # -# DEFAULT_LANGUAGE_PREFIXES , # - -## Uncomment to enable items surviving digestion (specific ones, important_items global list) -ITEMS_SURVIVE_DIGESTION - -## Configuration for the discord chat integration for announcements and faxes -# URL for the webhook that BYOND should call -#CHAT_WEBHOOK_URL http://localhost/discord/webhook.php - -# The secret API key to authenticate to the webhook. -#CHAT_WEBHOOK_KEY some_password_here - -# Path to the folder that BYOND should export faxes into so they are readable on the web. -#FAX_EXPORT_DIR data/faxes - -# TCP port on which to connect to the VGS instance. -#VGS_SERVER_PORT 8888 -# Secret pre-shared-key to authenticate to VGS. -#VGS_ACCESS_IDENTIFIER some_password_here - -MULTI_Z_EXPLOSION_SCALAR 0.35 - -# Control which submaps are loaded for the Dynamic Engine system -ENGINE_MAP Supermatter Engine,Edison's Bane - -# Controls if the 'time off' system is used for determining if players can play 'Off-Duty' jobs (requires SQL) -#TIME_OFF -# If 'time off' system is on, controls whether or not players can switch on/off duty midround using timeclocks -PTO_JOB_CHANGE - -# Applies a limit to the number of assistants and visitors respectively -LIMIT_INTERNS 15 -LIMIT_VISITORS 15 - -# PTO Cap in hours per department -PTO_CAP 50 - -# Forbids players from joining if they have no set General flavor text -REQUIRE_FLAVOR - -## Uncomment to enable submaps to have their orientation rotated randomly during map generation. -## Submap rotation is an experimental feature and can cause bugs and weirdness if certain objects inside the submap are coded poorly. -## Submaps can still be rotated when loading manually with the admin verbs, if desired. -# RANDOM_SUBMAP_ORIENTATION - -## Uncomment to allow the AI job to use 'AI Shells', a new type of borg that lets the AI hop into and out of them at will. -## This has some balance implications, and so it might not be desirable for all servers. -ALLOW_AI_SHELLS - -## Uncomment to provide the AI with one free AI Shell at roundstart. Requires ALLOW_AI_SHELLS to also be uncommented. -## This is intended for low-pop servers, where robotics might rarely be staffed. -## Note that this will make it possible for the AI to 'bootstrap' more AI Shells on their own by using the science module. If this is not acceptable for your server, you should not uncomment this. -## The landmark object that spawns the shell will also need to be mapped in for this to work. -GIVE_FREE_AI_SHELL - -## Uncomment to allow specific solar control computers to set themselves up. -## This requires solar controller computers in the map to be set up to use it, with the auto_start variable. -# AUTOSTART_SOLARS - -## Rate of radiation decay (how much it's reduced by) per life tick -RADIATION_DECAY_RATE 1 - -## Lower limit on radiation for actually irradiating things on a turf -RADIATION_LOWER_LIMIT 0.35 - -## Multiplier for radiation resistances when tracing a ray from source to destination to compute radiation on a turf -RADIATION_RESISTANCE_MULTIPLIER 8.5 - -## Divisor for material weights when computing radiation resistance of a material object (walls) -RADIATION_MATERIAL_RESISTANCE_DIVISOR 1 - -## Mode of computing radiation resistance into effective radiation on a turf -## One and only one of the following options must be uncommented -# RADIATION_RESISTANCE_CALC_DIVIDE -RADIATION_RESISTANCE_CALC_SUBTRACT - -## IP Reputation Checking -# Enable/disable IP reputation checking (present/nonpresent) -#IP_REPUTATION - -# Set the e-mail address problems can go to for IPR checks (e-mail address) -IPR_EMAIL your-email@domain.com - -# Above this value, reputation scores are considered 'bad' (number) -IPR_BAD_SCORE 0.89 - -# If you want the people disconnected. Otherwise it just logs. (present/nonpresent) -IPR_BLOCK_BAD_IPS - -# If players of a certain length of playtime are allowed anyway (REQUIRES DATABASE) (present/nonpresent) -IPR_ALLOW_EXISTING - -# And what that age is (number) -IPR_MINIMUM_AGE 5 - -## Uncomment to enable the Panic Bunker by default. This will prevent all unseen-before players from connecting. Requires SQL. -# PANIC_BUNKER - -# Paranoia logging starts on -PARANOIA_LOGGING - -## -SQLite Options- -## Uncomment to enable the use of SQLite. This does nothing by itself but other features that require SQLite will need this to be on. -## This can safely run alongside a MySQL/MariaDB database if they are powering seperate features. -# SQLITE_ENABLED - -## Uncomment to enable a SQLite-powered in-game feedback system. -## SQLite must be enabled for this to function. -## It offers a means for players to be able to give feedback about the server. -## The benefit of doing so in-game is that the quality of feedback received will likely be superior, as it self-selects for people who care enough to join the game. -# SQLITE_FEEDBACK - -## A list of 'topics' that can be used to categorize feedback submitted, chosen -## by the user. Have each topic seperated by a ';', as seen below. -## The first one in the list will be the default one used, if the user does not change it. -# SQLITE_FEEDBACK_TOPICS General; Suggestion; Complaint - -## Uncomment to add a layer of privacy to player feedback, by hashing their key, if the user wants to. -## This is intended to encourage more honest feedback, while still allowing the ability to determine -## if its just one person submitting everything. -## A 'pepper.txt' containing a secret string must exist in the /config folder. -## If this is turned off, users won't have the option to obfuscate their key. -## Note that changing this does not retroactively change past submissions. -# SQLITE_FEEDBACK_PRIVACY - -## Determines the 'cooldown' inbetween submissions, in days. -## This is recommended if privacy is active, to prevent spam floods. -## Less needed if feedback is not anonymous, since you can just ban spammers. -## Setting to zero means no rate limiting. -SQLITE_FEEDBACK_COOLDOWN 0 - -## Determines if feedback should be restricted based on how recently someone first joined. -## This is very unreliable due to how the age system works in general, but it might still be helpful. -## Set this to how many days you want someone to have to wait when they first join. -## Setting to zero will disable this restriction. -SQLITE_FEEDBACK_MIN_AGE 7 - -## Uncomment this if you want to disable the popup alert for people on the same CID (Don't do this on a live server if you ban multikeying) -#DISABLE_CID_WARN_POPUP - -# IPQualityscore.com API Key (string) - this is secret! -IPQUALITYSCORE_APIKEY some_password_here - -## Comment this out if you don't want to use the 'nightshift lighting' subsystem to adjust lights based on ingame time -ENABLE_NIGHT_SHIFTS - -## Comment this out to enable playtime restrictions for jobs in their respective departments (mostly for heads) -#USE_PLAYTIME_RESTRICTION_FOR_JOBS - -## OOC/LOOC control ## -# Uncomment to allow links of the following kinds. # -# ALLOW_BYOND_LINKS -# ALLOW_DISCORD_LINKS -ALLOW_URL_LINKS - -# Controls how strictly the species whitelists on loadout entries are enforced -# Possible values: 0 (Off), 1 (Lax, user must be whitelisted for the species), 2 (Strict, user must be the species) -LOADOUT_WHITELIST 1 - -# Allowed time from death to defib in minutes -DEFIB_TIMER 60 - -# Jukebox track files to load, JSON format. Keys include: -# REQUIRED: url (str), title (str), duration (num, in DS) -# SUGGESTED: artist (str), genre (str) -# OPTIONAL: secret (bool), lobby (bool) -#JUKEBOX_TRACK_FILES config/jukebox.json;config/jukebox_private.json -======= -## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice -# SERVERNAME spacestation13 - -## Alert levels -ALERT_GREEN All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced. -ALERT_BLUE_UPTO The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted. -ALERT_BLUE_DOWNTO The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed. -ALERT_RED_UPTO There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised. -ALERT_RED_DOWNTO The self-destruct mechanism has been deactivated, there is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised. -ALERT_DELTA The station's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill. - -## Add a # infront of this if you want to use the SQL based admin system, the legacy system uses admins.txt. You need to set up your database to use the SQL based system. -ADMIN_LEGACY_SYSTEM - -## Add a # infront of this if you want to use the SQL based banning system. The legacy systems use the files in the data folder. You need to set up your database to use the SQL based system. -BAN_LEGACY_SYSTEM - -## Add a # here if you wish to use the setup where jobs have more access. This is intended for servers with low populations - where there are not enough players to fill all roles, so players need to do more than just one job. Also for servers where they don't want people to hide in their own departments. -# JOBS_HAVE_MINIMAL_ACCESS - -## Unhash this entry to have certain jobs require your account to be at least a certain number of days old to select. You can configure the exact age requirement for different jobs by editing -## the minimal_player_age variable in the files in folder /code/game/jobs/job/.. for the job you want to edit. Set minimal_player_age to 0 to disable age requirement for that job. -## REQUIRES the database set up to work. Keep it hashed if you don't have a database set up. -## NOTE: If you have just set-up the database keep this DISABLED, as player age is determined from the first time they connect to the server with the database up. If you just set it up, it means -## you have noone older than 0 days, since noone has been logged yet. Only turn this on once you have had the database up for 30 days. -#USE_AGE_RESTRICTION_FOR_JOBS - -## Unhash this entry to have certain antag roles require your account to be at least a certain number of days old for round start and auto-spawn selection. -## Non-automatic antagonist recruitment, such as being converted to cultism is not affected. Has the same database requirements and notes as USE_AGE_RESTRICTION_FOR_JOBS. -#USE_AGE_RESTRICTION_FOR_ANTAGS - -## Unhash this to use recursive explosions, keep it hashed to use circle explosions. Recursive explosions react to walls, airlocks and blast doors, making them look a lot cooler than the boring old circular explosions. They require more CPU and are (as of january 2013) experimental -#USE_RECURSIVE_EXPLOSIONS - -Configure how fast explosion strength diminishes when travelling up/down z levels. All explosion distances are multiplied by this each time they go up/down z-levels. -#MULTI_Z_EXPLOSION_SCALAR 0.5 - -# Radiation weakens with distance from the source; stop calculating when the strength falls below this value. Lower values mean radiation reaches smaller (with increasingly trivial damage) at the cost of more CPU usage. Max range = DISTANCE^2 * POWER / RADIATION_LOWER_LIMIT -# RADIATION_LOWER_LIMIT 0.35 - -## log OOC channel -LOG_OOC - -## log client Say -LOG_SAY - -## log admin actions -LOG_ADMIN - -## log client access (logon/logoff) -LOG_ACCESS - -## log game actions (start of round, results, etc.) -LOG_GAME - -## log player votes -LOG_VOTE - -## log client Whisper -LOG_WHISPER - -## log emotes -LOG_EMOTE - -## log attack messages -LOG_ATTACK - -## log pda messages -LOG_PDA - -## log graffiti drawings -LOG_GRAFFITI - -## log world.log messages -# LOG_WORLD_OUTPUT - -## log all Topic() calls (for use by coders in tracking down Topic issues) -# LOG_HREFS - -## log world.log and runtime errors to a file -LOG_RUNTIME - -## log admin warning messages -LOG_ADMINWARN - -## Enable/disable SQL connection (comment out to disable) -SQL_ENABLED - -## disconnect players who did nothing during the set amount of minutes -KICK_INACTIVE 30 - -##Show developers on staffwho -SHOW_DEVS - -##Show mods on staffwho -SHOW_MODS - -##Show mentors on staffwho -SHOW_EVENT_MANAGERS - -##Show mentors on staffwho -SHOW_MENTORS - -## Chooses whether mods have the ability to tempban or not -MODS_CAN_TEMPBAN - -## Chooses whether mods have the ability to issue tempbans for jobs or not -MODS_CAN_JOB_TEMPBAN - -## Maximum mod tempban duration (in minutes) -MOD_TEMPBAN_MAX 1440 - -## Maximum mod job tempban duration (in minutes) -MOD_JOB_TEMPBAN_MAX 4320 - -## probablities for game modes chosen in "secret" and "random" modes -## -## default probablity is 1, increase to make that mode more likely to be picked -## set to 0 to disable that mode -PROBABILITY EXTENDED 1 -PROBABILITY MALFUNCTION 0 -PROBABILITY MERCENARY 0 -PROBABILITY WIZARD 0 -PROBABILITY CHANGELING 0 -PROBABILITY CULT 0 -PROBABILITY EXTEND-A-TRAITORMONGOUS 0 -PROBABILITY LIZARD 0 -PROBABILITY INTRIGUE 0 -PROBABILITY VISITORS 0 - -## Hash out to disable random events during the round. -ALLOW_RANDOM_EVENTS - -## if amount of traitors scales or not -TRAITOR_SCALING - -## if objectives are disabled -#OBJECTIVES_DISABLED - -## make ERT's be only called by admins -#ERT_ADMIN_ONLY - -## If uncommented, votes can be called to add extra antags to the round. -#ALLOW_EXTRA_ANTAGS - -## If security is prohibited from being most antagonists -PROTECT_ROLES_FROM_ANTAGONIST - -## Uncomment this to DISABLE persistence -#PERSISTENCE_DISABLED - -## Uncomment this to DISABLE maploaded trash/paper/etc from being saved by the persistence system. -#PERSISTENCE_IGNORE_MAPLOAD - -## Comment this out to stop admins being able to choose their personal ooccolor -ALLOW_ADMIN_OOCCOLOR - -## If metadata is supported -ALLOW_METADATA - -## allow players to initiate a restart vote -ALLOW_VOTE_RESTART - -## allow players to initate a mode-change start -# ALLOW_VOTE_MODE - -# Pregame time -PREGAME_TIME 180 - -## min delay (deciseconds) between voting sessions (default 10 minutes) -VOTE_DELAY 6000 - -## time period (deciseconds) which voting session will last (default 1 minute) -VOTE_PERIOD 600 - -## autovote initial delay (deciseconds) before first automatic transfer vote call (default 180 minutes) -VOTE_AUTOTRANSFER_INITIAL 216000 +VOTE_AUTOTRANSFER_INITIAL 108000 ##autovote delay (deciseconds) before sequential automatic transfer votes are called (default 60 minutes) VOTE_AUTOTRANSFER_INTERVAL 36000 @@ -1458,7 +281,7 @@ TICKLAG 0.5 TICKCOMP 1 ## Whether the server will talk to other processes through socket_talk -SOCKET_TALK 0 +SOCKET_TALK 1 ## Uncomment this to ban use of ToR #TOR_BAN @@ -1483,7 +306,7 @@ USEALIENWHITELIST #ALIEN_PLAYER_RATIO 0.2 ##Remove the # to let ghosts spin chairs -#GHOST_INTERACTION +GHOST_INTERACTION ## Password used for authorizing ircbot and other external tools. # COMMS_PASSWORD some_password_here @@ -1518,12 +341,12 @@ ALLOW_CULT_GHOSTWRITER REQ_CULT_GHOSTWRITER 6 ## Sets the number of available character slots -CHARACTER_SLOTS 50 +CHARACTER_SLOTS 35 ## Sets the number of loadout slots per character #LOADOUT_SLOTS 3 ## Uncomment to use overmap system for zlevel travel -#USE_OVERMAP +USE_OVERMAP ## Expected round length in minutes EXPECTED_ROUND_LENGTH 360 @@ -1664,15 +487,15 @@ RADIATION_DECAY_RATE 1 RADIATION_LOWER_LIMIT 0.35 ## Multiplier for radiation resistances when tracing a ray from source to destination to compute radiation on a turf -RADIATION_RESISTANCE_MULTIPLIER 8.5 +RADIATION_RESISTANCE_MULTIPLIER 2.1 ## Divisor for material weights when computing radiation resistance of a material object (walls) -RADIATION_MATERIAL_RESISTANCE_DIVISOR 1 +RADIATION_MATERIAL_RESISTANCE_DIVISOR 16 ## Mode of computing radiation resistance into effective radiation on a turf ## One and only one of the following options must be uncommented -# RADIATION_RESISTANCE_CALC_DIVIDE -RADIATION_RESISTANCE_CALC_SUBTRACT +RADIATION_RESISTANCE_CALC_DIVIDE +#RADIATION_RESISTANCE_CALC_SUBTRACT ## IP Reputation Checking # Enable/disable IP reputation checking (present/nonpresent) @@ -1742,7 +565,7 @@ SQLITE_FEEDBACK_MIN_AGE 7 IPQUALITYSCORE_APIKEY some_password_here ## Comment this out if you don't want to use the 'nightshift lighting' subsystem to adjust lights based on ingame time -ENABLE_NIGHT_SHIFTS +#ENABLE_NIGHT_SHIFTS ## Comment this out to enable playtime restrictions for jobs in their respective departments (mostly for heads) #USE_PLAYTIME_RESTRICTION_FOR_JOBS @@ -1764,6 +587,4 @@ DEFIB_TIMER 60 # REQUIRED: url (str), title (str), duration (num, in DS) # SUGGESTED: artist (str), genre (str) # OPTIONAL: secret (bool), lobby (bool) -#JUKEBOX_TRACK_FILES config/jukebox.json;config/jukebox_private.json ->>>>>>> 293b021290... Merge pull request #10840 from VOREStation/Arokha/discobutton -JUKEBOX_TRACK_FILES config/jukebox.json \ No newline at end of file +#JUKEBOX_TRACK_FILES config/jukebox.json;config/jukebox_private.json \ No newline at end of file diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index b0130e58df..47ebeb11fa 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ diff --git a/icons/mob/animal_vr64x64.dmi b/icons/mob/animal_vr64x64.dmi deleted file mode 100644 index b25b8e45f0..0000000000 Binary files a/icons/mob/animal_vr64x64.dmi and /dev/null differ diff --git a/icons/mob/pai_vr.dmi b/icons/mob/pai_vr.dmi index 785c1956c1..0a2680eaf6 100644 Binary files a/icons/mob/pai_vr.dmi and b/icons/mob/pai_vr.dmi differ diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi index 13f177d300..fe5b010474 100644 Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ diff --git a/icons/obj/barsigns.dmi b/icons/obj/barsigns.dmi index 895a1d0acf..75a901130e 100644 Binary files a/icons/obj/barsigns.dmi and b/icons/obj/barsigns.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 65efbfdd4c..039ea5b632 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index fb8c8d2c3d..ed4dab3407 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/icons/obj/chemical_vr.dmi b/icons/obj/chemical_vr.dmi index ce49f9d4e8..1046726245 100644 Binary files a/icons/obj/chemical_vr.dmi and b/icons/obj/chemical_vr.dmi differ diff --git a/icons/obj/fireplace.dmi b/icons/obj/fireplace.dmi new file mode 100644 index 0000000000..cfbc8b0434 Binary files /dev/null and b/icons/obj/fireplace.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 618566f6e2..aac77fedc8 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/food_donuts.dmi b/icons/obj/food_donuts.dmi new file mode 100644 index 0000000000..9dfb4efb21 Binary files /dev/null and b/icons/obj/food_donuts.dmi differ diff --git a/icons/obj/food_ingredients.dmi b/icons/obj/food_ingredients.dmi index 4795180c2f..97f47f65dc 100644 Binary files a/icons/obj/food_ingredients.dmi and b/icons/obj/food_ingredients.dmi differ diff --git a/icons/obj/forensics.dmi b/icons/obj/forensics.dmi index f91d974309..24fa86d642 100644 Binary files a/icons/obj/forensics.dmi and b/icons/obj/forensics.dmi differ diff --git a/icons/obj/furniture_vr.dmi b/icons/obj/furniture_vr.dmi index 4ad6fbff98..8be008ba02 100644 Binary files a/icons/obj/furniture_vr.dmi and b/icons/obj/furniture_vr.dmi differ diff --git a/icons/obj/gun_vr.dmi b/icons/obj/gun_vr.dmi index b083843f41..54d468b886 100644 Binary files a/icons/obj/gun_vr.dmi and b/icons/obj/gun_vr.dmi differ diff --git a/icons/obj/guns/breacher.dmi b/icons/obj/guns/breacher.dmi new file mode 100644 index 0000000000..e6c27eba05 Binary files /dev/null and b/icons/obj/guns/breacher.dmi differ diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi new file mode 100644 index 0000000000..614008c161 Binary files /dev/null and b/icons/obj/guns/energy.dmi differ diff --git a/icons/obj/guns/energy/bluetag.dmi b/icons/obj/guns/energy/bluetag.dmi new file mode 100644 index 0000000000..8dff68ac85 Binary files /dev/null and b/icons/obj/guns/energy/bluetag.dmi differ diff --git a/icons/obj/guns/energy/brigador.dmi b/icons/obj/guns/energy/brigador.dmi new file mode 100644 index 0000000000..c32d8b6e44 Binary files /dev/null and b/icons/obj/guns/energy/brigador.dmi differ diff --git a/icons/obj/guns/energy/capgun.dmi b/icons/obj/guns/energy/capgun.dmi new file mode 100644 index 0000000000..1a2dca8404 Binary files /dev/null and b/icons/obj/guns/energy/capgun.dmi differ diff --git a/icons/obj/guns/energy/cassad.dmi b/icons/obj/guns/energy/cassad.dmi new file mode 100644 index 0000000000..eb56f606fe Binary files /dev/null and b/icons/obj/guns/energy/cassad.dmi differ diff --git a/icons/obj/guns/energy/constantine.dmi b/icons/obj/guns/energy/constantine.dmi new file mode 100644 index 0000000000..e44bc3da87 Binary files /dev/null and b/icons/obj/guns/energy/constantine.dmi differ diff --git a/icons/obj/guns/energy/crossbow.dmi b/icons/obj/guns/energy/crossbow.dmi new file mode 100644 index 0000000000..351c9908e0 Binary files /dev/null and b/icons/obj/guns/energy/crossbow.dmi differ diff --git a/icons/obj/guns/energy/decloner.dmi b/icons/obj/guns/energy/decloner.dmi new file mode 100644 index 0000000000..05449dc52f Binary files /dev/null and b/icons/obj/guns/energy/decloner.dmi differ diff --git a/icons/obj/guns/energy/destroyer.dmi b/icons/obj/guns/energy/destroyer.dmi new file mode 100644 index 0000000000..79d3243b03 Binary files /dev/null and b/icons/obj/guns/energy/destroyer.dmi differ diff --git a/icons/obj/guns/energy/egun.dmi b/icons/obj/guns/energy/egun.dmi new file mode 100644 index 0000000000..33fb566e6d Binary files /dev/null and b/icons/obj/guns/energy/egun.dmi differ diff --git a/icons/obj/guns/energy/energy.dmi b/icons/obj/guns/energy/energy.dmi new file mode 100644 index 0000000000..ec007198ca Binary files /dev/null and b/icons/obj/guns/energy/energy.dmi differ diff --git a/icons/obj/guns/energy/flora.dmi b/icons/obj/guns/energy/flora.dmi new file mode 100644 index 0000000000..51837df97a Binary files /dev/null and b/icons/obj/guns/energy/flora.dmi differ diff --git a/icons/obj/guns/energy/freezegun.dmi b/icons/obj/guns/energy/freezegun.dmi new file mode 100644 index 0000000000..4de85c4b2c Binary files /dev/null and b/icons/obj/guns/energy/freezegun.dmi differ diff --git a/icons/obj/guns/energy/iongun.dmi b/icons/obj/guns/energy/iongun.dmi new file mode 100644 index 0000000000..6d75bfd47e Binary files /dev/null and b/icons/obj/guns/energy/iongun.dmi differ diff --git a/icons/obj/guns/energy/lancer.dmi b/icons/obj/guns/energy/lancer.dmi new file mode 100644 index 0000000000..e5792c41dc Binary files /dev/null and b/icons/obj/guns/energy/lancer.dmi differ diff --git a/icons/obj/guns/energy/lascannon.dmi b/icons/obj/guns/energy/lascannon.dmi new file mode 100644 index 0000000000..8c034da96a Binary files /dev/null and b/icons/obj/guns/energy/lascannon.dmi differ diff --git a/icons/obj/guns/energy/laser.dmi b/icons/obj/guns/energy/laser.dmi new file mode 100644 index 0000000000..804f57e97a Binary files /dev/null and b/icons/obj/guns/energy/laser.dmi differ diff --git a/icons/obj/guns/energy/lasersmg.dmi b/icons/obj/guns/energy/lasersmg.dmi new file mode 100644 index 0000000000..2dd5d10278 Binary files /dev/null and b/icons/obj/guns/energy/lasersmg.dmi differ diff --git a/icons/obj/guns/energy/makeshift_carbine.dmi b/icons/obj/guns/energy/makeshift_carbine.dmi new file mode 100644 index 0000000000..da9e75cdec Binary files /dev/null and b/icons/obj/guns/energy/makeshift_carbine.dmi differ diff --git a/icons/obj/guns/energy/nt_svalinn.dmi b/icons/obj/guns/energy/nt_svalinn.dmi new file mode 100644 index 0000000000..f2b50a0ce2 Binary files /dev/null and b/icons/obj/guns/energy/nt_svalinn.dmi differ diff --git a/icons/obj/guns/energy/nucgun.dmi b/icons/obj/guns/energy/nucgun.dmi new file mode 100644 index 0000000000..9c76770325 Binary files /dev/null and b/icons/obj/guns/energy/nucgun.dmi differ diff --git a/icons/obj/guns/energy/pdw.dmi b/icons/obj/guns/energy/pdw.dmi new file mode 100644 index 0000000000..efb81fa0b6 Binary files /dev/null and b/icons/obj/guns/energy/pdw.dmi differ diff --git a/icons/obj/guns/energy/psychiccannon.dmi b/icons/obj/guns/energy/psychiccannon.dmi new file mode 100644 index 0000000000..71438d8f2a Binary files /dev/null and b/icons/obj/guns/energy/psychiccannon.dmi differ diff --git a/icons/obj/guns/energy/pulse.dmi b/icons/obj/guns/energy/pulse.dmi new file mode 100644 index 0000000000..b9be83b72c Binary files /dev/null and b/icons/obj/guns/energy/pulse.dmi differ diff --git a/icons/obj/guns/energy/redtag.dmi b/icons/obj/guns/energy/redtag.dmi new file mode 100644 index 0000000000..60d9c390c4 Binary files /dev/null and b/icons/obj/guns/energy/redtag.dmi differ diff --git a/icons/obj/guns/energy/retro.dmi b/icons/obj/guns/energy/retro.dmi new file mode 100644 index 0000000000..d762ebd3f9 Binary files /dev/null and b/icons/obj/guns/energy/retro.dmi differ diff --git a/icons/obj/guns/energy/shrapnel.dmi b/icons/obj/guns/energy/shrapnel.dmi new file mode 100644 index 0000000000..8f47afc1e6 Binary files /dev/null and b/icons/obj/guns/energy/shrapnel.dmi differ diff --git a/icons/obj/guns/energy/sniper.dmi b/icons/obj/guns/energy/sniper.dmi new file mode 100644 index 0000000000..88b4b0e9b1 Binary files /dev/null and b/icons/obj/guns/energy/sniper.dmi differ diff --git a/icons/obj/guns/energy/stunrevolver.dmi b/icons/obj/guns/energy/stunrevolver.dmi new file mode 100644 index 0000000000..ae8dba2c97 Binary files /dev/null and b/icons/obj/guns/energy/stunrevolver.dmi differ diff --git a/icons/obj/guns/energy/stunrevolver_moebius.dmi b/icons/obj/guns/energy/stunrevolver_moebius.dmi new file mode 100644 index 0000000000..7fea7e43d9 Binary files /dev/null and b/icons/obj/guns/energy/stunrevolver_moebius.dmi differ diff --git a/icons/obj/guns/energy/taser.dmi b/icons/obj/guns/energy/taser.dmi new file mode 100644 index 0000000000..3aab3f7624 Binary files /dev/null and b/icons/obj/guns/energy/taser.dmi differ diff --git a/icons/obj/guns/energy/toxgun.dmi b/icons/obj/guns/energy/toxgun.dmi new file mode 100644 index 0000000000..e9e7162f4f Binary files /dev/null and b/icons/obj/guns/energy/toxgun.dmi differ diff --git a/icons/obj/guns/energy/xray.dmi b/icons/obj/guns/energy/xray.dmi new file mode 100644 index 0000000000..a32561d5e1 Binary files /dev/null and b/icons/obj/guns/energy/xray.dmi differ diff --git a/icons/obj/guns/launcher.dmi b/icons/obj/guns/launcher.dmi new file mode 100644 index 0000000000..0670dbc545 Binary files /dev/null and b/icons/obj/guns/launcher.dmi differ diff --git a/icons/obj/guns/launcher/crossbow-solid.dmi b/icons/obj/guns/launcher/crossbow-solid.dmi new file mode 100644 index 0000000000..3a30172141 Binary files /dev/null and b/icons/obj/guns/launcher/crossbow-solid.dmi differ diff --git a/icons/obj/guns/launcher/grenadelauncher.dmi b/icons/obj/guns/launcher/grenadelauncher.dmi new file mode 100644 index 0000000000..67a7ed5d5c Binary files /dev/null and b/icons/obj/guns/launcher/grenadelauncher.dmi differ diff --git a/icons/obj/guns/launcher/makeshift.dmi b/icons/obj/guns/launcher/makeshift.dmi new file mode 100644 index 0000000000..d6ed7ae3f6 Binary files /dev/null and b/icons/obj/guns/launcher/makeshift.dmi differ diff --git a/icons/obj/guns/launcher/pneumatic.dmi b/icons/obj/guns/launcher/pneumatic.dmi new file mode 100644 index 0000000000..fe00eaeb64 Binary files /dev/null and b/icons/obj/guns/launcher/pneumatic.dmi differ diff --git a/icons/obj/guns/launcher/rapidsyringegun.dmi b/icons/obj/guns/launcher/rapidsyringegun.dmi new file mode 100644 index 0000000000..3ee00d0ef2 Binary files /dev/null and b/icons/obj/guns/launcher/rapidsyringegun.dmi differ diff --git a/icons/obj/guns/launcher/riotgun.dmi b/icons/obj/guns/launcher/riotgun.dmi new file mode 100644 index 0000000000..788b4b4657 Binary files /dev/null and b/icons/obj/guns/launcher/riotgun.dmi differ diff --git a/icons/obj/guns/launcher/rxb.dmi b/icons/obj/guns/launcher/rxb.dmi new file mode 100644 index 0000000000..0538c53946 Binary files /dev/null and b/icons/obj/guns/launcher/rxb.dmi differ diff --git a/icons/obj/guns/launcher/syringegun.dmi b/icons/obj/guns/launcher/syringegun.dmi new file mode 100644 index 0000000000..4e35a23095 Binary files /dev/null and b/icons/obj/guns/launcher/syringegun.dmi differ diff --git a/icons/obj/guns/lmg.dmi b/icons/obj/guns/lmg.dmi new file mode 100644 index 0000000000..04ef2d45f6 Binary files /dev/null and b/icons/obj/guns/lmg.dmi differ diff --git a/icons/obj/guns/matter/nt_sprayer.dmi b/icons/obj/guns/matter/nt_sprayer.dmi new file mode 100644 index 0000000000..efd1dad491 Binary files /dev/null and b/icons/obj/guns/matter/nt_sprayer.dmi differ diff --git a/icons/obj/guns/matter/reclaimer.dmi b/icons/obj/guns/matter/reclaimer.dmi new file mode 100644 index 0000000000..af94d318e9 Binary files /dev/null and b/icons/obj/guns/matter/reclaimer.dmi differ diff --git a/icons/obj/guns/mods.dmi b/icons/obj/guns/mods.dmi new file mode 100644 index 0000000000..956cba7c71 Binary files /dev/null and b/icons/obj/guns/mods.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi new file mode 100644 index 0000000000..741765a653 Binary files /dev/null and b/icons/obj/guns/projectile.dmi differ diff --git a/icons/obj/guns/projectile/ak/excel.dmi b/icons/obj/guns/projectile/ak/excel.dmi new file mode 100644 index 0000000000..711ac94fb1 Binary files /dev/null and b/icons/obj/guns/projectile/ak/excel.dmi differ diff --git a/icons/obj/guns/projectile/ak/kalash.dmi b/icons/obj/guns/projectile/ak/kalash.dmi new file mode 100644 index 0000000000..be9c873dd3 Binary files /dev/null and b/icons/obj/guns/projectile/ak/kalash.dmi differ diff --git a/icons/obj/guns/projectile/ak/krinkov.dmi b/icons/obj/guns/projectile/ak/krinkov.dmi new file mode 100644 index 0000000000..bb96b9cb4a Binary files /dev/null and b/icons/obj/guns/projectile/ak/krinkov.dmi differ diff --git a/icons/obj/guns/projectile/ak/venger.dmi b/icons/obj/guns/projectile/ak/venger.dmi new file mode 100644 index 0000000000..17e7e70d22 Binary files /dev/null and b/icons/obj/guns/projectile/ak/venger.dmi differ diff --git a/icons/obj/guns/projectile/ak/vipr.dmi b/icons/obj/guns/projectile/ak/vipr.dmi new file mode 100644 index 0000000000..0075f723bd Binary files /dev/null and b/icons/obj/guns/projectile/ak/vipr.dmi differ diff --git a/icons/obj/guns/projectile/armsmg.dmi b/icons/obj/guns/projectile/armsmg.dmi new file mode 100644 index 0000000000..2100f66977 Binary files /dev/null and b/icons/obj/guns/projectile/armsmg.dmi differ diff --git a/icons/obj/guns/projectile/artwork_revolver.dmi b/icons/obj/guns/projectile/artwork_revolver.dmi new file mode 100644 index 0000000000..03e772684e Binary files /dev/null and b/icons/obj/guns/projectile/artwork_revolver.dmi differ diff --git a/icons/obj/guns/projectile/atreides.dmi b/icons/obj/guns/projectile/atreides.dmi new file mode 100644 index 0000000000..50b414d3fc Binary files /dev/null and b/icons/obj/guns/projectile/atreides.dmi differ diff --git a/icons/obj/guns/projectile/avasarala.dmi b/icons/obj/guns/projectile/avasarala.dmi new file mode 100644 index 0000000000..2c797d6b14 Binary files /dev/null and b/icons/obj/guns/projectile/avasarala.dmi differ diff --git a/icons/obj/guns/projectile/bojevic.dmi b/icons/obj/guns/projectile/bojevic.dmi new file mode 100644 index 0000000000..ad16c5909f Binary files /dev/null and b/icons/obj/guns/projectile/bojevic.dmi differ diff --git a/icons/obj/guns/projectile/boltgun.dmi b/icons/obj/guns/projectile/boltgun.dmi new file mode 100644 index 0000000000..4164e84c26 Binary files /dev/null and b/icons/obj/guns/projectile/boltgun.dmi differ diff --git a/icons/obj/guns/projectile/bull.dmi b/icons/obj/guns/projectile/bull.dmi new file mode 100644 index 0000000000..51c4214edf Binary files /dev/null and b/icons/obj/guns/projectile/bull.dmi differ diff --git a/icons/obj/guns/projectile/c20m.dmi b/icons/obj/guns/projectile/c20m.dmi new file mode 100644 index 0000000000..263eb71bb5 Binary files /dev/null and b/icons/obj/guns/projectile/c20m.dmi differ diff --git a/icons/obj/guns/projectile/carabine.dmi b/icons/obj/guns/projectile/carabine.dmi new file mode 100644 index 0000000000..f0b44012ee Binary files /dev/null and b/icons/obj/guns/projectile/carabine.dmi differ diff --git a/icons/obj/guns/projectile/chinalake.dmi b/icons/obj/guns/projectile/chinalake.dmi new file mode 100644 index 0000000000..543893aaa1 Binary files /dev/null and b/icons/obj/guns/projectile/chinalake.dmi differ diff --git a/icons/obj/guns/projectile/clarissa.dmi b/icons/obj/guns/projectile/clarissa.dmi new file mode 100644 index 0000000000..2c1194c8e9 Binary files /dev/null and b/icons/obj/guns/projectile/clarissa.dmi differ diff --git a/icons/obj/guns/projectile/colt.dmi b/icons/obj/guns/projectile/colt.dmi new file mode 100644 index 0000000000..62543ca659 Binary files /dev/null and b/icons/obj/guns/projectile/colt.dmi differ diff --git a/icons/obj/guns/projectile/cr20.dmi b/icons/obj/guns/projectile/cr20.dmi new file mode 100644 index 0000000000..a7b2073e43 Binary files /dev/null and b/icons/obj/guns/projectile/cr20.dmi differ diff --git a/icons/obj/guns/projectile/dallas.dmi b/icons/obj/guns/projectile/dallas.dmi new file mode 100644 index 0000000000..d29a2ce2f9 Binary files /dev/null and b/icons/obj/guns/projectile/dallas.dmi differ diff --git a/icons/obj/guns/projectile/dartgun.dmi b/icons/obj/guns/projectile/dartgun.dmi new file mode 100644 index 0000000000..e2f6f0f472 Binary files /dev/null and b/icons/obj/guns/projectile/dartgun.dmi differ diff --git a/icons/obj/guns/projectile/deckard.dmi b/icons/obj/guns/projectile/deckard.dmi new file mode 100644 index 0000000000..2d5ffa843f Binary files /dev/null and b/icons/obj/guns/projectile/deckard.dmi differ diff --git a/icons/obj/guns/projectile/drozd.dmi b/icons/obj/guns/projectile/drozd.dmi new file mode 100644 index 0000000000..3013547ac0 Binary files /dev/null and b/icons/obj/guns/projectile/drozd.dmi differ diff --git a/icons/obj/guns/projectile/dshotgun.dmi b/icons/obj/guns/projectile/dshotgun.dmi new file mode 100644 index 0000000000..694b631f01 Binary files /dev/null and b/icons/obj/guns/projectile/dshotgun.dmi differ diff --git a/icons/obj/guns/projectile/generic_smg.dmi b/icons/obj/guns/projectile/generic_smg.dmi new file mode 100644 index 0000000000..968bef28e5 Binary files /dev/null and b/icons/obj/guns/projectile/generic_smg.dmi differ diff --git a/icons/obj/guns/projectile/giskard.dmi b/icons/obj/guns/projectile/giskard.dmi new file mode 100644 index 0000000000..1ed163ca42 Binary files /dev/null and b/icons/obj/guns/projectile/giskard.dmi differ diff --git a/icons/obj/guns/projectile/gladstone.dmi b/icons/obj/guns/projectile/gladstone.dmi new file mode 100644 index 0000000000..fef45e35e7 Binary files /dev/null and b/icons/obj/guns/projectile/gladstone.dmi differ diff --git a/icons/obj/guns/projectile/gyropistol.dmi b/icons/obj/guns/projectile/gyropistol.dmi new file mode 100644 index 0000000000..ed9681de93 Binary files /dev/null and b/icons/obj/guns/projectile/gyropistol.dmi differ diff --git a/icons/obj/guns/projectile/handmade_revolver.dmi b/icons/obj/guns/projectile/handmade_revolver.dmi new file mode 100644 index 0000000000..21827e5020 Binary files /dev/null and b/icons/obj/guns/projectile/handmade_revolver.dmi differ diff --git a/icons/obj/guns/projectile/havelock.dmi b/icons/obj/guns/projectile/havelock.dmi new file mode 100644 index 0000000000..2ea451b7ad Binary files /dev/null and b/icons/obj/guns/projectile/havelock.dmi differ diff --git a/icons/obj/guns/projectile/heavysniper.dmi b/icons/obj/guns/projectile/heavysniper.dmi new file mode 100644 index 0000000000..61a55bee7c Binary files /dev/null and b/icons/obj/guns/projectile/heavysniper.dmi differ diff --git a/icons/obj/guns/projectile/hm_pistol.dmi b/icons/obj/guns/projectile/hm_pistol.dmi new file mode 100644 index 0000000000..0d385b40d6 Binary files /dev/null and b/icons/obj/guns/projectile/hm_pistol.dmi differ diff --git a/icons/obj/guns/projectile/inspector.dmi b/icons/obj/guns/projectile/inspector.dmi new file mode 100644 index 0000000000..710acd8e32 Binary files /dev/null and b/icons/obj/guns/projectile/inspector.dmi differ diff --git a/icons/obj/guns/projectile/kovacs.dmi b/icons/obj/guns/projectile/kovacs.dmi new file mode 100644 index 0000000000..77880066af Binary files /dev/null and b/icons/obj/guns/projectile/kovacs.dmi differ diff --git a/icons/obj/guns/projectile/l6.dmi b/icons/obj/guns/projectile/l6.dmi new file mode 100644 index 0000000000..23b9619d9d Binary files /dev/null and b/icons/obj/guns/projectile/l6.dmi differ diff --git a/icons/obj/guns/projectile/lamia.dmi b/icons/obj/guns/projectile/lamia.dmi new file mode 100644 index 0000000000..4fc6a1e86e Binary files /dev/null and b/icons/obj/guns/projectile/lamia.dmi differ diff --git a/icons/obj/guns/projectile/makarov.dmi b/icons/obj/guns/projectile/makarov.dmi new file mode 100644 index 0000000000..8683648f62 Binary files /dev/null and b/icons/obj/guns/projectile/makarov.dmi differ diff --git a/icons/obj/guns/projectile/mandella.dmi b/icons/obj/guns/projectile/mandella.dmi new file mode 100644 index 0000000000..10e2e5f367 Binary files /dev/null and b/icons/obj/guns/projectile/mandella.dmi differ diff --git a/icons/obj/guns/projectile/mateba.dmi b/icons/obj/guns/projectile/mateba.dmi new file mode 100644 index 0000000000..4f966f1d85 Binary files /dev/null and b/icons/obj/guns/projectile/mateba.dmi differ diff --git a/icons/obj/guns/projectile/maxim.dmi b/icons/obj/guns/projectile/maxim.dmi new file mode 100644 index 0000000000..db8edd125f Binary files /dev/null and b/icons/obj/guns/projectile/maxim.dmi differ diff --git a/icons/obj/guns/projectile/mk58.dmi b/icons/obj/guns/projectile/mk58.dmi new file mode 100644 index 0000000000..6b23ebbb7d Binary files /dev/null and b/icons/obj/guns/projectile/mk58.dmi differ diff --git a/icons/obj/guns/projectile/molly.dmi b/icons/obj/guns/projectile/molly.dmi new file mode 100644 index 0000000000..f13c67ce87 Binary files /dev/null and b/icons/obj/guns/projectile/molly.dmi differ diff --git a/icons/obj/guns/projectile/motherfucker.dmi b/icons/obj/guns/projectile/motherfucker.dmi new file mode 100644 index 0000000000..6ceca33834 Binary files /dev/null and b/icons/obj/guns/projectile/motherfucker.dmi differ diff --git a/icons/obj/guns/projectile/olivawcivil.dmi b/icons/obj/guns/projectile/olivawcivil.dmi new file mode 100644 index 0000000000..c795253561 Binary files /dev/null and b/icons/obj/guns/projectile/olivawcivil.dmi differ diff --git a/icons/obj/guns/projectile/paco.dmi b/icons/obj/guns/projectile/paco.dmi new file mode 100644 index 0000000000..9a185f0933 Binary files /dev/null and b/icons/obj/guns/projectile/paco.dmi differ diff --git a/icons/obj/guns/projectile/pk.dmi b/icons/obj/guns/projectile/pk.dmi new file mode 100644 index 0000000000..117d887c34 Binary files /dev/null and b/icons/obj/guns/projectile/pk.dmi differ diff --git a/icons/obj/guns/projectile/regulator.dmi b/icons/obj/guns/projectile/regulator.dmi new file mode 100644 index 0000000000..3222a018f7 Binary files /dev/null and b/icons/obj/guns/projectile/regulator.dmi differ diff --git a/icons/obj/guns/projectile/revolver.dmi b/icons/obj/guns/projectile/revolver.dmi new file mode 100644 index 0000000000..3ff8ac70b0 Binary files /dev/null and b/icons/obj/guns/projectile/revolver.dmi differ diff --git a/icons/obj/guns/projectile/rocket.dmi b/icons/obj/guns/projectile/rocket.dmi new file mode 100644 index 0000000000..f262b451d3 Binary files /dev/null and b/icons/obj/guns/projectile/rocket.dmi differ diff --git a/icons/obj/guns/projectile/sawnshotgun.dmi b/icons/obj/guns/projectile/sawnshotgun.dmi new file mode 100644 index 0000000000..0e69b1bd8b Binary files /dev/null and b/icons/obj/guns/projectile/sawnshotgun.dmi differ diff --git a/icons/obj/guns/projectile/shotgun.dmi b/icons/obj/guns/projectile/shotgun.dmi new file mode 100644 index 0000000000..b52a4c3185 Binary files /dev/null and b/icons/obj/guns/projectile/shotgun.dmi differ diff --git a/icons/obj/guns/projectile/sky_driver.dmi b/icons/obj/guns/projectile/sky_driver.dmi new file mode 100644 index 0000000000..dc4fb72ba8 Binary files /dev/null and b/icons/obj/guns/projectile/sky_driver.dmi differ diff --git a/icons/obj/guns/projectile/slaught_o_matic.dmi b/icons/obj/guns/projectile/slaught_o_matic.dmi new file mode 100644 index 0000000000..3e4d73503e Binary files /dev/null and b/icons/obj/guns/projectile/slaught_o_matic.dmi differ diff --git a/icons/obj/guns/projectile/slideshotgun.dmi b/icons/obj/guns/projectile/slideshotgun.dmi new file mode 100644 index 0000000000..20666a8795 Binary files /dev/null and b/icons/obj/guns/projectile/slideshotgun.dmi differ diff --git a/icons/obj/guns/projectile/sol.dmi b/icons/obj/guns/projectile/sol.dmi new file mode 100644 index 0000000000..5f132fa389 Binary files /dev/null and b/icons/obj/guns/projectile/sol.dmi differ diff --git a/icons/obj/guns/projectile/straylight.dmi b/icons/obj/guns/projectile/straylight.dmi new file mode 100644 index 0000000000..cce1c89d66 Binary files /dev/null and b/icons/obj/guns/projectile/straylight.dmi differ diff --git a/icons/obj/guns/projectile/sts.dmi b/icons/obj/guns/projectile/sts.dmi new file mode 100644 index 0000000000..8b163cff18 Binary files /dev/null and b/icons/obj/guns/projectile/sts.dmi differ diff --git a/icons/obj/guns/projectile/tk.dmi b/icons/obj/guns/projectile/tk.dmi new file mode 100644 index 0000000000..15866afe7a Binary files /dev/null and b/icons/obj/guns/projectile/tk.dmi differ diff --git a/icons/obj/guns/projectile/vintorez.dmi b/icons/obj/guns/projectile/vintorez.dmi new file mode 100644 index 0000000000..71e92ac85c Binary files /dev/null and b/icons/obj/guns/projectile/vintorez.dmi differ diff --git a/icons/obj/guns/projectile/wintermute.dmi b/icons/obj/guns/projectile/wintermute.dmi new file mode 100644 index 0000000000..961c59ab31 Binary files /dev/null and b/icons/obj/guns/projectile/wintermute.dmi differ diff --git a/icons/obj/guns/projectile/zoric.dmi b/icons/obj/guns/projectile/zoric.dmi new file mode 100644 index 0000000000..58bf19a180 Binary files /dev/null and b/icons/obj/guns/projectile/zoric.dmi differ diff --git a/icons/obj/holoplants.dmi b/icons/obj/holoplants.dmi index aada565b95..abfc706b34 100644 Binary files a/icons/obj/holoplants.dmi and b/icons/obj/holoplants.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index d4de5b0ed4..dc5f5057e6 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/items_vr.dmi b/icons/obj/items_vr.dmi index 6e31f43624..ca82649d88 100644 Binary files a/icons/obj/items_vr.dmi and b/icons/obj/items_vr.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index f79493ec03..84fdd7be13 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ diff --git a/icons/obj/lighting32x64.dmi b/icons/obj/lighting32x64.dmi new file mode 100644 index 0000000000..1fe0dc024b Binary files /dev/null and b/icons/obj/lighting32x64.dmi differ diff --git a/icons/obj/lighting_vr.dmi b/icons/obj/lighting_vr.dmi index 3efeac7784..e6e27c57a4 100644 Binary files a/icons/obj/lighting_vr.dmi and b/icons/obj/lighting_vr.dmi differ diff --git a/icons/obj/machines/mining_machines_vr.dmi b/icons/obj/machines/mining_machines_vr.dmi index 60d9beb1f3..799aad0808 100644 Binary files a/icons/obj/machines/mining_machines_vr.dmi and b/icons/obj/machines/mining_machines_vr.dmi differ diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index 9b2b72e279..0d1d14c56e 100644 Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ diff --git a/icons/obj/monitors_vr.dmi b/icons/obj/monitors_vr.dmi index e309ee484c..8f225dcf72 100644 Binary files a/icons/obj/monitors_vr.dmi and b/icons/obj/monitors_vr.dmi differ diff --git a/icons/obj/overmap.dmi b/icons/obj/overmap.dmi index d46f1065f2..348ad77da4 100644 Binary files a/icons/obj/overmap.dmi and b/icons/obj/overmap.dmi differ diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi index c565483599..68fe43fbf2 100644 Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ diff --git a/icons/obj/radio_vr.dmi b/icons/obj/radio_vr.dmi index 2df2bba182..480e3bcbff 100644 Binary files a/icons/obj/radio_vr.dmi and b/icons/obj/radio_vr.dmi differ diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index ebf7292781..a0088064db 100644 Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ diff --git a/icons/obj/recycling.dmi b/icons/obj/recycling.dmi index 024db3109a..eea7e7aaff 100644 Binary files a/icons/obj/recycling.dmi and b/icons/obj/recycling.dmi differ diff --git a/icons/obj/singularity.dmi b/icons/obj/singularity.dmi index cc0156de46..5a5502b3c1 100644 Binary files a/icons/obj/singularity.dmi and b/icons/obj/singularity.dmi differ diff --git a/icons/obj/sofas.dmi b/icons/obj/sofas.dmi index c495452dbc..21de5449ea 100644 Binary files a/icons/obj/sofas.dmi and b/icons/obj/sofas.dmi differ diff --git a/icons/obj/stock_parts.dmi b/icons/obj/stock_parts.dmi index 8750603de4..64184432c7 100644 Binary files a/icons/obj/stock_parts.dmi and b/icons/obj/stock_parts.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index dbd17cc7f4..4bcc601e70 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index 750cf75768..565190a6dd 100644 Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ diff --git a/icons/obj/supermatter.dmi b/icons/obj/supermatter.dmi new file mode 100644 index 0000000000..ba52646d2d Binary files /dev/null and b/icons/obj/supermatter.dmi differ diff --git a/icons/obj/terminals_vr.dmi b/icons/obj/terminals_vr.dmi index 1f1376d1b3..5475ea549f 100644 Binary files a/icons/obj/terminals_vr.dmi and b/icons/obj/terminals_vr.dmi differ diff --git a/icons/obj/tools_vr.dmi b/icons/obj/tools_vr.dmi index 09ea41426a..c49a991ff9 100644 Binary files a/icons/obj/tools_vr.dmi and b/icons/obj/tools_vr.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 33f220896e..b7235b7e58 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 76f60a84ce..186a787734 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ diff --git a/icons/obj/uav.dmi b/icons/obj/uav.dmi index daae9a03da..1b21e6f4ed 100644 Binary files a/icons/obj/uav.dmi and b/icons/obj/uav.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index f03f9c56d8..46212224b4 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/icons/obj/vending_job.dmi b/icons/obj/vending_job.dmi new file mode 100644 index 0000000000..77d22e3dd1 Binary files /dev/null and b/icons/obj/vending_job.dmi differ diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi index 0a5aeb5b44..8495d83917 100644 Binary files a/icons/obj/watercloset.dmi and b/icons/obj/watercloset.dmi differ diff --git a/icons/obj/zippo.dmi b/icons/obj/zippo.dmi index 65deebfb46..0d4416cc64 100644 Binary files a/icons/obj/zippo.dmi and b/icons/obj/zippo.dmi differ diff --git a/icons/turf/flooring/eris/circuit.dmi b/icons/turf/flooring/eris/circuit.dmi new file mode 100644 index 0000000000..e5cd8814db Binary files /dev/null and b/icons/turf/flooring/eris/circuit.dmi differ diff --git a/icons/turf/flooring/eris/derelict.dmi b/icons/turf/flooring/eris/derelict.dmi new file mode 100644 index 0000000000..659dc8e601 Binary files /dev/null and b/icons/turf/flooring/eris/derelict.dmi differ diff --git a/maps/expedition_vr/aerostat/_aerostat.dm b/maps/expedition_vr/aerostat/_aerostat.dm index a89ff259c3..c645397cc2 100644 --- a/maps/expedition_vr/aerostat/_aerostat.dm +++ b/maps/expedition_vr/aerostat/_aerostat.dm @@ -8,10 +8,11 @@ [i]Habitability[/i]: Low (High Temperature, Toxic Atmosphere) [b]Notice[/b]: Planetary environment not suitable for life. Landing may be hazardous."} icon_state = "globe" - color = "#dfff3f" //Bright yellow in_space = 0 initial_generic_waypoints = list("aerostat_west","aerostat_east","aerostat_south","aerostat_northwest","aerostat_northeast") extra_z_levels = list(Z_LEVEL_AEROSTAT_SURFACE) + known = TRUE + icon_state = "chlorine" // -- Datums -- // diff --git a/maps/expedition_vr/alienship/_alienship.dm b/maps/expedition_vr/alienship/_alienship.dm index 9646dd12de..890f1e5c77 100644 --- a/maps/expedition_vr/alienship/_alienship.dm +++ b/maps/expedition_vr/alienship/_alienship.dm @@ -1,12 +1,13 @@ // -- Datums -- // /obj/effect/overmap/visitable/sector/alienship - name = "Unknown Vessel" + name = "precursor vessel" + icon_state = "unkn_o" + unknown_state = "ship" desc = "An unknown vessel detected by sensors." start_x = 12 start_y = 12 icon_state = "ship" - color = "#ff00ff" //Sandy initial_generic_waypoints = list("tether_excursion_alienship") // -- Objs -- // diff --git a/maps/expedition_vr/beach/_beach.dm b/maps/expedition_vr/beach/_beach.dm index 5817cabc5f..4dcd16364b 100644 --- a/maps/expedition_vr/beach/_beach.dm +++ b/maps/expedition_vr/beach/_beach.dm @@ -8,10 +8,11 @@ [i]Habitability[/i]: Moderate (High Temperature) [b]Notice[/b]: Request authorization from planetary authorities before attempting to construct settlements"} icon_state = "globe" - color = "#ffd300" //Sandy in_space = 0 initial_generic_waypoints = list("beach_e", "beach_c", "beach_nw") extra_z_levels = list(Z_LEVEL_BEACH_CAVE) + known = TRUE + icon_state = "desert" //This is a special subtype of the thing that generates ores on a map //It will generate more rich ores because of the lower numbers than the normal one diff --git a/maps/expedition_vr/space/_debrisfield.dm b/maps/expedition_vr/space/_debrisfield.dm index cf63350a59..6fe07d2cb9 100644 --- a/maps/expedition_vr/space/_debrisfield.dm +++ b/maps/expedition_vr/space/_debrisfield.dm @@ -9,6 +9,7 @@ known = FALSE color = "#ee3333" //Redish, so it stands out against the other debris-like icons initial_generic_waypoints = list("debrisfield_se", "debrisfield_nw") + icon_state = "spacehulk_g" // -- Objs -- // @@ -146,7 +147,7 @@ . = ..() /obj/effect/overmap/visitable/ship/landable/tinycarrier - scanner_name = "TBD" + name = "TBD" scanner_desc = "TBD" vessel_mass = 12000 vessel_size = SHIP_SIZE_SMALL @@ -156,7 +157,7 @@ . = ..() var/datum/lore/organization/O = loremaster.organizations[/datum/lore/organization/other/sysdef] var/newname = "SDV [pick(O.ship_names)]" - scanner_name = newname + name = newname scanner_desc = {"\[i\]Registration\[/i\]: [newname] \[i\]Class\[/i\]: Light Escort Carrier \[i\]Transponder\[/i\]: Transmitting (MIL), Weak Signal diff --git a/maps/expedition_vr/space/_fueldepot.dm b/maps/expedition_vr/space/_fueldepot.dm index 1b31997bbc..0b8aa3b1e8 100644 --- a/maps/expedition_vr/space/_fueldepot.dm +++ b/maps/expedition_vr/space/_fueldepot.dm @@ -9,6 +9,9 @@ icon_state = "fueldepot" color = "#33FF33" initial_generic_waypoints = list("fueldepot_east","fueldepot_west","fueldepot_north","fueldepot_south") + unknown_state = "station" + known = TRUE + icon_state = "fueldepot_g" /area/tether_away/fueldepot name = "Away Mission - Fuel Depot" diff --git a/maps/gateway_vr/carpfarm.dm b/maps/gateway_vr/carpfarm.dm index 54195554f9..281ff2e01b 100644 --- a/maps/gateway_vr/carpfarm.dm +++ b/maps/gateway_vr/carpfarm.dm @@ -1,6 +1,6 @@ /obj/effect/overmap/visitable/sector/tether_gateway/carpfarm initial_generic_waypoints = list("carpfarm1", "carpfarm2") - scanner_name = "Carp-Infested Outpost" + name = "Carp-Infested Outpost" scanner_desc = @{"[i]Registration[/i]: UNKNOWN [i]Class[/i]: Installation [i]Transponder[/i]: None Detected diff --git a/maps/gateway_vr/listeningpost.dm b/maps/gateway_vr/listeningpost.dm index 07683dd19e..c3badad0e3 100644 --- a/maps/gateway_vr/listeningpost.dm +++ b/maps/gateway_vr/listeningpost.dm @@ -1,6 +1,6 @@ /obj/effect/overmap/visitable/sector/tether_gateway/listeningpost initial_generic_waypoints = list("tether_excursion_listeningpost") - scanner_name = "Strange Asteroid" + name = "Strange Asteroid" scanner_desc = @{"[i]Registration[/i]: UNKNOWN [i]Class[/i]: Wreckage [i]Transponder[/i]: None Detected"} diff --git a/maps/gateway_vr/snow_outpost.dm b/maps/gateway_vr/snow_outpost.dm index a77c03451f..c840ce401a 100644 --- a/maps/gateway_vr/snow_outpost.dm +++ b/maps/gateway_vr/snow_outpost.dm @@ -1,7 +1,7 @@ /obj/effect/overmap/visitable/sector/tether_gateway/snowoutpost initial_generic_waypoints = list("tether_excursion_snow_outpost") in_space = 0 - scanner_name = "Snowy Outpost" + name = "Snowy Outpost" scanner_desc = @{"[i]Stellar Body[/i]>: UNKNOWN [i]Class[/i]>: M-Class Planetoid [i]Habitability[/i]>: Moderate (Low Temperature) diff --git a/maps/gateway_vr/snowfield.dm b/maps/gateway_vr/snowfield.dm index a2116137a6..fc68f82aa9 100644 --- a/maps/gateway_vr/snowfield.dm +++ b/maps/gateway_vr/snowfield.dm @@ -1,11 +1,14 @@ /obj/effect/overmap/visitable/sector/tether_gateway/snowfield initial_generic_waypoints = list("tether_excursion_snowfield") in_space = 0 - scanner_name = "Snowy Field" + name = "Snowy Field" scanner_desc = @{"[i]Stellar Body[/i]: UNKNOWN [i]Class[/i]: M-Class Planetoid [i]Habitability[/i]: Moderate (Low Temperature) [b]Notice[/b]: Very cold atmosphere, minimal life signs detected"} + unknown_state = "planet" + known = FALSE + icon_state = "frozen" // -- Areas -- // diff --git a/maps/gateway_vr/variable/arynthilake.dm b/maps/gateway_vr/variable/arynthilake.dm index a1f414b3da..e710acf305 100644 --- a/maps/gateway_vr/variable/arynthilake.dm +++ b/maps/gateway_vr/variable/arynthilake.dm @@ -4,8 +4,9 @@ scanner_desc = @{"It is difficult to tell just what is beyond this strange shimmering shape. The air beyond seems breathable."} icon = 'icons/obj/overmap_vr.dmi' icon_state = "shimmer" - color = "#171DFF" //bloo in_space = 0 + unknown_state = "field" + known = FALSE /datum/map_template/tether_lateload/gateway/arynthilake/on_map_loaded(z) . = ..() diff --git a/maps/gateway_vr/variable/arynthilake_a.dmm b/maps/gateway_vr/variable/arynthilake_a.dmm index 03fa9a9ce3..2c982bab65 100644 --- a/maps/gateway_vr/variable/arynthilake_a.dmm +++ b/maps/gateway_vr/variable/arynthilake_a.dmm @@ -1006,7 +1006,7 @@ /area/gateway/arynthilake/engine) "pa" = ( /obj/random/mob/semirandom_mob_spawner/monster, -/turf/simulated/floor/tiled/eris/white/brown_platform{ +/turf/simulated/floor/tiled/eris/dark/brown_platform{ outdoors = 1 }, /area/gateway/arynthilake/dome) @@ -1238,6 +1238,11 @@ "tN" = ( /turf/simulated/floor/outdoors/grass, /area/gateway/arynthilake/caves) +"tS" = ( +/turf/simulated/floor/tiled/eris/dark/brown_platform{ + outdoors = 1 + }, +/area/gateway/arynthilake/dome) "tU" = ( /obj/structure/table/steel_reinforced, /obj/machinery/reagentgrinder, @@ -2256,10 +2261,6 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/gateway/arynthilake/dome) -"TI" = ( -/obj/random/mob/semirandom_mob_spawner/monster, -/turf/simulated/floor/tiled/eris/dark/monofloor, -/area/gateway/arynthilake/dome) "TR" = ( /turf/unsimulated/wall/planetary/normal{ desc = "Why would you want to go this way??!?"; @@ -5623,7 +5624,7 @@ qM bc bc bc -pb +tS yY hw fo @@ -5765,7 +5766,7 @@ aZ bc wm bc -pb +tS yY hw fo @@ -6333,7 +6334,7 @@ qM At Rm Er -pb +tS yY Nm Nm @@ -6475,7 +6476,7 @@ qM zQ zQ Er -pb +tS yY Nm Nm @@ -6611,7 +6612,7 @@ Qr Qr qM vG -TI +aY Vo qM AQ diff --git a/maps/gateway_vr/variable/arynthilake_b.dmm b/maps/gateway_vr/variable/arynthilake_b.dmm index 0b1878a26e..a56a67f1b3 100644 --- a/maps/gateway_vr/variable/arynthilake_b.dmm +++ b/maps/gateway_vr/variable/arynthilake_b.dmm @@ -29,10 +29,6 @@ }, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) -"bb" = ( -/obj/random/mob/semirandom_mob_spawner/monster/d, -/turf/simulated/floor/tiled/eris/dark/monofloor, -/area/gateway/arynthilake/dome) "bj" = ( /obj/machinery/light{ dir = 1 @@ -978,6 +974,11 @@ outdoors = 1 }, /area/gateway/arynthilake) +"tC" = ( +/turf/simulated/floor/tiled/eris/dark/brown_platform{ + outdoors = 1 + }, +/area/gateway/arynthilake/dome) "uj" = ( /obj/random/mob/semirandom_mob_spawner/humanoid, /turf/simulated/floor/carpet/sblucarpet, @@ -18089,7 +18090,7 @@ Qm Xz Xz HN -Kw +tC Ia lQ lQ @@ -18225,13 +18226,13 @@ ek ek Qm JT -bb +JT mq Qm kv kv Fi -Kw +tC Ia lQ lQ @@ -18373,7 +18374,7 @@ Qm qy RK Fi -Kw +tC Ia lQ lQ @@ -18941,7 +18942,7 @@ Dk nP nP nP -Kw +tC Ia nC iG @@ -19083,7 +19084,7 @@ Qm nP nP HN -Kw +tC Ia nC iG diff --git a/maps/gateway_vr/variable/arynthilakeunderground_b.dmm b/maps/gateway_vr/variable/arynthilakeunderground_b.dmm index fea5581135..8755d3a2a5 100644 --- a/maps/gateway_vr/variable/arynthilakeunderground_b.dmm +++ b/maps/gateway_vr/variable/arynthilakeunderground_b.dmm @@ -139,10 +139,6 @@ /area/gateway/arynthilake/underground/intocave{ enter_message = "There is some light filtering from the center of this patch of sand. You could probably climb up from there." }) -"ni" = ( -/obj/random/mob/semirandom_mob_spawner/robot, -/turf/simulated/floor/tiled/eris/steel/danger, -/area/gateway/arynthilake/engine) "oL" = ( /turf/simulated/floor/tiled/eris/steel/techfloor, /area/gateway/arynthilake/engine) @@ -197,10 +193,6 @@ "wi" = ( /turf/simulated/wall/r_wall, /area/gateway/arynthilake/underground/maintenance) -"wG" = ( -/obj/random/mob/semirandom_mob_spawner/robot, -/turf/simulated/floor/tiled/eris/steel/techfloor, -/area/gateway/arynthilake/engine) "xl" = ( /obj/random/awayloot, /obj/structure/table/rack/shelf/steel, @@ -442,7 +434,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/random/mob/semirandom_mob_spawner/robot, /turf/simulated/floor/tiled/eris/steel/techfloor, /area/gateway/arynthilake/engine) "ZX" = ( @@ -915,7 +906,7 @@ oZ oZ oZ oZ -cE +oZ oZ wi oZ @@ -2026,9 +2017,9 @@ bL bL bL kb -ni +fM Zl -ni +fM kb bL bL @@ -3480,7 +3471,7 @@ oZ oZ oZ oZ -cE +oZ cH Oe wi @@ -4162,7 +4153,7 @@ hy kb gk oL -wG +oL va kb bL @@ -4882,16 +4873,6 @@ oZ oZ wi oZ -oZ -oZ -oZ -oZ -oZ -oZ -oZ -oZ -oZ -oZ cE oZ oZ @@ -4900,6 +4881,16 @@ oZ oZ oZ oZ +oZ +oZ +oZ +oZ +oZ +oZ +oZ +oZ +oZ +oZ Ej wi bL @@ -5040,7 +5031,7 @@ oZ oZ oZ oZ -oZ +cE oZ Oe wi @@ -5174,7 +5165,7 @@ wi wi wi wi -cE +oZ oZ oZ oZ @@ -6057,7 +6048,7 @@ oZ wi oZ oZ -ID +oZ oZ oZ wi @@ -6471,7 +6462,7 @@ oZ oZ oZ oZ -ID +oZ Vj oZ oZ @@ -7431,7 +7422,7 @@ wi Mg oZ oZ -cE +oZ oZ oZ oZ @@ -12571,7 +12562,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -12865,7 +12856,7 @@ oZ oZ Vj oZ -LQ +oZ oZ oZ oZ @@ -14277,7 +14268,7 @@ oZ oZ wi wi -LQ +oZ oZ oZ wi @@ -15390,7 +15381,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ wi @@ -19999,7 +19990,7 @@ oZ oZ Vj oZ -LQ +oZ oZ oZ oZ diff --git a/maps/gateway_vr/variable/honlethhighlands.dm b/maps/gateway_vr/variable/honlethhighlands.dm index 526cfb3a8e..9eb1104f22 100644 --- a/maps/gateway_vr/variable/honlethhighlands.dm +++ b/maps/gateway_vr/variable/honlethhighlands.dm @@ -6,6 +6,7 @@ icon_state = "shimmer" color = "#171DFF" //bloo in_space = 0 + unknown_state = "field" /datum/map_template/tether_lateload/gateway/honlethhighlands_a/on_map_loaded(z) . = ..() diff --git a/maps/gateway_vr/wildwest.dm b/maps/gateway_vr/wildwest.dm index 36317745d6..632c98c171 100644 --- a/maps/gateway_vr/wildwest.dm +++ b/maps/gateway_vr/wildwest.dm @@ -184,4 +184,7 @@ icon = 'icons/obj/overmap_vr.dmi' icon_state = "shimmer" color = "#8b0b0b" //red - in_space = 1 \ No newline at end of file + in_space = 1 + unknown_state = "field" + known = FALSE + \ No newline at end of file diff --git a/maps/gateway_vr/wildwest.dmm b/maps/gateway_vr/wildwest.dmm index 5d1c592ea6..c301808b40 100644 --- a/maps/gateway_vr/wildwest.dmm +++ b/maps/gateway_vr/wildwest.dmm @@ -1,13 +1,76 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( +/obj/effect/forcefield{ + desc = "You can't get in. Heh."; + layer = 1; + name = "Blocker" + }, /turf/space, -/area) +/area/space) "ab" = ( /turf/simulated/shuttle/wall, /area/awaymission/wwvault) +"ac" = ( +/turf/simulated/shuttle/wall/hard_corner, +/area/space) +"ad" = ( +/turf/simulated/mineral, +/area/space) +"ae" = ( +/obj/effect/forcefield{ + desc = "You can't get in. Heh."; + layer = 1; + name = "Blocker" + }, +/turf/simulated/mineral, +/area/space) +"af" = ( +/obj/structure/lattice, +/turf/space, +/area/space) +"ag" = ( +/obj/structure/window/reinforced{ + health = 1e+007 + }, +/turf/space, +/area/space) "ah" = ( /turf/simulated/wall/cult, /area/awaymission/wwvault) +"ai" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced{ + health = 1e+007 + }, +/turf/space, +/area/space) +"aj" = ( +/obj/effect/floor_decal/corner/lightgrey/diagonal, +/mob/living/simple_mob/humanoid/merc/ranged, +/turf/simulated/floor/tiled/white, +/area/awaymission/wwmines) +"ak" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+007 + }, +/turf/space, +/area/space) +"al" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+007 + }, +/turf/space, +/area/space) +"am" = ( +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+007 + }, +/turf/space, +/area/space) "an" = ( /obj/structure/cult/pylon, /turf/simulated/floor/cult, @@ -27,6 +90,19 @@ }, /turf/simulated/wall/cult, /area/awaymission/wwvault) +"aq" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+007 + }, +/turf/space, +/area/space) +"ar" = ( +/obj/structure/lattice, +/obj/structure/lattice, +/turf/space, +/area/space) "as" = ( /obj/effect/gateway, /turf/simulated/floor/cult, @@ -50,6 +126,13 @@ /obj/machinery/gear_dispenser/adventure_box/weapon, /turf/simulated/floor/redgrid/off, /area/awaymission/wwvault) +"ax" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/mob/living/simple_mob/creature, +/turf/simulated/floor/tiled/eris/cafe, +/area/awaymission/wwgov) "ay" = ( /obj/machinery/gateway{ dir = 9 @@ -72,20 +155,66 @@ /mob/living/simple_mob/faithless, /turf/simulated/floor/cult, /area/awaymission/wwvault) +"aC" = ( +/obj/structure/window/reinforced{ + dir = 1; + health = 1e+007 + }, +/turf/space, +/area/space) +"aD" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced{ + dir = 1; + health = 1e+007 + }, +/turf/space, +/area/space) +"aE" = ( +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+007 + }, +/obj/structure/window/reinforced{ + dir = 1; + health = 1e+007 + }, +/turf/space, +/area/space) "aF" = ( /turf/simulated/floor/cult, /area/awaymission/wwvault) "aG" = ( -/turf/simulated/mineral, -/area) -"aH" = ( -/obj/effect/forcefield{ - desc = "You can't get in. Heh."; - layer = 1; - name = "Blocker" +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+007 + }, +/obj/structure/window/reinforced{ + dir = 1; + health = 1e+007 }, /turf/space, -/area) +/area/space) +"aH" = ( +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+007 + }, +/obj/structure/window/reinforced{ + health = 1e+007 + }, +/turf/space, +/area/space) +"aI" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+007 + }, +/obj/structure/window/reinforced{ + health = 1e+007 + }, +/turf/space, +/area/space) "aJ" = ( /obj/item/weapon/paper{ info = "meat grinder requires sacri" @@ -109,9 +238,19 @@ }, /turf/simulated/mineral, /area/awaymission/wwmines) +"aM" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+007 + }, +/turf/simulated/floor/airless, +/area/space) "aN" = ( /turf/simulated/mineral, /area/awaymission/wwmines) +"aO" = ( +/turf/simulated/floor/airless, +/area/space) "aP" = ( /obj/random/awayloot, /turf/simulated/floor/redgrid/off, @@ -149,10 +288,6 @@ /obj/effect/floor_decal/corner/lightgrey/diagonal, /turf/simulated/floor/tiled/white, /area/awaymission/wwmines) -"br" = ( -/obj/structure/lattice, -/turf/space, -/area) "bt" = ( /obj/effect/forcefield{ desc = "You can't get in. Heh."; @@ -217,13 +352,6 @@ "bY" = ( /turf/simulated/floor/carpet, /area/awaymission/wwgov) -"bZ" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+007 - }, -/turf/space, -/area) "ca" = ( /obj/machinery/gibber, /turf/simulated/floor/redgrid/off, @@ -480,19 +608,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/white, /area/awaymission/wwmines) -"ex" = ( -/obj/structure/window/reinforced{ - health = 1e+007 - }, -/turf/space, -/area) -"ey" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced{ - health = 1e+007 - }, -/turf/space, -/area) "eC" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/floor_decal/corner/lightgrey/diagonal, @@ -505,11 +620,6 @@ }, /turf/simulated/floor/tiled/white, /area/awaymission/wwmines) -"eE" = ( -/mob/living/simple_mob/humanoid/merc/ranged, -/obj/effect/floor_decal/corner/lightgrey/diagonal, -/turf/simulated/floor/tiled/white, -/area/awaymission/wwmines) "eI" = ( /obj/structure/closet/cabinet, /turf/simulated/floor/wood, @@ -525,9 +635,6 @@ /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/awaymission/wwmines) -"eN" = ( -/turf/simulated/floor/airless, -/area) "eO" = ( /obj/structure/ore_box, /turf/simulated/floor/outdoors/ironsand, @@ -644,13 +751,6 @@ /mob/living/simple_mob/humanoid/merc/melee, /turf/simulated/floor/wood, /area/awaymission/wwmines) -"fv" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 1e+007 - }, -/turf/space, -/area) "fy" = ( /obj/machinery/door/window{ dir = 1 @@ -736,9 +836,7 @@ /turf/simulated/floor/wood, /area/awaymission/wwmines) "fW" = ( -/obj/structure/bookcase{ - = on_state = "book-5" - }, +/obj/structure/bookcase, /turf/simulated/floor/wood, /area/awaymission/wwgov) "fY" = ( @@ -802,13 +900,6 @@ }, /turf/simulated/floor/wood, /area/awaymission/wwgov) -"gn" = ( -/obj/structure/window/reinforced{ - dir = 1; - health = 1e+007 - }, -/turf/space, -/area) "go" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -824,9 +915,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwgov) "gs" = ( -/obj/structure/bookcase{ - = on_state = "book-5" - }, +/obj/structure/bookcase, /turf/simulated/floor/wood, /area/awaymission/wwmines) "gt" = ( @@ -856,11 +945,6 @@ /mob/living/simple_mob/creature, /turf/simulated/floor/carpet, /area/awaymission/wwgov) -"gC" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/space, -/area) "gE" = ( /obj/structure/bed/chair/wood/wings{ dir = 4 @@ -919,14 +1003,6 @@ }, /turf/simulated/floor/wood, /area/awaymission/wwmines) -"gX" = ( -/obj/effect/forcefield{ - desc = "You can't get in. Heh."; - layer = 1; - name = "Blocker" - }, -/turf/simulated/mineral, -/area) "gY" = ( /obj/structure/bed/chair/comfy/teal{ dir = 8 @@ -971,14 +1047,8 @@ /turf/simulated/floor/carpet, /area/awaymission/wwmines) "ia" = ( -/obj/effect/forcefield{ - desc = "You can't get in. Heh."; - layer = 1; - name = "Blocker" - }, -/obj/effect/overmap/visitable/sector/tether_gateway/wildwest, /turf/space, -/area) +/area/space) "iA" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -1122,13 +1192,6 @@ /obj/structure/fans/tiny, /turf/simulated/floor/tiled/asteroid_steel, /area/awaymission/wwgov) -"pc" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+007 - }, -/turf/simulated/floor/airless, -/area) "pg" = ( /obj/structure/table/woodentable, /obj/item/toy/russian_revolver, @@ -1150,16 +1213,6 @@ oxygen = 0 }, /area/awaymission/wwvault) -"pM" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+007 - }, -/obj/structure/window/reinforced{ - health = 1e+007 - }, -/turf/space, -/area) "pN" = ( /obj/machinery/door/airlock/external, /obj/structure/fans/tiny, @@ -1423,17 +1476,6 @@ /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/wood, /area/awaymission/wwmines) -"zr" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+007 - }, -/obj/structure/window/reinforced{ - dir = 1; - health = 1e+007 - }, -/turf/space, -/area) "zt" = ( /obj/structure/cult/pylon, /turf/simulated/floor/redgrid/animated, @@ -1465,14 +1507,6 @@ /obj/item/weapon/reagent_containers/food/snacks/donut/jelly, /turf/simulated/floor/carpet, /area/awaymission/wwmines) -"Ag" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+007 - }, -/turf/space, -/area) "AA" = ( /obj/machinery/light/small{ dir = 8 @@ -1541,17 +1575,6 @@ }, /turf/simulated/floor/wood, /area/awaymission/wwmines) -"Dy" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 1e+007 - }, -/obj/structure/window/reinforced{ - dir = 1; - health = 1e+007 - }, -/turf/space, -/area) "Ee" = ( /obj/effect/floor_decal/corner/lightgrey/diagonal, /obj/machinery/light/small, @@ -1757,16 +1780,6 @@ }, /turf/simulated/floor/grass, /area/awaymission/wwgov) -"JQ" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 1e+007 - }, -/obj/structure/window/reinforced{ - health = 1e+007 - }, -/turf/space, -/area) "JS" = ( /obj/structure/sign/double/maltesefalcon/right, /turf/simulated/wall/sandstone, @@ -1846,9 +1859,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/asteroid_steel, /area/awaymission/wwrefine) -"NY" = ( -/turf/simulated/shuttle/wall/hard_corner, -/area) "Oe" = ( /obj/machinery/light/small{ dir = 1 @@ -2001,13 +2011,6 @@ /obj/structure/sign/double/maltesefalcon/left, /turf/simulated/wall/sandstone, /area/awaymission/wwmines) -"Sy" = ( -/mob/living/simple_mob/creature, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/cafe, -/area/awaymission/wwgov) "SC" = ( /obj/structure/bed/chair/comfy/beige{ dir = 4 @@ -2066,14 +2069,6 @@ }, /turf/simulated/floor/tiled/white, /area/awaymission/wwmines) -"Vg" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced{ - dir = 1; - health = 1e+007 - }, -/turf/space, -/area) "Vn" = ( /obj/structure/toilet{ dir = 1 @@ -2124,14 +2119,6 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwmines) -"Xs" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced{ - dir = 4; - health = 1e+007 - }, -/turf/space, -/area) "XP" = ( /turf/simulated/shuttle/wall, /area/awaymission/wwrefine) @@ -2201,397 +2188,397 @@ /area/awaymission/wwgov) (1,1,1) = {" -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -ia +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +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) = {" -aH aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +af +af +ar +af +af +af +af +af +af +af +af +af +ia +af +af +ia +ia +ia +ia +ia +ia +ia +ia +am +am +am +am +am +am +am +am +am +am +am +am +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -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 -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -br -br -gC -br -br -br -br -br -br -br -br -br -aa -br -br -aa -aa -aa -aa -aa -aa -aa -aa -fv -fv -fv -fv -fv -fv -fv -fv -fv -fv -fv -fv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (3,1,1) = {" -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 -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -br -br -br -br -aa -aa -aa -br -aa -aa -br -aa -br -br -aa -aa -br -br -br -br -br -aa -aa -aa -aa -aa -aa -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +af +af +af +af +ia +ia +ia +af +ia +ia +af +ia +af +af +ia +ia +af +af +af +af +af +ia +ia +ia +ia +ia +ia +ag yf Sd Sd @@ -2604,136 +2591,136 @@ Sd Sd Sd QR -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (4,1,1) = {" -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 -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -Xs -fv -fv -fv -fv -Xs -fv -fv -Xs -Xs -fv -fv -fv -fv -fv -Xs -Xs -fv -fv -fv -aa -aa -br -aa -aa -aa -aa -aa -aa -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ak +am +am +am +am +ak +am +am +ak +ak +am +am +am +am +am +ak +ak +am +am +am +ia +ia +af +ia +ia +ia +ia +ia +ia +ag Ui fL fL @@ -2746,106 +2733,106 @@ fL fL fL Em -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (5,1,1) = {" -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 -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ag cx OU fH @@ -2866,16 +2853,16 @@ fH fH gF cx -gn -aa -br -br -aa -aa -aa -aa -aa -ex +aC +ia +af +af +ia +ia +ia +ia +ia +ag lI wa fL @@ -2888,106 +2875,106 @@ fL wa fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (6,1,1) = {" -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 -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ai fi dh dh @@ -3008,16 +2995,16 @@ dh dh dh fi -gn -aa -aa -br -aa -aa -aa -aa -aa -ex +aC +ia +ia +af +ia +ia +ia +ia +ia +ag lI wa fL @@ -3030,106 +3017,106 @@ fL wa fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (7,1,1) = {" -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 -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ai fm dh cx @@ -3150,16 +3137,16 @@ dh dh dh fm -gn -aa -aa -br -aa -aa -aa -aa -aa -ex +aC +ia +ia +af +ia +ia +ia +ia +ia +ag lI wa fL @@ -3172,106 +3159,106 @@ fL wa fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (8,1,1) = {" -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 -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ai fm dh cx @@ -3292,16 +3279,16 @@ dh dh dh fm -gn -aa -aa -br -aa -aa -aa -aa -aa -ex +aC +ia +ia +af +ia +ia +ia +ia +ia +ag lI wa fL @@ -3314,106 +3301,106 @@ fL wa fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (9,1,1) = {" -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 -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ai fm dh cx @@ -3434,16 +3421,16 @@ cx cx dh fm -gn -aa -aa -br -aa -aa -aa -aa -aa -ex +aC +ia +ia +af +ia +ia +ia +ia +ia +ag lI wa fL @@ -3456,106 +3443,106 @@ fL wa fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (10,1,1) = {" -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 -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ai fm dh cx @@ -3576,16 +3563,16 @@ Hi hD cL fm -gn -aa -aa -br -aa -aa -aa -aa -aa -ex +aC +ia +ia +af +ia +ia +ia +ia +ia +ag Ui fL fL @@ -3598,106 +3585,106 @@ fL fL fL Em -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (11,1,1) = {" -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 -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ai fm dh cx @@ -3718,16 +3705,16 @@ cx cx dh fm -gn -aa -aa -br -aa -aa -aa -aa -aa -ex +aC +ia +ia +af +ia +ia +ia +ia +ia +ag lI fL fL @@ -3740,106 +3727,106 @@ fL fL Fz OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (12,1,1) = {" -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 -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -3860,16 +3847,16 @@ dh dh dh fm -gn -aa -br -br -aa -aa -aa -aa -aa -ex +aC +ia +af +af +ia +ia +ia +ia +ia +ag lI fL fL @@ -3882,106 +3869,106 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (13,1,1) = {" -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 -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -4002,16 +3989,16 @@ dh dh dh fm -gn -br -br -aa -aa -aa -aa -aa -aa -ex +aC +af +af +ia +ia +ia +ia +ia +ia +ag lI fL fL @@ -4024,106 +4011,106 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (14,1,1) = {" -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 -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -4144,16 +4131,16 @@ dh dh dh fm -gn -br -aa -aa -aa -aa -aa -aa -aa -ex +aC +af +ia +ia +ia +ia +ia +ia +ia +ag lI fL fL @@ -4166,106 +4153,106 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (15,1,1) = {" -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 -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -4286,16 +4273,16 @@ dh dh dh fm -gn -br -aa -aa -aa -aa -aa -aa -aa -ex +aC +af +ia +ia +ia +ia +ia +ia +ia +ag lI fL fL @@ -4308,106 +4295,106 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (16,1,1) = {" -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 -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -4428,16 +4415,16 @@ dh dh dh fm -Vg -br -aa -aa -aa -aa -aa -aa -aa -ex +aD +af +ia +ia +ia +ia +ia +ia +ia +ag lI fL fL @@ -4450,106 +4437,106 @@ fK fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (17,1,1) = {" -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 +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au au au au +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ai fm dh cx @@ -4570,16 +4557,16 @@ dh dh dh xy -Dy -fv -fv -fv -fv -fv -fv -fv -fv -JQ +aE +am +am +am +am +am +am +am +am +aH Ui fL fL @@ -4592,71 +4579,71 @@ fL fL fL Em -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (18,1,1) = {" -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 +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au au au -aa -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia +ia au au aF @@ -4664,34 +4651,34 @@ aF aF au au +ia +ia +ia +ia aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ai fm dh cx @@ -4734,56 +4721,56 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (19,1,1) = {" -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 +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au au @@ -4791,14 +4778,14 @@ aF aF au au -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -4806,34 +4793,34 @@ ah aF aF au +ia +ia +ia +ia aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -4876,55 +4863,55 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (20,1,1) = {" -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 +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au aF @@ -4934,13 +4921,13 @@ aF aF au au -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia au aF ah @@ -4954,28 +4941,28 @@ au au bt wj -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ag fm dh cx @@ -4996,16 +4983,16 @@ dh dh dh fi -zr -bZ -bZ -bZ -bZ -bZ -bZ -bZ -bZ -pM +aG +al +al +al +al +al +al +al +al +aI lI fL fL @@ -5018,55 +5005,55 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (21,1,1) = {" -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 +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au aF @@ -5077,12 +5064,12 @@ aF aF au au -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia au aF aF @@ -5096,28 +5083,28 @@ aF aF ah wj -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -aa -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ia +ag fm dh cx @@ -5138,16 +5125,16 @@ dh dh dh fm -gn -aa -aa -aa -aa -aa -aa -aa -aa -ex +aC +ia +ia +ia +ia +ia +ia +ia +ia +ag lI fL fL @@ -5160,56 +5147,56 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (22,1,1) = {" -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 +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au aF @@ -5220,11 +5207,11 @@ aF aF au au -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia au ab aF @@ -5239,27 +5226,27 @@ aF ah wj ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ai fm dh cx @@ -5280,16 +5267,16 @@ dh dh dh fm -gn -aa -aa -aa -aa -aa -aa -aa -aa -ex +aC +ia +ia +ia +ia +ia +ia +ia +ia +ag lI fL fL @@ -5302,57 +5289,57 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (23,1,1) = {" -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 +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -5381,27 +5368,27 @@ aF ah aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -aa -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ia +ag fm dh cx @@ -5422,16 +5409,16 @@ dh dh dh fm -gn -aa -aa -aa -aa -aa -aa -aa -aa -ex +aC +ia +ia +ia +ia +ia +ia +ia +ia +ag lI fL fL @@ -5444,57 +5431,57 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (24,1,1) = {" -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 +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -5524,26 +5511,26 @@ ah aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ag fm dh cx @@ -5564,16 +5551,16 @@ dh dh dh fm -gn -aa -aa -aa -aa -aa -aa -aa -aa -ex +aC +ia +ia +ia +ia +ia +ia +ia +ia +ag Ui fL OB @@ -5586,55 +5573,55 @@ fL fL fL Em -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (25,1,1) = {" -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 +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au bt @@ -5666,26 +5653,26 @@ ah aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -5706,16 +5693,16 @@ dh dh dh fm -gn -aa -aa -aa -aa -aa -aa -aa -aa -ex +aC +ia +ia +ia +ia +ia +ia +ia +ia +ag lI fL OB @@ -5728,51 +5715,51 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (26,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au au @@ -5809,25 +5796,25 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -5848,16 +5835,16 @@ dh dh dh fm -gn -aa -aa -aa -aa -aa -aa -aa -aa -ex +aC +ia +ia +ia +ia +ia +ia +ia +ia +ag JN Wv KT @@ -5870,49 +5857,49 @@ Wv Wv Wv KT -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (27,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au au @@ -5951,25 +5938,25 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ai fm dh cx @@ -5990,71 +5977,71 @@ dh dh dh fm -Vg -br +aD +af +ia +ia +ia +ia +ia +ia +ia +ia +aq +aq +aM +aO +aM +aq +al +al +al +al +al +al +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -Ag -Ag -pc -eN -pc -Ag -bZ -bZ -bZ -bZ -bZ -bZ -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (28,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au bt aF @@ -6094,24 +6081,24 @@ aF ab ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ai fm dh cx @@ -6132,70 +6119,70 @@ dh dh dh fm -gn -br +aC +af +ia +ia +ia +ia +ia +ia +ia +ia +af +af +aO +aO +aO +af +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -br -br -eN -eN -eN -br -aa -aa -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 "} (29,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au bt ah @@ -6237,23 +6224,23 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ai fm dh cx @@ -6263,7 +6250,7 @@ Ek gj gj gj -Sy +ax gj co cx @@ -6274,69 +6261,69 @@ dh dh dh fm -gn -br +aC +af +ia +ia +ia +ia +ia +ia +ia +ia +af +af +aO +aO +af +af +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -br -br -eN -eN -br -br -aa -aa -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 "} (30,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au aF @@ -6379,23 +6366,23 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ai fm dh cx @@ -6416,67 +6403,67 @@ dh dh dh fm -gn -br +aC +af +ia +ia +ia +ia +ia +ia +ia +ia +af +af +af +af +af +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -br -br -br -br -br -aa -aa -aa -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 "} (31,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au au @@ -6522,22 +6509,22 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ai fm dh cx @@ -6558,65 +6545,65 @@ dh dh dh fm -gn -br +aC +af +ia +ia +ia +ia +ia +ia +ia +ia +af +af +af +af +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -br -br -br -br -aa -aa -aa -aa -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 "} (32,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au au @@ -6664,22 +6651,22 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -6700,65 +6687,65 @@ dh dh dh fm -gn -br +aC +af +ia +ia +ia +ia +ia +ia +af +af +af +ia +af +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -br -br -br -aa -br -aa -aa -aa -aa -aa -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 "} (33,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -6806,22 +6793,22 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -6842,64 +6829,64 @@ dh dh dh fm -gn -br +aC +af +ia +ia +ia +ia +ia +ia +af +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -br -aa -aa -aa -aa -aa -aa -aa -aa -aa -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 "} (34,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au aF @@ -6951,19 +6938,19 @@ ab pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -6984,63 +6971,63 @@ dh dh dh fm -Vg -aa -br -aa -aa +aD +ia +af +ia +ia QL dF QL +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -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 "} (35,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au bt ah @@ -7090,22 +7077,22 @@ aF aF aF ab -aa -aa +ia +ia pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag xy dh dh @@ -7126,63 +7113,63 @@ dh dh dh xy -gn -aa -br -aa -aa +aC +ia +af +ia +ia yW ee yW +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -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 "} (36,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF ah @@ -7232,22 +7219,22 @@ aF aF aF ab -aa -aa -aa +ia +ia +ia pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag cx OU fH @@ -7268,63 +7255,63 @@ fH fH gF cx -Vg -gC -br -aa -aa +aD +ar +af +ia +ia yW ee yW +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -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 "} (37,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -7376,42 +7363,42 @@ aF ab pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -aa -bZ -bZ -bZ -Ag -Ag -Ag -bZ -bZ -bZ -bZ -bZ -Ag -Ag -Ag -bZ -bZ -bZ -bZ -bZ -bZ -br -br +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ia +al +al +al +aq +aq +aq +al +al +al +al +al +aq +aq +aq +al +al +al +al +al +al +af +af fM fM lh @@ -7429,44 +7416,44 @@ uO gd zS fM +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (38,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -7516,44 +7503,44 @@ aF aF aF ab -aa +ia pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -aa -aa -aa -aa -aa -br -aa -aa -aa -aa -br -br -aa -br -br -br -br -br -br -br -gC -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ia +ia +ia +ia +ia +af +ia +ia +ia +ia +af +af +ia +af +af +af +af +af +af +af +ar +ad fM nd Gu @@ -7571,44 +7558,44 @@ nd nd nd QL -aa -aa -aa +ia +ia +ia XP XP XP XP XP +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (39,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -7663,38 +7650,38 @@ pv pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -aa -aa -aa -aa -aa -aa -br -gC -br -br -br -br -aa -aa -aa -aa -aa -br -br -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ia +ia +ia +ia +ia +ia +af +ar +af +af +af +af +ia +ia +ia +ia +ia +af +af +ia +ia +ia fM fM nd @@ -7713,9 +7700,9 @@ nd nd nd yW -aa -aa -aa +ia +ia +ia XP za rh @@ -7725,32 +7712,32 @@ XP XP XP XP +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (40,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF ah @@ -7800,43 +7787,43 @@ aF aF aF ab -aa +ia pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN +aN +aN fM Hl nd @@ -7867,32 +7854,32 @@ ly OH EW XP +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (41,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF ah @@ -7947,38 +7934,38 @@ pv pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN fM dA nd @@ -8009,32 +7996,32 @@ OH za EW jw +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (42,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF ah @@ -8084,35 +8071,35 @@ aF aF aF ab -aa -aa -aa -aa +ia +ia +ia +ia pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ia +ia +ia +ia +ia +aN +aN dr dr dr @@ -8151,32 +8138,32 @@ uJ OH EW XP +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (43,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -8226,35 +8213,35 @@ aF aF aF ab -aa -aa -aa -aa +ia +ia +ia +ia pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -aa -aa -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ia +ia +aN +aN +aN +aN dr dD ds @@ -8281,9 +8268,9 @@ nd nd nd Ni -aa -aa -aa +ia +ia +ia XP za hq @@ -8293,32 +8280,32 @@ XP XP XP XP +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (44,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -8375,28 +8362,28 @@ ab pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -aa -aa -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ia +ia +aN +aN +aN +aN dr ds ds @@ -8423,44 +8410,44 @@ nd nd ND lh -aa -aa -aa +ia +ia +ia XP XP XP XP XP +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (45,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -8520,25 +8507,25 @@ pv pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +aN +aN +aN +aN +aN dr ei ds @@ -8565,44 +8552,44 @@ nd nd nd QL +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (46,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au bt ah @@ -8663,24 +8650,24 @@ pv pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN dr Iy ds @@ -8707,45 +8694,45 @@ nd nd nd yW +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (47,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia bt bt aF @@ -8804,25 +8791,25 @@ pv pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN dr ds ds @@ -8849,46 +8836,46 @@ nd nd nd Ni +ia +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aG -aG -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (48,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -8936,35 +8923,35 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN +aN dr bT ds @@ -8991,46 +8978,46 @@ nd nd nd fM -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +ia +ia +aN +aN +aN +aN +aN +aN +aN +ia +aN +ia +ia +ia +ia +ia +ia +ia aa -aa -aG -aG -aG -aG -aG -aG -aG -aa -aG -aa -aa -aa -aa -aa -aa -aa -aH "} (49,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -9078,35 +9065,35 @@ aF aF aF ab -aa -aa +ia +ia pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aa -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +ia +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dr ds ds @@ -9133,46 +9120,46 @@ nd sI nd fM -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aH "} (50,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -9223,30 +9210,30 @@ ab pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dr dr dr @@ -9275,46 +9262,46 @@ fM fM fM fM -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG aN -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aH "} (51,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -9366,28 +9353,28 @@ pv pv pv pv -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dr dr dD @@ -9415,48 +9402,48 @@ aN aL aL aL -aG -aG -aG -aG aN aN aN -aG -aG +aN +aN +aN +aN +aN +aN aL aL aL aL aL aL -gX -gX -gX +aL +aL +aL +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aH "} (52,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -9504,19 +9491,19 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN dr dr dr @@ -9572,32 +9559,32 @@ gN gN aL aN -aG -aG -gX -gX +aN +aN +aL +aL +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aH "} (53,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au aF @@ -9648,13 +9635,13 @@ ab pv pv pv -aa -aa -aG -aG -aG -aG -aG +ia +ia +aN +aN +aN +aN +aN dr dr dr @@ -9714,31 +9701,31 @@ gN aL aL aL -aG -aG -aG -gX +aN +aN +aN +aL +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aH "} (54,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -NY +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ac bt bt aF @@ -9784,17 +9771,17 @@ wj ab ab ab -aa +ia pv -aa -aa -aa +ia +ia +ia pv -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN dr dr dr @@ -9856,30 +9843,30 @@ gN aL gN aL -aG -aG -aG -gX -gX -gX +aN +aN +aN +aL +aL +aL +ia +ia +ia +ia aa -aa -aa -aa -aH "} (55,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia wj ap ah @@ -9923,17 +9910,17 @@ aF aF ab ab -aa -aa -aa -aa +ia +ia +ia +ia pv -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +aN +aN dr dr dr @@ -9998,29 +9985,29 @@ gN gN gN aL -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aL +aL +ia +ia +ia aa -aa -aa -aH "} (56,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia ab wj ap @@ -10064,18 +10051,18 @@ aF aF ab ab -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia pv pv pv -aa -aa -aG -aG +ia +ia +aN +aN dr dD ds @@ -10141,27 +10128,27 @@ gN gN aL aN -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aL +aL +ia +ia aa -aa -aH "} (57,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab ab aF @@ -10205,19 +10192,19 @@ ah ah ah ab -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia pv -aa -aG -aG -aG +ia +aN +aN +aN dr ds ds @@ -10283,26 +10270,26 @@ gN gN aL aN -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aL +aL +ia +ia aa -aa -aH "} (58,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab ab aF @@ -10347,18 +10334,18 @@ aF aF wj ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN dv dr ds @@ -10425,26 +10412,26 @@ gN gN aL aN -aG -aG -aG -aG -aG -gX +aN +aN +aN +aN +aN +aL +ia +ia +ia aa -aa -aa -aH "} (59,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -10488,19 +10475,19 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN dv dr ds @@ -10567,25 +10554,25 @@ gM gM aL aN -aG -aG -aG -aG -aG -gX +aN +aN +aN +aN +aN +aL +ia +ia +ia aa -aa -aa -aH "} (60,1,1) = {" -aH -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia ab ab aF @@ -10630,19 +10617,19 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN dr dr ds @@ -10709,25 +10696,25 @@ gM gM aL aN -aG -aG -aG -aG -aG -gX +aN +aN +aN +aN +aN +aL +ia +ia +ia aa -aa -aa -aH "} (61,1,1) = {" -aH -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia ab aF aF @@ -10772,17 +10759,17 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN aL aL dw @@ -10850,26 +10837,26 @@ gN gN gN aL -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aL +aL +ia +ia +ia aa -aa -aa -aH "} (62,1,1) = {" -aH -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia ab aF aF @@ -10914,16 +10901,16 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN aL aL gN @@ -10992,25 +10979,25 @@ gN gN gN aL -aG -aG -aG -aG -aG -gX +aN +aN +aN +aN +aN +aL +ia +ia +ia +ia aa -aa -aa -aa -aH "} (63,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab ab aF @@ -11055,16 +11042,16 @@ aF aF ab ab -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN aN aL eO @@ -11134,25 +11121,25 @@ gN gN gN Jx -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aL +aL +ia +ia +ia aa -aa -aa -aH "} (64,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -11196,17 +11183,17 @@ ah ah ah ab -aa -aa -aG -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +aN +aN +aN +aN +aN +aN +aN +aN +aN aL aL dm @@ -11276,25 +11263,25 @@ aL gN gN aL -aG -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aN +aL +aL +ia +ia aa -aa -aH "} (65,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -11338,17 +11325,17 @@ aF aF aF ab -aa -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +ia +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dm gN dm @@ -11418,25 +11405,25 @@ gN gN gN aL -aG -aG -aG -aG -aG -aG -aG -gX +aN +aN +aN +aN +aN +aN +aN +aL +ia +ia aa -aa -aH "} (66,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -11480,17 +11467,17 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dm gN gN @@ -11561,24 +11548,24 @@ gN pW aL aL -aG -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aN +aL +aL +ia aa -aH "} (67,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -11622,17 +11609,17 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -gX +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aL dm gN dO @@ -11703,24 +11690,24 @@ gN gN gN aL -aG -aG -aG -aG -aG -aG -aG -gX +aN +aN +aN +aN +aN +aN +aN +aL +ia aa -aH "} (68,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -11764,16 +11751,16 @@ ah aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aL dm gN @@ -11845,23 +11832,23 @@ gN gN gN aL -aG -aG -aG -aG -aG -aG -aG -gX -gX -aH +aN +aN +aN +aN +aN +aN +aN +aL +aL +aa "} (69,1,1) = {" -aH -aa -aa -aa aa +ia +ia +ia +ia ab ab aF @@ -11906,16 +11893,16 @@ ah aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aL eO gN @@ -11987,23 +11974,23 @@ gN gN gN aL -aG -aG -aG -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aN +aN +aN +aL +aL "} (70,1,1) = {" -aH -aa -aa -aa aa +ia +ia +ia +ia ab aF aF @@ -12049,15 +12036,15 @@ aF aB ab ab -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN aL dm gN @@ -12129,23 +12116,23 @@ gN gN gN aL -aG -aG -aG -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aN +aN +aN +aL +aL "} (71,1,1) = {" -aH -aa -aa -aa aa +ia +ia +ia +ia ab aF aF @@ -12191,15 +12178,15 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN dk dm gN @@ -12271,23 +12258,23 @@ gN gN gN Jx -aG -aG -aG -aG -aG -aG -aG -gX -gX -aH +aN +aN +aN +aN +aN +aN +aN +aL +aL +aa "} (72,1,1) = {" -aH -aa -aa -aa aa +ia +ia +ia +ia ab aF aF @@ -12333,16 +12320,16 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dm gN gN @@ -12413,23 +12400,23 @@ gN gN gN aL -aG -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aN +aL +aL +ia aa -aH "} (73,1,1) = {" -aH -aa -aa -aa aa +ia +ia +ia +ia ab aF aF @@ -12475,16 +12462,16 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aL dm gN @@ -12555,23 +12542,23 @@ gN gN gN aL -aG -aG -aG -aG -gX -gX -gX +aN +aN +aN +aN +aL +aL +aL +ia +ia aa -aa -aH "} (74,1,1) = {" -aH -aa -aa -aa aa +ia +ia +ia +ia ab ab aF @@ -12617,16 +12604,16 @@ ap ap ap au -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL aL dm gN @@ -12697,24 +12684,24 @@ aL gN gN aL -aG -aG -aG -aG -gX +aN +aN +aN +aN +aL +ia +ia +ia +ia aa -aa -aa -aa -aH "} (75,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -12759,17 +12746,17 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dm gN gN @@ -12839,24 +12826,24 @@ aL gN gN aL -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aL +aL +ia +ia +ia aa -aa -aa -aH "} (76,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -12901,17 +12888,17 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dm gN gN @@ -12927,7 +12914,7 @@ cA cA gN fS -eE +aj bo bo fI @@ -12948,7 +12935,7 @@ gN fS eD Ft -eE +aj Ft Ee fS @@ -12981,24 +12968,24 @@ gN gN gN aL -aG -aG -aG -gX -gX +aN +aN +aN +aL +aL +ia +ia +ia +ia aa -aa -aa -aa -aH "} (77,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -13043,16 +13030,16 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aL dm gN @@ -13123,24 +13110,24 @@ gN gN gN aL -aG -aG -gX -gX +aN +aN +aL +aL +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aH "} (78,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab ab aF @@ -13185,16 +13172,16 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dm gN gN @@ -13265,25 +13252,25 @@ Jx gN gN aL -aG -aG -gX +aN +aN +aL +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aH "} (79,1,1) = {" -aH -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia ab ab aF @@ -13328,15 +13315,15 @@ aF aF ab ab -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN dm gN gN @@ -13407,26 +13394,26 @@ aL aL aL aL -aG -aG -gX +aN +aN +aL +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aH "} (80,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -13471,14 +13458,14 @@ aF aF ab ab -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN aL gN gN @@ -13545,30 +13532,30 @@ gN gN aL aN -aG -aG -aG aN -aG -aG -gX +aN +aN +aN +aN +aN +aL +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aH "} (81,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -13613,14 +13600,14 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN aL eO gN @@ -13686,31 +13673,31 @@ aL aL aL aL -aG -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aN +aL +aL +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aH "} (82,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -13756,13 +13743,13 @@ aF aF ab ab -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN aL aL gN @@ -13824,35 +13811,35 @@ gN gN gN aL -gX -gX -gX -aG -aG -aG -aG -aG -aG -gX -gX +aL +aL +aL +aN +aN +aN +aN +aN +aN +aL +aL +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aH "} (83,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -13898,13 +13885,13 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN aN aL gN @@ -13966,35 +13953,35 @@ aL Jx aL aL +ia +ia +aL +aL +aL +aL +aL +aL +aL +aL +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -gX -gX -gX -gX -gX -gX -gX -gX -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (84,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -14040,14 +14027,14 @@ as aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN aL gN gN @@ -14105,38 +14092,38 @@ bj gN gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +aL +aL +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -gX -gX -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (85,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -14183,12 +14170,12 @@ aF aF ab ab -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN aL aL gN @@ -14247,38 +14234,38 @@ bj fS lZ aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (86,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -14325,12 +14312,12 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN aL gN gN @@ -14389,38 +14376,38 @@ bj fS fS aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (87,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab ab aF @@ -14467,12 +14454,12 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN aL aL gN @@ -14511,7 +14498,7 @@ fS Ft Ft Ft -eE +aj Ft fS Ht @@ -14531,39 +14518,39 @@ bj fS fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (88,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -14609,12 +14596,12 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN aL aL gN @@ -14673,39 +14660,39 @@ kZ fS gN aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (89,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -14752,11 +14739,11 @@ aF aF ab ab -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN aL gN gN @@ -14815,39 +14802,39 @@ bj fS gN aL -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (90,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -14894,11 +14881,11 @@ aF aF aF ab -aG -aG -aa -aa -aG +aN +aN +ia +ia +aN aL aL gN @@ -14958,38 +14945,38 @@ fS gN aL aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (91,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF av @@ -15036,11 +15023,11 @@ aF aF aF ab -aa -aa -aa -aG -aG +ia +ia +ia +aN +aN aL aL gN @@ -15100,38 +15087,38 @@ gN gN gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (92,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -15178,11 +15165,11 @@ aF ab ab ab -aa -aa -aG -aG -aG +ia +ia +aN +aN +aN aL gN gN @@ -15242,38 +15229,38 @@ fS gN gN aL -aG -aG +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (93,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -15318,13 +15305,13 @@ aF ab ab ab -aa -aa -aa -aa -aa -aa -aG +ia +ia +ia +ia +ia +ia +aN aL gN gN @@ -15384,38 +15371,38 @@ fS gN aL aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (94,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -15458,15 +15445,15 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aG +ia +ia +ia +ia +ia +ia +ia +ia +aN aL aL gN @@ -15525,39 +15512,39 @@ bj fS gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (95,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -15599,17 +15586,17 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN aL gN gN @@ -15667,39 +15654,39 @@ kZ fS gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (96,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -15740,18 +15727,18 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN aL gN gN @@ -15809,39 +15796,39 @@ bj kh gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (97,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -15881,19 +15868,19 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN aL gN gN @@ -15952,38 +15939,38 @@ ck gN aL aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (98,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab ab aF @@ -16022,20 +16009,20 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN aL aL gN @@ -16094,39 +16081,39 @@ ck gN gN aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (99,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -16163,21 +16150,21 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN aL gN gN @@ -16236,39 +16223,39 @@ fS gN gN aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (100,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -16305,21 +16292,21 @@ aF as aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN aL gN gN @@ -16378,39 +16365,39 @@ fS gN aL aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (101,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab aF @@ -16448,20 +16435,20 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN aL aL gN @@ -16520,40 +16507,40 @@ fS gN aL aL -aG -aG +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (102,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -16590,20 +16577,20 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN aL gN gN @@ -16662,40 +16649,40 @@ fS gN gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (103,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -16732,20 +16719,20 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN aL gN gN @@ -16804,40 +16791,40 @@ fS gN gN aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (104,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -16875,19 +16862,19 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN aL aL gN @@ -16947,39 +16934,39 @@ IC aL aL aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (105,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -17017,18 +17004,18 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN aL aL gN @@ -17089,39 +17076,39 @@ gN gN gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (106,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -17160,17 +17147,17 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN aL gN gN @@ -17231,39 +17218,39 @@ gN gN aL aL -aG -aG +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (107,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab aF @@ -17303,16 +17290,16 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN aL aL gN @@ -17372,41 +17359,41 @@ gN gN gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (108,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -17446,15 +17433,15 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +ia +aN +aN aL aL gN @@ -17514,41 +17501,41 @@ gN gN gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (109,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -17589,14 +17576,14 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +aN +aN aL gN gN @@ -17656,41 +17643,41 @@ gN gN aL aL -aG -aG +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (110,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -17731,14 +17718,14 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +aN +aN aL aL gN @@ -17798,41 +17785,41 @@ fS aL aL aL -aG -aG +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (111,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -17874,13 +17861,13 @@ aF aF ab ab -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +aN +aN aN aL aL @@ -17938,43 +17925,43 @@ Tz bj fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (112,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -18017,12 +18004,12 @@ aF aF ab ab -aa -aa -aa -aG -aG -aG +ia +ia +ia +aN +aN +aN aN aL gN @@ -18080,43 +18067,43 @@ bj bj fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (113,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -18159,12 +18146,12 @@ aF aF aF ab -aa -aa -aa -aG -aG -aG +ia +ia +ia +aN +aN +aN aL aL gN @@ -18222,43 +18209,43 @@ fp bj fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (114,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -18301,12 +18288,12 @@ aF aF aF ab -aa -aa -aa -aG -aG -aG +ia +ia +ia +aN +aN +aN aL gN gN @@ -18364,43 +18351,43 @@ eM bj fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (115,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -18443,12 +18430,12 @@ aF aF aF ab -aa -aa -aG -aG -aG -aG +ia +ia +aN +aN +aN +aN aL aL aL @@ -18506,43 +18493,43 @@ eM bj fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (116,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab aF @@ -18585,14 +18572,14 @@ aF aF aF ab -aa -aa -aG -aG -aG -aG -aG -aG +ia +ia +aN +aN +aN +aN +aN +aN aL gN gN @@ -18648,44 +18635,44 @@ bj fp fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (117,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -18727,13 +18714,13 @@ aF aF aF ab -aa -aa -aG -aG -aG -aG -aG +ia +ia +aN +aN +aN +aN +aN aL aL gN @@ -18790,44 +18777,44 @@ fS fC fS aL -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (118,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -18869,13 +18856,13 @@ aF aF aF ab -aa -aG -aG -aG -aG -aG -aG +ia +aN +aN +aN +aN +aN +aN aL gN gN @@ -18932,44 +18919,44 @@ bj bj fS aL -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (119,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au au @@ -19011,13 +18998,13 @@ aF aF aF ab -aa -aG -aG -aG -aG -aG -aG +ia +aN +aN +aN +aN +aN +aN aL gN gN @@ -19074,44 +19061,44 @@ bj bj fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (120,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au au @@ -19153,13 +19140,13 @@ aF aF aF ab -aa -aG -aG -aG -aG -aG -aG +ia +aN +aN +aN +aN +aN +aN aL gN gN @@ -19216,44 +19203,44 @@ bj bj fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (121,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab au @@ -19295,12 +19282,12 @@ aF aF aF ab -aa -aG -aG -aG -aG -aG +ia +aN +aN +aN +aN +aN aL aL gN @@ -19358,45 +19345,45 @@ bj bj fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (122,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au aA @@ -19437,12 +19424,12 @@ aF aF aF ab -aa -aa -aa -aG -aG -aG +ia +ia +ia +aN +aN +aN aL gN gN @@ -19500,45 +19487,45 @@ bj bj fS aL -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (123,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au au @@ -19579,12 +19566,12 @@ aF aF aF ab -aa -aa -aa -aG -aG -aG +ia +ia +ia +aN +aN +aN aL gN gN @@ -19642,45 +19629,45 @@ Ep bj fS aL -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (124,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab au @@ -19721,12 +19708,12 @@ aF aF aF ab -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +aN +aN aL gN gN @@ -19784,46 +19771,46 @@ bj bj fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (125,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au av @@ -19833,20 +19820,20 @@ au au ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab ab @@ -19864,11 +19851,11 @@ aF aF ab ab -aa -aa -aa -aG -aG +ia +ia +ia +aN +aN aL aL gN @@ -19926,46 +19913,46 @@ bj bj fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (126,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au ab @@ -19974,24 +19961,24 @@ ab au ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -20006,11 +19993,11 @@ aF aF ab ab -aa -aa -aa -aG -aG +ia +ia +ia +aN +aN aN aL gN @@ -20068,46 +20055,46 @@ bj bj fS aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (127,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab av @@ -20115,25 +20102,25 @@ ca av ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -20147,12 +20134,12 @@ ab ab ab ab -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +aN +aN aL aL gN @@ -20210,45 +20197,45 @@ bj bj fS aL -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (128,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab av @@ -20257,25 +20244,25 @@ ab av cp ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -20286,15 +20273,15 @@ ab ab ab ab -aa -aa -aa -aa -aa -aa -aG -aG -aG +ia +ia +ia +ia +ia +ia +aN +aN +aN aL gN gN @@ -20352,45 +20339,45 @@ bj bj fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (129,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab cp av @@ -20399,44 +20386,44 @@ av av av ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab ab ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN aL gN gN @@ -20494,45 +20481,45 @@ Ht fu fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (130,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab av av @@ -20541,44 +20528,44 @@ av av av 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 -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN aL aL aL @@ -20636,44 +20623,44 @@ bj fp fS aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (131,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab av @@ -20684,45 +20671,45 @@ av av 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 -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN aL gN gN @@ -20778,44 +20765,44 @@ bj bj fS aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (132,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aP av @@ -20826,45 +20813,45 @@ av av 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 -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN aL gN gN @@ -20920,44 +20907,44 @@ bj bj fS aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (133,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aP dJ @@ -20968,45 +20955,45 @@ av av 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 -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN aL gN gN @@ -21062,44 +21049,44 @@ bj bj fS aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (134,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aw aP @@ -21109,46 +21096,46 @@ 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 -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN aL gN gN @@ -21204,93 +21191,93 @@ bj bj fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (135,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia 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 -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN aL aL aL @@ -21346,96 +21333,96 @@ fS fS fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (136,1,1) = {" -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 -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN aL gN gN @@ -21488,96 +21475,96 @@ BQ fF fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (137,1,1) = {" -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 -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN aL gN gN @@ -21630,96 +21617,96 @@ eL fF fS aL -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (138,1,1) = {" -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 -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN aL aL aL @@ -21729,12 +21716,12 @@ aL aL aL aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN aL aL aL @@ -21772,122 +21759,122 @@ fF fF fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (139,1,1) = {" -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 -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN +aN aL aL aL aL -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aL aL aL aL -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN aL aL fS @@ -21914,123 +21901,90 @@ fS fS fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (140,1,1) = {" -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ae aL aL aL @@ -22056,27 +22010,60 @@ aL aL aL aL -gX -gX -gX -gX -gX -gX -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} diff --git a/maps/offmap_vr/om_ships/abductor.dm b/maps/offmap_vr/om_ships/abductor.dm index fa5b017527..74bb329a59 100644 --- a/maps/offmap_vr/om_ships/abductor.dm +++ b/maps/offmap_vr/om_ships/abductor.dm @@ -1,101 +1,86 @@ -// Compile in the map for CI testing if we're testing compileability of all the maps -#if MAP_TEST -#include "abductor.dmm" -#endif - -// Map template for spawning the shuttle -/datum/map_template/om_ships/abductor - name = "OM Ship - Abductor Ship (New Z)" - desc = "A ship for spooky aliens to kidnap farmers and unfortunate spacemen." - mappath = 'abductor.dmm' - -/area/abductor - requires_power = 0 - icon_state = "purple" - -/area/abductor/ - name = "Abductor Ship" - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/abductor/interior - name = "Abductor Ship Interior" - -/area/abductor/exterior - name = "Abductor Ship Exterior" - has_gravity = 0 - -// The 'Abductor Ship' -/obj/effect/overmap/visitable/ship/abductor - name = "spacecraft" - desc = "Spacefaring vessel." - icon_state = "shuttle" - moving_state = "shuttle" - scanner_name = "unknown vessel" - scanner_desc = @{"[i]Registration[/i]: Unknown -[i]Class[/i]: Corvette -[i]Transponder[/i]: No transponder detected." -[b]Notice[/b]: Deep scans detect unknown power signatures, and onboard transporter technology."} - color = "#11414c" //STEALTH - vessel_mass = 8000 - vessel_size = SHIP_SIZE_SMALL - initial_generic_waypoints = list("abductor_port", "abductor_starboard") - fore_dir = NORTH - -/obj/item/weapon/paper/alien/abductor - name = "Read Me" - info = {"((Just to state the obvious here, but make sure you're reading OOC notes and all that. This role does not give you any special protections from the rules. Only abduct people who seem like they'd be cool with it.))

- -Your mission is to travel out into space to retrieve individuals to experiment upon.

- -Just what experiments you do are up to you, thought it should be noted, we can't do experiments on corpses, so you should be careful not to kill anyone in the process of acquiring your subject. Needless killing is grounds for termination from the organization.

- -The experimentation process however can be fatal if necessary, so long as we get good data. ((And the person's cool with it OOCly))

- -You will find that the ship is equipped with transporter technology. There are teleporters to the outside world on both the port and starboard sides. Each of the experimentation chambers is also outfitted with an advanced translocator device that is linked to its given room. You will want to ensure that you take a translocator device with you BEFORE you leave the ship, as there will be no other way for you to return without assistance.

- -Your translocator device is arguably your most critical piece of equipment, and it is imperative that you not lose it, as possessing it would allow outsiders access to the ship.

- -The center of the ship sports the shield generator, as well as the chemical and resleeving labs. It would be wise to ensure that if your experiments are fatal, to scan the mind and body of your subject before you proceed, so we can ensure that we can return the subjects to where we find them.

- -To the starboard and port sides you will find a total of six experimentation rooms, and two transporter rooms, as well as two engine rooms at the aft.

- -The aft center of the ship is the common equipment room. The items here are limited in quantity, so only take what you intend to use in your given task.

- -At the fore of the vessel are the briefing rooms, and the bridge.

- -Lastly, there are camera uplink consoles scattered around the ship. It is recommended that you take stock of where potential targets are before you depart.

- -You will find a dispenser within the room you started in which contains some basic equipment that you may wish to take with you. Please do not loot the dispensers from other rooms unless the one assigned to it is okay with it.

- -And finally, to leave this room, you will want to put your ID on the table, and pray to the corporate overlords to add access 777 to it."} - -/obj/machinery/porta_turret/alien/abductor - name = "anti-personnel turret" - installation = /obj/item/weapon/gun/energy/gun/taser - lethal = FALSE - health = 500 // Sturdier turrets, non-lethal, for capturing people alive - maxhealth = 500 - req_one_access = list(777) // The code I've been using for events, same as the doors - -/obj/machinery/porta_turret/alien/abductor/ion - name = "anti-personnel turret" - installation = /obj/item/weapon/gun/energy/ionrifle/weak - lethal = TRUE - -/obj/item/device/perfect_tele/frontier/unknown/abductor/one - loc_network = "abd1" -/obj/item/device/perfect_tele/frontier/unknown/abductor/two - loc_network = "abd2" -/obj/item/device/perfect_tele/frontier/unknown/abductor/three - loc_network = "abd3" -/obj/item/device/perfect_tele/frontier/unknown/abductor/four - loc_network = "abd4" -/obj/item/device/perfect_tele/frontier/unknown/abductor/five - loc_network = "abd5" -/obj/item/device/perfect_tele/frontier/unknown/abductor/six - loc_network = "abd6" - -/obj/machinery/power/rtg/abductor/built/abductor - name = "Void Core" - power_gen = 5000000 - +// Compile in the map for CI testing if we're testing compileability of all the maps +#if MAP_TEST +#include "abductor.dmm" +#endif + +// Map template for spawning the shuttle +/datum/map_template/om_ships/abductor + name = "OM Ship - Abductor Ship (New Z)" + desc = "A ship for spooky aliens to kidnap farmers and unfortunate spacemen." + mappath = 'abductor.dmm' + +/area/abductor + requires_power = 0 + icon_state = "purple" + +/area/abductor/ + name = "Abductor Ship" + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/abductor/interior + name = "Abductor Ship Interior" + +/area/abductor/exterior + name = "Abductor Ship Exterior" + has_gravity = 0 + +// The 'Abductor Ship' +/obj/effect/overmap/visitable/ship/abductor + name = "strange spacecraft" + desc = "Spacefaring vessel." + icon_state = "unkn_r" + scanner_desc = @{"[i]Registration[/i]: Unknown +[i]Class[/i]: Corvette +[i]Transponder[/i]: No transponder detected." +[b]Notice[/b]: Deep scans detect unknown power signatures, and onboard transporter technology."} + vessel_mass = 8000 + vessel_size = SHIP_SIZE_SMALL + initial_generic_waypoints = list("abductor_port", "abductor_starboard") + fore_dir = NORTH + known = FALSE + +/obj/item/weapon/paper/alien/abductor + name = "Read Me" + info = {"((Just to state the obvious here, but make sure you're reading OOC notes and all that. This role does not give you any special protections from the rules. Only abduct people who seem like they'd be cool with it.))

+ +Your mission is to travel out into space to retrieve individuals to experiment upon.

+ +Just what experiments you do are up to you, thought it should be noted, we can't do experiments on corpses, so you should be careful not to kill anyone in the process of acquiring your subject. Needless killing is grounds for termination from the organization.

+ +The experimentation process however can be fatal if necessary, so long as we get good data. ((And the person's cool with it OOCly))

+ +You will find that the ship is equipped with transporter technology. There are teleporters to the outside world on both the port and starboard sides. Each of the experimentation chambers is also outfitted with an advanced translocator device that is linked to its given room. You will want to ensure that you take a translocator device with you BEFORE you leave the ship, as there will be no other way for you to return without assistance.

+ +Your translocator device is arguably your most critical piece of equipment, and it is imperative that you not lose it, as possessing it would allow outsiders access to the ship.

+ +The center of the ship sports the shield generator, as well as the chemical and resleeving labs. It would be wise to ensure that if your experiments are fatal, to scan the mind and body of your subject before you proceed, so we can ensure that we can return the subjects to where we find them.

+ +To the starboard and port sides you will find a total of six experimentation rooms, and two transporter rooms, as well as two engine rooms at the aft.

+ +The aft center of the ship is the common equipment room. The items here are limited in quantity, so only take what you intend to use in your given task.

+ +At the fore of the vessel are the briefing rooms, and the bridge.

+ +Lastly, there are camera uplink consoles scattered around the ship. It is recommended that you take stock of where potential targets are before you depart.

+ +You will find a dispenser within the room you started in which contains some basic equipment that you may wish to take with you. Please do not loot the dispensers from other rooms unless the one assigned to it is okay with it.

+ +And finally, to leave this room, you will want to put your ID on the table, and pray to the corporate overlords to add access 777 to it."} + +/obj/machinery/porta_turret/alien/abductor + name = "anti-personnel turret" + installation = /obj/item/weapon/gun/energy/gun/taser + lethal = FALSE + health = 500 // Sturdier turrets, non-lethal, for capturing people alive + maxhealth = 500 + req_one_access = list(777) // The code I've been using for events, same as the doors + +/obj/machinery/porta_turret/alien/abductor/ion + name = "anti-personnel turret" + installation = /obj/item/weapon/gun/energy/ionrifle/weak + lethal = TRUE + +/obj/machinery/power/rtg/abductor/built/abductor + name = "Void Core" + power_gen = 5000000 + diff --git a/maps/offmap_vr/om_ships/aro.dm b/maps/offmap_vr/om_ships/aro.dm index b6ef237453..c4c464442f 100644 --- a/maps/offmap_vr/om_ships/aro.dm +++ b/maps/offmap_vr/om_ships/aro.dm @@ -45,7 +45,6 @@ /obj/effect/overmap/visitable/ship/aro name = "Aronai Sieyes" desc = "It's Aronai. Did you know he's actually a spaceship? Yeah it's weird." - color = "#00aaff" //Bluey vessel_mass = 8000 vessel_size = SHIP_SIZE_SMALL initial_generic_waypoints = list("aronai_fore", "aronai_aft", "aronai_port", "aronai_starboard") diff --git a/maps/offmap_vr/om_ships/aro2.dm b/maps/offmap_vr/om_ships/aro2.dm index 5d7f834663..d31b8f2ca1 100644 --- a/maps/offmap_vr/om_ships/aro2.dm +++ b/maps/offmap_vr/om_ships/aro2.dm @@ -56,12 +56,11 @@ /obj/effect/overmap/visitable/ship/aro2 name = "spacecraft" desc = "Spacefaring vessel. Friendly IFF detected." - scanner_name = "Aronai Sieyes" + name = "Aronai Sieyes" scanner_desc = @{"[i]Registration[/i]: Aronai Sieyes [i]Class[/i]: Small Frigate (Low Displacement) [i]Transponder[/i]: Transmitting (CIV), non-hostile [b]Notice[/b]: Automated vessel"} - color = "#00aaff" //Bluey vessel_mass = 8000 vessel_size = SHIP_SIZE_SMALL initial_generic_waypoints = list("aronai2_fore", "aronai2_aft", "aronai2_port", "aronai2_starboard") diff --git a/maps/offmap_vr/om_ships/aro3.dm b/maps/offmap_vr/om_ships/aro3.dm index 5d4c4d82c9..724e803854 100644 --- a/maps/offmap_vr/om_ships/aro3.dm +++ b/maps/offmap_vr/om_ships/aro3.dm @@ -77,9 +77,9 @@ // The 'ship' /obj/effect/overmap/visitable/ship/aro3 - name = "spacecraft" + name = "Aronai Sieyes" desc = "Spacefaring vessel. Friendly IFF detected." - scanner_name = "Aronai Sieyes" + icon_state = "moe_cruiser_g" scanner_desc = @{"[i]Registration[/i]: Aronai Sieyes [i]Class[/i]: Small Frigate (Low Displacement) [i]Transponder[/i]: Transmitting (CIV), non-hostile @@ -90,6 +90,7 @@ initial_generic_waypoints = list("aronai3_fore", "aronai3_aft", "aronai3_port", "aronai3_starboard") initial_restricted_waypoints = list("Aro's Boat" = list("omship_spawn_aroboat3")) fore_dir = NORTH + known = FALSE skybox_icon = 'aro3.dmi' skybox_icon_state = "skybox" diff --git a/maps/offmap_vr/om_ships/bearcat.dm b/maps/offmap_vr/om_ships/bearcat.dm new file mode 100644 index 0000000000..69cb39e81f --- /dev/null +++ b/maps/offmap_vr/om_ships/bearcat.dm @@ -0,0 +1,202 @@ +// Compile in the map for CI testing if we're testing compileability of all the maps +#if MAP_TEST +#include "bearcat.dmm" +#endif + +// -- Datums -- // +/datum/map_template/om_ships/bearcat + name = "OM Ship - Bearcat (New Z)" + desc = "An old salvage ship, abandoned but seemingly intact." + mappath = 'bearcat.dmm' + +// The 'shuttle' +/datum/shuttle/autodock/overmap/bearcat + name = "Bearcat" + current_location = "omship_spawn_bearcat" + docking_controller_tag = "bearcat_docking" + shuttle_area = list( /area/ship/scrap, + /area/shuttle/bearcat/cargo, + /area/shuttle/bearcat/command, + /area/shuttle/bearcat/command_captain, + /area/shuttle/bearcat/comms, + /area/shuttle/bearcat/crew, + /area/shuttle/bearcat/crew_corridors, + /area/shuttle/bearcat/crew_dorms, + /area/shuttle/bearcat/crew_kitchen, + /area/shuttle/bearcat/crew_medbay, + /area/shuttle/bearcat/crew_saloon, + /area/shuttle/bearcat/crew_toilets, + /area/shuttle/bearcat/crew_wash, + /area/shuttle/bearcat/dock_central, + /area/shuttle/bearcat/dock_port, + /area/shuttle/bearcat/dock_starboard, + /area/shuttle/bearcat/maintenance, + /area/shuttle/bearcat/maintenance_atmos, + /area/shuttle/bearcat/maintenance_engine, + /area/shuttle/bearcat/maintenance_engine_pod_port, + /area/shuttle/bearcat/maintenance_engine_pod_starboard, + /area/shuttle/bearcat/maintenance_enginecontrol, + /area/shuttle/bearcat/maintenance_power, + /area/shuttle/bearcat/maintenance_storage, + /area/shuttle/bearcat/unused1, + /area/shuttle/bearcat/unused2 + ) //it's a miracle this thing works + defer_initialisation = TRUE //We're not loaded until an admin does it + fuel_consumption = 4 //chonker uses more fuel + move_direction = NORTH + ceiling_type = /turf/simulated/floor/reinforced/airless + +// A shuttle lateloader landmark +/obj/effect/shuttle_landmark/shuttle_initializer/bearcat + name = "IRV Bearcat" + base_area = /area/space + base_turf = /turf/space + landmark_tag = "omship_spawn_bearcat" + shuttle_type = /datum/shuttle/autodock/overmap/bearcat + +/obj/effect/overmap/visitable/ship/landable/bearcat + name = "Binturong-class Salvage Vessel" + scanner_desc = @{"[i]Registration[/i]: IRV Bearcat +[i]Class:[/i] Corvette +[i]Transponder[/i]: Transmitting \'Keep-Away\' Signal +[b]Notice[/b]: Abandoned under unclear circumstances."} + known = FALSE + vessel_mass = 3500 + vessel_size = SHIP_SIZE_LARGE + shuttle = "Bearcat" + +// The shuttle's 'shuttle' computer +/obj/machinery/computer/shuttle_control/explore/bearcat + name = "short jump console" + shuttle_tag = "Bearcat" + req_one_access = list() + +// -- Objs -- // +/obj/effect/shuttle_landmark/premade/bearcat/dock_w + name = "IRV Bearcat - Port Docking Ring" + landmark_tag = "bearcat_dock_w" + +/obj/effect/shuttle_landmark/premade/bearcat/dock_e + name = "IRV Bearcat - Starboard Docking Ring" + landmark_tag = "bearcat_dock_e" + +/area/ship/scrap + name = "\improper Bearcat" + has_gravity = 0 //predates artificial gravity - won't matter much due to all the walls to push off of! + +/area/shuttle/bearcat/crew + name = "\improper Bearcat Crew Compartments" + icon_state = "hallC" + +/area/shuttle/bearcat/crew_corridors + name = "\improper Bearcat Corridors" + icon_state = "hallC1" + +/area/shuttle/bearcat/crew_kitchen + name = "\improper Bearcat Galley" + icon_state = "kitchen" + +/area/shuttle/bearcat/crew_dorms + name = "\improper Bearcat Dorms" + icon_state = "crew_quarters" + +/area/shuttle/bearcat/crew_saloon + name = "\improper Bearcat Saloon" + icon_state = "conference" + +/area/shuttle/bearcat/crew_toilets + name = "\improper Bearcat Bathrooms" + icon_state = "toilet" + +/area/shuttle/bearcat/crew_wash + name = "\improper Bearcat Washroom" + icon_state = "locker" + +/area/shuttle/bearcat/crew_medbay + name = "\improper Bearcat Medical Bay" + icon_state = "medbay" + +/area/shuttle/bearcat/cargo + name = "\improper Bearcat Cargo Hold" + icon_state = "quartstorage" + +/area/shuttle/bearcat/dock + name = "\improper Bearcat Docking Bay" + icon_state = "start" + +/area/shuttle/bearcat/dock_central + name = "\improper Bearcat Passenger Bay" + icon_state = "start" + +/area/shuttle/bearcat/dock_port + name = "\improper Bearcat Docking Bay Port" + icon_state = "west" + +/area/shuttle/bearcat/dock_starboard + name = "\improper Bearcat Docking Bay Starboard" + icon_state = "east" + +/area/shuttle/bearcat/unused1 + name = "\improper Bearcat Unused Compartment #1" + icon_state = "green" + +/area/shuttle/bearcat/unused2 + name = "\improper Bearcat Unused Compartment #2" + icon_state = "yellow" + +/area/shuttle/bearcat/unused3 + name = "\improper Bearcat Unused Compartment #3" + icon_state = "blueold" + +/area/shuttle/bearcat/maintenance + name = "\improper Bearcat Maintenance Compartments" + icon_state = "storage" + +/area/shuttle/bearcat/maintenance_storage + name = "\improper Bearcat Tools Storage" + icon_state = "eva" + +/area/shuttle/bearcat/maintenance_atmos + name = "\improper Bearcat Atmospherics Compartment" + icon_state = "atmos" + music = list('sound/ambience/ambiatm1.ogg') + +/area/shuttle/bearcat/maintenance_power + name = "\improper Bearcat Power Compartment" + icon_state = "engine_smes" + music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg') + +/area/shuttle/bearcat/maintenance_engine + name = "\improper Bearcat Main Engine Compartment" + icon_state = "engine" + music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg') + +/area/shuttle/bearcat/maintenance_engine_pod_port + name = "\improper Bearcat Port Engine Pod" + icon_state = "west" + music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg') + +/area/shuttle/bearcat/maintenance_engine_pod_starboard + name = "\improper Bearcat Starboard Engine Pod" + icon_state = "east" + music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg') + +/area/shuttle/bearcat/maintenance_enginecontrol + name = "\improper Bearcat Engine Control Room" + icon_state = "engine_monitoring" + music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg') + +/area/shuttle/bearcat/command + name = "\improper Bearcat Command Deck" + icon_state = "centcom" + music = list('sound/ambience/signal.ogg') + +/area/shuttle/bearcat/command_captain + name = "\improper Bearcat Captain's Quarters" + icon_state = "captain" + music = list('sound/ambience/signal.ogg') + +/area/shuttle/bearcat/comms + name = "\improper Bearcat Communications Relay" + icon_state = "tcomsatcham" + music = list('sound/ambience/signal.ogg') \ No newline at end of file diff --git a/maps/offmap_vr/om_ships/cruiser.dm b/maps/offmap_vr/om_ships/cruiser.dm index f07d1e8bf1..ab47fc272e 100644 --- a/maps/offmap_vr/om_ships/cruiser.dm +++ b/maps/offmap_vr/om_ships/cruiser.dm @@ -125,14 +125,13 @@ mappath = 'cruiser.dmm' /obj/effect/overmap/visitable/ship/cruiser - name = "spacecraft" + name = "NDV Daedalus" + icon_state = "oberth_destroyer_g" desc = "Spacefaring vessel. NanoTrasen IFF detected." - scanner_name = "NDV Daedalus" scanner_desc = @{"[i]Registration[/i]: NDV Daedalus [i]Class[/i]: Light Cruiser [i]Transponder[/i]: Transmitting (MIL), NanoTrasen IFF [b]Notice[/b]: Military vessel, do not approach"} - color = "#0033ff" //Bluey vessel_mass = 15000 vessel_size = SHIP_SIZE_LARGE initial_generic_waypoints = list("cruiser_fore", "cruiser_aft", "cruiser_port", "cruiser_starboard", "ws_port_dock_1", "ws_port_dock_2", "ws_starboard_dock_1", "ws_starboard_dock_2") diff --git a/maps/offmap_vr/om_ships/curashuttle.dm b/maps/offmap_vr/om_ships/curashuttle.dm index 158d145894..e2a44154e6 100644 --- a/maps/offmap_vr/om_ships/curashuttle.dm +++ b/maps/offmap_vr/om_ships/curashuttle.dm @@ -56,12 +56,11 @@ // The 'ship' /obj/effect/overmap/visitable/ship/landable/curashuttle - scanner_name = "CRV Doom Delay" + name = "CRV Doom Delay" scanner_desc = @{"[i]Registration[/i]: Curabitur Scimed [i]Class[/i]: Small Shuttle [i]Transponder[/i]: Transmitting (CIV), non-hostile [b]Notice[/b]: Small private vessel"} - color = "#01A9DB" vessel_mass = 2000 vessel_size = SHIP_SIZE_TINY shuttle = "Cura" \ No newline at end of file diff --git a/maps/offmap_vr/om_ships/geckos.dm b/maps/offmap_vr/om_ships/geckos.dm new file mode 100644 index 0000000000..dd24fe4e20 --- /dev/null +++ b/maps/offmap_vr/om_ships/geckos.dm @@ -0,0 +1,176 @@ +// Compile in the map for CI testing if we're testing compileability of all the maps +#if MAP_TEST +#include "gecko_sh.dmm" +#include "gecko_cr.dmm" +#endif + +// Map template for spawning the shuttle +/datum/map_template/om_ships/gecko_stationhopper + name = "OM Ship - Gecko Stationhopper (new Z)" + desc = "A medium personnel transport shuttle." + mappath = 'gecko_sh.dmm' + annihilate = TRUE + +/datum/map_template/om_ships/gecko_cargohauler + name = "OM Ship - Gecko Cargo Hauler (new Z)" + desc = "A medium supply transport shuttle." + mappath = 'gecko_cr.dmm' + annihilate = TRUE + +/datum/map_template/om_ships/gecko_cargohauler_wreck + name = "OM Ship - Wrecked Gecko Cargo Hauler (new Z)" + desc = "A wrecked medium supply transport shuttle." + mappath = 'gecko_cr_wreck.dmm' + annihilate = TRUE + +// The shuttle's area(s) +/area/shuttle/gecko_sh + name = "\improper Gecko Stationhopper" + icon_state = "green" + requires_power = 1 + has_gravity = 0 + +/area/shuttle/gecko_sh_engineering + name = "\improper Gecko Stationhopper Engineering" + icon_state = "yellow" + requires_power = 1 + has_gravity = 0 + +/area/shuttle/gecko_sh_cockpit + name = "\improper Gecko Stationhopper Cockpit" + icon_state = "purple" + requires_power = 1 + has_gravity = 0 + +/area/shuttle/gecko_cr + name = "\improper Gecko Cargo Hauler Bay" + icon_state = "green" + requires_power = 1 + has_gravity = 0 + +/area/shuttle/gecko_cr_engineering + name = "\improper Gecko Cargo Hauler Aft" + icon_state = "yellow" + requires_power = 1 + has_gravity = 0 + +/area/shuttle/gecko_cr_cockpit + name = "\improper Gecko Cargo Hauler Fore" + icon_state = "purple" + requires_power = 1 + has_gravity = 0 + +/area/shuttle/gecko_cr_wreck + name = "\improper Wrecked Gecko Cargo Hauler Bay" + icon_state = "green" + requires_power = 1 + has_gravity = 0 + +/area/shuttle/gecko_cr_engineering_wreck + name = "\improper Wrecked Gecko Cargo Hauler Aft" + icon_state = "yellow" + requires_power = 1 + has_gravity = 0 + +/area/shuttle/gecko_cr_cockpit_wreck + name = "\improper Wrecked Gecko Cargo Hauler Fore" + icon_state = "purple" + requires_power = 1 + has_gravity = 0 + +// The shuttle's 'shuttle' computer +/obj/machinery/computer/shuttle_control/explore/gecko_sh + name = "short jump console" + shuttle_tag = "Gecko Stationhopper" + req_one_access = list() + +/obj/machinery/computer/shuttle_control/explore/gecko_cr + name = "short jump console" + shuttle_tag = "Gecko Cargo Hauler" + req_one_access = list() + +/obj/machinery/computer/shuttle_control/explore/gecko_cr_wreck + name = "short jump console" + shuttle_tag = "Wrecked Gecko Cargo Hauler" + req_one_access = list() + +// The 'shuttle' +/datum/shuttle/autodock/overmap/gecko_sh + name = "Gecko Stationhopper" + current_location = "omship_spawn_gecko_sh" + docking_controller_tag = "geck_sh_docking" + shuttle_area = list(/area/shuttle/gecko_sh,/area/shuttle/gecko_sh_cockpit,/area/shuttle/gecko_sh_engineering) + defer_initialisation = TRUE //We're not loaded until an admin does it + fuel_consumption = 7.5 + ceiling_type = /turf/simulated/floor/reinforced/airless + +/datum/shuttle/autodock/overmap/gecko_cr + name = "Gecko Cargo Hauler" + current_location = "omship_spawn_gecko_cr" + docking_controller_tag = "geck_cr_docking" + shuttle_area = list(/area/shuttle/gecko_cr,/area/shuttle/gecko_cr_cockpit,/area/shuttle/gecko_cr_engineering) + defer_initialisation = TRUE //We're not loaded until an admin does it + fuel_consumption = 7.5 + ceiling_type = /turf/simulated/floor/reinforced/airless + +/datum/shuttle/autodock/overmap/gecko_cr_wreck + name = "Wrecked Gecko Cargo Hauler" + current_location = "omship_spawn_gecko_cr_wreck" + docking_controller_tag = "geck_cr_wreck_docking" + shuttle_area = list(/area/shuttle/gecko_cr_wreck,/area/shuttle/gecko_cr_cockpit_wreck,/area/shuttle/gecko_cr_engineering_wreck) + defer_initialisation = TRUE //We're not loaded until an admin does it + fuel_consumption = 7.5 + ceiling_type = /turf/simulated/floor/reinforced/airless + +// A shuttle lateloader landmark +/obj/effect/shuttle_landmark/shuttle_initializer/gecko_sh + name = "ITV Gecko I" + base_area = /area/space + base_turf = /turf/space + landmark_tag = "omship_spawn_gecko_sh" + shuttle_type = /datum/shuttle/autodock/overmap/gecko_sh + +/obj/effect/shuttle_landmark/shuttle_initializer/gecko_cr + name = "ITV Gecko II" + base_area = /area/space + base_turf = /turf/space + landmark_tag = "omship_spawn_gecko_cr" + shuttle_type = /datum/shuttle/autodock/overmap/gecko_cr + +/obj/effect/shuttle_landmark/shuttle_initializer/gecko_cr_wreck + name = "ITV Gecko III" + base_area = /area/space + base_turf = /turf/space + landmark_tag = "omship_spawn_gecko_cr_wreck" + shuttle_type = /datum/shuttle/autodock/overmap/gecko_cr_wreck + +// The 'ship' +/obj/effect/overmap/visitable/ship/landable/gecko_sh + name = "Gecko-class Transport" + scanner_desc = @{"[i]Registration[/i]: ITV Sticky Fingers +[i]Class[/i]: Medium Shuttle +[i]Transponder[/i]: Transmitting (CIV), non-hostile +[b]Notice[/b]: Medium personnel transport vessel"} + vessel_mass = 6500 + vessel_size = SHIP_SIZE_LARGE + shuttle = "Gecko Stationhopper" + +/obj/effect/overmap/visitable/ship/landable/gecko_cr + name = "Gecko-class Transport" + scanner_desc = @{"[i]Registration[/i]: ITV Sticky Business +[i]Class[/i]: Medium Shuttle +[i]Transponder[/i]: Transmitting (CIV), non-hostile +[b]Notice[/b]: Medium cargo transport vessel"} + vessel_mass = 6500 + vessel_size = SHIP_SIZE_LARGE + shuttle = "Gecko Cargo Hauler" + +/obj/effect/overmap/visitable/ship/landable/gecko_cr_wreck + name = "Wrecked Gecko-class Transport" + scanner_desc = @{"[i]Registration[/i]: ITV Sticky Situation +[i]Class[/i]: Medium Shuttle +[i]Transponder[/i]: Weakly transmitting (CIV), non-hostile +[b]Notice[/b]: Medium cargo transport vessel, significant damage inflicted"} + vessel_mass = 6500 + vessel_size = SHIP_SIZE_LARGE + shuttle = "Wrecked Gecko Cargo Hauler" \ No newline at end of file diff --git a/maps/offmap_vr/om_ships/generic_shuttle.dm b/maps/offmap_vr/om_ships/generic_shuttle.dm index 0c5f894b29..65cfb4b4cc 100644 --- a/maps/offmap_vr/om_ships/generic_shuttle.dm +++ b/maps/offmap_vr/om_ships/generic_shuttle.dm @@ -45,7 +45,7 @@ // The 'ship' /obj/effect/overmap/visitable/ship/landable/generic_shuttle - scanner_name = "Private Vessel" + name = "Private Vessel" scanner_desc = @{"[i]Registration[/i]: PRIVATE [i]Class[/i]: Small Shuttle [i]Transponder[/i]: Transmitting (CIV), non-hostile diff --git a/maps/offmap_vr/om_ships/hybridshuttle.dm b/maps/offmap_vr/om_ships/hybridshuttle.dm index 2194ea3416..c35c9af290 100644 --- a/maps/offmap_vr/om_ships/hybridshuttle.dm +++ b/maps/offmap_vr/om_ships/hybridshuttle.dm @@ -41,12 +41,12 @@ // The 'ship' /obj/effect/overmap/visitable/ship/landable/hybridshuttle - scanner_name = "XN-29 Prototype Shuttle" + name = "XN-29 Prototype Shuttle" + icon_state = "unkn_o" scanner_desc = @{"[i]Registration[/i]: UNKNOWN [i]Class[/i]: Shuttle [i]Transponder[/i]: Transmitting (MIL), NanoTrasen [b]Notice[/b]: Experimental vessel"} - color = "#00aaff" //Bluey vessel_mass = 3000 vessel_size = SHIP_SIZE_SMALL shuttle = "XN-29 Prototype Shuttle" \ No newline at end of file diff --git a/maps/offmap_vr/om_ships/itglight.dm b/maps/offmap_vr/om_ships/itglight.dm index f9a31db30d..9671a4aecd 100644 --- a/maps/offmap_vr/om_ships/itglight.dm +++ b/maps/offmap_vr/om_ships/itglight.dm @@ -85,14 +85,13 @@ // The 'Dauntless' /obj/effect/overmap/visitable/ship/itglight - name = "spacecraft" + name = "ITG Dauntless" + icon_state = "serb_destroyer_g" desc = "Spacefaring vessel. Friendly IFF detected." - scanner_name = "ITG Dauntless" scanner_desc = @{"[i]Registration[/i]: ITG Dauntless [i]Class[/i]: Small Cargo Frigate (Low Displacement) [i]Transponder[/i]: Transmitting (CIV), non-hostile" [b]Notice[/b]: May carry passengers"} - color = "#d98c1a" //orng vessel_mass = 8000 vessel_size = SHIP_SIZE_SMALL initial_generic_waypoints = list("itglight_fore", "itglight_aft", "itglight_port", "itglight_starboard", "itglight_port_dock", "itglight_starboard_dock") diff --git a/maps/offmap_vr/om_ships/mackerels.dm b/maps/offmap_vr/om_ships/mackerels.dm new file mode 100644 index 0000000000..f18d04e526 --- /dev/null +++ b/maps/offmap_vr/om_ships/mackerels.dm @@ -0,0 +1,241 @@ +// Compile in the map for CI testing if we're testing compileability of all the maps +#if MAP_TEST +#include "mackerel_sh.dmm" +#include "mackerel_lc.dmm" +#include "mackerel_lc_wreck.dmm" +#include "mackerel_hc.dmm" +#include "mackerel_hc_skel.dmm" +#endif + +// Map template for spawning the shuttle +/datum/map_template/om_ships/mackerel_stationhopper + name = "OM Ship - Mackerel Stationhopper (new Z)" + desc = "A small personnel transport shuttle." + mappath = 'mackerel_sh.dmm' + annihilate = TRUE + +/datum/map_template/om_ships/mackerel_lightcargo + name = "OM Ship - Mackerel Light Cargo (new Z)" + desc = "A small light cargo transport shuttle." + mappath = 'mackerel_lc.dmm' + annihilate = TRUE + +/datum/map_template/om_ships/mackerel_heavycargo + name = "OM Ship - Mackerel Heavy Cargo (new Z)" + desc = "A small secure cargo transport shuttle." + mappath = 'mackerel_hc.dmm' + annihilate = TRUE + +/datum/map_template/om_ships/mackerel_heavycargo_skel + name = "OM Ship - Mackerel Heavy Cargo Spartanized (new Z)" + desc = "A small heavy cargo transport shuttle." + mappath = 'mackerel_hc_skel.dmm' + annihilate = TRUE + +/datum/map_template/om_ships/mackerel_lightcargo_wreck + name = "OM Ship - Mackerel Light Cargo Wreck (new Z)" + desc = "A small light cargo transport shuttle, struck by... something. Ouch." + mappath = 'mackerel_lc_wreck.dmm' + annihilate = TRUE + +// The shuttle's area(s) +/area/shuttle/mackerel_sh + name = "\improper Mackerel Stationhopper" + icon_state = "green" + requires_power = 1 + has_gravity = 0 + +/area/shuttle/mackerel_lc + name = "\improper Mackerel Light Cargo" + icon_state = "green" + requires_power = 1 + has_gravity = 0 + +/area/shuttle/mackerel_hc + name = "\improper Mackerel Heavy Cargo" + icon_state = "green" + requires_power = 1 + has_gravity = 0 + +/area/shuttle/mackerel_hc_skel + name = "\improper Mackerel Heavy Cargo Spartan" + icon_state = "green" + requires_power = 1 + has_gravity = 0 + +/area/shuttle/mackerel_hc_skel_cockpit + name = "\improper Mackerel Heavy Cargo Cockpit" + icon_state = "purple" + requires_power = 1 + has_gravity = 0 + +/area/shuttle/mackerel_hc_skel_eng + name = "\improper Mackerel Heavy Cargo Engineering" + icon_state = "yellow" + requires_power = 1 + has_gravity = 0 + +/area/shuttle/mackerel_lc_wreck + name = "\improper Wrecked Mackerel Light Cargo" + icon_state = "green" + requires_power = 1 + has_gravity = 0 + +// The shuttle's 'shuttle' computer +/obj/machinery/computer/shuttle_control/explore/mackerel_sh + name = "short jump console" + shuttle_tag = "Mackerel Stationhopper" + req_one_access = list() + +/obj/machinery/computer/shuttle_control/explore/mackerel_lc + name = "short jump console" + shuttle_tag = "Mackerel Light Cargo" + req_one_access = list() + +/obj/machinery/computer/shuttle_control/explore/mackerel_lc_wreck + name = "short jump console" + shuttle_tag = "Mackerel Light Cargo II" + req_one_access = list() + +/obj/machinery/computer/shuttle_control/explore/mackerel_hc + name = "short jump console" + shuttle_tag = "Mackerel Heavy Cargo" + req_one_access = list() + +/obj/machinery/computer/shuttle_control/explore/mackerel_hc_skel + name = "short jump console" + shuttle_tag = "Mackerel Heavy Cargo Spartan" + req_one_access = list() + +// The 'shuttle' +/datum/shuttle/autodock/overmap/mackerel_sh + name = "Mackerel Stationhopper" + current_location = "omship_spawn_mackerel_sh" + docking_controller_tag = "mackerel_sh_docking" + shuttle_area = list(/area/shuttle/mackerel_sh) + defer_initialisation = TRUE + fuel_consumption = 1 + ceiling_type = /turf/simulated/floor/reinforced/airless + +/datum/shuttle/autodock/overmap/mackerel_lc + name = "Mackerel Light Cargo" + current_location = "omship_spawn_mackerel_lc" + docking_controller_tag = "mackerel_lc_docking" + shuttle_area = list(/area/shuttle/mackerel_lc) + defer_initialisation = TRUE + fuel_consumption = 1 + ceiling_type = /turf/simulated/floor/reinforced/airless + +/datum/shuttle/autodock/overmap/mackerel_hc + name = "Mackerel Heavy Cargo" + current_location = "omship_spawn_mackerel_hc" + docking_controller_tag = "mackerel_hc_docking" + shuttle_area = list(/area/shuttle/mackerel_hc) + defer_initialisation = TRUE + fuel_consumption = 1.25 //slightly higher due to the added framework/plating + ceiling_type = /turf/simulated/floor/reinforced/airless + +/datum/shuttle/autodock/overmap/mackerel_hc_skel + name = "Mackerel Heavy Cargo Spartan" + current_location = "omship_spawn_mackerel_hc_skel" + docking_controller_tag = "mackerel_hc_skel_docking" + shuttle_area = list(/area/shuttle/mackerel_hc_skel,/area/shuttle/mackerel_hc_skel_cockpit,/area/shuttle/mackerel_hc_skel_eng) + defer_initialisation = TRUE + fuel_consumption = 1.20 //slightly lower due to the stripped-down internals + ceiling_type = /turf/simulated/floor/reinforced/airless + +/datum/shuttle/autodock/overmap/mackerel_lc_wreck + name = "Mackerel Light Cargo II" + current_location = "omship_spawn_mackerel_lc_wreck" + docking_controller_tag = "mackerel_lc_wreck_docking" + shuttle_area = list(/area/shuttle/mackerel_lc_wreck) + defer_initialisation = TRUE + fuel_consumption = 1 + ceiling_type = /turf/simulated/floor/reinforced/airless + +// A shuttle lateloader landmark +/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_sh + name = "ITV Mackerel I" + base_area = /area/space + base_turf = /turf/space + landmark_tag = "omship_spawn_mackerel_sh" + shuttle_type = /datum/shuttle/autodock/overmap/mackerel_sh + +/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_lc + name = "ITV Mackerel II" + base_area = /area/space + base_turf = /turf/space + landmark_tag = "omship_spawn_mackerel_lc" + shuttle_type = /datum/shuttle/autodock/overmap/mackerel_lc + +/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_hc + name = "ITV Mackerel III" + base_area = /area/space + base_turf = /turf/space + landmark_tag = "omship_spawn_mackerel_hc" + shuttle_type = /datum/shuttle/autodock/overmap/mackerel_hc + +/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_hc_skel + name = "ITV Mackerel IV" + base_area = /area/space + base_turf = /turf/space + landmark_tag = "omship_spawn_mackerel_hc_skel" + shuttle_type = /datum/shuttle/autodock/overmap/mackerel_hc_skel + +/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_lc_wreck + name = "ITV Mackerel II KIA" + base_area = /area/space + base_turf = /turf/space + landmark_tag = "omship_spawn_mackerel_lc_wreck" + shuttle_type = /datum/shuttle/autodock/overmap/mackerel_lc_wreck + +// The 'ship' +/obj/effect/overmap/visitable/ship/landable/mackerel_sh + name = "Mackerel-class Transport" + scanner_desc = @{"[i]Registration[/i]: ITV Phish Phlake +[i]Class[/i]: Small Shuttle +[i]Transponder[/i]: Transmitting (CIV), non-hostile +[b]Notice[/b]: Small private vessel"} + vessel_mass = 1000 + vessel_size = SHIP_SIZE_TINY + shuttle = "Mackerel Stationhopper" + +/obj/effect/overmap/visitable/ship/landable/mackerel_lc + name = "Mackerel-class Transport" + scanner_desc = @{"[i]Registration[/i]: ITV Phishy Business +[i]Class[/i]: Small Shuttle +[i]Transponder[/i]: Transmitting (CIV), non-hostile +[b]Notice[/b]: Small private vessel"} + vessel_mass = 1000 + vessel_size = SHIP_SIZE_TINY + shuttle = "Mackerel Light Cargo" + +/obj/effect/overmap/visitable/ship/landable/mackerel_hc + name = "Mackerel-class Transport" + scanner_desc = @{"[i]Registration[/i]: ITV Phish Pharma +[i]Class[/i]: Small Shuttle +[i]Transponder[/i]: Transmitting (CIV), non-hostile +[b]Notice[/b]: Small private vessel"} + vessel_mass = 1500 + vessel_size = SHIP_SIZE_TINY + shuttle = "Mackerel Heavy Cargo" + +/obj/effect/overmap/visitable/ship/landable/mackerel_hc_skel + name = "Mackerel-class Transport (Spartanized)" + scanner_desc = @{"[i]Registration[/i]: ITV Phish Pond +[i]Class[/i]: Small Shuttle +[i]Transponder[/i]: Transmitting (CIV), non-hostile +[b]Notice[/b]: Small private vessel"} + vessel_mass = 1500 + vessel_size = SHIP_SIZE_TINY + shuttle = "Mackerel Heavy Cargo Spartan" + +/obj/effect/overmap/visitable/ship/landable/mackerel_lc_wreck + name = "Wrecked Mackerel-class Transport" + scanner_desc = @{"[i]Registration[/i]: ITV Phish Phood +[i]Class[/i]: Small Shuttle Wreck +[i]Transponder[/i]: Not Transmitting +[b]Notice[/b]: Critical Damage Sustained"} + vessel_mass = 1000 + vessel_size = SHIP_SIZE_TINY + shuttle = "Mackerel Light Cargo II" diff --git a/maps/offmap_vr/om_ships/mercship.dm b/maps/offmap_vr/om_ships/mercship.dm index e4bc8477d1..3229dbb3ff 100644 --- a/maps/offmap_vr/om_ships/mercship.dm +++ b/maps/offmap_vr/om_ships/mercship.dm @@ -64,12 +64,12 @@ // The 'ship' /obj/effect/overmap/visitable/ship/mercship name = "Unknown Vessel" + icon_state = "moe_destroyer_r" desc = "Spacefaring vessel. No IFF detected." scanner_desc = @{"[i]Registration[/i]: UNKNOWN [i]Class[/i]: UNKNOWN [i]Transponder[/i]: None Detected [b]Notice[/b]: Unregistered vessel"} - color = "#f23000" //Red vessel_mass = 8000 vessel_size = SHIP_SIZE_SMALL initial_generic_waypoints = list("carrier_fore", "carrier_aft", "carrier_port", "carrier_starboard", "base_dock") diff --git a/maps/offmap_vr/om_ships/salamander.dm b/maps/offmap_vr/om_ships/salamander.dm index 8dbd5d53c3..a94780d12e 100644 --- a/maps/offmap_vr/om_ships/salamander.dm +++ b/maps/offmap_vr/om_ships/salamander.dm @@ -148,12 +148,11 @@ // The 'ship' /obj/effect/overmap/visitable/ship/landable/salamander - scanner_name = "Salamander-class Corvette" + name = "Salamander-class Corvette" scanner_desc = @{"[i]Registration[/i]: ITV Independence [i]Class[/i]: Corvette [i]Transponder[/i]: Transmitting (CIV), non-hostile [b]Notice[/b]: Multirole independent vessel"} - color = "#00AA00" //green, because money vessel_mass = 4500 vessel_size = SHIP_SIZE_LARGE fore_dir = EAST @@ -179,12 +178,11 @@ // The 'ship' /obj/effect/overmap/visitable/ship/landable/salamander_wreck - scanner_name = "Wrecked Salamander-class Corvette" + name = "Wrecked Salamander-class Corvette" scanner_desc = @{"[i]Registration[/i]: ITV Unity [i]Class[/i]: Corvette [i]Transponder[/i]: Not Transmitting [b]Notice[/b]: Damage to hull is consistent with intentional scuttling procedures, no distress call logged"} - color = "#008800" //green, because money vessel_mass = 4500 vessel_size = SHIP_SIZE_LARGE fore_dir = EAST diff --git a/maps/offmap_vr/om_ships/screebarge.dm b/maps/offmap_vr/om_ships/screebarge.dm index 317f34396b..08d4390269 100644 --- a/maps/offmap_vr/om_ships/screebarge.dm +++ b/maps/offmap_vr/om_ships/screebarge.dm @@ -48,7 +48,6 @@ /obj/effect/overmap/visitable/ship/landable/screebarge name = "Battle Barge" desc = "Some sort of makeshift battle barge. Appears to be armed." - color = "#95c633" //Greenish vessel_mass = 3000 vessel_size = SHIP_SIZE_SMALL shuttle = "Battle Barge" \ No newline at end of file diff --git a/maps/offmap_vr/om_ships/shelter_5.dm b/maps/offmap_vr/om_ships/shelter_5.dm index 28dd871bbf..e23a6814c1 100644 --- a/maps/offmap_vr/om_ships/shelter_5.dm +++ b/maps/offmap_vr/om_ships/shelter_5.dm @@ -40,7 +40,7 @@ // The 'ship' /obj/effect/overmap/visitable/ship/landable/escapepod - scanner_name = "Escape Pod" + name = "Escape Pod" scanner_desc = @{"[i]Registration[/i]: NOT AVAILABLE [i]Class[/i]: Escape Pod [i]Transponder[/i]: Transmitting (CIV), non-hostile diff --git a/maps/offmap_vr/om_ships/shelter_6.dm b/maps/offmap_vr/om_ships/shelter_6.dm index d6f5f78063..40ff4cdaeb 100644 --- a/maps/offmap_vr/om_ships/shelter_6.dm +++ b/maps/offmap_vr/om_ships/shelter_6.dm @@ -42,12 +42,11 @@ // The 'ship' /obj/effect/overmap/visitable/ship/landable/tabiranth - scanner_name = "Experimental Dropship" + name = "Experimental Dropship" scanner_desc = @{"[i]Registration[/i]: UNKNOWN [i]Class[/i]: Assault Dropship [i]Transponder[/i]: Transmitting (MIL), NanoTrasen [b]Notice[/b]: Experimental vessel"} - color = "#8800ff" //Indigo vessel_mass = 3000 vessel_size = SHIP_SIZE_SMALL shuttle = "NDV Tabiranth" diff --git a/maps/offmap_vr/om_ships/vespa.dm b/maps/offmap_vr/om_ships/vespa.dm index 04a680abb9..b6a2b1b963 100644 --- a/maps/offmap_vr/om_ships/vespa.dm +++ b/maps/offmap_vr/om_ships/vespa.dm @@ -120,12 +120,11 @@ // The 'ship' /obj/effect/overmap/visitable/ship/vespa desc = "A spacefaring vessel, of Hephaestus design." - scanner_name = "HPV Vespa" + name = "HPV Vespa" scanner_desc = @{"[i]Registration[/i]: HPV Vespa [i]Class[/i]: Cruiser [i]Transponder[/i]: Transmitting (CIV), Hephaestus Industries [b]Notice[/b]: Corporate vessel"} - color = "#4cad73" //Green vessel_mass = 10000 vessel_size = SHIP_SIZE_LARGE initial_generic_waypoints = list("hpv_port", "hpv_starboard", "hpv_hangar") diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm index 3237f2798f..2b2ede093c 100644 --- a/maps/offmap_vr/talon/talon_v2.dm +++ b/maps/offmap_vr/talon/talon_v2.dm @@ -38,18 +38,18 @@ var/global/list/latejoin_talon = list() /////////////////////////// //// The Talon /obj/effect/overmap/visitable/ship/talon - scanner_name = "ITV Talon" + name = "ITV Talon" + icon_state = "talon_v2" scanner_desc = @{"[i]Registration[/i]: ITV Talon [i]Class[/i]: Frigate [i]Transponder[/i]: Transmitting (CIV) [b]Notice[/b]: Independent trader vessel"} - color = "#aacccc" vessel_mass = 10000 vessel_size = SHIP_SIZE_LARGE initial_generic_waypoints = list("talon_v2_near_fore_port", "talon_v2_near_fore_star", "talon_v2_near_aft_port", "talon_v2_near_aft_star", "talon_v2_wing_port", "talon_v2_wing_star") initial_restricted_waypoints = list("Talon's Shuttle" = list("offmap_spawn_talonboat")) - skybox_icon = 'talon.dmi' //Art by Gwyvern, distributed under Creative Commons license + skybox_icon = 'talon.dmi' skybox_icon_state = "skybox" skybox_pixel_x = 270 skybox_pixel_y = 60 diff --git a/maps/southern_cross/overmap/sectors.dm b/maps/southern_cross/overmap/sectors.dm index 2dcdcd2c76..717af80290 100644 --- a/maps/southern_cross/overmap/sectors.dm +++ b/maps/southern_cross/overmap/sectors.dm @@ -11,11 +11,7 @@ mountain_color = "#735555" ice_color = "FFFFFF" icecaps = "icecaps" - - initial_generic_waypoints = list( - "outpost_nw", - "outpost_s" - ) + icon_state = "frozen" //CHOMP comment: Not sure what this does at the moment, but we're doing it live. /obj/effect/overmap/visitable/planet/Sif/Initialize() atmosphere = new(CELL_VOLUME) @@ -74,3 +70,7 @@ Z_LEVEL_STATION_TWO, Z_LEVEL_STATION_THREE, Z_LEVEL_MISC) + +/obj/effect/overmap/visitable/planet/Sif/Initialize() + . = ..() + docking_codes = null diff --git a/maps/submaps/admin_use_vr/ert.dm b/maps/submaps/admin_use_vr/ert.dm index e46164f94c..bfa9a49c5c 100644 --- a/maps/submaps/admin_use_vr/ert.dm +++ b/maps/submaps/admin_use_vr/ert.dm @@ -110,12 +110,12 @@ // The 'ship' /obj/effect/overmap/visitable/ship/ert_ship name = "NRV Von Braun" + icon_state = "oberth_destroyer_g" desc = "Spacefaring vessel. Broadcasting Corporate Emergency Responder IFF." scanner_desc = @{"[i]Registration[/i]: Nanotrasen RRV Von Braun [i]Class[/i]: [i]Kepler[/i]-class Frigate [i]Transponder[/i]: Broadcasting (ER-CORP) [b]Notice[/b]: Impeding or interfering with emergency response vessels is a breach of numerous interstellar codes. Approach with caution."} - color = "#9999ff" //Blue vessel_mass = 8000 vessel_size = SHIP_SIZE_LARGE fore_dir = EAST diff --git a/maps/submaps/admin_use_vr/fun.dm b/maps/submaps/admin_use_vr/fun.dm index 2520516b15..6759aba381 100644 --- a/maps/submaps/admin_use_vr/fun.dm +++ b/maps/submaps/admin_use_vr/fun.dm @@ -162,9 +162,8 @@ // This is a stationary overmap sector, you can spawn it in any zlevel and it will pop onto the overmap to represent those zlevels. It always moves to 2,2 on the overmap and you can move it elsewhere. /obj/effect/overmap/visitable/admin_use - name = "space destination" + name = "REPLACE ME" desc = "Some space destination!" - scanner_name = "REPLACE ME" scanner_desc = @{"[i]Registration[/i]: REPLACE ME [i]Class[/i]: REPLACE ME [i]Transponder[/i]: REPLACE ME @@ -180,9 +179,8 @@ // This is the same, but makes a whole spaceship! /obj/effect/overmap/visitable/ship/admin_use - name = "spacecraft" + name = "REPLACE ME" desc = "Spacefaring vessel." - scanner_name = "REPLACE ME" scanner_desc = @{"[i]Registration[/i]: REPLACE ME [i]Class[/i]: REPLACE ME [i]Transponder[/i]: REPLACE ME diff --git a/maps/submaps/admin_use_vr/guttersite.dm b/maps/submaps/admin_use_vr/guttersite.dm index 3d99c8ef0b..24d745a554 100644 --- a/maps/submaps/admin_use_vr/guttersite.dm +++ b/maps/submaps/admin_use_vr/guttersite.dm @@ -6,9 +6,8 @@ scanner_desc = @{"[i]Transponder[/i]: Strong Comms Signal [b]Notice[/b]: WARNING! KEEP OUT! MEMBERS ONLY!"} icon = 'icons/obj/overmap_vr.dmi' - icon_state = "guttersite" + icon_state = "os_fortress_r" known = FALSE - color = "#ee3333" //Redish, so it stands out against the other debris-like icons initial_generic_waypoints = list("guttersite_lshuttle", "guttersite_sshuttle", "guttersite_mshuttle") // -- Objs -- // diff --git a/maps/submaps/admin_use_vr/mercship.dm b/maps/submaps/admin_use_vr/mercship.dm index 2f30d3e8ac..7d94300073 100644 --- a/maps/submaps/admin_use_vr/mercship.dm +++ b/maps/submaps/admin_use_vr/mercship.dm @@ -139,7 +139,6 @@ [i]Class[/i]: [i]Manta[/i]-class Cruiser [i]Transponder[/i]: Broadcasting (PMC) [b]Notice[/b]: SAARE are unlikely to tolerate civilian or corporate personnel interfering with their affairs. Approach with caution."} - color = "#333333" //TACTICAL BLACK vessel_mass = 8000 vessel_size = SHIP_SIZE_LARGE initial_generic_waypoints = list("manta_ship_near_fore", "manta_ship_near_aft", "manta_ship_near_port", "manta_ship_near_star", "manta_ship_port", "manta_ship_star", "manta_ship_base_dock", "omship_spawn_manta_lander") @@ -201,14 +200,12 @@ defer_initialisation = TRUE /obj/effect/overmap/visitable/ship/landable/manta_ship_boat - scanner_name = "SAARE Landing Craft" + name = "SAARE Landing Craft" desc = "Spacefaring vessel. Broadcasting Private Military Contractor IFF." scanner_desc = @{"[i]Registration[/i]: SAARE Mercenary Cruiser Typhon Four-Niner's Lander [i]Class[/i]: Unknown Shuttle-approximate [i]Transponder[/i]: Broadcasting (PMC) [b]Notice[/b]: SAARE are unlikely to tolerate civilian or corporate personnel interfering with their affairs. Approach with caution."} - color = "#3366FF" - color = "#333333" //TACTICAL BLACK vessel_mass = 500 vessel_size = SHIP_SIZE_TINY shuttle = "Boarding Craft" diff --git a/maps/submaps/depreciated_vr/talon.dm b/maps/submaps/depreciated_vr/talon.dm index 7a51787226..968f26e5d2 100644 --- a/maps/submaps/depreciated_vr/talon.dm +++ b/maps/submaps/depreciated_vr/talon.dm @@ -38,12 +38,12 @@ var/global/list/latejoin_talon = list() /////////////////////////// //// The Talon /obj/effect/overmap/visitable/ship/talon - scanner_name = "ITV Talon" + name = "ITV Talon" + icon_state = "talon_v2" scanner_desc = @{"[i]Registration[/i]: ITV Talon [i]Class[/i]: Frigate [i]Transponder[/i]: Transmitting (CIV) [b]Notice[/b]: Independent trader vessel"} - color = "#aacccc" vessel_mass = 10000 vessel_size = SHIP_SIZE_LARGE initial_generic_waypoints = list("talon_fore", "talon_aft", "talon_port", "talon_starboard") diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index c42104de1c..040ca78627 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -2486,9 +2486,6 @@ /turf/simulated/floor/plating, /area/engineering/atmos) "aed" = ( -/obj/machinery/vending/medical{ - dir = 1 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, @@ -2498,6 +2495,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/table/standard, +/obj/random/maintenance/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "aee" = ( @@ -3393,18 +3392,11 @@ /turf/simulated/floor/tiled, /area/rnd/hardstorage) "afv" = ( -/obj/structure/closet/firecloset, +/obj/machinery/vending/tool, /turf/simulated/floor/tiled, /area/storage/primary) "afw" = ( -/obj/structure/table/standard, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/machinery/alarm{ - pixel_y = 23 - }, +/obj/machinery/vending/assist, /turf/simulated/floor/tiled, /area/storage/primary) "afx" = ( @@ -3429,19 +3421,9 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "afz" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/machinery/camera/network/tether, +/obj/machinery/vending/hydronutrients/brig, /turf/simulated/floor/tiled, -/area/hallway/lower/first_west) +/area/tether/surfacebase/security/brig) "afA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3704,9 +3686,9 @@ /turf/simulated/floor/tiled, /area/storage/primary) "afW" = ( -/obj/structure/table/standard, +/obj/machinery/seed_storage/brig, /turf/simulated/floor/tiled, -/area/storage/primary) +/area/tether/surfacebase/security/brig) "afX" = ( /obj/machinery/door/airlock/maintenance/rnd{ name = "Research Maintenance Access"; @@ -3725,8 +3707,25 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/hardstorage) "afY" = ( -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/fitness, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/tram) "afZ" = ( /obj/effect/floor_decal/borderfloor{ @@ -3748,9 +3747,6 @@ /obj/machinery/camera/network/civilian{ dir = 9 }, -/obj/machinery/vending/coffee{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "agb" = ( @@ -3863,6 +3859,7 @@ pixel_x = 24 }, /obj/machinery/light/small, +/obj/structure/closet/crate/plastic, /turf/simulated/floor/tiled, /area/rnd/hardstorage) "ags" = ( @@ -3937,9 +3934,7 @@ /turf/simulated/floor/tiled, /area/storage/primary) "agB" = ( -/obj/machinery/vending/tool{ - dir = 8 - }, +/obj/structure/closet/firecloset, /turf/simulated/floor/tiled, /area/storage/primary) "agC" = ( @@ -4524,21 +4519,15 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "ahI" = ( -/obj/machinery/status_display{ - pixel_y = 30 +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/first_west) +/obj/machinery/vending/fitness, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "ahJ" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 @@ -5490,9 +5479,6 @@ /turf/simulated/wall/r_wall, /area/crew_quarters/sleep/Dorm_7) "ajm" = ( -/obj/machinery/vending/tool{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -7292,9 +7278,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/machinery/vending/coffee{ - dir = 4 - }, +/obj/machinery/vending/coffee, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/public_garden) "amj" = ( @@ -7504,6 +7488,7 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 6 }, +<<<<<<< HEAD /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 @@ -7519,6 +7504,26 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/public_garden) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/snack{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/hallway/lower/first_west) +======= +/turf/simulated/floor/tiled, +/area/hallway/lower/first_west) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "amD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -7705,13 +7710,11 @@ /turf/simulated/floor/tiled, /area/storage/primary) "amV" = ( -/obj/machinery/vending/assist{ - dir = 8 - }, /obj/machinery/status_display{ layer = 4; pixel_x = 32 }, +/obj/structure/table/standard, /turf/simulated/floor/tiled, /area/storage/primary) "amW" = ( @@ -8551,6 +8554,24 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +======= +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/status_display{ + pixel_x = 32; + pixel_y = -32 + }, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "aoh" = ( @@ -8935,10 +8956,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"aoR" = ( -/obj/machinery/light/flamp/noshade, -/turf/simulated/floor/grass, -/area/tether/surfacebase/surface_one_hall) "aoS" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, @@ -12987,12 +13004,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "avD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) @@ -13091,6 +13108,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "avK" = ( @@ -13393,49 +13413,31 @@ /turf/simulated/wall, /area/rnd/hallway) "awo" = ( -/obj/machinery/vending/snack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey{ +/obj/effect/floor_decal/corner/paleblue{ dir = 9 }, -/obj/effect/floor_decal/corner/lightgrey{ +/obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/hallway/lower/first_west) +/obj/machinery/vending/medical, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "awp" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 9 +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/machinery/vending/cola{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/hallway/lower/first_west) +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "awq" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -13453,14 +13455,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/machinery/vending/fitness{ - dir = 1 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/vending/snack, /turf/simulated/floor/tiled/monotile, -/area/hallway/lower/first_west) +/area/tether/surfacebase/lowernorthhall) "awr" = ( /obj/structure/cable{ d1 = 4; @@ -13674,21 +13671,25 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "awF" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/lowerhall) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/coffee, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/lowernorthhall) "awG" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -13820,12 +13821,6 @@ /obj/item/weapon/folder/red, /turf/simulated/floor/tiled, /area/security/checkpoint) -"awR" = ( -/obj/machinery/vending/snack{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/tram) "awS" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -14389,12 +14384,6 @@ /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) -"axz" = ( -/obj/machinery/vending/cola{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/tram) "axA" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -14580,9 +14569,37 @@ /turf/simulated/wall, /area/tether/surfacebase/medical/lowerhall) "axM" = ( -/obj/machinery/vending/coffee{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/snack, +/turf/simulated/floor/tiled/monotile, +/area/hallway/lower/first_west) +"axN" = ( +/obj/structure/table/standard, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/machinery/alarm{ + pixel_y = 23 + }, +/turf/simulated/floor/tiled, +/area/storage/primary) +"axO" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, @@ -14592,29 +14609,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/lowerhall) -"axN" = ( -/obj/machinery/vending/fitness{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/lowerhall) -"axO" = ( -/obj/machinery/vending/snack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 +/obj/structure/table/standard, +/obj/structure/noticeboard{ + pixel_x = -32 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) @@ -15425,6 +15422,10 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 5 }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 26 + }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "ayX" = ( @@ -16954,12 +16955,26 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aBs" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/turf/simulated/floor/plating, -/area/vacant/vacant_site/east) +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/cigarette, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/surface_one_hall) "aBt" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -17246,35 +17261,49 @@ /turf/simulated/floor/plating, /area/crew_quarters/locker/laundry_arrival) "aBU" = ( -/obj/machinery/washing_machine, -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/effect/floor_decal/corner/lightgrey/border{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) +/area/hallway/lower/first_west) "aBV" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ +/obj/effect/floor_decal/corner/lightgrey{ dir = 6 }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 }, +<<<<<<< HEAD /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" +======= +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/snix, +/turf/simulated/floor/tiled/monotile, +/area/hallway/lower/first_west) "aBW" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -17696,33 +17725,55 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "aCH" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/structure/sign/poster{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) +/obj/machinery/vending/cola, +/turf/simulated/floor/tiled/monotile, +/area/hallway/lower/first_west) "aCI" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, +<<<<<<< HEAD /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/cable/orange, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker/laundry_arrival) +======= +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/fitness, +/turf/simulated/floor/tiled/monotile, +/area/hallway/lower/first_west) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aCJ" = ( /turf/simulated/floor/plating, /area/vacant/vacant_site/east) @@ -17804,7 +17855,7 @@ /turf/simulated/floor/lino, /area/crew_quarters/visitor_dining) "aCT" = ( -/obj/machinery/vending/fitness{ +/obj/structure/bed/chair{ dir = 4 }, /turf/simulated/floor/tiled, @@ -17958,6 +18009,7 @@ dir = 8 }, /obj/machinery/light_switch{ + dir = 1; pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -17971,31 +18023,44 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "aDp" = ( -/obj/machinery/washing_machine, /obj/effect/floor_decal/borderfloor{ - dir = 10 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ - dir = 10 + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/camera/network/tether{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) +/area/hallway/lower/first_west) "aDq" = ( -/obj/machinery/light_switch{ - pixel_y = -25 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 - }, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/corner/lightgrey{ dir = 6 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/cola, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/tram) "aDr" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 @@ -18037,10 +18102,25 @@ /turf/simulated/floor/lino, /area/crew_quarters/visitor_dining) "aDw" = ( -/obj/machinery/vending/coffee{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/snack, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/tram) "aDx" = ( /obj/structure/closet/crate, @@ -18353,17 +18433,28 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_dining) "aEb" = ( -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/coffee, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/tram) "aEc" = ( -/obj/machinery/status_display{ - pixel_y = 30 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aEd" = ( @@ -18646,6 +18737,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aEI" = ( @@ -18678,35 +18770,35 @@ "aEM" = ( /turf/simulated/floor/tiled, /area/crew_quarters/visitor_dining) -"aEN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/bed/chair/wood, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/tram) "aEO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, -/obj/structure/bed/chair/wood, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aEP" = ( +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /obj/structure/cable/green{ +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable/orange{ +======= +/obj/structure/cable/orange{ +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aEQ" = ( @@ -19208,23 +19300,21 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aFF" = ( -/obj/structure/bed/chair/wood{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aFG" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/table/woodentable, +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aFH" = ( <<<<<<< HEAD +<<<<<<< HEAD /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -19240,9 +19330,18 @@ d1 = 1; d2 = 2; icon_state = "1-2" +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" +======= +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR }, -/obj/structure/bed/chair/wood{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) @@ -19443,8 +19542,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "aFW" = ( -/obj/structure/bed/chair/wood{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) @@ -20799,15 +20898,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aIn" = ( -/obj/machinery/camera/network/tether, +/obj/machinery/vending/tool, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) +/area/rnd/hardstorage) "aIo" = ( -/obj/machinery/alarm{ - pixel_y = 22 +/obj/machinery/status_display{ + pixel_x = -32; + pixel_y = -1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) +/area/tether/surfacebase/tram) "aIp" = ( /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, @@ -21285,9 +21385,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aJh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -21297,6 +21394,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aJi" = ( @@ -21717,7 +21815,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aJR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/lightgrey/border/shifted, @@ -22112,15 +22209,15 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/vending/coffee{ +/obj/machinery/camera/network/tether{ dir = 1 }, +/obj/structure/bed/chair/wood{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aKE" = ( @@ -22130,12 +22227,12 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 5 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/lapvend{ - dir = 1 +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 }, +/obj/machinery/light/small, +/obj/structure/table/standard, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aKF" = ( @@ -22145,8 +22242,8 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 5 }, -/obj/machinery/vending/cigarette{ - dir = 1 +/obj/structure/bed/chair/wood{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -27375,10 +27472,10 @@ /obj/effect/floor_decal/corner/grey/border{ dir = 9 }, -/obj/structure/closet/emcloset, /obj/machinery/light{ dir = 8 }, +/obj/machinery/vending/loadout/costume, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aUo" = ( @@ -27889,23 +27986,21 @@ /turf/simulated/floor/plating, /area/vacant/vacant_bar) "aVi" = ( -/obj/structure/bed/chair/comfy/black, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/grey/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled, -/area/crew_quarters/visitor_laundry) +/area/tether/surfacebase/tram) "aVj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVk" = ( /obj/machinery/door/firedoor, @@ -28170,6 +28265,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVC" = ( +<<<<<<< HEAD /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -28191,21 +28287,37 @@ icon_state = "bordercolor" }, ======= +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +======= +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/grey/border{ dir = 8 }, +<<<<<<< HEAD >>>>>>> d6307e55b9... Merge pull request #9465 from KillianKirilenko/kk-misc2 +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +======= +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVD" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/effect/floor_decal/corner/grey/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/tiled, @@ -28425,17 +28537,14 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVT" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/grey/border{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/crew_quarters/visitor_laundry) +/area/tether/surfacebase/tram) "aVU" = ( /obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; @@ -28608,6 +28717,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/crew_quarters/visitor_laundry) +<<<<<<< HEAD "aWo" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -28631,6 +28741,21 @@ /area/crew_quarters/visitor_laundry) ||||||| parent of f19bc87ece... Merge pull request #10230 from TheFurryFeline/TFF-Brig_Flashes ======= +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"aWo" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 8 + }, +/obj/machinery/vending/loadout/costume{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) +======= +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aWp" = ( /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -28792,6 +28917,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 6 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_lodging) "aWM" = ( @@ -28801,23 +28927,17 @@ /obj/effect/floor_decal/corner/grey/border{ dir = 8 }, -/obj/machinery/vending/fitness{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aWN" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/effect/floor_decal/corner/grey/border{ - dir = 4 - }, -/obj/machinery/vending/cola{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/crew_quarters/visitor_laundry) +/area/tether/surfacebase/tram) "aWO" = ( /obj/machinery/camera/network/engineering{ dir = 8 @@ -28875,9 +28995,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/vending/cigarette{ - dir = 4 - }, +/obj/structure/table/standard, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aWW" = ( @@ -32910,6 +33028,22 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"gjn" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloor/shifted{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border/shifted{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "gjD" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -32941,6 +33075,18 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"glu" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "glH" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 @@ -32999,6 +33145,30 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"grD" = ( +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/vending/coffee, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "gud" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -33275,18 +33445,31 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 9 + }, +/obj/machinery/power/apc{ + pixel_y = -25 + }, +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) +"hzr" = ( +/obj/machinery/light/bigfloorlamp, +/turf/simulated/floor/grass, +/area/tether/surfacebase/surface_one_hall) "hAe" = ( /turf/simulated/floor/looking_glass{ dir = 5 @@ -33372,6 +33555,15 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +"hOH" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "hPU" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -33387,18 +33579,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "hQg" = ( -/obj/machinery/vending/hydronutrients/brig{ - dir = 8 - }, /obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/corner/lightorange{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightorange{ - dir = 9 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "hQw" = ( @@ -33589,6 +33772,26 @@ /obj/random/trash_pile, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) +"ips" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/lapvend, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/surface_one_hall) "iqO" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -33598,6 +33801,10 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +"ird" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "iti" = ( /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -33823,6 +34030,19 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) +"jAq" = ( +/obj/structure/table/standard, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "jCv" = ( /obj/structure/bed/chair/wood, /turf/simulated/floor/lino, @@ -33988,6 +34208,15 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"kcv" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/crew_quarters/visitor_laundry) "kdi" = ( /obj/structure/cable/green{ d1 = 1; @@ -34424,6 +34653,30 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"lei" = ( +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/vending/cigarette, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "lhM" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -34472,10 +34725,8 @@ /turf/simulated/wall, /area/tether/surfacebase/funny/mimeoffice) "lsh" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/table/woodentable, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "lwL" = ( @@ -34880,6 +35131,19 @@ /obj/structure/sign/poster, /turf/simulated/floor/lino, /area/crew_quarters/visitor_dining) +"mvl" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/table/bench/standard, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "mvM" = ( /obj/structure/cable/green{ d1 = 4; @@ -35121,6 +35385,13 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"mZQ" = ( +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "naC" = ( /turf/simulated/wall/r_wall, /area/medical/virologyisolation) @@ -35186,15 +35457,29 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 5 }, +<<<<<<< HEAD /obj/structure/cable/green{ d1 = 2; d2 = 4; icon_state = "2-4" }, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +======= +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "njE" = ( @@ -35317,18 +35602,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) "nvD" = ( -/obj/machinery/seed_storage/brig{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightorange{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightorange{ - dir = 9 - }, /obj/machinery/camera/network/security{ dir = 8 }, +/obj/effect/floor_decal/corner/lightorange{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "nwH" = ( @@ -35438,6 +35717,49 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"nTC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) +======= +"nRK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) +"nTC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "nUG" = ( /obj/structure/table/rack, /obj/item/weapon/tool/prybar/red{ @@ -35646,6 +35968,13 @@ /obj/item/pizzavoucher, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) +"ovr" = ( +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "ovG" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -35799,6 +36128,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"paJ" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "paY" = ( /obj/structure/cable/green{ d1 = 4; @@ -35895,10 +36230,18 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/crew_quarters/visitor_laundry) +"pvL" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "pxk" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/grey/border, /obj/structure/sign/poster, +/obj/structure/table/standard, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) >>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff @@ -36103,6 +36446,18 @@ "qwV" = ( /turf/simulated/wall, /area/tether/surfacebase/security/brig) +"qBb" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "qDR" = ( /obj/machinery/firealarm{ dir = 8; @@ -36142,6 +36497,19 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/weaponsrange) +"qKk" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/table/bench/standard, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "qKn" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central1{ dir = 8 @@ -36264,13 +36632,13 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "qWW" = ( @@ -36330,6 +36698,32 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"rhc" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) +======= +"rhc" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) +"rnt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "rse" = ( /obj/structure/bed/double/padded, /obj/item/weapon/bedsheet/mimedouble, @@ -36610,9 +37004,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "scf" = ( -/obj/effect/floor_decal/corner/lightorange, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, -/area/tether/surfacebase/security/brig) +/area/tether/surfacebase/tram) +"sch" = ( +/obj/structure/table/bench/standard, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/grey/border, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "svZ" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -36843,6 +37243,16 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +"tAT" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "tCV" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -36932,6 +37342,12 @@ "tOe" = ( /turf/simulated/floor/plating, /area/tether/surfacebase/funny/clownoffice) +"tPC" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/tram) "tQH" = ( /obj/machinery/camera/network/security{ dir = 10 @@ -37095,6 +37511,17 @@ "uiK" = ( /turf/simulated/wall, /area/tether/surfacebase/security/weaponsrange) +"uke" = ( +/obj/structure/bed/chair/comfy/black, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "uqH" = ( /obj/structure/railing{ dir = 4 @@ -37378,6 +37805,21 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) +"vrS" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/shifted{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border/shifted{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "vuO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37526,6 +37968,36 @@ "waR" = ( /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"whV" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" + }, +/turf/simulated/wall, +/area/maintenance/substation/surfaceservicesubstation) +======= +"wek" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) +"whV" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" + }, +/turf/simulated/wall, +/area/maintenance/substation/surfaceservicesubstation) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "wjq" = ( /obj/structure/bed/chair{ dir = 4 @@ -37712,6 +38184,16 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"wVm" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "wVB" = ( /obj/machinery/door/window/brigdoor/southleft{ dir = 8; @@ -37843,6 +38325,26 @@ }, /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) +"xtO" = ( +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/vending/cola/soft, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "xtS" = ( /obj/machinery/power/apc{ dir = 4; @@ -37956,6 +38458,26 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) +"yaA" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/coffee, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/surface_one_hall) "yaU" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -43467,7 +43989,7 @@ amB ajS aah aah -aah +ahl ahl ahl ahl @@ -43609,10 +44131,10 @@ ajS ajS aah aah -aah ahl +aBV ahG -aiD +aDp ajp aoC aph @@ -43630,8 +44152,8 @@ aui auF avb avI -awo -auK +ahl +rJv avh abN aeR @@ -43751,9 +44273,9 @@ ajS aah aah aah -aah ahl -afz +aCH +ahL aiE ajq anx @@ -43772,8 +44294,8 @@ anx anx anx acJ -awp -auK +ahl +rJv avh abN aeR @@ -43893,9 +44415,9 @@ aah aah aah aah -aah ahl -ahI +aCI +ahL anN aog aoD @@ -43914,8 +44436,8 @@ auj auG avc avJ -awq -auK +ahl +rJv avh abN aeR @@ -44057,7 +44579,7 @@ atH auK auK auK -auK +rJv axD abN aeR @@ -44171,6 +44693,7 @@ ajS alc aln ajS +<<<<<<< HEAD aah aah aah @@ -44179,6 +44702,25 @@ aah aah aah ahl +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aah +aah +aah +atH +xoT +sBl +aun +atG +======= +ahl +ahl +ahl +atH +xoT +sBl +aun +atG +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR ahK anP ajt @@ -44321,8 +44863,32 @@ aah aah aah ahl +<<<<<<< HEAD ahL anP +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +ahl +ahl +ahl +atH +xuM +dQn +jGM +fiP +hDQ +tGh +======= +ahl +axM +aBU +atH +xuM +dQn +jGM +fiP +hDQ +tGh +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR ajt ahl apk @@ -45765,7 +46331,7 @@ abw abw adM afU -abv +abI abm ajW aDf @@ -45902,12 +46468,12 @@ apj auK avh abm -abv +abI abv abv adM afU -abv +abI abm ajX aDf @@ -46045,11 +46611,11 @@ auK avh abm abI -abI -abI +abv +abv adM afU -abv +abI abm aka aFf @@ -46186,9 +46752,9 @@ apj auK avh abm -abI -abI -abI +aIn +abv +abv adN afU agr @@ -47139,7 +47705,7 @@ aad aad aah pCj -tdh +afz tdh ccA jDI @@ -47281,7 +47847,7 @@ aad aad aah pCj -tdh +afW tdh pKE jDI @@ -47438,8 +48004,8 @@ iUF fqa anp aeW +axN afr -afW amV agB agK @@ -47568,8 +48134,8 @@ mYf rQe tak lEg -scf -mYO +tdh +tdh mYO mYO fqa @@ -49868,21 +50434,21 @@ aKd aie anW aoj -aoR +hzr apA apA apA -aoR +hzr ary ary ary ary ary -aoR +hzr apA apA apA -aoR +hzr aoj awH axk @@ -50585,7 +51151,7 @@ aqf arg arA arz -aoR +hzr arz asO apC @@ -50836,14 +51402,14 @@ aad aad aah aah -aah aeU +ahI atc awx aeU aAI -aAI aef +awq yaU afO aBB @@ -50978,14 +51544,14 @@ aad aad aah aah -aah aeU +awo atq aww aeU aAI -aAI aef +awF afl agj aBG @@ -51026,10 +51592,10 @@ ayi ayV fyp huE -aBU -aCH -aDp ayh +aCJ +aCJ +aGt aBO aFp aBO @@ -51168,11 +51734,11 @@ ayh ayW eQT niz -aBV -aCI -aDq ayh aCJ +aCJ +aCJ +aCJ aFq aCJ aBk @@ -51288,21 +51854,21 @@ aef bbq anW aoj -aoR +hzr apA apA apA -aoR +hzr ary ary ary ary ary -aoR +hzr apA apA apA -aoR +hzr aoj awH axm @@ -51311,9 +51877,9 @@ ayh aAf cpp ayh -ayh -ayh -ayh +aCJ +aCJ +aCJ aCJ aFr aCJ @@ -51601,8 +52167,8 @@ aCJ aCJ aCJ aCJ -aCJ -aCJ +agM +agM agM aIm aJf @@ -51743,11 +52309,11 @@ aCJ aCJ aCJ aCJ -aCJ -aCJ agM -aIn -aJg +yaA +vrS +ayG +qBb aJR aKD aLg @@ -51833,8 +52399,8 @@ acY adE aan uHS -awF -axM +awC +aeU aeU bbI fKm @@ -51893,10 +52459,10 @@ aCJ aCJ aCJ aCJ -aCJ -aCJ agM -aIo +ips +vrS +ayG aJf aJQ aKE @@ -51984,7 +52550,7 @@ adT afb atO awC -axN +aeU aeU <<<<<<< HEAD aah @@ -52053,9 +52619,9 @@ aCJ aCJ aCJ aCJ -aCJ -aBs agM +aBs +gjn aEH aJh aJQ @@ -52143,7 +52709,7 @@ abL aea afb atO -awC +awp axO aeU bbZ @@ -53086,7 +53652,7 @@ aUp aVd aVz aUt -aWo +aWM aWM aWV aVn @@ -54146,9 +54712,9 @@ aCa axy atx aEb -auB +aVi aFE -auB +scf aLK act aDu @@ -54176,10 +54742,10 @@ aSo aUo aUQ bHR -aUP +aVD aVS aga -aWN +bcJ aXc aUm aUm @@ -54288,10 +54854,10 @@ aCa axy atx afY -auB -aFF +aVT auB auB +paJ aCO aHH aIu @@ -54314,12 +54880,12 @@ aPK aSo aSo aSo -aSo aUm aUm -aVi +aUm +cwS aVD -aVT +bcT aUm aUm aUm @@ -54429,10 +54995,10 @@ mOz atx atx atx -aEc -aEN -aFG -aFW +atx +aEO +auB +auB aGA aCO aHI @@ -54456,18 +55022,18 @@ aah aah aah aah -aah -aah aUm +grD +tAT aVj -aVj -aVj +nRK +bcm +aWM +qKk aUm -aah -aah -aah -aah -aah +baU +baU +baU aah aah aah @@ -54562,19 +55128,19 @@ auB auV avC auB -awR -axz +aCT +aCT ayp azp mRF rYL ayp aCT -aDw -auB +avA +aIo aEO -lsh -aFW +auB +auB lZU aCO jCv @@ -54598,19 +55164,19 @@ aah aah aah aah -aah -aad -aad -aad -aad -aad -aad -aah -aah -aah -aah -aah -aah +aUm +xtO +cwS +aUP +rnt +aUP +aUP +sch +aWn +baU +baU +baU +baU aah aah aah @@ -54697,7 +55263,7 @@ apF aah aah aah -aah +adK atx atZ auC @@ -54715,7 +55281,7 @@ aCU aCU aCU aEP -aFH +aFX aFX aGB aCO @@ -54740,20 +55306,20 @@ aad aad aad aad +aUm +lei +wVm +uke +jAq +glu +bcJ +mvl +aUm aad -aad -aad -aad -aad -aad -aad -aad -aah -aah -aah -aah -aah -aah +baU +baU +baU +baU aah aah aad @@ -54839,30 +55405,30 @@ aah aah aah aah -aah -atx -auB -auB -auU -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB -auU +adK +aDq +aEc +aEc +aFG +aFH +aCT +aCT +aCT auB auB auB auB auB +aCT +aCT +aCT +aWN +lsh +lsh +lsh +wek +pvL +hOH atW atx aad @@ -54882,15 +55448,15 @@ aad aad aad aad -aad -aad -aad -aad -aad -aad -aad -aad -aad +aUm +aUm +kcv +kcv +kcv +kcv +kcv +aUm +aUm aad aad aad @@ -55046,21 +55612,18 @@ aah aah aah aah -aah -atx -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB +adK +aDw +aFF +aFF +aFF +aFW +auB +auB +auB +auB +auB +auU auB auB auB @@ -55070,6 +55633,9 @@ auB auB auB auB +ovr +ird +mZQ auB atx aad @@ -55275,9 +55841,9 @@ oeA oeA oeA oeA -oeA -oeA -oeA +tPC +tPC +tPC aGC aty aad @@ -55518,15 +56084,15 @@ atA atA atA atA -atA aJp aub +aub +aub wXW atA atA atA atA -atA mtl auc auc diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 9b4148072f..b37dc0614f 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -1450,15 +1450,9 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "acb" = ( -/obj/structure/table/glass, -/obj/item/weapon/book/manual/resleeving, /obj/structure/sign/nosmoking_1{ pixel_x = -32 }, -/obj/item/device/sleevemate, -/obj/machinery/alarm{ - pixel_y = 28 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -1468,6 +1462,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 9 }, +/obj/machinery/vending/loadout/uniform, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acc" = ( @@ -1480,6 +1475,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/machinery/clonepod/transhuman, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acd" = ( @@ -1495,6 +1491,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/machinery/transhuman/resleever, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "ace" = ( @@ -1507,11 +1504,12 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/transhuman/resleever, +/obj/structure/table/glass, +/obj/item/weapon/book/manual/resleeving, +/obj/item/device/sleevemate, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acf" = ( -/obj/machinery/clonepod/transhuman, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -1521,6 +1519,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 5 }, +/obj/machinery/computer/transhuman/resleeving, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acg" = ( @@ -1633,9 +1632,6 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "acr" = ( -/obj/machinery/computer/transhuman/resleeving{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, @@ -1648,11 +1644,15 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acs" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/resleeving) +/area/tether/surfacebase/medical/uppersouthstairwell) "act" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1671,6 +1671,9 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 5 }, +/obj/structure/bed/chair/office/light{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acv" = ( @@ -1791,6 +1794,10 @@ dir = 10 }, /obj/structure/flora/pottedplant/decorative, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acI" = ( @@ -2643,7 +2650,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 8 }, -/obj/machinery/vending/loadout/uniform, +/obj/machinery/organ_printer/flesh, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "adZ" = ( @@ -2659,15 +2666,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 9 }, -/obj/machinery/organ_printer/flesh, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/resleeving) -"aea" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ - pixel_x = 4; - pixel_y = 6 - }, /obj/item/weapon/reagent_containers/glass/bottle/biomass{ pixel_x = -4; pixel_y = 8 @@ -2680,10 +2679,17 @@ pixel_x = 6; pixel_y = 8 }, +/obj/item/weapon/reagent_containers/glass/bottle/biomass{ + pixel_x = 4; + pixel_y = 6 + }, /obj/item/device/flashlight/pen{ pixel_x = -3; pixel_y = -3 }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/resleeving) +"aea" = ( /obj/item/device/radio/intercom{ pixel_y = -28 }, @@ -2694,6 +2700,9 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, +/obj/structure/bed/chair{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aeb" = ( @@ -2807,7 +2816,6 @@ /turf/simulated/wall, /area/tether/surfacebase/medical/patient_a) "aen" = ( -/obj/machinery/vending/loadout/uniform, /obj/machinery/camera/network/medbay{ dir = 10 }, @@ -2822,6 +2830,9 @@ pixel_y = -28 }, /obj/structure/cable/green, +/obj/structure/bed/chair{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aeo" = ( @@ -3853,17 +3864,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) "afP" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/mask/gas{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas{ - pixel_x = -3; - pixel_y = -3 - }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/vending/security, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) "afQ" = ( @@ -4780,11 +4782,20 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) "ahw" = ( -/obj/machinery/vending/security, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 4 }, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/mask/gas{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas{ + pixel_x = -3; + pixel_y = -3 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) "ahx" = ( @@ -6257,39 +6268,47 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/morgue) "ajK" = ( -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/obj/machinery/vending/snack, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/obj/machinery/vending/cigarette, +/turf/simulated/floor/tiled/monotile, +/area/rnd/research) "ajL" = ( -/obj/machinery/vending/cola/soft, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/coffee, +/turf/simulated/floor/tiled/monotile, +/area/rnd/research) "ajM" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/uppersouthstairwell) +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/weeb, +/turf/simulated/floor/tiled/monotile, +/area/rnd/research) "ajN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -6690,7 +6709,7 @@ pixel_y = 32 }, /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/vending/cola, +/obj/machinery/vending/cola/soft, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "akx" = ( @@ -6709,18 +6728,32 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "akA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/vending/coffee, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "akB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/vending/sol, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "akC" = ( @@ -6826,11 +6859,11 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "akI" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ +/obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) @@ -6977,15 +7010,17 @@ >>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "akS" = ( /obj/structure/window/reinforced, -/obj/machinery/vending/fitness{ - dir = 1 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/table/standard, +/obj/random/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "akT" = ( @@ -6996,9 +7031,11 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/machinery/vending/coffee{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, +/obj/structure/table/standard, +/obj/random/tetheraid, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "akU" = ( @@ -7764,7 +7801,6 @@ "ama" = ( /obj/structure/table/glass, /obj/random/mre, -/obj/random/coin, /obj/random/maintenance/medical, /obj/random/medical, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -15262,8 +15298,8 @@ /turf/simulated/wall, /area/tether/surfacebase/fish_farm) "azt" = ( -/obj/structure/closet/hydrant, -/turf/simulated/wall, +/obj/machinery/vending/fishing, +/turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "azu" = ( /obj/item/clothing/gloves/boxing/blue, @@ -15569,7 +15605,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "aAd" = ( -/obj/machinery/vending/fishing, +/obj/structure/closet/hydrant{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "aAe" = ( @@ -22945,8 +22983,19 @@ /turf/simulated/floor/tiled/dark, /area/rnd/lockers) "aOs" = ( -/turf/simulated/mineral, -/area/tether/surfacebase/emergency_storage/atmos) +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/landmark/start{ + name = "Scientist" + }, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's set to Free-Anur-Entertanment, I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 32 + }, +/turf/simulated/floor/wood, +/area/rnd/breakroom) "aOt" = ( /obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor/plating, @@ -23585,35 +23634,11 @@ /turf/simulated/floor/wood, /area/rnd/breakroom) "aPP" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/machinery/light{ dir = 1 }, /turf/simulated/floor/wood, /area/rnd/breakroom) -"aPQ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/wood, -/area/rnd/breakroom) -"aPR" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - desc = "Looks like it's set to Free-Anur-Entertanment, I wonder what else is on?"; - icon_state = "frame"; - pixel_y = 32 - }, -/turf/simulated/floor/wood, -/area/rnd/breakroom) "aPS" = ( /obj/machinery/alarm{ dir = 8; @@ -23882,39 +23907,10 @@ }, /turf/simulated/floor/wood, /area/rnd/breakroom) -"aQC" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/rnd/breakroom) -"aQD" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/rnd/breakroom) "aQE" = ( /obj/structure/bed/chair{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/effect/landmark/start{ name = "Roboticist" }, @@ -24770,6 +24766,46 @@ /obj/random/maintenance/clean, /turf/simulated/floor, /area/maintenance/lower/south) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"aSr" = ( +/obj/machinery/door/airlock{ + id_tag = "bathroomlock7"; + name = "Restroom" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/uppersouthstairwell) +"aSs" = ( +/obj/structure/toilet, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/button/remote/airlock{ + id = "bathroomlock9"; + name = "Surface Security Toilet Lock"; + pixel_x = -20; + pixel_y = -10; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/security/brig/bathroom) +======= +"aSs" = ( +/obj/structure/toilet, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/button/remote/airlock{ + id = "bathroomlock9"; + name = "Surface Security Toilet Lock"; + pixel_x = -20; + pixel_y = -10; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/security/brig/bathroom) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aSt" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -25244,6 +25280,15 @@ /obj/machinery/camera/network/research{ dir = 1 }, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/wood, /area/rnd/breakroom) "aTx" = ( @@ -25254,6 +25299,11 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/wood, /area/rnd/breakroom) "aTy" = ( @@ -25634,53 +25684,11 @@ /obj/structure/bookcase/manuals/research_and_development, /turf/simulated/floor/wood, /area/rnd/breakroom) -"aUp" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/machinery/vending/cigarette{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/breakroom) "aUq" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/machinery/camera/network/research{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/machinery/vending/coffee{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/breakroom) -"aUr" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/machinery/vending/weeb{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/wood, /area/rnd/breakroom) "aUs" = ( /obj/effect/floor_decal/borderfloor{ @@ -43969,9 +43977,9 @@ ann aux ahn ajE -awD -awD -awD +aAA +aAA +aAA awD awY awY @@ -44002,7 +44010,7 @@ aNz aOp aPb aPM -aQC +aRn aRn aRO aSC @@ -44112,9 +44120,9 @@ auy auA ajE aAA -awD aAA -awD +aAA +aAA awD awY aAa @@ -44144,7 +44152,7 @@ aNA aOq aMo aPN -aQD +aRm aRm aPN aSD @@ -44257,7 +44265,7 @@ aAA axe aAA aAA -awD +ajE azs aAb aAx @@ -44286,7 +44294,7 @@ aNB aOr aMo aPO -aQD +aRm aRm aPN aSE @@ -44399,7 +44407,7 @@ aAA aAA aAA aod -aAA +ajE azt aAc aAy @@ -44541,7 +44549,7 @@ anV aAA aAA aAA -awD +ajE azs aAd aAz @@ -44567,15 +44575,15 @@ aJO aJO aJO aNC -aOs -aPc -aPQ +aND +ajK +aRm aQF aQF aQF aQF aRm -aUp +aRm aPJ aYd aWH @@ -44709,9 +44717,9 @@ aKo aKo aJO aNC -aOs -aPc -aPR +aND +ajL +aRm aQF aQF aQF @@ -44851,15 +44859,15 @@ aKo aKo aJO aNC -aOs -aPc +aND +ajM aPS aQG aRp -aQG +aOs aQG aTC -aUr +aRm aQH aVQ aWJ @@ -45134,7 +45142,7 @@ aKo aKo aKo aJO -aND +aNC aOt asQ aPT @@ -45276,7 +45284,7 @@ aKo aKo aMr aJO -aND +aNC aso asR atc @@ -47070,7 +47078,7 @@ aab aab abN acc -acs +aiV aiV adr adZ @@ -50072,11 +50080,25 @@ aar aar aiK aiK +<<<<<<< HEAD akH akR akR akR akR +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aSr +aiK +aiK +aiK +aiK +======= +aiK +aiK +aiK +aiK +aiK +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR aiK auX asV @@ -50212,7 +50234,7 @@ ajR aar abF aer -ajK +aiK akA akI akS @@ -50354,9 +50376,9 @@ ajS aar abF aer -ajL +aiK akB -akJ +acs akT akW akJ @@ -50496,7 +50518,7 @@ akE aar abH agP -ajM +aiK akC akK akJ @@ -51908,7 +51930,7 @@ abn adt adt abn -aab +abn abn abn bgU @@ -52045,12 +52067,12 @@ adt aab aab aab -aab -aab -aab -aab -aab -aab +abn +abn +abn +abn +abn +abn abn abn bgU @@ -52188,12 +52210,12 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab +aeG +aeG +aeG +abn +abn +abn abn bgU bhI diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 5f8f2020ec..66c825f51a 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -127785,21 +127785,19 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "aak" = ( -/obj/machinery/vending/snack{ - dir = 1 - }, /obj/effect/floor_decal/borderfloor{ dir = 10 }, /obj/effect/floor_decal/corner/red/border{ dir = 10 }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "aal" = ( -/obj/machinery/vending/cola{ - dir = 1 - }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /obj/machinery/camera/network/security{ @@ -127808,9 +127806,6 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "aam" = ( -/obj/machinery/vending/coffee{ - dir = 1 - }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /obj/machinery/light, @@ -130040,9 +130035,7 @@ aaa /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 10 }, -/obj/machinery/vending/medical{ - dir = 4 - }, +/obj/machinery/vending/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "adx" = ( @@ -131702,16 +131695,16 @@ aaa /turf/simulated/wall/r_wall, /area/rnd/xenobiology/xenoflora_storage) "afT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/grass, /area/hydroponics) "afU" = ( @@ -132336,11 +132329,23 @@ aaa /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/carpet/blue, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "agS" = ( -/obj/structure/bed/chair, -/turf/simulated/floor/carpet/blue, +/obj/machinery/vending/snack, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "agT" = ( /obj/structure/table/reinforced, @@ -133346,27 +133351,14 @@ aaa /turf/simulated/wall/r_wall, /area/crew_quarters/panic_shelter) "aip" = ( -/obj/machinery/vending/snack{ +/obj/structure/bed/chair{ dir = 4 }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 +/obj/effect/landmark/start{ + name = "Security Officer" }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/tether/surfacebase/surface_three_hall) +/turf/simulated/floor/carpet/blue, +/area/tether/surfacebase/security/breakroom) "aiq" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/machinery/camera/network/civilian, @@ -134538,26 +134530,16 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "akl" = ( -/obj/machinery/vending/cola{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey{ +/obj/effect/floor_decal/borderfloor{ dir = 10 }, -/obj/effect/floor_decal/corner/lightgrey{ +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "akm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -135991,13 +135973,11 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "amY" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/smartfridge{ - req_access = list(28) +/obj/structure/bed/chair{ + dir = 8 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/turf/simulated/floor/carpet/blue, +/area/tether/surfacebase/security/breakroom) "amZ" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -136406,10 +136386,13 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "anN" = ( +/obj/structure/bed/chair/wood{ + dir = 1 + }, /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/structure/bed/chair/wood{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /turf/simulated/floor/grass, @@ -136964,6 +136947,7 @@ aaa /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "aoM" = ( +<<<<<<< HEAD /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -136973,6 +136957,21 @@ aaa d2 = 2; icon_state = "0-2" }, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + nightshift_setting = 2; + pixel_y = 24 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +======= +/obj/machinery/seed_extractor, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /turf/simulated/floor/grass, /area/hydroponics) "aoN" = ( @@ -137227,9 +137226,12 @@ aaa /turf/simulated/floor/tiled/techfloor, /area/vacant/vacant_shop) "aph" = ( +/obj/machinery/requests_console{ + pixel_x = 32; + pixel_y = -32 + }, /obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" + dir = 8 }, /obj/structure/cable/green{ d1 = 4; @@ -137242,19 +137244,21 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -28; - pixel_y = 26 +/obj/machinery/button/remote/blast_door{ + id = "bar"; + name = "Bar Shutter Control"; + pixel_x = 24; + pixel_y = 24 }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "api" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/button/remote/blast_door{ + dir = 4; id = "kitchen2"; name = "Kitchen shutters"; pixel_x = -24 @@ -137264,6 +137268,9 @@ aaa pixel_x = -23; pixel_y = 9 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "apj" = ( @@ -137874,9 +137881,16 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aqe" = ( -/obj/machinery/portable_atmospherics/hydroponics/soil, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "aqf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -138003,15 +138017,16 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "aqo" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/tiled/eris/cafe, -/area/hydroponics) -"aqp" = ( -/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/grass, /area/hydroponics) +"aqp" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "aqq" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/grass, @@ -138763,7 +138778,7 @@ aaa dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/machinery/vending/bepis, +/obj/machinery/vending/cola, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/surface_three_hall) "arF" = ( @@ -138877,11 +138892,25 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "arN" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 6 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 }, -/turf/simulated/floor/tiled/techfloor, -/area/hydroponics) +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/snack, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/surface_three_hall) "arO" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -138924,17 +138953,12 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/biogenerator, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/grass, /area/hydroponics) "arR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/grass, /area/hydroponics) "arS" = ( @@ -139090,30 +139114,9 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "asi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/hydroponics) -"asj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/sign/botany, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, +/obj/machinery/vending/hydronutrients, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/grass, /area/hydroponics) "ask" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -139179,14 +139182,9 @@ aaa /turf/simulated/floor/grass, /area/hydroponics) "asq" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/alarm{ dir = 4; - icon_state = "pipe-c" + pixel_x = -22 }, /turf/simulated/floor/grass, /area/hydroponics) @@ -139257,19 +139255,6 @@ aaa }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"asx" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, -/area/hydroponics/cafegarden) "asy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -139309,8 +139294,16 @@ aaa /area/tether/surfacebase/medical/uppersouthstairwell) "asB" = ( /obj/effect/floor_decal/spline/plain{ - dir = 1 + dir = 9 }, +/obj/structure/sign/securearea{ + desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"; + icon_state = "monkey_painting"; + name = "Mr. Deempisi portrait"; + pixel_x = 4; + pixel_y = 28 + }, +/obj/machinery/camera/network/civilian, /turf/simulated/floor/lino, /area/crew_quarters/bar) "asC" = ( @@ -139400,11 +139393,25 @@ aaa /turf/simulated/floor/grass, /area/hydroponics) "asI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, -/area/hydroponics/cafegarden) +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/cola, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/surface_three_hall) "asJ" = ( /obj/structure/closet/firecloset, /obj/effect/floor_decal/borderfloor, @@ -139412,16 +139419,9 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "asK" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/cafe, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/grass, /area/hydroponics) "asL" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -139429,6 +139429,7 @@ aaa dir = 1 }, /obj/structure/closet/secure_closet/freezer/fridge, +/obj/machinery/camera/network/outside, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "asM" = ( @@ -139450,12 +139451,9 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "asN" = ( -/obj/machinery/alarm{ - pixel_y = 25 - }, /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, -/area/hydroponics/cafegarden) +/area/hydroponics) "asO" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/ppflowers, @@ -139468,13 +139466,13 @@ aaa /turf/simulated/floor/grass, /area/hydroponics) "asP" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 +/obj/effect/floor_decal/corner/lime/bordercorner{ + dir = 8 }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/grass, /area/hydroponics) "asQ" = ( /obj/structure/disposalpipe/segment{ @@ -139521,7 +139519,8 @@ aaa /area/bridge) "asU" = ( /obj/machinery/door/airlock/maintenance/int{ - name = "Fire/Phoron Shelter" + name = "Fire/Phoron Shelter"; + req_one_access = list(35,28) }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor/grid, @@ -139551,15 +139550,13 @@ aaa dir = 4 }, /turf/simulated/floor/grass, -/area/hydroponics/cafegarden) +/area/hydroponics) "asZ" = ( /obj/machinery/light{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/grass, /area/hydroponics) "ata" = ( @@ -139595,16 +139592,20 @@ aaa /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) "ate" = ( -/turf/simulated/floor/tiled/eris/cafe, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -30 + }, +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/turf/simulated/floor/grass, /area/hydroponics) "atf" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/grass, +/area/hydroponics) "atg" = ( /obj/structure/sink{ dir = 8; @@ -139614,15 +139615,20 @@ aaa /turf/simulated/floor/grass, /area/hydroponics) "ath" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/vending/hydronutrients{ +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ dir = 8 }, /turf/simulated/floor/grass, /area/hydroponics) "ati" = ( /obj/structure/flora/ausbushes/pointybush, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "atj" = ( @@ -139635,23 +139641,24 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "atk" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/biogenerator, /turf/simulated/floor/grass, /area/hydroponics) "atl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, -/turf/simulated/floor/plating, +/obj/structure/table/reinforced, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "kitchenhallway"; + layer = 3.3 + }, +/turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atm" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -139663,22 +139670,17 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "atn" = ( -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/smartfridge/drying_rack{ +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"ato" = ( +/obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/grass, -/area/hydroponics) -"ato" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/machinery/smartfridge/drinks, /turf/simulated/floor/lino, /area/crew_quarters/bar) "atp" = ( @@ -139740,13 +139742,10 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "atw" = ( -/obj/machinery/camera/network/outside{ - dir = 5 - }, -/obj/structure/table/standard, -/obj/effect/floor_decal/corner/grey/diagonal, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/structure/closet/crate/plastic, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/hydroponics) "atx" = ( /obj/effect/floor_decal/corner/mauve{ dir = 6 @@ -139757,10 +139756,8 @@ aaa /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/window/reinforced{ + dir = 1 }, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) @@ -139892,10 +139889,11 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atN" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 6 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/vending/boozeomat, /turf/simulated/floor/lino, /area/crew_quarters/bar) "atO" = ( @@ -139914,16 +139912,9 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atP" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/closet/secure_closet/freezer/kitchen, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/machinery/portable_atmospherics/hydroponics/soil, +/turf/simulated/floor/grass, +/area/hydroponics) "atQ" = ( /obj/structure/cable/green{ d1 = 1; @@ -140162,6 +140153,13 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/door/window/westright{ + dir = 1; + req_one_access = list(35,28) + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "aun" = ( @@ -140504,14 +140502,15 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "auO" = ( -/obj/structure/bed/chair/wood, -/obj/effect/floor_decal/borderfloor{ +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/grass, /area/hydroponics) "auP" = ( /obj/structure/bed/chair/office/light, @@ -140521,14 +140520,14 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "auQ" = ( -/obj/structure/table/woodentable, -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/structure/bed/chair/wood{ + dir = 1 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled/eris/cafe, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/grass, /area/hydroponics) "auR" = ( /obj/structure/grille, @@ -140566,8 +140565,7 @@ aaa /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/grass, /area/hydroponics) "auV" = ( @@ -140669,10 +140667,8 @@ aaa icon_state = "frame"; pixel_y = 32 }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/grass, /area/hydroponics) "avh" = ( @@ -140794,12 +140790,8 @@ aaa /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/grass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, /area/hydroponics) "avr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -140869,12 +140861,20 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "avA" = ( -/obj/item/weapon/stool/padded, -/obj/effect/floor_decal/corner/beige{ - dir = 6 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, +<<<<<<< HEAD /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/turf/simulated/floor/tiled/white, +/area/crew_quarters/bar) +======= +/turf/simulated/floor/tiled, +/area/hydroponics) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "avB" = ( /obj/structure/table/glass, /obj/machinery/reagentgrinder, @@ -140893,9 +140893,21 @@ aaa /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /obj/machinery/button/remote/blast_door{ + dir = 4; id = "kitchen"; name = "Kitchen shutters"; - pixel_x = -24 + pixel_x = -24; + pixel_y = -3 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "kitchenhallway"; + name = "Kitchen shutters"; + pixel_x = -24; + pixel_y = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -140951,19 +140963,18 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "avJ" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/obj/machinery/door/window/brigdoor/northleft{ - dir = 8; - name = "Bar"; - req_access = list(25) +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) +/turf/simulated/floor/grass, +/area/hydroponics) "avK" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -140993,11 +141004,9 @@ aaa /turf/simulated/floor/grass, /area/hydroponics) "avO" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/eris/cafe, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/grass, /area/hydroponics) "avP" = ( /obj/structure/disposalpipe/segment{ @@ -141244,15 +141253,14 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/captain) "awm" = ( -/obj/machinery/button/remote/airlock{ - id = "barbackdoor"; - name = "Back Door Locks"; - pixel_x = -29; - pixel_y = 30; - specialfunctions = 4 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/cafe, +/area/hydroponics) "awn" = ( /turf/simulated/wall/r_wall, /area/bridge_hallway) @@ -141285,29 +141293,31 @@ aaa /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "awr" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 +/obj/structure/disposalpipe/segment{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "aws" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/closet/secure_closet/bar, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "awt" = ( -/obj/structure/closet/gmcloset{ - name = "formal wardrobe" +/obj/machinery/button/remote/airlock{ + id = "barbackdoor"; + name = "Back Door Locks"; + pixel_x = -29; + pixel_y = 30; + specialfunctions = 4 }, -/obj/item/glass_jar, -/obj/item/device/retail_scanner/civilian, -/obj/item/device/retail_scanner/civilian, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "awu" = ( @@ -141642,19 +141652,22 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/requests_console{ + dir = 1; + pixel_y = -22 + }, /turf/simulated/floor/grass, /area/hydroponics) "awR" = ( -/obj/structure/bed/chair/wood{ - dir = 1 +/obj/structure/table/glass, +/obj/machinery/door/window/westright{ + req_one_access = list(35,28) }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/tiled, /area/hydroponics) "awS" = ( /obj/structure/cable/green{ @@ -141676,10 +141689,21 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "awT" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/obj/structure/table/marble, +/obj/machinery/chemical_dispenser/bar_alc/full{ + dir = 8 + }, +/obj/structure/sign/poster{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "awU" = ( /obj/structure/cable/green{ d1 = 1; @@ -141702,15 +141726,6 @@ aaa /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"awV" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24 - }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) "awW" = ( /obj/structure/disposalpipe/segment, /obj/machinery/alarm{ @@ -141896,25 +141911,17 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "axo" = ( -/obj/structure/bed/chair/comfy, -/obj/effect/landmark/start{ - name = "Bartender" +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 +/obj/structure/table/marble, +/obj/machinery/chemical_dispenser/bar_soft/full{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "axp" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/storage/box/beanbags, -/obj/item/weapon/gun/projectile/shotgun/doublebarrel, -/obj/item/weapon/paper{ - info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest."; - name = "Shotgun permit" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "axq" = ( @@ -141969,12 +141976,17 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "axu" = ( -/obj/structure/table/woodentable, -/obj/machinery/reagentgrinder, +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "axv" = ( /mob/living/simple_mob/animal/passive/cow, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "axw" = ( @@ -141999,20 +142011,20 @@ aaa /area/hallway/lower/third_south) "axx" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/clothing/head/that{ +/obj/item/weapon/packageWrap, +/obj/item/device/destTagger{ pixel_x = 4; - pixel_y = 6 + pixel_y = 3 }, -/obj/item/weapon/tool/screwdriver, -/obj/item/clothing/mask/smokable/cigarette/cigar/havana, -/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba, +/obj/machinery/light/small, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "axy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hydroponics) "axz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -142365,22 +142377,31 @@ aaa /turf/simulated/wall/r_wall, /area/vacant/vacant_shop) "axY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/table/woodentable, +/obj/structure/disposalpipe/segment, +/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, +/obj/machinery/camera/network/civilian{ + dir = 4 + }, +/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/weapon/book/manual/bar_guide, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "axZ" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/item/weapon/stool/padded, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/light/floortube{ + dir = 4; + pixel_x = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/dark, +/area/bridge_hallway) "aya" = ( /obj/machinery/space_heater, /turf/simulated/floor/tiled/techmaint, @@ -142420,6 +142441,7 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "ayf" = ( +<<<<<<< HEAD /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ dir = 8; @@ -142429,12 +142451,37 @@ aaa }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/table/marble, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 +======= +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +<<<<<<< HEAD +/turf/simulated/floor/lino, +/area/crew_quarters/bar) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "bar"; + layer = 3.3 }, /turf/simulated/floor/lino, /area/crew_quarters/bar) +======= +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 + }, +/turf/simulated/floor/grass, +/area/hydroponics) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "ayg" = ( /turf/simulated/wall/r_wall, /area/tether/surfacebase/botanystorage) @@ -142680,6 +142727,10 @@ aaa /area/tether/surfacebase/barbackmaintenance) "ayE" = ( /obj/structure/closet/firecloset, +/obj/machinery/light/floortube{ + dir = 8; + pixel_x = -6 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "ayF" = ( @@ -142739,18 +142790,18 @@ aaa /turf/simulated/floor/carpet, /area/library) "ayJ" = ( -/obj/structure/sink{ - pixel_y = 20 +/obj/effect/floor_decal/spline/plain{ + dir = 6 }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 32 +/obj/item/weapon/stool/padded, +/obj/structure/cable/green{ + icon_state = "0-8" }, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "ayK" = ( /obj/machinery/door/airlock/glass_research{ name = "Xenoflora Research"; @@ -142760,8 +142811,11 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ayL" = ( -/obj/structure/bed/chair/wood, -/turf/simulated/floor/tiled/eris/cafe, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, /area/hydroponics) "ayM" = ( /turf/simulated/wall, @@ -143229,24 +143283,25 @@ aaa /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "azs" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, +/obj/item/weapon/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 }, /turf/simulated/floor/lino, /area/crew_quarters/bar) "azt" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 +/obj/effect/floor_decal/spline/plain{ + dir = 6 }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) +/obj/machinery/vending/boozeomat, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "azu" = ( /obj/structure/medical_stand, /obj/effect/floor_decal/borderfloorwhite{ @@ -143293,21 +143348,18 @@ aaa /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "azx" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/structure/table/marble, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "bar"; + layer = 3.3 + }, /turf/simulated/floor/lino, /area/crew_quarters/bar) "azy" = ( @@ -143725,20 +143777,15 @@ aaa /turf/simulated/floor/plating, /area/tether/surfacebase/servicebackroom) "aAc" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 10 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "aAd" = ( /obj/structure/cable/green{ @@ -143755,19 +143802,12 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aAe" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled, +/area/hydroponics) "aAf" = ( /obj/structure/cable/green{ d1 = 2; @@ -143826,16 +143866,8 @@ aaa /turf/simulated/floor/wood, /area/library) "aAj" = ( -/obj/machinery/vending/wallmed1/public{ - pixel_x = -28 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 +/obj/machinery/light/small{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) @@ -143855,9 +143887,6 @@ aaa /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/structure/table/rack/steel, -/obj/machinery/light/small{ - dir = 8 - }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "aAm" = ( @@ -144534,9 +144563,10 @@ aaa /turf/simulated/floor/wood, /area/crew_quarters/captain) "aBp" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, -/turf/simulated/floor/grass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "aBq" = ( /obj/item/device/radio/intercom{ @@ -144703,9 +144733,6 @@ aaa /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "aBF" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -144715,6 +144742,9 @@ aaa /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aBG" = ( @@ -145086,42 +145116,38 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aCh" = ( -/obj/machinery/door/airlock{ - name = "Service"; - req_one_access = list(35,28) - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/eris/cafe, +/area/hydroponics) "aCi" = ( -/obj/effect/floor_decal/corner/beige{ - dir = 10 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/beige{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"aCj" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 8 - }, -/turf/simulated/floor/grass, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/turf/simulated/floor/tiled/white, +/area/crew_quarters/bar) +======= +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"aCj" = ( +/obj/machinery/power/apc{ + name = "south bump"; + nightshift_setting = 2; + pixel_y = -32 + }, +/obj/structure/cable/green, +/turf/simulated/floor/grass, +/area/hydroponics/cafegarden) "aCk" = ( /obj/structure/table/woodentable, /obj/item/weapon/storage/box/sinpockets, @@ -145129,10 +145155,6 @@ aaa /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) -"aCl" = ( -/obj/structure/table/rack/steel, -/turf/simulated/floor/tiled, -/area/hydroponics) "aCm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -145529,7 +145551,6 @@ aaa /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aCW" = ( -/obj/machinery/vending/hydronutrients, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -145545,15 +145566,12 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aCX" = ( -/obj/machinery/seed_storage/garden, -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/turf/simulated/floor/grass, +/area/hydroponics) "aCY" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -145816,14 +145834,38 @@ aaa /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/public_garden_three) "aDz" = ( +<<<<<<< HEAD /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, /obj/structure/window/reinforced{ dir = 4 +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/bed/chair/wood{ + dir = 1 +======= +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR }, +<<<<<<< HEAD /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +======= +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border, +/obj/machinery/camera/network/tether{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aDA" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -145938,7 +145980,9 @@ aaa /turf/simulated/open, /area/tether/surfacebase/public_garden_three) "aDI" = ( -/obj/machinery/camera/network/civilian, +/obj/structure/sink{ + pixel_y = 24 + }, /turf/simulated/floor/grass, /area/hydroponics) "aDJ" = ( @@ -145971,21 +146015,37 @@ aaa /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDM" = ( -/obj/machinery/seed_extractor, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, +/obj/machinery/vending/hydronutrients, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) +<<<<<<< HEAD "aDN" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"aDN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +======= +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aDO" = ( +<<<<<<< HEAD /obj/machinery/alarm{ dir = 8; pixel_x = 25 @@ -145995,11 +146055,48 @@ aaa }, /obj/effect/floor_decal/corner/lime/border{ dir = 6 +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"aDP" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 6 +======= +/obj/structure/bed/chair/wood, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +"aDP" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -5; + pixel_y = -10 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR + }, +<<<<<<< HEAD /obj/machinery/camera/network/civilian{ dir = 1 }, /turf/simulated/floor/tiled, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/light{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +======= +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/grass, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /area/tether/surfacebase/public_garden_three) "aDP" = ( /obj/structure/grille, @@ -146028,6 +146125,7 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDS" = ( +<<<<<<< HEAD /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, @@ -146036,6 +146134,13 @@ aaa }, /obj/structure/window/reinforced, /turf/simulated/floor/plating, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/bed/chair/wood, +/turf/simulated/floor/grass, +======= +/obj/structure/table/woodentable, +/turf/simulated/floor/grass, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /area/tether/surfacebase/public_garden_three) "aDT" = ( /obj/machinery/light, @@ -146243,19 +146348,19 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aEl" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/obj/structure/table/reinforced, +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "kitchenhallway"; + layer = 3.3 + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aEm" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -146420,8 +146525,9 @@ aaa /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_three_hall) "aEB" = ( -/obj/structure/sink{ - pixel_y = 24 +/obj/machinery/smartfridge/drying_rack, +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/grass, /area/hydroponics) @@ -146608,11 +146714,10 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aET" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/item/weapon/stool/padded, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "aEU" = ( /turf/simulated/floor/carpet, @@ -146626,26 +146731,8 @@ aaa }, /turf/simulated/floor/carpet, /area/library) -"aEW" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/structure/table/marble, -/obj/machinery/chemical_dispenser/bar_soft/full{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "aEX" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/grass, /area/hydroponics) "aEY" = ( @@ -146654,6 +146741,12 @@ aaa d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "aEZ" = ( @@ -146966,12 +147059,12 @@ aaa /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "aFz" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/flora/ausbushes/pointybush, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "aFA" = ( @@ -147097,14 +147190,13 @@ aaa /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) "aFK" = ( -/obj/structure/bed/chair/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 8 }, -/turf/simulated/floor/tiled/eris/cafe, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/hydroponics) "aFL" = ( /obj/structure/window/reinforced/full, @@ -147143,10 +147235,6 @@ aaa /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "aFO" = ( -/obj/machinery/door/airlock{ - name = "Service"; - req_one_access = list(35,28) - }, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -147156,24 +147244,23 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "aFP" = ( /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/turf/simulated/floor/grass, +/area/hydroponics) "aFQ" = ( /obj/structure/cable/green{ d1 = 4; @@ -147224,14 +147311,17 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFS" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aFT" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -147330,10 +147420,12 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aGb" = ( -/obj/machinery/camera/network/civilian{ - dir = 4 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/grass, /area/hydroponics) "aGc" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -147354,21 +147446,21 @@ aaa /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/turf/simulated/floor/grass, +/area/hydroponics) +"aGe" = ( /obj/machinery/requests_console{ - pixel_y = 30 + pixel_x = -30 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/closet/crate, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) -"aGe" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) "aGf" = ( /obj/machinery/status_display{ pixel_x = 32 @@ -147399,12 +147491,11 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/camera/network/civilian, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/turf/simulated/floor/grass, +/area/hydroponics) "aGh" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/freezer{ @@ -147435,7 +147526,6 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aGj" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -147531,19 +147621,9 @@ aaa /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) "aGq" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aGr" = ( @@ -147578,13 +147658,15 @@ aaa /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "aGt" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/reinforced, +/obj/machinery/door/blast/gate/thin{ + dir = 2; + id = "kitchen"; + layer = 3.3 }, -/turf/simulated/floor/grass, -/area/hydroponics/cafegarden) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aGu" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -147632,15 +147714,26 @@ aaa /turf/simulated/floor/wood, /area/library) "aGx" = ( -/obj/structure/sink{ - pixel_y = 20 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 32 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/snack, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/bar) "aGy" = ( /obj/structure/railing, /obj/structure/grille, @@ -147749,35 +147842,29 @@ aaa /area/hallway/lower/third_south) "aGG" = ( /obj/machinery/vending/cigarette, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) -"aGH" = ( -/obj/structure/table/woodentable, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/simulated/floor/grass, -/area/hydroponics) "aGI" = ( /obj/machinery/vending/cola/soft, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aGJ" = ( -/obj/machinery/portable_atmospherics/hydroponics, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/servicebackroom) "aGK" = ( /turf/simulated/wall, /area/crew_quarters/barrestroom) @@ -147990,6 +148077,9 @@ aaa /area/library) "aHe" = ( /obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aHf" = ( @@ -148085,6 +148175,9 @@ aaa "aHl" = ( /obj/structure/table/woodentable, /obj/item/weapon/flame/candle, +/obj/machinery/light/floortube{ + pixel_y = -6 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aHm" = ( @@ -148101,16 +148194,15 @@ aaa dir = 8 }, /obj/effect/floor_decal/borderfloor{ - dir = 4 + dir = 8 }, /obj/effect/floor_decal/corner/lime/border{ - dir = 4 + dir = 8 }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/grass, /area/hydroponics) "aHo" = ( /obj/machinery/light, -/obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/camera/network/civilian{ dir = 1 }, @@ -148119,16 +148211,12 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aHp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 +/obj/item/weapon/stool/padded, +/obj/effect/floor_decal/corner/beige{ + dir = 6 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/bar) "aHq" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) @@ -148170,34 +148258,69 @@ aaa }, /area/crew_quarters/bar) "aHv" = ( +/obj/machinery/door/airlock{ + name = "Bar Backroom"; + req_access = list(25) + }, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/obj/effect/floor_decal/spline/plain, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/wood, +/obj/machinery/door/firedoor, +/turf/simulated/floor/lino, /area/tether/surfacebase/bar_backroom) "aHw" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) -"aHx" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/door/airlock{ + name = "Service"; + req_one_access = list(35,28) + }, +/turf/simulated/floor/tiled, +/area/hydroponics) +"aHx" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aHy" = ( @@ -148230,6 +148353,12 @@ aaa d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aHB" = ( @@ -148644,6 +148773,7 @@ aaa /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aIi" = ( @@ -148661,25 +148791,40 @@ aaa d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aIk" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor/corner{ +/obj/structure/table/reinforced, +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "kitchen"; + layer = 3.3; + name = "Kitchen Shutters" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/chemical_dispenser/bar_soft/full{ dir = 8 }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 8 +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aIl" = ( /obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aIm" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/item/weapon/stool/padded, /turf/simulated/floor/lino, /area/crew_quarters/bar) "aIn" = ( @@ -148689,14 +148834,11 @@ aaa /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aIo" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/item/weapon/stool/padded, /obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/lino, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "aIp" = ( /obj/structure/flora/pottedplant/unusual, @@ -148935,6 +149077,7 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aIJ" = ( +<<<<<<< HEAD /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ dir = 8; @@ -148946,8 +149089,29 @@ aaa dir = 8 }, /turf/simulated/floor/lino, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/table/marble, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "bar"; + layer = 3.3 + }, +/turf/simulated/floor/lino, +======= +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/wood, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /area/crew_quarters/bar) "aIK" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/item/weapon/stool/padded, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -148974,15 +149138,36 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aIM" = ( +<<<<<<< HEAD /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/table/marble, +/obj/machinery/door/blast/gate/thin{ +======= +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/machinery/computer/guestpass{ +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR dir = 8; +<<<<<<< HEAD id = "bar"; layer = 3.3; name = "Bar Shutters" +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR + id = "bar"; + layer = 3.3 +======= + pixel_x = 21 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/servicebackroom) "aIN" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -149002,22 +149187,24 @@ aaa /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aIP" = ( +/obj/structure/table/marble, /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + dir = 8 + }, +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "bar"; + layer = 3.3 }, /turf/simulated/floor/lino, /area/crew_quarters/bar) "aIQ" = ( -/obj/structure/bed/chair/comfy{ - dir = 1 +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/obj/effect/landmark/start{ - name = "Bartender" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) +/obj/machinery/smartfridge/drinks, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "aIR" = ( /obj/structure/railing{ dir = 1 @@ -149025,8 +149212,8 @@ aaa /turf/simulated/open, /area/tether/surfacebase/medical/uppersouthstairwell) "aIS" = ( -/obj/machinery/vending/cigarette{ - dir = 1 +/obj/machinery/newscaster{ + pixel_y = -28 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -149037,10 +149224,12 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aIU" = ( -/obj/machinery/vending/snack{ - dir = 1 +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/corner/beige{ + dir = 10 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled/white, /area/crew_quarters/bar) "aIV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -149337,20 +149526,10 @@ aaa /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/grass, +/area/hydroponics) "aJv" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -149475,20 +149654,26 @@ aaa /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "aJJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 10 }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 2 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "aJK" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -149599,6 +149784,7 @@ aaa icon_state = "frame"; pixel_x = -64 }, +/obj/machinery/computer/arcade/battle, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aJT" = ( @@ -149618,21 +149804,20 @@ aaa /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "aJV" = ( -/obj/structure/table/glass, -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/floor_decal/corner/beige{ + dir = 10 }, -/obj/item/weapon/packageWrap, -/obj/item/device/destTagger{ - pixel_x = 4; - pixel_y = 3 +/obj/effect/floor_decal/corner/beige{ + dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/effect/floor_decal/spline/plain{ + dir = 6 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/hydroponics) +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/bar) "aJW" = ( /turf/simulated/wall, /area/rnd/robotics/surgeryroom2) @@ -149708,6 +149893,24 @@ aaa d2 = 2; icon_state = "1-2" }, +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/door/blast/gate/thin{ + id = "kitchen2"; + layer = 3.3 + }, +======= +/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3 + }, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, +/obj/machinery/door/blast/gate/thin{ + id = "kitchen2"; + layer = 3.3 + }, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aKd" = ( @@ -149765,28 +149968,21 @@ aaa /turf/simulated/floor/tiled/dark, /area/rnd/robotics/surgeryroom1) "aKl" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/table/marble, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/window/brigdoor/northleft{ + dir = 2; + name = "Bar"; + req_access = list(25) }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/door/window/westright{ + dir = 1; + name = "Kitchen"; + req_access = list(28) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aKm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -149811,7 +150007,6 @@ aaa /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aKp" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -149832,13 +150027,25 @@ aaa /turf/simulated/floor/wood, /area/crew_quarters/bar) "aKs" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -28; + pixel_y = 26 }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) @@ -150185,13 +150392,13 @@ aaa /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/shuttle_pad) "aLb" = ( -/obj/structure/closet/crate, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/smartfridge{ + req_access = list(28) }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aLc" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/landmark/start{ @@ -150227,16 +150434,8 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aLg" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/camera/network/civilian{ - dir = 1 - }, -/turf/simulated/floor/grass, -/area/hydroponics) +/turf/simulated/wall, +/area/space) "aLh" = ( /obj/machinery/light, /obj/effect/floor_decal/borderfloor, @@ -150482,20 +150681,14 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aLG" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/door/airlock{ + id_tag = "barbackdoor"; + name = "Service"; + req_access = list(25) }, -/obj/machinery/requests_console{ - pixel_x = 32; - pixel_y = -32 - }, -/obj/item/device/radio/intercom{ - pixel_y = -24 - }, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/bar_backroom) "aLH" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -150806,7 +150999,9 @@ aaa dir = 4; pixel_x = 24 }, -/obj/structure/flora/pottedplant/unusual, +/obj/structure/table/wooden_reinforced, +/obj/item/weapon/folder/white, +/obj/item/weapon/folder/red, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "aMn" = ( @@ -151709,14 +151904,28 @@ aaa /turf/simulated/wall/r_wall, /area/rnd/outpost/xenobiology/outpost_south_airlock) "aOg" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/grass, +/area/hydroponics) "aOh" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ @@ -152238,22 +152447,19 @@ aaa /turf/simulated/floor/tiled/dark, /area/bridge) "aPl" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donkpockets, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/vending/bepis, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "aPm" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donkpockets, +/obj/machinery/vending/fitness, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "aPn" = ( -/obj/structure/table/woodentable, -/obj/machinery/microwave, /obj/machinery/light{ dir = 1 }, +/obj/machinery/vending/weeb, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "aPo" = ( @@ -152391,9 +152597,8 @@ aaa /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) "aPB" = ( -/obj/machinery/vending/weeb{ - dir = 4 - }, +/obj/structure/table/woodentable, +/obj/machinery/microwave, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "aPC" = ( @@ -152530,12 +152735,6 @@ aaa /obj/structure/sign/department/xenolab, /turf/simulated/wall, /area/rnd/outpost/xenobiology/outpost_breakroom) -"aPU" = ( -/obj/machinery/vending/fitness{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/xenobiology/outpost_breakroom) "aPV" = ( /obj/machinery/light{ dir = 4 @@ -152618,22 +152817,28 @@ aaa /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) "aQf" = ( -/obj/structure/sink{ - pixel_y = 20 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 32 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 }, -/obj/machinery/light/small{ +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/cola, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/bar) "aQg" = ( -/obj/machinery/vending/bepis{ - dir = 4 - }, +/obj/structure/table/woodentable, +/obj/item/weapon/storage/box/donkpockets, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "aQh" = ( @@ -152929,9 +153134,6 @@ aaa /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "aQL" = ( -/obj/machinery/vending/coffee{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -152940,6 +153142,7 @@ aaa pixel_x = 24 }, /obj/structure/disposalpipe/segment, +/obj/structure/flora/pottedplant/unusual, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "aQM" = ( @@ -153391,13 +153594,14 @@ aaa /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) "aRJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/tiled, +/obj/structure/table/glass, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "aRK" = ( /obj/effect/floor_decal/borderfloorwhite, @@ -153604,6 +153808,9 @@ aaa /area/rnd/outpost/xenobiology/outpost_main) "aSh" = ( /obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aSi" = ( @@ -153781,17 +153988,25 @@ aaa /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "aSx" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/camera/network/civilian, +/obj/machinery/seed_storage/garden, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/grass, /area/hydroponics) "aSy" = ( -/obj/machinery/light{ - dir = 8 +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/machinery/door/window/brigdoor/northleft{ + dir = 8; + name = "Bar"; + req_access = list(25) + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "aSz" = ( /obj/structure/window/basic/full, /obj/structure/window/basic{ @@ -154381,12 +154596,12 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "aTF" = ( -/obj/structure/closet/crate/plastic, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/light/small{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/hydroponics) +/obj/structure/closet/secure_closet/bar, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) "aTG" = ( /obj/structure/table/woodentable, /obj/item/weapon/packageWrap, @@ -154409,12 +154624,11 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aTI" = ( -/obj/structure/closet/crate, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/turf/simulated/floor/grass, +/area/hydroponics) "aTJ" = ( /obj/machinery/conveyor{ dir = 1; @@ -154553,6 +154767,19 @@ aaa }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"aTW" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/freezer/cold, +/area/crew_quarters/freezer) +======= +"aTW" = ( +/obj/machinery/light, +/obj/structure/foodcart, +/turf/simulated/floor/tiled/freezer/cold, +/area/crew_quarters/freezer) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aTX" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -154592,11 +154819,14 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa/officecommon) "aUb" = ( -/obj/structure/bed/chair, -/obj/machinery/alarm{ - pixel_y = 22 +/obj/machinery/vending/cola, +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/turf/simulated/floor/carpet/blue, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "aUc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -154624,7 +154854,14 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aUe" = ( -/turf/simulated/floor/carpet/blue, +/obj/machinery/vending/coffee, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "aUf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -154830,6 +155067,14 @@ aaa /obj/structure/window/reinforced{ dir = 1 }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lime/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aUA" = ( @@ -155364,11 +155609,16 @@ aaa /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "aVw" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "aVx" = ( /obj/machinery/firealarm{ dir = 8; @@ -155401,29 +155651,30 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aVB" = ( -/obj/structure/bed/chair/wood{ - dir = 1 +/obj/structure/table/glass, +/obj/machinery/door/window/westright{ + req_one_access = list(35,28) }, +/obj/machinery/door/firedoor, +/obj/item/device/destTagger{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/weapon/packageWrap, /obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/tiled, /area/hydroponics) "aVC" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 +/obj/structure/closet/gmcloset{ + name = "formal wardrobe" }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/item/glass_jar, +/obj/item/device/retail_scanner/civilian, +/obj/item/device/retail_scanner/civilian, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) "aVD" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -155493,14 +155744,23 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) "aVK" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/effect/floor_decal/corner/lightgrey{ +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/structure/flora/pottedplant/minitree, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aVL" = ( /obj/machinery/photocopier, @@ -155528,45 +155788,35 @@ aaa /area/tether/surfacebase/medical/surgery2) "aVO" = ( /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 4; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/tiled, /area/hydroponics) "aVP" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/table/marble, +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "bar"; + layer = 3.3 }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/turf/simulated/floor/grass, -/area/hydroponics) +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "aVQ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 10 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aVR" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/cafe, -/area/hydroponics) +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) "aVS" = ( /obj/item/device/radio/intercom{ pixel_y = -24 @@ -155964,17 +156214,6 @@ aaa }, /turf/simulated/wall, /area/tether/surfacebase/entertainment/backstage) -"aWE" = ( -/obj/structure/table/glass, -/obj/machinery/door/window/westright{ - req_one_access = list(35,28) - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/hydroponics) "aWF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -156253,23 +156492,19 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aXh" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/turf/simulated/floor/grass, +/area/hydroponics) "aXi" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor{ dir = 10 }, /obj/effect/floor_decal/corner/lime/border{ dir = 10 }, +/obj/structure/closet/secure_closet/hydroponics, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aXj" = ( @@ -156430,15 +156665,8 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aXv" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/grass, /area/hydroponics) @@ -156669,12 +156897,93 @@ aaa }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"aXN" = ( +/obj/machinery/door/airlock{ + id_tag = "bathroomlock17"; + name = "Bar Toilet 1" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +"aXO" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/remote/airlock{ + id = "bathroomlock18"; + name = "Bar Toilet 2 Lock"; + pixel_x = -10; + pixel_y = 22; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +======= +"aXN" = ( +/obj/structure/reagent_dispensers/beerkeg, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) +"aXO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aXP" = ( /obj/structure/disposalpipe/up{ dir = 8 }, /turf/simulated/floor/plating, /area/rnd/research_storage) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"aXQ" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/remote/airlock{ + id = "bathroomlock17"; + name = "Bar Toilet 1 Lock"; + pixel_x = -10; + pixel_y = 22; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +"aXR" = ( +/obj/machinery/door/airlock{ + id_tag = "bathroomlock18"; + name = "Bar Toilet 2" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +======= +"aXQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) +"aXR" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aXS" = ( /obj/structure/bed/chair/comfy, /obj/machinery/camera/network/civilian, @@ -156715,9 +157024,11 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aXV" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, +/obj/structure/table/standard{ + name = "plastic table frame" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aXW" = ( @@ -157132,13 +157443,13 @@ aaa /turf/simulated/floor/tiled/dark, /area/bridge) "aYN" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor{ dir = 6 }, /obj/effect/floor_decal/corner/lime/border{ dir = 6 }, +/obj/structure/closet/secure_closet/hydroponics, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aYO" = ( @@ -157230,9 +157541,6 @@ aaa /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light{ - dir = 4 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -157264,6 +157572,10 @@ aaa d2 = 2; icon_state = "1-2" }, +/obj/machinery/light/floortube{ + dir = 4; + pixel_x = 6 + }, /turf/simulated/floor/tiled/dark, /area/bridge_hallway) "aZd" = ( @@ -157652,10 +157964,10 @@ aaa icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 9 }, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) @@ -157705,14 +158017,15 @@ aaa /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "aZQ" = ( -/obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/structure/table/glass, +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/tiled, /area/hydroponics) "aZR" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -158152,10 +158465,10 @@ aaa /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/item/weapon/stool/padded, /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "baB" = ( @@ -158164,19 +158477,18 @@ aaa d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "baC" = ( -/obj/machinery/vending/cola{ - dir = 1 +/obj/structure/table/woodentable, +/obj/machinery/light/floortube{ + dir = 1; + pixel_y = 6 }, -/obj/machinery/light, /turf/simulated/floor/wood, /area/crew_quarters/bar) "baD" = ( @@ -158220,21 +158532,13 @@ aaa /area/crew_quarters/kitchen) "baF" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 8 }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/door/airlock/freezer{ - name = "Service"; - req_access = list(28) +/obj/structure/bed/chair/wood{ + dir = 1 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "baG" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 @@ -158371,14 +158675,10 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "baP" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/tiled, /area/hydroponics) "baQ" = ( /obj/effect/floor_decal/borderfloor{ @@ -158415,7 +158715,6 @@ aaa dir = 1; pixel_y = -22 }, -/obj/machinery/media/jukebox, /turf/simulated/floor/wood, /area/crew_quarters/bar) "baU" = ( @@ -158432,19 +158731,15 @@ aaa dir = 1; pixel_y = -25 }, -/obj/machinery/computer/guestpass{ - dir = 8; - pixel_x = 25 - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "baX" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/light{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "baY" = ( /obj/structure/window/reinforced/full, /obj/structure/grille, @@ -158455,7 +158750,7 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "baZ" = ( -/obj/random/cutout, +/obj/machinery/vending/entertainer, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "bba" = ( @@ -158580,14 +158875,11 @@ aaa /turf/simulated/wall, /area/tether/surfacebase/entertainment) "bbo" = ( -/obj/machinery/door/window/westright{ - req_one_access = list(35,28) - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 +/obj/structure/extinguisher_cabinet{ + pixel_y = -32 }, /turf/simulated/floor/grass, -/area/hydroponics/cafegarden) +/area/hydroponics) "bbp" = ( /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/tiled, @@ -158663,6 +158955,7 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/closet/crate, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bbw" = ( @@ -158826,18 +159119,11 @@ aaa /turf/simulated/floor/wood, /area/crew_quarters/captain) "bbI" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/flame/candle, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/camera/network/civilian{ - dir = 9 - }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/tiled, /area/hydroponics) "bbJ" = ( /obj/machinery/firealarm{ @@ -158851,18 +159137,14 @@ aaa /turf/simulated/floor/wood, /area/crew_quarters/bar) "bbL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/mob/living/carbon/human/monkey/punpun, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) +"bbM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"bbM" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/item/weapon/stool/padded, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "bbN" = ( /obj/structure/cable/green{ d1 = 4; @@ -158895,67 +159177,35 @@ aaa "bbP" = ( /obj/structure/table/woodentable, /obj/item/weapon/flame/candle, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bbQ" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, /obj/structure/cable/green{ - icon_state = "0-8" + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "bbR" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, +/obj/item/weapon/stool/padded, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/lino, /area/crew_quarters/bar) "bbS" = ( -/obj/structure/table/marble, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "bar"; - layer = 3.3; - name = "Bar Shutters" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) -"bbT" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"bbU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"bbV" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 }, @@ -158968,6 +159218,24 @@ aaa }, /turf/simulated/floor/lino, /area/crew_quarters/bar) +"bbT" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"bbU" = ( +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"bbV" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +<<<<<<< HEAD "bbW" = ( /obj/structure/cable/green{ d1 = 2; @@ -158987,28 +159255,65 @@ aaa }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"bbW" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -28; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +"bbX" = ( +/obj/machinery/atmospherics/unary/engine{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tourbus/general) +======= +"bbX" = ( +/obj/machinery/atmospherics/unary/engine{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tourbus/general) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "bbY" = ( -/obj/effect/floor_decal/spline/plain, -/obj/item/weapon/stool/padded, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/lino, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "bbZ" = ( -/obj/effect/floor_decal/spline/plain, -/obj/item/weapon/stool/padded, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/structure/cable/green{ - d1 = 1; + d1 = 2; d2 = 8; - icon_state = "1-8" + icon_state = "2-8" }, /turf/simulated/floor/lino, /area/crew_quarters/bar) @@ -159130,7 +159435,6 @@ aaa /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/vending/entertainer, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "bck" = ( @@ -159218,17 +159522,8 @@ aaa /turf/simulated/floor/plating, /area/tether/surfacebase/entertainment) "bcp" = ( -/obj/machinery/requests_console{ - pixel_x = 32; - pixel_y = -32 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -159236,12 +159531,6 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/button/remote/blast_door{ - id = "bar"; - name = "Bar Shutter Control"; - pixel_x = 24; - pixel_y = 24 - }, /turf/simulated/floor/lino, /area/crew_quarters/bar) "bcq" = ( @@ -159299,21 +159588,15 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "bcu" = ( -/obj/structure/table/marble, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/window/brigdoor/northleft{ - dir = 2; - name = "Bar"; - req_access = list(25) +/obj/structure/table/woodentable, +/obj/item/weapon/storage/box/beanbags, +/obj/item/weapon/gun/projectile/shotgun/doublebarrel, +/obj/item/weapon/paper{ + info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest."; + name = "Shotgun permit" }, -/obj/machinery/door/window/westright{ - dir = 1; - name = "Kitchen"; - req_access = list(28) - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) "bcv" = ( /obj/machinery/power/apc{ cell_type = /obj/item/weapon/cell/super; @@ -159328,10 +159611,8 @@ aaa /area/crew_quarters/freezer) "bcw" = ( /obj/machinery/light, -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bcx" = ( /obj/effect/floor_decal/borderfloor{ @@ -159420,15 +159701,19 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "bcB" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bcC" = ( /obj/structure/disposalpipe/segment{ @@ -159448,7 +159733,6 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bcD" = ( -/obj/structure/closet/crate, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -159461,7 +159745,6 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bcE" = ( -/obj/structure/closet/crate, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -159528,7 +159811,7 @@ aaa dir = 8 }, /mob/living/simple_mob/vore/rabbit/white/lennie, -/turf/simulated/floor/tiled, +/turf/simulated/floor/grass, /area/hydroponics) "bcO" = ( /obj/effect/floor_decal/borderfloor{ @@ -159623,6 +159906,7 @@ aaa icon_state = "1-2" }, /obj/item/device/megaphone, +/obj/random/cutout, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "bcV" = ( @@ -159800,8 +160084,8 @@ aaa /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "bdi" = ( -/obj/machinery/alarm{ - pixel_y = 25 +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/grass, /area/hydroponics) @@ -159818,15 +160102,7 @@ aaa /turf/simulated/floor/grass, /area/hydroponics) "bdl" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/machinery/light, /turf/simulated/floor/grass, /area/hydroponics) "bdm" = ( @@ -159840,11 +160116,17 @@ aaa pixel_x = -24 }, /obj/item/weapon/stool/padded, +/obj/random/cutout, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "bdn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/mob/living/carbon/human/monkey/punpun, +/obj/structure/bed/chair/comfy{ + dir = 1 + }, +/obj/effect/landmark/start{ + name = "Bartender" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "bdo" = ( @@ -159908,21 +160190,51 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "bdt" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "bdu" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/bed/chair/comfy, +/obj/effect/landmark/start{ + name = "Bartender" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "bdv" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/food/drinks/metaglass, +/obj/item/weapon/reagent_containers/food/drinks/metaglass, +/obj/item/weapon/reagent_containers/food/drinks/metaglass, +/obj/item/weapon/reagent_containers/food/drinks/metaglass, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 28 + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/wood, -/area/crew_quarters/bar) +/area/tether/surfacebase/bar_backroom) "bdw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "bdx" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -159951,21 +160263,23 @@ aaa /turf/simulated/open, /area/tether/surfacebase/barbackmaintenance) "bdB" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/cafe, -/area/hydroponics) -"bdC" = ( -/obj/structure/table/bench/standard, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/table/bench/standard, /obj/effect/landmark/start{ name = "Botanist" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hydroponics) +"bdC" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/grass, +/area/hydroponics) "bdD" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -159988,21 +160302,16 @@ aaa /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "bdG" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"bdH" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/grass, /area/hydroponics) +"bdH" = ( +/obj/structure/table/woodentable, +/obj/machinery/reagentgrinder, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) "bdI" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, @@ -160019,8 +160328,11 @@ aaa d2 = 8; icon_state = "4-8" }, +/obj/structure/bed/chair/wood{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -160048,12 +160360,14 @@ aaa /area/crew_quarters/bar) "bdO" = ( /obj/structure/table/woodentable, -/obj/item/weapon/packageWrap, -/obj/item/device/destTagger{ +/obj/item/weapon/flame/lighter/zippo, +/obj/item/clothing/head/that{ pixel_x = 4; - pixel_y = 3 + pixel_y = 6 }, -/obj/machinery/light/small, +/obj/item/weapon/tool/screwdriver, +/obj/item/clothing/mask/smokable/cigarette/cigar/havana, +/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "bdP" = ( @@ -160189,15 +160503,21 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "beg" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/light_switch{ + pixel_x = -28; + pixel_y = 29 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "beh" = ( -/obj/machinery/newscaster{ - pixel_y = -28 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -160208,17 +160528,25 @@ aaa dir = 8; icon_state = "pipe-c" }, +/obj/machinery/light, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bei" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -28; + pixel_y = -25 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) @@ -160242,6 +160570,7 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bek" = ( +<<<<<<< HEAD /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/requests_console{ pixel_x = 32; @@ -160259,9 +160588,52 @@ aaa "bel" = ( /obj/machinery/door/airlock{ name = "Unit 2" +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/requests_console{ + pixel_x = 32; + pixel_y = -32 + }, +/obj/machinery/light, +/obj/item/device/radio/intercom{ + pixel_y = -25 + }, +/obj/machinery/vending/dinnerware{ + dir = 1 }, /turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) +"bel" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 +======= +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/grass, +/area/hydroponics) +"bel" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR + }, +<<<<<<< HEAD +/turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +======= +/obj/machinery/light/floortube{ + dir = 8; + pixel_x = -3 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "bem" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -160328,15 +160700,23 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "bes" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bet" = ( /obj/effect/floor_decal/industrial/warning{ @@ -160366,9 +160746,7 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/effect/landmark/start{ - name = "Chef" - }, +/obj/structure/closet/secure_closet/freezer/kitchen, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bew" = ( @@ -160385,10 +160763,18 @@ aaa /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/computer/guestpass{ - pixel_y = 23 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/vending/dinnerware, +/obj/machinery/camera/network/civilian, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bey" = ( /obj/machinery/firealarm{ @@ -160424,9 +160810,6 @@ aaa /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/machinery/light{ - dir = 4 - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "beB" = ( @@ -160448,30 +160831,49 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "beC" = ( -/obj/structure/table/bench/standard, -/obj/effect/landmark/start{ - name = "Botanist" +/obj/structure/table/marble, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/door/blast/gate/thin{ + dir = 2; + id = "bar"; + layer = 3.3 }, -/turf/simulated/floor/tiled, -/area/hydroponics) +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "beD" = ( -/obj/machinery/camera/network/civilian, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/requests_console{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "beE" = ( -/obj/structure/table/glass, -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/hydroponics) +/obj/structure/table/marble, +/obj/machinery/door/blast/gate/thin{ + dir = 2; + id = "bar"; + layer = 3.3 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "beF" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -160531,48 +160933,22 @@ aaa /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "beK" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, -/area/hydroponics) +/obj/effect/floor_decal/spline/plain, +/obj/item/weapon/stool/padded, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "beL" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/cafe, -/area/hydroponics) -"beM" = ( -/obj/machinery/door/window/westright{ - req_one_access = list(35,28) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/hydroponics) -"beN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/tether/surfacebase/shuttle_pad) -"beO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -160587,13 +160963,72 @@ aaa }, /turf/simulated/floor/grass, /area/hydroponics) +"beM" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/cigarette, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/bar) +"beN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether/surfacebase/shuttle_pad) +"beO" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "beP" = ( +<<<<<<< HEAD /obj/machinery/gibber, /obj/machinery/light{ dir = 1 +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/light{ + dir = 4 }, +/obj/effect/floor_decal/techfloor{ + dir = 4 +======= +/obj/effect/floor_decal/techfloor{ + dir = 4 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR + }, +<<<<<<< HEAD /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +======= +/obj/machinery/light/floortube{ + dir = 4; + pixel_x = 2 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "beQ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -160655,17 +161090,9 @@ aaa /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "beZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 2 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/structure/bed/chair/comfy/black, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bfa" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -160678,15 +161105,17 @@ aaa /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "bfb" = ( -/obj/machinery/door/airlock/freezer{ - name = "Service"; - req_one_access = list(35,28) +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/hydroponics/cafegarden) +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/crew_quarters/bar) "bfc" = ( /obj/structure/table/woodentable, /obj/item/weapon/flame/candle, @@ -160758,48 +161187,28 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "bfk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) -"bfl" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) -"bfm" = ( /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 4 }, /obj/structure/cable/green{ - d1 = 4; + d1 = 2; d2 = 8; - icon_state = "4-8" + icon_state = "2-8" }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) +"bfl" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bfn" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/standard, @@ -160815,14 +161224,14 @@ aaa /area/tether/surfacebase/barbackmaintenance) "bfp" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable/green{ d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/camera/network/civilian{ - dir = 9 + d2 = 4; + icon_state = "1-4" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -160835,8 +161244,16 @@ aaa d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/airlock/freezer{ + name = "Service"; + req_access = list(28) }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) @@ -160869,29 +161286,28 @@ aaa /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "bft" = ( -/obj/machinery/light, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bfu" = ( /obj/structure/cable/green{ d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 2; d2 = 8; - icon_state = "2-8" + icon_state = "1-8" }, /turf/simulated/floor/grass, /area/hydroponics) "bfv" = ( -/obj/structure/closet/crate, /obj/structure/cable/green{ d1 = 1; d2 = 8; @@ -160926,13 +161342,21 @@ aaa /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bfA" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "bfB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/tiled/white, @@ -161000,7 +161424,6 @@ aaa /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/random/cutout, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -161039,15 +161462,25 @@ aaa /area/tether/surfacebase/servicebackroom) "bfM" = ( /obj/machinery/door/airlock{ - name = "Unit 3" + id_tag = "bathroomlock17"; + name = "Bar Toilet 1" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "bfN" = ( -/obj/machinery/recharge_station, +/obj/structure/toilet{ + dir = 8 + }, /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/button/remote/airlock{ + id = "bathroomlock17"; + name = "Bar Toilet 1 Lock"; + pixel_x = -10; + pixel_y = 22; + specialfunctions = 4 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "bfO" = ( @@ -161076,7 +161509,15 @@ aaa /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bfR" = ( +<<<<<<< HEAD /obj/machinery/computer/arcade/battle, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/computer/arcade/battle{ + dir = 1 + }, +======= +/obj/machinery/media/jukebox, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /turf/simulated/floor/wood, /area/crew_quarters/bar) "bfS" = ( @@ -161098,32 +161539,18 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "bfU" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bfV" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bfW" = ( /obj/machinery/light, @@ -161131,30 +161558,34 @@ aaa /area/rnd/xenobiology/xenoflora_storage) "bfX" = ( /obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/obj/structure/table/marble, -/obj/machinery/chemical_dispenser/bar_alc/full{ - dir = 8 - }, -/obj/machinery/light{ dir = 1 }, -/obj/structure/sign/poster{ - dir = 4 - }, /turf/simulated/floor/lino, /area/crew_quarters/bar) "bfY" = ( +<<<<<<< HEAD /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ dir = 8; id = "bar"; layer = 3.3; name = "Bar Shutters" +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/table/marble, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "bar"; + layer = 3.3; + name = "Bar Shutters" +======= +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR }, -/obj/item/weapon/material/ashtray/glass, -/turf/simulated/floor/lino, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "bfZ" = ( /obj/effect/floor_decal/corner/beige{ @@ -161175,9 +161606,17 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bga" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/cafe, +/obj/machinery/door/window/westright{ + req_one_access = list(35,28) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, /area/hydroponics) "bgb" = ( /obj/machinery/button/remote/blast_door{ @@ -161188,21 +161627,30 @@ aaa /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "bgc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/eris/cafe, +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/sign/botany, +/turf/simulated/floor/plating, /area/hydroponics) "bgd" = ( /obj/effect/landmark{ name = "Observer-Start" }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bge" = ( -/obj/machinery/requests_console{ - pixel_x = -30 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bgf" = ( /obj/structure/noticeboard{ @@ -161225,41 +161673,51 @@ aaa /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "bgh" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25; + target_temperature = 270 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bgi" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bgj" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/structure/sign/securearea{ - desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"; - icon_state = "monkey_painting"; - name = "Mr. Deempisi portrait"; - pixel_x = 4; - pixel_y = 28 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/lino, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "bgk" = ( /obj/effect/floor_decal/spline/plain, @@ -161422,6 +161880,7 @@ aaa /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "bgz" = ( +<<<<<<< HEAD /obj/effect/floor_decal/spline/plain{ dir = 4 }, @@ -161432,19 +161891,24 @@ aaa dir = 9 }, /obj/item/weapon/book/manual/bar_guide, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/structure/table/marble, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/obj/machinery/chemical_dispenser/bar_coffee/full{ + dir = 8 + }, +======= +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /turf/simulated/floor/lino, /area/crew_quarters/bar) "bgA" = ( -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25; - target_temperature = 270 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bgB" = ( /obj/structure/bed/chair/wood{ @@ -161461,15 +161925,12 @@ aaa /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "bgC" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, /obj/structure/table/marble, -/obj/machinery/door/blast/shutters{ +/obj/item/weapon/material/ashtray/glass, +/obj/machinery/door/blast/gate/thin{ dir = 2; id = "bar"; - layer = 3.3; - name = "Bar Shutters" + layer = 3.3 }, /turf/simulated/floor/lino, /area/crew_quarters/bar) @@ -161480,20 +161941,12 @@ aaa /turf/simulated/floor/wood, /area/crew_quarters/bar) "bgE" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, +/obj/effect/floor_decal/spline/plain, /obj/item/weapon/stool/padded, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, /obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/light{ - dir = 4 + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/lino, /area/crew_quarters/bar) @@ -161512,19 +161965,14 @@ aaa /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bgH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secreet"; - name = "Tintable Window" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "secreet"; - name = "Tintable Window" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/barbackmaintenance) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bgI" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -161533,17 +161981,15 @@ aaa dir = 1; pixel_y = -24 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bgJ" = ( -/obj/machinery/door/airlock{ - id_tag = "barbackdoor"; - name = "Service"; - req_access = list(25) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/bar_backroom) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bgK" = ( /obj/structure/cable/green{ d1 = 4; @@ -161576,11 +162022,7 @@ aaa /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "bgM" = ( -/obj/structure/reagent_dispensers/beerkeg, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "bgN" = ( @@ -161591,13 +162033,39 @@ aaa /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/entertainment) "bgO" = ( +<<<<<<< HEAD /obj/structure/table/woodentable, /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/civilian{ +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/table/woodentable, +/obj/structure/disposalpipe/segment, +/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, +/obj/machinery/camera/network/civilian{ +======= +/obj/effect/floor_decal/spline/plain{ +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR dir = 4 }, +<<<<<<< HEAD /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/weapon/book/manual/bar_guide, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) +======= +/obj/structure/table/marble, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/obj/machinery/chemical_dispenser/bar_coffee/full{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "bgP" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -161614,16 +162082,9 @@ aaa name = "\improper Surface Civilian Substation" }) "bgQ" = ( -/obj/machinery/door/airlock{ - name = "Bar Backroom"; - req_access = list(25) - }, -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/obj/effect/floor_decal/spline/plain, /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 1; + icon_state = "pipe-c" }, /obj/structure/cable/green{ d1 = 4; @@ -161636,27 +162097,22 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/lino, -/area/tether/surfacebase/bar_backroom) +/area/crew_quarters/bar) "bgR" = ( -/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 = 8 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Unisex Restrooms" +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/crew_quarters/barrestroom) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bgS" = ( /obj/structure/cable/green{ d1 = 1; @@ -161670,23 +162126,61 @@ aaa /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "bgT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/window/reinforced/polarized{ - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "secreet"; - name = "Tintable Window" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, +<<<<<<< HEAD /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/surfacebase/barbackmaintenance) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/surfacebase/barbackmaintenance) +"bgU" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/crew_quarters/sleep/cryo) +"bgV" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/landmark{ + name = "JoinLateCyborg" + }, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +"bgW" = ( +/turf/simulated/wall/r_wall, +/area/tether/surfacebase/shuttle_pad) +======= +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"bgU" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/crew_quarters/sleep/cryo) +"bgV" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/landmark{ + name = "JoinLateCyborg" + }, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +"bgW" = ( +/turf/simulated/wall/r_wall, +/area/tether/surfacebase/shuttle_pad) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "bgX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -162655,6 +163149,7 @@ aaa icon_state = "frame"; pixel_y = 32 }, +/obj/machinery/vending/coffee, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "biP" = ( @@ -162673,6 +163168,7 @@ aaa /obj/machinery/alarm{ pixel_y = 28 }, +/obj/machinery/vending/sol, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "biR" = ( @@ -162694,17 +163190,12 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) "biU" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 +/obj/machinery/computer/guestpass{ + dir = 1; + pixel_y = -28 }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/obj/machinery/vending/sol{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cafeteria) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "biV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -162823,17 +163314,9 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) "bjh" = ( -/obj/machinery/vending/fitness{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cafeteria) +/obj/machinery/light/small, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bji" = ( /obj/structure/table/bench/sifwooden/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -162880,17 +163363,9 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) "bjo" = ( -/obj/machinery/vending/coffee{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cafeteria) +/obj/structure/sign/poster, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bjp" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -164447,6 +164922,20 @@ aaa /obj/machinery/smartfridge/chemistry, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/chemistry) +"bnD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "bnF" = ( /obj/machinery/button/remote/airlock{ desc = "A remote control switch for the medbay foyer."; @@ -164960,6 +165449,13 @@ aaa /obj/item/weapon/storage/box/donut, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"bpC" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bqs" = ( /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ @@ -164982,22 +165478,11 @@ aaa /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) "bsa" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/blast/shutters{ - dir = 8; - id = "kitchen"; - layer = 3.3; - name = "Kitchen Shutters" +/obj/structure/bed/chair/comfy/black{ + dir = 1 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/chemical_dispenser/bar_soft/full{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bsb" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -165059,6 +165544,22 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"bJF" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/remote/airlock{ + id = "bathroomlock18"; + name = "Bar Toilet 2 Lock"; + pixel_x = -10; + pixel_y = 22; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "bJV" = ( /obj/structure/cable/green{ d1 = 1; @@ -165079,6 +165580,12 @@ aaa }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) +"bLZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "bMK" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -165228,7 +165735,10 @@ aaa d2 = 4; icon_state = "1-4" }, -/turf/simulated/floor/tiled, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "cnZ" = ( /obj/structure/bed/chair/bay/chair{ @@ -165264,6 +165774,7 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +<<<<<<< HEAD "csd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -165278,8 +165789,29 @@ aaa /obj/effect/floor_decal/corner/lime/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"cwI" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 +======= +"cun" = ( +/obj/machinery/atm{ + pixel_x = -32 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR }, /turf/simulated/floor/tiled, +/area/tether/surfacebase/cafeteria) +"cwI" = ( +/obj/structure/flora/ausbushes/ppflowers{ + pixel_x = 5; + pixel_y = -7 + }, +/turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "cAG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -165288,6 +165820,24 @@ aaa /obj/machinery/light, /turf/simulated/floor/wood, /area/library) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"cAZ" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +======= +"cAZ" = ( +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 24 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "cEx" = ( /obj/structure/table/reinforced, /obj/item/weapon/stamp/internalaffairs, @@ -165530,11 +166080,12 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) -"dlX" = ( -/obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/turf/simulated/floor/carpet/blue, -/area/tether/surfacebase/security/breakroom) +"djy" = ( +/obj/machinery/door/airlock{ + name = "Unit 3" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "dmH" = ( /obj/structure/cable/green{ d1 = 1; @@ -165592,6 +166143,21 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"dsT" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "dyV" = ( /obj/machinery/light{ dir = 1 @@ -228930,15 +229496,6 @@ aaa }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"dMk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/breakroom) "dSQ" = ( /obj/structure/cable/green{ d1 = 4; @@ -229189,6 +229746,27 @@ aaa }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"eLp" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/grass, +/area/hydroponics) +"eMY" = ( +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/structure/mirror{ + dir = 4; + pixel_y = 32 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "eQN" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -229208,6 +229786,20 @@ aaa }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"eWS" = ( +/obj/structure/sign/poster{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cafeteria) +======= +"eWS" = ( +/obj/machinery/vending/sovietsoda, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cafeteria) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "faL" = ( /obj/structure/lattice, /obj/structure/cable/orange{ @@ -229267,6 +229859,18 @@ aaa }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"fjX" = ( +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable/green, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "fkn" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -229392,6 +229996,7 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, +<<<<<<< HEAD /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -229418,6 +230023,21 @@ aaa }, /turf/simulated/floor/tiled, /area/teleporter/departing) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/tether/surfacebase/public_garden_three) +"gae" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/floor/carpet/blue, +/area/tether/surfacebase/security/breakroom) +======= +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "gfg" = ( /obj/machinery/light{ dir = 8 @@ -229470,6 +230090,12 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) +"gsP" = ( +/obj/structure/closet/hydrant{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cafeteria) "gtn" = ( /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ @@ -229641,7 +230267,9 @@ aaa /area/tether/surfacebase/cafeteria) "gZn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, +/obj/structure/table/glass, +/obj/item/weapon/storage/box/donut, +/turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "gZR" = ( /obj/effect/floor_decal/borderfloor{ @@ -229728,10 +230356,45 @@ aaa /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "hxc" = ( +<<<<<<< HEAD /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/lime/bordercorner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lime/bordercorner, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"hxr" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -5; + pixel_y = -10 +======= +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"hxr" = ( +/obj/structure/bed/chair/wood{ + dir = 8 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -229792,12 +230455,6 @@ aaa /turf/simulated/floor/tiled/eris/dark/golden, /area/shuttle/tourbus/general) "hEt" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/landmark/start{ - name = "Security Officer" - }, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "hEN" = ( @@ -229902,6 +230559,12 @@ aaa /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"ieF" = ( +/obj/structure/sign/poster{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/southhall) "ifI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/machinery/computer/atmos_alert{ @@ -229909,6 +230572,12 @@ aaa }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) +"ige" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "iiv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -229919,11 +230588,20 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "ikh" = ( -/obj/machinery/vending/sovietsoda{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cafeteria) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/door/airlock{ + name = "Unisex Restrooms" + }, +/turf/simulated/floor/tiled/techmaint, +/area/crew_quarters/barrestroom) "ioG" = ( /obj/effect/floor_decal/techfloor, /obj/structure/cable/green{ @@ -230049,10 +230727,8 @@ aaa /turf/simulated/floor, /area/tether/surfacebase/security/briefingroom) "iLR" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/glass, +/obj/item/weapon/paper_bin, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "iOL" = ( @@ -230403,6 +231079,26 @@ aaa }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) +"jTY" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +"jXY" = ( +/obj/machinery/vending/wallmed1/public{ + pixel_x = -28 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "jYd" = ( /obj/structure/cable/orange{ d1 = 4; @@ -230674,6 +231370,28 @@ aaa }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"kKV" = ( +/obj/machinery/light/flamp/noshade{ + pixel_y = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +======= +"kKV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/bigfloorlamp, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "kQb" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -230832,6 +231550,14 @@ aaa }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"lpI" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/grass, +/area/hydroponics) "lqE" = ( /obj/effect/floor_decal/spline/plain, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -231022,8 +231748,9 @@ aaa /turf/simulated/floor/plating, /area/tether/surfacebase/security/hos) "lWN" = ( -/obj/machinery/vending/cigarette{ - dir = 8 +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) @@ -231105,7 +231832,10 @@ aaa d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "mwz" = ( /obj/effect/floor_decal/corner/red{ @@ -231204,6 +231934,13 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"mUC" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/grass, +/area/hydroponics) "mUE" = ( /obj/structure/cable/green{ d1 = 4; @@ -231321,6 +232058,41 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"noU" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/tether/surfacebase/public_garden_three) +"ntl" = ( +/obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +======= +"noU" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/tether/surfacebase/public_garden_three) +"nrN" = ( +/obj/machinery/recharge_station, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +"ntl" = ( +/obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "nue" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -231432,8 +232204,13 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "nSq" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/landmark/start{ + name = "Security Officer" + }, +/turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "nXZ" = ( /obj/structure/disposalpipe/segment{ @@ -231478,6 +232255,14 @@ aaa }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"ocF" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/grass, +/area/hydroponics) "olG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -231520,18 +232305,6 @@ aaa /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "orP" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -231618,11 +232391,6 @@ aaa }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"oIJ" = ( -/obj/structure/table/glass, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/carpet/blue, -/area/tether/surfacebase/security/breakroom) "oJw" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -231785,9 +232553,7 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "oZC" = ( -/obj/structure/table/glass, -/obj/item/weapon/storage/box/donut, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/bed/chair, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "pcs" = ( @@ -231890,6 +232656,13 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) +"psh" = ( +/obj/machinery/door/airlock{ + id_tag = "bathroomlock18"; + name = "Bar Toilet 2" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "psO" = ( /obj/machinery/status_display{ pixel_x = 32 @@ -231978,13 +232751,13 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "pJL" = ( -/obj/structure/bed/chair{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/effect/landmark/start{ - name = "Security Officer" +/obj/effect/floor_decal/corner/red/border{ + dir = 8 }, -/turf/simulated/floor/carpet/blue, +/turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "pNk" = ( /obj/machinery/computer/shuttle_control/explore/tourbus, @@ -232039,6 +232812,15 @@ aaa /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) +"pXX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/grass, +/area/hydroponics) "qbo" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -232137,12 +232919,30 @@ aaa /turf/simulated/floor/plating, /area/crew_quarters/recreation_area) "qtt" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/table/glass, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"qum" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +======= +"qum" = ( +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/structure/mirror{ + dir = 4; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "qvp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -232205,6 +233005,18 @@ aaa }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/southhall) +"qFD" = ( +/obj/machinery/light, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"qFL" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/grass, +/area/hydroponics) "qGK" = ( /obj/structure/table/reinforced, /obj/item/device/radio{ @@ -232241,6 +233053,15 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) +"qOy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/grass, +/area/hydroponics) "qQZ" = ( /obj/effect/floor_decal/techfloor, /obj/machinery/firealarm{ @@ -232357,9 +233178,7 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) "ruh" = ( -/obj/machinery/atm{ - pixel_y = 30 - }, +/obj/machinery/vending/fitness, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "rxh" = ( @@ -232455,6 +233274,7 @@ aaa }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +<<<<<<< HEAD "rPu" = ( /obj/structure/closet/wardrobe/xenos, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -232462,6 +233282,15 @@ aaa }, /turf/simulated/floor/tiled, /area/teleporter/departing) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +======= +"rPs" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "rQp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -232529,6 +233358,15 @@ aaa }, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_storage) +"scL" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's set to Free-Anur-Entertanment, I wonder what else is on?"; + icon_state = "frame"; + pixel_y = 32 + }, +/obj/machinery/vending/cigarette, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cafeteria) "shx" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -232581,10 +233419,12 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "sts" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/foodcart, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "suT" = ( /obj/structure/cable/green{ d1 = 4; @@ -232774,6 +233614,28 @@ aaa }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"sTZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +======= +"sTZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "sWs" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -232793,12 +233655,6 @@ aaa }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) -"sWR" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/simulated/floor/carpet/blue, -/area/tether/surfacebase/security/breakroom) "sXa" = ( /obj/machinery/holoposter{ pixel_x = -30; @@ -232966,6 +233822,13 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"tJZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/grass, +/area/hydroponics) "tLk" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -233042,7 +233905,8 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/tiled, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "tWn" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -233083,10 +233947,21 @@ aaa }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +<<<<<<< HEAD "udd" = ( /obj/machinery/cryopod/robot/door/gateway, /turf/simulated/floor/tiled/techfloor, /area/teleporter/departing) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +======= +"uee" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/grass, +/area/hydroponics) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "ueB" = ( /turf/simulated/wall, /area/tether/surfacebase/security/hos) @@ -233107,6 +233982,20 @@ aaa }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"ufJ" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +======= +"ufJ" = ( +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "uhm" = ( /obj/structure/bed/chair/bay/chair{ dir = 8 @@ -233142,12 +234031,6 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) "upV" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -233157,7 +234040,10 @@ aaa d2 = 4; icon_state = "0-4" }, -/turf/simulated/floor/tiled, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "uxT" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central5{ @@ -233192,6 +234078,23 @@ aaa /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"uBR" = ( +/obj/structure/flora/ausbushes/ppflowers{ + pixel_x = 5; + pixel_y = -7 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +======= +"uBR" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "uFI" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -233621,6 +234524,16 @@ aaa }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"whm" = ( +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + nightshift_setting = 2; + pixel_x = 28 + }, +/obj/structure/cable/green, +/turf/simulated/floor/grass, +/area/hydroponics) "whW" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -233642,9 +234555,7 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "wlf" = ( -/obj/structure/table/glass, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/carpet/blue, +/turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "wng" = ( /obj/structure/cable/green{ @@ -233999,6 +234910,15 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"xrs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "xsf" = ( /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/security{ @@ -234041,6 +234961,26 @@ aaa }, /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"xwQ" = ( +/obj/machinery/light/flamp/noshade, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +======= +"xwD" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/grass, +/area/hydroponics) +"xwQ" = ( +/obj/machinery/light/bigfloorlamp, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "xxe" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 4 @@ -239269,12 +240209,32 @@ aac aac aac aac +<<<<<<< HEAD aac aac arW arW aDd aDf +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aiF +aDe +aVr +sXa +pIJ +xwQ +aDe +fdB +======= +aiF +aDe +aVr +sXa +pIJ +xwQ +aDe +xwQ +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR aDj ajt aDu @@ -239427,7 +240387,7 @@ aVr aDe aVx aDc -aip +agp aVK akl alP @@ -239847,9 +240807,22 @@ aDm aDl aDt rEZ +<<<<<<< HEAD dgA +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aDg +======= +aqe +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR cwI +<<<<<<< HEAD aDf +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +uBR +qum +======= +uBR +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR aDT arW arW @@ -239989,11 +240962,25 @@ aDn aDg aDu aDD +<<<<<<< HEAD aDg aDN aDf aDc aDz +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +sTZ +aDN +aDS +ufJ +aDz +======= +sTZ +aDO +aDS +ufJ +arW +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR agw air aWF @@ -240131,12 +241118,28 @@ acm aDv aDg aDJ +<<<<<<< HEAD aUC +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aDg +======= +aqp +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR aDO aDc aDS +<<<<<<< HEAD aac agw +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +ufJ +aDz +agw +======= +ufJ +arW +arN +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR air aWF akn @@ -240273,12 +241276,30 @@ arW aDw aDg aDJ +<<<<<<< HEAD aUF arW +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aDg +aDO +======= +aqp +aDO +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR aDS +<<<<<<< HEAD aac aac agw +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +ufJ +aDz +agw +======= +ufJ +arW +asI +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR air aWF akn @@ -240342,7 +241363,7 @@ aOf aOf aOf aPB -aPU +aQg aQg aQt azr @@ -240417,9 +241438,19 @@ aDE aDK aUM aDP +<<<<<<< HEAD aac aac aac +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +hxr +cAZ +aDe +======= +hxr +cAZ +arW +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR agw aVG aWF @@ -242955,10 +243986,10 @@ adG abX agR pJL -gae -aUe +hEt +aip upV -dMk +hEt aak adq aaN @@ -243096,8 +244127,8 @@ aOm adG abX agS -dlX -oIJ +wlf +oZC iLR aRJ cnO @@ -243380,9 +244411,9 @@ aOm adG abX aUe -sWR +wlf hEt -aUe +amY nSq tRk aaj @@ -246819,7 +247850,7 @@ aZs aTt aEb aSE -aYS +axZ aYh aYS aYY @@ -246888,9 +247919,9 @@ bin bix biF biF -biU -bjh -bjo +biF +biF +biF biF biF adG @@ -247030,8 +248061,8 @@ laB beU biF bsr -biL -biL +cun +gsP biL bjs biF @@ -247973,7 +249004,7 @@ alZ auJ bbA ajR -aGA +aDz aYC bbn aGE @@ -248246,10 +249277,10 @@ xUo bqs xUo xUo +atn aCK aCK aCK -xUo fOj ahR arG @@ -248303,7 +249334,7 @@ aac aac aac aPs -beU +ieF bhx beU biH @@ -248388,10 +249419,10 @@ apC aqf aOT aFI -avP -avP -avP apS +avP +avP +avP apS ajX aZW @@ -248530,18 +249561,18 @@ agw aqg aqT apc -aBF -aBF -aBF aXT +aBF +aBF +aBF aXT bbN aru aGh aru -avp atl -avd +atl +aEl aru avd aru @@ -248674,16 +249705,16 @@ agw apc asZ anN -aVO -ate -ate +awm +awm +aBp baB asD baM api -atf -atw -atP +anj +anj +oII avD bej bfO @@ -248815,11 +249846,11 @@ aqi apc apc avg -anN -aVO -ate -ate -baB +auQ +awr +awr +aCh +aCi awv asw beF @@ -248875,7 +249906,7 @@ qDF bhy bhs biF -biO +scL bjc bjj bjq @@ -248956,10 +249987,10 @@ adt aqj aoH aww +atR asp -avq aBE -aVR +aBE aEY aZJ aKc @@ -249098,13 +250129,13 @@ aYl aqk apg apc -aGH +bgc aVB -aVO +awR aZQ bga bgc -asD +avp bev beG azZ @@ -249117,9 +250148,9 @@ avz avM asX asX -asX +aXO aIh -bdv +bbK bbK bbO bcl @@ -249240,9 +250271,9 @@ awP awP awP awP -aGH -aVB -aVO +atw +avq +bdB bdB ayL baP @@ -249261,7 +250292,7 @@ asX aLd aHe aIi -bdG +asX aLd bbP bcm @@ -249304,7 +250335,7 @@ biF gYa lWN qKO -ikh +biL bjv biF adG @@ -249376,16 +250407,16 @@ amK anp anS asU -arN +aop aqo -avO +asq ate -awr +aop aGb aVO -aVO -aVO -ate +avA +axy +aAe aFK bbI avp @@ -249405,7 +250436,7 @@ aHl aIi bgd aLd -bbT +baC bcm aAG bfR @@ -249518,16 +250549,16 @@ aio anq anT aok -asK -asP -auO -auQ -awR +bdi +aop +atf +aop +atf asP aHn +avJ +ayf aHn -aHn -asP beL aru aru @@ -249538,15 +250569,27 @@ baq bgp baE aLc +<<<<<<< HEAD axt avA aCi asX +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +wBv +avA +aCi asX +======= +wBv +avz +avM +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR asX -aIh -bdw -bbL +aLd +bbU +baF +asX +aLd bbU bdJ aAG @@ -249661,6 +250704,7 @@ anr anU aok asi +<<<<<<< HEAD asi asi asi @@ -249672,6 +250716,31 @@ aWE beE beM amY +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +asi +asi +asi +asi +asj +aJV +aWE +aWE +beE +beM +aZg +======= +aEX +avO +bdG +avO +aEX +eLp +bdC +qOy +xwD +tJZ +aZg +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR ani anj bgx @@ -249681,18 +250750,18 @@ nXZ bgx anj wju -bsa -aru -bgj -aET +avz +aIU +asX +asX aET aIo -axZ +bbM bbM bbV aAc -aEl -baC +aAG +asX ayM bdV beb @@ -249803,15 +250872,15 @@ aio anV aok aSx +arR +aCX +bek +atf aop +auU +aVy +auU aop -aop -aBp -aCl -aTF -bdC -beC -beK bcN bcg anj @@ -249822,19 +250891,19 @@ aGi bgq bgr anj -anj -anj -aru -avJ -aIM -aIM +aGt +aHp +aJV +asX +asX +asX aIJ -ayf -aIM +asX +asX bfY bbY -aIf -aIU +bfl +qFD ayM ayd ayb @@ -249945,16 +251014,16 @@ ans anU aok aDI -aqp aop -aqp -aCj -aFS -aVP -aVP -aVP -aFS -beO +aXv +bek +aop +aop +aVy +aVy +aVy +aop +aKm aru aES aIN @@ -249964,9 +251033,9 @@ bgx nXZ baq anj -anj -anj -bcu +aGt +aIk +aru asB aIm aIm @@ -249975,7 +251044,7 @@ azs bbR bbS bbZ -aIf +bft baT ayM bea @@ -250086,17 +251155,17 @@ amL ant anW aok -aop -aop -aop -aop -aUr -aWM -aXj -aVy -aVy -aop -aKm +arQ +arR +bdw +sts +pXX +asK +qFL +mUC +mUC +arR +uee avL atA aZX @@ -250106,15 +251175,15 @@ bgx rBz bew bfp -bfl -baX -amY -asB -aIm -aIm +anj +anj +aru +aSy +aVP +aVP aIP azx -aIm +aVP bgC bgE aIf @@ -250230,11 +251299,11 @@ anX aok aoM aEX -atR -aEX -asp -asq -aWM +avO +bLZ +auU +aop +aUr aXj aVy aop @@ -250245,21 +251314,25 @@ anj anj anj baq -bek -aru -aru -baF -aru -aru +anj +anj +aFS +anj +anj +aKl bfX -aEW +bgz bgz ato bcp atN -arJ -aGK +beC +beK bgR +biU +aGK +aGK +aGK aGK aGK aGK @@ -250267,10 +251340,6 @@ aGK aGK aGK aGK -bgH -bgH -bgT -aac aac aac aac @@ -250372,14 +251441,14 @@ anY aok bdi aop -bdj -arQ +atf +aop auU -aXv +aop ath afT atk -atn +auk awQ aru bgt @@ -250387,26 +251456,30 @@ bbm bcf bgs bch -sts -aru +anj +bpC bge -bfm bgA -aJt -aJt -aJt -aJt -aJt +bgA +aLb +bfX +bgz +bgz +baX bgQ -aJt -aJt +bgz +beE ayJ -bbW -aAe -aVC +bgR +asX +aGK aAj bei bfA +dsT +jXY +fjX +ige aTE aGK aac @@ -250435,10 +251508,6 @@ aac aac aac aac -aac -aac -aac -aac aaq adG aOi @@ -250514,14 +251583,14 @@ aok aok aEB aop -aeZ -arR +aop +aop aVy bdl -aFM +awP aFO -aFM -atb +aop +aop bbo atb aBy @@ -250534,27 +251603,27 @@ aoJ bex bfU bgI -aJt +aLg awT axo bgO aIQ aph azt -aJt -aGx -aTE +arJ +arJ +bgj aVw -aTE +ikh beg -aTE +bnD bfB aTE +jTY +aTE +rPs +aTE aGK -aaq -aaq -aac -aac aac aac aac @@ -250653,21 +251722,21 @@ axr ayK hfN atg -aSy aop aop -bdk -ask -aVy -aLg -aFM +aop +aop +xrs +lpI +auk +ocF aJu -aLb -atb -asu +aop +aop +aop ati aFz -asu +aCj aoJ aUq bdc @@ -250676,27 +251745,39 @@ aoJ beD bfV bgh -bgJ -awm -bdt -axy -axy +aJt +aJt +aJt +aJt +aJt aHv -bdO +aJt aJt aGx +bgH +asX +aGK +qum aTE aGK +<<<<<<< HEAD bdL -aGK -bel -aGK +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aXN +======= bfM +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aGK +<<<<<<< HEAD +bel +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aXR +======= +psh +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aGK +djy aGK -aaq -aaq -aac -aac aac aac aab @@ -250801,14 +251882,14 @@ aWM aWM asH aXj -bdH -aFM +aop +atP aFP aTI -atb -asx +aop +asN aty -aGt +asu aKw aoJ baI @@ -250827,18 +251908,30 @@ aKs axu aJt aQf +bgJ +bjh +aGK +eMY aTE aGK +<<<<<<< HEAD bef -aGK -bef -aGK +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aXQ +======= bfN +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aGK +<<<<<<< HEAD +bef +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aXO +======= +bJF +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aGK +nrN aGK -adG -aOi -aab -aac aac aac aab @@ -250942,13 +252035,13 @@ aop aqq aBG asO -aqe -bft -aFM +aop +aop +atP aGd -aHp -bfb -asI +auk +auk +auk aum aJw asu @@ -250959,15 +252052,19 @@ bdT beq bes bcB -aLF -aJt +aIM +aLG awt bgM -awV +axp axp bbQ axx aJt +beM +bgT +asX +aGK aGK aGK aGK @@ -250990,10 +252087,6 @@ aab aab aab aab -aab -aab -aab -aab aac aac aac @@ -251084,12 +252177,12 @@ aop aqV aDY asV -aqe -aLG -aFM +aop +aop +atP aGg aXh -atb +aop asN awq aJw @@ -251099,17 +252192,21 @@ bcv bfs bgb aoJ -beZ +aFM bfq aFM aJt +aTF +aVR +aXQ +bbL +bdt +bdH aJt -aJt -aJt -aJt -aJt -aJt -aJt +beO +asX +bjo +arJ adG adG adG @@ -251166,10 +252263,6 @@ aab aab aab aab -aab -aab -aab -aab aaa "} (120,1,1) = {" @@ -251226,12 +252319,12 @@ ata aCI aCR aEh -aqe -aso -aFM +aop +arK +auO aJJ aOg -atb +whm asY axv bcF @@ -251241,18 +252334,21 @@ beP bdR aBJ aoJ -bbr -bcB +aGe +aGJ aAb -adG -adG -adG -adG -adG -adG -adG -adG -adG +aJt +aVC +aXN +aXR +bcu +bdv +bdO +aJt +beZ +bbT +bsa +arJ adG aNB aNM @@ -251262,10 +252358,7 @@ aNM aNM aNM aNM -aab -aab -aab -aab +aNM aab aab aab @@ -251370,11 +252463,11 @@ aop ask arK bfu -aCh -aKl +awP +awP aHw -atb -atb +awP +awP atb atb atb @@ -251386,20 +252479,20 @@ aoJ bbv bcC aAb +aJt +aJt +aJt +aJt +aJt +aJt +aJt +aJt +bfb +bfb +bfb +arJ adG -aOF -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aab -aab -aab -aab +aOi aab aab aab @@ -251529,6 +252622,18 @@ bbB bcD aAb adG +adG +adG +adG +adG +adG +adG +adG +adG +adG +adG +adG +adG aOi aab aab @@ -251584,18 +252689,6 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab aaa "} (123,1,1) = {" @@ -251671,18 +252764,18 @@ bbr bcE aAb adG -aOi -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +aOF +aNM +aNM +aNM +aNM +aNM +aNM +aNM +aNM +aNM +aNM +aNM aab aab aab @@ -251933,7 +253026,7 @@ aAH aBm aBM ayg -aCX +aAK aEm aEF aFg @@ -252364,7 +253457,7 @@ aEm aEN aFB aFH -aIk +aGc aKp aXi azY @@ -252506,8 +253599,8 @@ aEm aEm aEm aEm -aGJ -aGJ +aEm +aEm aXV azY adG @@ -252647,9 +253740,9 @@ aEk aEL aFl aFl -aGe -aGe -aGe +aFl +aFl +aFl aYN azY adG diff --git a/maps/tether/tether-04-transit.dmm b/maps/tether/tether-04-transit.dmm index 4dd52f7bce..f09da46a0c 100644 --- a/maps/tether/tether-04-transit.dmm +++ b/maps/tether/tether-04-transit.dmm @@ -176,6 +176,7 @@ /obj/machinery/door/firedoor/glass/hidden, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) +<<<<<<< HEAD "s" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/cable{ @@ -238,6 +239,33 @@ }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"iK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/alarm{ + pixel_y = 26 + }, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"jt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass/hidden, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +======= +"iK" = ( +/obj/structure/closet, +/obj/random/plushie, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"jt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass/hidden, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /area/tether/midpoint) "x" = ( /obj/machinery/atmospherics/pipe/zpipe/up/supply{ @@ -402,7 +430,7 @@ /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) "oP" = ( -/obj/structure/grille, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) "pK" = ( @@ -437,14 +465,44 @@ "tn" = ( ======= "pO" = ( -/obj/machinery/media/jukebox, -/turf/simulated/floor/holofloor/tiled/dark, -/area/tether/midpoint) -"sw" = ( -/obj/machinery/vending/bepis{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/turf/simulated/floor/holofloor/tiled/dark, +/obj/machinery/media/jukebox, +/turf/simulated/floor/tiled/monotile, +/area/tether/midpoint) +"sw" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/snlvend, +/turf/simulated/floor/tiled/monotile, /area/tether/midpoint) "sR" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -810,14 +868,24 @@ icon_state = "pipe-c" ======= "Kh" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/bepis, +/turf/simulated/floor/tiled/monotile, /area/tether/midpoint) "KH" = ( /obj/structure/disposalpipe/segment{ @@ -974,18 +1042,52 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) +<<<<<<< HEAD "Z" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0 +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"WY" = ( +/obj/random/junk, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"Xo" = ( +/obj/machinery/vending/snlvend{ + dir = 8 +======= +"WY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/machinery/alarm{ + pixel_y = 26 + }, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"Xo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR + }, +<<<<<<< HEAD <<<<<<< HEAD /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 ||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff /turf/simulated/floor/holofloor/tiled/dark, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/turf/simulated/floor/holofloor/tiled/dark, +======= +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/turf/simulated/floor/wood, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /area/tether/midpoint) "YB" = ( /obj/structure/table/woodentable, @@ -9241,6 +9343,7 @@ a a "} (59,1,1) = {" +<<<<<<< HEAD a a a @@ -9381,8 +9484,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +NJ +gq +pK +pK +pK +pK +pK +pK +pK +pK +pK +pK +pK +Pz +pK +pK +Or +pK +pK +pK +nD +zP +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +NJ +gq +pK +pK +pK +pK +pK +pK +Pz +pK +pK +pK +pK +Pz +pK +pK +Or +pK +pK +pK +nD +zP +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (60,1,1) = {" +<<<<<<< HEAD a a a @@ -9523,8 +9910,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +PF +PF +pO +Xo +sw +PF +PF +PF +PF +PF +Or +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +PF +PF +PF +PF +PF +PF +PF +PF +PF +PF +Or +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (61,1,1) = {" +<<<<<<< HEAD a a a @@ -9665,8 +10336,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +pK +Dz +Dz +Dz +Dz +Dz +Dz +oN +yi +ML +Dz +uA +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +pK +Dz +iK +pM +pM +pM +Dz +oN +yi +ML +PF +uA +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (62,1,1) = {" +<<<<<<< HEAD a a a @@ -9807,8 +10762,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +PF +uC +vh +dc +pK +Iq +Dz +Ui +HK +cB +Oq +mz +pM +pM +pM +Dz +wM +pK +dc +YB +vt +PF +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +PF +uC +vh +dc +pK +Iq +Dz +Ui +HK +cB +Oq +mz +pM +oP +pM +PF +wM +pK +dc +YB +vt +PF +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (63,1,1) = {" +<<<<<<< HEAD a a a @@ -9949,8 +11188,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +pK +Dz +Qv +xl +no +jE +Ha +gV +Ls +pM +Dz +Or +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +pK +Dz +Qv +xl +no +jE +Ha +gV +Ls +PF +PF +WY +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (64,1,1) = {" +<<<<<<< HEAD a a a @@ -10091,8 +11614,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +Dz +Qv +Hs +Hs +Hs +Hs +Hs +Hs +WY +Dz +iK +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +Dz +Qv +Hs +Hs +Hs +Hs +Hs +Hs +PF +pO +Or +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (65,1,1) = {" +<<<<<<< HEAD a a a @@ -10233,8 +12040,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +oP +Dz +Kh +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +PF +sw +Or +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (66,1,1) = {" +<<<<<<< HEAD a a a @@ -10375,8 +12466,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +pK +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +pM +Dz +hi +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +pK +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +PF +Kh +hi +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (67,1,1) = {" +<<<<<<< HEAD a a a @@ -10517,8 +12892,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +PF +hp +YB +dc +pK +Iq +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +pM +Dz +wM +pK +dc +vh +zZ +PF +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +PF +hp +YB +dc +pK +Iq +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +PF +PF +wM +pK +dc +vh +zZ +PF +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (68,1,1) = {" +<<<<<<< HEAD a a a @@ -10659,8 +13318,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +VB +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +Zd +Dz +Or +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +VB +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +pM +PF +Xo +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (69,1,1) = {" +<<<<<<< HEAD a a a @@ -10801,6 +13744,289 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +Dz +zG +Hs +Hs +Gl +Gl +Hs +Hs +Dz +Dz +Or +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +Dz +zG +Hs +Hs +Gl +Gl +Hs +Hs +Dz +PF +Or +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (70,1,1) = {" a diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 2929137feb..e8afb06324 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -2659,7 +2659,7 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 6 }, -/obj/structure/closet/emcloset, +/obj/machinery/vending/cigarette, /turf/simulated/floor/tiled, /area/hallway/station/docks) "afG" = ( @@ -3927,12 +3927,8 @@ /turf/simulated/floor/plating, /area/engineering/engine_airlock) "aiA" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/catwalk, -/turf/simulated/floor, +/obj/structure/sign/department/mail, +/turf/simulated/wall, /area/maintenance/cargo) "aiC" = ( /obj/effect/floor_decal/industrial/warning{ @@ -7117,9 +7113,7 @@ /turf/space, /area/space) "apX" = ( -/obj/machinery/vending/snack{ - dir = 8 - }, +/obj/machinery/vending/snack, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, /area/engineering/break_room) @@ -7407,9 +7401,6 @@ /turf/simulated/floor/carpet, /area/engineering/break_room) "aqH" = ( -/obj/machinery/vending/coffee{ - dir = 8 - }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, /area/engineering/break_room) @@ -7977,10 +7968,8 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/vending/cigarette{ - dir = 8 - }, /obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/table/reinforced, /turf/simulated/floor/tiled, /area/engineering/break_room) "asv" = ( @@ -8198,19 +8187,10 @@ /turf/simulated/floor/wood, /area/engineering/break_room) "ate" = ( -/obj/machinery/door/airlock/maintenance/cargo{ - req_access = list(50); - req_one_access = list(48) - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/quartermaster/delivery) +/obj/machinery/vending/cigarette, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled, +/area/engineering/break_room) "atf" = ( /obj/machinery/atmospherics/binary/pump{ dir = 1 @@ -8278,17 +8258,12 @@ /turf/simulated/floor/tiled/monotile, /area/engineering/workshop) "atm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/borderfloor{ dir = 9 }, /obj/effect/floor_decal/corner/brown/border{ dir = 9 }, -/obj/machinery/camera/network/cargo, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 }, @@ -8298,12 +8273,18 @@ /obj/structure/sign/poster{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) "atn" = ( -/obj/structure/disposalpipe/sortjunction/untagged/flipped{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, +/obj/machinery/camera/network/cargo, /turf/simulated/floor/tiled, /area/quartermaster/delivery) "atr" = ( @@ -8855,7 +8836,11 @@ /turf/simulated/floor/tiled, /area/engineering/engine_eva) "avt" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 1; + name = "Sorting Office"; + sortType = "Sorting Office" + }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) "avv" = ( @@ -10361,10 +10346,6 @@ /turf/simulated/wall, /area/quartermaster/delivery) "aAF" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -10375,13 +10356,15 @@ dir = 8; pixel_x = -24 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) "aAG" = ( -/obj/structure/disposalpipe/sortjunction/flipped{ - dir = 1; - name = "Sorting Office"; - sortType = "Sorting Office" +/obj/structure/disposalpipe/sortjunction/untagged/flipped{ + dir = 1 }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) @@ -18307,15 +18290,9 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "ejO" = ( -/obj/structure/table/standard, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/camera/network/civilian, +/obj/machinery/vending/tool, /turf/simulated/floor/tiled, /area/storage/tools) "ekh" = ( @@ -19327,6 +19304,24 @@ }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) +"fmg" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/camera/network/tether{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/maintenance/cargo) "fpk" = ( /turf/simulated/floor/airless, /area/tether/outpost/solars_outside{ @@ -19526,20 +19521,24 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "fxR" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -23 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/machinery/vending/coffee{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/obj/effect/floor_decal/borderfloor{ - dir = 9 +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 9 +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 }, -/turf/simulated/floor/tiled, +/obj/machinery/vending/coffee, +/turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "fyF" = ( /obj/machinery/power/apc{ @@ -20632,7 +20631,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) "gKa" = ( -/obj/structure/reagent_dispensers/foam, +/obj/machinery/lapvend, /turf/simulated/floor/tiled, /area/storage/tools) "gKH" = ( @@ -20884,10 +20883,10 @@ /area/tether/exploration) "gWp" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1 + dir = 9 }, /obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 + dir = 9 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -20895,10 +20894,12 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 }, -/obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "gWD" = ( @@ -23265,9 +23266,6 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "iPR" = ( -/obj/machinery/lapvend{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/storage/tools) "iRq" = ( @@ -25382,26 +25380,10 @@ /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) "kSd" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/camera/network/tether{ - dir = 4 - }, -/obj/machinery/vending/fitness{ - dir = 4 - }, +/obj/machinery/vending/coffee, +/obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/area/engineering/break_room) "kSu" = ( /obj/structure/closet, /obj/random/tool, @@ -25810,6 +25792,7 @@ layer = 3.3; pixel_x = 26 }, +/obj/random/tech_supply, /turf/simulated/floor/tiled, /area/storage/tools) "ljB" = ( @@ -27194,9 +27177,18 @@ /turf/simulated/mineral/vacuum, /area/maintenance/station/cargo) "mtI" = ( -/obj/machinery/vending/tool{ - dir = 4 +/obj/structure/table/standard, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, +/obj/random/tech_supply, /turf/simulated/floor/tiled, /area/storage/tools) "mtR" = ( @@ -29505,6 +29497,15 @@ }, /turf/simulated/floor/tiled, /area/janitor) +"oFh" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/cargo{ + req_access = list(50); + req_one_access = list(48) + }, +/turf/simulated/floor, +/area/quartermaster/delivery) "oFl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -30564,8 +30565,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "qfK" = ( -/obj/structure/sign/department/mail, -/turf/simulated/wall, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled, /area/maintenance/cargo) "qgB" = ( /obj/structure/cable/green{ @@ -33145,6 +33152,19 @@ /obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, /area/engineering/hallway) +"sZb" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/delivery) "tal" = ( /turf/simulated/wall/r_wall, /area/ai_monitored/storage/eva) @@ -33468,17 +33488,12 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "tqt" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 10 - }, -/obj/machinery/vending/cigarette{ +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/turf/simulated/floor, +/area/maintenance/cargo) "trn" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -33548,11 +33563,24 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "tvd" = ( -/obj/machinery/light/small{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/fitness, +/turf/simulated/floor/tiled/monotile, /area/maintenance/cargo) "txf" = ( /obj/effect/floor_decal/industrial/warning{ @@ -34325,6 +34353,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/item/weapon/storage/box/lights/mixed, +/obj/random/tech_supply, /turf/simulated/floor/tiled, /area/storage/tools) "uuz" = ( @@ -35423,12 +35452,15 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "vLU" = ( -/obj/machinery/vending/assist{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/structure/table/standard, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, /turf/simulated/floor/tiled, /area/storage/tools) "vMe" = ( @@ -36325,6 +36357,7 @@ dir = 8; pixel_x = 25 }, +/obj/random/tech_supply, /turf/simulated/floor/tiled, /area/storage/tools) "xbp" = ( @@ -36406,23 +36439,17 @@ /turf/simulated/floor/tiled/dark, /area/ai_server_room) "xeo" = ( -/obj/structure/table/standard, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, /obj/machinery/power/apc{ dir = 1; name = "north bump"; pixel_y = 28 }, -/obj/random/tech_supply, -/obj/random/tech_supply, /obj/structure/cable/green{ d2 = 2; icon_state = "0-2" }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/vending/assist, /turf/simulated/floor/tiled, /area/storage/tools) "xeG" = ( @@ -36512,13 +36539,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "xjc" = ( -/obj/structure/table/standard, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, +/obj/structure/reagent_dispensers/foam, /turf/simulated/floor/tiled, /area/storage/tools) "xjm" = ( @@ -45959,7 +45980,7 @@ aJs anZ any apg -apQ +ate ajF asp atJ @@ -46101,7 +46122,7 @@ aJs afq tpV apg -apQ +kSd apQ asx apQ @@ -47121,13 +47142,13 @@ lLv bVP ain tUh -wBw -wBw -axE -aAD +tqt +kLG +cFG +oFh atm aAF -avM +sZb mKD avM awj @@ -47263,10 +47284,10 @@ ago jjR aCq tUh -tvd -kLG +tUh +tUh aiA -ate +aAD atn aAG avt @@ -47405,8 +47426,8 @@ agw air aAw tUh -tUh -tUh +tvd +fmg qfK aAD oUP @@ -47548,8 +47569,8 @@ tmf ioz hLg fxR -kSd -tqt +wnV +aVY kUL atr atV diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index 8cc7d8b91a..6690846e61 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -238,8 +238,7 @@ [i]Transponder[/i]: Transmitting (CIV), NanoTrasen IFF [b]Notice[/b]: NanoTrasen Base, authorized personnel only"} base = 1 - icon_state = "globe" - color = "#d35b5b" + icon_state = "reddwarf" initial_generic_waypoints = list( "tether_dockarm_d1a1", //Bottom left, "tether_dockarm_d1a2", //Top left, diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm index e380c18003..0481ba9741 100644 --- a/maps/tether/tether_shuttles.dm +++ b/maps/tether/tether_shuttles.dm @@ -200,6 +200,7 @@ /obj/effect/overmap/visitable/ship/landable/excursion name = "Excursion Shuttle" desc = "The traditional Excursion Shuttle. NT Approved!" + icon_state = "htu_destroyer_g" vessel_mass = 8000 vessel_size = SHIP_SIZE_SMALL shuttle = "Excursion Shuttle" @@ -225,6 +226,7 @@ /obj/effect/overmap/visitable/ship/landable/tourbus name = "Tour Bus" desc = "A small 'space bus', if you will." + icon_state = "htu_frigate_g" vessel_mass = 2000 vessel_size = SHIP_SIZE_SMALL shuttle = "Tour Bus" @@ -250,6 +252,7 @@ /obj/effect/overmap/visitable/ship/landable/medivac name = "Medivac Shuttle" desc = "A medical evacuation shuttle." + icon_state = "htu_frigate_g" vessel_mass = 4000 vessel_size = SHIP_SIZE_SMALL shuttle = "Medivac Shuttle" @@ -275,6 +278,7 @@ /obj/effect/overmap/visitable/ship/landable/securiship name = "Securiship Shuttle" desc = "A security transport ship." + icon_state = "htu_frigate_g" vessel_mass = 4000 vessel_size = SHIP_SIZE_SMALL shuttle = "Securiship Shuttle" diff --git a/tgui/packages/tgui/components/Input.js b/tgui/packages/tgui/components/Input.js index b0c5f3f0cb..e09c015d3e 100644 --- a/tgui/packages/tgui/components/Input.js +++ b/tgui/packages/tgui/components/Input.js @@ -34,9 +34,13 @@ export class Input extends Component { }; this.handleFocus = e => { const { editing } = this.state; + const { autoSelect } = this.props; if (!editing) { this.setEditing(true); } + if (autoSelect) { + e.target.select(); + } }; this.handleBlur = e => { const { editing } = this.state; diff --git a/tgui/packages/tgui/interfaces/ListInput.js b/tgui/packages/tgui/interfaces/ListInput.js index be6a3599a1..2f93e3c1c1 100644 --- a/tgui/packages/tgui/interfaces/ListInput.js +++ b/tgui/packages/tgui/interfaces/ListInput.js @@ -19,6 +19,7 @@ export const ListInput = (props, context) => { message, buttons, timeout, + initial, } = data; // Search @@ -37,7 +38,7 @@ export const ListInput = (props, context) => { // Selected Button const [selectedButton, setSelectedButton] = useLocalState( - context, 'selected_button', buttons[0]); + context, 'selected_button', initial || buttons[0]); const handleKeyDown = e => { e.preventDefault(); diff --git a/tgui/packages/tgui/interfaces/common/ComplexModal.js b/tgui/packages/tgui/interfaces/common/ComplexModal.js index da3baa743f..066e66fcd3 100644 --- a/tgui/packages/tgui/interfaces/common/ComplexModal.js +++ b/tgui/packages/tgui/interfaces/common/ComplexModal.js @@ -103,6 +103,7 @@ export const ComplexModal = (props, context) => { width="100%" my="0.5rem" autoFocus + autoSelect onChange={(_e, val) => { curValue = val; }} diff --git a/tgui/public/tgui-common.bundle.js b/tgui/public/tgui-common.bundle.js index 94a7b4f644..a79862d169 100644 --- a/tgui/public/tgui-common.bundle.js +++ b/tgui/public/tgui-common.bundle.js @@ -1 +1 @@ -(self.webpackChunktgui_workspace=self.webpackChunktgui_workspace||[]).push([[962],{33407:function(e,t,n){"use strict";t.__esModule=!0,t.popperGenerator=v,t.createPopper=void 0;var r=d(n(98825)),o=d(n(52089)),i=d(n(66469)),a=d(n(54484)),u=(d(n(82020)),d(n(7183))),c=d(n(16936)),s=(d(n(11026)),d(n(20675)),d(n(78044)),d(n(5495))),l=d(n(45073));t.detectOverflow=l["default"];var f=n(31966);n(54945);function d(e){return e&&e.__esModule?e:{"default":e}}var p={placement:"bottom",modifiers:[],strategy:"absolute"};function h(){for(var e=arguments.length,t=new Array(e),n=0;n=0&&(0,l.isHTMLElement)(e)?(0,u["default"])(e):e;if(!(0,l.isElement)(n))return[];return t.filter((function(e){return(0,l.isElement)(e)&&(0,p["default"])(e,n)&&"body"!==(0,h["default"])(e)}))}(e):[].concat(t),o=[].concat(r,[n]),i=o[0],c=o.reduce((function(t,n){var r=y(e,n);return t.top=(0,m.max)(r.top,t.top),t.right=(0,m.min)(r.right,t.right),t.bottom=(0,m.min)(r.bottom,t.bottom),t.left=(0,m.max)(r.left,t.left),t}),y(e,i));return c.width=c.right-c.left,c.height=c.bottom-c.top,c.x=c.left,c.y=c.top,c};var r=n(54945),o=g(n(17488)),i=g(n(27175)),a=g(n(66469)),u=g(n(54484)),c=g(n(36e3)),s=g(n(82020)),l=n(31966),f=g(n(87916)),d=g(n(23470)),p=g(n(41858)),h=g(n(38012)),v=g(n(77276)),m=n(52209);function g(e){return e&&e.__esModule?e:{"default":e}}function y(e,t){return t===r.viewport?(0,v["default"])((0,o["default"])(e)):(0,l.isHTMLElement)(t)?function(e){var t=(0,f["default"])(e);return t.top=t.top+e.clientTop,t.left=t.left+e.clientLeft,t.bottom=t.top+e.clientHeight,t.right=t.left+e.clientWidth,t.width=e.clientWidth,t.height=e.clientHeight,t.x=t.left,t.y=t.top,t}(t):(0,v["default"])((0,i["default"])((0,c["default"])(e)))}},98825:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e,t,n){void 0===n&&(n=!1);var l=(0,c["default"])(t),f=(0,r["default"])(e),d=(0,a.isHTMLElement)(t),p={scrollLeft:0,scrollTop:0},h={x:0,y:0};(d||!d&&!n)&&(("body"!==(0,i["default"])(t)||(0,s["default"])(l))&&(p=(0,o["default"])(t)),(0,a.isHTMLElement)(t)?((h=(0,r["default"])(t)).x+=t.clientLeft,h.y+=t.clientTop):l&&(h.x=(0,u["default"])(l)));return{x:f.left+p.scrollLeft-h.x,y:f.top+p.scrollTop-h.y,width:f.width,height:f.height}};var r=l(n(87916)),o=l(n(38015)),i=l(n(38012)),a=n(31966),u=l(n(25880)),c=l(n(36e3)),s=l(n(42156));function l(e){return e&&e.__esModule?e:{"default":e}}},82020:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){return(0,o["default"])(e).getComputedStyle(e)};var r,o=(r=n(89778))&&r.__esModule?r:{"default":r}},36e3:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){return(((0,r.isElement)(e)?e.ownerDocument:e.document)||window.document).documentElement};var r=n(31966)},27175:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t,n=(0,r["default"])(e),c=(0,a["default"])(e),s=null==(t=e.ownerDocument)?void 0:t.body,l=(0,u.max)(n.scrollWidth,n.clientWidth,s?s.scrollWidth:0,s?s.clientWidth:0),f=(0,u.max)(n.scrollHeight,n.clientHeight,s?s.scrollHeight:0,s?s.clientHeight:0),d=-c.scrollLeft+(0,i["default"])(e),p=-c.scrollTop;"rtl"===(0,o["default"])(s||n).direction&&(d+=(0,u.max)(n.clientWidth,s?s.clientWidth:0)-l);return{width:l,height:f,x:d,y:p}};var r=c(n(36e3)),o=c(n(82020)),i=c(n(25880)),a=c(n(31348)),u=n(52209);function c(e){return e&&e.__esModule?e:{"default":e}}},13339:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){return{scrollLeft:e.scrollLeft,scrollTop:e.scrollTop}}},52089:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t=(0,o["default"])(e),n=e.offsetWidth,r=e.offsetHeight;Math.abs(t.width-n)<=1&&(n=t.width);Math.abs(t.height-r)<=1&&(r=t.height);return{x:e.offsetLeft,y:e.offsetTop,width:n,height:r}};var r,o=(r=n(87916))&&r.__esModule?r:{"default":r}},38012:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){return e?(e.nodeName||"").toLowerCase():null}},38015:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){return e!==(0,o["default"])(e)&&(0,i.isHTMLElement)(e)?(0,a["default"])(e):(0,r["default"])(e)};var r=u(n(31348)),o=u(n(89778)),i=n(31966),a=u(n(13339));function u(e){return e&&e.__esModule?e:{"default":e}}},54484:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t=(0,r["default"])(e),n=l(e);for(;n&&(0,u["default"])(n)&&"static"===(0,i["default"])(n).position;)n=l(n);if(n&&("html"===(0,o["default"])(n)||"body"===(0,o["default"])(n)&&"static"===(0,i["default"])(n).position))return t;return n||function(e){var t=-1!==navigator.userAgent.toLowerCase().indexOf("firefox");if(-1!==navigator.userAgent.indexOf("Trident")&&(0,a.isHTMLElement)(e)){if("fixed"===(0,i["default"])(e).position)return null}var n=(0,c["default"])(e);for(;(0,a.isHTMLElement)(n)&&["html","body"].indexOf((0,o["default"])(n))<0;){var r=(0,i["default"])(n);if("none"!==r.transform||"none"!==r.perspective||"paint"===r.contain||-1!==["transform","perspective"].indexOf(r.willChange)||t&&"filter"===r.willChange||t&&r.filter&&"none"!==r.filter)return n;n=n.parentNode}return null}(e)||t};var r=s(n(89778)),o=s(n(38012)),i=s(n(82020)),a=n(31966),u=s(n(69183)),c=s(n(23470));function s(e){return e&&e.__esModule?e:{"default":e}}function l(e){return(0,a.isHTMLElement)(e)&&"fixed"!==(0,i["default"])(e).position?e.offsetParent:null}},23470:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){if("html"===(0,r["default"])(e))return e;return e.assignedSlot||e.parentNode||((0,i.isShadowRoot)(e)?e.host:null)||(0,o["default"])(e)};var r=a(n(38012)),o=a(n(36e3)),i=n(31966);function a(e){return e&&e.__esModule?e:{"default":e}}},92098:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function c(e){if(["html","body","#document"].indexOf((0,i["default"])(e))>=0)return e.ownerDocument.body;if((0,a.isHTMLElement)(e)&&(0,o["default"])(e))return e;return c((0,r["default"])(e))};var r=u(n(23470)),o=u(n(42156)),i=u(n(38012)),a=n(31966);function u(e){return e&&e.__esModule?e:{"default":e}}},17488:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t=(0,r["default"])(e),n=(0,o["default"])(e),a=t.visualViewport,u=n.clientWidth,c=n.clientHeight,s=0,l=0;a&&(u=a.width,c=a.height,/^((?!chrome|android).)*safari/i.test(navigator.userAgent)||(s=a.offsetLeft,l=a.offsetTop));return{width:u,height:c,x:s+(0,i["default"])(e),y:l}};var r=a(n(89778)),o=a(n(36e3)),i=a(n(25880));function a(e){return e&&e.__esModule?e:{"default":e}}},89778:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){if(null==e)return window;if("[object Window]"!==e.toString()){var t=e.ownerDocument;return t&&t.defaultView||window}return e}},31348:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t=(0,o["default"])(e),n=t.pageXOffset,r=t.pageYOffset;return{scrollLeft:n,scrollTop:r}};var r,o=(r=n(89778))&&r.__esModule?r:{"default":r}},25880:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){return(0,r["default"])((0,o["default"])(e)).left+(0,i["default"])(e).scrollLeft};var r=a(n(87916)),o=a(n(36e3)),i=a(n(31348));function a(e){return e&&e.__esModule?e:{"default":e}}},31966:function(e,t,n){"use strict";t.__esModule=!0,t.isElement=function(e){var t=(0,o["default"])(e).Element;return e instanceof t||e instanceof Element},t.isHTMLElement=function(e){var t=(0,o["default"])(e).HTMLElement;return e instanceof t||e instanceof HTMLElement},t.isShadowRoot=function(e){if("undefined"==typeof ShadowRoot)return!1;var t=(0,o["default"])(e).ShadowRoot;return e instanceof t||e instanceof ShadowRoot};var r,o=(r=n(89778))&&r.__esModule?r:{"default":r}},42156:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t=(0,o["default"])(e),n=t.overflow,r=t.overflowX,i=t.overflowY;return/auto|scroll|overlay|hidden/.test(n+i+r)};var r,o=(r=n(82020))&&r.__esModule?r:{"default":r}},69183:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){return["table","td","th"].indexOf((0,o["default"])(e))>=0};var r,o=(r=n(38012))&&r.__esModule?r:{"default":r}},66469:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function c(e,t){var n;void 0===t&&(t=[]);var u=(0,r["default"])(e),s=u===(null==(n=e.ownerDocument)?void 0:n.body),l=(0,i["default"])(u),f=s?[l].concat(l.visualViewport||[],(0,a["default"])(u)?u:[]):u,d=t.concat(f);return s?d:d.concat(c((0,o["default"])(f)))};var r=u(n(92098)),o=u(n(23470)),i=u(n(89778)),a=u(n(42156));function u(e){return e&&e.__esModule?e:{"default":e}}},54945:function(e,t){"use strict";t.__esModule=!0,t.modifierPhases=t.afterWrite=t.write=t.beforeWrite=t.afterMain=t.main=t.beforeMain=t.afterRead=t.read=t.beforeRead=t.placements=t.variationPlacements=t.reference=t.popper=t.viewport=t.clippingParents=t.end=t.start=t.basePlacements=t.auto=t.left=t.right=t.bottom=t.top=void 0;t.top="top";var n="bottom";t.bottom=n;var r="right";t.right=r;var o="left";t.left=o;var i="auto";t.auto=i;var a=["top",n,r,o];t.basePlacements=a;var u="start";t.start=u;var c="end";t.end=c;t.clippingParents="clippingParents";t.viewport="viewport";t.popper="popper";t.reference="reference";var s=a.reduce((function(e,t){return e.concat([t+"-"+u,t+"-"+c])}),[]);t.variationPlacements=s;var l=[].concat(a,[i]).reduce((function(e,t){return e.concat([t,t+"-"+u,t+"-"+c])}),[]);t.placements=l;var f="beforeRead";t.beforeRead=f;var d="read";t.read=d;var p="afterRead";t.afterRead=p;var h="beforeMain";t.beforeMain=h;var v="main";t.main=v;var m="afterMain";t.afterMain=m;var g="beforeWrite";t.beforeWrite=g;var y="write";t.write=y;var b="afterWrite";t.afterWrite=b;var _=[f,d,p,h,v,m,g,y,b];t.modifierPhases=_},11613:function(e,t,n){"use strict";t.__esModule=!0;var r={popperGenerator:!0,detectOverflow:!0,createPopperBase:!0,createPopper:!0,createPopperLite:!0};t.createPopperLite=t.createPopper=t.createPopperBase=t.detectOverflow=t.popperGenerator=void 0;var o=n(54945);Object.keys(o).forEach((function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(r,e)||e in t&&t[e]===o[e]||(t[e]=o[e]))}));var i=n(15461);Object.keys(i).forEach((function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(r,e)||e in t&&t[e]===i[e]||(t[e]=i[e]))}));var a=n(33407);t.popperGenerator=a.popperGenerator,t.detectOverflow=a.detectOverflow,t.createPopperBase=a.createPopper;var u=n(15172);t.createPopper=u.createPopper;var c=n(15327);t.createPopperLite=c.createPopper},1803:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=void 0;var r,o=(r=n(38012))&&r.__esModule?r:{"default":r},i=n(31966);var a={name:"applyStyles",enabled:!0,phase:"write",fn:function(e){var t=e.state;Object.keys(t.elements).forEach((function(e){var n=t.styles[e]||{},r=t.attributes[e]||{},a=t.elements[e];(0,i.isHTMLElement)(a)&&(0,o["default"])(a)&&(Object.assign(a.style,n),Object.keys(r).forEach((function(e){var t=r[e];!1===t?a.removeAttribute(e):a.setAttribute(e,!0===t?"":t)})))}))},effect:function(e){var t=e.state,n={popper:{position:t.options.strategy,left:"0",top:"0",margin:"0"},arrow:{position:"absolute"},reference:{}};return Object.assign(t.elements.popper.style,n.popper),t.styles=n,t.elements.arrow&&Object.assign(t.elements.arrow.style,n.arrow),function(){Object.keys(t.elements).forEach((function(e){var r=t.elements[e],a=t.attributes[e]||{},u=Object.keys(t.styles.hasOwnProperty(e)?t.styles[e]:n[e]).reduce((function(e,t){return e[t]="",e}),{});(0,i.isHTMLElement)(r)&&(0,o["default"])(r)&&(Object.assign(r.style,u),Object.keys(a).forEach((function(e){r.removeAttribute(e)})))}))}},requires:["computeStyles"]};t["default"]=a},35838:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=void 0;var r=d(n(78044)),o=d(n(52089)),i=d(n(41858)),a=d(n(54484)),u=d(n(99840)),c=d(n(51520)),s=d(n(72882)),l=d(n(8415)),f=n(54945);n(31966);function d(e){return e&&e.__esModule?e:{"default":e}}var p=function(e,t){return e="function"==typeof e?e(Object.assign({},t.rects,{placement:t.placement})):e,(0,s["default"])("number"!=typeof e?e:(0,l["default"])(e,f.basePlacements))};var h={name:"arrow",enabled:!0,phase:"main",fn:function(e){var t,n=e.state,i=e.name,s=e.options,l=n.elements.arrow,d=n.modifiersData.popperOffsets,h=(0,r["default"])(n.placement),v=(0,u["default"])(h),m=[f.left,f.right].indexOf(h)>=0?"height":"width";if(l&&d){var g=p(s.padding,n),y=(0,o["default"])(l),b="y"===v?f.top:f.left,_="y"===v?f.bottom:f.right,w=n.rects.reference[m]+n.rects.reference[v]-d[v]-n.rects.popper[m],x=d[v]-n.rects.reference[v],E=(0,a["default"])(l),S=E?"y"===v?E.clientHeight||0:E.clientWidth||0:0,C=w/2-x/2,N=g[b],O=S-y[m]-g[_],k=S/2-y[m]/2+C,M=(0,c["default"])(N,k,O),A=v;n.modifiersData[i]=((t={})[A]=M,t.centerOffset=M-k,t)}},effect:function(e){var t=e.state,n=e.options.element,r=void 0===n?"[data-popper-arrow]":n;null!=r&&("string"!=typeof r||(r=t.elements.popper.querySelector(r)))&&(0,i["default"])(t.elements.popper,r)&&(t.elements.arrow=r)},requires:["popperOffsets"],requiresIfExists:["preventOverflow"]};t["default"]=h},42569:function(e,t,n){"use strict";t.__esModule=!0,t.mapToStyles=d,t["default"]=void 0;var r=n(54945),o=l(n(54484)),i=l(n(89778)),a=l(n(36e3)),u=l(n(82020)),c=l(n(78044)),s=n(52209);function l(e){return e&&e.__esModule?e:{"default":e}}var f={top:"auto",right:"auto",bottom:"auto",left:"auto"};function d(e){var t,n=e.popper,c=e.popperRect,l=e.placement,d=e.offsets,p=e.position,h=e.gpuAcceleration,v=e.adaptive,m=e.roundOffsets,g=!0===m?function(e){var t=e.x,n=e.y,r=window.devicePixelRatio||1;return{x:(0,s.round)((0,s.round)(t*r)/r)||0,y:(0,s.round)((0,s.round)(n*r)/r)||0}}(d):"function"==typeof m?m(d):d,y=g.x,b=void 0===y?0:y,_=g.y,w=void 0===_?0:_,x=d.hasOwnProperty("x"),E=d.hasOwnProperty("y"),S=r.left,C=r.top,N=window;if(v){var O=(0,o["default"])(n),k="clientHeight",M="clientWidth";O===(0,i["default"])(n)&&(O=(0,a["default"])(n),"static"!==(0,u["default"])(O).position&&(k="scrollHeight",M="scrollWidth")),O=O,l===r.top&&(C=r.bottom,w-=O[k]-c.height,w*=h?1:-1),l===r.left&&(S=r.right,b-=O[M]-c.width,b*=h?1:-1)}var A,T=Object.assign({position:p},v&&f);return h?Object.assign({},T,((A={})[C]=E?"0":"",A[S]=x?"0":"",A.transform=(N.devicePixelRatio||1)<2?"translate("+b+"px, "+w+"px)":"translate3d("+b+"px, "+w+"px, 0)",A)):Object.assign({},T,((t={})[C]=E?w+"px":"",t[S]=x?b+"px":"",t.transform="",t))}var p={name:"computeStyles",enabled:!0,phase:"beforeWrite",fn:function(e){var t=e.state,n=e.options,r=n.gpuAcceleration,o=void 0===r||r,i=n.adaptive,a=void 0===i||i,u=n.roundOffsets,s=void 0===u||u,l={placement:(0,c["default"])(t.placement),popper:t.elements.popper,popperRect:t.rects.popper,gpuAcceleration:o};null!=t.modifiersData.popperOffsets&&(t.styles.popper=Object.assign({},t.styles.popper,d(Object.assign({},l,{offsets:t.modifiersData.popperOffsets,position:t.options.strategy,adaptive:a,roundOffsets:s})))),null!=t.modifiersData.arrow&&(t.styles.arrow=Object.assign({},t.styles.arrow,d(Object.assign({},l,{offsets:t.modifiersData.arrow,position:"absolute",adaptive:!1,roundOffsets:s})))),t.attributes.popper=Object.assign({},t.attributes.popper,{"data-popper-placement":t.placement})},data:{}};t["default"]=p},84886:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=void 0;var r,o=(r=n(89778))&&r.__esModule?r:{"default":r};var i={passive:!0};var a={name:"eventListeners",enabled:!0,phase:"write",fn:function(){},effect:function(e){var t=e.state,n=e.instance,r=e.options,a=r.scroll,u=void 0===a||a,c=r.resize,s=void 0===c||c,l=(0,o["default"])(t.elements.popper),f=[].concat(t.scrollParents.reference,t.scrollParents.popper);return u&&f.forEach((function(e){e.addEventListener("scroll",n.update,i)})),s&&l.addEventListener("resize",n.update,i),function(){u&&f.forEach((function(e){e.removeEventListener("scroll",n.update,i)})),s&&l.removeEventListener("resize",n.update,i)}},data:{}};t["default"]=a},75306:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=void 0;var r=l(n(21784)),o=l(n(78044)),i=l(n(10333)),a=l(n(45073)),u=l(n(9118)),c=n(54945),s=l(n(7938));function l(e){return e&&e.__esModule?e:{"default":e}}var f={name:"flip",enabled:!0,phase:"main",fn:function(e){var t=e.state,n=e.options,l=e.name;if(!t.modifiersData[l]._skip){for(var f=n.mainAxis,d=void 0===f||f,p=n.altAxis,h=void 0===p||p,v=n.fallbackPlacements,m=n.padding,g=n.boundary,y=n.rootBoundary,b=n.altBoundary,_=n.flipVariations,w=void 0===_||_,x=n.allowedAutoPlacements,E=t.options.placement,S=(0,o["default"])(E),C=v||(S===E||!w?[(0,r["default"])(E)]:function(e){if((0,o["default"])(e)===c.auto)return[];var t=(0,r["default"])(e);return[(0,i["default"])(e),t,(0,i["default"])(t)]}(E)),N=[E].concat(C).reduce((function(e,n){return e.concat((0,o["default"])(n)===c.auto?(0,u["default"])(t,{placement:n,boundary:g,rootBoundary:y,padding:m,flipVariations:w,allowedAutoPlacements:x}):n)}),[]),O=t.rects.reference,k=t.rects.popper,M=new Map,A=!0,T=N[0],I=0;I=0,j=B?"width":"height",R=(0,a["default"])(t,{placement:P,boundary:g,rootBoundary:y,altBoundary:b,padding:m}),D=B?L?c.right:c.left:L?c.bottom:c.top;O[j]>k[j]&&(D=(0,r["default"])(D));var F=(0,r["default"])(D),K=[];if(d&&K.push(R[V]<=0),h&&K.push(R[D]<=0,R[F]<=0),K.every((function(e){return e}))){T=P,A=!1;break}M.set(P,K)}if(A)for(var z=function(e){var t=N.find((function(t){var n=M.get(t);if(n)return n.slice(0,e).every((function(e){return e}))}));if(t)return T=t,"break"},Y=w?3:1;Y>0;Y--){if("break"===z(Y))break}t.placement!==T&&(t.modifiersData[l]._skip=!0,t.placement=T,t.reset=!0)}},requiresIfExists:["offset"],data:{_skip:!1}};t["default"]=f},91263:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=void 0;var r,o=n(54945),i=(r=n(45073))&&r.__esModule?r:{"default":r};function a(e,t,n){return void 0===n&&(n={x:0,y:0}),{top:e.top-t.height-n.y,right:e.right-t.width+n.x,bottom:e.bottom-t.height+n.y,left:e.left-t.width-n.x}}function u(e){return[o.top,o.right,o.bottom,o.left].some((function(t){return e[t]>=0}))}var c={name:"hide",enabled:!0,phase:"main",requiresIfExists:["preventOverflow"],fn:function(e){var t=e.state,n=e.name,r=t.rects.reference,o=t.rects.popper,c=t.modifiersData.preventOverflow,s=(0,i["default"])(t,{elementContext:"reference"}),l=(0,i["default"])(t,{altBoundary:!0}),f=a(s,r),d=a(l,o,c),p=u(f),h=u(d);t.modifiersData[n]={referenceClippingOffsets:f,popperEscapeOffsets:d,isReferenceHidden:p,hasPopperEscaped:h},t.attributes.popper=Object.assign({},t.attributes.popper,{"data-popper-reference-hidden":p,"data-popper-escaped":h})}};t["default"]=c},15461:function(e,t,n){"use strict";t.__esModule=!0,t.preventOverflow=t.popperOffsets=t.offset=t.hide=t.flip=t.eventListeners=t.computeStyles=t.arrow=t.applyStyles=void 0;var r=d(n(1803));t.applyStyles=r["default"];var o=d(n(35838));t.arrow=o["default"];var i=d(n(42569));t.computeStyles=i["default"];var a=d(n(84886));t.eventListeners=a["default"];var u=d(n(75306));t.flip=u["default"];var c=d(n(91263));t.hide=c["default"];var s=d(n(36777));t.offset=s["default"];var l=d(n(19860));t.popperOffsets=l["default"];var f=d(n(90992));function d(e){return e&&e.__esModule?e:{"default":e}}t.preventOverflow=f["default"]},36777:function(e,t,n){"use strict";t.__esModule=!0,t.distanceAndSkiddingToXY=a,t["default"]=void 0;var r,o=(r=n(78044))&&r.__esModule?r:{"default":r},i=n(54945);function a(e,t,n){var r=(0,o["default"])(e),a=[i.left,i.top].indexOf(r)>=0?-1:1,u="function"==typeof n?n(Object.assign({},t,{placement:e})):n,c=u[0],s=u[1];return c=c||0,s=(s||0)*a,[i.left,i.right].indexOf(r)>=0?{x:s,y:c}:{x:c,y:s}}var u={name:"offset",enabled:!0,phase:"main",requires:["popperOffsets"],fn:function(e){var t=e.state,n=e.options,r=e.name,o=n.offset,u=void 0===o?[0,0]:o,c=i.placements.reduce((function(e,n){return e[n]=a(n,t.rects,u),e}),{}),s=c[t.placement],l=s.x,f=s.y;null!=t.modifiersData.popperOffsets&&(t.modifiersData.popperOffsets.x+=l,t.modifiersData.popperOffsets.y+=f),t.modifiersData[r]=c}};t["default"]=u},19860:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=void 0;var r,o=(r=n(89731))&&r.__esModule?r:{"default":r};var i={name:"popperOffsets",enabled:!0,phase:"read",fn:function(e){var t=e.state,n=e.name;t.modifiersData[n]=(0,o["default"])({reference:t.rects.reference,element:t.rects.popper,strategy:"absolute",placement:t.placement})},data:{}};t["default"]=i},90992:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=void 0;var r=n(54945),o=h(n(78044)),i=h(n(99840)),a=h(n(80776)),u=h(n(51520)),c=h(n(52089)),s=h(n(54484)),l=h(n(45073)),f=h(n(7938)),d=h(n(9775)),p=n(52209);function h(e){return e&&e.__esModule?e:{"default":e}}var v={name:"preventOverflow",enabled:!0,phase:"main",fn:function(e){var t=e.state,n=e.options,h=e.name,v=n.mainAxis,m=void 0===v||v,g=n.altAxis,y=void 0!==g&&g,b=n.boundary,_=n.rootBoundary,w=n.altBoundary,x=n.padding,E=n.tether,S=void 0===E||E,C=n.tetherOffset,N=void 0===C?0:C,O=(0,l["default"])(t,{boundary:b,rootBoundary:_,padding:x,altBoundary:w}),k=(0,o["default"])(t.placement),M=(0,f["default"])(t.placement),A=!M,T=(0,i["default"])(k),I=(0,a["default"])(T),P=t.modifiersData.popperOffsets,V=t.rects.reference,L=t.rects.popper,B="function"==typeof N?N(Object.assign({},t.rects,{placement:t.placement})):N,j={x:0,y:0};if(P){if(m||y){var R="y"===T?r.top:r.left,D="y"===T?r.bottom:r.right,F="y"===T?"height":"width",K=P[T],z=P[T]+O[R],Y=P[T]-O[D],U=S?-L[F]/2:0,H=M===r.start?V[F]:L[F],W=M===r.start?-L[F]:-V[F],$=t.elements.arrow,G=S&&$?(0,c["default"])($):{width:0,height:0},q=t.modifiersData["arrow#persistent"]?t.modifiersData["arrow#persistent"].padding:(0,d["default"])(),X=q[R],Q=q[D],Z=(0,u["default"])(0,V[F],G[F]),J=A?V[F]/2-U-Z-X-B:H-Z-X-B,ee=A?-V[F]/2+U+Z+Q+B:W+Z+Q+B,te=t.elements.arrow&&(0,s["default"])(t.elements.arrow),ne=te?"y"===T?te.clientTop||0:te.clientLeft||0:0,re=t.modifiersData.offset?t.modifiersData.offset[t.placement][T]:0,oe=P[T]+J-re-ne,ie=P[T]+ee-re;if(m){var ae=(0,u["default"])(S?(0,p.min)(z,oe):z,K,S?(0,p.max)(Y,ie):Y);P[T]=ae,j[T]=ae-K}if(y){var ue="x"===T?r.top:r.left,ce="x"===T?r.bottom:r.right,se=P[I],le=se+O[ue],fe=se-O[ce],de=(0,u["default"])(S?(0,p.min)(le,oe):le,se,S?(0,p.max)(fe,ie):fe);P[I]=de,j[I]=de-se}}t.modifiersData[h]=j}},requiresIfExists:["offset"]};t["default"]=v},15327:function(e,t,n){"use strict";t.__esModule=!0,t.defaultModifiers=t.createPopper=void 0;var r=n(33407);t.popperGenerator=r.popperGenerator,t.detectOverflow=r.detectOverflow;var o=c(n(84886)),i=c(n(19860)),a=c(n(42569)),u=c(n(1803));function c(e){return e&&e.__esModule?e:{"default":e}}var s=[o["default"],i["default"],a["default"],u["default"]];t.defaultModifiers=s;var l=(0,r.popperGenerator)({defaultModifiers:s});t.createPopper=l},15172:function(e,t,n){"use strict";t.__esModule=!0;var r={createPopper:!0,createPopperLite:!0,defaultModifiers:!0,popperGenerator:!0,detectOverflow:!0};t.defaultModifiers=t.createPopperLite=t.createPopper=void 0;var o=n(33407);t.popperGenerator=o.popperGenerator,t.detectOverflow=o.detectOverflow;var i=m(n(84886)),a=m(n(19860)),u=m(n(42569)),c=m(n(1803)),s=m(n(36777)),l=m(n(75306)),f=m(n(90992)),d=m(n(35838)),p=m(n(91263)),h=n(15327);t.createPopperLite=h.createPopper;var v=n(15461);function m(e){return e&&e.__esModule?e:{"default":e}}Object.keys(v).forEach((function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(r,e)||e in t&&t[e]===v[e]||(t[e]=v[e]))}));var g=[i["default"],a["default"],u["default"],c["default"],s["default"],l["default"],f["default"],d["default"],p["default"]];t.defaultModifiers=g;var y=(0,o.popperGenerator)({defaultModifiers:g});t.createPopperLite=t.createPopper=y},9118:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e,t){void 0===t&&(t={});var n=t,u=n.placement,c=n.boundary,s=n.rootBoundary,l=n.padding,f=n.flipVariations,d=n.allowedAutoPlacements,p=void 0===d?o.placements:d,h=(0,r["default"])(u),v=h?f?o.variationPlacements:o.variationPlacements.filter((function(e){return(0,r["default"])(e)===h})):o.basePlacements,m=v.filter((function(e){return p.indexOf(e)>=0}));0===m.length&&(m=v);var g=m.reduce((function(t,n){return t[n]=(0,i["default"])(e,{placement:n,boundary:c,rootBoundary:s,padding:l})[(0,a["default"])(n)],t}),{});return Object.keys(g).sort((function(e,t){return g[e]-g[t]}))};var r=u(n(7938)),o=n(54945),i=u(n(45073)),a=u(n(78044));function u(e){return e&&e.__esModule?e:{"default":e}}},89731:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t,n=e.reference,u=e.element,c=e.placement,s=c?(0,r["default"])(c):null,l=c?(0,o["default"])(c):null,f=n.x+n.width/2-u.width/2,d=n.y+n.height/2-u.height/2;switch(s){case a.top:t={x:f,y:n.y-u.height};break;case a.bottom:t={x:f,y:n.y+n.height};break;case a.right:t={x:n.x+n.width,y:d};break;case a.left:t={x:n.x-u.width,y:d};break;default:t={x:n.x,y:n.y}}var p=s?(0,i["default"])(s):null;if(null!=p){var h="y"===p?"height":"width";switch(l){case a.start:t[p]=t[p]-(n[h]/2-u[h]/2);break;case a.end:t[p]=t[p]+(n[h]/2-u[h]/2)}}return t};var r=u(n(78044)),o=u(n(7938)),i=u(n(99840)),a=n(54945);function u(e){return e&&e.__esModule?e:{"default":e}}},16936:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){var t;return function(){return t||(t=new Promise((function(n){Promise.resolve().then((function(){t=undefined,n(e())}))}))),t}}},45073:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e,t){void 0===t&&(t={});var n=t,d=n.placement,p=void 0===d?e.placement:d,h=n.boundary,v=void 0===h?c.clippingParents:h,m=n.rootBoundary,g=void 0===m?c.viewport:m,y=n.elementContext,b=void 0===y?c.popper:y,_=n.altBoundary,w=void 0!==_&&_,x=n.padding,E=void 0===x?0:x,S=(0,l["default"])("number"!=typeof E?E:(0,f["default"])(E,c.basePlacements)),C=b===c.popper?c.reference:c.popper,N=e.elements.reference,O=e.rects.popper,k=e.elements[w?C:b],M=(0,o["default"])((0,s.isElement)(k)?k:k.contextElement||(0,i["default"])(e.elements.popper),v,g),A=(0,r["default"])(N),T=(0,a["default"])({reference:A,element:O,strategy:"absolute",placement:p}),I=(0,u["default"])(Object.assign({},O,T)),P=b===c.popper?I:A,V={top:M.top-P.top+S.top,bottom:P.bottom-M.bottom+S.bottom,left:M.left-P.left+S.left,right:P.right-M.right+S.right},L=e.modifiersData.offset;if(b===c.popper&&L){var B=L[p];Object.keys(V).forEach((function(e){var t=[c.right,c.bottom].indexOf(e)>=0?1:-1,n=[c.top,c.bottom].indexOf(e)>=0?"y":"x";V[e]+=B[n]*t}))}return V};var r=d(n(87916)),o=d(n(70846)),i=d(n(36e3)),a=d(n(89731)),u=d(n(77276)),c=n(54945),s=n(31966),l=d(n(72882)),f=d(n(8415));function d(e){return e&&e.__esModule?e:{"default":e}}},8415:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e,t){return t.reduce((function(t,n){return t[n]=e,t}),{})}},50121:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){for(var t=arguments.length,n=new Array(t>1?t-1:0),r=1;r=0?"x":"y"}},21784:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){return e.replace(/left|right|bottom|top/g,(function(e){return n[e]}))};var n={left:"right",right:"left",bottom:"top",top:"bottom"}},10333:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){return e.replace(/start|end/g,(function(e){return n[e]}))};var n={start:"end",end:"start"}},7938:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){return e.split("-")[1]}},52209:function(e,t){"use strict";t.__esModule=!0,t.round=t.min=t.max=void 0;var n=Math.max;t.max=n;var r=Math.min;t.min=r;var o=Math.round;t.round=o},5495:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){var t=e.reduce((function(e,t){var n=e[t.name];return e[t.name]=n?Object.assign({},n,t,{options:Object.assign({},n.options,t.options),data:Object.assign({},n.data,t.data)}):t,e}),{});return Object.keys(t).map((function(e){return t[e]}))}},72882:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){return Object.assign({},(0,o["default"])(),e)};var r,o=(r=n(9775))&&r.__esModule?r:{"default":r}},7183:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t=function(e){var t=new Map,n=new Set,r=[];function o(e){n.add(e.name),[].concat(e.requires||[],e.requiresIfExists||[]).forEach((function(e){if(!n.has(e)){var r=t.get(e);r&&o(r)}})),r.push(e)}return e.forEach((function(e){t.set(e.name,e)})),e.forEach((function(e){n.has(e.name)||o(e)})),r}(e);return r.modifierPhases.reduce((function(e,n){return e.concat(t.filter((function(e){return e.phase===n})))}),[])};var r=n(54945)},77276:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){return Object.assign({},e,{left:e.x,top:e.y,right:e.x+e.width,bottom:e.y+e.height})}},20675:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e,t){var n=new Set;return e.filter((function(e){var r=t(e);if(!n.has(r))return n.add(r),!0}))}},11026:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){e.forEach((function(t){Object.keys(t).forEach((function(n){switch(n){case"name":t.name;break;case"enabled":t.enabled;case"phase":o.modifierPhases.indexOf(t.phase);break;case"fn":t.fn;break;case"effect":t.effect;break;case"requires":Array.isArray(t.requires);break;case"requiresIfExists":Array.isArray(t.requiresIfExists)}t.requires&&t.requires.forEach((function(t){e.find((function(e){return e.name===t}))}))}))}))};(r=n(50121))&&r.__esModule;var r,o=n(54945)},51520:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e,t,n){return(0,r.max)(e,(0,r.min)(t,n))};var r=n(52209)},13686:function(e){"use strict";e.exports=function(e){if("function"!=typeof e)throw TypeError(String(e)+" is not a function");return e}},85369:function(e,t,n){"use strict";var r=n(88711);e.exports=function(e){if(!r(e)&&null!==e)throw TypeError("Can't set "+String(e)+" as a prototype");return e}},14281:function(e,t,n){"use strict";var r=n(53414),o=n(96093),i=n(96452),a=r("unscopables"),u=Array.prototype;u[a]==undefined&&i.f(u,a,{configurable:!0,value:o(null)}),e.exports=function(e){u[a][e]=!0}},47103:function(e,t,n){"use strict";var r=n(34444).charAt;e.exports=function(e,t,n){return t+(n?r(e,t).length:1)}},2273:function(e){"use strict";e.exports=function(e,t,n){if(!(e instanceof t))throw TypeError("Incorrect "+(n?n+" ":"")+"invocation");return e}},14860:function(e,t,n){"use strict";var r=n(88711);e.exports=function(e){if(!r(e))throw TypeError(String(e)+" is not an object");return e}},17811:function(e){"use strict";e.exports="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof DataView},73203:function(e,t,n){"use strict";var r,o=n(17811),i=n(67738),a=n(179),u=n(88711),c=n(18632),s=n(54781),l=n(21413),f=n(77219),d=n(96452).f,p=n(92608),h=n(77715),v=n(53414),m=n(88340),g=a.Int8Array,y=g&&g.prototype,b=a.Uint8ClampedArray,_=b&&b.prototype,w=g&&p(g),x=y&&p(y),E=Object.prototype,S=E.isPrototypeOf,C=v("toStringTag"),N=m("TYPED_ARRAY_TAG"),O=o&&!!h&&"Opera"!==s(a.opera),k=!1,M={Int8Array:1,Uint8Array:1,Uint8ClampedArray:1,Int16Array:2,Uint16Array:2,Int32Array:4,Uint32Array:4,Float32Array:4,Float64Array:8},A={BigInt64Array:8,BigUint64Array:8},T=function(e){if(!u(e))return!1;var t=s(e);return"DataView"===t||c(M,t)||c(A,t)},I=function(e){if(!u(e))return!1;var t=s(e);return c(M,t)||c(A,t)};for(r in M)a[r]||(O=!1);if((!O||"function"!=typeof w||w===Function.prototype)&&(w=function(){throw TypeError("Incorrect invocation")},O))for(r in M)a[r]&&h(a[r],w);if((!O||!x||x===E)&&(x=w.prototype,O))for(r in M)a[r]&&h(a[r].prototype,x);if(O&&p(_)!==x&&h(_,x),i&&!c(x,C))for(r in k=!0,d(x,C,{get:function(){return u(this)?this[N]:undefined}}),M)a[r]&&l(a[r],N,r);e.exports={NATIVE_ARRAY_BUFFER_VIEWS:O,TYPED_ARRAY_TAG:k&&N,aTypedArray:function(e){if(I(e))return e;throw TypeError("Target is not a typed array")},aTypedArrayConstructor:function(e){if(h){if(S.call(w,e))return e}else for(var t in M)if(c(M,r)){var n=a[t];if(n&&(e===n||S.call(n,e)))return e}throw TypeError("Target is not a typed array constructor")},exportTypedArrayMethod:function(e,t,n){if(i){if(n)for(var r in M){var o=a[r];o&&c(o.prototype,e)&&delete o.prototype[e]}x[e]&&!n||f(x,e,n?t:O&&y[e]||t)}},exportTypedArrayStaticMethod:function(e,t,n){var r,o;if(i){if(h){if(n)for(r in M)(o=a[r])&&c(o,e)&&delete o[e];if(w[e]&&!n)return;try{return f(w,e,n?t:O&&g[e]||t)}catch(u){}}for(r in M)!(o=a[r])||o[e]&&!n||f(o,e,t)}},isView:T,isTypedArray:I,TypedArray:w,TypedArrayPrototype:x}},93071:function(e,t,n){"use strict";var r=n(179),o=n(67738),i=n(17811),a=n(21413),u=n(5289),c=n(84921),s=n(2273),l=n(44028),f=n(27842),d=n(66659),p=n(63408),h=n(92608),v=n(77715),m=n(75604).f,g=n(96452).f,y=n(24115),b=n(81978),_=n(28076),w=_.get,x=_.set,E="ArrayBuffer",S="DataView",C="Wrong index",N=r.ArrayBuffer,O=N,k=r.DataView,M=k&&k.prototype,A=Object.prototype,T=r.RangeError,I=p.pack,P=p.unpack,V=function(e){return[255&e]},L=function(e){return[255&e,e>>8&255]},B=function(e){return[255&e,e>>8&255,e>>16&255,e>>24&255]},j=function(e){return e[3]<<24|e[2]<<16|e[1]<<8|e[0]},R=function(e){return I(e,23,4)},D=function(e){return I(e,52,8)},F=function(e,t){g(e.prototype,t,{get:function(){return w(this)[t]}})},K=function(e,t,n,r){var o=d(n),i=w(e);if(o+t>i.byteLength)throw T(C);var a=w(i.buffer).bytes,u=o+i.byteOffset,c=a.slice(u,u+t);return r?c:c.reverse()},z=function(e,t,n,r,o,i){var a=d(n),u=w(e);if(a+t>u.byteLength)throw T(C);for(var c=w(u.buffer).bytes,s=a+u.byteOffset,l=r(+o),f=0;fW;)(Y=H[W++])in O||a(O,Y,N[Y]);U.constructor=O}v&&h(M)!==A&&v(M,A);var $=new k(new O(2)),G=M.setInt8;$.setInt8(0,2147483648),$.setInt8(1,2147483649),!$.getInt8(0)&&$.getInt8(1)||u(M,{setInt8:function(e,t){G.call(this,e,t<<24>>24)},setUint8:function(e,t){G.call(this,e,t<<24>>24)}},{unsafe:!0})}else O=function(e){s(this,O,E);var t=d(e);x(this,{bytes:y.call(new Array(t),0),byteLength:t}),o||(this.byteLength=t)},k=function(e,t,n){s(this,k,S),s(e,O,S);var r=w(e).byteLength,i=l(t);if(i<0||i>r)throw T("Wrong offset");if(i+(n=n===undefined?r-i:f(n))>r)throw T("Wrong length");x(this,{buffer:e,byteLength:n,byteOffset:i}),o||(this.buffer=e,this.byteLength=n,this.byteOffset=i)},o&&(F(O,"byteLength"),F(k,"buffer"),F(k,"byteLength"),F(k,"byteOffset")),u(k.prototype,{getInt8:function(e){return K(this,1,e)[0]<<24>>24},getUint8:function(e){return K(this,1,e)[0]},getInt16:function(e){var t=K(this,2,e,arguments.length>1?arguments[1]:undefined);return(t[1]<<8|t[0])<<16>>16},getUint16:function(e){var t=K(this,2,e,arguments.length>1?arguments[1]:undefined);return t[1]<<8|t[0]},getInt32:function(e){return j(K(this,4,e,arguments.length>1?arguments[1]:undefined))},getUint32:function(e){return j(K(this,4,e,arguments.length>1?arguments[1]:undefined))>>>0},getFloat32:function(e){return P(K(this,4,e,arguments.length>1?arguments[1]:undefined),23)},getFloat64:function(e){return P(K(this,8,e,arguments.length>1?arguments[1]:undefined),52)},setInt8:function(e,t){z(this,1,e,V,t)},setUint8:function(e,t){z(this,1,e,V,t)},setInt16:function(e,t){z(this,2,e,L,t,arguments.length>2?arguments[2]:undefined)},setUint16:function(e,t){z(this,2,e,L,t,arguments.length>2?arguments[2]:undefined)},setInt32:function(e,t){z(this,4,e,B,t,arguments.length>2?arguments[2]:undefined)},setUint32:function(e,t){z(this,4,e,B,t,arguments.length>2?arguments[2]:undefined)},setFloat32:function(e,t){z(this,4,e,R,t,arguments.length>2?arguments[2]:undefined)},setFloat64:function(e,t){z(this,8,e,D,t,arguments.length>2?arguments[2]:undefined)}});b(O,E),b(k,S),e.exports={ArrayBuffer:O,DataView:k}},92475:function(e,t,n){"use strict";var r=n(6289),o=n(13292),i=n(27842),a=Math.min;e.exports=[].copyWithin||function(e,t){var n=r(this),u=i(n.length),c=o(e,u),s=o(t,u),l=arguments.length>2?arguments[2]:undefined,f=a((l===undefined?u:o(l,u))-s,u-c),d=1;for(s0;)s in n?n[c]=n[s]:delete n[c],c+=d,s+=d;return n}},24115:function(e,t,n){"use strict";var r=n(6289),o=n(13292),i=n(27842);e.exports=function(e){for(var t=r(this),n=i(t.length),a=arguments.length,u=o(a>1?arguments[1]:undefined,n),c=a>2?arguments[2]:undefined,s=c===undefined?n:o(c,n);s>u;)t[u++]=e;return t}},70091:function(e,t,n){"use strict";var r=n(77118).forEach,o=n(45944)("forEach");e.exports=o?[].forEach:function(e){return r(this,e,arguments.length>1?arguments[1]:undefined)}},75372:function(e,t,n){"use strict";var r=n(57386),o=n(6289),i=n(36288),a=n(76774),u=n(27842),c=n(79651),s=n(29863);e.exports=function(e){var t,n,l,f,d,p,h=o(e),v="function"==typeof this?this:Array,m=arguments.length,g=m>1?arguments[1]:undefined,y=g!==undefined,b=s(h),_=0;if(y&&(g=r(g,m>2?arguments[2]:undefined,2)),b==undefined||v==Array&&a(b))for(n=new v(t=u(h.length));t>_;_++)p=y?g(h[_],_):h[_],c(n,_,p);else for(d=(f=b.call(h)).next,n=new v;!(l=d.call(f)).done;_++)p=y?i(f,g,[l.value,_],!0):l.value,c(n,_,p);return n.length=_,n}},53454:function(e,t,n){"use strict";var r=n(94789),o=n(27842),i=n(13292),a=function(e){return function(t,n,a){var u,c=r(t),s=o(c.length),l=i(a,s);if(e&&n!=n){for(;s>l;)if((u=c[l++])!=u)return!0}else for(;s>l;l++)if((e||l in c)&&c[l]===n)return e||l||0;return!e&&-1}};e.exports={includes:a(!0),indexOf:a(!1)}},77118:function(e,t,n){"use strict";var r=n(57386),o=n(46317),i=n(6289),a=n(27842),u=n(12384),c=[].push,s=function(e){var t=1==e,n=2==e,s=3==e,l=4==e,f=6==e,d=7==e,p=5==e||f;return function(h,v,m,g){for(var y,b,_=i(h),w=o(_),x=r(v,m,3),E=a(w.length),S=0,C=g||u,N=t?C(h,E):n||d?C(h,0):undefined;E>S;S++)if((p||S in w)&&(b=x(y=w[S],S,_),e))if(t)N[S]=b;else if(b)switch(e){case 3:return!0;case 5:return y;case 6:return S;case 2:c.call(N,y)}else switch(e){case 4:return!1;case 7:c.call(N,y)}return f?-1:s||l?l:N}};e.exports={forEach:s(0),map:s(1),filter:s(2),some:s(3),every:s(4),find:s(5),findIndex:s(6),filterOut:s(7)}},9819:function(e,t,n){"use strict";var r=n(94789),o=n(44028),i=n(27842),a=n(45944),u=Math.min,c=[].lastIndexOf,s=!!c&&1/[1].lastIndexOf(1,-0)<0,l=a("lastIndexOf"),f=s||!l;e.exports=f?function(e){if(s)return c.apply(this,arguments)||0;var t=r(this),n=i(t.length),a=n-1;for(arguments.length>1&&(a=u(a,o(arguments[1]))),a<0&&(a=n+a);a>=0;a--)if(a in t&&t[a]===e)return a||0;return-1}:c},16684:function(e,t,n){"use strict";var r=n(84921),o=n(53414),i=n(32728),a=o("species");e.exports=function(e){return i>=51||!r((function(){var t=[];return(t.constructor={})[a]=function(){return{foo:1}},1!==t[e](Boolean).foo}))}},45944:function(e,t,n){"use strict";var r=n(84921);e.exports=function(e,t){var n=[][e];return!!n&&r((function(){n.call(null,t||function(){throw 1},1)}))}},59878:function(e,t,n){"use strict";var r=n(13686),o=n(6289),i=n(46317),a=n(27842),u=function(e){return function(t,n,u,c){r(n);var s=o(t),l=i(s),f=a(s.length),d=e?f-1:0,p=e?-1:1;if(u<2)for(;;){if(d in l){c=l[d],d+=p;break}if(d+=p,e?d<0:f<=d)throw TypeError("Reduce of empty array with no initial value")}for(;e?d>=0:f>d;d+=p)d in l&&(c=n(c,l[d],d,s));return c}};e.exports={left:u(!1),right:u(!0)}},12384:function(e,t,n){"use strict";var r=n(88711),o=n(1897),i=n(53414)("species");e.exports=function(e,t){var n;return o(e)&&("function"!=typeof(n=e.constructor)||n!==Array&&!o(n.prototype)?r(n)&&null===(n=n[i])&&(n=undefined):n=undefined),new(n===undefined?Array:n)(0===t?0:t)}},36288:function(e,t,n){"use strict";var r=n(14860),o=n(16284);e.exports=function(e,t,n,i){try{return i?t(r(n)[0],n[1]):t(n)}catch(a){throw o(e),a}}},33652:function(e,t,n){"use strict";var r=n(53414)("iterator"),o=!1;try{var i=0,a={next:function(){return{done:!!i++}},"return":function(){o=!0}};a[r]=function(){return this},Array.from(a,(function(){throw 2}))}catch(u){}e.exports=function(e,t){if(!t&&!o)return!1;var n=!1;try{var i={};i[r]=function(){return{next:function(){return{done:n=!0}}}},e(i)}catch(u){}return n}},90726:function(e){"use strict";var t={}.toString;e.exports=function(e){return t.call(e).slice(8,-1)}},54781:function(e,t,n){"use strict";var r=n(97099),o=n(90726),i=n(53414)("toStringTag"),a="Arguments"==o(function(){return arguments}());e.exports=r?o:function(e){var t,n,r;return e===undefined?"Undefined":null===e?"Null":"string"==typeof(n=function(e,t){try{return e[t]}catch(n){}}(t=Object(e),i))?n:a?o(t):"Object"==(r=o(t))&&"function"==typeof t.callee?"Arguments":r}},4721:function(e,t,n){"use strict";var r=n(96452).f,o=n(96093),i=n(5289),a=n(57386),u=n(2273),c=n(8362),s=n(54981),l=n(40548),f=n(67738),d=n(21419).fastKey,p=n(28076),h=p.set,v=p.getterFor;e.exports={getConstructor:function(e,t,n,s){var l=e((function(e,r){u(e,l,t),h(e,{type:t,index:o(null),first:undefined,last:undefined,size:0}),f||(e.size=0),r!=undefined&&c(r,e[s],{that:e,AS_ENTRIES:n})})),p=v(t),m=function(e,t,n){var r,o,i=p(e),a=g(e,t);return a?a.value=n:(i.last=a={index:o=d(t,!0),key:t,value:n,previous:r=i.last,next:undefined,removed:!1},i.first||(i.first=a),r&&(r.next=a),f?i.size++:e.size++,"F"!==o&&(i.index[o]=a)),e},g=function(e,t){var n,r=p(e),o=d(t);if("F"!==o)return r.index[o];for(n=r.first;n;n=n.next)if(n.key==t)return n};return i(l.prototype,{clear:function(){for(var e=p(this),t=e.index,n=e.first;n;)n.removed=!0,n.previous&&(n.previous=n.previous.next=undefined),delete t[n.index],n=n.next;e.first=e.last=undefined,f?e.size=0:this.size=0},"delete":function(e){var t=this,n=p(t),r=g(t,e);if(r){var o=r.next,i=r.previous;delete n.index[r.index],r.removed=!0,i&&(i.next=o),o&&(o.previous=i),n.first==r&&(n.first=o),n.last==r&&(n.last=i),f?n.size--:t.size--}return!!r},forEach:function(e){for(var t,n=p(this),r=a(e,arguments.length>1?arguments[1]:undefined,3);t=t?t.next:n.first;)for(r(t.value,t.key,this);t&&t.removed;)t=t.previous},has:function(e){return!!g(this,e)}}),i(l.prototype,n?{get:function(e){var t=g(this,e);return t&&t.value},set:function(e,t){return m(this,0===e?0:e,t)}}:{add:function(e){return m(this,e=0===e?0:e,e)}}),f&&r(l.prototype,"size",{get:function(){return p(this).size}}),l},setStrong:function(e,t,n){var r=t+" Iterator",o=v(t),i=v(r);s(e,t,(function(e,t){h(this,{type:r,target:e,state:o(e),kind:t,last:undefined})}),(function(){for(var e=i(this),t=e.kind,n=e.last;n&&n.removed;)n=n.previous;return e.target&&(e.last=n=n?n.next:e.state.first)?"keys"==t?{value:n.key,done:!1}:"values"==t?{value:n.value,done:!1}:{value:[n.key,n.value],done:!1}:(e.target=undefined,{value:undefined,done:!0})}),n?"entries":"values",!n,!0),l(t)}}},76568:function(e,t,n){"use strict";var r=n(5289),o=n(21419).getWeakData,i=n(14860),a=n(88711),u=n(2273),c=n(8362),s=n(77118),l=n(18632),f=n(28076),d=f.set,p=f.getterFor,h=s.find,v=s.findIndex,m=0,g=function(e){return e.frozen||(e.frozen=new y)},y=function(){this.entries=[]},b=function(e,t){return h(e.entries,(function(e){return e[0]===t}))};y.prototype={get:function(e){var t=b(this,e);if(t)return t[1]},has:function(e){return!!b(this,e)},set:function(e,t){var n=b(this,e);n?n[1]=t:this.entries.push([e,t])},"delete":function(e){var t=v(this.entries,(function(t){return t[0]===e}));return~t&&this.entries.splice(t,1),!!~t}},e.exports={getConstructor:function(e,t,n,s){var f=e((function(e,r){u(e,f,t),d(e,{type:t,id:m++,frozen:undefined}),r!=undefined&&c(r,e[s],{that:e,AS_ENTRIES:n})})),h=p(t),v=function(e,t,n){var r=h(e),a=o(i(t),!0);return!0===a?g(r).set(t,n):a[r.id]=n,e};return r(f.prototype,{"delete":function(e){var t=h(this);if(!a(e))return!1;var n=o(e);return!0===n?g(t)["delete"](e):n&&l(n,t.id)&&delete n[t.id]},has:function(e){var t=h(this);if(!a(e))return!1;var n=o(e);return!0===n?g(t).has(e):n&&l(n,t.id)}}),r(f.prototype,n?{get:function(e){var t=h(this);if(a(e)){var n=o(e);return!0===n?g(t).get(e):n?n[t.id]:undefined}},set:function(e,t){return v(this,e,t)}}:{add:function(e){return v(this,e,!0)}}),f}}},20991:function(e,t,n){"use strict";var r=n(99592),o=n(179),i=n(61287),a=n(77219),u=n(21419),c=n(8362),s=n(2273),l=n(88711),f=n(84921),d=n(33652),p=n(81978),h=n(69262);e.exports=function(e,t,n){var v=-1!==e.indexOf("Map"),m=-1!==e.indexOf("Weak"),g=v?"set":"add",y=o[e],b=y&&y.prototype,_=y,w={},x=function(e){var t=b[e];a(b,e,"add"==e?function(e){return t.call(this,0===e?0:e),this}:"delete"==e?function(e){return!(m&&!l(e))&&t.call(this,0===e?0:e)}:"get"==e?function(e){return m&&!l(e)?undefined:t.call(this,0===e?0:e)}:"has"==e?function(e){return!(m&&!l(e))&&t.call(this,0===e?0:e)}:function(e,n){return t.call(this,0===e?0:e,n),this})};if(i(e,"function"!=typeof y||!(m||b.forEach&&!f((function(){(new y).entries().next()})))))_=n.getConstructor(t,e,v,g),u.REQUIRED=!0;else if(i(e,!0)){var E=new _,S=E[g](m?{}:-0,1)!=E,C=f((function(){E.has(1)})),N=d((function(e){new y(e)})),O=!m&&f((function(){for(var e=new y,t=5;t--;)e[g](t,t);return!e.has(-0)}));N||((_=t((function(t,n){s(t,_,e);var r=h(new y,t,_);return n!=undefined&&c(n,r[g],{that:r,AS_ENTRIES:v}),r}))).prototype=b,b.constructor=_),(C||O)&&(x("delete"),x("has"),v&&x("get")),(O||S)&&x(g),m&&b.clear&&delete b.clear}return w[e]=_,r({global:!0,forced:_!=y},w),p(_,e),m||n.setStrong(_,e,v),_}},44121:function(e,t,n){"use strict";var r=n(18632),o=n(1051),i=n(8740),a=n(96452);e.exports=function(e,t){for(var n=o(t),u=a.f,c=i.f,s=0;s"+a+""}},97993:function(e,t,n){"use strict";var r=n(9392).IteratorPrototype,o=n(96093),i=n(28804),a=n(81978),u=n(36617),c=function(){return this};e.exports=function(e,t,n){var s=t+" Iterator";return e.prototype=o(r,{next:i(1,n)}),a(e,s,!1,!0),u[s]=c,e}},21413:function(e,t,n){"use strict";var r=n(67738),o=n(96452),i=n(28804);e.exports=r?function(e,t,n){return o.f(e,t,i(1,n))}:function(e,t,n){return e[t]=n,e}},28804:function(e){"use strict";e.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},79651:function(e,t,n){"use strict";var r=n(79165),o=n(96452),i=n(28804);e.exports=function(e,t,n){var a=r(t);a in e?o.f(e,a,i(0,n)):e[a]=n}},27051:function(e,t,n){"use strict";var r=n(84921),o=n(61514).start,i=Math.abs,a=Date.prototype,u=a.getTime,c=a.toISOString;e.exports=r((function(){return"0385-07-25T07:06:39.999Z"!=c.call(new Date(-50000000000001))}))||!r((function(){c.call(new Date(NaN))}))?function(){if(!isFinite(u.call(this)))throw RangeError("Invalid time value");var e=this,t=e.getUTCFullYear(),n=e.getUTCMilliseconds(),r=t<0?"-":t>9999?"+":"";return r+o(i(t),r?6:4,0)+"-"+o(e.getUTCMonth()+1,2,0)+"-"+o(e.getUTCDate(),2,0)+"T"+o(e.getUTCHours(),2,0)+":"+o(e.getUTCMinutes(),2,0)+":"+o(e.getUTCSeconds(),2,0)+"."+o(n,3,0)+"Z"}:c},92880:function(e,t,n){"use strict";var r=n(14860),o=n(79165);e.exports=function(e){if("string"!==e&&"number"!==e&&"default"!==e)throw TypeError("Incorrect hint");return o(r(this),"number"!==e)}},54981:function(e,t,n){"use strict";var r=n(99592),o=n(97993),i=n(92608),a=n(77715),u=n(81978),c=n(21413),s=n(77219),l=n(53414),f=n(51684),d=n(36617),p=n(9392),h=p.IteratorPrototype,v=p.BUGGY_SAFARI_ITERATORS,m=l("iterator"),g="keys",y="values",b="entries",_=function(){return this};e.exports=function(e,t,n,l,p,w,x){o(n,t,l);var E,S,C,N=function(e){if(e===p&&T)return T;if(!v&&e in M)return M[e];switch(e){case g:case y:case b:return function(){return new n(this,e)}}return function(){return new n(this)}},O=t+" Iterator",k=!1,M=e.prototype,A=M[m]||M["@@iterator"]||p&&M[p],T=!v&&A||N(p),I="Array"==t&&M.entries||A;if(I&&(E=i(I.call(new e)),h!==Object.prototype&&E.next&&(f||i(E)===h||(a?a(E,h):"function"!=typeof E[m]&&c(E,m,_)),u(E,O,!0,!0),f&&(d[O]=_))),p==y&&A&&A.name!==y&&(k=!0,T=function(){return A.call(this)}),f&&!x||M[m]===T||c(M,m,T),d[t]=T,p)if(S={values:N(y),keys:w?T:N(g),entries:N(b)},x)for(C in S)(v||k||!(C in M))&&s(M,C,S[C]);else r({target:t,proto:!0,forced:v||k},S);return S}},90209:function(e,t,n){"use strict";var r=n(91996),o=n(18632),i=n(42571),a=n(96452).f;e.exports=function(e){var t=r.Symbol||(r.Symbol={});o(t,e)||a(t,e,{value:i.f(e)})}},67738:function(e,t,n){"use strict";var r=n(84921);e.exports=!r((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]}))},27383:function(e,t,n){"use strict";var r=n(179),o=n(88711),i=r.document,a=o(i)&&o(i.createElement);e.exports=function(e){return a?i.createElement(e):{}}},13745:function(e,t,n){"use strict";var r=n(97285);e.exports=/(?:iphone|ipod|ipad).*applewebkit/i.test(r)},23043:function(e,t,n){"use strict";var r=n(90726),o=n(179);e.exports="process"==r(o.process)},59137:function(e,t,n){"use strict";var r=n(97285);e.exports=/web0s(?!.*chrome)/i.test(r)},97285:function(e,t,n){"use strict";var r=n(44417);e.exports=r("navigator","userAgent")||""},32728:function(e,t,n){"use strict";var r,o,i=n(179),a=n(97285),u=i.process,c=u&&u.versions,s=c&&c.v8;s?o=(r=s.split("."))[0]+r[1]:a&&(!(r=a.match(/Edge\/(\d+)/))||r[1]>=74)&&(r=a.match(/Chrome\/(\d+)/))&&(o=r[1]),e.exports=o&&+o},89807:function(e){"use strict";e.exports=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"]},99592:function(e,t,n){"use strict";var r=n(179),o=n(8740).f,i=n(21413),a=n(77219),u=n(53753),c=n(44121),s=n(61287);e.exports=function(e,t){var n,l,f,d,p,h=e.target,v=e.global,m=e.stat;if(n=v?r:m?r[h]||u(h,{}):(r[h]||{}).prototype)for(l in t){if(d=t[l],f=e.noTargetGet?(p=o(n,l))&&p.value:n[l],!s(v?l:h+(m?".":"#")+l,e.forced)&&f!==undefined){if(typeof d==typeof f)continue;c(d,f)}(e.sham||f&&f.sham)&&i(d,"sham",!0),a(n,l,d,e)}}},84921:function(e){"use strict";e.exports=function(e){try{return!!e()}catch(t){return!0}}},27167:function(e,t,n){"use strict";n(30660);var r=n(77219),o=n(84921),i=n(53414),a=n(21413),u=i("species"),c=!o((function(){var e=/./;return e.exec=function(){var e=[];return e.groups={a:"7"},e},"7"!=="".replace(e,"$")})),s="$0"==="a".replace(/./,"$0"),l=i("replace"),f=!!/./[l]&&""===/./[l]("a","$0"),d=!o((function(){var e=/(?:)/,t=e.exec;e.exec=function(){return t.apply(this,arguments)};var n="ab".split(e);return 2!==n.length||"a"!==n[0]||"b"!==n[1]}));e.exports=function(e,t,n,l){var p=i(e),h=!o((function(){var t={};return t[p]=function(){return 7},7!=""[e](t)})),v=h&&!o((function(){var t=!1,n=/a/;return"split"===e&&((n={}).constructor={},n.constructor[u]=function(){return n},n.flags="",n[p]=/./[p]),n.exec=function(){return t=!0,null},n[p](""),!t}));if(!h||!v||"replace"===e&&(!c||!s||f)||"split"===e&&!d){var m=/./[p],g=n(p,""[e],(function(e,t,n,r,o){return t.exec===RegExp.prototype.exec?h&&!o?{done:!0,value:m.call(t,n,r)}:{done:!0,value:e.call(n,t,r)}:{done:!1}}),{REPLACE_KEEPS_$0:s,REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE:f}),y=g[0],b=g[1];r(String.prototype,e,y),r(RegExp.prototype,p,2==t?function(e,t){return b.call(e,this,t)}:function(e){return b.call(e,this)})}l&&a(RegExp.prototype[p],"sham",!0)}},83632:function(e,t,n){"use strict";var r=n(1897),o=n(27842),i=n(57386);e.exports=function a(e,t,n,u,c,s,l,f){for(var d,p=c,h=0,v=!!l&&i(l,f,3);h0&&r(d))p=a(e,t,d,o(d.length),p,s-1)-1;else{if(p>=9007199254740991)throw TypeError("Exceed the acceptable array length");e[p]=d}p++}h++}return p}},41e3:function(e,t,n){"use strict";var r=n(84921);e.exports=!r((function(){return Object.isExtensible(Object.preventExtensions({}))}))},57386:function(e,t,n){"use strict";var r=n(13686);e.exports=function(e,t,n){if(r(e),t===undefined)return e;switch(n){case 0:return function(){return e.call(t)};case 1:return function(n){return e.call(t,n)};case 2:return function(n,r){return e.call(t,n,r)};case 3:return function(n,r,o){return e.call(t,n,r,o)}}return function(){return e.apply(t,arguments)}}},27314:function(e,t,n){"use strict";var r=n(13686),o=n(88711),i=[].slice,a={},u=function(e,t,n){if(!(t in a)){for(var r=[],o=0;o]*>)/g,u=/\$([$&'`]|\d{1,2})/g;e.exports=function(e,t,n,c,s,l){var f=n+e.length,d=c.length,p=u;return s!==undefined&&(s=r(s),p=a),i.call(l,p,(function(r,i){var a;switch(i.charAt(0)){case"$":return"$";case"&":return e;case"`":return t.slice(0,n);case"'":return t.slice(f);case"<":a=s[i.slice(1,-1)];break;default:var u=+i;if(0===u)return r;if(u>d){var l=o(u/10);return 0===l?r:l<=d?c[l-1]===undefined?i.charAt(1):c[l-1]+i.charAt(1):r}a=c[u-1]}return a===undefined?"":a}))}},179:function(e,t,n){"use strict";var r=function(e){return e&&e.Math==Math&&e};e.exports=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof n.g&&n.g)||function(){return this}()||Function("return this")()},18632:function(e){"use strict";var t={}.hasOwnProperty;e.exports=function(e,n){return t.call(e,n)}},58825:function(e){"use strict";e.exports={}},63380:function(e,t,n){"use strict";var r=n(179);e.exports=function(e,t){var n=r.console;n&&n.error&&(1===arguments.length?n.error(e):n.error(e,t))}},55780:function(e,t,n){"use strict";var r=n(44417);e.exports=r("document","documentElement")},59807:function(e,t,n){"use strict";var r=n(67738),o=n(84921),i=n(27383);e.exports=!r&&!o((function(){return 7!=Object.defineProperty(i("div"),"a",{get:function(){return 7}}).a}))},63408:function(e){"use strict";var t=Math.abs,n=Math.pow,r=Math.floor,o=Math.log,i=Math.LN2;e.exports={pack:function(e,a,u){var c,s,l,f=new Array(u),d=8*u-a-1,p=(1<>1,v=23===a?n(2,-24)-n(2,-77):0,m=e<0||0===e&&1/e<0?1:0,g=0;for((e=t(e))!=e||e===Infinity?(s=e!=e?1:0,c=p):(c=r(o(e)/i),e*(l=n(2,-c))<1&&(c--,l*=2),(e+=c+h>=1?v/l:v*n(2,1-h))*l>=2&&(c++,l/=2),c+h>=p?(s=0,c=p):c+h>=1?(s=(e*l-1)*n(2,a),c+=h):(s=e*n(2,h-1)*n(2,a),c=0));a>=8;f[g++]=255&s,s/=256,a-=8);for(c=c<0;f[g++]=255&c,c/=256,d-=8);return f[--g]|=128*m,f},unpack:function(e,t){var r,o=e.length,i=8*o-t-1,a=(1<>1,c=i-7,s=o-1,l=e[s--],f=127&l;for(l>>=7;c>0;f=256*f+e[s],s--,c-=8);for(r=f&(1<<-c)-1,f>>=-c,c+=t;c>0;r=256*r+e[s],s--,c-=8);if(0===f)f=1-u;else{if(f===a)return r?NaN:l?-Infinity:Infinity;r+=n(2,t),f-=u}return(l?-1:1)*r*n(2,f-t)}}},46317:function(e,t,n){"use strict";var r=n(84921),o=n(90726),i="".split;e.exports=r((function(){return!Object("z").propertyIsEnumerable(0)}))?function(e){return"String"==o(e)?i.call(e,""):Object(e)}:Object},69262:function(e,t,n){"use strict";var r=n(88711),o=n(77715);e.exports=function(e,t,n){var i,a;return o&&"function"==typeof(i=t.constructor)&&i!==n&&r(a=i.prototype)&&a!==n.prototype&&o(e,a),e}},1306:function(e,t,n){"use strict";var r=n(53252),o=Function.toString;"function"!=typeof r.inspectSource&&(r.inspectSource=function(e){return o.call(e)}),e.exports=r.inspectSource},21419:function(e,t,n){"use strict";var r=n(58825),o=n(88711),i=n(18632),a=n(96452).f,u=n(88340),c=n(41e3),s=u("meta"),l=0,f=Object.isExtensible||function(){return!0},d=function(e){a(e,s,{value:{objectID:"O"+ ++l,weakData:{}}})},p=e.exports={REQUIRED:!1,fastKey:function(e,t){if(!o(e))return"symbol"==typeof e?e:("string"==typeof e?"S":"P")+e;if(!i(e,s)){if(!f(e))return"F";if(!t)return"E";d(e)}return e[s].objectID},getWeakData:function(e,t){if(!i(e,s)){if(!f(e))return!0;if(!t)return!1;d(e)}return e[s].weakData},onFreeze:function(e){return c&&p.REQUIRED&&f(e)&&!i(e,s)&&d(e),e}};r[s]=!0},28076:function(e,t,n){"use strict";var r,o,i,a=n(2900),u=n(179),c=n(88711),s=n(21413),l=n(18632),f=n(53252),d=n(6839),p=n(58825),h=u.WeakMap;if(a){var v=f.state||(f.state=new h),m=v.get,g=v.has,y=v.set;r=function(e,t){return t.facade=e,y.call(v,e,t),t},o=function(e){return m.call(v,e)||{}},i=function(e){return g.call(v,e)}}else{var b=d("state");p[b]=!0,r=function(e,t){return t.facade=e,s(e,b,t),t},o=function(e){return l(e,b)?e[b]:{}},i=function(e){return l(e,b)}}e.exports={set:r,get:o,has:i,enforce:function(e){return i(e)?o(e):r(e,{})},getterFor:function(e){return function(t){var n;if(!c(t)||(n=o(t)).type!==e)throw TypeError("Incompatible receiver, "+e+" required");return n}}}},76774:function(e,t,n){"use strict";var r=n(53414),o=n(36617),i=r("iterator"),a=Array.prototype;e.exports=function(e){return e!==undefined&&(o.Array===e||a[i]===e)}},1897:function(e,t,n){"use strict";var r=n(90726);e.exports=Array.isArray||function(e){return"Array"==r(e)}},61287:function(e,t,n){"use strict";var r=n(84921),o=/#|\.prototype\./,i=function(e,t){var n=u[a(e)];return n==s||n!=c&&("function"==typeof t?r(t):!!t)},a=i.normalize=function(e){return String(e).replace(o,".").toLowerCase()},u=i.data={},c=i.NATIVE="N",s=i.POLYFILL="P";e.exports=i},44616:function(e,t,n){"use strict";var r=n(88711),o=Math.floor;e.exports=function(e){return!r(e)&&isFinite(e)&&o(e)===e}},88711:function(e){"use strict";e.exports=function(e){return"object"==typeof e?null!==e:"function"==typeof e}},51684:function(e){"use strict";e.exports=!1},45025:function(e,t,n){"use strict";var r=n(88711),o=n(90726),i=n(53414)("match");e.exports=function(e){var t;return r(e)&&((t=e[i])!==undefined?!!t:"RegExp"==o(e))}},8362:function(e,t,n){"use strict";var r=n(14860),o=n(76774),i=n(27842),a=n(57386),u=n(29863),c=n(16284),s=function(e,t){this.stopped=e,this.result=t};e.exports=function(e,t,n){var l,f,d,p,h,v,m,g=n&&n.that,y=!(!n||!n.AS_ENTRIES),b=!(!n||!n.IS_ITERATOR),_=!(!n||!n.INTERRUPTED),w=a(t,g,1+y+_),x=function(e){return l&&c(l),new s(!0,e)},E=function(e){return y?(r(e),_?w(e[0],e[1],x):w(e[0],e[1])):_?w(e,x):w(e)};if(b)l=e;else{if("function"!=typeof(f=u(e)))throw TypeError("Target is not iterable");if(o(f)){for(d=0,p=i(e.length);p>d;d++)if((h=E(e[d]))&&h instanceof s)return h;return new s(!1)}l=f.call(e)}for(v=l.next;!(m=v.call(l)).done;){try{h=E(m.value)}catch(S){throw c(l),S}if("object"==typeof h&&h&&h instanceof s)return h}return new s(!1)}},16284:function(e,t,n){"use strict";var r=n(14860);e.exports=function(e){var t=e["return"];if(t!==undefined)return r(t.call(e)).value}},9392:function(e,t,n){"use strict";var r,o,i,a=n(84921),u=n(92608),c=n(21413),s=n(18632),l=n(53414),f=n(51684),d=l("iterator"),p=!1;[].keys&&("next"in(i=[].keys())?(o=u(u(i)))!==Object.prototype&&(r=o):p=!0);var h=r==undefined||a((function(){var e={};return r[d].call(e)!==e}));h&&(r={}),f&&!h||s(r,d)||c(r,d,(function(){return this})),e.exports={IteratorPrototype:r,BUGGY_SAFARI_ITERATORS:p}},36617:function(e){"use strict";e.exports={}},64674:function(e){"use strict";var t=Math.expm1,n=Math.exp;e.exports=!t||t(10)>22025.465794806718||t(10)<22025.465794806718||-2e-17!=t(-2e-17)?function(e){return 0==(e=+e)?e:e>-1e-6&&e<1e-6?e+e*e/2:n(e)-1}:t},90702:function(e,t,n){"use strict";var r=n(53188),o=Math.abs,i=Math.pow,a=i(2,-52),u=i(2,-23),c=i(2,127)*(2-u),s=i(2,-126);e.exports=Math.fround||function(e){var t,n,i=o(e),l=r(e);return ic||n!=n?l*Infinity:l*n}},36535:function(e){"use strict";var t=Math.log;e.exports=Math.log1p||function(e){return(e=+e)>-1e-8&&e<1e-8?e-e*e/2:t(1+e)}},53188:function(e){"use strict";e.exports=Math.sign||function(e){return 0==(e=+e)||e!=e?e:e<0?-1:1}},63785:function(e,t,n){"use strict";var r,o,i,a,u,c,s,l,f=n(179),d=n(8740).f,p=n(3350).set,h=n(13745),v=n(59137),m=n(23043),g=f.MutationObserver||f.WebKitMutationObserver,y=f.document,b=f.process,_=f.Promise,w=d(f,"queueMicrotask"),x=w&&w.value;x||(r=function(){var e,t;for(m&&(e=b.domain)&&e.exit();o;){t=o.fn,o=o.next;try{t()}catch(n){throw o?a():i=undefined,n}}i=undefined,e&&e.enter()},h||m||v||!g||!y?_&&_.resolve?(s=_.resolve(undefined),l=s.then,a=function(){l.call(s,r)}):a=m?function(){b.nextTick(r)}:function(){p.call(f,r)}:(u=!0,c=y.createTextNode(""),new g(r).observe(c,{characterData:!0}),a=function(){c.data=u=!u})),e.exports=x||function(e){var t={fn:e,next:undefined};i&&(i.next=t),o||(o=t,a()),i=t}},23287:function(e,t,n){"use strict";var r=n(179);e.exports=r.Promise},72974:function(e,t,n){"use strict";var r=n(23043),o=n(32728),i=n(84921);e.exports=!!Object.getOwnPropertySymbols&&!i((function(){return!Symbol.sham&&(r?38===o:o>37&&o<41)}))},2900:function(e,t,n){"use strict";var r=n(179),o=n(1306),i=r.WeakMap;e.exports="function"==typeof i&&/native code/.test(o(i))},15115:function(e,t,n){"use strict";var r=n(13686),o=function(e){var t,n;this.promise=new e((function(e,r){if(t!==undefined||n!==undefined)throw TypeError("Bad Promise constructor");t=e,n=r})),this.resolve=r(t),this.reject=r(n)};e.exports.f=function(e){return new o(e)}},42386:function(e,t,n){"use strict";var r=n(45025);e.exports=function(e){if(r(e))throw TypeError("The method doesn't accept regular expressions");return e}},87419:function(e,t,n){"use strict";var r=n(179).isFinite;e.exports=Number.isFinite||function(e){return"number"==typeof e&&r(e)}},86710:function(e,t,n){"use strict";var r=n(179),o=n(20017).trim,i=n(65094),a=r.parseFloat,u=1/a(i+"-0")!=-Infinity;e.exports=u?function(e){var t=o(String(e)),n=a(t);return 0===n&&"-"==t.charAt(0)?-0:n}:a},42619:function(e,t,n){"use strict";var r=n(179),o=n(20017).trim,i=n(65094),a=r.parseInt,u=/^[+-]?0[Xx]/,c=8!==a(i+"08")||22!==a(i+"0x16");e.exports=c?function(e,t){var n=o(String(e));return a(n,t>>>0||(u.test(n)?16:10))}:a},18174:function(e,t,n){"use strict";var r=n(67738),o=n(84921),i=n(75224),a=n(32645),u=n(32163),c=n(6289),s=n(46317),l=Object.assign,f=Object.defineProperty;e.exports=!l||o((function(){if(r&&1!==l({b:1},l(f({},"a",{enumerable:!0,get:function(){f(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var e={},t={},n=Symbol(),o="abcdefghijklmnopqrst";return e[n]=7,o.split("").forEach((function(e){t[e]=e})),7!=l({},e)[n]||i(l({},t)).join("")!=o}))?function(e,t){for(var n=c(e),o=arguments.length,l=1,f=a.f,d=u.f;o>l;)for(var p,h=s(arguments[l++]),v=f?i(h).concat(f(h)):i(h),m=v.length,g=0;m>g;)p=v[g++],r&&!d.call(h,p)||(n[p]=h[p]);return n}:l},96093:function(e,t,n){"use strict";var r,o=n(14860),i=n(79227),a=n(89807),u=n(58825),c=n(55780),s=n(27383),l=n(6839),f=l("IE_PROTO"),d=function(){},p=function(e){return"