From fa775bd51ecaa807ba153a9fdebcae76d02a80e7 Mon Sep 17 00:00:00 2001 From: ephemeralstoryteller Date: Sun, 26 Nov 2023 19:47:31 -0800 Subject: [PATCH] POI - Shelter Remap (#9277) * remaps the shelter poi + adds new random subgroups * quick fixes - 'rapid' isn't actually a laser type, oops - changes the description of the shelter to be more accurate - adds some light sockets. APC got totally mangled by the pod but there should at least be nonfunctional lights --- code/game/objects/random/mob.dm | 22 + .../surface_submaps/wilderness/Shelter.dmm | 594 +++++++++++++++++- .../surface_submaps/wilderness/wilderness.dm | 2 +- 3 files changed, 587 insertions(+), 31 deletions(-) diff --git a/code/game/objects/random/mob.dm b/code/game/objects/random/mob.dm index 8274aff63b..d7646c118b 100644 --- a/code/game/objects/random/mob.dm +++ b/code/game/objects/random/mob.dm @@ -238,6 +238,28 @@ prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser, prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong, prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong/guard) + +/obj/random/mob/robotic/hivebot/melee + name = "Random Lesser Melee Hivebot" + desc = "This is a random hivebot that engages in melee but has no special ability." + icon_state = "robot" + + mob_faction = "hivebot" + +/obj/random/mob/robotic/hivebot/melee/item_to_spawn() + return pick(prob(10);/mob/living/simple_mob/mechanical/hivebot, + prob(5);/mob/living/simple_mob/mechanical/hivebot/swarm) + +/obj/random/mob/robotic/hivebot/laser + name = "Random Laser Hivebot" + desc = "This is a random hivebot that can shoot through obstacles and does burn damage." + icon_state = "robot" + + mob_faction = "hivebot" + +/obj/random/mob/robotic/hivebot/laser/item_to_spawn() + return pick(prob(30);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser, + prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline) //Mice diff --git a/maps/submaps/surface_submaps/wilderness/Shelter.dmm b/maps/submaps/surface_submaps/wilderness/Shelter.dmm index 9415cbb9c9..9b86fca133 100644 --- a/maps/submaps/surface_submaps/wilderness/Shelter.dmm +++ b/maps/submaps/surface_submaps/wilderness/Shelter.dmm @@ -1,33 +1,567 @@ -"a" = (/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) -"b" = (/turf/simulated/floor/outdoors/grass/sif/forest,/area/template_noop) -"c" = (/obj/effect/landmark/snowy_turf,/turf/template_noop,/area/template_noop) -"d" = (/turf/simulated/floor/outdoors/grass/sif/forest,/area/submap/Shelter1) -"e" = (/turf/simulated/floor/outdoors/grass/sif,/area/submap/Shelter1) -"f" = (/obj/effect/landmark/snowy_turf,/turf/template_noop,/area/submap/Shelter1) -"g" = (/turf/simulated/wall/log_sif,/area/submap/Shelter1) -"h" = (/obj/random/obstruction,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Shelter1) -"i" = (/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Shelter1) -"j" = (/obj/structure/bonfire/sifwood,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Shelter1) -"k" = (/obj/random/mob/robotic,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Shelter1) -"l" = (/obj/structure/bed/roller/adv,/obj/random/humanoidremains,/obj/random/cash,/obj/random/cigarettes,/obj/item/clothing/under/explorer,/obj/item/clothing/shoes/boots/winter/explorer,/obj/item/clothing/mask/gas/explorer,/obj/item/clothing/accessory/medal/permit/gun/planetside,/obj/item/clothing/suit/armor/pcarrier/light/nt,/obj/random/projectile/scrapped_smg,/obj/random/projectile/scrapped_pistol,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Shelter1) -"m" = (/obj/random/medical/lite,/obj/random/toolbox,/obj/random/trash,/obj/random/technology_scanner/anom,/obj/random/tool/anom,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Shelter1) -"n" = (/obj/structure/fence/corner{dir = 1; icon_state = "corner"},/obj/effect/landmark/snowy_turf,/turf/template_noop,/area/submap/Shelter1) -"o" = (/obj/structure/fence/door/locked{dir = 1; icon_state = "door_closed"},/obj/effect/landmark/snowy_turf,/turf/template_noop,/area/submap/Shelter1) -"p" = (/obj/structure/fence/post{dir = 8; icon_state = "post"},/obj/effect/landmark/snowy_turf,/turf/template_noop,/area/submap/Shelter1) -"q" = (/obj/structure/fence{dir = 8; icon_state = "straight"},/obj/effect/landmark/snowy_turf,/turf/template_noop,/area/submap/Shelter1) -"r" = (/obj/structure/fence/cut/large{dir = 8; icon_state = "straight_cut3"},/obj/effect/landmark/snowy_turf,/turf/template_noop,/area/submap/Shelter1) -"s" = (/obj/structure/fence/corner,/obj/effect/landmark/snowy_turf,/turf/template_noop,/area/submap/Shelter1) +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"bH" = ( +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Shelter1) +"cu" = ( +/obj/item/material/shard/shrapnel, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"dO" = ( +/obj/structure/table/sifwoodentable, +/obj/item/flashlight/lamp/green, +/obj/random/cigarettes, +/obj/item/flame/lighter/random, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"dZ" = ( +/obj/structure/girder, +/obj/item/stack/material/wood/sif, +/turf/simulated/floor/plating, +/area/submap/Shelter1) +"ee" = ( +/obj/item/stack/material/wood/sif, +/obj/item/stack/rods, +/obj/item/material/shard/shrapnel, +/turf/simulated/floor/plating, +/area/submap/Shelter1) +"eM" = ( +/turf/simulated/wall/log_sif, +/area/submap/Shelter1) +"eT" = ( +/obj/random/junk, +/turf/simulated/floor/wood/sif/broken, +/area/submap/Shelter1) +"gc" = ( +/obj/structure/loot_pile/surface/bones, +/obj/item/radio{ + start_anomalous = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"hd" = ( +/obj/structure/table/sifwoodentable, +/obj/item/binoculars/spyglass, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"hl" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/grass/sif, +/area/submap/Shelter1) +"iC" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/submap/Shelter1) +"jd" = ( +/obj/structure/table/sifwoodentable, +/obj/random/mug, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"lg" = ( +/turf/template_noop, +/area/template_noop) +"lO" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"mc" = ( +/obj/structure/toilet, +/turf/simulated/floor/tiled/neutral, +/area/submap/Shelter1) +"mw" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"sh" = ( +/obj/item/stack/material/wood/sif, +/turf/simulated/floor/wood/sif/broken, +/area/submap/Shelter1) +"sv" = ( +/obj/structure/fence, +/turf/simulated/floor/outdoors/dirt, +/area/submap/Shelter1) +"sI" = ( +/obj/structure/fence{ + dir = 8; + icon_state = "straight" + }, +/turf/simulated/floor/outdoors/grass/sif, +/area/submap/Shelter1) +"uf" = ( +/obj/structure/table/sifwoodentable, +/obj/machinery/microwave, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"uZ" = ( +/obj/item/material/shard/shrapnel, +/obj/item/stack/material/steel, +/turf/simulated/floor/plating, +/area/submap/Shelter1) +"wc" = ( +/obj/structure/fence/door{ + dir = 1 + }, +/turf/simulated/floor/outdoors/dirt, +/area/submap/Shelter1) +"xq" = ( +/obj/item/stack/material/wood/sif, +/obj/random/mob/robotic/hivebot/melee, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/wood/sif/broken, +/area/submap/Shelter1) +"xv" = ( +/turf/simulated/floor/tiled/neutral, +/area/submap/Shelter1) +"xQ" = ( +/obj/structure/flora/grass/brown, +/turf/simulated/floor/outdoors/grass/sif, +/area/submap/Shelter1) +"ye" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/item/stack/material/steel, +/turf/simulated/floor/tiled/neutral, +/area/submap/Shelter1) +"yg" = ( +/turf/simulated/floor/outdoors/grass/sif, +/area/submap/Shelter1) +"yr" = ( +/obj/effect/decal/remains/human, +/turf/simulated/floor/outdoors/dirt, +/area/submap/Shelter1) +"yD" = ( +/obj/structure/fireplace, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"zh" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/spawner/gibs/robot, +/turf/simulated/floor/reinforced, +/area/submap/Shelter1) +"zv" = ( +/obj/structure/fence/cut/large, +/turf/simulated/floor/outdoors/dirt, +/area/submap/Shelter1) +"zz" = ( +/obj/effect/spawner/gibs/robot, +/turf/simulated/floor/reinforced, +/area/submap/Shelter1) +"zX" = ( +/obj/fiftyspawner/log/sif, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"AT" = ( +/obj/structure/simple_door/sifwood, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"AU" = ( +/obj/random/mob/robotic/hivebot/laser, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"BJ" = ( +/obj/structure/window/basic/full, +/obj/structure/curtain/black, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"Fa" = ( +/turf/simulated/wall/titanium, +/area/submap/Shelter1) +"Fp" = ( +/turf/template_noop, +/area/submap/Shelter1) +"HH" = ( +/turf/simulated/floor/wood/sif/broken, +/area/submap/Shelter1) +"HT" = ( +/obj/structure/table/sifwoodentable, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/random/coin/anom, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"IT" = ( +/obj/random/projectile/scrapped_shotgun, +/obj/random/toolbox, +/obj/effect/spawner/gibs/human, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"Je" = ( +/obj/structure/closet/cabinet, +/obj/item/mop, +/obj/random/soap, +/obj/random/medical, +/obj/item/stock_parts/spring, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/neutral, +/area/submap/Shelter1) +"Jp" = ( +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/outdoors/dirt, +/area/submap/Shelter1) +"JD" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/accessory/medal/permit/gun/planetside, +/obj/item/clothing/suit/armor/pcarrier/light, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/shoes/boots/winter, +/obj/item/material/knife/machete, +/obj/item/storage/wallet/random, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"JR" = ( +/turf/simulated/floor/outdoors/dirt, +/area/submap/Shelter1) +"Kf" = ( +/obj/structure/fence, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Shelter1) +"Lp" = ( +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Shelter1) +"LB" = ( +/obj/random/trash, +/obj/random/junk, +/obj/random/mob/robotic/hivebot/melee, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"Mw" = ( +/obj/structure/loot_pile/maint/trash, +/turf/simulated/floor/outdoors/dirt, +/area/submap/Shelter1) +"MR" = ( +/obj/structure/girder/displaced, +/turf/simulated/floor/plating, +/area/submap/Shelter1) +"Nx" = ( +/obj/structure/fence/corner{ + dir = 4 + }, +/turf/simulated/floor/outdoors/grass/sif, +/area/submap/Shelter1) +"OO" = ( +/obj/structure/loot_pile/maint/junk, +/turf/simulated/floor/outdoors/dirt, +/area/submap/Shelter1) +"Pg" = ( +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"PS" = ( +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"Ro" = ( +/obj/structure/sink{ + pixel_y = 17 + }, +/obj/structure/mirror{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/neutral, +/area/submap/Shelter1) +"RV" = ( +/obj/item/material/shard/shrapnel, +/turf/simulated/floor/reinforced, +/area/submap/Shelter1) +"Vv" = ( +/obj/item/stack/material/steel, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/wood/sif/broken, +/area/submap/Shelter1) +"WG" = ( +/obj/item/stack/material/wood/sif, +/obj/item/material/shard/shrapnel, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Shelter1) +"WI" = ( +/turf/simulated/floor/reinforced, +/area/submap/Shelter1) +"Xl" = ( +/obj/structure/fence, +/turf/simulated/floor/outdoors/grass/sif, +/area/submap/Shelter1) +"YM" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/outdoors/grass/sif, +/area/submap/Shelter1) +"YV" = ( +/obj/item/stack/material/steel, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"Zb" = ( +/obj/structure/bed/chair/comfy/brown, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) +"Zj" = ( +/obj/structure/bed/double/padded, +/obj/item/bedsheet/mimedouble, +/turf/simulated/floor/wood/sif, +/area/submap/Shelter1) (1,1,1) = {" -addeddddfec -efeefffdeee -eeeffffffee -fdgggggggef -ddghijikgfe -ffgkiiiigfe -ffgihlmhgfe -ffnopqprsee -edfffffffdf -fedfffffddd -bffeeddddfb +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +"} +(2,1,1) = {" +lg +eM +eM +BJ +eM +eM +yg +hl +yg +Fp +Fp +xQ +yg +Fp +lg +"} +(3,1,1) = {" +lg +eM +gc +Zb +dO +eM +eM +eM +eM +BJ +BJ +BJ +eM +Fp +lg +"} +(4,1,1) = {" +lg +BJ +PS +cu +PS +eM +hd +HT +eM +uf +lO +jd +eM +yg +lg +"} +(5,1,1) = {" +lg +eM +JD +Zj +AU +AT +PS +sh +PS +PS +cu +PS +eM +Fp +lg +"} +(6,1,1) = {" +lg +eM +eM +eM +ee +eM +xq +WI +iC +IT +mw +LB +eM +Fp +lg +"} +(7,1,1) = {" +lg +Fp +eM +Ro +xv +MR +Fa +RV +Fa +eM +eM +PS +eM +yg +lg +"} +(8,1,1) = {" +lg +OO +eM +mc +ye +Fa +Fa +zz +Fa +Fa +Vv +cu +BJ +YM +Pg +"} +(9,1,1) = {" +Pg +Mw +eM +Je +WI +WI +zz +zh +WI +WI +WI +YV +AT +JR +lg +"} +(10,1,1) = {" +Pg +JR +eM +dZ +bH +Fa +Fa +zz +MR +Fa +sh +PS +BJ +YM +lg +"} +(11,1,1) = {" +lg +JR +wc +Jp +JR +WG +iC +WI +dZ +eT +PS +PS +eM +yg +lg +"} +(12,1,1) = {" +lg +hl +sI +Fp +yr +JR +Lp +WI +uZ +HH +yD +zX +eM +yg +lg +"} +(13,1,1) = {" +lg +Fp +Nx +Xl +Xl +sv +zv +Kf +eM +BJ +eM +BJ +eM +Fp +lg +"} +(14,1,1) = {" +lg +Fp +Fp +Fp +Fp +Fp +JR +JR +xQ +yg +yg +Fp +Fp +Fp +lg +"} +(15,1,1) = {" +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg "} diff --git a/maps/submaps/surface_submaps/wilderness/wilderness.dm b/maps/submaps/surface_submaps/wilderness/wilderness.dm index dec2811782..d5e68e9941 100644 --- a/maps/submaps/surface_submaps/wilderness/wilderness.dm +++ b/maps/submaps/surface_submaps/wilderness/wilderness.dm @@ -286,7 +286,7 @@ /datum/map_template/surface/wilderness/normal/Shelter1 name = "Shelter 1" - desc = "The remains of a resourceful, but prideful explorer." + desc = "The bitter end of a house after a drop pod crashed into it." mappath = 'maps/submaps/surface_submaps/wilderness/Shelter.dmm' cost = 10