From 93cfe375de34dc49188ddbf0897b17b3b2009261 Mon Sep 17 00:00:00 2001 From: "mport2004@gmail.com" Date: Thu, 29 Sep 2011 06:32:40 +0000 Subject: [PATCH] Wire fix for the detectives office and quickfix for jobs. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2291 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/new_player/preferences.dm | 3 ++- maps/tgstation.2.0.8.dmm | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 55bcc5a96c9..29e2a67930e 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -504,6 +504,7 @@ datum/preferences occupation[job] = 4 else occupation[job] = 0 + return 1 if(occupation[job] == 0)//Only one job may be set to "High" for(var/j in occupation) @@ -516,7 +517,7 @@ datum/preferences SetChoices(user) - return + return 1 proc/process_link(mob/user, list/link_tags) diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 998a8a0224d..05239f5ef94 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -272,7 +272,7 @@ "afl" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/prison/control) "afm" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/security{name = "Prison Control Room"; req_access = null; req_access_txt = "1"},/turf/simulated/floor,/area/prison/control) "afn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/prison/control) -"afo" = (/obj/machinery/power/apc{dir = 4; name = "Prison Control Room APC"; pixel_x = -23; pixel_y = 0},/obj/cable,/turf/simulated/floor{icon_state = "red"; dir = 8},/area/prison/control) +"afo" = (/obj/machinery/power/apc{dir = 8; name = "Prison Control Room APC"; pixel_x = -23; pixel_y = 0},/obj/cable,/turf/simulated/floor{icon_state = "red"; dir = 8},/area/prison/control) "afp" = (/obj/table,/obj/item/device/timer,/turf/simulated/floor,/area/prison/control) "afq" = (/obj/machinery/light{dir = 4},/obj/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/prison/control) "afr" = (/turf/simulated/wall/r_wall,/area/prison/control) @@ -793,7 +793,7 @@ "apm" = (/obj/grille,/obj/window/reinforced{dir = 8},/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "apn" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "apo" = (/turf/simulated/floor{dir = 9; icon_state = "carpetside"},/area/security/detectives_office) -"app" = (/obj/table/woodentable,/obj/item/weapon/cigpacket,/obj/item/clothing/glasses/thermal,/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/security/detectives_office) +"app" = (/obj/table/woodentable,/obj/item/weapon/cigpacket,/obj/item/clothing/glasses/thermal,/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/security/detectives_office) "apq" = (/obj/table/woodentable,/turf/simulated/floor{dir = 5; icon_state = "carpetside"},/area/security/detectives_office) "apr" = (/obj/table/woodentable,/obj/machinery/light/lamp/green{pixel_x = 1; pixel_y = 5},/obj/deskclutter,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "aps" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/lawoffice) @@ -822,7 +822,7 @@ "apP" = (/obj/grille,/obj/window/reinforced{dir = 8},/obj/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "apQ" = (/obj/machinery/requests_console{department = "Detective's office"; pixel_x = -30; pixel_y = 0},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "apR" = (/turf/simulated/floor{dir = 8; icon_state = "carpetside"},/area/security/detectives_office) -"apS" = (/obj/table/woodentable,/obj/item/weapon/pen,/obj/item/weapon/hand_labeler,/obj/item/device/taperecorder{pixel_y = 0},/obj/item/weapon/paper,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/security/detectives_office) +"apS" = (/obj/table/woodentable,/obj/item/weapon/pen,/obj/item/weapon/hand_labeler,/obj/item/device/taperecorder{pixel_y = 0},/obj/item/weapon/paper,/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/security/detectives_office) "apT" = (/obj/stool/chair{dir = 8},/obj/landmark/start{name = "Detective"},/turf/simulated/floor{dir = 4; icon_state = "carpetside"},/area/security/detectives_office) "apU" = (/obj/machinery/computer/security/wooden_tv,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "apV" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice)