From 198f2d7fcf83f6274e33b4c157e71534b2f7b9eb Mon Sep 17 00:00:00 2001 From: BurgerLUA Date: Mon, 18 Jun 2018 11:48:27 -0700 Subject: [PATCH 01/26] Burger's Fixes (#4900) Fixed library books spawning outside of shelves. Fixed kinetic accelerators displaying an error when equipped on the waist. Balances kinetic accelerator research to prevent easy research exploit. Balances traitor kinetic accelerator to be less powerful. Tweaked the new library to be more aesthetically pleasing. (Changes all the light chairs to dark chairs, and makes all the plastic tables wood.) 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/modules/custom_ka/barrels.dm | 32 +- code/modules/custom_ka/cells.dm | 54 +- code/modules/custom_ka/frames.dm | 8 +- code/modules/custom_ka/upgrade_chips.dm | 3 +- code/modules/library/lib_items.dm | 2 +- .../research/designs/weapon_designs.dm | 50 +- html/changelogs/burgerbb-postfixes.yml | 40 + icons/obj/kinetic_accelerators.dmi | Bin 6095 -> 5592 bytes maps/aurora/aurora-1_centcomm.dmm | 257 +++--- maps/aurora/aurora-4_mainlevel.dmm | 854 +++++------------- maps/aurora/aurora-6_surface.dmm | 24 +- 11 files changed, 452 insertions(+), 872 deletions(-) create mode 100644 html/changelogs/burgerbb-postfixes.yml 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/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/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/html/changelogs/burgerbb-postfixes.yml b/html/changelogs/burgerbb-postfixes.yml new file mode 100644 index 00000000000..ff9c5243e0e --- /dev/null +++ b/html/changelogs/burgerbb-postfixes.yml @@ -0,0 +1,40 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: BurgerBB + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - 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." \ No newline at end of file diff --git a/icons/obj/kinetic_accelerators.dmi b/icons/obj/kinetic_accelerators.dmi index 2446c7e858847f4edfc66572ecd4f23871637788..d89a1833a477afa2f46f2c19e3128509a94d1ed9 100644 GIT binary patch delta 5242 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 diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 727df16b797..e8a548165b6 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -13217,9 +13217,17 @@ }, /area/centcom/holding) "DA" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/shuttle/floor, -/area/shuttle/escape/centcom) +/turf/unsimulated/floor{ + icon_state = "gcircuit" + }, +/obj/structure/artilleryplaceholder/decorative{ + icon_state = "29" + }, +/obj/machinery/porta_turret/crescent, +/turf/unsimulated/floor{ + icon_state = "wood_siding6" + }, +/area/centcom/control) "DB" = ( /obj/machinery/light/spot, /turf/simulated/shuttle/plating, @@ -13295,24 +13303,6 @@ }, /area/centcom/holding) "DJ" = ( -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, -/obj/structure/artilleryplaceholder/decorative{ - icon_state = "29" - }, -/obj/machinery/porta_turret/crescent, -/turf/unsimulated/floor{ - icon_state = "wood_siding6" - }, -/area/centcom/control) -"DK" = ( -/obj/item/modular_computer/console/preset/security, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape/centcom) -"DL" = ( /turf/unsimulated/floor{ icon_state = "engine" }, @@ -13329,6 +13319,28 @@ icon_state = "wood_siding9" }, /area/centcom/control) +"DK" = ( +/obj/item/modular_computer/console/preset/security, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"DL" = ( +/turf/unsimulated/floor{ + icon_state = "gcircuit" + }, +/obj/structure/artilleryplaceholder/decorative{ + icon_state = "27" + }, +/obj/structure/table/reinforced/steel, +/obj/machinery/button/remote/blast_door{ + id = "battery2"; + name = "Battery 2 Firing Control" + }, +/turf/unsimulated/floor{ + icon_state = "wood_siding10" + }, +/area/centcom/control) "DM" = ( /turf/unsimulated/wall/riveted, /area/centcom/ferry) @@ -13527,9 +13539,11 @@ }, /obj/structure/table/reinforced/steel, /obj/machinery/button/remote/blast_door{ - id = "battery2"; - name = "Battery 2 Firing Control" + id = "battery1"; + name = "Battery 1 Firing Control" }, +/obj/effect/decal/cleanable/cobweb, +/obj/item/weapon/reagent_containers/glass/rag, /turf/unsimulated/floor{ icon_state = "wood_siding10" }, @@ -13598,20 +13612,12 @@ /area/centcom/holding) "Er" = ( /turf/unsimulated/floor{ - icon_state = "gcircuit" + icon_state = "engine" }, -/obj/structure/artilleryplaceholder/decorative{ - icon_state = "27" - }, -/obj/structure/table/reinforced/steel, -/obj/machinery/button/remote/blast_door{ - id = "battery1"; - name = "Battery 1 Firing Control" - }, -/obj/effect/decal/cleanable/cobweb, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/effect/decal/cleanable/dirt, /turf/unsimulated/floor{ - icon_state = "wood_siding10" + icon_state = "wood_siding1"; + dir = 6 }, /area/centcom/control) "Es" = ( @@ -13793,6 +13799,7 @@ icon_state = "engine" }, /obj/effect/decal/cleanable/dirt, +/obj/item/weapon/stool, /turf/unsimulated/floor{ icon_state = "wood_siding1"; dir = 6 @@ -13811,7 +13818,7 @@ icon_state = "engine" }, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/stool, +/obj/item/weapon/storage/toolbox/electrical, /turf/unsimulated/floor{ icon_state = "wood_siding1"; dir = 6 @@ -13954,17 +13961,6 @@ }, /area/centcom/holding) "Fl" = ( -/turf/unsimulated/floor{ - icon_state = "engine" - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/weapon/storage/toolbox/electrical, -/turf/unsimulated/floor{ - icon_state = "wood_siding1"; - dir = 6 - }, -/area/centcom/control) -"Fm" = ( /turf/unsimulated/floor{ icon_state = "engine" }, @@ -13982,6 +13978,16 @@ icon_state = "wood_siding9" }, /area/centcom/control) +"Fm" = ( +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/obj/item/weapon/stool/padded, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "siding2" + }, +/area/centcom/holding) "Fn" = ( /obj/machinery/computer/med_data, /obj/structure/window/reinforced{ @@ -14356,11 +14362,19 @@ /obj/machinery/status_display{ pixel_y = -32 }, +/obj/machinery/light, /turf/simulated/shuttle/floor{ icon_state = "floor3" }, /area/shuttle/escape/centcom) "Ga" = ( +/obj/structure/bed/chair/office/bridge{ + icon_state = "bridge"; + dir = 8 + }, +/obj/machinery/status_display{ + pixel_y = -32 + }, /obj/machinery/light, /turf/simulated/shuttle/floor{ icon_state = "floor3" @@ -15134,12 +15148,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/closet/medical_wall{ - pixel_x = -32 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/tiled/ramp, /area/shuttle/escape/centcom) "HM" = ( /obj/structure/window/reinforced, @@ -15308,16 +15317,11 @@ }, /area/centcom/spawning) "If" = ( -/obj/structure/bed/chair/office/bridge{ - icon_state = "bridge"; - dir = 8 - }, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" +/obj/machinery/light{ + dir = 4; + status = 2 }, +/turf/simulated/floor/tiled/ramp, /area/shuttle/escape/centcom) "Ig" = ( /obj/structure/window/reinforced{ @@ -17208,14 +17212,16 @@ /turf/unsimulated/wall/riveted, /area/centcom/spawning) "Ma" = ( -/obj/machinery/light{ - dir = 4; - status = 0 +/turf/unsimulated/floor{ + icon_state = "floor" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" +/obj/structure/bed/chair/unmovable{ + dir = 1 }, -/area/shuttle/escape/centcom) +/turf/unsimulated/floor{ + icon_state = "wood_siding2" + }, +/area/centcom/spawning) "Mb" = ( /obj/structure/window/reinforced{ dir = 8 @@ -22032,14 +22038,16 @@ /area/shuttle/escape/centcom) "WE" = ( /turf/unsimulated/floor{ - icon_state = "wood" + icon_state = "floor" + }, +/obj/machinery/vending/snack{ + name = "Free Chocolate Corp"; + prices = list() }, -/obj/item/weapon/stool/padded, /turf/unsimulated/floor{ - name = "plating"; - icon_state = "siding2" + icon_state = "wood_siding4" }, -/area/centcom/holding) +/area/centcom/spawning) "WF" = ( /obj/machinery/status_display{ pixel_y = -32 @@ -22346,29 +22354,6 @@ }, /area/centcom/spawning) "Xl" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/obj/structure/bed/chair/unmovable{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "wood_siding2" - }, -/area/centcom/spawning) -"Xm" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/obj/machinery/vending/snack{ - name = "Free Chocolate Corp"; - prices = list() - }, -/turf/unsimulated/floor{ - icon_state = "wood_siding4" - }, -/area/centcom/spawning) -"Xn" = ( /turf/unsimulated/floor{ icon_state = "floor" }, @@ -22380,7 +22365,7 @@ icon_state = "wood_siding8" }, /area/centcom/spawning) -"Xo" = ( +"Xm" = ( /turf/unsimulated/floor{ icon_state = "floor" }, @@ -57018,7 +57003,7 @@ DM DM EP EP -WE +Fm Gq GE GF @@ -57275,7 +57260,7 @@ Fi Fo EP EP -WE +Fm Gq GF GF @@ -57532,7 +57517,7 @@ Fj Fp EP EP -WE +Fm Gq GF GF @@ -57789,7 +57774,7 @@ Fk Fp EP EP -WE +Fm Gq GF GF @@ -58046,7 +58031,7 @@ EP EP Fy EP -WE +Fm Gq GF GF @@ -58303,7 +58288,7 @@ EP EP EP EP -WE +Fm Gq GF GF @@ -64458,7 +64443,7 @@ CG CQ VC Fu -Ga +GQ CP CP OX @@ -64495,7 +64480,7 @@ Ms Id Id Id -Xm +WE Id Id Id @@ -64698,17 +64683,17 @@ wl xe xA yk -DL +DJ wl xe xA yk -DL +DJ wl xe xA Bp -Fm +Fl uT Cq CG @@ -64716,8 +64701,8 @@ CQ Fn Fz GN +GQ HL -GO VH CP VQ @@ -64751,9 +64736,9 @@ KZ Ms Id Id -Xl +Ma OY -Xo +Xm Id Id OA @@ -65008,9 +64993,9 @@ MN Ms Id Id -Xl +Ma OZ -Xo +Xm Id Id Qn @@ -65472,13 +65457,13 @@ yl yE wo xh -Eh +DL yl yE wo xh +Eh Er -ER BT uT Cq @@ -65522,9 +65507,9 @@ KZ Ms Id Id -Xl +Ma Pa -Xo +Xm Id Id OA @@ -65735,7 +65720,7 @@ yE wp xi Dr -ET +ER BT uT Cq @@ -65751,7 +65736,7 @@ VE Ds Ds Ds -DA +Ds Ds Ds Ds @@ -65779,9 +65764,9 @@ Nw Ms Id Id -Xl +Ma Pb -Xo +Xm Id Id OA @@ -65981,18 +65966,18 @@ it uT wq xj -DJ +DA yl yE wq xj -DJ +DA yl yE wq xj -DJ -Fl +DA +ET BT uT Cq @@ -66001,8 +65986,8 @@ CQ Ft FO Ig -Ma -GO +GQ +If VH CP Ds @@ -66036,9 +66021,9 @@ KZ Ms Id Id -Xl +Ma Pc -Xo +Xm Id Id OA @@ -66257,7 +66242,7 @@ CG CQ DK VF -Ga +GQ CP CP CP @@ -66514,7 +66499,7 @@ CO CQ CQ GQ -If +Ga CP VD VJ @@ -66550,9 +66535,9 @@ MN Ms Id Id -Xl +Ma Pb -Xo +Xm Id Id OA @@ -66807,9 +66792,9 @@ KZ Ms Id Id -Xl +Ma Pd -Xo +Xm Id Id OA @@ -67065,7 +67050,7 @@ Ms Id Id Id -Xn +Xl Id Id Id diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 714ddcb7527..17f430e519f 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{ @@ -62140,13 +62218,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{ @@ -62381,18 +62452,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"; @@ -62556,22 +62615,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{ @@ -62599,9 +62642,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_office) -"crU" = ( -/turf/simulated/floor/tiled, -/area/security/security_office) "crV" = ( /obj/machinery/light{ dir = 1 @@ -62732,22 +62772,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{ @@ -62756,9 +62780,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, @@ -62796,12 +62817,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; @@ -62813,12 +62828,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{ @@ -62826,9 +62835,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{ @@ -62875,24 +62881,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, @@ -62901,9 +62895,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 @@ -62986,9 +62977,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, @@ -63106,12 +63094,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, @@ -63135,28 +63117,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"; @@ -63263,15 +63223,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{ @@ -63347,9 +63298,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{ @@ -63367,16 +63315,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 @@ -63425,22 +63363,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"; @@ -63448,9 +63370,6 @@ }, /turf/simulated/floor/wood, /area/journalistoffice) -"ctO" = ( -/turf/simulated/floor/wood, -/area/journalistoffice) "ctP" = ( /obj/structure/bed/chair, /turf/simulated/floor/wood, @@ -63465,13 +63384,6 @@ }, /turf/simulated/floor/wood, /area/journalistoffice) -"ctR" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/journalistoffice) -"ctS" = ( -/turf/simulated/floor/wood, -/area/journalistoffice) "ctT" = ( /obj/machinery/light_switch{ pixel_x = 24 @@ -63480,9 +63392,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{ @@ -63540,16 +63449,10 @@ /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{ @@ -63615,9 +63518,6 @@ }, /turf/simulated/floor/wood, /area/journalistoffice) -"cuk" = ( -/turf/simulated/floor/wood, -/area/journalistoffice) "cul" = ( /obj/machinery/light{ dir = 4; @@ -63626,12 +63526,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"; @@ -63691,27 +63585,6 @@ /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{ @@ -63719,9 +63592,6 @@ }, /turf/simulated/floor/plating, /area/journalistoffice) -"cuD" = ( -/turf/simulated/wall, -/area/journalistoffice) "cuE" = ( /turf/simulated/wall, /area/journalistoffice) @@ -63819,15 +63689,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{ @@ -63872,35 +63733,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{ @@ -64032,36 +63864,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{ @@ -64070,13 +63878,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, @@ -64104,23 +63905,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"; @@ -64128,14 +63912,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, @@ -64268,13 +64044,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{ @@ -64311,10 +64080,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 @@ -64324,33 +64089,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 @@ -64379,20 +64117,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; @@ -64405,36 +64129,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; @@ -64445,15 +64139,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 @@ -64496,40 +64181,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 @@ -64550,21 +64205,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"; @@ -64586,10 +64231,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, @@ -64604,57 +64245,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, @@ -64693,12 +64293,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, @@ -64706,12 +64300,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{ @@ -64778,26 +64366,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{ @@ -65006,24 +64582,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 @@ -65127,10 +64685,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{ @@ -94931,9 +94485,9 @@ bUz bPO bPK cbD -cxK +cxN ccf -cxK +cxN cdh aaa aab @@ -95404,9 +94958,9 @@ aVI aXq bEu cuL -cuR -cuR -cvp +cwW +cwW +cxi bFv bFv bFv @@ -95660,17 +95214,17 @@ bxs bCz bDu bEt -cuM -cuS -cvg -cvq +cuN +cwX +afA +afB cvy bGy cvN cvZ bGy bFv -cwC +cwD cwQ cwZ bPI @@ -95917,17 +95471,17 @@ bxs bCA aXt bEt -cuM -cuT +cuN +aeG bGA cvr bKA bGy -cvO -cvO +cwa +cwa bGy bFv -cwC +cwD cwR cxa bPI @@ -96175,9 +95729,9 @@ bCB bDv cuH bFx -cuU +afz cvh -cvs +afO bKA bGy bGy @@ -96433,18 +95987,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 @@ -96694,19 +96248,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 @@ -96891,13 +96445,13 @@ aja aja aja aja -crQ +cth crZ -crQ -csr -csr -csr -csr +cth +cti +cti +cti +cti asw auk avI @@ -96951,19 +96505,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 @@ -97154,7 +96708,7 @@ csj cst csD csO -csr +cti asx auk avJ @@ -97208,19 +96762,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 @@ -97407,10 +96961,10 @@ cmy crO crS csb -crU -crU -crU -crU +csP +csP +csP +csP ctb asy aul @@ -97461,17 +97015,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 @@ -97723,10 +97277,10 @@ bGy cvC cvH cvU -cwg -cwg -cwg -cwJ +cww +cww +cww +cxj bGA bGA bGA @@ -97919,13 +97473,13 @@ crF cmA cmA cmH -crU +csP csd csm csw csG csR -csr +cti asA aum avK @@ -97982,9 +97536,9 @@ cvI cvV cwh bGy -cwx -cwr -cwf +afR +afW +afU bGy cxl bFv @@ -98182,7 +97736,7 @@ csn csx csH csS -csr +cti asB aun avM @@ -98236,13 +97790,13 @@ cvm bFv bFv cvJ -cvW -cwi -cwt -cwp +afS +cwj +afP +cwy cwL cwU -cwx +afU bOJ bFv bMj @@ -98425,7 +97979,7 @@ aaV adW aeC aja -crf +crg crl crs crA @@ -98439,7 +97993,7 @@ cso csy csI csT -crQ +cth asC auo avN @@ -98492,13 +98046,13 @@ cvc cvn bII bFv -cvK -cvW -cwi +cvL +afQ +cwj bGy -cwr -cwf -cwr +afW +afR +afW bGy cxm bFv @@ -98692,9 +98246,9 @@ cmC cmI crX csg -csp -csp -csp +csJ +csJ +csJ csU ctg cnQ @@ -98749,8 +98303,8 @@ cvd bHR cvw bFv -cvK -cvY +cvL +afT cwk cwu cwA @@ -98939,12 +98493,12 @@ aaV adY clC aja -crf +crg crm cru -crC +crN cmD -crC +crN cmD aja crY @@ -98953,7 +98507,7 @@ csq csA csK csV -crQ +cth asE aup avK @@ -99011,9 +98565,9 @@ bFv cwl bFv cwB -cuR -cuR -cvp +cwW +cwW +cxi bFv bFv bPJ @@ -99206,11 +98760,11 @@ afe afe afe afe -csr -csr +cti +cti csL csW -csr +cti asF aun avM @@ -102565,13 +102119,13 @@ asL axP aLc axP -ctu +cuE ctD -ctM -ctM +ctV +ctV cue -ctu -ctu +cuE +cuE aYW bah bbv @@ -102822,13 +102376,13 @@ asL aJs aLc aMV -ctu -ctE +cuE +cuu ctN ctW cuf cuo -ctu +cuE aYX bah bbw @@ -103079,13 +102633,13 @@ asL axP aLd aMW -ctu -ctF -ctF +cuE +cut +cut ctX cug cup -ctu +cuE aYY bah bbx @@ -103337,12 +102891,12 @@ aJt aLe aMX ctx -ctF +cut ctP ctY cuh cuq -ctu +cuE aYY bah bby @@ -103599,7 +103153,7 @@ ctQ ctZ cui cur -ctu +cuE aYY bah bbz @@ -103852,11 +103406,11 @@ aLf aMZ ctz ctI -ctR -ctR +cua +cua cuj cus -ctu +cuE aYZ bah bbA @@ -104109,10 +103663,10 @@ aLg aNa ctA ctJ -ctF -ctF -ctF -ctF +cut +cut +cut +cut cuC aYY bah @@ -104369,8 +103923,8 @@ ctK ctT cuc cul -ctE -ctu +cuu +cuE aZa bah bbC @@ -104621,13 +104175,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-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index 87ff60e9ab9..d0291fb2c48 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -5754,9 +5754,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" = ( @@ -19321,17 +19318,14 @@ /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 +19395,16 @@ /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) (1,1,1) = {" aa @@ -48035,7 +48039,7 @@ jx kr Jf lB -kZ +JQ lb Jz Jz From 0654f921d95bdea423a117ccdab81830643cc00e Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 18 Jun 2018 15:53:11 -0300 Subject: [PATCH 02/26] June update fixes (#4905) -fixes the catbeast plants missing from botany -fixes a runtime on the minigun -fixes #4870 --- code/game/machinery/vending_types.dm | 8 ++++++-- code/modules/mining/machine_vending.dm | 7 +++++-- .../computers/modular_computer/interaction.dm | 13 +++++++++---- code/modules/projectiles/guns/projectile/minigun.dm | 12 +++++++----- 4 files changed, 27 insertions(+), 13 deletions(-) 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/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/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/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() ..() From dbc285b9bdef891b29e01cccc08380fc9962fdeb Mon Sep 17 00:00:00 2001 From: ben10083 <31709901+ben10083@users.noreply.github.com> Date: Mon, 18 Jun 2018 15:16:37 -0400 Subject: [PATCH 03/26] Adding a Change log for PR #4858 (#4906) --- .../ben10083 - Vault_Security_Increase.yml | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 html/changelogs/ben10083 - Vault_Security_Increase.yml diff --git a/html/changelogs/ben10083 - Vault_Security_Increase.yml b/html/changelogs/ben10083 - Vault_Security_Increase.yml new file mode 100644 index 00000000000..a275e77f992 --- /dev/null +++ b/html/changelogs/ben10083 - Vault_Security_Increase.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: ben10083 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - maptweak: "Following multiple security breaches and thefts from the vault, NanoTrasen has increased security in the main vault." From e8c54e5af44293fef5fd5462314f8d325e0a35d4 Mon Sep 17 00:00:00 2001 From: Mykhailo Bykhovtsev Date: Mon, 18 Jun 2018 12:23:27 -0700 Subject: [PATCH 04/26] June update Bugfixes (#4904) Shuttle structures that are on the corner walls have been moved by one tile in different directions. So it doesn't look like hanging in the air. Fixes #4903 Added missing cable wires in Journalist office. Fixes #4902 Journalist office power grid is connected to the Bridge subgrid, instead of main grid. --- html/changelogs/Sindorman-bugfixing.yml | 8 + maps/aurora/aurora-1_centcomm.dmm | 265 +++++++++++++----------- maps/aurora/aurora-4_mainlevel.dmm | 68 ++++-- 3 files changed, 206 insertions(+), 135 deletions(-) create mode 100644 html/changelogs/Sindorman-bugfixing.yml diff --git a/html/changelogs/Sindorman-bugfixing.yml b/html/changelogs/Sindorman-bugfixing.yml new file mode 100644 index 00000000000..cf53cef977f --- /dev/null +++ b/html/changelogs/Sindorman-bugfixing.yml @@ -0,0 +1,8 @@ +author: PoZe + +delete-after: True + +changes: + - 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." diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index e8a548165b6..b9f00914150 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -13217,17 +13217,9 @@ }, /area/centcom/holding) "DA" = ( -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, -/obj/structure/artilleryplaceholder/decorative{ - icon_state = "29" - }, -/obj/machinery/porta_turret/crescent, -/turf/unsimulated/floor{ - icon_state = "wood_siding6" - }, -/area/centcom/control) +/obj/machinery/hologram/holopad, +/turf/simulated/shuttle/floor, +/area/shuttle/escape/centcom) "DB" = ( /obj/machinery/light/spot, /turf/simulated/shuttle/plating, @@ -13303,6 +13295,24 @@ }, /area/centcom/holding) "DJ" = ( +/turf/unsimulated/floor{ + icon_state = "gcircuit" + }, +/obj/structure/artilleryplaceholder/decorative{ + icon_state = "29" + }, +/obj/machinery/porta_turret/crescent, +/turf/unsimulated/floor{ + icon_state = "wood_siding6" + }, +/area/centcom/control) +"DK" = ( +/obj/item/modular_computer/console/preset/security, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"DL" = ( /turf/unsimulated/floor{ icon_state = "engine" }, @@ -13319,28 +13329,6 @@ icon_state = "wood_siding9" }, /area/centcom/control) -"DK" = ( -/obj/item/modular_computer/console/preset/security, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape/centcom) -"DL" = ( -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, -/obj/structure/artilleryplaceholder/decorative{ - icon_state = "27" - }, -/obj/structure/table/reinforced/steel, -/obj/machinery/button/remote/blast_door{ - id = "battery2"; - name = "Battery 2 Firing Control" - }, -/turf/unsimulated/floor{ - icon_state = "wood_siding10" - }, -/area/centcom/control) "DM" = ( /turf/unsimulated/wall/riveted, /area/centcom/ferry) @@ -13539,11 +13527,9 @@ }, /obj/structure/table/reinforced/steel, /obj/machinery/button/remote/blast_door{ - id = "battery1"; - name = "Battery 1 Firing Control" + id = "battery2"; + name = "Battery 2 Firing Control" }, -/obj/effect/decal/cleanable/cobweb, -/obj/item/weapon/reagent_containers/glass/rag, /turf/unsimulated/floor{ icon_state = "wood_siding10" }, @@ -13612,12 +13598,20 @@ /area/centcom/holding) "Er" = ( /turf/unsimulated/floor{ - icon_state = "engine" + icon_state = "gcircuit" }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/artilleryplaceholder/decorative{ + icon_state = "27" + }, +/obj/structure/table/reinforced/steel, +/obj/machinery/button/remote/blast_door{ + id = "battery1"; + name = "Battery 1 Firing Control" + }, +/obj/effect/decal/cleanable/cobweb, +/obj/item/weapon/reagent_containers/glass/rag, /turf/unsimulated/floor{ - icon_state = "wood_siding1"; - dir = 6 + icon_state = "wood_siding10" }, /area/centcom/control) "Es" = ( @@ -13799,7 +13793,6 @@ icon_state = "engine" }, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/stool, /turf/unsimulated/floor{ icon_state = "wood_siding1"; dir = 6 @@ -13818,7 +13811,7 @@ icon_state = "engine" }, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/weapon/stool, /turf/unsimulated/floor{ icon_state = "wood_siding1"; dir = 6 @@ -13961,6 +13954,17 @@ }, /area/centcom/holding) "Fl" = ( +/turf/unsimulated/floor{ + icon_state = "engine" + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/storage/toolbox/electrical, +/turf/unsimulated/floor{ + icon_state = "wood_siding1"; + dir = 6 + }, +/area/centcom/control) +"Fm" = ( /turf/unsimulated/floor{ icon_state = "engine" }, @@ -13978,16 +13982,6 @@ icon_state = "wood_siding9" }, /area/centcom/control) -"Fm" = ( -/turf/unsimulated/floor{ - icon_state = "wood" - }, -/obj/item/weapon/stool/padded, -/turf/unsimulated/floor{ - name = "plating"; - icon_state = "siding2" - }, -/area/centcom/holding) "Fn" = ( /obj/machinery/computer/med_data, /obj/structure/window/reinforced{ @@ -14368,13 +14362,6 @@ }, /area/shuttle/escape/centcom) "Ga" = ( -/obj/structure/bed/chair/office/bridge{ - icon_state = "bridge"; - dir = 8 - }, -/obj/machinery/status_display{ - pixel_y = -32 - }, /obj/machinery/light, /turf/simulated/shuttle/floor{ icon_state = "floor3" @@ -15148,7 +15135,12 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/ramp, +/obj/structure/closet/medical_wall{ + pixel_x = -32 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, /area/shuttle/escape/centcom) "HM" = ( /obj/structure/window/reinforced, @@ -15317,11 +15309,17 @@ }, /area/centcom/spawning) "If" = ( -/obj/machinery/light{ - dir = 4; - status = 2 +/obj/structure/bed/chair/office/bridge{ + icon_state = "bridge"; + dir = 8 + }, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/machinery/light, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" }, -/turf/simulated/floor/tiled/ramp, /area/shuttle/escape/centcom) "Ig" = ( /obj/structure/window/reinforced{ @@ -17212,16 +17210,14 @@ /turf/unsimulated/wall/riveted, /area/centcom/spawning) "Ma" = ( -/turf/unsimulated/floor{ - icon_state = "floor" +/obj/machinery/light{ + dir = 4; + status = 0 }, -/obj/structure/bed/chair/unmovable{ - dir = 1 +/turf/simulated/shuttle/floor{ + icon_state = "floor3" }, -/turf/unsimulated/floor{ - icon_state = "wood_siding2" - }, -/area/centcom/spawning) +/area/shuttle/escape/centcom) "Mb" = ( /obj/structure/window/reinforced{ dir = 8 @@ -22038,16 +22034,14 @@ /area/shuttle/escape/centcom) "WE" = ( /turf/unsimulated/floor{ - icon_state = "floor" - }, -/obj/machinery/vending/snack{ - name = "Free Chocolate Corp"; - prices = list() + icon_state = "wood" }, +/obj/item/weapon/stool/padded, /turf/unsimulated/floor{ - icon_state = "wood_siding4" + name = "plating"; + icon_state = "siding2" }, -/area/centcom/spawning) +/area/centcom/holding) "WF" = ( /obj/machinery/status_display{ pixel_y = -32 @@ -22354,6 +22348,29 @@ }, /area/centcom/spawning) "Xl" = ( +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/obj/structure/bed/chair/unmovable{ + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "wood_siding2" + }, +/area/centcom/spawning) +"Xm" = ( +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/obj/machinery/vending/snack{ + name = "Free Chocolate Corp"; + prices = list() + }, +/turf/unsimulated/floor{ + icon_state = "wood_siding4" + }, +/area/centcom/spawning) +"Xn" = ( /turf/unsimulated/floor{ icon_state = "floor" }, @@ -22365,7 +22382,7 @@ icon_state = "wood_siding8" }, /area/centcom/spawning) -"Xm" = ( +"Xo" = ( /turf/unsimulated/floor{ icon_state = "floor" }, @@ -22374,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 @@ -57003,7 +57036,7 @@ DM DM EP EP -Fm +WE Gq GE GF @@ -57260,7 +57293,7 @@ Fi Fo EP EP -Fm +WE Gq GF GF @@ -57517,7 +57550,7 @@ Fj Fp EP EP -Fm +WE Gq GF GF @@ -57774,7 +57807,7 @@ Fk Fp EP EP -Fm +WE Gq GF GF @@ -58031,7 +58064,7 @@ EP EP Fy EP -Fm +WE Gq GF GF @@ -58288,7 +58321,7 @@ EP EP EP EP -Fm +WE Gq GF GF @@ -64480,7 +64513,7 @@ Ms Id Id Id -WE +Xm Id Id Id @@ -64683,17 +64716,17 @@ wl xe xA yk -DJ +DL wl xe xA yk -DJ +DL wl xe xA Bp -Fl +Fm uT Cq CG @@ -64702,7 +64735,7 @@ Fn Fz GN GQ -HL +Xp VH CP VQ @@ -64736,9 +64769,9 @@ KZ Ms Id Id -Ma +Xl OY -Xm +Xo Id Id OA @@ -64993,9 +65026,9 @@ MN Ms Id Id -Ma +Xl OZ -Xm +Xo Id Id Qn @@ -65457,13 +65490,13 @@ yl yE wo xh -DL +Eh yl yE wo xh -Eh Er +ER BT uT Cq @@ -65507,9 +65540,9 @@ KZ Ms Id Id -Ma +Xl Pa -Xm +Xo Id Id OA @@ -65720,7 +65753,7 @@ yE wp xi Dr -ER +ET BT uT Cq @@ -65764,9 +65797,9 @@ Nw Ms Id Id -Ma +Xl Pb -Xm +Xo Id Id OA @@ -65966,18 +65999,18 @@ it uT wq xj -DA +DJ yl yE wq xj -DA +DJ yl yE wq xj -DA -ET +DJ +Fl BT uT Cq @@ -65987,7 +66020,7 @@ Ft FO Ig GQ -If +Xq VH CP Ds @@ -66021,9 +66054,9 @@ KZ Ms Id Id -Ma +Xl Pc -Xm +Xo Id Id OA @@ -66499,7 +66532,7 @@ CO CQ CQ GQ -Ga +If CP VD VJ @@ -66535,9 +66568,9 @@ MN Ms Id Id -Ma +Xl Pb -Xm +Xo Id Id OA @@ -66792,9 +66825,9 @@ KZ Ms Id Id -Ma +Xl Pd -Xm +Xo Id Id OA @@ -67050,7 +67083,7 @@ Ms Id Id Id -Xl +Xn Id Id Id diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 17f430e519f..f66570396d8 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -20410,10 +20410,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) @@ -20427,6 +20427,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" = ( @@ -20439,6 +20444,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" = ( @@ -20452,6 +20462,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" = ( @@ -20469,6 +20484,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" = ( @@ -21556,7 +21576,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" @@ -63264,6 +63284,11 @@ name = "Journalist's Office"; req_access = list(111) }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/journalistoffice) "ctA" = ( @@ -63323,7 +63348,7 @@ icon_state = "intact-supply"; dir = 6 }, -/obj/structure/cable{ +/obj/structure/cable/green{ d1 = 2; d2 = 4; icon_state = "2-4" @@ -63339,7 +63364,7 @@ dir = 9; pixel_y = 0 }, -/obj/structure/cable{ +/obj/structure/cable/green{ d1 = 1; d2 = 8; icon_state = "1-8" @@ -63377,7 +63402,7 @@ "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" @@ -63428,14 +63453,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{ @@ -63443,6 +63468,11 @@ }, /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" = ( @@ -63483,11 +63513,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 }, @@ -63497,6 +63522,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" = ( @@ -63556,7 +63586,7 @@ name = "south bump"; pixel_y = -24 }, -/obj/structure/cable, +/obj/structure/cable/green, /turf/simulated/floor/carpet, /area/journalistoffice) "cur" = ( From 95b586e5101cc3b7ab39c66cac77bbf039a57f5b Mon Sep 17 00:00:00 2001 From: skull132 Date: Mon, 18 Jun 2018 22:26:11 +0300 Subject: [PATCH 05/26] Changelogs, 18JUN2018 --- html/changelog.html | 11 +++++ html/changelogs/.all_changelog.yml | 15 +++++++ html/changelogs/Sindorman-bugfixing.yml | 8 ---- .../ben10083 - Vault_Security_Increase.yml | 37 ----------------- html/changelogs/burgerbb-postfixes.yml | 40 ------------------- 5 files changed, 26 insertions(+), 85 deletions(-) delete mode 100644 html/changelogs/Sindorman-bugfixing.yml delete mode 100644 html/changelogs/ben10083 - Vault_Security_Increase.yml delete mode 100644 html/changelogs/burgerbb-postfixes.yml diff --git a/html/changelog.html b/html/changelog.html index ac72a26b4ff..0886c8f6f1b 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -77,6 +77,10 @@
  • Gave wrenches to mining drones and mining cyborgs, so synthetics can tinker with custom KAs.
  • Improved the shuttle and docks design.
  • Users will now be automatically threatened with a day ban if they mention the phrase 'Organ Damage'.
    • +
  • Fixed library books spawning outside of shelves.
    • +
  • Fixed kinetic accelerators displaying an error when equipped on the waist.
    • +
  • Balances kinetic accelerator research to prevent easy research exploit. Balances traitor kinetic accelerator to be less powerful.
    • +
  • 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 updated:

      @@ -114,6 +118,9 @@
    • IPCs can not be convertable to cult.
    • IPCs can no longer draw runes, since they have no blood. They still can use talismans
    • Cultist IPCs are immune to cultist EMP from runes or talismans.
      • +
    • Fixed Journalist Office missing power cables.
      • +
    • Journalist Office is now connected to the bridge subgrid, instead of main grid.
      • +
    • Shuttle wall structures that are on the corners have been moved one tile in different directions, so that it looks good.

    Scheveningen updated:

      @@ -121,6 +128,10 @@
    • Direct flashes no longer stun those who are -not- sentient trees, robots, or bugpeople.
    • Changed how flash break mechanics work. Crappy budget NT tech is more likely to break from overuse.
    +

    ben10083 updated:

    +
      +
    • Following multiple security breaches and thefts from the vault, NanoTrasen has increased security in the main vault.
      • +

    16 June 2018

    Arrow768 updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index b15b38cd388..c8af80006dd 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,17 @@ 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. diff --git a/html/changelogs/Sindorman-bugfixing.yml b/html/changelogs/Sindorman-bugfixing.yml deleted file mode 100644 index cf53cef977f..00000000000 --- a/html/changelogs/Sindorman-bugfixing.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: PoZe - -delete-after: True - -changes: - - 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." diff --git a/html/changelogs/ben10083 - Vault_Security_Increase.yml b/html/changelogs/ben10083 - Vault_Security_Increase.yml deleted file mode 100644 index a275e77f992..00000000000 --- a/html/changelogs/ben10083 - Vault_Security_Increase.yml +++ /dev/null @@ -1,37 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -# balance -################################# - -# Your name. -author: ben10083 - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - maptweak: "Following multiple security breaches and thefts from the vault, NanoTrasen has increased security in the main vault." diff --git a/html/changelogs/burgerbb-postfixes.yml b/html/changelogs/burgerbb-postfixes.yml deleted file mode 100644 index ff9c5243e0e..00000000000 --- a/html/changelogs/burgerbb-postfixes.yml +++ /dev/null @@ -1,40 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -# balance -################################# - -# Your name. -author: BurgerBB - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - 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." \ No newline at end of file From 3b1355beea215b73b08ca1035dce81f3189563ae Mon Sep 17 00:00:00 2001 From: BurgerLUA Date: Wed, 20 Jun 2018 12:07:59 -0700 Subject: [PATCH 06/26] More Fixes (#4910) Someone didn't do a mapmerge properly and broke PR #4826 Also adds missing holopads to areas without holopads, like hydroponics and the chaplain's office. --- html/changelogs/burgerbb-fixes.yml | 38 ++++++ maps/aurora/aurora-4_mainlevel.dmm | 207 +++++++++++++++++------------ 2 files changed, 157 insertions(+), 88 deletions(-) create mode 100644 html/changelogs/burgerbb-fixes.yml diff --git a/html/changelogs/burgerbb-fixes.yml b/html/changelogs/burgerbb-fixes.yml new file mode 100644 index 00000000000..dad93de17ed --- /dev/null +++ b/html/changelogs/burgerbb-fixes.yml @@ -0,0 +1,38 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: BurgerBB + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Readds disposal spread in disposals. Re-fixes the scrubber vent in the warehouse mail room." + - maptweak: "Adds holopads to missing areas without holopads." diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index f66570396d8..1bc8f12b4a3 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -3096,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{ @@ -3289,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"; @@ -3570,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." @@ -48005,27 +48111,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 @@ -52094,15 +52179,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; @@ -58404,18 +58480,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{ @@ -61458,14 +61522,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 @@ -64715,31 +64771,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/storage) -"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{ @@ -89131,8 +89162,8 @@ cjw cea ceF cea -cfd -cfq +ahv +ahw cfE cfP cfZ @@ -89371,7 +89402,7 @@ bWm cih cim cxI -bXT +agu cxJ bWm cbs @@ -89867,7 +89898,7 @@ bdJ bRL con coA -coN +agQ coY cpk cpt @@ -90105,7 +90136,7 @@ bCw bDp bEp bFn -bGl +ahu bHt bFj bJn @@ -90897,7 +90928,7 @@ cor coF coR bSO -bSO +agR bSO bSO cpT @@ -91916,7 +91947,7 @@ bNi bNL bOt bOZ -bPB +aht bQa bQD bRf @@ -94515,9 +94546,9 @@ bUz bPO bPK cbD -cxN ccf -cxN +ccf +ccf cdh aaa aab @@ -94772,9 +94803,9 @@ bUz caW bPL cbE -cxL +ags ccf -cxO +agt cdh aab aab @@ -95287,7 +95318,7 @@ bPO bPL cbE cbE -cxM +agr cbE cdh cdt @@ -97308,7 +97339,7 @@ cvC cvH cvU cww -cww +agq cww cxj bGA From b146ec5307849ead380c79bee934c57ca4d4fd8a Mon Sep 17 00:00:00 2001 From: BurgerLUA Date: Wed, 20 Jun 2018 12:08:44 -0700 Subject: [PATCH 07/26] Fixes #4915 (#4916) Caused by my terminal stupidity and forgetting to extend the area when extending the size of the docks. --- .../burgerbb-mapfixnumber51725765166523.yml | 37 +++++++++++ maps/aurora/aurora-6_surface.dmm | 61 ++++++++----------- 2 files changed, 63 insertions(+), 35 deletions(-) create mode 100644 html/changelogs/burgerbb-mapfixnumber51725765166523.yml diff --git a/html/changelogs/burgerbb-mapfixnumber51725765166523.yml b/html/changelogs/burgerbb-mapfixnumber51725765166523.yml new file mode 100644 index 00000000000..ca1ac6e06a3 --- /dev/null +++ b/html/changelogs/burgerbb-mapfixnumber51725765166523.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: BurgerBB + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed hull shields not covering departures properly." diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index d0291fb2c48..fcff63a44fa 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; @@ -19305,18 +19308,6 @@ }, /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/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/red{ @@ -47770,7 +47761,7 @@ aa aa aa aa -ab +eI fT jU kY @@ -48284,7 +48275,7 @@ aa aa aa aa -eL +eK fR JA hC @@ -48300,7 +48291,7 @@ la lx JA kZ -eL +eK aa aa aa @@ -48541,7 +48532,7 @@ aa aa aa aa -eL +eK fU gD iW @@ -48557,7 +48548,7 @@ ja lw Jr JK -eL +eK aa aa aa @@ -48798,7 +48789,7 @@ aa aa aa aa -eL +eK gB gG iY @@ -48814,7 +48805,7 @@ lz Ju Jy JL -eL +eK aa aa aa @@ -49055,7 +49046,7 @@ aa aa aa aa -eL +eK fU kw kq @@ -49071,7 +49062,7 @@ iZ Jv kw JM -eL +eK aa aa aa @@ -49312,7 +49303,7 @@ aa aa aa aa -eL +eK fU kw Jp @@ -49328,7 +49319,7 @@ ja JE kw JM -eL +eK aa aa aa @@ -49569,7 +49560,7 @@ aa aa aa aa -eL +eK Jh JF hA @@ -49585,7 +49576,7 @@ JC Js JJ JN -eL +eK aa aa aa @@ -49826,7 +49817,7 @@ aa aa aa aa -fg +eL is gA kt @@ -49842,7 +49833,7 @@ jX Jw Jx is -JH +fg aa aa aa From 7a687df0b457dd368f33f2327eb39bdf35345aec Mon Sep 17 00:00:00 2001 From: skull132 Date: Wed, 20 Jun 2018 22:41:57 +0300 Subject: [PATCH 08/26] Changelogs, 20JUN2018 --- html/changelog.html | 8 ++++ html/changelogs/.all_changelog.yml | 6 +++ html/changelogs/burgerbb-fixes.yml | 38 ------------------- .../burgerbb-mapfixnumber51725765166523.yml | 37 ------------------ 4 files changed, 14 insertions(+), 75 deletions(-) delete mode 100644 html/changelogs/burgerbb-fixes.yml delete mode 100644 html/changelogs/burgerbb-mapfixnumber51725765166523.yml diff --git a/html/changelog.html b/html/changelog.html index 0886c8f6f1b..92cba0f8417 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,14 @@ -->
    +

    20 June 2018

    +

    BurgerBB updated:

    +
      +
    • Readds disposal spread in disposals. Re-fixes the scrubber vent in the warehouse mail room.
      • +
    • Adds holopads to missing areas without holopads.
      • +
    • Fixed hull shields not covering departures properly.
      • +
    +

    18 June 2018

    Alberyk updated: