Merge pull request #29 from 800maximum123/HandheldHolopads

Handheld holopads

maps/torch_fd/fd_torch.dm

@@ -235,7 +235,7 @@
 	#include "../../mods/legalese_language/_legalese.dme"
 	#include "../../mods/petting_zoo/_petting_zoo.dme"
 	#include "../../mods/screentips/_screentips.dme"
-	#include "../../mods/tajara/_tajara.dme"
+//	#include "../../mods/tajara/_tajara.dme"
 	#include "../../mods/sauna_props/_sauna_props.dme"
 	#include "../../mods/wyccbay_optimization/_wyccbay_optimization.dme"
 
@@ -256,6 +256,7 @@
 	#include "../../mods/_fd/ascent/_ascent.dme"
 	#include "../../mods/_fd/backgrounds/_fd_backgrounds.dme"
 	#include "../../mods/_fd/bruno_items/_bruno_items.dme"
+	#include "../../mods/_fd/chem_furniture/_furniture.dme"
 	#include "../../mods/_fd/combat_stances/_combat_stances.dme"
 	#include "../../mods/_fd/complementary_xeno_ablities/_complementary_xeno_ablities.dme"
 	#include "../../mods/_fd/conference_holopads/_conference_holopads.dme"
@@ -270,8 +271,8 @@
 	#include "../../mods/_fd/multitile_vehicles/_multitile_vehicles.dme"
 	#include "../../mods/_fd/old_space_cannons/_old_space_cannons.dme"
 	#include "../../mods/_fd/random_rooms/_random_rooms.dme"
+	#include "../../mods/_fd/small_holopad/_small_holopad.dme"
 	#include "../../mods/_fd/structure_storage/_structure_storage.dme"
-	#include "../../mods/_fd/chem_furniture/_furniture.dme"
 
 	#include "../../mods/_fd/_maps/airfield/_airfield.dme"
 	#include "../../mods/_fd/_maps/ares/_ares.dme"

maps/torch_fd/torch2_deck4.dmm

@@ -523,7 +523,7 @@
 "kh" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/civilian{name = "Emergency Storage"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled/steel_ridged,/area/hallway/primary/fourthdeck/fore)
 "ki" = (/turf/unsimulated/mask,/area/hallway/primary/fourthdeck/center)
 "kj" = (/obj/structure/railing/mapped{dir = 4; icon_state = "railing0-1"},/obj/floor_decal/corner/black/mono,/obj/machinery/button/windowtint{id = "pathfinder_office"; pixel_x = -24; pixel_y = 6},/obj/machinery/light_switch{pixel_x = -24; pixel_y = -6},/turf/simulated/floor/tiled/dark/monotile,/area/command/pathfinder)
-"kk" = (/obj/structure/table/standard,/obj/floor_decal/spline/fancy/wood{dir = 10},/turf/simulated/floor/wood/walnut,/area/command/pathfinder)
+"kk" = (/obj/structure/table/standard,/obj/floor_decal/spline/fancy/wood{dir = 10},/obj/item/device/holopad,/turf/simulated/floor/wood/walnut,/area/command/pathfinder)
 "kl" = (/obj/structure/table/standard,/obj/floor_decal/spline/fancy/wood,/obj/item/modular_computer/tablet/lease/preset/command,/turf/simulated/floor/wood/walnut,/area/command/pathfinder)
 "km" = (/obj/structure/table/standard,/obj/floor_decal/spline/fancy/wood,/obj/random_multi/single_item/memo_exploration,/obj/item/flora/pottedplantsmall/leaf{pixel_x = 8},/turf/simulated/floor/wood/walnut,/area/command/pathfinder)
 "kn" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/techmaint,/area/quartermaster/hangar/top)
@@ -1217,7 +1217,7 @@
 "xz" = (/obj/structure/catwalk,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fourthdeck/foreport)
 "xA" = (/obj/structure/catwalk,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/maintenance/fourthdeck/foreport)
 "xB" = (/obj/structure/catwalk,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/mopbucket,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plating,/area/maintenance/fourthdeck/foreport)
-"xC" = (/obj/floor_decal/techfloor,/obj/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/deckofficer,/obj/item/device/destTagger,/obj/item/device/scanner/price,/turf/simulated/floor/tiled/techfloor/grid,/area/quartermaster/office)
+"xC" = (/obj/floor_decal/techfloor,/obj/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/deckofficer,/obj/item/device/destTagger,/obj/item/device/scanner/price,/obj/item/device/holopad,/turf/simulated/floor/tiled/techfloor/grid,/area/quartermaster/office)
 "xD" = (/obj/floor_decal/techfloor,/obj/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/decktech,/obj/machinery/newscaster{pixel_y = 30},/obj/item/music_tape/custom,/obj/item/music_tape/custom,/obj/item/music_player/csplayer,/obj/item/device/destTagger,/obj/item/device/scanner/price,/turf/simulated/floor/tiled/techfloor/grid,/area/quartermaster/office)
 "xE" = (/obj/floor_decal/techfloor{dir = 6},/obj/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/decktech,/obj/machinery/media/music_writer{pixel_y = 27},/obj/item/storage/pill_bottle/dice_nerd,/obj/item/device/destTagger,/obj/item/device/scanner/price,/turf/simulated/floor/tiled/techfloor/grid,/area/quartermaster/office)
 "xF" = (/obj/floor_decal/corner_steel_grid{dir = 9},/obj/structure/sign/warning/nosmoking_burned{pixel_x = -26},/obj/structure/closet/crate,/obj/machinery/light{dir = 1},/obj/item/stack/tile/carpetred/fifty,/obj/item/stack/tile/carpetpurple/fifty,/obj/item/stack/tile/carpetorange/fifty,/obj/item/stack/tile/carpetmagenta/fifty,/obj/item/stack/tile/carpetgreen/fifty,/obj/item/stack/tile/carpetblue3/fifty,/obj/item/stack/tile/carpetblue2/fifty,/obj/item/stack/tile/carpetblue/fifty,/obj/item/stack/tile/carpet/fifty,/turf/simulated/floor/tiled/techfloor/grid,/area/quartermaster/office)