From 3f58a1bb730ac0a816cb4da6747754e517473aac Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 5 Jan 2012 00:31:23 -0700 Subject: [PATCH] Final fix, I think. --- code/modules/recycling/sortingmachinery.dm | 12 ++++++++++++ maps/tgstation.2.0.8.dmm | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 8548c92b2a1..3ace332a034 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -60,6 +60,18 @@ var/obj/item/device/destTagger/O = W user << "\blue *TAGGED*" src.sortTag = O.currTag + else if(istype(W, /obj/item/weapon/pen)) + var/str = input(usr,"Label text?","Set label","") + if(!str || !length(str)) + usr << "\red Invalid text." + return + if(length(str) > 64) + usr << "\red Text too long." + return + var/label = str + for(var/mob/M in viewers()) + M << "\blue [user] labels [src] as [label]." + src.name = "[src.name] ([label])" return diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index bcd628608dc..019a8d7bc23 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -3158,7 +3158,7 @@ "biL" = (/obj/structure/stool/chair{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "biM" = (/obj/machinery/door/firedoor/border_only,/obj/structure/table/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/window/eastright{name = "Chemistry Desk"},/obj/machinery/door/window/westleft{name = "Chemistry Desk"; req_access_txt = "33"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/disposalpipe/sortjunction{backsort = 1; dir = 4; icon_state = "pipe-j1s"; sortType = list("Genetics")},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "biN" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) -"biO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/sortjunction{backsort = 1; dir = 4; icon_state = "pipe-j2s"; sortType = list("Chemistry")},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) +"biO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/sortjunction{backsort = 1; dir = 8; icon_state = "pipe-j1s"; sortType = list("Chemistry")},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "biP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/disposalpipe/sortjunction{sortType = list("Chemistry","Genetics","Morgue")},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "biQ" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 4; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/wall/r_wall,/area/toxins/lab) "biR" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) @@ -3590,7 +3590,7 @@ "brb" = (/obj/machinery/light,/obj/structure/disposalpipe/sortjunction{backsort = 1; icon_state = "pipe-j2s"; sortType = list("HoP Office")},/turf/simulated/floor,/area/hallway/primary/aft) "brc" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/hallway/primary/aft) "brd" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/hallway/primary/aft) -"bre" = (/obj/structure/disposalpipe/sortjunction{backsort = 0; dir = 4; icon_state = "pipe-j1s"; sortType = list("HoP Office")},/turf/simulated/floor,/area/hallway/primary/aft) +"bre" = (/obj/structure/disposalpipe/sortjunction{backsort = 0; dir = 8; icon_state = "pipe-j1s"; sortType = list("HoP Office")},/turf/simulated/floor,/area/hallway/primary/aft) "brf" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/hallway/primary/aft) "brg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/maintenance/asmaint) "brh" = (/obj/machinery/atmospherics/pipe/tank/air,/turf/simulated/floor/plating,/area/maintenance/asmaint)