diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index 736daff97b7..d4859f148a1 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -450,10 +450,10 @@ Define for getting a bitfield of adjacent turfs that meet a condition. // Z-controller stuff - see basic.dm to see why the fuck this is the way it is. -#define IS_VALID_ZINDEX(z) !((z) > world.maxz || z > 17 || z < 2) +#define IS_VALID_ZINDEX(z) !((z) > world.maxz || (z) > 17) -#define HAS_ABOVE(z) (IS_VALID_ZINDEX(z) && z_levels & (1 << (z - 1))) -#define HAS_BELOW(z) (IS_VALID_ZINDEX(z) && z_levels & (1 << (z - 2))) +#define HAS_ABOVE(z) (IS_VALID_ZINDEX(z) && SSatlas.z_levels & (1 << (z - 1))) +#define HAS_BELOW(z) (IS_VALID_ZINDEX(z) && (z) != 1 && SSatlas.z_levels & (1 << (z - 2))) #define GET_ABOVE(A) (HAS_ABOVE(A:z) ? get_step(A, UP) : null) #define GET_BELOW(A) (HAS_BELOW(A:z) ? get_step(A, DOWN) : null) diff --git a/code/controllers/subsystems/garbage-debug.dm b/code/controllers/subsystems/garbage-debug.dm index cfe1a429159..31e266c194a 100644 --- a/code/controllers/subsystems/garbage-debug.dm +++ b/code/controllers/subsystems/garbage-debug.dm @@ -800,7 +800,6 @@ SearchVar(ntnet_card_uid) SearchVar(ntnet_global) SearchVar(ntnrc_uid) - SearchVar(z_levels) SearchVar(BLOOD_VOLUME_SAFE) SearchVar(BLOOD_VOLUME_OKAY) SearchVar(BLOOD_VOLUME_BAD) diff --git a/code/controllers/subsystems/initialization/atlas.dm b/code/controllers/subsystems/initialization/atlas.dm index 77aa5a5eb5b..cad6afc0a35 100644 --- a/code/controllers/subsystems/initialization/atlas.dm +++ b/code/controllers/subsystems/initialization/atlas.dm @@ -18,6 +18,10 @@ var/datum/controller/subsystem/atlas/SSatlas var/list/spawn_locations = list() var/list/connected_z_cache = list() + var/z_levels = 0 // Each bit represents a connection between adjacent levels. So the first bit means levels 1 and 2 are connected. + +/datum/controller/subsystem/atlas/stat_entry() + ..("W:{X:[world.maxx] Y:[world.maxy] Z:[world.maxz]} ZL:[z_levels]") /datum/controller/subsystem/atlas/New() NEW_SS_GLOBAL(SSatlas) @@ -112,6 +116,7 @@ var/datum/controller/subsystem/atlas/SSatlas /datum/controller/subsystem/atlas/proc/setup_multiz() for (var/thing in height_markers) var/obj/effect/landmark/map_data/marker = thing + log_debug("atlas: setting up Z marker on level [marker.z] with height [marker.height].") marker.setup() connected_z_cache.Cut() diff --git a/code/controllers/subsystems/zcopy.dm b/code/controllers/subsystems/zcopy.dm index d42617a2e39..c6ff0fe7e58 100644 --- a/code/controllers/subsystems/zcopy.dm +++ b/code/controllers/subsystems/zcopy.dm @@ -13,9 +13,9 @@ flags = SS_FIRE_IN_LOBBY var/list/queued_turfs = list() - var/list/qt_idex = 1 + var/qt_idex = 1 var/list/queued_overlays = list() - var/list/qo_idex = 1 + var/qo_idex = 1 var/list/openspace_overlays = list() var/list/openspace_turfs = list() diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index 67c22e41219..a075e2a6681 100644 --- a/code/game/jobs/access_datum.dm +++ b/code/game/jobs/access_datum.dm @@ -407,6 +407,12 @@ desc = "Weaponry Permission" region = ACCESS_REGION_SECURITY +var/const/access_journalist = 70//journalist's office access +/datum/access/journalist + id = access_journalist + desc = "Journalist Office" + region = ACCESS_REGION_GENERAL + /****************** * Central Command * ******************/ @@ -470,12 +476,6 @@ desc = "Merchant Access" access_type = ACCESS_TYPE_CENTCOM -var/const/access_journalist = 111//journalist's office access -/datum/access/journalist - id = access_journalist - desc = "Journalist Access" - access_type = ACCESS_REGION_GENERAL - /*************** * Antag access * ***************/ diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 47428e8bc01..82e3e2bddb0 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -78,12 +78,12 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_chapel_office, access_library, access_research, access_mining, access_mining_station, access_janitor, - access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons) + access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_journalist) minimal_access = list(access_sec_doors, access_medical, access_engine, access_change_ids, access_eva, access_heads, access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_chapel_office, access_library, access_research, access_mining, access_mining_station, access_janitor, - access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons) + access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_journalist) equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 7009e5b34fb..02f3fb54e92 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -105,7 +105,7 @@ var/list/civilian_positions = list( "Chef", "Janitor", "Librarian", - "Journalist", + "Corporate Reporter", "Chaplain", "Assistant" ) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 929cc89ab40..cfd6fe2f883 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -453,7 +453,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.updateUsrDialog() else if(href_list["set_new_message"]) - src.msg = pencode2html(sanitize(input(usr, "Write your Feed story", "Network Channel Handler", "") as message, encode = 0, trim = 0, extra = 0)) + src.msg = pencode2html(sanitize(input(usr, "Write your Feed story", "Network Channel Handler", "") as message, max_length = MAX_BOOK_MESSAGE_LEN, encode = 0, trim = 0, extra = 0)) src.updateUsrDialog() else if(href_list["set_attachment"]) @@ -469,7 +469,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.screen=6 else if(paper_data) - src.msg += "
Attachment Name: [paper_name]
Attachment:
[paper_data]
" + src.msg += "
Attachment Name: [paper_name]
Attachment:
[paper_data]
" var/image = photo_data ? photo_data.photo : null feedback_inc("newscaster_stories",1) var/datum/feed_channel/ch = SSnews.GetFeedChannel(src.channel_name) diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 33d8119f83a..b21555d96cc 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -438,7 +438,9 @@ /obj/item/seeds/towermycelium = 3, /obj/item/seeds/watermelonseed = 3, /obj/item/seeds/wheatseed = 3, - /obj/item/seeds/whitebeetseed = 3 + /obj/item/seeds/whitebeetseed = 3, + /obj/item/seeds/earthenroot = 2, + /obj/item/seeds/nifberries = 2 ) contraband = list( /obj/item/seeds/amanitamycelium = 3, @@ -486,7 +488,9 @@ /obj/item/seeds/towermycelium = 20, /obj/item/seeds/watermelonseed = 30, /obj/item/seeds/wheatseed = 20, - /obj/item/seeds/whitebeetseed = 20 + /obj/item/seeds/whitebeetseed = 20, + /obj/item/seeds/earthenroot = 70, + /obj/item/seeds/nifberries = 70 ) restock_items = 1 diff --git a/code/game/objects/items/airbubble.dm b/code/game/objects/items/airbubble.dm index 4ddbb6be8e7..8ce326b4a10 100644 --- a/code/game/objects/items/airbubble.dm +++ b/code/game/objects/items/airbubble.dm @@ -37,7 +37,8 @@ else R = new /obj/structure/closet/airbubble(user.loc) if(!used) - internal_tank = new /obj/item/weapon/tank/emergency_oxygen/double(src) + internal_tank = new /obj/item/weapon/tank/emergency_oxygen/engi(src) + internal_tank.air_contents.adjust_gas("oxygen", (42*ONE_ATMOSPHERE)/(R_IDEAL_GAS_EQUATION*T20C)) R.internal_tank = internal_tank if(!isnull(internal_tank)) internal_tank.forceMove(R) @@ -82,7 +83,7 @@ return 0 return 1 -/obj/structure/closet/airbubble/can_close() +/obj/structure/closet/airbubble/can_close(mob/user as mob) if(zipped) return 0 var/turf/T = get_turf(src) @@ -93,7 +94,7 @@ for(var/mob/living/M in T) mob_num += 1 if(mob_num > 1) - user << "[src] can only fit one person." + to_chat(user, "[src] can only fit one person.") return 0 return 1 @@ -125,7 +126,7 @@ /obj/structure/closet/airbubble/toggle(mob/user as mob) if(!(opened ? close(user) : open(user))) - user << "It won't budge!" + to_chat(user, "It won't budge!") return update_icon() return 1 @@ -139,9 +140,6 @@ dump_contents() - if(!do_after(user, 0.35 SECONDS, act_target = src)) - return - icon_state = icon_opened opened = 1 playsound(loc, open_sound, 15, 1, -3) @@ -151,14 +149,11 @@ /obj/structure/closet/airbubble/close(mob/user as mob) if(!opened) return 0 - if(!can_close()) + if(!can_close(user)) return 0 var/stored_units = 0 - if(!do_after(user, 0.35 SECONDS, act_target = src)) - return - if(store_misc) stored_units += store_misc(stored_units) if(store_items) @@ -274,6 +269,12 @@ var/datum/gas_mixture/t_air = get_turf_air() t_air.merge(inside_air) +// When we shoot bubble, make it rip. +/obj/structure/closet/airbubble/bullet_act(var/obj/item/projectile/Proj) + ..() + ripped = TRUE + update_icon() + // Change valve on internal tank /obj/structure/closet/airbubble/verb/set_internals() set src in oview(1) @@ -296,7 +297,7 @@ START_PROCESSING(SSfast_process, src) use_internal_tank = !use_internal_tank else - usr << "[src] has no internal tank." + to_chat(usr, "[src] has no internal tank.") // Remove tank from bubble /obj/structure/closet/airbubble/verb/take_tank() @@ -321,7 +322,7 @@ update_icon() STOP_PROCESSING(SSfast_process, src) else - usr << "[src] already has no tank." + to_chat(user, "[src] already has no tank.") // Handle most of things: restraining, cutting restrains, attaching tank. /obj/structure/closet/airbubble/attackby(W as obj, mob/user as mob) @@ -345,7 +346,7 @@ START_PROCESSING(SSfast_process, src) return else - user << "[src] already has a tank attached." + to_chat(user, "[src] already has a tank attached.") if(opened) if(istype(W, /obj/item/weapon/grab)) var/obj/item/weapon/grab/G = W @@ -357,6 +358,9 @@ return user.drop_item() else if(istype(W, /obj/item/weapon/handcuffs/cable)) + if(zipped) + to_chat(user, "[src]'s zipper is already restrained.") + return user.visible_message( "[user] begins putting cable restrains on zipper of [src].", "You begin putting cable restrains on zipper of [src]." @@ -374,6 +378,10 @@ qdel(W) update_icon() else if(istype(W, /obj/item/weapon/wirecutters)) + if(!zipped) + to_chat(user, "[src] has no cables to cut.") + attack_hand(user) + return user.visible_message( "[user] begins cutting cable restrains on zipper of [src].", "You begin cutting cable restrains on zipper of [src]." diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index b59edddc0bc..394fd2d69da 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -412,7 +412,7 @@ BREATH ANALYZER /obj/item/device/breath_analyzer/attack(mob/living/carbon/human/H, mob/living/user as mob) if (!istype(H)) - to_chat(user,"You can't find a way to use the [src] on [H]!") + to_chat(user,"You can't find a way to use \the [src] on [H]!") return if ( ((CLUMSY in user.mutations) || (DUMB in user.mutations)) && prob(20)) @@ -433,7 +433,7 @@ BREATH ANALYZER user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) user.do_attack_animation(H) - user.visible_message("[user] is trying to take a breath sample from [H].","You gently insert the [src] into [H]'s mouth.") + user.visible_message("[user] is trying to take a breath sample from [H].","You gently insert \the [src] into [H]'s mouth.") if (!LAZYLEN(src.other_DNA)) LAZYADD(src.other_DNA, H.dna.unique_enzymes) @@ -443,7 +443,7 @@ BREATH ANALYZER to_chat(user,"You and the target need to be standing still in order to take a breath sample.") return - user.visible_message("[user] takes a breath sample from [H].","The [src] clicks as it finishes reading [H]'s breath sample.") + user.visible_message("[user] takes a breath sample from [H].","\The [src] clicks as it finishes reading [H]'s breath sample.") to_chat(user,"Breath Sample Results:") diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 7a971aa7978..f91f442b667 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -161,7 +161,7 @@ return var/mob/living/carbon/human/H = M - if (!H.species || !isipc(H) || !H.organs_by_name["groin"]) + if (!H.species || !isipc(H) || !H.organs_by_name["head"]) user << "You cannot use this on a non-synthetic organism!" return @@ -178,9 +178,9 @@ user.show_message("You implanted the implant into [M].") - ipc_tag.replaced(H, H.organs_by_name["groin"]) - - qdel(ipc_tag) + ipc_tag.replaced(H, H.organs_by_name["head"]) + + ipc_tag = null update() diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm index 08f8a1b94d3..392511ad9a6 100644 --- a/code/game/objects/structures/coathanger.dm +++ b/code/game/objects/structures/coathanger.dm @@ -21,7 +21,7 @@ coat = null update_icon() -/obj/structure/coatrack/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/coatrack/attackby(obj/item/W as obj, mob/user as mob) var/can_hang = 0 if(is_type_in_list(W, allowed)) can_hang = 1 @@ -51,4 +51,9 @@ /obj/structure/coatrack/update_icon() cut_overlays() if (coat) + if(istype(coat, /obj/item/clothing/suit/storage/toggle)) + var/obj/item/clothing/suit/storage/toggle/T = coat + if(T.icon_state == T.icon_open) // avoid icon conflicts + T.icon_state = T.icon_closed + T.item_state = T.icon_closed add_overlay("coat_[coat.icon_state]") diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index db5d352053a..c5ac1c50308 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -125,8 +125,8 @@ return else user.put_in_hands(stored_item) - stored_item = null to_chat(user,"You take \the [stored_item] from [src].") + stored_item = null return /obj/structure/flora/pottedplant/bullet_act(var/obj/item/projectile/Proj) diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm index 5c17ace5452..53ece07aad9 100644 --- a/code/game/turfs/flooring/flooring_decals.dm +++ b/code/game/turfs/flooring/flooring_decals.dm @@ -21,6 +21,8 @@ if(!T.decals) T.decals = list() T.decals |= floor_decals[cache_key] T.add_overlay(floor_decals[cache_key]) + if(desc) + T.desc += "
There is \a [src] on it with the following inscription:
[desc]" qdel(src) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 7911191e0eb..9f999a8f869 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -37,6 +37,9 @@ if (!mapload) make_plating(defer_icon_update = 1) flooring = newflooring + //Set the initial strings + name = flooring.name + desc = flooring.desc if (mapload) queue_icon_update() else diff --git a/code/game/turfs/simulated/floor_icon.dm b/code/game/turfs/simulated/floor_icon.dm index 241dd5aa80b..0aaff48a367 100644 --- a/code/game/turfs/simulated/floor_icon.dm +++ b/code/game/turfs/simulated/floor_icon.dm @@ -7,9 +7,7 @@ var/list/to_add = list() if(flooring) - // Set initial icon and strings. - name = flooring.name - desc = flooring.desc + // Set initial icon. icon = flooring.icon if(flooring_override) diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index e0efabaa8a9..2760d34625a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -177,7 +177,7 @@ gear_tweaks += new/datum/gear_tweak/path(surgical) /datum/gear/head/headbando - display_name = "Basic Headband" + display_name = "basic headband" path = /obj/item/clothing/head/headbando /datum/gear/head/headbando/New() diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 751b99dd0dc..2506e374def 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -507,7 +507,7 @@ BLIND // can't see anything //from verkister /obj/item/clothing/glasses/spiffygogs - name = "Orange Goggles" + name = "orange goggles" desc = "You can almost feel the raw power radiating off these strange specs." icon_state = "spiffygogs" item_state = "spiffygogs" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 4b2dc148de8..9d141377d32 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -29,6 +29,8 @@ if(contained_sprite) tmp_icon_state = "[tmp_icon_state]" inv_overlay = image("icon" = icon, "icon_state" = "[tmp_icon_state]_w", dir = SOUTH) + if(color) + inv_overlay.color = color return inv_overlay /obj/item/clothing/accessory/proc/get_mob_overlay() @@ -43,6 +45,8 @@ mob_overlay = image("icon" = icon, "icon_state" = "[tmp_icon_state]") else mob_overlay = image("icon" = INV_ACCESSORIES_DEF_ICON, "icon_state" = "[tmp_icon_state]") + if(color) + mob_overlay.color = color return mob_overlay //when user attached an accessory to S diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index 5033cfcdad4..9cbd4852480 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -111,14 +111,15 @@ new /obj/item/weapon/material/hatchet/unathiknife(hold) /obj/item/clothing/accessory/storage/bayonet - name = "bayonet sheat" - desc = "A leather sheat designated to hold a bayonet." + name = "bayonet sheath" + desc = "A leather sheath designated to hold a bayonet." icon_state = "holster_machete" slots = 1 /obj/item/clothing/accessory/storage/bayonet/Initialize() . = ..() - hold.max_storage_space = 2 + hold.max_storage_space = 4 + hold.max_w_class = 3 hold.can_hold = list( /obj/item/weapon/material/knife/bayonet ) diff --git a/code/modules/custom_ka/barrels.dm b/code/modules/custom_ka/barrels.dm index 703f2dc9e1f..e11fe8255fa 100644 --- a/code/modules/custom_ka/barrels.dm +++ b/code/modules/custom_ka/barrels.dm @@ -1,18 +1,18 @@ /obj/item/custom_ka_upgrade/barrels/barrel01 name = "standard core KA power converter" build_name = "'Standard'" - desc = "A very standard kinetic accelerator energy converter and barrel assembly. Has poor range, but gets the job done." + desc = "A very standard kinetic accelerator energy converter and barrel assembly. Has poor range and firerate, but gets the job done." icon_state = "barrel01" - damage_increase = 10 - firedelay_increase = 0.75 SECONDS - range_increase = 2 + damage_increase = 15 + firedelay_increase = 1 SECONDS + range_increase = 3 recoil_increase = 2 cost_increase = 1 cell_increase = 0 capacity_increase = -1 fire_sound = 'sound/weapons/Kenetic_accel.ogg' projectile_type = /obj/item/projectile/kinetic - origin_tech = list(TECH_MATERIAL = 2,TECH_ENGINEERING = 2,TECH_MAGNET = 2) + origin_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 1, TECH_PHORON = 2) /obj/item/custom_ka_upgrade/barrels/barrel02 name = "professional core KA power converter" @@ -20,15 +20,15 @@ desc = "A more advanced kinetic accelerator energy converter and barrel assembly intended for professional miners out on the rock." icon_state = "barrel02" damage_increase = 15 - firedelay_increase = 0.75 SECONDS - range_increase = 3 + firedelay_increase = 0.5 SECONDS + range_increase = 4 recoil_increase = 3 cost_increase = 1 cell_increase = 0 capacity_increase = -2 fire_sound = 'sound/weapons/Kenetic_accel.ogg' projectile_type = /obj/item/projectile/kinetic - origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3,TECH_MAGNET = 3) + origin_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 3, TECH_PHORON = 2) /obj/item/custom_ka_upgrade/barrels/barrel03 name = "meteor core KA power converter" @@ -37,14 +37,14 @@ icon_state = "barrel03" damage_increase = 20 firedelay_increase = 0.75 SECONDS - range_increase = 4 + range_increase = 5 recoil_increase = 4 cost_increase = 2 cell_increase = 0 capacity_increase = -3 fire_sound = 'sound/weapons/resonator_fire.ogg' projectile_type = /obj/item/projectile/kinetic - origin_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 4,TECH_MAGNET = 4) + origin_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 3,TECH_MAGNET = 3, TECH_PHORON = 3) /obj/item/custom_ka_upgrade/barrels/barrel04 @@ -54,14 +54,14 @@ icon_state = "barrel04" damage_increase = 25 firedelay_increase = 1 SECONDS - range_increase = 5 + range_increase = 6 recoil_increase = 6 cost_increase = 5 cell_increase = 0 capacity_increase = -4 fire_sound = 'sound/weapons/pulse.ogg' projectile_type = /obj/item/projectile/kinetic - origin_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 5,TECH_MAGNET = 5) + origin_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 3,TECH_MAGNET = 5, TECH_PHORON = 4) /obj/item/custom_ka_upgrade/barrels/barrel05 name = "experimental core KA power converter" @@ -70,14 +70,14 @@ icon_state = "barrel05" damage_increase = 30 firedelay_increase = 1 SECONDS - range_increase = 6 + range_increase = 7 recoil_increase = 10 cost_increase = 10 cell_increase = 0 capacity_increase = -5 fire_sound = 'sound/weapons/resonator_blast.ogg' projectile_type = /obj/item/projectile/kinetic - origin_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 6,TECH_MAGNET = 6) + origin_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 5,TECH_MAGNET = 6, TECH_PHORON = 5) /obj/item/custom_ka_upgrade/barrels/illegal name = "laser KA power converter" @@ -87,8 +87,8 @@ damage_increase = 15 firedelay_increase = 1.5 SECONDS range_increase = 64 - recoil_increase = 6 - cost_increase = 4 + recoil_increase = 0 + cost_increase = 10 cell_increase = 0 capacity_increase = 0 fire_sound = 'sound/weapons/lasercannonfire.ogg' diff --git a/code/modules/custom_ka/cells.dm b/code/modules/custom_ka/cells.dm index 2a459506892..a266df48aa2 100644 --- a/code/modules/custom_ka/cells.dm +++ b/code/modules/custom_ka/cells.dm @@ -21,49 +21,46 @@ /obj/item/custom_ka_upgrade/cells/cell01 //Pump Action - name = "pump action KA cell" - build_name = "pump-action" - desc = "A very basic power cell and pump action combo that stores a single charge. A pump is required after each shot, however it deals increased damage and has increased range." + name = "pump recharging KA cell" + build_name = "pump-recharging" + desc = "A very basic power cell and pump action combo that stores 4 charges. Low capacity however it has slightly increased range." icon_state = "cell01" - damage_increase = 5 firedelay_increase = 0.25 SECONDS - range_increase = 3 - recoil_increase = -1 - cost_increase = -100 //Always have a single charge - cell_increase = 1 + range_increase = 2 + recoil_increase = -3 + cell_increase = 4 capacity_increase = -1 mod_limit_increase = 0 pump_restore = 1 pump_delay = 0.4 SECONDS - origin_tech = list(TECH_MATERIAL = 2,TECH_ENGINEERING = 2,TECH_MAGNET = 2,TECH_POWER = 2) + origin_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 1,TECH_POWER = 1) /obj/item/custom_ka_upgrade/cells/cell02 //Pump Action - name = "pump recharging KA cell" + name = "advanced pump recharging KA cell" build_name = "pump-recharging" - desc = "A somewhat more advanced, standard issue pump and cell assembly that allows the user to 'pre-pump' their charges, up to a capacity of 12. Can fire quite quickly." + desc = "A somewhat more advanced, standard issue pump and cell assembly that stores charges up to a capacity of 12. Can fire and pump quite quickly." icon_state = "cell02" - firedelay_increase = 0 + firedelay_increase = 0.1 SECONDS recoil_increase = 1 cell_increase = 12 capacity_increase = -2 mod_limit_increase = 0 pump_restore = 1 - pump_delay = 0.5 SECONDS + pump_delay = 0.3 SECONDS - origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3,TECH_MAGNET = 3,TECH_POWER = 3) + origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 1,TECH_MAGNET = 1,TECH_POWER = 3) /obj/item/custom_ka_upgrade/cells/cell03 name = "kinetic charging KA cell" - build_name = "kinetic-reloading" - desc = "A complex pump and cell assembly that uses the kinetic energy of an initial pump to significantly charge the cell. Deals increased damage at the cost of severely increased recoil and reduced firerate." + build_name = "kinetic" + desc = "A complex pump and cell assembly that uses the kinetic energy of an initial pump to significantly charge the cell. Deals increased damage at the cost of reduced firerate." icon_state = "cell03" damage_increase = 10 firedelay_increase = 0.5 SECONDS - recoil_increase = 4 cost_increase = -1 cell_increase = 40 capacity_increase = -3 @@ -72,13 +69,14 @@ pump_restore = 40 pump_delay = 1 SECONDS - origin_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 4,TECH_MAGNET = 4,TECH_POWER = 4) + origin_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 3,TECH_MAGNET = 2,TECH_POWER = 3) /obj/item/custom_ka_upgrade/cells/cell04 name = "uranium charging KA cell" build_name = "recharging" desc = "A pumpless cell assembly that containes a miniaturized nuclear reactor housed safely inside the assembly. Recharges the cell shortly over time, however deals slightly reduced damage." icon_state = "cell04" + firedelay_increase = 0.1 SECONDS damage_increase = -5 recoil_increase = 0 cost_increase = 0 @@ -89,7 +87,7 @@ pump_restore = 0 pump_delay = 0 - origin_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 5,TECH_MAGNET = 5,TECH_POWER = 5) + origin_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 4,TECH_MAGNET = 3,TECH_POWER = 5) /obj/item/custom_ka_upgrade/cells/cell04/on_update(var/obj/item/weapon/gun/custom_ka/the_gun) stored_charge = min(stored_charge + 3,cell_increase) @@ -110,7 +108,7 @@ pump_restore = 5 pump_delay = 0.5 SECONDS - origin_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 6,TECH_MAGNET = 6,TECH_POWER = 6) + origin_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 6,TECH_MAGNET = 5,TECH_POWER = 5, TECH_PHORON = 5) /obj/item/custom_ka_upgrade/cells/cell05/on_fire(var/obj/item/weapon/gun/custom_ka/the_gun) if(the_gun.recoil_increase > 0) @@ -132,7 +130,7 @@ pump_restore = 0 pump_delay = 0 - origin_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 5,TECH_MAGNET = 5,TECH_POWER = 5) + origin_tech = list() /obj/item/custom_ka_upgrade/cells/cyborg/on_update(var/obj/item/weapon/gun/custom_ka/the_gun) var/mob/living/silicon/robot/owner_robot = the_gun.loc @@ -147,18 +145,18 @@ /obj/item/custom_ka_upgrade/cells/illegal //Pump Action name = "pump action KA cell" - build_name = "static" - desc = "A clusterfuck of circuitry and battery parts all snuggly fit inside a solid, static plastisteel frame." + build_name = "pump-action" + desc = "A clusterfuck of circuitry and battery parts all snuggly fit inside a solid, static plastisteel frame. A single pump is enough for any shot of any weapon." icon_state = "cell_illegal" firedelay_increase = 0 recoil_increase = 0 - cost_increase = 0 - stored_charge = 20 - cell_increase = 20 + cost_increase = -100 + stored_charge = 1 + cell_increase = 1 capacity_increase = 0 mod_limit_increase = 0 - pump_restore = 20 - pump_delay = 0.5 SECONDS + pump_restore = 1 + pump_delay = 0.3 SECONDS origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3,TECH_MAGNET = 3,TECH_POWER = 3, TECH_ILLEGAL = 4) \ No newline at end of file diff --git a/code/modules/custom_ka/frames.dm b/code/modules/custom_ka/frames.dm index b3267c7349f..1438407d239 100644 --- a/code/modules/custom_ka/frames.dm +++ b/code/modules/custom_ka/frames.dm @@ -5,7 +5,7 @@ w_class = 3 capacity_increase = 3 mod_limit_increase = 2 - origin_tech = list(TECH_MATERIAL = 2,TECH_ENGINEERING = 2) + origin_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1) slot_flags = SLOT_BELT /obj/item/weapon/gun/custom_ka/frame02 @@ -16,7 +16,7 @@ recoil_increase = -1 capacity_increase = 5 mod_limit_increase = 3 - origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3) + origin_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 3) /obj/item/weapon/gun/custom_ka/frame03 name = "medium kinetic accelerator frame" @@ -26,7 +26,7 @@ recoil_increase = -2 capacity_increase = 7 mod_limit_increase = 4 - origin_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 4) + origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3) /obj/item/weapon/gun/custom_ka/frame04 name = "heavy kinetic accelerator frame" @@ -36,7 +36,7 @@ recoil_increase = -5 capacity_increase = 9 mod_limit_increase = 5 - origin_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 5) + origin_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 5) /obj/item/weapon/gun/custom_ka/frame05 name = "tactical kinetic accelerator frame" diff --git a/code/modules/custom_ka/upgrade_chips.dm b/code/modules/custom_ka/upgrade_chips.dm index 979333ae413..82a8cf33272 100644 --- a/code/modules/custom_ka/upgrade_chips.dm +++ b/code/modules/custom_ka/upgrade_chips.dm @@ -1,6 +1,6 @@ /obj/item/custom_ka_upgrade/upgrade_chips/damage name = "upgrade chip - damage increase" - desc = "Increases damage and recoil." + desc = "Increases damage and recoil, reduces accuracy." icon_state = "upgrade_chip" damage_increase = 10 recoil_increase = 3 @@ -54,7 +54,6 @@ name = "illegal custom KA upgrade chip" desc = "Overrides safety settings for a custom kinetic accelerator. What's the worst that could happen?" icon_state = "upgrade_chip_illegal" - damage_increase = 10 firedelay_increase = -0.5 SECONDS recoil_increase = 4 cost_increase = 1 diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 1644aa9d315..8ae167b47d4 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -2041,20 +2041,12 @@ obj/item/clothing/suit/storage/hooded/fluff/make_poncho //Raincoat Poncho - M.A. icon_state = "nikit_zippo" -/obj/item/clothing/under/dress/fluff/marwani_dress_front //Unathi Purple Dress - Ilaeza Marwani - burgerbb +/obj/item/clothing/suit/fluff/marwani_dress //Unathi Purple Dress - Ilaeza Marwani - burgerbb name = "unathi purple dress" - desc = "A strange purple dress designed to fit very tall female unathi, suitable for indoor wear in warmer climate. This is the front piece." + desc = "A strange purple dress designed to fit very tall female unathi, suitable for indoor wear in warmer climate. Attached to it is some sort of giant iron emblem." icon = 'icons/obj/custom_items/marwani_dress.dmi' - icon_state = "mar_front_dress" - item_state = "mar_front_dress" - contained_sprite = TRUE - -/obj/item/clothing/suit/fluff/marwani_dress_back //Unathi Purple Dress - Ilaeza Marwani - burgerbb - name = "unathi purple dress" - desc = "A strange purple dress designed to fit very tall female unathi, suitable for indoor wear in warmer climate. This is the back piece." - icon = 'icons/obj/custom_items/marwani_dress.dmi' - icon_state = "mar_back_dress" - item_state = "mar_back_dress" + icon_state = "mar_dress" + item_state = "mar_dress" contained_sprite = TRUE /obj/item/clothing/shoes/jackboots/unathi/fluff/marwani_shoes //Unathi Purple Boots - Ilaeza Marwani - burgerbb @@ -2073,14 +2065,6 @@ obj/item/clothing/suit/storage/hooded/fluff/make_poncho //Raincoat Poncho - M.A. item_state = "mar_gloves" contained_sprite = TRUE -/obj/item/clothing/accessory/fluff/marwani_armor //Clan Marwani Emblem - Ilaeza Marwani - burgerbb - name = "clan marwani armor" - desc = "A large, decorative iron and brass alloyed breastplate signifying the industrial strength of Clan Marwani." - icon = 'icons/obj/custom_items/marwani_dress.dmi' - icon_state = "mar_emblem" - item_state = "mar_emblem" - contained_sprite = TRUE - /obj/item/weapon/deck/tarot/fluff/klavdiya_cards //Adhomian Divination Cards Deck - Klavdiya Tikhomirov - alberyk name = "adhomian divination cards deck" diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 349ae9cae3c..ade79edff93 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -125,7 +125,7 @@ var/author = query_books.item[1] var/title = query_books.item[2] var/content = query_books.item[3] - var/obj/item/weapon/book/B = new(src.loc) + var/obj/item/weapon/book/B = new(src) B.name = "Book: [title]" B.title = title B.author = author diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm index b2c2e2dff27..55719d792c1 100644 --- a/code/modules/materials/material_recipes.dm +++ b/code/modules/materials/material_recipes.dm @@ -8,7 +8,6 @@ // If is_brittle() returns true, these are only good for a single strike. recipes += new/datum/stack_recipe("[display_name] baseball bat", /obj/item/weapon/material/twohanded/baseballbat, 10, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]") - recipes += new/datum/stack_recipe("[display_name] ashtray", /obj/item/weapon/material/ashtray, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]") recipes += new/datum/stack_recipe("[display_name] spoon", /obj/item/weapon/material/kitchen/utensil/spoon/plastic, 1, on_floor = 1, supplied_material = "[name]") recipes += new/datum/stack_recipe("[display_name] ring", /obj/item/clothing/ring/material, 1, on_floor = 1, supplied_material = "[name]") recipes += new/datum/stack_recipe("[display_name] armor plate", /obj/item/weapon/material/armor_plating, 3, time = 20, on_floor = 1, supplied_material = "[name]") @@ -19,7 +18,8 @@ recipes += new/datum/stack_recipe("[display_name] stool", /obj/item/weapon/stool, one_per_turf = 1, on_floor = 1, supplied_material = "[name]") recipes += new/datum/stack_recipe("[display_name] chair", /obj/structure/bed/chair, one_per_turf = 1, on_floor = 1, supplied_material = "[name]") recipes += new/datum/stack_recipe("[display_name] bed", /obj/structure/bed, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]") - + if(hardness>=10) + recipes += new/datum/stack_recipe("[display_name] ashtray", /obj/item/weapon/material/ashtray, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]") if(hardness>50) recipes += new/datum/stack_recipe("[display_name] fork", /obj/item/weapon/material/kitchen/utensil/fork/plastic, 1, on_floor = 1, supplied_material = "[name]") recipes += new/datum/stack_recipe("[display_name] knife", /obj/item/weapon/material/kitchen/utensil/knife/plastic, 1, on_floor = 1, supplied_material = "[name]") diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 4af9cf457bc..45d77b2de04 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -136,8 +136,11 @@ var/global/list/minevendor_list = list( //keep in order of price if(istype(inserted_id)) if(href_list["choice"] == "eject") inserted_id.loc = loc - if(!usr.get_active_hand()) - usr.put_in_hands(inserted_id) + if(ishuman(usr)) + if(!usr.get_active_hand()) + usr.put_in_hands(inserted_id) + else + inserted_id.forceMove(get_turf(src)) inserted_id = null else if(href_list["choice"] == "insert") var/obj/item/weapon/card/id/I = usr.get_active_hand() diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm index 5aa8d46f786..cbec439ebec 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -29,7 +29,9 @@ dat += "Maintenance Units
" for(var/mob/living/silicon/robot/drone/D in silicon_mob_list) - if(D.z != src.z) + if(src.z in current_map.station_levels && !(D.z in current_map.station_levels)) //If the console is on a station level, then list all drones on the station levels + continue + else if (!(src.z in current_map.station_levels) && src.z != D.z) //If the console is not on the station, only list drones on the current level continue dat += "
[D.real_name] ([D.stat == 2 ? "INACTIVE" : "ACTIVE"])" dat += "
Cell charge: [D.cell.charge]/[D.cell.maxcharge]." diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm b/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm index 5fcac67d5a3..e0e1ba6b92f 100644 --- a/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm +++ b/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm @@ -10,6 +10,7 @@ var/mob/master = null //undisputed master. Their commands hold ultimate sway and ultimate power. var/list/allowed_targets = list() //WHO CAN I KILL D: var/retribution = 1 //whether or not they will attack us if we attack them like some kinda dick. + var/list/sad_emote = list("whimpers") /mob/living/simple_animal/hostile/commanded/Initialize() ..() @@ -55,7 +56,7 @@ var/mode = "specific" if(allowed_targets[1] == "everyone") //we have been given the golden gift of murdering everything. Except our master, of course. And our friends. So just mostly everyone. mode = "everyone" - for(var/atom/A in ListTargets(10)) + for(var/atom/A in targets) var/mob/M = null if(A == src) continue @@ -141,8 +142,7 @@ allowed_targets = list("everyone")//everyone? EVERYONE return 1 - var/list/targets = get_targets_by_name(text) - allowed_targets += targets + allowed_targets += get_targets_by_name(text) if(emote_hear && emote_hear.len) audible_emote("[pick(emote_hear)].",0) return targets.len != 0 @@ -190,6 +190,13 @@ /mob/living/simple_animal/hostile/commanded/hit_with_weapon(obj/item/O, mob/living/user, var/effective_force, var/hit_zone) //if they attack us, we want to kill them. None of that "you weren't given a command so free kill" bullshit. . = ..() + + // We forgive our master + if(user == master) + stance = HOSTILE_STANCE_IDLE + target_mob = null + audible_emote("[pick(sad_emote)].",0) + return if(!. && retribution) stance = HOSTILE_STANCE_ATTACK target_mob = user @@ -200,9 +207,57 @@ /mob/living/simple_animal/hostile/commanded/attack_hand(mob/living/carbon/human/M as mob) ..() + + // We forgive our master + if(M == master) + stance = HOSTILE_STANCE_IDLE + target_mob = null + if(M.a_intent == I_HURT) + audible_emote("[pick(sad_emote)].",0) + return + if(M.a_intent == I_HURT && retribution) //assume he wants to hurt us. + target_mob = M allowed_targets += M stance = HOSTILE_STANCE_ATTACK if(M in friends) friends -= M + +/mob/living/simple_animal/hostile/commanded/attack_generic(var/mob/user, var/damage, var/attack_message) + ..() + + // We forgive our master + if(user == master) + target_mob = null + stance = HOSTILE_STANCE_IDLE + audible_emote("[pick(sad_emote)].",0) + +/mob/living/simple_animal/hostile/commanded/bullet_act(var/obj/item/projectile/P, var/def_zone) + ..() + + // We forgive our master + if (ismob(P.firer) && P.firer == master) + target_mob = null + stance = HOSTILE_STANCE_IDLE + audible_emote("[pick(sad_emote)].",0) + +/mob/living/simple_animal/hostile/commanded/attackby(var/obj/item/O, var/mob/user) + ..() + + // We forgive our master + if(user == master) + target_mob = null + stance = HOSTILE_STANCE_IDLE + audible_emote("[pick(sad_emote)].",0) + +mob/living/simple_animal/hostile/commanded/hitby(atom/movable/AM as mob|obj,var/speed = THROWFORCE_SPEED_DIVISOR)//Standardization and logging -Sieve + ..() + + if(istype(AM,/obj/)) + var/obj/O = AM + if(ismob(O.thrower)) + if(O.thrower == master) + target_mob = null + stance = HOSTILE_STANCE_IDLE + audible_emote("[pick(sad_emote)].",0) diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm index af8c737a6aa..caf7f3737c1 100644 --- a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm +++ b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm @@ -21,6 +21,7 @@ speak = list("Woof!", "Bark!", "AUUUUUU!","AwooOOOoo!") speak_emote = list("barks", "woofs") emote_hear = list("barks", "woofs") + sad_emote = list("whines") attacktext = "bitten" attack_sound = 'sound/misc/dog_bark.ogg' @@ -42,16 +43,7 @@ var/name_changed = 0 -/mob/living/simple_animal/hostile/commanded/dog/hit_with_weapon(obj/item/O, mob/living/user, var/effective_force, var/hit_zone) - . = ..() - if(!.) - src.emote("barks!") - -/mob/living/simple_animal/hostile/commanded/dog/attack_hand(mob/living/carbon/human/M as mob) - ..() - if(M.a_intent == I_HURT) - src.emote("barks!") - + destroy_surroundings = FALSE /mob/living/simple_animal/hostile/commanded/dog/verb/befriend() set name = "Befriend Dog" diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm index 7baa4d31f70..2e521f099cb 100644 --- a/code/modules/modular_computers/computers/modular_computer/interaction.dm +++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm @@ -62,8 +62,10 @@ for(var/datum/computer_file/program/P in idle_threads) P.event_idremoved(1) - - user.put_in_hands(card_slot.stored_card) + if(ishuman(user)) + user.put_in_hands(card_slot.stored_card) + else + card_slot.stored_card.forceMove(get_turf(src)) card_slot.stored_card = null update_uis() to_chat(user, "You remove the card from \the [src]") @@ -88,7 +90,10 @@ to_chat(user, "There is no intellicard connected to \the [src].") return - user.put_in_hands(ai_slot.stored_card) + if(ishuman(user)) + user.put_in_hands(ai_slot.stored_card) + else + ai_slot.stored_card.forceMove(get_turf(src)) ai_slot.stored_card = null ai_slot.update_power_usage() update_uis() @@ -157,7 +162,7 @@ playsound(user, 'sound/items/Ratchet.ogg', 100, 1) if (do_after(user, 20)) new /obj/item/stack/material/steel(get_turf(src.loc), steel_sheet_cost) - src.visible_message("\The [user] disassembles \the [src].", + src.visible_message("\The [user] disassembles \the [src].", "You disassemble \the [src].", "You hear a ratchet.") qdel(src) diff --git a/code/modules/multiz/basic.dm b/code/modules/multiz/basic.dm index 284233a1c26..01c6ad5b13b 100644 --- a/code/modules/multiz/basic.dm +++ b/code/modules/multiz/basic.dm @@ -1,6 +1,5 @@ // If you add a more comprehensive system, just untick this file. // WARNING: Only works for up to 17 z-levels! -var/z_levels = 0 // Each bit represents a connection between adjacent levels. So the first bit means levels 1 and 2 are connected. // If the height is more than 1, we mark all contained levels as connected. /obj/effect/landmark/map_data/New() @@ -10,7 +9,7 @@ var/z_levels = 0 // Each bit represents a connection between adjacent levels. S ASSERT(height <= z) // Due to the offsets of how connections are stored v.s. how z-levels are indexed, some magic number silliness happened. for(var/i = (z - height) to (z - 2)) - z_levels |= (1 << i) + SSatlas.z_levels |= (1 << i) qdel(src) /obj/effect/landmark/map_data/Destroy() @@ -26,9 +25,13 @@ var/z_levels = 0 // Each bit represents a connection between adjacent levels. S // Thankfully, no bitwise magic is needed here. /proc/GetAbove(atom/A) + if (!A.z) + A = get_turf(A) return A ? GET_ABOVE(A) : null /proc/GetBelow(atom/A) + if (!A.z) + A = get_turf(A) return A ? GET_BELOW(A) : null /proc/GetConnectedZlevels(z) @@ -57,7 +60,11 @@ var/z_levels = 0 // Each bit represents a connection between adjacent levels. S return new_entry[zB] -/proc/get_zstep(ref, dir) +/proc/get_zstep(atom/ref, dir) + if (!isloc(ref)) + CRASH("Expected atom.") + if (!ref.z) + ref = get_turf(ref) switch (dir) if (UP) . = GET_ABOVE(ref) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 5e57c1ce380..506493e6174 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -340,7 +340,7 @@ transplant_data["blood_DNA"] = transplant_blood.data["blood_DNA"] owner = target - loc = owner + src.forceMove(owner) STOP_PROCESSING(SSprocessing, src) target.internal_organs |= src affected.internal_organs |= src diff --git a/code/modules/projectiles/guns/projectile/minigun.dm b/code/modules/projectiles/guns/projectile/minigun.dm index 55ed0439855..dbe4e0658a4 100644 --- a/code/modules/projectiles/guns/projectile/minigun.dm +++ b/code/modules/projectiles/guns/projectile/minigun.dm @@ -15,7 +15,7 @@ var/obj/item/ammo_magazine/ammo_magazine var/magazine_type = /obj/item/ammo_magazine/minigun -/obj/item/minigunpack/update_icon(var/mob/user) +/obj/item/minigunpack/update_icon() ..() if(armed) icon_state = "notholstered" @@ -23,7 +23,6 @@ else icon_state = "holstered" item_state = "holstered" - user.update_inv_back() /obj/item/minigunpack/Initialize() . = ..() @@ -72,12 +71,14 @@ return armed = TRUE - update_icon(user) + update_icon() + user.update_inv_back() /obj/item/minigunpack/equipped(mob/user, slot) ..() if(slot != slot_back) remove_gun() + user.update_inv_back() /obj/item/minigunpack/proc/remove_gun() if(!gun) @@ -85,7 +86,7 @@ if(ismob(gun.loc)) var/mob/M = gun.loc if(M.drop_from_inventory(gun, src)) - update_icon(M) + update_icon() else gun.forceMove(src) update_icon() @@ -160,7 +161,8 @@ if(source) to_chat(user, "\The [src] snaps back onto \the [source].") addtimer(CALLBACK(source, /obj/item/minigunpack/.proc/remove_gun), 0) - source.update_icon(user) + source.update_icon() + user.update_inv_back() /obj/item/weapon/gun/projectile/automatic/rifle/minigun/Move() ..() diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 3cd7025f371..eebdb868261 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -442,28 +442,28 @@ //Frames /datum/design/item/weapon/ka_frame01 id = "ka_frame01" - req_tech = list(TECH_MATERIAL = 2,TECH_ENGINEERING = 2) + req_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1) materials = list(DEFAULT_WALL_MATERIAL = 3000) build_path = /obj/item/weapon/gun/custom_ka/frame01 sort_string = "TZZFA" /datum/design/item/weapon/ka_frame02 id = "ka_frame02" - req_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3) - materials = list(DEFAULT_WALL_MATERIAL = 4000, "silver" = 1000) + req_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 3) + materials = list(DEFAULT_WALL_MATERIAL = 4000) build_path = /obj/item/weapon/gun/custom_ka/frame02 sort_string = "TZZFB" /datum/design/item/weapon/ka_frame03 id = "ka_frame03" - req_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 4) + req_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3) materials = list(DEFAULT_WALL_MATERIAL = 5000, "silver" = 2000) build_path = /obj/item/weapon/gun/custom_ka/frame03 sort_string = "TZZFC" /datum/design/item/weapon/ka_frame04 id = "ka_frame04" - req_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 5) + req_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 5) materials = list(DEFAULT_WALL_MATERIAL = 5000, "silver" = 2000, "diamond" = 1000) build_path = /obj/item/weapon/gun/custom_ka/frame04 sort_string = "TZZFD" @@ -478,35 +478,35 @@ //Cells /datum/design/item/weapon/ka_cell01 id = "ka_cell01" - req_tech = list(TECH_MATERIAL = 2,TECH_ENGINEERING = 2,TECH_MAGNET = 2,TECH_POWER = 2) + req_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 1,TECH_POWER = 1) materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 1000) build_path = /obj/item/custom_ka_upgrade/cells/cell01 sort_string = "TZZGA" /datum/design/item/weapon/ka_cell02 id = "ka_cell02" - req_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3,TECH_MAGNET = 3,TECH_POWER = 3) - materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1000, "gold" = 1000) + req_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 1,TECH_MAGNET = 1,TECH_POWER = 3) + materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1000) build_path = /obj/item/custom_ka_upgrade/cells/cell02 sort_string = "TZZGB" /datum/design/item/weapon/ka_cell03 id = "ka_cell03" - req_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 4,TECH_MAGNET = 4,TECH_POWER = 4) + req_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 3,TECH_MAGNET = 2,TECH_POWER = 3) materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 3000, "silver" = 3000, "gold" = 1000) build_path = /obj/item/custom_ka_upgrade/cells/cell03 sort_string = "TZZGC" /datum/design/item/weapon/ka_cell04 id = "ka_cell04" - req_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 5,TECH_MAGNET = 5,TECH_POWER = 5) + req_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 4,TECH_MAGNET = 3,TECH_POWER = 5) materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 3000, "silver" = 3000, "gold" = 1000, "uranium" = 5000) build_path = /obj/item/custom_ka_upgrade/cells/cell04 sort_string = "TZZGD" /datum/design/item/weapon/ka_cell05 id = "ka_cell05" - req_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 6,TECH_MAGNET = 6,TECH_POWER = 6) + req_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 6,TECH_MAGNET = 5,TECH_POWER = 5, TECH_PHORON = 5) materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 3000, "silver" = 3000, "gold" = 1000, "phoron" = 5000) build_path = /obj/item/custom_ka_upgrade/cells/cell05 sort_string = "TZZGE" @@ -514,35 +514,35 @@ //Barrels /datum/design/item/weapon/ka_barrel01 id = "ka_barrel01" - req_tech = list(TECH_MATERIAL = 2,TECH_ENGINEERING = 2,TECH_MAGNET = 2) - materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 2000, "gold" = 1000, "phoron" = 500) + req_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 1, TECH_PHORON = 2) + materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 2000, "phoron" = 500) build_path = /obj/item/custom_ka_upgrade/barrels/barrel01 sort_string = "TZZHA" /datum/design/item/weapon/ka_barrel02 id = "ka_barrel02" - req_tech = list(TECH_MATERIAL = 3,TECH_ENGINEERING = 3,TECH_MAGNET = 3) - materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 2000, "gold" = 1000, "phoron" = 500) + req_tech = list(TECH_MATERIAL = 1,TECH_ENGINEERING = 1,TECH_MAGNET = 3, TECH_PHORON = 2) + materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 2000, "phoron" = 500) build_path = /obj/item/custom_ka_upgrade/barrels/barrel02 sort_string = "TZZHB" /datum/design/item/weapon/ka_barrel03 id = "ka_barrel03" - req_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 4,TECH_MAGNET = 4) + req_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 3,TECH_MAGNET = 3, TECH_PHORON = 3) materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 2000, "gold" = 2000, "phoron" = 1000) build_path = /obj/item/custom_ka_upgrade/barrels/barrel03 sort_string = "TZZHC" /datum/design/item/weapon/ka_barrel04 id = "ka_barrel04" - req_tech = list(TECH_MATERIAL = 5,TECH_ENGINEERING = 5,TECH_MAGNET = 5) + req_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 3,TECH_MAGNET = 5, TECH_PHORON = 4) materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 3000, "gold" = 3000, "phoron" = 3000, "diamond" = 1000) build_path = /obj/item/custom_ka_upgrade/barrels/barrel04 sort_string = "TZZHD" /datum/design/item/weapon/ka_barrel05 id = "ka_barrel05" - req_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 6,TECH_MAGNET = 6) + req_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 5,TECH_MAGNET = 6, TECH_PHORON = 5) materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 4000, "gold" = 4000, "phoron" = 4000, "diamond" = 2000) build_path = /obj/item/custom_ka_upgrade/barrels/barrel05 sort_string = "TZZHE" @@ -551,48 +551,48 @@ /datum/design/item/weapon/ka_upgrade01 id = "ka_upgrade01" req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4) - materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000, "diamond" = 1000) + materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000) build_path = /obj/item/custom_ka_upgrade/upgrade_chips/damage sort_string = "TZZIA" /datum/design/item/weapon/ka_upgrade02 id = "ka_upgrade02" req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4) - materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000, "diamond" = 1000) + materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000) build_path = /obj/item/custom_ka_upgrade/upgrade_chips/firerate sort_string = "TZZIB" /datum/design/item/weapon/ka_upgrade03 id = "ka_upgrade03" req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4) - materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000, "diamond" = 1000) + materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000) build_path = /obj/item/custom_ka_upgrade/upgrade_chips/effeciency sort_string = "TZZIC" /datum/design/item/weapon/ka_upgrade04 id = "ka_upgrade04" req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4) - materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000, "diamond" = 1000) + materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000) build_path = /obj/item/custom_ka_upgrade/upgrade_chips/recoil sort_string = "TZZID" /datum/design/item/weapon/ka_upgrade05 id = "ka_upgrade05" req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4) - materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000, "diamond" = 1000) + materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000) build_path = /obj/item/custom_ka_upgrade/upgrade_chips/focusing sort_string = "TZZIE" /datum/design/item/weapon/ka_upgrade06 id = "ka_upgrade06" req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4) - materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000, "diamond" = 1000) + materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000) build_path = /obj/item/custom_ka_upgrade/upgrade_chips/capacity sort_string = "TZZIF" /datum/design/item/weapon/ka_upgrade07 id = "ka_upgrade07" req_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4) - materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000, "diamond" = 1000) + materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 2000, "gold" = 1000) build_path = /obj/item/custom_ka_upgrade/upgrade_chips/explosive sort_string = "TZZIF" \ No newline at end of file diff --git a/code/modules/tables/rack.dm b/code/modules/tables/rack.dm index f51a9ec8b30..8bada0b3c0a 100644 --- a/code/modules/tables/rack.dm +++ b/code/modules/tables/rack.dm @@ -13,6 +13,9 @@ verbs -= /obj/structure/table/verb/do_flip verbs -= /obj/structure/table/proc/do_put +/obj/structure/table/rack/remove_material(obj/item/weapon/wrench/W, mob/user) + src.dismantle(W, user) + /obj/structure/table/rack/update_connections() return diff --git a/html/changelog.html b/html/changelog.html index ac72a26b4ff..3dde6c7e742 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,47 @@ -->
+

27 June 2018

+

Arrow768 updated:

+ + +

26 June 2018

+

Lohikar updated:

+ +

PoZe updated:

+ + +

24 June 2018

+

PoZe updated:

+ + +

22 June 2018

+

Arrow768 updated:

+ + +

20 June 2018

+

BurgerBB updated:

+ +

18 June 2018

Alberyk updated:

Code - PoZe, Sprites - DronzTheWolf updated:

Scheveningen updated:

+

ben10083 updated:

+

16 June 2018

Arrow768 updated:

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index b15b38cd388..76d89ea8259 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -5561,6 +5561,13 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - maptweak: Improved the shuttle and docks design. - bugfix: Users will now be automatically threatened with a day ban if they mention the phrase 'Organ Damage'. + - bugfix: Fixed library books spawning outside of shelves. + - bugfix: Fixed kinetic accelerators displaying an error when equipped on the waist. + - balance: Balances kinetic accelerator research to prevent easy research exploit. + Balances traitor kinetic accelerator to be less powerful. + - maptweak: Tweaked the new library to be more aesthetically pleasing. Removed empty + mediwall from the command section of the shuttle. Removed floating light near + departures and on the shuttle. Removed pointless holopad on the evac shuttle. Code - PoZe, Sprites - DronzTheWolf: - rscadd: Adds airbubble(oxyball) into the game. It is used to protect user inside from decompressed environment for 30 minutes. Has an air tank attached to it @@ -5604,9 +5611,48 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - balance: IPCs can no longer draw runes, since they have no blood. They still can use talismans - tweak: Cultist IPCs are immune to cultist EMP from runes or talismans. + - bugfix: Fixed Journalist Office missing power cables. + - maptweak: Journalist Office is now connected to the bridge subgrid, instead of + main grid. + - maptweak: Shuttle wall structures that are on the corners have been moved one + tile in different directions, so that it looks good. Scheveningen: - balance: Blinding sources are significantly increased in duration. - rscdel: Direct flashes no longer stun those who are -not- sentient trees, robots, or bugpeople. - tweak: Changed how flash break mechanics work. Crappy budget NT tech is more likely to break from overuse. + ben10083: + - maptweak: Following multiple security breaches and thefts from the vault, NanoTrasen + has increased security in the main vault. +2018-06-20: + BurgerBB: + - bugfix: Readds disposal spread in disposals. Re-fixes the scrubber vent in the + warehouse mail room. + - maptweak: Adds holopads to missing areas without holopads. + - bugfix: Fixed hull shields not covering departures properly. +2018-06-22: + Arrow768: + - bugfix: The drone console now lists drones on different station levels. +2018-06-24: + PoZe: + - tweak: Airbubble comes now with fully filled engineering extended airtank(6 liters + max). Instead of double emergency airtank(10 liters max). It lasts around the + same time, even slightly longer(40 minutes). + - tweak: Airbubble now gets ripped and leaks after being shot with projectile weapons. + - bugfix: Airbubbles no longer produces infinite cable restrains. + - bugfix: Users of airbubble can no longer 'magically' get out of bubble with it + still remaining closed. + - tweak: No longer it takes time to get in and out of Airbubble. +2018-06-26: + Lohikar: + - bugfix: RIG actuator Z-climbing now actually works. Probably. + PoZe: + - bugfix: Fixed commanded mobs. They will no longer attack people they follow, destroy + things around them. + - tweak: Commanded mobs will not attack their master even if they are being attacked + by their own master. +2018-06-27: + Arrow768: + - maptweak: Various plaques have been placed around the station to memorize the + odin murders. diff --git a/icons/mob/screen/action.dmi b/icons/mob/screen/action.dmi index 1b7a6d28b43..de59931098c 100644 Binary files a/icons/mob/screen/action.dmi and b/icons/mob/screen/action.dmi differ diff --git a/icons/mob/screen/alien.dmi b/icons/mob/screen/alien.dmi index 58516e1c0d1..7c9c96031e4 100644 Binary files a/icons/mob/screen/alien.dmi and b/icons/mob/screen/alien.dmi differ diff --git a/icons/mob/screen/generic.dmi b/icons/mob/screen/generic.dmi index ffa7a47aa9b..f0888262eb4 100644 Binary files a/icons/mob/screen/generic.dmi and b/icons/mob/screen/generic.dmi differ diff --git a/icons/mob/screen/midnight.dmi b/icons/mob/screen/midnight.dmi index 5ca20700d14..5ba8d7afe31 100644 Binary files a/icons/mob/screen/midnight.dmi and b/icons/mob/screen/midnight.dmi differ diff --git a/icons/mob/screen/old-noborder.dmi b/icons/mob/screen/old-noborder.dmi index ac1a28d4b64..ee1439f4fa5 100644 Binary files a/icons/mob/screen/old-noborder.dmi and b/icons/mob/screen/old-noborder.dmi differ diff --git a/icons/mob/screen/old.dmi b/icons/mob/screen/old.dmi index 8bfaccf861a..bad7c413198 100644 Binary files a/icons/mob/screen/old.dmi and b/icons/mob/screen/old.dmi differ diff --git a/icons/mob/screen/orange.dmi b/icons/mob/screen/orange.dmi index c369a6ea302..db6f8142e65 100644 Binary files a/icons/mob/screen/orange.dmi and b/icons/mob/screen/orange.dmi differ diff --git a/icons/mob/screen/white.dmi b/icons/mob/screen/white.dmi index ca073d5468b..4fb1ae22edc 100644 Binary files a/icons/mob/screen/white.dmi and b/icons/mob/screen/white.dmi differ diff --git a/icons/obj/custom_items/marwani_dress.dmi b/icons/obj/custom_items/marwani_dress.dmi index cd3db138def..8d61d66d271 100644 Binary files a/icons/obj/custom_items/marwani_dress.dmi and b/icons/obj/custom_items/marwani_dress.dmi differ diff --git a/icons/obj/kinetic_accelerators.dmi b/icons/obj/kinetic_accelerators.dmi index 2446c7e8588..d89a1833a47 100644 Binary files a/icons/obj/kinetic_accelerators.dmi and b/icons/obj/kinetic_accelerators.dmi differ diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 727df16b797..b9f00914150 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -14356,6 +14356,7 @@ /obj/machinery/status_display{ pixel_y = -32 }, +/obj/machinery/light, /turf/simulated/shuttle/floor{ icon_state = "floor3" }, @@ -15315,6 +15316,7 @@ /obj/machinery/status_display{ pixel_y = -32 }, +/obj/machinery/light, /turf/simulated/shuttle/floor{ icon_state = "floor3" }, @@ -22389,6 +22391,22 @@ icon_state = "wood_siding1" }, /area/centcom/spawning) +"Xp" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/closet/medical_wall{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/ramp, +/area/shuttle/escape/centcom) +"Xq" = ( +/obj/machinery/light{ + dir = 4; + status = 2 + }, +/turf/simulated/floor/tiled/ramp, +/area/shuttle/escape/centcom) (1,1,1) = {" aa @@ -64458,7 +64476,7 @@ CG CQ VC Fu -Ga +GQ CP CP OX @@ -64716,8 +64734,8 @@ CQ Fn Fz GN -HL -GO +GQ +Xp VH CP VQ @@ -65751,7 +65769,7 @@ VE Ds Ds Ds -DA +Ds Ds Ds Ds @@ -66001,8 +66019,8 @@ CQ Ft FO Ig -Ma -GO +GQ +Xq VH CP Ds @@ -66257,7 +66275,7 @@ CG CQ DK VF -Ga +GQ CP CP CP diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index d23cfbe9366..3252ec00c84 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -2375,6 +2375,13 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"aeG" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/table/wood, +/turf/simulated/floor/wood, +/area/library) "aeH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2765,6 +2772,25 @@ /obj/machinery/seed_extractor, /turf/simulated/floor/tiled, /area/hydroponics) +"afz" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table/wood, +/turf/simulated/floor/wood, +/area/library) +"afA" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/table/wood, +/turf/simulated/floor/wood, +/area/library) +"afB" = ( +/obj/structure/window/reinforced, +/obj/structure/table/wood, +/turf/simulated/floor/wood, +/area/library) "afC" = ( /obj/structure/closet{ name = "Evidence Closet" @@ -2851,6 +2877,58 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"afO" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/wood, +/area/library) +"afP" = ( +/obj/effect/landmark/start{ + name = "Librarian" + }, +/obj/structure/bed/chair/office/dark, +/turf/simulated/floor/carpet, +/area/library) +"afQ" = ( +/obj/structure/bed/chair/office/dark, +/turf/simulated/floor/wood, +/area/library) +"afR" = ( +/obj/structure/bed/chair/office/dark, +/turf/simulated/floor/carpet, +/area/library) +"afS" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) +"afT" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/library) +"afU" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/library) +"afV" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/library) +"afW" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/library) "afX" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark{ @@ -3018,6 +3096,46 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"agq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/wood, +/area/library) +"agr" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/disposaloutlet{ + dir = 8; + spread = 360; + spread_point = 2 + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) +"ags" = ( +/obj/structure/sign/drop{ + pixel_y = 32 + }, +/turf/simulated/open, +/area/maintenance/disposal) +"agt" = ( +/obj/machinery/light/small/emergency, +/turf/simulated/open, +/area/maintenance/disposal) +"agu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "agv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark{ @@ -3211,6 +3329,22 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"agQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hydroponics) +"agR" = ( +/obj/effect/floor_decal/corner/green{ + icon_state = "corner_white"; + dir = 9 + }, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled, +/area/hydroponics) "agS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ icon_state = "intact-scrubbers"; @@ -3492,6 +3626,56 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"aht" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/wood, +/area/chapel/office) +"ahu" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled/white, +/area/outpost/research/chemistry) +"ahv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/outpost/mining_main/eva) +"ahw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled, +/area/outpost/mining_main/eva) "ahx" = ( /obj/structure/filingcabinet/filingcabinet{ desc = "A large cabinet with drawers. There seems to be a layer of dust covering it." @@ -16816,6 +17000,9 @@ dir = 4; icon_state = "pipe-c" }, +/obj/effect/floor_decal/plaque{ + desc = "Charles Hall Memorial Hall
Charles Hall was the 2nd victim of the infamous Odin Killer. From beginnings as an orphan, he rose to Head of Security and dedicated his life to ensuring security was robust and effective. He will be missed.
March 2425 - June 2460" + }, /turf/simulated/floor/tiled, /area/security/brig) "aFr" = ( @@ -20332,10 +20519,10 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "2-8" +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) @@ -20349,6 +20536,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "aLh" = ( @@ -20361,6 +20553,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "aLi" = ( @@ -20374,6 +20571,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "aLj" = ( @@ -20391,6 +20593,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "aLk" = ( @@ -21478,7 +21685,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/industrial/warning, -/obj/structure/cable{ +/obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" @@ -28824,7 +29031,6 @@ dir = 1 }, /obj/structure/window/reinforced, -/obj/machinery/door/firedoor, /obj/structure/window/reinforced{ icon_state = "rwindow"; dir = 4 @@ -47911,27 +48117,6 @@ }, /turf/simulated/floor/tiled/white, /area/outpost/research/chemistry) -"bGl" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/white, -/area/outpost/research/chemistry) "bGm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -52000,15 +52185,6 @@ }, /turf/simulated/floor/wood, /area/chapel/office) -"bPB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/chapel/office) "bPC" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -58310,18 +58486,6 @@ }, /turf/simulated/floor/tiled, /area/outpost/mining_main/eva) -"cfd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/eva) "cfe" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable/green{ @@ -61364,14 +61528,6 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"coN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/hydroponics) "coO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -62144,13 +62300,6 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"crf" = ( -/obj/structure/toilet, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled/freezer, -/area/security/main) "crg" = ( /obj/structure/toilet, /obj/machinery/light/small{ @@ -62385,18 +62534,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/security/main) -"crC" = ( -/obj/machinery/shower{ - dir = 8; - icon_state = "shower"; - pixel_x = 0; - pixel_y = 0 - }, -/obj/machinery/door/window/westleft, -/obj/structure/curtain/open/shower, -/obj/item/weapon/soap, -/turf/simulated/floor/tiled/freezer, -/area/security/main) "crD" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -62560,22 +62697,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/main) -"crQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 8 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor, -/area/security/security_office) "crR" = ( /obj/structure/flora/pottedplant/random, /obj/effect/floor_decal/corner/blue{ @@ -62603,9 +62724,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_office) -"crU" = ( -/turf/simulated/floor/tiled, -/area/security/security_office) "crV" = ( /obj/machinery/light{ dir = 1 @@ -62736,22 +62854,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, /area/security/security_office) -"csi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 8 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor, -/area/security/security_office) "csj" = ( /obj/structure/coatrack, /obj/effect/floor_decal/corner/blue{ @@ -62760,9 +62862,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_office) -"csk" = ( -/turf/simulated/floor/tiled, -/area/security/security_office) "csl" = ( /obj/structure/table/standard, /obj/structure/window/reinforced, @@ -62800,12 +62899,6 @@ /obj/item/weapon/paper_bin, /turf/simulated/floor/tiled/dark, /area/security/security_office) -"csp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/security/security_office) "csq" = ( /obj/machinery/alarm{ dir = 8; @@ -62817,12 +62910,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_office) -"csr" = ( -/turf/simulated/wall, -/area/security/security_office) -"css" = ( -/turf/simulated/wall, -/area/security/security_office) "cst" = ( /obj/structure/bed/chair, /obj/item/device/radio/intercom{ @@ -62830,9 +62917,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_office) -"csu" = ( -/turf/simulated/floor/tiled, -/area/security/security_office) "csv" = ( /obj/structure/table/standard, /obj/structure/window/reinforced{ @@ -62847,7 +62931,6 @@ /turf/simulated/floor/tiled/dark, /area/security/security_office) "csw" = ( -/obj/item/clothing/gloves/combat, /obj/item/weapon/handcuffs, /obj/structure/table/standard, /obj/structure/window/reinforced{ @@ -62879,24 +62962,12 @@ /obj/item/weapon/paper_bin, /turf/simulated/floor/tiled/dark, /area/security/security_office) -"csz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/security/security_office) "csA" = ( /obj/structure/noticeboard{ pixel_x = 32 }, /turf/simulated/floor/tiled, /area/security/security_office) -"csB" = ( -/turf/simulated/wall, -/area/security/security_office) -"csC" = ( -/turf/simulated/wall, -/area/security/security_office) "csD" = ( /obj/structure/table/standard, /obj/item/weapon/storage/box/donut, @@ -62905,9 +62976,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_office) -"csE" = ( -/turf/simulated/floor/tiled, -/area/security/security_office) "csF" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -62990,9 +63058,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/security/security_office) -"csN" = ( -/turf/simulated/wall, -/area/security/security_office) "csO" = ( /obj/machinery/vending/coffee, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -63110,12 +63175,6 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"csZ" = ( -/turf/simulated/wall, -/area/security/security_office) -"cta" = ( -/turf/simulated/wall, -/area/security/security_office) "ctb" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -63139,28 +63198,6 @@ }, /turf/simulated/floor/plating, /area/security/security_office) -"ctd" = ( -/turf/simulated/wall, -/area/security/security_office) -"cte" = ( -/turf/simulated/wall, -/area/security/security_office) -"ctf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 8 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor, -/area/security/security_office) "ctg" = ( /obj/machinery/door/airlock/glass_security{ name = "Security Office"; @@ -63198,14 +63235,6 @@ /area/security/security_office) "ctr" = ( /obj/structure/table/rack, -/obj/item/clothing/suit/space/void/atmos, -/obj/item/clothing/head/helmet/space/void/atmos, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 1 - }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/door/window/southleft{ dir = 4; @@ -63213,30 +63242,18 @@ name = "Atmospheric Hardsuits"; req_access = list(24) }, -/obj/structure/table/rack, -/obj/item/clothing/suit/space/void/atmos, -/obj/item/clothing/head/helmet/space/void/atmos, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/structure/window/reinforced{ icon_state = "rwindow"; dir = 1 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/door/window/southleft{ - dir = 4; - icon_state = "left"; - name = "Atmospheric Hardsuits"; - req_access = list(24) - }, +/obj/item/clothing/suit/space/void/atmos, +/obj/item/clothing/head/helmet/space/void/atmos, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) "cts" = ( /obj/structure/table/rack, -/obj/item/clothing/suit/space/void/atmos, -/obj/item/clothing/head/helmet/space/void/atmos, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/door/window/southleft{ dir = 4; @@ -63244,18 +63261,11 @@ name = "Atmospheric Hardsuits"; req_access = list(24) }, -/obj/structure/table/rack, -/obj/item/clothing/suit/space/void/atmos, -/obj/item/clothing/head/helmet/space/void/atmos, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/door/window/southleft{ - dir = 4; - icon_state = "left"; - name = "Atmospheric Hardsuits"; - req_access = list(24) - }, +/obj/item/clothing/suit/space/void/atmos, +/obj/item/clothing/head/helmet/space/void/atmos, +/obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) "ctt" = ( @@ -63267,15 +63277,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) -"ctu" = ( -/turf/simulated/wall, -/area/journalistoffice) -"ctv" = ( -/turf/simulated/wall, -/area/journalistoffice) -"ctw" = ( -/turf/simulated/wall, -/area/journalistoffice) "ctx" = ( /obj/machinery/door/firedoor, /obj/structure/window/reinforced/polarized{ @@ -63315,7 +63316,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock{ name = "Journalist's Office"; - req_access = list(111) + req_access = list(70) + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/journalistoffice) @@ -63351,9 +63357,6 @@ /obj/structure/grille, /turf/simulated/floor, /area/journalistoffice) -"ctC" = ( -/turf/simulated/wall, -/area/journalistoffice) "ctD" = ( /obj/machinery/door/firedoor, /obj/structure/window/reinforced/polarized{ @@ -63371,16 +63374,6 @@ /obj/structure/grille, /turf/simulated/floor/plating, /area/journalistoffice) -"ctE" = ( -/obj/structure/flora/pottedplant/random, -/turf/simulated/floor/wood, -/area/journalistoffice) -"ctF" = ( -/turf/simulated/floor/wood, -/area/journalistoffice) -"ctG" = ( -/turf/simulated/floor/wood, -/area/journalistoffice) "ctH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -63389,7 +63382,7 @@ icon_state = "intact-supply"; dir = 6 }, -/obj/structure/cable{ +/obj/structure/cable/green{ d1 = 2; d2 = 4; icon_state = "2-4" @@ -63405,7 +63398,7 @@ dir = 9; pixel_y = 0 }, -/obj/structure/cable{ +/obj/structure/cable/green{ d1 = 1; d2 = 8; icon_state = "1-8" @@ -63429,22 +63422,6 @@ }, /turf/simulated/floor/wood, /area/journalistoffice) -"ctL" = ( -/turf/simulated/wall, -/area/journalistoffice) -"ctM" = ( -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "journalist" - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "journalist" - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/journalistoffice) "ctN" = ( /obj/machinery/light{ icon_state = "tube1"; @@ -63452,9 +63429,6 @@ }, /turf/simulated/floor/wood, /area/journalistoffice) -"ctO" = ( -/turf/simulated/floor/wood, -/area/journalistoffice) "ctP" = ( /obj/structure/bed/chair, /turf/simulated/floor/wood, @@ -63462,18 +63436,12 @@ "ctQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ +/obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/wood, -/area/journalistoffice) -"ctR" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/journalistoffice) -"ctS" = ( +/obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/journalistoffice) "ctT" = ( @@ -63484,9 +63452,6 @@ /obj/item/glass_jar/peter, /turf/simulated/floor/wood, /area/journalistoffice) -"ctU" = ( -/turf/simulated/wall, -/area/journalistoffice) "ctV" = ( /obj/machinery/door/firedoor, /obj/structure/window/reinforced/polarized{ @@ -63523,14 +63488,14 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/carpet, /area/journalistoffice) "ctZ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/structure/table/wood, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -63538,22 +63503,21 @@ }, /obj/item/device/taperecorder, /obj/item/weapon/storage/photo_album, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/carpet, /area/journalistoffice) "cua" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/journalistoffice) -"cub" = ( -/turf/simulated/floor/wood, -/area/journalistoffice) "cuc" = ( /obj/structure/closet, /turf/simulated/floor/wood, /area/journalistoffice) -"cud" = ( -/turf/simulated/wall, -/area/journalistoffice) "cue" = ( /obj/machinery/door/firedoor, /obj/structure/window/reinforced/polarized{ @@ -63584,11 +63548,6 @@ /turf/simulated/floor/carpet, /area/journalistoffice) "cuh" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/bed/chair/office/dark{ dir = 1 }, @@ -63598,6 +63557,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/carpet, /area/journalistoffice) "cui" = ( @@ -63619,9 +63583,6 @@ }, /turf/simulated/floor/wood, /area/journalistoffice) -"cuk" = ( -/turf/simulated/floor/wood, -/area/journalistoffice) "cul" = ( /obj/machinery/light{ dir = 4; @@ -63630,12 +63591,6 @@ /obj/structure/filingcabinet/filingcabinet, /turf/simulated/floor/wood, /area/journalistoffice) -"cum" = ( -/turf/simulated/wall, -/area/journalistoffice) -"cun" = ( -/turf/simulated/wall, -/area/journalistoffice) "cuo" = ( /obj/machinery/requests_console{ department = "Journalist's Office"; @@ -63666,7 +63621,7 @@ name = "south bump"; pixel_y = -24 }, -/obj/structure/cable, +/obj/structure/cable/green, /turf/simulated/floor/carpet, /area/journalistoffice) "cur" = ( @@ -63695,37 +63650,13 @@ /obj/structure/flora/pottedplant/random, /turf/simulated/floor/wood, /area/journalistoffice) -"cuv" = ( -/turf/simulated/wall, -/area/journalistoffice) -"cuw" = ( -/turf/simulated/wall, -/area/journalistoffice) -"cux" = ( -/turf/simulated/wall, -/area/journalistoffice) -"cuy" = ( -/turf/simulated/wall, -/area/journalistoffice) -"cuz" = ( -/turf/simulated/wall, -/area/journalistoffice) -"cuA" = ( -/turf/simulated/wall, -/area/journalistoffice) -"cuB" = ( -/turf/simulated/wall, -/area/journalistoffice) "cuC" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ - req_access = list(57) + req_access = list(70) }, /turf/simulated/floor/plating, /area/journalistoffice) -"cuD" = ( -/turf/simulated/wall, -/area/journalistoffice) "cuE" = ( /turf/simulated/wall, /area/journalistoffice) @@ -63823,15 +63754,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/library) -"cuM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/library) "cuN" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -63876,35 +63798,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) -"cuR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/library) -"cuS" = ( -/obj/structure/table/standard, -/turf/simulated/floor/wood, -/area/library) -"cuT" = ( -/obj/structure/table/standard, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/library) -"cuU" = ( -/obj/structure/table/standard, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/library) "cuV" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ @@ -64036,36 +63929,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) -"cvf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/library) -"cvg" = ( -/obj/structure/table/standard, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/library) "cvh" = ( /obj/structure/window/reinforced{ dir = 4 }, /turf/simulated/floor/wood, /area/library) -"cvi" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, -/area/library) "cvj" = ( /obj/structure/table/wood, /obj/machinery/door/window/westright{ @@ -64074,13 +63943,6 @@ }, /turf/simulated/floor/wood, /area/library) -"cvk" = ( -/obj/structure/bed/chair/office/light, -/obj/effect/landmark/start{ - name = "Librarian" - }, -/turf/simulated/floor/carpet, -/area/library) "cvl" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -64108,23 +63970,6 @@ /obj/item/device/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/library) -"cvp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/library) -"cvq" = ( -/obj/structure/table/standard, -/obj/structure/window/reinforced, -/turf/simulated/floor/wood, -/area/library) "cvr" = ( /obj/machinery/door/window/southright{ name = "Library Display Area"; @@ -64132,14 +63977,6 @@ }, /turf/simulated/floor/wood, /area/library) -"cvs" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/table/standard, -/turf/simulated/floor/wood, -/area/library) "cvt" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -64272,13 +64109,6 @@ }, /turf/simulated/floor/wood, /area/library) -"cvK" = ( -/obj/structure/table/wood, -/obj/machinery/librarypubliccomp{ - pixel_y = 8 - }, -/turf/simulated/floor/wood, -/area/library) "cvL" = ( /obj/structure/table/wood, /obj/machinery/librarypubliccomp{ @@ -64315,10 +64145,6 @@ }, /turf/simulated/floor/carpet, /area/library) -"cvO" = ( -/obj/structure/bookcase/libraryspawn/religion, -/turf/simulated/floor/carpet, -/area/library) "cvP" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -64328,33 +64154,6 @@ }, /turf/simulated/floor/wood, /area/library) -"cvQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/library) -"cvR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/library) -"cvS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/library) "cvT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -64383,20 +64182,6 @@ }, /turf/simulated/floor/wood, /area/library) -"cvW" = ( -/obj/structure/bed/chair/office/light, -/turf/simulated/floor/wood, -/area/library) -"cvX" = ( -/obj/structure/bed/chair/office/light, -/turf/simulated/floor/wood, -/area/library) -"cvY" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/library) "cvZ" = ( /obj/item/device/radio/intercom{ dir = 4; @@ -64409,36 +64194,6 @@ /obj/structure/bookcase/libraryspawn/religion, /turf/simulated/floor/carpet, /area/library) -"cwb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, -/area/library) -"cwc" = ( -/obj/structure/bed/chair/office/light, -/obj/effect/landmark/start{ - name = "Librarian" - }, -/turf/simulated/floor/carpet, -/area/library) -"cwd" = ( -/obj/structure/table/wood, -/turf/simulated/floor/carpet, -/area/library) -"cwe" = ( -/obj/structure/table/wood, -/turf/simulated/floor/carpet, -/area/library) -"cwf" = ( -/obj/structure/bed/chair/office/light{ - dir = 1 - }, -/turf/simulated/floor/carpet, -/area/library) -"cwg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/library) "cwh" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -64449,15 +64204,6 @@ }, /turf/simulated/floor/wood, /area/library) -"cwi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/library) "cwj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64500,40 +64246,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/library) -"cwo" = ( -/obj/structure/bed/chair/office/light{ - dir = 1 - }, -/turf/simulated/floor/carpet, -/area/library) -"cwp" = ( -/obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, -/turf/simulated/floor/carpet, -/area/library) "cwq" = ( /obj/structure/table/wood, /turf/simulated/floor/carpet, /area/library) -"cwr" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/library) -"cws" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/library) -"cwt" = ( -/obj/structure/bed/chair/office/light{ - dir = 1 - }, -/obj/effect/landmark/start{ - name = "Librarian" - }, -/turf/simulated/floor/carpet, -/area/library) "cwu" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -64554,21 +64270,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/library) -"cwx" = ( -/obj/structure/bed/chair/office/light, -/turf/simulated/floor/carpet, -/area/library) "cwy" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green, /turf/simulated/floor/carpet, /area/library) -"cwz" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/library) "cwA" = ( /obj/machinery/camera/network/service{ c_tag = "Library - East"; @@ -64590,10 +64296,6 @@ }, /turf/simulated/floor/plating, /area/library) -"cwC" = ( -/obj/structure/bookcase/libraryspawn/adult, -/turf/simulated/floor/wood, -/area/library) "cwD" = ( /obj/structure/bookcase/libraryspawn/adult, /turf/simulated/floor/wood, @@ -64608,57 +64310,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/library) -"cwF" = ( -/obj/structure/bookcase/libraryspawn/reference, -/turf/simulated/floor/carpet, -/area/library) -"cwG" = ( -/obj/structure/bookcase/libraryspawn/reference, -/turf/simulated/floor/carpet, -/area/library) -"cwH" = ( -/obj/structure/bookcase/libraryspawn/reference, -/turf/simulated/floor/carpet, -/area/library) "cwI" = ( /obj/structure/bookcase/libraryspawn/reference, /turf/simulated/floor/carpet, /area/library) -"cwJ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/library) -"cwK" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/library) "cwL" = ( /obj/structure/table/wood, /obj/item/weapon/storage/pill_bottle/dice/gaming, /obj/item/weapon/storage/pill_bottle/dice, /turf/simulated/floor/carpet, /area/library) -"cwM" = ( -/obj/structure/bed/chair/office/light{ - dir = 1 - }, -/turf/simulated/floor/carpet, -/area/library) -"cwN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/library) "cwO" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green, @@ -64697,12 +64358,6 @@ }, /turf/simulated/floor/wood, /area/library) -"cwT" = ( -/obj/structure/bed/chair/office/light{ - dir = 1 - }, -/turf/simulated/floor/carpet, -/area/library) "cwU" = ( /obj/structure/table/wood, /obj/item/weapon/deck/cards, @@ -64710,12 +64365,6 @@ /obj/item/weapon/deck/tarot, /turf/simulated/floor/carpet, /area/library) -"cwV" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/library) "cwW" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -64782,26 +64431,14 @@ }, /turf/simulated/floor/wood, /area/library) -"cxd" = ( -/obj/structure/bookcase/libraryspawn/nonfiction, -/turf/simulated/floor/carpet, -/area/library) "cxe" = ( /obj/structure/bookcase/libraryspawn/nonfiction, /turf/simulated/floor/carpet, /area/library) -"cxf" = ( -/obj/structure/bookcase/libraryspawn/fiction, -/turf/simulated/floor/carpet, -/area/library) "cxg" = ( /obj/structure/bookcase/libraryspawn/fiction, /turf/simulated/floor/carpet, /area/library) -"cxh" = ( -/obj/structure/bed/chair/office/light, -/turf/simulated/floor/carpet, -/area/library) "cxi" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -65010,24 +64647,6 @@ temperature = 253.15 }, /area/crew_quarters/kitchen) -"cxA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/freezer{ - name = "freezer storage tiles"; - temperature = 253.15 - }, -/area/crew_quarters/kitchen) -"cxB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/freezer{ - name = "freezer storage tiles"; - temperature = 253.15 - }, -/area/crew_quarters/kitchen) "cxC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65131,35 +64750,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/storage) -"cxK" = ( -/obj/structure/lattice/catwalk, -/turf/simulated/open, -/area/maintenance/disposal) -"cxL" = ( -/obj/structure/lattice/catwalk, -/obj/structure/sign/drop{ - pixel_y = 32 - }, -/turf/simulated/open, -/area/maintenance/disposal) -"cxM" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/structure/disposaloutlet{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) -"cxN" = ( -/obj/structure/lattice/catwalk, -/turf/simulated/open, -/area/maintenance/disposal) -"cxO" = ( -/obj/machinery/light/small/emergency, -/obj/structure/lattice/catwalk, -/turf/simulated/open, -/area/maintenance/disposal) "cxP" = ( /obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ @@ -65187,6 +64777,27 @@ /obj/item/weapon/crowbar, /turf/simulated/floor/tiled, /area/outpost/mining_main/eva) +"cKq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lime{ + dir = 10 + }, +/obj/effect/floor_decal/plaque{ + desc = "Charlie Dove Memorial Hall
With an endless capacity for kindness, she used her skills as a doctor to better the lives of everyone she met. She was the 4th victim murdered by the notorious Odin Killer, and will be missed.
December 2416 - June 2460" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) +"grp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/plaque{ + desc = "Mikail Ivanovich Memorial
The 3rd Victim of the Odin Killer. Mikail Ivanovich had an unparalleled work ethic and an unbreakable drive to end corruption. Struck down too soon.
May 2419 - June 2460" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) (1,1,1) = {" aaa @@ -89551,8 +89162,8 @@ cjw cea ceF cea -cfd -cfq +ahv +ahw cfE cfP cfZ @@ -89791,7 +89402,7 @@ bWm cih cim cxI -bXT +agu cxJ bWm cbs @@ -90287,7 +89898,7 @@ bdJ bRL con coA -coN +agQ coY cpk cpt @@ -90525,7 +90136,7 @@ bCw bDp bEp bFn -bGl +ahu bHt bFj bJn @@ -91317,7 +90928,7 @@ cor coF coR bSO -bSO +agR bSO bSO cpT @@ -92336,7 +91947,7 @@ bNi bNL bOt bOZ -bPB +aht bQa bQD bRf @@ -94935,9 +94546,9 @@ bUz bPO bPK cbD -cxK ccf -cxK +ccf +ccf cdh aaa aab @@ -95192,9 +94803,9 @@ bUz caW bPL cbE -cxL +ags ccf -cxO +agt cdh aab aab @@ -95408,9 +95019,9 @@ aVI aXq bEu cuL -cuR -cuR -cvp +cwW +cwW +cxi bFv bFv bFv @@ -95664,17 +95275,17 @@ bxs bCz bDu bEt -cuM -cuS -cvg -cvq +cuN +cwX +afA +afB cvy bGy cvN cvZ bGy bFv -cwC +cwD cwQ cwZ bPI @@ -95707,7 +95318,7 @@ bPO bPL cbE cbE -cxM +agr cbE cdh cdt @@ -95921,17 +95532,17 @@ bxs bCA aXt bEt -cuM -cuT +cuN +aeG bGA cvr bKA bGy -cvO -cvO +cwa +cwa bGy bFv -cwC +cwD cwR cxa bPI @@ -96179,9 +95790,9 @@ bCB bDv cuH bFx -cuU +afz cvh -cvs +afO bKA bGy bGy @@ -96437,18 +96048,18 @@ cuG cuI cuO cuV -cvi -cvi +cvt +cvt cvz cvE cvP -cwb -cwb +cwn +cwn cwv cwE cwS cxc -cwJ +cxj bPI bRS cxs @@ -96698,19 +96309,19 @@ bGy bGy bGA cvF -cvQ -cvk -cwf +cvT +afP +afU bGy -cwF +cwI bGy -cxd +cxe bGy bPI cxo cxt bRS -cxA +cxC cxG bPI bPJ @@ -96895,13 +96506,13 @@ aja aja aja aja -crQ +cth crZ -crQ -csr -csr -csr -csr +cth +cti +cti +cti +cti asw auk avI @@ -96955,19 +96566,19 @@ bGA bGA bGA bGA -cvQ -cwd -cwp +cvT +cwq +cwy bGy -cwF +cwI bGy -cxd +cxe bGy bPI cxp cxu bRS -cxA +cxC bTf bPI bPJ @@ -97158,7 +96769,7 @@ csj cst csD csO -csr +cti asx auk avJ @@ -97212,19 +96823,19 @@ cvj cvu cvA bKx -cvQ -cwd -cwd +cvT +cwq +cwq bGy -cwF +cwI bGy -cxf +cxg bGy bPI cxq bRw bRT -cxA +cxC bTh bPI bPJ @@ -97411,10 +97022,10 @@ cmy crO crS csb -crU -crU -crU -crU +csP +csP +csP +csP ctb asy aul @@ -97465,17 +97076,17 @@ bDA cuJ bFv cuZ -cvk +afP bGy cvB cvG -cvQ -cwf -cwr +cvT +afU +afV bGy -cwF +cwI bGy -cxf +cxg cxk bPI bPI @@ -97727,10 +97338,10 @@ bGy cvC cvH cvU -cwg -cwg -cwg -cwJ +cww +agq +cww +cxj bGA bGA bGA @@ -97923,13 +97534,13 @@ crF cmA cmA cmH -crU +csP csd csm csw csG csR -csr +cti asA aum avK @@ -97986,9 +97597,9 @@ cvI cvV cwh bGy -cwx -cwr -cwf +afR +afW +afU bGy cxl bFv @@ -98186,7 +97797,7 @@ csn csx csH csS -csr +cti asB aun avM @@ -98240,13 +97851,13 @@ cvm bFv bFv cvJ -cvW -cwi -cwt -cwp +afS +cwj +afP +cwy cwL cwU -cwx +afU bOJ bFv bMj @@ -98429,7 +98040,7 @@ aaV adW aeC aja -crf +crg crl crs crA @@ -98443,7 +98054,7 @@ cso csy csI csT -crQ +cth asC auo avN @@ -98496,13 +98107,13 @@ cvc cvn bII bFv -cvK -cvW -cwi +cvL +afQ +cwj bGy -cwr -cwf -cwr +afW +afR +afW bGy cxm bFv @@ -98696,9 +98307,9 @@ cmC cmI crX csg -csp -csp -csp +csJ +csJ +csJ csU ctg cnQ @@ -98753,8 +98364,8 @@ cvd bHR cvw bFv -cvK -cvY +cvL +afT cwk cwu cwA @@ -98943,12 +98554,12 @@ aaV adY clC aja -crf +crg crm cru -crC +crN cmD -crC +crN cmD aja crY @@ -98957,7 +98568,7 @@ csq csA csK csV -crQ +cth asE aup avK @@ -99015,9 +98626,9 @@ bFv cwl bFv cwB -cuR -cuR -cvp +cwW +cwW +cxi bFv bFv bPJ @@ -99210,11 +98821,11 @@ afe afe afe afe -csr -csr +cti +cti csL csW -csr +cti asF aun avM @@ -101805,7 +101416,7 @@ axP axP aWg aLc -aYO +cKq baj bbs bcR @@ -102569,13 +102180,13 @@ asL axP aLc axP -ctu +cuE ctD -ctM -ctM +ctV +ctV cue -ctu -ctu +cuE +cuE aYW bah bbv @@ -102826,13 +102437,13 @@ asL aJs aLc aMV -ctu -ctE +cuE +cuu ctN ctW cuf cuo -ctu +cuE aYX bah bbw @@ -103083,13 +102694,13 @@ asL axP aLd aMW -ctu -ctF -ctF +cuE +cut +cut ctX cug cup -ctu +cuE aYY bah bbx @@ -103341,12 +102952,12 @@ aJt aLe aMX ctx -ctF +cut ctP ctY cuh cuq -ctu +cuE aYY bah bby @@ -103590,7 +103201,7 @@ awa axN azm aAH -aCj +grp aEc axP aHS @@ -103603,7 +103214,7 @@ ctQ ctZ cui cur -ctu +cuE aYY bah bbz @@ -103856,11 +103467,11 @@ aLf aMZ ctz ctI -ctR -ctR +cua +cua cuj cus -ctu +cuE aYZ bah bbA @@ -104113,10 +103724,10 @@ aLg aNa ctA ctJ -ctF -ctF -ctF -ctF +cut +cut +cut +cut cuC aYY bah @@ -104373,8 +103984,8 @@ ctK ctT cuc cul -ctE -ctu +cuu +cuE aZa bah bbC @@ -104625,13 +104236,13 @@ aGb awc aLh ctt -ctu -ctu -ctu -ctu -ctu -ctu -ctu +cuE +cuE +cuE +cuE +cuE +cuE +cuE aZb bah bbD diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index e694baaaa52..2698789cc6a 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -4228,6 +4228,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/plaque{ + desc = "Avery Bennett Memorial Hall
The 5th and final victim of the Odin Killer. He was slain by the Odin Killer for his brave, personal investigation on the killings. Studying to become a detective at the time of his death, he was posthumously granted the title.
November 2428 - June 2460" + }, /turf/simulated/floor/tiled, /area/security/training) "hx" = ( @@ -4394,16 +4397,6 @@ }, /turf/simulated/floor/tiled, /area/security/training) -"hN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/security/training) "hO" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -4411,16 +4404,6 @@ }, /turf/simulated/floor/tiled, /area/security/training) -"hP" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/security/training) "hQ" = ( /turf/simulated/open, /area/security/investigations) @@ -4484,39 +4467,6 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics_office) -"hY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled, -/area/security/training) -"hZ" = ( -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/security/training) "ib" = ( /obj/item/clothing/head/fedora/brown, /obj/item/ammo_casing/c38{ @@ -6785,25 +6735,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/training) -"mm" = ( -/obj/machinery/door/airlock/maintenance{ - req_access = list(63); - req_one_access = null - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/security/training) "mn" = ( /obj/effect/floor_decal/corner/beige/diagonal, /obj/structure/table/glass, @@ -6820,891 +6751,12 @@ "mo" = ( /turf/simulated/mineral, /area/mine/unexplored) -"mp" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mq" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mr" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ms" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mt" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mu" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mv" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mw" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mx" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"my" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mz" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mA" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mB" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mC" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mD" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mE" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mF" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mG" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mH" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mI" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mJ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mK" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mL" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mM" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mN" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mO" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mP" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mQ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mR" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mS" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mT" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mU" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mV" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mW" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mX" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mY" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"mZ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"na" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nb" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nc" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nd" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ne" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nf" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ng" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nh" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ni" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nj" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nk" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nl" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nm" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nn" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"no" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"np" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nq" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nr" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ns" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nt" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nu" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nv" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nw" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nx" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ny" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nz" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nA" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nB" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nC" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nD" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nE" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nF" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nG" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nH" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nI" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nJ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nK" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nL" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nM" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nN" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nO" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nP" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nQ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nR" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nS" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nT" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nU" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nV" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nW" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nX" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nY" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"nZ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oa" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ob" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oc" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"od" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oe" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"of" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"og" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oh" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oi" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oj" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ok" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ol" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"om" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"on" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oo" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"op" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oq" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"or" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"os" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ot" = ( -/turf/simulated/mineral, -/area/mine/unexplored) "ou" = ( /obj/effect/landmark{ name = "cavernspawn" }, /turf/simulated/floor/asteroid/ash/rocky, /area/mine/unexplored) -"ov" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ow" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ox" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oy" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oz" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oA" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oB" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oC" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oD" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oE" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oF" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oG" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oH" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oI" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oJ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oK" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oL" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oM" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oN" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oO" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oP" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oQ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oR" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oS" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oT" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oU" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oV" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oW" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oX" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oY" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"oZ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pa" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pb" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pc" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pd" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pe" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pf" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pg" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ph" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pi" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pj" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pk" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pl" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pm" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pn" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"po" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pp" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pq" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pr" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ps" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pt" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pu" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pv" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pw" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"px" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"py" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pz" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pA" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pB" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pC" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pD" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pE" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pF" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pG" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pH" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pI" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pJ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pK" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pL" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pM" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pN" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pO" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pP" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pQ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pR" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pS" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pT" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pU" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pV" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pW" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pX" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pY" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"pZ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qa" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qb" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qc" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qd" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qe" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qf" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qg" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qh" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qi" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qj" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qk" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ql" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qm" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qn" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qo" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qp" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qq" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qr" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qs" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qt" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qu" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qv" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qw" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qx" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qy" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qz" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qA" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qB" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qC" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qD" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qE" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qF" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qG" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qH" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qI" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qJ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qK" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qL" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qM" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qN" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qO" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qP" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qQ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qR" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qS" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qT" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qU" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qV" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qW" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qX" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qY" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"qZ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ra" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rb" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rc" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rd" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"re" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rf" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rg" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rh" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ri" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rj" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rk" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rl" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rm" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rn" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ro" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rp" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rq" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rr" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rs" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rt" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ru" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rv" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rw" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rx" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ry" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rz" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rA" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rB" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rC" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rD" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rE" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rF" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rG" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rH" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rI" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rJ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rK" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rL" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rM" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rN" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rO" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rP" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rQ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rR" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rS" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rT" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rU" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rV" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rW" = ( -/turf/simulated/mineral, -/area/mine/unexplored) "rX" = ( /obj/effect/floor_decal/corner/green/full{ icon_state = "corner_white_full"; @@ -7727,42 +6779,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) -"rY" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rZ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sa" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sb" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sc" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sd" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"se" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sf" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sg" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sh" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"si" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sj" = ( -/turf/simulated/mineral, -/area/mine/unexplored) "sk" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; @@ -7780,42 +6796,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) -"sl" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sm" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sn" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"so" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sp" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sq" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sr" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ss" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"st" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"su" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sv" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sw" = ( -/turf/simulated/mineral, -/area/mine/unexplored) "sx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -7826,15 +6806,6 @@ }, /turf/simulated/floor/tiled/dark, /area/medical/psych) -"sy" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sz" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sA" = ( -/turf/simulated/mineral, -/area/mine/unexplored) "sB" = ( /obj/machinery/camera/network/medbay{ c_tag = "Medical - Psychaitry Isolation Room"; @@ -7844,42 +6815,6 @@ }, /turf/simulated/floor/reinforced, /area/medical/psych) -"sC" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sD" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sE" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sF" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sG" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sH" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sI" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sJ" = ( -/obj/effect/landmark{ - name = "cavernspawn" - }, -/turf/simulated/floor/asteroid/ash/rocky, -/area/mine/unexplored) -"sK" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sL" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sM" = ( -/turf/simulated/mineral, -/area/mine/unexplored) "sN" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; @@ -7891,36 +6826,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) -"sO" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sP" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sQ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sR" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sS" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sT" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sU" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sV" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sW" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sX" = ( -/turf/simulated/mineral, -/area/mine/unexplored) "sY" = ( /obj/effect/floor_decal/corner/green/full, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -7934,327 +6839,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) -"sZ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ta" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tb" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tc" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"td" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"te" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tf" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tg" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"th" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ti" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tj" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tk" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tl" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tm" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tn" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"to" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tp" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tq" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tr" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ts" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tt" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tu" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tv" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tw" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tx" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ty" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tz" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tA" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tB" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tC" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tD" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tE" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tF" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tG" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tH" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tI" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tJ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tK" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tL" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tM" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tN" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tO" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tP" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tQ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tR" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tS" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tT" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tU" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tV" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tW" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tX" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tY" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"tZ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ua" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ub" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uc" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ud" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ue" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uf" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ug" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uh" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ui" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uj" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uk" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ul" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"um" = ( -/obj/effect/landmark{ - name = "cavernspawn" - }, -/turf/simulated/floor/asteroid/ash/rocky, -/area/mine/unexplored) -"un" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uo" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"up" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uq" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ur" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"us" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ut" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uu" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uv" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uw" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ux" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uy" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uz" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uA" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uB" = ( -/obj/effect/landmark{ - name = "cavernspawn" - }, -/turf/simulated/floor/asteroid/ash/rocky, -/area/mine/unexplored) -"uC" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uD" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uE" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uF" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uG" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uH" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uI" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uJ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uK" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uL" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uM" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uN" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uO" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uP" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uQ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uR" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uS" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uT" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uU" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uV" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uW" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uX" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uY" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"uZ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) "va" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index 87ff60e9ab9..afffc01fd57 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -2516,7 +2516,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/mine/explored) +/area/hallway/secondary/exit) "eK" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -2528,13 +2528,18 @@ /area/hallway/secondary/exit) "eL" = ( /obj/structure/grille, -/obj/structure/window/reinforced, +/obj/machinery/door/firedoor{ + dir = 2 + }, /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, /turf/simulated/floor/plating, -/area/mine/explored) +/area/hallway/secondary/exit) "eM" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -2752,18 +2757,16 @@ /area/hallway/secondary/exit) "fg" = ( /obj/structure/grille, +/obj/structure/window/reinforced, /obj/machinery/door/firedoor{ dir = 2 }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/window/reinforced{ icon_state = "rwindow"; dir = 4 }, /turf/simulated/floor/plating, -/area/mine/explored) +/area/hallway/secondary/exit) "fh" = ( /obj/machinery/airlock_sensor{ frequency = 1380; @@ -5754,9 +5757,6 @@ "ks" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /obj/effect/floor_decal/industrial/warning/cee, -/obj/machinery/light{ - dir = 8 - }, /turf/simulated/floor/plating, /area/hallway/secondary/exit) "kt" = ( @@ -19308,30 +19308,15 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/exit) -"JH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 4 - }, -/turf/simulated/floor/plating, -/area/mine/explored) "JI" = ( -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/red{ icon_state = "corner_white"; dir = 9 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/exit) "JJ" = ( @@ -19401,6 +19386,29 @@ /obj/machinery/space_heater, /turf/simulated/floor/tiled, /area/hallway/secondary/exit) +"JQ" = ( +/obj/effect/floor_decal/corner/red/full, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/exit) +"NI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/plaque{ + desc = "Harley O'Ryan Memorial Hall
O'Ryan is memorialized here as the first victim of the Odin Killer. She was always in a good mood. She was brought down before her time.
August 2439 - May 2460" + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) (1,1,1) = {" aa @@ -46000,7 +46008,7 @@ jq pZ kP qv -kP +NI qO kP rd @@ -47766,7 +47774,7 @@ aa aa aa aa -ab +eI fT jU kY @@ -48035,7 +48043,7 @@ jx kr Jf lB -kZ +JQ lb Jz Jz @@ -48280,7 +48288,7 @@ aa aa aa aa -eL +eK fR JA hC @@ -48296,7 +48304,7 @@ la lx JA kZ -eL +eK aa aa aa @@ -48537,7 +48545,7 @@ aa aa aa aa -eL +eK fU gD iW @@ -48553,7 +48561,7 @@ ja lw Jr JK -eL +eK aa aa aa @@ -48794,7 +48802,7 @@ aa aa aa aa -eL +eK gB gG iY @@ -48810,7 +48818,7 @@ lz Ju Jy JL -eL +eK aa aa aa @@ -49051,7 +49059,7 @@ aa aa aa aa -eL +eK fU kw kq @@ -49067,7 +49075,7 @@ iZ Jv kw JM -eL +eK aa aa aa @@ -49308,7 +49316,7 @@ aa aa aa aa -eL +eK fU kw Jp @@ -49324,7 +49332,7 @@ ja JE kw JM -eL +eK aa aa aa @@ -49565,7 +49573,7 @@ aa aa aa aa -eL +eK Jh JF hA @@ -49581,7 +49589,7 @@ JC Js JJ JN -eL +eK aa aa aa @@ -49822,7 +49830,7 @@ aa aa aa aa -fg +eL is gA kt @@ -49838,7 +49846,7 @@ jX Jw Jx is -JH +fg aa aa aa diff --git a/maps/runtime/code/runtime.dm b/maps/runtime/code/runtime.dm index 2d67762ecd2..2f21ea8a0ab 100644 --- a/maps/runtime/code/runtime.dm +++ b/maps/runtime/code/runtime.dm @@ -3,11 +3,11 @@ full_name = "Runtime Debugging Station" path = "runtime" - station_levels = list(1) + station_levels = list(1, 2, 3) admin_levels = list() - contact_levels = list(1) - player_levels = list(1) - accessible_z_levels = list() + contact_levels = list(1, 2, 3) + player_levels = list(1, 2, 3) + accessible_z_levels = list(1, 2, 3) station_name = "NSS Runtime" station_short = "Runtime" diff --git a/maps/runtime/runtime-2.dmm b/maps/runtime/runtime-2.dmm index 3805f0f1751..073cf623ca8 100644 --- a/maps/runtime/runtime-2.dmm +++ b/maps/runtime/runtime-2.dmm @@ -1,8 +1,5 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/effect/landmark/map_data{ - height = 2 - }, /turf/template_noop, /area/template_noop) "b" = ( diff --git a/maps/runtime/runtime-3.dmm b/maps/runtime/runtime-3.dmm index fe671e45ea7..a90b24e9e00 100644 --- a/maps/runtime/runtime-3.dmm +++ b/maps/runtime/runtime-3.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /obj/effect/landmark/map_data{ - height = 2 + height = 3 }, /turf/template_noop, /area/template_noop)