From d4a2a37b50b8b9ea81a0bbb9cb3172ad39cfb325 Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Wed, 28 Mar 2012 19:41:12 +0000 Subject: [PATCH] removed paint with muskets' permission it sucked git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3369 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/weapons/paint.dm | 2 ++ maps/tgstation.2.0.8.dmm | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index eb51255b517..5de9a90a0bc 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -1,3 +1,5 @@ +//NEVER USE THIS IT SUX -PETETHEGOAT + var/global/list/cached_icons = list() /obj/item/weapon/paint diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 015cc2d7e76..8212ba247d8 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -1857,7 +1857,7 @@ "aJK" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 8; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/storage/art) "aJL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/table,/obj/item/weapon/cable_coil,/obj/item/weapon/cable_coil/blue,/obj/item/weapon/cable_coil/green,/obj/item/weapon/cable_coil/yellow,/turf/simulated/floor,/area/storage/art) "aJM" = (/turf/simulated/floor,/area/storage/art) -"aJN" = (/obj/structure/table,/obj/item/weapon/paint/anycolor,/obj/item/weapon/paint/anycolor,/turf/simulated/floor,/area/storage/art) +"aJN" = (/obj/structure/table,/obj/item/toy/blink,/turf/simulated/floor,/area/storage/art) "aJO" = (/turf/simulated/wall,/area/storage/tools) "aJP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/storage/tools) "aJQ" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Tool Storage"; req_access_txt = "12"},/turf/simulated/floor,/area/storage/tools) @@ -1916,7 +1916,7 @@ "aKR" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/crew_quarters/locker) "aKS" = (/obj/structure/table,/obj/item/weapon/cable_coil,/obj/item/weapon/cable_coil/blue,/obj/item/weapon/cable_coil/green,/obj/item/weapon/cable_coil/yellow,/turf/simulated/floor,/area/storage/art) "aKT" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor,/area/storage/art) -"aKU" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "Art Storage APC"; pixel_x = 27; pixel_y = 2},/obj/structure/table,/obj/item/weapon/paint/anycolor,/obj/item/weapon/paint/anycolor,/turf/simulated/floor,/area/storage/art) +"aKU" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "Art Storage APC"; pixel_x = 27; pixel_y = 2},/obj/structure/table,/turf/simulated/floor,/area/storage/art) "aKV" = (/obj/effect/landmark{name = "blobstart"},/obj/item/clothing/suit/ianshirt,/turf/simulated/floor/plating,/area/maintenance/port) "aKW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/maintenance/port) "aKX" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/storage/tools) @@ -1980,7 +1980,7 @@ "aMd" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/crew_quarters/locker) "aMe" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/table,/obj/item/weapon/cable_coil,/obj/item/weapon/cable_coil/blue,/obj/item/weapon/cable_coil/green,/obj/item/weapon/cable_coil/yellow,/turf/simulated/floor,/area/storage/art) "aMf" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/light/small,/obj/structure/table,/obj/item/weapon/storage/crayonbox,/obj/item/weapon/storage/crayonbox,/obj/item/weapon/storage/crayonbox,/turf/simulated/floor,/area/storage/art) -"aMg" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/table,/obj/item/weapon/paint/paint_remover,/obj/item/weapon/paint/paint_remover,/turf/simulated/floor,/area/storage/art) +"aMg" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/table,/turf/simulated/floor,/area/storage/art) "aMh" = (/obj/machinery/door/airlock{name = "Emergency Storage"},/turf/simulated/floor/plating,/area/storage/tools) "aMi" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plating,/area/storage/tools) "aMj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/weapon/storage/lightbox/mixed,/turf/simulated/floor/plating,/area/storage/tools)