diff --git a/_maps/shuttles/hunter_bounty.dmm b/_maps/shuttles/hunter_bounty.dmm index 4e285d671c..034747f85d 100644 --- a/_maps/shuttles/hunter_bounty.dmm +++ b/_maps/shuttles/hunter_bounty.dmm @@ -37,6 +37,7 @@ /area/shuttle/hunter) "i" = ( /obj/structure/grille, +/obj/structure/window/plastitanium, /turf/open/floor/plating, /area/shuttle/hunter) "j" = ( @@ -71,7 +72,9 @@ /turf/open/floor/pod/light, /area/shuttle/hunter) "p" = ( -/obj/effect/mob_spawn/human/fugitive/bounty/hook, +/obj/effect/mob_spawn/human/fugitive/bounty/hook{ + short_desc = null + }, /turf/open/floor/pod/light, /area/shuttle/hunter) "q" = ( @@ -145,6 +148,10 @@ }, /turf/open/floor/pod/dark, /area/shuttle/hunter) +"E" = ( +/obj/structure/window/plastitanium, +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/hunter) "F" = ( /obj/machinery/power/smes, /turf/open/floor/pod/dark, @@ -195,7 +202,6 @@ id = "huntership"; movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); name = "hunter shuttle"; - rechargeTime = 1800; width = 15 }, /obj/structure/fans/tiny, @@ -203,7 +209,8 @@ /area/shuttle/hunter) "M" = ( /obj/effect/mob_spawn/human/fugitive/bounty/armor{ - dir = 1 + dir = 1; + short_desc = null }, /turf/open/floor/pod/light, /area/shuttle/hunter) @@ -213,8 +220,16 @@ }, /turf/open/floor/pod/light, /area/shuttle/hunter) +"U" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/obj/structure/window/plastitanium, +/turf/open/floor/plating, +/area/shuttle/hunter) "Z" = ( -/obj/effect/mob_spawn/human/fugitive/bounty/synth, +/obj/effect/mob_spawn/human/fugitive/bounty/synth{ + short_desc = null + }, /turf/open/floor/pod/light, /area/shuttle/hunter) @@ -387,7 +402,7 @@ a a a a -b +E o y s @@ -417,7 +432,7 @@ a a a a -i +U p s s @@ -447,7 +462,7 @@ a a a a -b +E i A n diff --git a/_maps/shuttles/hunter_russian.dmm b/_maps/shuttles/hunter_russian.dmm index 6200c183ef..c665cadbd2 100644 --- a/_maps/shuttles/hunter_russian.dmm +++ b/_maps/shuttles/hunter_russian.dmm @@ -1,59 +1,500 @@ -"a" = (/turf/template_noop,/area/template_noop) -"b" = (/turf/closed/wall,/area/shuttle/hunter) -"c" = (/obj/structure/shuttle/engine/propulsion{dir = 8},/turf/open/floor/plating/airless,/area/shuttle/hunter) -"d" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/open/floor/plating/airless,/area/shuttle/hunter) -"e" = (/obj/machinery/portable_atmospherics/scrubber/huge,/turf/open/floor/plating,/area/shuttle/hunter) -"f" = (/obj/machinery/power/smes,/turf/open/floor/plating,/area/shuttle/hunter) -"g" = (/turf/open/floor/plating,/area/shuttle/hunter) -"h" = (/obj/machinery/door/airlock/security/glass,/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter) -"i" = (/obj/machinery/door/airlock/security/glass,/obj/structure/fans/tiny,/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter) -"j" = (/obj/effect/turf_decal/bot,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating,/area/shuttle/hunter) -"k" = (/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter) -"m" = (/obj/structure/reagent_dispensers/fueltank,/obj/item/weldingtool/largetank,/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter) -"n" = (/obj/effect/decal/cleanable/dirt/dust,/obj/structure/reagent_dispensers/watertank,/obj/item/reagent_containers/glass/bucket,/obj/item/mop,/obj/item/storage/bag/trash{pixel_x = 6},/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter) -"o" = (/obj/effect/mob_spawn/human/fugitive/russian{dir = 4},/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter) -"p" = (/obj/effect/turf_decal/bot,/obj/effect/decal/cleanable/dirt,/obj/structure/closet/crate{icon_state = "crateopen"},/turf/open/floor/plating,/area/shuttle/hunter) -"q" = (/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter) -"r" = (/obj/effect/turf_decal/arrows{dir = 4},/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter) -"s" = (/obj/structure/table,/obj/item/storage/fancy/cigarettes/cigars/cohiba{pixel_y = 6},/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter) -"t" = (/obj/effect/turf_decal/bot,/obj/effect/decal/cleanable/dirt,/obj/structure/closet/crate/large{icon_state = "crittercrate"},/turf/open/floor/plating,/area/shuttle/hunter) -"u" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter) -"v" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/shuttle/hunter) -"w" = (/obj/machinery/fugitive_capture,/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter) -"x" = (/obj/effect/turf_decal/bot,/turf/open/floor/plating,/area/shuttle/hunter) -"y" = (/turf/template_noop,/area/shuttle/hunter) -"z" = (/obj/structure/chair{dir = 4},/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter) -"A" = (/obj/machinery/computer/shuttle/hunter{dir = 8},/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter) -"B" = (/obj/effect/turf_decal/bot,/obj/structure/closet/crate{icon_state = "crateopen"},/turf/open/floor/plating,/area/shuttle/hunter) -"C" = (/obj/machinery/computer/camera_advanced{dir = 8},/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter) -"D" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter) -"E" = (/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{dir = 8; x_offset = 0; y_offset = 3},/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter) -"F" = (/obj/effect/turf_decal/bot,/obj/effect/decal/cleanable/dirt,/obj/structure/closet/crate/engineering{icon_state = "engi_crateopen"},/turf/open/floor/plating,/area/shuttle/hunter) -"G" = (/obj/structure/table,/obj/item/reagent_containers/food/drinks/bottle/vodka,/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter) -"H" = (/obj/effect/turf_decal/bot,/obj/structure/closet/crate/coffin{icon_state = "coffinopen"},/turf/open/floor/plating,/area/shuttle/hunter) -"I" = (/obj/effect/turf_decal/bot,/obj/structure/mecha_wreckage/ripley,/turf/open/floor/plating,/area/shuttle/hunter) -"J" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter) -"K" = (/obj/machinery/door/airlock/security/glass,/obj/structure/fans/tiny,/obj/docking_port/stationary{dwidth = 11; height = 16; id = "pirateship_home"; name = "Deep Space"; width = 17},/obj/docking_port/mobile{dheight = 3; dwidth = 3; height = 13; id = "huntership"; movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); name = "hunter shuttle"; !INVALID_VAR! = 1800; width = 15},/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter) -"L" = (/obj/effect/mob_spawn/human/fugitive/russian{dir = 1},/turf/open/floor/plating,/area/shuttle/hunter) -"N" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/effect/turf_decal/stripes/line{dir = 2},/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter) -"Q" = (/obj/item/book/manual/ripley_build_and_repair,/turf/open/floor/mineral/plastitanium/red,/area/shuttle/hunter) -"Y" = (/obj/machinery/suit_storage_unit/standard_unit,/turf/open/floor/mineral/plastitanium,/area/shuttle/hunter) +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/closed/wall, +/area/shuttle/hunter) +"c" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/shuttle/hunter) +"d" = ( +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/shuttle/hunter) +"e" = ( +/obj/machinery/portable_atmospherics/scrubber/huge, +/turf/open/floor/plating, +/area/shuttle/hunter) +"f" = ( +/obj/machinery/power/smes, +/turf/open/floor/plating, +/area/shuttle/hunter) +"g" = ( +/turf/open/floor/plating, +/area/shuttle/hunter) +"h" = ( +/obj/machinery/door/airlock/security/glass, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/hunter) +"i" = ( +/obj/machinery/door/airlock/security/glass, +/obj/structure/fans/tiny, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/hunter) +"j" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/shuttle/hunter) +"k" = ( +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/hunter) +"m" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/item/weldingtool/largetank, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/hunter) +"n" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/storage/bag/trash{ + pixel_x = 6 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/hunter) +"o" = ( +/obj/effect/mob_spawn/human/fugitive/russian{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/hunter) +"p" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate{ + icon_state = "crateopen" + }, +/turf/open/floor/plating, +/area/shuttle/hunter) +"q" = ( +/turf/open/floor/mineral/plastitanium, +/area/shuttle/hunter) +"r" = ( +/obj/effect/turf_decal/arrows{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/hunter) +"s" = ( +/obj/structure/table, +/obj/item/storage/fancy/cigarettes/cigars/cohiba{ + pixel_y = 6 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/hunter) +"t" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/large{ + icon_state = "crittercrate" + }, +/turf/open/floor/plating, +/area/shuttle/hunter) +"u" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/hunter) +"v" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/shuttle/hunter) +"w" = ( +/obj/machinery/fugitive_capture, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/hunter) +"x" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/plating, +/area/shuttle/hunter) +"y" = ( +/turf/template_noop, +/area/shuttle/hunter) +"z" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/hunter) +"A" = ( +/obj/machinery/computer/shuttle/hunter{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/hunter) +"B" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate{ + icon_state = "crateopen" + }, +/turf/open/floor/plating, +/area/shuttle/hunter) +"C" = ( +/obj/machinery/computer/camera_advanced{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/hunter) +"D" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/hunter) +"E" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{ + dir = 8; + x_offset = 0; + y_offset = 3 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/hunter) +"F" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/engineering{ + icon_state = "engi_crateopen" + }, +/turf/open/floor/plating, +/area/shuttle/hunter) +"G" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/hunter) +"H" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate/coffin{ + icon_state = "coffinopen" + }, +/turf/open/floor/plating, +/area/shuttle/hunter) +"I" = ( +/obj/effect/turf_decal/bot, +/obj/structure/mecha_wreckage/ripley, +/turf/open/floor/plating, +/area/shuttle/hunter) +"J" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/hunter) +"K" = ( +/obj/machinery/door/airlock/security/glass, +/obj/structure/fans/tiny, +/obj/docking_port/stationary{ + dwidth = 11; + height = 16; + id = "pirateship_home"; + name = "Deep Space"; + width = 17 + }, +/obj/docking_port/mobile{ + dheight = 3; + dwidth = 3; + height = 13; + id = "huntership"; + movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); + name = "hunter shuttle"; + width = 15 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/hunter) +"L" = ( +/obj/effect/mob_spawn/human/fugitive/russian{ + dir = 1; + short_desc = null + }, +/turf/open/floor/plating, +/area/shuttle/hunter) +"N" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/hunter) +"Q" = ( +/obj/item/book/manual/ripley_build_and_repair, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/hunter) +"Y" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/hunter) (1,1,1) = {" -aaabbbbbaaaaaaa -aacdeefbbaaaaaa -aacdgggbbaaaaaa -aaabbhbbbibbbba -aabbjkxbmknbobb -aabpqkkhkkrhksb -abbtukYbbvbbrwv -acdxqkYbyyybzAv -acdBqkYbyyybzCv -abbBuDYbbvbbkEv -aabFukQhkkrhkGb -aabbHkIbNkJbobb -aaabbhbbbKbbbba -aacdgggbbaaaaaa -aacdLLLbbaaaaaa -aaabbbbbaaaaaaa +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +b +c +c +b +a +a +a +a +a +a +"} +(3,1,1) = {" +a +c +c +a +b +b +b +d +d +b +b +b +a +c +c +a +"} +(4,1,1) = {" +b +d +d +b +b +p +t +x +B +B +F +b +b +d +d +b +"} +(5,1,1) = {" +b +e +g +b +j +q +u +q +q +u +u +H +b +g +L +b +"} +(6,1,1) = {" +b +e +g +h +k +k +k +k +k +D +k +k +h +g +L +b +"} +(7,1,1) = {" +b +f +g +b +x +k +Y +Y +Y +Y +Q +I +b +g +L +b +"} +(8,1,1) = {" +b +b +b +b +b +h +b +b +b +b +h +b +b +b +b +b +"} +(9,1,1) = {" +a +b +b +b +m +k +b +y +y +b +k +N +b +b +b +a +"} +(10,1,1) = {" +a +a +a +i +k +k +v +y +y +v +k +k +K +a +a +a +"} +(11,1,1) = {" +a +a +a +b +n +r +b +y +y +b +r +J +b +a +a +a +"} +(12,1,1) = {" +a +a +a +b +b +h +b +b +b +b +h +b +b +a +a +a +"} +(13,1,1) = {" +a +a +a +b +o +k +r +z +z +k +k +o +b +a +a +a +"} +(14,1,1) = {" +a +a +a +b +b +s +w +A +C +E +G +b +b +a +a +a +"} +(15,1,1) = {" +a +a +a +a +b +b +v +v +v +v +b +b +a +a +a +a "} diff --git a/_maps/shuttles/hunter_space_cop.dmm b/_maps/shuttles/hunter_space_cop.dmm index 0800c6f551..9bc1cf13ec 100644 --- a/_maps/shuttles/hunter_space_cop.dmm +++ b/_maps/shuttles/hunter_space_cop.dmm @@ -29,7 +29,6 @@ height = 12; id = "huntership"; name = "hunter shuttle"; - rechargeTime = 1800; width = 7 }, /obj/machinery/door/poddoor/shutters{ @@ -73,7 +72,8 @@ dir = 1 }, /obj/effect/mob_spawn/human/fugitive/spacepol{ - dir = 1 + dir = 1; + short_desc = null }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/hunter) diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index 29308832cf..a1d5bc5900 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ diff --git a/icons/obj/machines/research.dmi b/icons/obj/machines/research.dmi index b756c77e20..7d64c494fd 100644 Binary files a/icons/obj/machines/research.dmi and b/icons/obj/machines/research.dmi differ