diff --git a/_maps/RandomRuins/SpaceRuins/BlueMoon/fisher_store.dmm b/_maps/RandomRuins/SpaceRuins/BlueMoon/fisher_store.dmm new file mode 100644 index 000000000000..494ece0517ea --- /dev/null +++ b/_maps/RandomRuins/SpaceRuins/BlueMoon/fisher_store.dmm @@ -0,0 +1,1091 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"bs" = ( +/obj/structure/closet/crate/trashcart, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/powered/fisherstore) +"dU" = ( +/obj/structure/fence/corner{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/powered/fisherstore) +"fS" = ( +/obj/structure/lattice/catwalk, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/powered/fisherstore) +"gr" = ( +/obj/machinery/light/cold{ + dir = 8 + }, +/turf/open/floor/wood/damturf/broken3, +/area/ruin/space/has_grav/powered/fisherstore) +"gS" = ( +/turf/closed/wall, +/area/ruin/space/has_grav) +"hk" = ( +/obj/machinery/light/cold{ + dir = 8 + }, +/turf/open/floor/iron/smooth_half, +/area/ruin/space/has_grav/powered/fisherstore) +"ii" = ( +/obj/structure/table, +/obj/item/toy/redbutton{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/item/suspiciousphone{ + dumped = 1 + }, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"iI" = ( +/obj/structure/table, +/obj/machinery/computer/pod/old, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"iP" = ( +/obj/item/trash/chips{ + pixel_x = 12; + pixel_y = -16; + layer = 2 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/powered/fisherstore) +"kp" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/ruin/space/has_grav) +"ml" = ( +/obj/structure/table/reinforced, +/turf/open/floor/wood, +/area/ruin/space/has_grav/powered/fisherstore) +"nU" = ( +/obj/structure/fence, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/powered/fisherstore) +"nY" = ( +/obj/structure/rack/shelf, +/obj/item/storage/fancy/cigarettes/cigpack_carp{ + pixel_x = 6 + }, +/obj/item/storage/fancy/cigarettes/cigpack_carp{ + pixel_x = 1 + }, +/obj/item/storage/fancy/cigarettes/cigpack_carp{ + pixel_x = -6 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/ruin/space/has_grav/powered/fisherstore) +"ob" = ( +/obj/structure/table, +/obj/item/phone{ + pixel_y = 10; + pixel_x = 7 + }, +/obj/structure/fluff/paper/stack{ + dir = 10 + }, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = -4 + }, +/obj/item/pen{ + pixel_y = 1; + pixel_x = 6 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"oe" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/lootdrop/space_cash, +/obj/effect/spawner/lootdrop/space_cash, +/turf/open/floor/wood, +/area/ruin/space/has_grav/powered/fisherstore) +"oE" = ( +/obj/structure/fence/cut, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/powered/fisherstore) +"qZ" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/item/reagent_containers/food/snacks/fishfingers, +/obj/item/reagent_containers/food/snacks/fishfingers, +/obj/item/reagent_containers/food/snacks/fishfingers, +/obj/item/reagent_containers/food/snacks/fishfingers, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/powered/fisherstore) +"rt" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood/damturf/broken7, +/area/ruin/space/has_grav/powered/fisherstore) +"rL" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/powered/fisherstore) +"sa" = ( +/obj/machinery/door/airlock/wood, +/turf/open/floor/eighties, +/area/ruin/space/has_grav/powered/fisherstore) +"sk" = ( +/turf/closed/wall, +/area/ruin/space/has_grav/powered/fisherstore) +"sq" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"sN" = ( +/obj/structure/table, +/obj/machinery/computer/pod/old, +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"sU" = ( +/obj/machinery/door/airlock/wood, +/turf/open/floor/iron/smooth_edge{ + dir = 1 + }, +/area/ruin/space/has_grav/powered/fisherstore) +"tg" = ( +/obj/structure/lattice/catwalk, +/obj/structure/marker_beacon/jade, +/turf/open/space/basic, +/area/ruin/space/has_grav/powered/fisherstore) +"uJ" = ( +/obj/structure/sign/poster/contraband/bulldog{ + pixel_x = 32 + }, +/obj/structure/chair/office/dark{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"uV" = ( +/obj/structure/table/reinforced, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/ruin/space/has_grav/powered/fisherstore) +"wL" = ( +/obj/structure/fence{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/powered/fisherstore) +"wX" = ( +/obj/structure/rack/shelf, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"xj" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/powered/fisherstore) +"xW" = ( +/obj/structure/rack/shelf, +/obj/item/kitchen/knife/combat/survival/knuckledagger, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"zl" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/powered/fisherstore) +"zU" = ( +/obj/structure/curtain/goliath, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"AN" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/iron/smooth_half, +/area/ruin/space/has_grav/powered/fisherstore) +"AV" = ( +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav) +"Bm" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/smooth_half, +/area/ruin/space/has_grav/powered/fisherstore) +"Bp" = ( +/obj/structure/fence/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/powered/fisherstore) +"Bz" = ( +/obj/structure/window/reinforced, +/turf/open/floor/fakespace, +/area/ruin/space/has_grav/powered/fisherstore) +"BY" = ( +/obj/structure/window/reinforced, +/obj/structure/bed/dogbed, +/mob/living/simple_animal/hostile/carp/pet_carp{ + size_multiplier = 0.8; + name = "Mr. ClickBait" + }, +/turf/open/floor/fakespace, +/area/ruin/space/has_grav/powered/fisherstore) +"CC" = ( +/obj/structure/rack/shelf, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/powered/fisherstore) +"Er" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/powered/fisherstore) +"EB" = ( +/obj/structure/marker_beacon/jade, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"EN" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/ruin/space/has_grav/powered/fisherstore) +"Fe" = ( +/obj/structure/lattice/catwalk, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"FA" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/powered/fisherstore) +"GI" = ( +/turf/closed/mineral/random/stationside, +/area/ruin/space/has_grav) +"Hq" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/trash/rkibble, +/turf/open/floor/fakespace, +/area/ruin/space/has_grav/powered/fisherstore) +"IJ" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/light/cold{ + dir = 4 + }, +/obj/structure/closet/crate/large, +/obj/item/clothing/mask/gas/carp, +/obj/item/toy/plush/carpplushie, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/powered/fisherstore) +"IY" = ( +/obj/structure/sign/poster/contraband/manifest{ + pixel_x = 32 + }, +/obj/structure/chair/office/dark{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"Jt" = ( +/obj/structure/rack/shelf, +/obj/item/clothing/suit/space/hardsuit/carp, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"Kj" = ( +/obj/machinery/door/airlock/multi_tile/glass, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav) +"Kl" = ( +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"KB" = ( +/obj/machinery/light/cold{ + dir = 4 + }, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/powered/fisherstore) +"Lf" = ( +/obj/structure/curtain/goliath, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"Lh" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/turf/open/floor/wood/damturf/broken2, +/area/ruin/space/has_grav/powered/fisherstore) +"Lq" = ( +/obj/structure/fence/door, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/powered/fisherstore) +"Ls" = ( +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/powered/fisherstore) +"Mg" = ( +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/ruin/space/has_grav/powered/fisherstore) +"MJ" = ( +/obj/structure/rack/shelf, +/obj/item/reagent_containers/food/drinks/soda_cans/cola{ + pixel_y = 7; + pixel_x = -7 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/cola{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/cola{ + pixel_x = -2; + pixel_y = 7 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/ruin/space/has_grav/powered/fisherstore) +"Pp" = ( +/obj/structure/rack/shelf, +/obj/item/trash/chips, +/turf/open/floor/wood/damturf/broken6, +/area/ruin/space/has_grav/powered/fisherstore) +"PD" = ( +/turf/open/space/basic, +/area/template_noop) +"PQ" = ( +/obj/machinery/light/cold{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/powered/fisherstore) +"QR" = ( +/obj/structure/table, +/obj/item/phone{ + pixel_x = -5 + }, +/obj/structure/fluff/paper/stack{ + dir = 5 + }, +/obj/item/trash/can{ + pixel_x = 8; + pixel_y = -11; + layer = 2 + }, +/obj/item/trash/can{ + pixel_x = 2; + pixel_y = -7; + layer = 2 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"Re" = ( +/obj/structure/rack/shelf, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/powered/fisherstore) +"Sf" = ( +/obj/structure/billboard/fishstore, +/obj/structure/lattice/catwalk, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"UF" = ( +/obj/machinery/door/airlock/wood, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/powered/fisherstore) +"UN" = ( +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/powered/fisherstore) +"US" = ( +/obj/structure/sign/poster/contraband/cc64k_ad{ + pixel_x = 32 + }, +/obj/structure/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"VW" = ( +/turf/open/floor/wood, +/area/ruin/space/has_grav/powered/fisherstore) +"Wm" = ( +/obj/structure/fans/tiny/invisible, +/obj/machinery/door/airlock/hatch, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"Wr" = ( +/obj/structure/rack/shelf, +/obj/item/toy/plush/carpplushie, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"WK" = ( +/obj/structure/table/reinforced, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood/damturf/broken7, +/area/ruin/space/has_grav/powered/fisherstore) +"XF" = ( +/turf/open/floor/iron/smooth_large, +/area/ruin/space/has_grav/powered/fisherstore) +"Yr" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/powered/fisherstore) +"YQ" = ( +/obj/structure/fence, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav/powered/fisherstore) +"YR" = ( +/turf/open/floor/wood/damturf/broken4, +/area/ruin/space/has_grav/powered/fisherstore) +"YX" = ( +/turf/open/floor/wood/damturf/broken7, +/area/ruin/space/has_grav/powered/fisherstore) +"Zd" = ( +/turf/open/floor/iron/smooth_half, +/area/ruin/space/has_grav/powered/fisherstore) +"Ze" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/powered/fisherstore) +"ZE" = ( +/obj/structure/rack/shelf, +/obj/item/reagent_containers/food/snacks/cornchips, +/obj/item/reagent_containers/food/snacks/cornchips, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/ruin/space/has_grav/powered/fisherstore) + +(1,1,1) = {" +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +EB +Kl +Kl +PD +PD +PD +PD +PD +PD +PD +PD +PD +"} +(2,1,1) = {" +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +GI +Kl +Kl +Kl +Kl +Kl +Kl +PD +PD +PD +PD +PD +PD +PD +"} +(3,1,1) = {" +PD +PD +PD +PD +PD +PD +PD +PD +PD +GI +GI +GI +GI +GI +GI +GI +Kl +Kl +EB +PD +PD +PD +PD +PD +"} +(4,1,1) = {" +PD +PD +PD +PD +PD +PD +EB +Kl +GI +GI +GI +GI +GI +GI +GI +GI +GI +GI +Kl +PD +PD +PD +PD +PD +"} +(5,1,1) = {" +PD +PD +PD +Kl +Kl +Kl +Kl +GI +GI +sk +gS +gS +gS +gS +gS +gS +gS +GI +GI +Kl +PD +PD +PD +PD +"} +(6,1,1) = {" +PD +PD +dU +YQ +YQ +YQ +YQ +YQ +YQ +sk +BY +XF +ml +gr +VW +YX +gS +GI +Kl +Kl +PD +PD +PD +PD +"} +(7,1,1) = {" +PD +Kl +xj +UN +UN +UN +bs +bs +bs +sk +Bz +sq +ml +VW +kp +EN +Kj +Fe +Fe +Fe +Mg +Mg +Mg +PD +"} +(8,1,1) = {" +EB +Kl +wL +UN +UN +UN +UN +UN +UN +sk +Hq +XF +uV +EN +rt +EN +AV +Fe +Fe +Fe +fS +Mg +Mg +tg +"} +(9,1,1) = {" +Kl +Kl +Lq +UN +UN +UN +UN +Yr +UN +sk +Jt +XF +WK +VW +iP +Pp +gS +Kl +Kl +Kl +Kl +Kl +PD +PD +"} +(10,1,1) = {" +Kl +Kl +wL +UN +UN +Yr +UN +UN +rL +sk +xW +sq +uV +EN +EN +ZE +gS +Kl +Kl +Kl +Kl +PD +PD +PD +"} +(11,1,1) = {" +Kl +Kl +wL +UN +UN +UN +Bp +oE +nU +sk +wX +XF +oe +YR +VW +MJ +gS +Kl +Kl +Sf +Fe +PD +PD +PD +"} +(12,1,1) = {" +Kl +Kl +wL +UN +rL +rL +Lq +zl +zl +sk +Wr +sq +uV +PQ +Lh +nY +gS +Fe +Fe +Fe +Fe +PD +PD +PD +"} +(13,1,1) = {" +Kl +GI +sk +sk +Wm +sk +sk +sk +sk +sk +sk +sa +sk +sk +UF +sk +gS +Kl +Kl +Fe +Fe +PD +PD +PD +"} +(14,1,1) = {" +GI +GI +sk +AN +Bm +hk +Zd +Bm +Bm +sU +Ls +Ze +Ls +Ze +Ze +Ls +gS +Kl +Kl +Kl +Kl +PD +PD +PD +"} +(15,1,1) = {" +Kl +GI +sk +Lf +zU +zU +zU +zU +Lf +sk +Re +Ze +Ze +Ze +Ls +Ze +gS +Kl +Kl +Kl +Kl +PD +PD +PD +"} +(16,1,1) = {" +EB +GI +sk +ii +sq +QR +sq +ob +XF +sk +Re +Ls +Ze +Er +Er +Er +gS +Kl +Kl +Kl +Kl +Kl +PD +PD +"} +(17,1,1) = {" +PD +GI +sk +sN +IY +iI +US +iI +uJ +sk +CC +KB +Ls +FA +IJ +qZ +gS +Kl +Kl +Kl +Kl +Kl +PD +PD +"} +(18,1,1) = {" +PD +GI +GI +gS +gS +gS +gS +gS +gS +gS +gS +gS +gS +gS +gS +gS +gS +GI +Kl +PD +PD +PD +PD +PD +"} +(19,1,1) = {" +PD +GI +GI +GI +GI +GI +GI +GI +GI +GI +GI +GI +GI +GI +GI +GI +GI +Kl +EB +PD +PD +PD +PD +PD +"} +(20,1,1) = {" +PD +Kl +GI +GI +GI +GI +GI +GI +GI +GI +GI +GI +GI +GI +GI +GI +Kl +Kl +PD +PD +PD +PD +PD +PD +"} +(21,1,1) = {" +PD +PD +PD +PD +Kl +GI +GI +GI +GI +Kl +GI +GI +GI +GI +Kl +Kl +Kl +PD +PD +PD +PD +PD +PD +PD +"} +(22,1,1) = {" +PD +PD +PD +PD +PD +PD +PD +Kl +PD +PD +Kl +Kl +EB +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +"} +(23,1,1) = {" +PD +PD +PD +PD +PD +PD +PD +Kl +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +"} +(24,1,1) = {" +PD +PD +PD +PD +PD +PD +PD +EB +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +PD +"} diff --git a/config/spaceRuinBlacklist.txt b/config/spaceRuinBlacklist.txt index 32fa394b8670..cf35f9b0ff3f 100644 --- a/config/spaceRuinBlacklist.txt +++ b/config/spaceRuinBlacklist.txt @@ -63,3 +63,4 @@ #_maps/RandomRuins/SpaceRuins/BlueMoon/droneship.dmm #_maps/RandomRuins/SpaceRuins/BlueMoon/drugpost.dmm #_maps/RandomRuins/SpaceRuins/BlueMoon/clockworkhaven.dmm +#_maps/RandomRuins/SpaceRuins/BlueMoon/fisher_store.dmm diff --git a/modular_bluemoon/Ren/Code/FTU/FTU.dm b/modular_bluemoon/Ren/Code/FTU/FTU.dm index 5c3b706ae6db..3b732b76f77d 100644 --- a/modular_bluemoon/Ren/Code/FTU/FTU.dm +++ b/modular_bluemoon/Ren/Code/FTU/FTU.dm @@ -186,6 +186,9 @@ /area/ruin/space/has_grav/powered/drugpost name = "Pirat secret post" +/area/ruin/space/has_grav/powered/fisherstore + name = "Fishing store" + /area/ruin/space/has_grav/powered/clockworkhaven name = "Ratvar citadel" @@ -194,7 +197,6 @@ description = "Захваченый пиратами корабль." prefix = "_maps/RandomRuins/SpaceRuins/BlueMoon/" suffix = "cargodiselost.dmm" - allow_duplicates = FALSE id = "cargodiselost" datum/map_template/ruin/space/vaulttango @@ -245,3 +247,10 @@ datum/map_template/ruin/space/vaulttango prefix = "_maps/RandomRuins/SpaceRuins/BlueMoon/" suffix = "clockworkhaven.dmm" id = "clockworkhaven" + +/datum/map_template/ruin/space/fisherstore + name = "Fishing store" + description = "Рыболовный магазин" + prefix = "_maps/RandomRuins/SpaceRuins/BlueMoon/" + suffix = "fisher_store.dmm" + id = "fisher_store" diff --git a/modular_bluemoon/Ren/Code/misc.dm b/modular_bluemoon/Ren/Code/misc.dm index fa2424f08064..7e002bb8f656 100644 --- a/modular_bluemoon/Ren/Code/misc.dm +++ b/modular_bluemoon/Ren/Code/misc.dm @@ -247,7 +247,7 @@ ftu_item_list[initial(A.name)] = A return ftu_item_list -//Энергетический балистический щит +//Энергетический щит /obj/item/shield/inteq_energy name = "Old energy shield" desc = "Устаревшая на несколько поколений модель энергетического щита. Использует механические ограничители силового поля и эрганомика немного страдает, но всё ещё является желанным элементом экипировки." @@ -474,29 +474,6 @@ transfer_fingerprints_to(R,D) qdel(src) ..() -// Ловушка струна -/obj/structure/oldtrap/string_trap - name = "Piano wire" - desc = "Струна натянутая на высоте шеи существа среднего роста. Будет очень неприятно нарваться на неё со всей скорости в темноте" - icon_state = "string_trap" - -/obj/structure/oldtrap/string_trap/Crossed(datum/source, atom/movable/AM) - if(ishuman(AM)) - var/mob/living/carbon/human/H = AM - var/picked_def_zone = NONE - var/multiplier = 1 - if(H.maxHealth <= 70) - return - if((H.maxHealth > 70) & (H.maxHealth < 130)) - picked_def_zone = BODY_ZONE_HEAD - if(H.maxHealth >= 130) - picked_def_zone = BODY_ZONE_CHEST - if(H.m_intent == MOVE_INTENT_RUN) - multiplier = multiplier*3 - if(H.combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) - multiplier = multiplier*1.5 - var/damage = 10*multiplier - H.apply_damage(damage, BRUTE, picked_def_zone, wound_bonus = 5) /obj/item/toy/plush/bao name = "Stupid cat plush" @@ -507,6 +484,13 @@ righthand_file = 'modular_bluemoon/Ren/Icons/Mob/inhand_r.dmi' squeak_override = list('modular_bluemoon/Ren/Sound/bao_sex.ogg'=1) - - - +/obj/structure/billboard/fishstore + name = "Billboard" + desc = "An advertisement for a fishing store." + icon = 'modular_bluemoon/Ren/Icons/Obj/billboard.dmi' + icon_state = "billboard_fishstore" + max_integrity = 1000 + bound_width = 96 + bound_height = 64 + density = TRUE + anchored = TRUE diff --git a/modular_bluemoon/Ren/Code/weapons.dm b/modular_bluemoon/Ren/Code/weapons.dm index 0110cc1dd717..2e015345b014 100644 --- a/modular_bluemoon/Ren/Code/weapons.dm +++ b/modular_bluemoon/Ren/Code/weapons.dm @@ -12,10 +12,9 @@ hitsound = 'modular_bluemoon/Ren/Sound/USHM_hit.ogg' desc = "УШМ с алмазным диском и четырёх тактовым двигателем на жидкой плазме. Что ещё может быть нужно, когда требуется взять штурмом чью то крепость? " force = 30 - attack_speed = CLICK_CD_MELEE * 1.5 throwforce = 10 - wound_bonus = 40 - armour_penetration = 20 + wound_bonus = 35 + armour_penetration = 30 sharpness = SHARP_EDGED attack_verb = list("slashed", "sliced", "shredded") diff --git a/modular_bluemoon/Ren/Icons/Obj/billboard.dmi b/modular_bluemoon/Ren/Icons/Obj/billboard.dmi new file mode 100644 index 000000000000..06b1ff421e9c Binary files /dev/null and b/modular_bluemoon/Ren/Icons/Obj/billboard.dmi differ