From 56fc1cf5f18522c726bef7c8fc180ddf258136c8 Mon Sep 17 00:00:00 2001 From: Mykhailo Bykhovtsev Date: Sat, 6 Oct 2018 01:37:49 -0700 Subject: [PATCH] CC upgrades (#5359) This is just #5063 without merge conflict and tiny bit of my own additions. --- html/changelogs/Sindorman-centra-remap.yml | 13 + maps/aurora/aurora-1_centcomm.dmm | 356 +++++++++++++-------- 2 files changed, 238 insertions(+), 131 deletions(-) create mode 100644 html/changelogs/Sindorman-centra-remap.yml diff --git a/html/changelogs/Sindorman-centra-remap.yml b/html/changelogs/Sindorman-centra-remap.yml new file mode 100644 index 00000000000..a87ad7fd3a9 --- /dev/null +++ b/html/changelogs/Sindorman-centra-remap.yml @@ -0,0 +1,13 @@ +author: PoZe, 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: "Nanotrasen has hired a designer to remake the interview room on the Odin." + - maptweak: "ERT Cmdr's Spec Ops ready room button now does not include the Admin shuttle, the button for the Admin shuttle is now beside it's door. The Spec Ops button is also renamed." diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index b37b02cc1db..815f56cf7d3 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -7922,7 +7922,8 @@ }, /area/centcom/living) "sE" = ( -/obj/structure/filingcabinet, +/obj/structure/table/wood, +/obj/machinery/chemical_dispenser/coffee/full, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -7971,45 +7972,6 @@ icon_state = "warnplate" }, /area/centcom/living) -"sK" = ( -/obj/structure/table/wood, -/obj/item/device/radio/phone, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/unsimulated/floor{ - dir = 9; - icon_state = "carpetside" - }, -/area/centcom/living) -"sL" = ( -/obj/structure/bed/chair, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "carpetside" - }, -/area/centcom/living) -"sM" = ( -/obj/structure/table/wood, -/obj/item/weapon/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, -/obj/item/weapon/pen, -/turf/unsimulated/floor{ - dir = 5; - icon_state = "carpetside" - }, -/area/centcom/living) -"sN" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/area/centcom/living) "sO" = ( /obj/machinery/door/airlock/external{ frequency = 1380; @@ -8051,11 +8013,9 @@ }, /area/centcom/living) "sS" = ( -/obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/structure/flora/pottedplant/random, /turf/unsimulated/floor{ - dir = 10; - icon_state = "carpetside" + icon_state = "floor" }, /area/centcom/living) "sT" = ( @@ -8065,13 +8025,6 @@ icon_state = "carpetside" }, /area/centcom/living) -"sU" = ( -/obj/structure/table/wood, -/turf/unsimulated/floor{ - dir = 6; - icon_state = "carpetside" - }, -/area/centcom/living) "sV" = ( /turf/unsimulated/wall/riveted, /area/centcom/suppy) @@ -8143,15 +8096,6 @@ icon_state = "floor" }, /area/centcom/living) -"td" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/area/centcom/living) "te" = ( /turf/unsimulated/floor{ icon_state = "warnplate"; @@ -8314,7 +8258,9 @@ locked = 1; name = "To: Administration Level" }, -/turf/unsimulated/wall/riveted, +/turf/unsimulated/floor{ + icon_state = "floor" + }, /area/centcom/suppy) "tC" = ( /turf/simulated/shuttle/floor, @@ -9512,7 +9458,7 @@ }, /area/centcom/creed) "wb" = ( -/obj/structure/bed/chair{ +/obj/structure/bed/chair/office/bridge{ dir = 4 }, /turf/unsimulated/floor{ @@ -9536,7 +9482,7 @@ /obj/machinery/door/blast/regular{ dir = 1; icon_state = "pdoor1"; - id = "CREED"; + id = "ADMIN_SHUTTLE"; name = "Ready Room"; p_open = 0 }, @@ -9894,10 +9840,12 @@ }, /area/centcom/specops) "wT" = ( -/obj/machinery/light{ - dir = 1; - icon_state = "tube1"; - pixel_y = 0 +/obj/machinery/button/remote/blast_door{ + id = "ADMIN_SHUTTLE"; + name = "Administration Shuttle"; + pixel_x = 0; + pixel_y = 26; + req_access = list(101); }, /turf/unsimulated/floor{ icon_state = "dark" @@ -11104,7 +11052,8 @@ }, /area/centcom/control) "zn" = ( -/obj/structure/bed/chair{ +/obj/structure/bed/chair/office/bridge{ + icon_state = "bridge"; dir = 8 }, /turf/unsimulated/floor{ @@ -11148,7 +11097,7 @@ }, /area/centcom/control) "zr" = ( -/obj/structure/bed/chair{ +/obj/structure/bed/chair/office/bridge{ dir = 4 }, /turf/unsimulated/floor{ @@ -11350,7 +11299,7 @@ }, /area/centcom/control) "zJ" = ( -/obj/structure/bed/chair, +/obj/structure/bed/chair/office/bridge, /obj/effect/landmark{ name = "CCIAAgent" }, @@ -11621,7 +11570,7 @@ }, /area/centcom/control) "Ao" = ( -/obj/structure/bed/chair, +/obj/structure/bed/chair/office/bridge, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -20249,7 +20198,9 @@ name = "Traditional Vaurcesian Cuisine"; opacity = 1 }, -/turf/unsimulated/wall/riveted, +/turf/unsimulated/floor{ + icon_state = "floor" + }, /area/centcom/spawning) "SH" = ( /obj/structure/cult/tome, @@ -22576,6 +22527,149 @@ icon_state = "wood_siding1" }, /area/centcom/spawning) +"XQ" = ( +/obj/structure/table/wood, +/obj/item/weapon/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/weapon/pen, +/turf/unsimulated/floor{ + dir = 10; + icon_state = "carpetside" + }, +/area/centcom/living) +"Yc" = ( +/obj/structure/table/wood, +/obj/item/device/flashlight/lamp, +/turf/unsimulated/floor{ + dir = 6; + icon_state = "carpetside" + }, +/area/centcom/living) +"Yl" = ( +/obj/structure/bed/chair/comfy/blue{ + icon_state = "comfychair_preview"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/area/centcom/living) +"Yp" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "wood" + }, +/area/centcom/living) +"Yr" = ( +/obj/structure/banner, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "wood" + }, +/area/centcom/living) +"Ys" = ( +/obj/machinery/light/small, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/centcom/specops) +"Yw" = ( +/obj/machinery/light{ + dir = 1; + icon_state = "tube1"; + pixel_y = 0 + }, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/centcom/specops) +"Yy" = ( +/obj/structure/bed/chair/comfy/red{ + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/area/centcom/living) +"YS" = ( +/obj/structure/bed/chair/office/bridge, +/turf/unsimulated/floor{ + dir = 1; + icon_state = "carpetside" + }, +/area/centcom/living) +"YV" = ( +/obj/structure/banner, +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/area/centcom/living) +"YX" = ( +/obj/structure/table/wood, +/obj/item/device/radio/phone, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/unsimulated/floor{ + dir = 5; + icon_state = "carpetside" + }, +/area/centcom/living) +"Zh" = ( +/obj/structure/filingcabinet, +/turf/unsimulated/floor{ + dir = 9; + icon_state = "carpetside" + }, +/area/centcom/living) +"Zk" = ( +/obj/structure/flora/pottedplant/random, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "wood" + }, +/area/centcom/living) +"ZG" = ( +/obj/structure/bed/chair/office/dark, +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/area/centcom/control) +"ZI" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/obj/structure/bed/chair/comfy/red{ + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/area/centcom/living) +"ZU" = ( +/obj/machinery/photocopier, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "wood" + }, +/area/centcom/living) +"ZV" = ( +/obj/structure/bed/chair/comfy/blue{ + icon_state = "comfychair_preview"; + dir = 1 + }, +/turf/unsimulated/floor{ + dir = 8; + icon_state = "wood" + }, +/area/centcom/living) (1,1,1) = {" aa @@ -56661,7 +56755,7 @@ pU vf vf wS -wS +Ys ve ve zG @@ -57686,7 +57780,7 @@ uT uT uT uT -wS +Yw xu yd ve @@ -58711,7 +58805,7 @@ pW pW uX vh -vh +ZG vO uT wV @@ -60844,7 +60938,7 @@ Id Om Id SG -aM +aP aM aM aM @@ -62285,8 +62379,8 @@ aM aM aM aM -aM -aM +pW +pW pW pW pW @@ -62542,17 +62636,17 @@ aM aM aM aM -aM -aM -aM -aM -aM pW -sE -sK -sS +Zk +Yp sF +sF +Yp +sE pW +sS +ZI +Yy rI pW it @@ -62799,18 +62893,18 @@ aM aM aM aM -aM -aM -aM -aM -aM sq sF -sL -sT -td +Zh +XQ +sF +sF +Yr pW -tA +YV +rI +rI +rI sq aM aM @@ -63056,18 +63150,18 @@ aM aM aM aM -aM -aM -aM -aM -aM sq sF -sM -sU +YS +sT +ZV +sF sF tp rI +rI +rI +rI sq aM aM @@ -63313,17 +63407,17 @@ aM aM aM aM -aM -aM -aM -aM -aM -pW -sF -sN -sF -sF +sq +sF +YX +Yc +sF +sF +Yr pW +YV +rI +rI rI sq aM @@ -63570,17 +63664,17 @@ aM aM aM aM -aM -aM -aM -aM -aM -pW -pW -pW -pW pW +Zk +sF +sF +sF +sF +ZU pW +sS +Yl +Yl rI sq aM @@ -63827,16 +63921,16 @@ aM aM aM aM -aM -aM -aM -aM -aM -aM -aM -aM -aM -aM +pW +pW +sq +sq +sq +sq +pW +pW +pW +pW pW tA sq