diff --git a/html/changelogs/190921-bugfix_exoduscont.yml b/html/changelogs/190921-bugfix_exoduscont.yml new file mode 100644 index 00000000000..81a7faf0b6b --- /dev/null +++ b/html/changelogs/190921-bugfix_exoduscont.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Ferner + +# 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: "Fixed engine blast doors opening during power failures, added a request console to the rep office, added chem heaters to the chem labs, misc fixes." diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm index 8cf24b53de5..2acda478f4b 100644 --- a/maps/exodus/exodus-1_station.dmm +++ b/maps/exodus/exodus-1_station.dmm @@ -11073,15 +11073,10 @@ /turf/simulated/wall/r_wall, /area/hallway/secondary/entry/fore) "aub" = ( -/obj/item/stack/material/phoron, -/obj/item/stack/material/phoron, -/obj/item/stack/material/phoron, -/obj/item/stack/material/phoron, -/obj/item/stack/material/phoron, -/obj/structure/table/glass, /obj/machinery/alarm{ pixel_y = 25 }, +/obj/machinery/chem_heater, /turf/simulated/floor/tiled/white, /area/medical/pharmacy) "auc" = ( @@ -19847,6 +19842,8 @@ /obj/item/device/eftpos{ eftpos_name = "Chapel EFTPOS scanner" }, +/obj/item/weapon/nullrod/obsidianshards, +/obj/item/weapon/reagent_containers/spray/aspergillum, /turf/simulated/floor/carpet, /area/chapel/office) "aKW" = ( @@ -35867,6 +35864,9 @@ /area/maintenance/substation/command) "boq" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/camera/network/command{ + c_tag = "Bridge Substation" + }, /turf/simulated/floor/plating, /area/maintenance/substation/command) "bor" = ( @@ -37894,7 +37894,7 @@ dir = 4 }, /obj/machinery/door/airlock/hatch{ - name = "Command Substation"; + name = "Command Substation and Shield Generators"; req_one_access = list(11,24) }, /obj/machinery/door/firedoor, @@ -38132,6 +38132,21 @@ }, /obj/item/weapon/screwdriver, /obj/structure/table/glass, +/obj/item/stack/material/phoron{ + pixel_y = 16 + }, +/obj/item/stack/material/phoron{ + pixel_y = 16 + }, +/obj/item/stack/material/phoron{ + pixel_y = 16 + }, +/obj/item/stack/material/phoron{ + pixel_y = 16 + }, +/obj/item/stack/material/phoron{ + pixel_y = 16 + }, /turf/simulated/floor/tiled/white, /area/medical/pharmacy) "bsA" = ( @@ -64568,6 +64583,7 @@ dir = 4; icon_state = "tube1" }, +/obj/item/weapon/storage/bag/circuits/basic, /turf/simulated/floor/tiled, /area/engineering/locker_room) "cnm" = ( @@ -66231,6 +66247,10 @@ c_tag = "Atmospherics Northeast" }, /obj/structure/table/steel, +/obj/item/weapon/pipewrench, +/obj/item/weapon/pipewrench, +/obj/item/weapon/pipewrench, +/obj/item/weapon/pipewrench, /turf/simulated/floor/tiled, /area/engineering/atmos) "cqp" = ( @@ -75683,6 +75703,7 @@ dir = 4; icon_state = "pdoor0"; id = "EngineBlast"; + is_critical = 1; name = "Engine Monitoring Room Blast Doors"; opacity = 0 }, @@ -75699,6 +75720,7 @@ dir = 4; icon_state = "pdoor0"; id = "EngineBlast"; + is_critical = 1; name = "Engine Monitoring Room Blast Doors"; opacity = 0 }, @@ -75715,6 +75737,7 @@ dir = 4; icon_state = "pdoor0"; id = "EngineBlast"; + is_critical = 1; name = "Engine Monitoring Room Blast Doors"; opacity = 0 }, @@ -75736,6 +75759,7 @@ dir = 4; icon_state = "pdoor0"; id = "EngineBlast"; + is_critical = 1; name = "Engine Monitoring Room Blast Doors"; opacity = 0 }, @@ -76674,6 +76698,7 @@ dir = 4; icon_state = "pdoor0"; id = "SupermatterPort"; + is_critical = 1; layer = 2.7; name = "Reactor Blast Door"; opacity = 0 @@ -76894,6 +76919,7 @@ density = 0; icon_state = "pdoor0"; id = "SupermatterPort"; + is_critical = 1; layer = 2.7; name = "Reactor Blast Door"; opacity = 0 @@ -76969,6 +76995,7 @@ density = 0; icon_state = "pdoor0"; id = "SupermatterPort"; + is_critical = 1; layer = 2.7; name = "Reactor Blast Door"; opacity = 0 @@ -77263,6 +77290,7 @@ density = 0; icon_state = "pdoor0"; id = "SupermatterPort"; + is_critical = 1; layer = 2.7; name = "Reactor Blast Door"; opacity = 0 @@ -77313,6 +77341,7 @@ density = 0; icon_state = "pdoor0"; id = "SupermatterPort"; + is_critical = 1; layer = 2.7; name = "Reactor Blast Door"; opacity = 0 @@ -77413,6 +77442,7 @@ density = 0; icon_state = "pdoor0"; id = "SupermatterPort"; + is_critical = 1; layer = 2.7; name = "Reactor Blast Door"; opacity = 0 @@ -77449,6 +77479,7 @@ density = 0; icon_state = "pdoor0"; id = "SupermatterPort"; + is_critical = 1; layer = 2.7; name = "Reactor Blast Door"; opacity = 0 @@ -77952,6 +77983,15 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/crew_quarters/locker) +"eXE" = ( +/obj/machinery/requests_console{ + department = "Representative's Office"; + departmentType = 5; + pixel_x = 0; + pixel_y = -28 + }, +/turf/simulated/floor/carpet, +/area/space) "fhn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -78593,10 +78633,6 @@ temperature = 278 }, /area/security/forensics_office) -"kmI" = ( -/obj/item/weapon/storage/bag/circuits/basic, -/turf/simulated/wall/r_wall, -/area/engineering/workshop) "knl" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -104182,7 +104218,7 @@ pnI aVr aWZ mfF -nxA +eXE bbY bdD bfb @@ -110394,7 +110430,7 @@ ccA ckr clK cif -kmI +col cpu cpx cpx @@ -110651,7 +110687,7 @@ ccB cks clL cif -kmI +col cpv cpx cpx diff --git a/maps/exodus/exodus-5_asteroid.dmm b/maps/exodus/exodus-5_asteroid.dmm index 2f1e9b9c1d7..f0cfeaad3e6 100644 --- a/maps/exodus/exodus-5_asteroid.dmm +++ b/maps/exodus/exodus-5_asteroid.dmm @@ -562,6 +562,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 1 }, +/obj/machinery/chem_heater, /turf/simulated/floor/tiled, /area/outpost/research/chemistry) "br" = (