From ad16ef963d025881afc954f0d0c4b8805674b6a6 Mon Sep 17 00:00:00 2001 From: RenVII <106078409+RenVII@users.noreply.github.com> Date: Sat, 18 Jan 2025 21:56:00 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D0=B2=D1=81=D1=8F=D0=BA=D0=BE=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpaceRuins/BlueMoon/fisher_store.dmm | 1091 +++++++++++++++++ config/spaceRuinBlacklist.txt | 1 + modular_bluemoon/Ren/Code/FTU/FTU.dm | 11 +- modular_bluemoon/Ren/Code/misc.dm | 38 +- modular_bluemoon/Ren/Code/weapons.dm | 6 +- modular_bluemoon/Ren/Icons/Obj/billboard.dmi | Bin 0 -> 8386 bytes 6 files changed, 1116 insertions(+), 31 deletions(-) create mode 100644 _maps/RandomRuins/SpaceRuins/BlueMoon/fisher_store.dmm create mode 100644 modular_bluemoon/Ren/Icons/Obj/billboard.dmi 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..309212bfe1a0 100644 --- a/modular_bluemoon/Ren/Code/weapons.dm +++ b/modular_bluemoon/Ren/Code/weapons.dm @@ -11,11 +11,11 @@ usesound = 'modular_bluemoon/Ren/Sound/USHM_hit.ogg' hitsound = 'modular_bluemoon/Ren/Sound/USHM_hit.ogg' desc = "УШМ с алмазным диском и четырёх тактовым двигателем на жидкой плазме. Что ещё может быть нужно, когда требуется взять штурмом чью то крепость? " + block_chance = 50 force = 30 - attack_speed = CLICK_CD_MELEE * 1.5 throwforce = 10 - wound_bonus = 40 - armour_penetration = 20 + wound_bonus = 50 + armour_penetration = 80 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 0000000000000000000000000000000000000000..06b1ff421e9c8ea8cdbe025cf49f898d9b973666 GIT binary patch literal 8386 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 literal 0 HcmV?d00001 From cd20d7607eadbb7b5a0990f5cb498f5de77c74cb Mon Sep 17 00:00:00 2001 From: RenVII <106078409+RenVII@users.noreply.github.com> Date: Sun, 19 Jan 2025 02:48:14 +0400 Subject: [PATCH 2/2] Update weapons.dm --- modular_bluemoon/Ren/Code/weapons.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modular_bluemoon/Ren/Code/weapons.dm b/modular_bluemoon/Ren/Code/weapons.dm index 309212bfe1a0..2e015345b014 100644 --- a/modular_bluemoon/Ren/Code/weapons.dm +++ b/modular_bluemoon/Ren/Code/weapons.dm @@ -11,11 +11,10 @@ usesound = 'modular_bluemoon/Ren/Sound/USHM_hit.ogg' hitsound = 'modular_bluemoon/Ren/Sound/USHM_hit.ogg' desc = "УШМ с алмазным диском и четырёх тактовым двигателем на жидкой плазме. Что ещё может быть нужно, когда требуется взять штурмом чью то крепость? " - block_chance = 50 force = 30 throwforce = 10 - wound_bonus = 50 - armour_penetration = 80 + wound_bonus = 35 + armour_penetration = 30 sharpness = SHARP_EDGED attack_verb = list("slashed", "sliced", "shredded")