From 81efa15d25c6b573f57ae24c0c1c9fd3df1b487e Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Fri, 26 Oct 2012 23:36:44 +0000 Subject: [PATCH] Whoops, forgot to add Poly in my last commit due to map conflicts. Better late than never. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4963 316c924e-a436-60f5-8080-3fe189b3f50e --- html/changelog.html | 1 + maps/tgstation.2.0.9.dmm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/html/changelog.html b/html/changelog.html index 48ddbaa15d5..9bbfcfd1bb3 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
  • Added a camera and hand labeler to art storage.
  • Added a medical records cabinet to the Detective's office.
  • Added a safe to the vault. Who'll be the first to crack it?
    • +
  • The CE has a new pet...
    • diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm index c33697893b2..a164e2cf0f9 100644 --- a/maps/tgstation.2.0.9.dmm +++ b/maps/tgstation.2.0.9.dmm @@ -5529,7 +5529,7 @@ "ccq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/engine/engineering) "ccr" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/machinery/door/airlock/glass_engineering{name = "Engineering Break room"; req_access_txt = "10"; req_one_access_txt = "0"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/engine/engineering) "ccs" = (/obj/structure/closet/secure_closet/engineering_chief{req_access_txt = "0"},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office) -"cct" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office) +"cct" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/disposalpipe/segment,/mob/living/simple_animal/parrot/Poly,/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office) "ccu" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office) "ccv" = (/obj/machinery/power/apc{dir = 1; name = "CE office APC"; pixel_x = 0; pixel_y = 25},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office) "ccw" = (/obj/machinery/hologram/holopad,/obj/machinery/door_control{desc = "A remote control-switch for the engineering security doors."; id = "Engineering"; name = "Engineering Lockdown"; pixel_x = 24; pixel_y = 5},/obj/machinery/door_control{desc = "A remote control-switch for secure storage."; id = "Secure Storage"; name = "Engineering Secure Storage"; pixel_x = 24; pixel_y = -5},/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office)