From 84fd3fdd3433d875065a587675834c4cbcac8428 Mon Sep 17 00:00:00 2001 From: hunterluthi Date: Mon, 4 Apr 2011 07:33:54 +0000 Subject: [PATCH] Fixed a compilation error in mining.dm Also fixed a wiring mistake of my own in my last commit. Yaaay fuckups. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1365 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/mining.dm | 3 ++- maps/tgstation.2.0.5.dmm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm index 3b5dc3ec5c4..ea51d311ff9 100644 --- a/code/WorkInProgress/mining.dm +++ b/code/WorkInProgress/mining.dm @@ -780,7 +780,8 @@ proc/move_mining_shuttle() var/turf/T = user.loc if (!( istype(T, /turf) )) return -*///Watch your tabbing, microwave. --NEO +*/ +//Watch your tabbing, microwave. --NEO user << "\red You start picking." playsound(user, 'Genhit.ogg', 20, 1) diff --git a/maps/tgstation.2.0.5.dmm b/maps/tgstation.2.0.5.dmm index 8f586d12a92..98696024a47 100644 --- a/maps/tgstation.2.0.5.dmm +++ b/maps/tgstation.2.0.5.dmm @@ -2383,7 +2383,7 @@ "aTQ" = (/obj/grille,/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 8},/obj/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hallway/secondary/entry) "aTR" = (/obj/machinery/power/apc{name = "Delivery Sorting APC"; pixel_y = -25},/obj/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor{icon_state = "arrival"; dir = 10},/area/quartermaster/sorting) "aTS" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "arrival"},/area/quartermaster/sorting) -"aTT" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{icon_state = "arrival"},/area/quartermaster/sorting) +"aTT" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "arrival"},/area/quartermaster/sorting) "aTU" = (/obj/machinery/light,/obj/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor{icon_state = "arrival"},/area/quartermaster/sorting) "aTV" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/camera{c_tag = "Delivery Office"; dir = 1; network = "SS13"},/turf/simulated/floor{icon_state = "arrival"},/area/quartermaster/sorting) "aTW" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/port)