From 8e6b360d0dbaeb2f84335646b0aaab8d3bf353ef Mon Sep 17 00:00:00 2001 From: Guti <32563288+TheCaramelion@users.noreply.github.com> Date: Mon, 14 Oct 2024 20:31:38 +0200 Subject: [PATCH] Reduces the amount of guns in PoIs, adds salvage items (#9198) --- code/controllers/subsystems/supply.dm | 5 + .../subtypes/humanoid/mercs/mercs_ch.dm | 4 + .../subtypes/humanoid/pirates_ch.dm | 4 + .../simple_mob/subtypes/humanoid/russian.dm | 6 + modular_chomp/code/modules/salvage/bags.dm | 15 +++ modular_chomp/code/modules/salvage/salvage.dm | 84 +++++++++++++ modular_chomp/icons/obj/salvage/sellable.dmi | Bin 0 -> 1721 bytes .../surface_submaps/valley/CultBar.dmm | 66 ++++------ .../surface_submaps/valley/Redshuttledown.dmm | 49 ++------ .../surface_submaps/valley/begderg.dmm | 14 +-- .../surface_submaps/valley/bloodchurch.dmm | 57 ++++----- .../surface_submaps/valley/carriershuttle.dmm | 74 ++++++++---- .../surface_submaps/valley/cliffmanor.dmm | 70 +++-------- .../submaps/surface_submaps/valley/cove.dmm | 60 ++++------ .../surface_submaps/valley/crashedexplo.dmm | 64 +++++----- .../surface_submaps/valley/demonranch.dmm | 87 +++++--------- .../surface_submaps/valley/dronelord.dmm | 20 +--- .../surface_submaps/valley/eclipseaqua.dmm | 35 ++---- .../surface_submaps/valley/eclipseblob.dmm | 46 +++---- .../surface_submaps/valley/eclipsecargo.dmm | 82 ++++++++----- .../surface_submaps/valley/eclipselava.dmm | 83 +++++-------- .../valley/eclipsemountain.dmm | 48 ++++---- .../surface_submaps/valley/fallenlab.dmm | 71 +++++++---- .../surface_submaps/valley/frostlake.dmm | 16 +-- .../surface_submaps/valley/frozenlab.dmm | 39 ++++-- .../surface_submaps/valley/hydroxeno.dmm | 62 ++++------ .../submaps/surface_submaps/valley/leppy.dmm | 3 +- .../surface_submaps/valley/mausarmy.dmm | 32 ++--- .../surface_submaps/valley/metroidmaze.dmm | 27 ++++- .../surface_submaps/valley/mousehq.dmm | 53 ++++---- .../surface_submaps/valley/paperworks.dmm | 16 +-- .../surface_submaps/valley/phorondragon.dmm | 18 +-- .../surface_submaps/valley/piratefortress.dmm | 27 +---- .../surface_submaps/valley/piratevessel.dmm | 82 ++++++------- .../surface_submaps/valley/piratevox.dmm | 67 ++++------- .../surface_submaps/valley/plontden.dmm | 6 +- .../surface_submaps/valley/settlement.dmm | 41 +++---- .../surface_submaps/valley/siegepoint.dmm | 75 +++++------- .../surface_submaps/valley/solarmoff.dmm | 4 +- .../surface_submaps/valley/spooderchurch.dmm | 53 ++++---- .../surface_submaps/valley/teppifarm.dmm | 4 +- .../surface_submaps/valley/terraformer.dmm | 6 +- .../submaps/surface_submaps/valley/vault.dmm | 54 ++++----- .../surface_submaps/valley/warzone.dmm | 2 +- .../wilderness/AbandonedLab.dmm | 61 ++-------- .../surface_submaps/wilderness/AmbushBase.dmm | 78 +++--------- .../wilderness/AmbushBaseAlt.dmm | 94 ++++----------- .../wilderness/Blackshuttledown.dmm | 23 ++-- .../surface_submaps/wilderness/CaveS.dmm | 32 +++-- .../surface_submaps/wilderness/CaveSAlt.dmm | 57 +++++++-- .../surface_submaps/wilderness/Chapel.dmm | 1 - .../surface_submaps/wilderness/DJOutpost1.dmm | 8 +- .../surface_submaps/wilderness/DoomP.dmm | 20 +--- .../surface_submaps/wilderness/DoomPAlt.dmm | 20 +--- .../surface_submaps/wilderness/Drugden.dmm | 1 - .../surface_submaps/wilderness/Epod3.dmm | 8 +- .../surface_submaps/wilderness/Epod4.dmm | 8 +- .../wilderness/FrostflyNest.dmm | 11 +- .../surface_submaps/wilderness/MCamp1.dmm | 2 - .../surface_submaps/wilderness/Manor1.dmm | 42 ++----- .../surface_submaps/wilderness/Manor1Alt.dmm | 46 ++----- .../surface_submaps/wilderness/Rockybase.dmm | 8 +- .../surface_submaps/wilderness/borglab.dmm | 25 +--- .../surface_submaps/wilderness/borglabAlt.dmm | 16 +-- .../wilderness/bountyhunters.dmm | 3 +- .../wilderness/bountyhunters2.dmm | 14 +-- .../surface_submaps/wilderness/chasm.dmm | 32 +++-- .../surface_submaps/wilderness/chemspill2.dmm | 8 +- .../surface_submaps/wilderness/deathden.dmm | 4 - .../wilderness/deathdenAlt.dmm | 2 - .../surface_submaps/wilderness/demonpool.dmm | 7 +- .../wilderness/derelictengine.dmm | 113 ++++++++++-------- .../surface_submaps/wilderness/dogbase.dmm | 49 ++------ .../surface_submaps/wilderness/dogbaseAlt.dmm | 48 ++------ .../surface_submaps/wilderness/frostoasis.dmm | 1 - .../surface_submaps/wilderness/lonewolf.dmm | 4 +- .../surface_submaps/wilderness/spider1.dmm | 4 +- .../surface_submaps/wilderness/wolfden.dmm | 12 +- .../surface_submaps/wilderness/xenohive.dmm | 10 +- .../sound/items/salvage/salvagedrop.ogg | Bin 0 -> 30360 bytes .../sound/items/salvage/salvagepickup.ogg | Bin 0 -> 18174 bytes .../sound/items/taperecorder_drop.ogg | Bin 0 -> 12951 bytes .../sound/items/taperecorder_pickup.ogg | Bin 0 -> 27155 bytes vorestation.dme | 2 + 84 files changed, 1120 insertions(+), 1485 deletions(-) create mode 100644 modular_chomp/code/modules/salvage/bags.dm create mode 100644 modular_chomp/code/modules/salvage/salvage.dm create mode 100644 modular_chomp/icons/obj/salvage/sellable.dmi create mode 100644 modular_chomp/sound/items/salvage/salvagedrop.ogg create mode 100644 modular_chomp/sound/items/salvage/salvagepickup.ogg create mode 100644 modular_chomp/sound/items/taperecorder_drop.ogg create mode 100644 modular_chomp/sound/items/taperecorder_pickup.ogg diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm index 084058b50f..96ef08d05a 100644 --- a/code/controllers/subsystems/supply.dm +++ b/code/controllers/subsystems/supply.dm @@ -121,6 +121,11 @@ SUBSYSTEM_DEF(supply) EC.contents[EC.contents.len]["quantity"] = cashmoney.worth EC.value += EC.contents[EC.contents.len]["value"] + // CHOMPAdd Start - Sell salvage + if(istype(A, /obj/item/salvage)) + var/obj/item/salvage/salvagedStuff = A + EC.contents[EC.contents.len]["value"] = salvagedStuff.worth + // CHOMPAdd End // Make a log of it, but it wasn't shipped properly, and so isn't worth anything diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm index ea2116d66a..eb3a5af253 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm @@ -69,6 +69,10 @@ icon = 'modular_chomp/icons/mob/animal_ch.dmi' catalogue_data = list(/datum/category_item/catalogue/fauna/mercenary/human) +/mob/living/simple_mob/humanoid/merc/Initialize() + . = ..() + loot_list += list(/obj/item/salvage/loot/syndicate = 10) + /mob/living/simple_mob/humanoid/merc/ranged desc = "A tough looking individual armed with an pistol." diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm index d7eab07f0c..9021d9e506 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm @@ -49,6 +49,10 @@ ai_holder_type = /datum/ai_holder/simple_mob/merc say_list_type = /datum/say_list/pirate +/mob/living/simple_mob/humanoid/pirate/Initialize() + . = ..() + loot_list += list(/obj/item/salvage/loot/pirate = 35) + //Armored Variant /mob/living/simple_mob/humanoid/pirate/armored diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm index bf5c611547..d8e1f5f95d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm @@ -23,6 +23,12 @@ corpse = /obj/effect/landmark/mobcorpse/russian +// CHOMPEdit Start +/mob/living/simple_mob/humanoid/russian + + loot_list = list(/obj/item/salvage/loot/russian = 10) + +// CHOMPEdit End /mob/living/simple_mob/humanoid/russian/ranged icon_state = "russianranged" diff --git a/modular_chomp/code/modules/salvage/bags.dm b/modular_chomp/code/modules/salvage/bags.dm new file mode 100644 index 0000000000..83736de310 --- /dev/null +++ b/modular_chomp/code/modules/salvage/bags.dm @@ -0,0 +1,15 @@ +/obj/item/storage/bag/salvage + name = "treasure satchel" + desc = "A satchel for storing scavenged salvage. There be tresure." + icon = 'icons/obj/mining.dmi' + slot_flags = SLOT_BELT | SLOT_POCKET + w_class = ITEMSIZE_NORMAL + storage_slots = 15 + max_w_class = ITEMSIZE_NORMAL + can_hold = list(/obj/item/salvage) + +/obj/item/storage/bag/salvage/bluespace + name = "bluespace treasure satchel" + desc = "A satchel to store even more scavenged salvage! There be lots of treasure." + storage_slots = 30 + icon_state = "satchel_bspace" diff --git a/modular_chomp/code/modules/salvage/salvage.dm b/modular_chomp/code/modules/salvage/salvage.dm new file mode 100644 index 0000000000..8fae069a23 --- /dev/null +++ b/modular_chomp/code/modules/salvage/salvage.dm @@ -0,0 +1,84 @@ +/obj/item/salvage + name = "salvage" + desc = "A tonne of salvage from bad mapping practices. Who spawned the base type? Report this on GitHub" + icon = 'modular_chomp/icons/obj/salvage/sellable.dmi' + force = 5 + throwforce = 5 + throw_speed = 1 + throw_speed = 4 + hitsound = 'modular_chomp/sound/items/salvage/salvagepickup.ogg' + drop_sound = 'modular_chomp/sound/items/salvage/salvagedrop.ogg' + w_class = ITEMSIZE_NORMAL + var/worth = 100 + +/obj/item/salvage/examine(mob/user) + . = ..() + . += span_notice("This could fetch a good price...") + +/obj/item/salvage/ruin + desc = "A tonne of salvage recovered from an abandoned ruin. Who spawned the base type? Report this on GitHub" + +/obj/item/salvage/ruin/pirate + name = "rum keg" + desc = "A highly valued keg of aged space rum. Limited edition and sure to be a collector's item." + icon_state = "barrel" + color = "#7e5c00" + +/obj/item/salvage/ruin/russian + name = "armaments cache" + desc = "A crate of old disused Belastrav ballistic firearms clearly long past their usability. This crate would make good scrap metal for shuttle construction." + icon_state = "weapon_crate" + +/obj/item/salvage/ruin/brick + name = "mysterious brick" + desc = "A peculier brick formed out of what appears to be plastic. This would make a fantastic collector's item." + icon_state = "lego_brick" + hitsound = 'sound/items/smolesmallbuild.ogg' + drop_sound = 'sound/items/drop/smolematerial.ogg' + +/obj/item/salvage/ruin/nanotrasen + name = "lost research notes" + desc = "A collection of research notes penned by old Nanotrasen scientists from decades past, technology lost in time- until you found them. It is a mystery what technology Central Command will push if they could just get their hands on these notes." + icon_state = "research_doc" + hitsound = 'sound/items/pickup/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' + drop_sound = 'sound/items/drop/paper.ogg' + +/obj/item/salvage/ruin/nanotrasen/Initialize(mapload) + . = ..() + become_anomalous() + +/obj/item/salvage/ruin/carp + name = "carp scales" + desc = "A collection of scales shed from a corrupted space carp. Their culinary potential could mean untold riches for Nanotrasen." + icon_state = "dragon_scales" + hitsound = 'sound/effects/glass_step.ogg' + pickup_sound = 'sound/effects/glass_step.ogg' + drop_sound = 'sound/effects/glass_step.ogg' + +/obj/item/salvage/loot + desc = "A tonne of salvage looted from a fallen foe. Who spawned the base type? Report this on the github." + +/obj/item/salvage/loot/pirate + name = "stolen jewellery" + desc = "A collection of stolen jewellery, fashioned from pilfered bluespace crystals and gems. Rumour has it, local pirates have been known to use these accessories to avoid capture." + icon_state = "pirate_treasure" + hitsound = 'modular_chomp/sound/items/taperecorder_drop.ogg' + pickup_sound = 'modular_chomp/sound/items/taperecorder_pickup.ogg' + drop_sound = 'modular_chomp/sound/items/taperecorder_drop.ogg' + +/obj/item/salvage/loot/russian + name = "siosp manual" + desc = "A small manual, written in Neo-Russkyia, detailing the manifesto of Malfoy Ames, father of The Cygni Rebellion. Central Command may wish to share this with their allies in the Trans-Solar Federation." + icon_state = "ussp_manual" + hitsound = 'sound/items/pickup/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' + drop_sound = 'sound/items/drop/paper.ogg' + +/obj/item/salvage/loot/syndicate + name = "syndicate intel" + desc = "A folder detailing Syndicate plans to infiltrate and sabotage operations in the Vir system. Central Command may find use of this to aid them in counter-intelligence." + icon_state = "syndie_doc" + hitsound = 'sound/items/pickup/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' + drop_sound = 'sound/items/drop/paper.ogg' diff --git a/modular_chomp/icons/obj/salvage/sellable.dmi b/modular_chomp/icons/obj/salvage/sellable.dmi new file mode 100644 index 0000000000000000000000000000000000000000..96238af04655747066c422a68830296125830dc3 GIT binary patch literal 1721 zcmV;q21fabP)^3ItlR5MNPZ|OJm}MN@ZyJNTB50!WWStDbW1F( zh(xxNNQ0)iCozdGP`4^28XXoAOM=jM&GsW4YnNayvw%WiH55J+2~#H!fkhuUK~6nA zJzid3P+MglA1P#VcYAw#l9H0aqD|UMI4UYCgBB{|d{9(mQ{$XacZYUocxN9B231KS zO+X*n>2X*90004WQchCV=-0C=2@(ajEmFboIq zGkb~!?#8dH7XvXIV;V6p%`#Q!kiOIn-f4U*LKQK>blb3d~)=K_2n=?e|wq zQGhH4VBRjEaB#369zlLD6cAbi5m5L81+V~O0T^Ko$mKA928fD)<{z(t4}b>XMz9wr z0!nZJn7>nlR}o#535j4kfD=JD;Hia{-mHTh>c7=G*b=ah0;1PJ_O+ud`gwW-_!HeK zA|uGa^5H7P0_<%R2G~D5xO69Fjl}h>f2<}|0R*!0aLcIb2I9#!LJ;bNcY~cRPxl}zms#RM) z0t3AB0@^5`)9Jvq+k4;aBmUeOuC-dVTJ-_iW%|bD_C|dE&Tk-h27^IImb=Hj<_8(` zuetuMVjzNcL?#cVcKqLtMt<&cNK6cK|&L9f8|EVv36abEM3H6sMLzgh|Vt+zr(oO>@|Ch@x|oo>S}T! z0zjv3m-+$aa=lWidjWhde7}2q(t}-Ma&>)ueKkPUD6d*OiUWF|5zxc4*Ri=6fzyeUEf(c--nxD7c0Lr<0Y zTtOTn3D8TyyG{+f!fFs->y&It5IaR7a#Ex?Nm7*fDZ;h$6fs2osd=JA+e+0mRfWrr z>@`(4bV7)st2;q}ze!9u4O3Uu9RO5fg1v5jBO%;_yd&yA zozf!+c+iP%&*yh{bNUAh;vwL^Sb`Srhyduz;}L*6O^>1L{6cJ<2!JIwUarRgUFaA_!Pn(Ecn%@S6i`!CD0#iINjR$X2nkESs-0`jci`@c?Tf0H^{W;IM5v#PA1z zD-1x42Vig+Vh?Qv@Cf^SWzgi%48ak@KU%Am0f%AGVHf@k!L=j%L^1U*!?I?4P&$qb P00000NkvXXu0mjf0*Vi- literal 0 HcmV?d00001 diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/CultBar.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/CultBar.dmm index 334ac99af7..fb6a871832 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/CultBar.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/CultBar.dmm @@ -27,7 +27,6 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table/fancyblack, /obj/random/maintenance/foodstuff, -/obj/random/maintenance/cargo, /obj/item/gun/magic/firestaff/cultstaff, /obj/random/maintenance/research, /turf/simulated/floor/carpet, @@ -288,7 +287,6 @@ /obj/effect/decal/cleanable/dirt, /obj/item/soulstone, /obj/item/gun/magic/firestaff, -/obj/item/holosign_creator/smokewand, /turf/simulated/floor/gorefloor2, /area/submap/CultBar) "kY" = ( @@ -447,8 +445,6 @@ /obj/structure/table/sifwooden_reinforced, /obj/random/maintenance/misc, /obj/random/maintenance/cargo, -/obj/item/stack/nanopaste/advanced, -/obj/random/maintenance/security, /turf/simulated/floor/wood/sif, /area/submap/CultBar) "pE" = ( @@ -499,10 +495,8 @@ /area/submap/CultBar) "tE" = ( /obj/structure/table/standard, -/obj/random/cash/big, -/obj/random/cash/big, -/obj/random/cash/big, /obj/effect/floor_decal/corner/red/diagonal, +/obj/random/cash, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/CultBar) "tO" = ( @@ -553,8 +547,7 @@ /area/submap/CultBar) "xX" = ( /obj/structure/table/sifwooden_reinforced, -/obj/effect/decal/cleanable/dirt, -/obj/item/stolenpackage, +/obj/item/stack/nanopaste/advanced, /turf/simulated/floor/wood/sif, /area/submap/CultBar) "yI" = ( @@ -621,8 +614,9 @@ /area/submap/CultBar) "BW" = ( /obj/structure/table/sifwooden_reinforced, -/obj/item/stolenpackage, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/random/maintenance/security, /turf/simulated/floor/wood/sif, /area/submap/CultBar) "Cf" = ( @@ -738,11 +732,6 @@ /obj/structure/loot_pile/surface/bones, /turf/simulated/floor/tiled/freezer, /area/submap/CultBar) -"GO" = ( -/obj/structure/table/sifwooden_reinforced, -/obj/random/contraband, -/turf/simulated/floor/wood/sif, -/area/submap/CultBar) "Hw" = ( /obj/effect/floor_decal/corner/lightgrey/diagonal, /obj/effect/decal/cleanable/dirt, @@ -777,7 +766,6 @@ "Jj" = ( /obj/structure/table/standard, /obj/item/reagent_containers/food/snacks/ribplate, -/obj/item/reagent_containers/food/snacks/ribplate, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/CultBar) @@ -794,8 +782,8 @@ /area/submap/CultBar) "Ka" = ( /obj/structure/table/gamblingtable, -/obj/random/cash/big, /obj/effect/decal/cleanable/dirt, +/obj/random/cash, /turf/simulated/floor/wood/sif, /area/submap/CultBar) "Kb" = ( @@ -850,7 +838,8 @@ "LD" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_mob/humanoid/cultist/elite{ - faction = "demon" + faction = "demon"; + loot_list = list(/obj/item/telecube = 50) }, /turf/simulated/floor/wood/sif, /area/submap/CultBar) @@ -887,23 +876,12 @@ /obj/effect/decal/cleanable/blood, /turf/simulated/floor/wood/sif/broken, /area/submap/CultBar) -"MJ" = ( -/obj/structure/table/sifwooden_reinforced, -/obj/random/energy, -/turf/simulated/floor/wood/sif, -/area/submap/CultBar) "MO" = ( /obj/structure/bookcase, /obj/item/book/codex/lore/vir, /obj/item/book/manual/supermatter_engine, /turf/simulated/floor/carpet, /area/submap/CultBar) -"MS" = ( -/obj/structure/table/sifwooden_reinforced, -/obj/effect/decal/cleanable/dirt, -/obj/random/firstaid, -/turf/simulated/floor/wood/sif, -/area/submap/CultBar) "Na" = ( /obj/structure/table/sifwooden_reinforced, /obj/item/clothing/gloves/regen, @@ -983,11 +961,8 @@ /area/submap/CultBar) "RO" = ( /obj/structure/table/fancyblack, -/obj/random/contraband, /obj/machinery/light/small/flicker, /obj/random/maintenance/misc, -/obj/random/mainttoyloot/nofail, -/obj/item/telecube/randomized, /turf/simulated/floor/carpet, /area/submap/CultBar) "Sn" = ( @@ -1069,7 +1044,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /mob/living/simple_mob/humanoid/cultist/elite{ - faction = "demon" + faction = "demon"; + loot_list = list(/obj/item/telecube = 50) }, /turf/simulated/floor/wood/sif/broken, /area/submap/CultBar) @@ -1136,7 +1112,7 @@ /area/submap/CultBar) "WT" = ( /obj/structure/table/gamblingtable, -/obj/random/cash/huge, +/obj/random/cash, /turf/simulated/floor/wood/sif/broken, /area/submap/CultBar) "WW" = ( @@ -1165,9 +1141,7 @@ /obj/structure/table/sifwooden_reinforced, /obj/random/maintenance/misc, /obj/random/maintenance/morestuff, -/obj/random/maintenance/medical, /obj/random/maintenance/research, -/obj/random/firstaid, /turf/simulated/floor/wood/sif, /area/submap/CultBar) "YT" = ( @@ -1770,7 +1744,7 @@ EH qP zU Ah -GO +qP Le zy dt @@ -1807,7 +1781,7 @@ eT gu Ah zU -qP +lm rJ HK dY @@ -1844,7 +1818,7 @@ qG cL or YZ -MJ +qP LY mT zU @@ -1918,8 +1892,8 @@ EH qP yP NZ -GO -xX +qP +gu Ah or ZZ @@ -1993,7 +1967,7 @@ VZ Ks mT Ot -Ot +gu SN zU ZZ @@ -2177,7 +2151,7 @@ Xa or HK at -qP +xX pv zU or @@ -2252,7 +2226,7 @@ or ez HK gP -gP +BW HK or ZZ @@ -2288,8 +2262,8 @@ cX Ah dt Ki -MS -BW +gu +gu Ah HK VZ diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/Redshuttledown.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/Redshuttledown.dmm index 6efcf3762b..557eb67de4 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/Redshuttledown.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/Redshuttledown.dmm @@ -11,7 +11,9 @@ /turf/simulated/floor/tiled/yellow, /area/submap/redshuttledown) "bU" = ( -/mob/living/simple_mob/humanoid/merc/ranged/space/shotgun/auto, +/mob/living/simple_mob/humanoid/merc/ranged/space/shotgun/auto{ + loot_list = list(/obj/item/gun/projectile/automatic/as24 = 100, /obj/item/perfect_tele = 20) + }, /obj/structure/bed/chair/office/dark{ dir = 1 }, @@ -102,7 +104,6 @@ dir = 6; icon_state = "bordercolor" }, -/obj/random/maintenance/medical, /turf/simulated/floor/tiled/white, /area/submap/redshuttledown) "ix" = ( @@ -310,7 +311,6 @@ /area/submap/redshuttledown) "qr" = ( /obj/structure/table/steel, -/obj/random/firstaid, /turf/simulated/floor/tiled/steel, /area/submap/redshuttledown) "qT" = ( @@ -347,18 +347,14 @@ /obj/random/grenade/box, /obj/random/grenade/box, /obj/item/stolenpackage, -/obj/item/stolenpackage, /obj/item/rig/merc, /obj/item/rig/internalaffairs, -/obj/random/contraband/nofail, -/obj/random/contraband/nofail, /obj/random/maintenance/medical, /obj/random/maintenance/morestuff, /obj/random/maintenance/misc, -/obj/random/maintenance/security, /obj/random/maintenance/cargo, /obj/random/ammo, -/obj/random/ammo, +/obj/random/contraband, /turf/simulated/floor/tiled/yellow, /area/submap/redshuttledown) "tv" = ( @@ -396,7 +392,9 @@ /turf/template_noop, /area/submap/redshuttledown) "vX" = ( -/mob/living/simple_mob/humanoid/merc/ranged/deagle, +/mob/living/simple_mob/humanoid/merc/ranged/deagle{ + loot_list = list(/obj/item/gun/projectile/deagle = 100, /obj/item/perfect_tele = 20) + }, /obj/structure/bed/chair/office/dark{ dir = 1 }, @@ -501,9 +499,6 @@ /obj/structure/table/steel, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -531,10 +526,6 @@ /obj/machinery/light, /obj/structure/table/steel, /obj/random/tool, -/obj/random/maintenance/research, -/obj/random/maintenance/engineering, -/obj/random/material/refined, -/obj/item/cell/device/weapon/recharge/alien/omni, /turf/simulated/floor/tiled/steel, /area/submap/redshuttledown) "zv" = ( @@ -594,7 +585,6 @@ /obj/structure/table/standard, /obj/item/tank/anesthetic, /obj/effect/floor_decal/corner/green/border, -/obj/random/maintenance/medical, /turf/simulated/floor/tiled/white, /area/submap/redshuttledown) "Cu" = ( @@ -686,7 +676,6 @@ }, /obj/structure/table/standard, /obj/item/storage/pill_bottle/combat, -/obj/random/maintenance/medical, /turf/simulated/floor/tiled/white, /area/submap/redshuttledown) "GZ" = ( @@ -774,7 +763,9 @@ /turf/simulated/floor/tiled/steel, /area/submap/redshuttledown) "Mn" = ( -/mob/living/simple_mob/mechanical/mecha/combat/phazon, +/mob/living/simple_mob/mechanical/mecha/combat/phazon{ + loot_list = list(/obj/item/cell/device/weapon/recharge/alien/omni = 50) + }, /turf/simulated/floor/tiled/steel, /area/submap/redshuttledown) "MX" = ( @@ -796,10 +787,7 @@ /obj/structure/table/steel, /obj/item/stack/cable_coil/alien/blood, /obj/item/circuitboard/mecha/phazon/main, -/obj/random/tool/power, -/obj/random/maintenance/research, /obj/random/maintenance/engineering, -/obj/random/material/precious, /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser/rigged, /turf/simulated/floor/tiled/steel, /area/submap/redshuttledown) @@ -873,7 +861,6 @@ /obj/item/clothing/gloves/sterile, /obj/item/clothing/gloves/sterile, /obj/effect/floor_decal/corner/green/border, -/obj/random/maintenance/medical, /turf/simulated/floor/tiled/white, /area/submap/redshuttledown) "Sz" = ( @@ -983,9 +970,6 @@ /obj/random/energy/highend, /obj/item/rig/pmc/commander/grey/equipped, /obj/item/rig/pmc/commander/grey/equipped, -/obj/item/card/emag/used, -/obj/random/contraband/nofail, -/obj/random/contraband/nofail, /obj/random/maintenance/medical, /obj/random/maintenance/morestuff, /obj/random/maintenance/misc, @@ -993,6 +977,7 @@ /obj/random/maintenance/cargo, /obj/random/ammo, /obj/random/ammo, +/obj/random/contraband, /turf/simulated/floor/tiled/yellow, /area/submap/redshuttledown) "Yv" = ( @@ -1008,14 +993,6 @@ }, /turf/simulated/floor/tiled/yellow, /area/submap/redshuttledown) -"YR" = ( -/obj/structure/table/steel, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/item/perfect_tele, -/turf/simulated/floor/tiled/steel, -/area/submap/redshuttledown) "YZ" = ( /obj/structure/table/steel, /obj/item/material/knife, @@ -1026,12 +1003,10 @@ /area/submap/redshuttledown) "ZC" = ( /obj/structure/table/standard, -/obj/item/storage/firstaid/surgery, /obj/effect/floor_decal/corner/green/border{ dir = 10; icon_state = "bordercolor" }, -/obj/random/maintenance/medical, /turf/simulated/floor/tiled/white, /area/submap/redshuttledown) "ZN" = ( @@ -1319,7 +1294,7 @@ Ni ss kx GI -YR +BA BA Bx AD diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/begderg.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/begderg.dmm index 23b67b11cb..9b0e03d620 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/begderg.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/begderg.dmm @@ -577,7 +577,7 @@ H H H H -M +H I H H @@ -701,7 +701,7 @@ H I I I -M +H H H H @@ -737,7 +737,7 @@ H H H H -M +H I H H @@ -768,7 +768,7 @@ H H H H -M +H I I I @@ -850,7 +850,7 @@ H I I I -M +H H H H @@ -936,7 +936,7 @@ I I I I -M +H H H H @@ -1011,7 +1011,7 @@ H H H H -M +H I I I diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/bloodchurch.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/bloodchurch.dmm index ab26913471..d17eadd731 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/bloodchurch.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/bloodchurch.dmm @@ -11,14 +11,14 @@ /turf/simulated/floor/wood/sif, /area/submap/bloodchurch) "cq" = ( -/mob/living/simple_mob/construct/shade, /obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/construct/shade{ + loot_list = list(/obj/item/ectoplasm = 100, /obj/item/storage/backpack/holding/duffle = 5) + }, /turf/simulated/floor/wood/sif, /area/submap/bloodchurch) "cH" = ( /obj/structure/closet, -/obj/random/energy/highend, -/obj/item/clothing/gloves/regen, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/sif, /area/submap/bloodchurch) @@ -72,13 +72,6 @@ /obj/item/bedsheet/hosdouble, /turf/simulated/floor/wood/sif, /area/submap/bloodchurch) -"il" = ( -/obj/structure/closet, -/obj/random/energy/highend, -/obj/item/storage/belt/holding, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/sif, -/area/submap/bloodchurch) "iT" = ( /obj/structure/kitchenspike, /turf/simulated/floor/wood/sif, @@ -104,7 +97,6 @@ "mn" = ( /obj/item/clothing/suit/wizrobe/psypurple, /obj/effect/decal/cleanable/dirt, -/obj/item/holosign_creator/forcewand, /turf/simulated/floor/wood/sif, /area/submap/bloodchurch) "mG" = ( @@ -137,7 +129,9 @@ /area/submap/bloodchurch) "qb" = ( /obj/structure/bed/double/padded, -/mob/living/simple_mob/humanoid/cultist/human/bloodjaunt, +/mob/living/simple_mob/humanoid/cultist/human/bloodjaunt{ + health = 200 + }, /obj/item/bedsheet/hosdouble, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/sif, @@ -167,26 +161,20 @@ /turf/simulated/floor/wood/sif, /area/submap/bloodchurch) "wh" = ( -/mob/living/simple_mob/humanoid/cultist/elite, +/mob/living/simple_mob/humanoid/cultist/elite{ + loot_list = list(/obj/item/clothing/head/psy_crown/wrath = 25, /obj/item/clothing/gloves/regen = 10, /obj/item/storage/belt/utility/holding = 10) + }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/sif, /area/submap/bloodchurch) -"wA" = ( -/obj/item/clothing/head/wizard/amp, -/mob/living/simple_mob/construct/shade, -/turf/simulated/floor/wood/sif, -/area/submap/bloodchurch) "xJ" = ( /obj/structure/closet/crate, /obj/item/stolenpackage, -/obj/item/stolenpackage, -/obj/item/stolenpackage, /obj/item/rig_module/vision/thermal, /turf/simulated/floor/wood/sif, /area/submap/bloodchurch) "xN" = ( /obj/structure/table/sifwoodentable, -/obj/random/mouseray, /turf/simulated/floor/wood/sif, /area/submap/bloodchurch) "yn" = ( @@ -205,12 +193,6 @@ "yC" = ( /turf/simulated/floor/outdoors/dirt, /area/submap/bloodchurch) -"yD" = ( -/obj/structure/table/sifwoodentable, -/obj/item/holosign_creator/forcewand, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/sif, -/area/submap/bloodchurch) "zB" = ( /obj/structure/cliff/automatic/corner{ dir = 9 @@ -219,8 +201,10 @@ /area/submap/bloodchurch) "zO" = ( /obj/item/clothing/suit/wizrobe, -/mob/living/simple_mob/construct/shade, /obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/construct/shade{ + loot_list = list(/obj/item/ectoplasm = 100, /obj/item/storage/backpack/holding/duffle = 5) + }, /turf/simulated/floor/wood/sif, /area/submap/bloodchurch) "Ac" = ( @@ -257,7 +241,6 @@ /area/submap/bloodchurch) "DJ" = ( /obj/structure/table/sifwoodentable, -/obj/item/clothing/head/psy_crown/wrath, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/sif, /area/submap/bloodchurch) @@ -289,7 +272,6 @@ "Hn" = ( /obj/random/explorer_shield, /obj/random/contraband/nofail, -/obj/random/contraband/nofail, /obj/structure/closet/crate/secure/loot, /obj/item/rig_module/mounted/energy_blade, /obj/item/rig_module/sprinter, @@ -359,9 +341,8 @@ /area/submap/bloodchurch) "RN" = ( /obj/structure/table/sifwoodentable, -/obj/random/contraband/nofail, -/obj/random/contraband/nofail, /obj/random/gun/random, +/obj/random/contraband, /turf/simulated/floor/wood/sif, /area/submap/bloodchurch) "Uz" = ( @@ -382,7 +363,9 @@ /turf/simulated/floor/wood/sif, /area/submap/bloodchurch) "Yz" = ( -/mob/living/simple_mob/construct/shade, +/mob/living/simple_mob/construct/shade{ + loot_list = list(/obj/item/ectoplasm = 100, /obj/item/storage/backpack/holding/duffle = 5) + }, /turf/simulated/floor/wood/sif, /area/submap/bloodchurch) "YL" = ( @@ -782,7 +765,7 @@ or cq Gk AZ -Pn +rQ gy ev Nn @@ -817,11 +800,11 @@ Nn cq mn MK -wA +Yz kn fn gy -il +cH Nn Nn gy @@ -1071,7 +1054,7 @@ yC eT MQ rQ -yD +DJ Nn MH GX diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/carriershuttle.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/carriershuttle.dmm index 2d973c36d0..6188cc3ad0 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/carriershuttle.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/carriershuttle.dmm @@ -12,7 +12,9 @@ /turf/simulated/shuttle/floor/darkred, /area/submap/carriershuttle) "bh" = ( -/mob/living/simple_mob/animal/space/carp/large, +/mob/living/simple_mob/animal/space/carp/large{ + loot_list = list(/obj/item/salvage/ruin/carp = 100) + }, /obj/machinery/light/poi{ dir = 1 }, @@ -24,7 +26,6 @@ /obj/structure/cable/green, /obj/structure/cable/blue, /obj/structure/table/gold, -/obj/random/material/precious, /obj/machinery/light/poi{ dir = 8 }, @@ -80,6 +81,15 @@ }, /turf/simulated/shuttle/wall/voidcraft, /area/submap/carriershuttle) +"gp" = ( +/obj/structure/table/standard, +/obj/random/maintenance/foodstuff, +/obj/machinery/light/poi{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/diagonal, +/turf/simulated/shuttle/floor/darkred, +/area/submap/carriershuttle) "gu" = ( /obj/structure/grille/cult{ name = "Alien grille" @@ -113,18 +123,15 @@ /area/submap/carriershuttle) "ju" = ( /obj/structure/table/standard, -/obj/random/maintenance/foodstuff, -/obj/random/medical/pillbottle, /obj/machinery/light/poi, /obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/shuttle/floor/darkred, /area/submap/carriershuttle) "ln" = ( /obj/structure/table/standard, -/obj/random/ammo, -/obj/random/contraband/nofail, /obj/machinery/light/poi, /obj/effect/floor_decal/corner/red/diagonal, +/obj/random/contraband, /turf/simulated/shuttle/floor/darkred, /area/submap/carriershuttle) "lR" = ( @@ -237,6 +244,18 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/shuttle/floor/darkred, /area/submap/carriershuttle) +"tv" = ( +/obj/structure/table/standard, +/obj/machinery/recharger, +/obj/effect/floor_decal/corner/lime/diagonal, +/turf/simulated/shuttle/floor/darkred, +/area/submap/carriershuttle) +"tN" = ( +/obj/structure/table/standard, +/obj/random/medical/lite, +/obj/effect/floor_decal/corner/lime/diagonal, +/turf/simulated/shuttle/floor/darkred, +/area/submap/carriershuttle) "tQ" = ( /obj/machinery/light/poi{ dir = 8 @@ -309,7 +328,6 @@ "yb" = ( /obj/structure/table/standard, /obj/random/maintenance/foodstuff, -/obj/random/medical/lite, /obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/shuttle/floor/darkred, /area/submap/carriershuttle) @@ -332,7 +350,6 @@ icon_state = "0-2" }, /obj/structure/table/gold, -/obj/random/material/precious, /obj/machinery/light/poi{ dir = 8 }, @@ -399,6 +416,13 @@ /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/shuttle/floor/darkred, /area/submap/carriershuttle) +"BW" = ( +/obj/structure/table/standard, +/obj/random/ammo, +/obj/effect/floor_decal/corner/red/diagonal, +/obj/random/contraband, +/turf/simulated/shuttle/floor/darkred, +/area/submap/carriershuttle) "Cz" = ( /obj/structure/cable/green{ d1 = 4; @@ -410,7 +434,6 @@ /area/submap/carriershuttle) "CR" = ( /obj/structure/table/standard, -/obj/random/ammo, /obj/random/grenade/lethal, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/shuttle/floor/darkred, @@ -422,7 +445,6 @@ icon_state = "1-2" }, /obj/structure/table/gold, -/obj/random/material/precious, /obj/machinery/light/poi{ dir = 8 }, @@ -461,7 +483,6 @@ /area/submap/carriershuttle) "EN" = ( /obj/random/maintenance/morestuff, -/obj/random/maintenance/morestuff, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/shuttle/floor/darkred, /area/submap/carriershuttle) @@ -511,6 +532,11 @@ /obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/shuttle/floor/darkred, /area/submap/carriershuttle) +"JQ" = ( +/obj/structure/table/standard, +/obj/effect/floor_decal/corner/lime/diagonal, +/turf/simulated/shuttle/floor/darkred, +/area/submap/carriershuttle) "KX" = ( /obj/structure/grille/cult{ name = "Alien grille" @@ -566,11 +592,11 @@ "MZ" = ( /obj/structure/table/standard, /obj/random/ammo, -/obj/random/contraband/nofail, /obj/machinery/light/poi{ dir = 1 }, /obj/effect/floor_decal/corner/red/diagonal, +/obj/random/contraband, /turf/simulated/shuttle/floor/darkred, /area/submap/carriershuttle) "NI" = ( @@ -591,9 +617,8 @@ /area/submap/carriershuttle) "PM" = ( /obj/structure/table/standard, -/obj/random/ammo, -/obj/random/contraband/nofail, /obj/effect/floor_decal/corner/red/diagonal, +/obj/random/contraband, /turf/simulated/shuttle/floor/darkred, /area/submap/carriershuttle) "Qm" = ( @@ -644,6 +669,13 @@ /obj/effect/floor_decal/corner/lightorange/diagonal, /turf/simulated/shuttle/floor/yellow, /area/submap/carriershuttle) +"Vr" = ( +/obj/structure/table/standard, +/obj/random/maintenance/foodstuff, +/obj/machinery/light/poi, +/obj/effect/floor_decal/corner/lime/diagonal, +/turf/simulated/shuttle/floor/darkred, +/area/submap/carriershuttle) "Vv" = ( /obj/machinery/light/poi{ dir = 1 @@ -1171,7 +1203,7 @@ Qm BP QQ QQ -PM +BW Qm mM mM @@ -1251,11 +1283,11 @@ mM mM mM Qm -dI +gp VX VX VX -ju +Vr Qm mM "} @@ -1288,18 +1320,18 @@ mM mM mM Qm -yb +tN VX VX VX -yb +JQ Qm mM "} (17,1,1) = {" mM Qm -ZO +tv Eb VX Eb @@ -1325,7 +1357,7 @@ mM mM mM Qm -ZO +tv Eb VX Eb diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/cliffmanor.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/cliffmanor.dmm index baf0acd495..e216888639 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/cliffmanor.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/cliffmanor.dmm @@ -53,16 +53,6 @@ temperature = 243.15 }, /area/submap/cliffmanor) -"iA" = ( -/obj/structure/railing, -/obj/structure/table/wooden_reinforced, -/obj/random/material/precious, -/turf/simulated/floor/wood{ - nitrogen = 93.7835; - oxygen = 20.7263; - temperature = 243.15 - }, -/area/submap/cliffmanor) "iR" = ( /obj/structure/simple_door/wood, /turf/simulated/floor/wood{ @@ -109,13 +99,10 @@ temperature = 243.15 }, /area/submap/cliffmanor) -"oX" = ( -/obj/structure/table/wooden_reinforced, -/obj/item/clothing/head/psy_crown/gluttony, -/turf/simulated/floor/wood, -/area/submap/cliffmanor) "pI" = ( -/mob/living/simple_mob/humanoid/cultist/hunter, +/mob/living/simple_mob/humanoid/cultist/hunter{ + loot_list = list(/obj/item/material/butterfly/saw = 100, /obj/item/gun/projectile/shotgun/doublebarrel/sawn/alt = 100, /obj/item/clothing/head/psy_crown/wrath = 25) + }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ nitrogen = 93.7835; @@ -282,15 +269,6 @@ temperature = 243.15 }, /area/submap/cliffmanor) -"Ik" = ( -/obj/structure/table/wooden_reinforced, -/obj/random/energy/highend, -/turf/simulated/floor/wood{ - nitrogen = 93.7835; - oxygen = 20.7263; - temperature = 243.15 - }, -/area/submap/cliffmanor) "Ja" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -302,7 +280,9 @@ }, /area/submap/cliffmanor) "Kj" = ( -/mob/living/simple_mob/humanoid/cultist/hunter, +/mob/living/simple_mob/humanoid/cultist/hunter{ + loot_list = list(/obj/item/material/butterfly/saw = 100, /obj/item/gun/projectile/shotgun/doublebarrel/sawn/alt = 100, /obj/item/clothing/head/psy_crown/gluttony = 25) + }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, @@ -331,18 +311,8 @@ temperature = 243.15 }, /area/submap/cliffmanor) -"Mt" = ( -/obj/structure/table/wooden_reinforced, -/obj/random/firstaid, -/turf/simulated/floor/wood{ - nitrogen = 93.7835; - oxygen = 20.7263; - temperature = 243.15 - }, -/area/submap/cliffmanor) "ND" = ( /obj/structure/table/wooden_reinforced, -/obj/item/clothing/head/psy_crown/wrath, /turf/simulated/floor/wood, /area/submap/cliffmanor) "NQ" = ( @@ -360,8 +330,6 @@ dir = 1 }, /obj/structure/table/wooden_reinforced, -/obj/random/medical/pillbottle, -/obj/random/material/refined, /turf/simulated/floor/wood{ nitrogen = 93.7835; oxygen = 20.7263; @@ -465,8 +433,6 @@ "Wc" = ( /obj/structure/railing, /obj/structure/table/wooden_reinforced, -/obj/random/medical/pillbottle, -/obj/random/material/refined, /turf/simulated/floor/wood{ nitrogen = 93.7835; oxygen = 20.7263; @@ -477,13 +443,11 @@ /turf/simulated/floor/water, /area/submap/cliffmanor) "Zp" = ( -/obj/structure/table/wooden_reinforced, -/obj/random/gun/random, -/turf/simulated/floor/wood{ - nitrogen = 93.7835; - oxygen = 20.7263; - temperature = 243.15 - }, +/obj/structure/closet/crate/secure/loot, +/obj/random/mainttoyloot/nofail, +/obj/item/stack/material/mhydrogen, +/obj/random/material, +/turf/simulated/floor/wood, /area/submap/cliffmanor) "ZA" = ( /obj/structure/cliff/automatic{ @@ -723,7 +687,7 @@ bi Qi SZ kW -oX +ND uv ei kW @@ -813,7 +777,7 @@ lK SZ nu gX -Zp +gX uS kW bA @@ -1069,7 +1033,7 @@ nu SZ SZ SZ -iA +Wc xD rT rT @@ -1155,7 +1119,7 @@ rT rT aJ kW -GU +Zp wg Rh Dd @@ -1247,7 +1211,7 @@ lK SZ SZ gX -Mt +gX uS kW Rm @@ -1255,7 +1219,7 @@ Rm Rm kW uS -Ik +gX Ls SZ SZ diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/cove.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/cove.dmm index 0549d2e4bf..69cbfd8d62 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/cove.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/cove.dmm @@ -50,7 +50,6 @@ /obj/structure/table/rack, /obj/item/reagent_containers/chem_disp_cartridge/corophizine, /obj/item/reagent_containers/chem_disp_cartridge/moonshine, -/obj/random/gun/random, /obj/random/energy/highend, /obj/random/maintenance/morestuff, /obj/random/maintenance/morestuff, @@ -67,11 +66,15 @@ /obj/machinery/appliance/cooker/grill, /turf/simulated/floor/wood, /area/submap/cove) +"iO" = ( +/obj/structure/table/marble, +/obj/random/maintenance/foodstuff, +/obj/random/maintenance/foodstuff, +/turf/simulated/floor/wood, +/area/submap/cove) "iU" = ( /obj/structure/table/sifwooden_reinforced, /obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, /turf/simulated/floor/wood, /area/submap/cove) "jw" = ( @@ -142,9 +145,6 @@ "ov" = ( /obj/structure/table/marble, /obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, /turf/simulated/floor/wood, /area/submap/cove) "oM" = ( @@ -201,7 +201,6 @@ /area/submap/cove) "vN" = ( /obj/structure/table/standard, -/obj/item/gun/projectile/revolvershotgun, /obj/item/paper{ info = "The Eclipse bastards are really getting in the way of business. Every raid is becoming a battle on two fronts, and they just keep coming. Fortantly I have rainy day money, and got some of my bois backing me up. Narsch is the least offensive, so dead or alive for 100 thosuand thalers. I want to do the deed myself on Virrzzur, so alive for 150 thousand. Not sure what to do about the head admiral dude, since we have no name or face. I think they're made up."; name = "Work in progress bounty" @@ -231,12 +230,7 @@ /obj/structure/table/rack, /obj/item/reagent_containers/chem_disp_cartridge/dexalin, /obj/item/reagent_containers/chem_disp_cartridge/nuka_cola, -/obj/random/gun/random, -/obj/random/energy/highend, /obj/random/maintenance/morestuff, -/obj/random/maintenance/morestuff, -/obj/random/maintenance/morestuff, -/obj/random/contraband, /turf/simulated/floor/wood, /area/submap/cove) "Ac" = ( @@ -287,11 +281,6 @@ /obj/structure/table/rack, /obj/item/reagent_containers/chem_disp_cartridge/sleeptox, /obj/item/reagent_containers/chem_disp_cartridge/oxycodone, -/obj/random/gun/random, -/obj/random/energy/highend, -/obj/random/maintenance/morestuff, -/obj/random/maintenance/morestuff, -/obj/random/maintenance/morestuff, /obj/random/contraband, /turf/simulated/floor/wood, /area/submap/cove) @@ -364,7 +353,6 @@ /area/submap/cove) "RE" = ( /obj/structure/table/sifwooden_reinforced, -/obj/random/gun/random, /turf/simulated/floor/wood, /area/submap/cove) "RT" = ( @@ -393,7 +381,9 @@ /area/submap/cove) "US" = ( /mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced{ - faction = "pirate" + faction = "pirate"; + loot_list = list(/obj/item/gun/projectile/revolvershotgun = 50); + health = 150 }, /turf/simulated/floor/wood, /area/submap/cove) @@ -613,7 +603,7 @@ lk Gb aP Ox -Ox +Gb TN Gb lk @@ -646,7 +636,7 @@ Gb LQ ht qW -LQ +iO Gb lk rj @@ -674,8 +664,8 @@ qI qI Tm lk -Ox -TN +Gb +Gb Gb Gb Ox @@ -707,7 +697,7 @@ Tm Tm lk Gb -LQ +ov Ky Ky ov @@ -739,11 +729,11 @@ Tm Tm lk Gb -Ox -TN +Gb +Gb NQ Gb -Ox +Gb lk rj RT @@ -866,10 +856,10 @@ IP sl Gb MQ -ld -MQ RE MQ +RE +RE Gb RV lk @@ -964,7 +954,7 @@ Gb Gb MQ RE -MQ +RE ld MQ RV @@ -1089,12 +1079,12 @@ qI qI lk Gb -ld -MQ +RE +RE RE MQ -ld -MQ +RE +iU RE lk rj @@ -1155,7 +1145,7 @@ lk HQ iU kD -iU +MQ wD EC Gb diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/crashedexplo.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/crashedexplo.dmm index 28b6ecdd68..8816245883 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/crashedexplo.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/crashedexplo.dmm @@ -16,8 +16,6 @@ /obj/item/defib_kit/loaded, /obj/structure/closet/walllocker_double/medical/south, /obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/surgery, -/obj/item/storage/firstaid/adv, /obj/item/selectable_item/chemistrykit/gender, /obj/item/selectable_item/chemistrykit/size, /turf/simulated/shuttle/floor/white, @@ -82,7 +80,9 @@ /obj/structure/bed/chair/bay/comfy/blue{ dir = 1 }, -/mob/living/simple_mob/animal/giant_spider/phorogenic, +/mob/living/simple_mob/animal/giant_spider/phorogenic{ + loot_list = list(/obj/item/stock_parts/scanning_module/omni = 50) + }, /turf/simulated/shuttle/floor/black, /area/submap/crashedexplo) "ey" = ( @@ -90,14 +90,12 @@ dir = 1 }, /obj/structure/bed/chair/bay/shuttle, -/obj/random/rigsuit/chancetofail, /turf/simulated/shuttle/floor/black, /area/submap/crashedexplo) "eQ" = ( /turf/simulated/shuttle/wall/voidcraft/lightblue, /area/submap/crashedexplo) "fv" = ( -/obj/random/energy/highend, /turf/simulated/shuttle/floor/black, /area/submap/crashedexplo) "go" = ( @@ -151,13 +149,14 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/item/stock_parts/micro_laser/omni, /turf/simulated/shuttle/floor/black, /area/submap/crashedexplo) "jc" = ( /obj/structure/bed/chair/bay/shuttle, /obj/effect/decal/cleanable/blood, -/mob/living/simple_mob/animal/giant_spider/lurker, +/mob/living/simple_mob/animal/giant_spider/lurker{ + loot_list = list(/obj/item/stock_parts/capacitor/omni = 50) + }, /turf/simulated/shuttle/floor/black, /area/submap/crashedexplo) "ke" = ( @@ -216,7 +215,9 @@ /obj/machinery/light{ dir = 8 }, -/mob/living/simple_mob/animal/giant_spider/phorogenic, +/mob/living/simple_mob/animal/giant_spider/phorogenic{ + loot_list = list(/obj/item/stock_parts/manipulator/omni = 50) + }, /obj/item/circuitboard/sleeper, /turf/simulated/shuttle/floor/white, /area/submap/crashedexplo) @@ -224,7 +225,9 @@ /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/submap/crashedexplo) "nV" = ( -/mob/living/simple_mob/animal/giant_spider/phorogenic, +/mob/living/simple_mob/animal/giant_spider/phorogenic{ + loot_list = list(/obj/item/stock_parts/capacitor/omni = 50) + }, /turf/simulated/shuttle/floor/black, /area/submap/crashedexplo) "pd" = ( @@ -273,7 +276,9 @@ dir = 1; pixel_y = -32 }, -/mob/living/simple_mob/animal/giant_spider/carrier, +/mob/living/simple_mob/animal/giant_spider/carrier{ + loot_list = list(/obj/item/stock_parts/matter_bin/omni = 50) + }, /turf/simulated/shuttle/floor/black, /area/submap/crashedexplo) "sR" = ( @@ -351,7 +356,9 @@ /area/submap/crashedexplo) "vH" = ( /obj/item/stock_parts/capacitor/omni, -/mob/living/simple_mob/animal/giant_spider/lurker, +/mob/living/simple_mob/animal/giant_spider/lurker{ + loot_list = list(/obj/item/stock_parts/manipulator/omni = 50) + }, /turf/simulated/shuttle/floor/white, /area/submap/crashedexplo) "wv" = ( @@ -518,7 +525,9 @@ /turf/simulated/shuttle/plating, /area/submap/crashedexplo) "Cc" = ( -/mob/living/simple_mob/animal/giant_spider/carrier, +/mob/living/simple_mob/animal/giant_spider/carrier{ + loot_list = list(/obj/item/stock_parts/matter_bin/omni = 50) + }, /turf/simulated/shuttle/floor/black, /area/submap/crashedexplo) "CY" = ( @@ -526,10 +535,6 @@ /obj/effect/catwalk_plated/dark, /turf/simulated/shuttle/plating, /area/submap/crashedexplo) -"DH" = ( -/obj/item/stock_parts/matter_bin/omni, -/turf/simulated/shuttle/floor/black, -/area/submap/crashedexplo) "DJ" = ( /obj/structure/salvageable/console_broken_os, /turf/simulated/shuttle/floor/black, @@ -543,12 +548,6 @@ /obj/item/gps, /obj/structure/closet/walllocker_double/kitchen/east, /obj/item/storage/mre/random, -/obj/item/storage/mre/random, -/obj/item/storage/mre/random, -/obj/item/storage/mre/random, -/obj/item/storage/mre/random, -/obj/item/storage/mre/random, -/obj/item/storage/mre/random, /turf/simulated/shuttle/floor/black, /area/submap/crashedexplo) "Ft" = ( @@ -598,7 +597,6 @@ /area/submap/crashedexplo) "KT" = ( /obj/structure/table/glass, -/obj/machinery/chemical_dispenser/full, /turf/simulated/shuttle/floor/white, /area/submap/crashedexplo) "KV" = ( @@ -624,7 +622,6 @@ /obj/structure/bed/chair/bay/shuttle{ dir = 1 }, -/obj/item/stock_parts/capacitor/omni, /turf/simulated/shuttle/floor/black, /area/submap/crashedexplo) "LY" = ( @@ -633,7 +630,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/item/stock_parts/scanning_module/omni, /turf/simulated/shuttle/floor/black, /area/submap/crashedexplo) "MU" = ( @@ -765,7 +761,9 @@ pixel_x = -25; pixel_y = 32 }, -/mob/living/simple_mob/animal/giant_spider/phorogenic, +/mob/living/simple_mob/animal/giant_spider/phorogenic{ + loot_list = list(/obj/item/stock_parts/scanning_module/omni = 50) + }, /turf/simulated/shuttle/floor/yellow, /area/submap/crashedexplo) "SV" = ( @@ -775,7 +773,9 @@ d2 = 8; icon_state = "4-8" }, -/mob/living/simple_mob/animal/giant_spider/carrier, +/mob/living/simple_mob/animal/giant_spider/carrier{ + loot_list = list(/obj/item/stock_parts/micro_laser/omni = 50) + }, /turf/simulated/shuttle/floor/black, /area/submap/crashedexplo) "Tb" = ( @@ -869,7 +869,6 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/blood, -/obj/item/stock_parts/scanning_module/omni, /turf/simulated/shuttle/floor/yellow, /area/submap/crashedexplo) "VE" = ( @@ -911,7 +910,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/stock_parts/manipulator/omni, /turf/simulated/shuttle/floor/black, /area/submap/crashedexplo) "Yq" = ( @@ -921,10 +919,6 @@ }, /turf/simulated/shuttle/wall/voidcraft/lightblue, /area/submap/crashedexplo) -"Yr" = ( -/obj/item/stock_parts/capacitor/omni, -/turf/simulated/shuttle/floor/black, -/area/submap/crashedexplo) "YK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ dir = 8 @@ -1060,7 +1054,7 @@ UG UG bF DJ -DH +fv LY go dv @@ -1082,7 +1076,7 @@ hn Cc RE jc -Yr +fv Ft cI lL diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/demonranch.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/demonranch.dmm index d30b46ba25..bb82c8a380 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/demonranch.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/demonranch.dmm @@ -1,24 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ax" = ( /obj/structure/closet/crate, -/obj/random/contraband/nofail, -/obj/random/contraband/nofail, -/obj/random/ammo, -/obj/random/ammo, -/obj/random/energy/highend, -/obj/random/energy/highend, -/obj/random/firstaid, -/obj/random/firstaid, -/obj/random/maintenance/morestuff, -/obj/random/maintenance/morestuff, -/obj/random/maintenance/misc, -/obj/random/maintenance/misc, +/obj/random/contraband, /obj/random/maintenance/research, -/obj/random/maintenance/research, -/obj/random/material/precious, -/obj/random/material/precious, -/obj/random/material/refined, -/obj/random/material/refined, /turf/simulated/floor/wood/sif{ temperature = 243.15; oxygen = 20.7263; @@ -31,9 +15,6 @@ /area/submap/demonranch) "aT" = ( /obj/structure/table/sifwoodentable, -/obj/random/mainttoyloot/nofail, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, /obj/random/medical/pillbottle, /turf/simulated/floor/wood/sif{ temperature = 243.15; @@ -134,12 +115,8 @@ "ml" = ( /obj/structure/closet/crate/secure/loot, /obj/item/personal_shield_generator/belt/security, -/obj/random/contraband/nofail, -/obj/random/contraband/nofail, -/obj/random/contraband/nofail, -/obj/random/contraband/nofail, /obj/item/storage/backpack/dufflebag/syndie/med, -/obj/item/holosign_creator/forcewand, +/obj/random/contraband, /turf/simulated/floor/wood/sif{ temperature = 243.15; oxygen = 20.7263; @@ -164,15 +141,11 @@ /turf/simulated/floor/outdoors/dirt, /area/submap/demonranch) "nX" = ( -/obj/structure/table/sifwoodentable, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/random/medical/pillbottle, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, +/obj/structure/closet/crate, +/obj/random/ammo, +/obj/random/ammo, +/obj/random/maintenance/morestuff, +/obj/random/material/precious, /turf/simulated/floor/wood/sif{ temperature = 243.15; oxygen = 20.7263; @@ -293,7 +266,6 @@ /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, -/obj/random/medical/pillbottle, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, /turf/simulated/floor/wood/sif{ @@ -319,9 +291,13 @@ }, /area/submap/demonranch) "Dw" = ( -/obj/effect/landmark/loot_spawn, -/obj/fire, -/turf/simulated/floor/outdoors/dirt, +/obj/structure/table/sifwoodentable, +/obj/random/maintenance/foodstuff, +/turf/simulated/floor/wood/sif{ + temperature = 243.15; + oxygen = 20.7263; + nitrogen = 93.7835 + }, /area/submap/demonranch) "Fw" = ( /obj/structure/table/bench/sifwooden, @@ -363,14 +339,6 @@ "IW" = ( /obj/structure/table/sifwoodentable, /obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/random/contraband/nofail, -/obj/random/medical/pillbottle, -/obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, /turf/simulated/floor/wood/sif{ temperature = 243.15; @@ -441,7 +409,6 @@ /area/submap/demonranch) "QH" = ( /obj/structure/table/sifwoodentable, -/obj/random/firstaid, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, /turf/simulated/floor/wood/sif{ @@ -749,7 +716,7 @@ mG mG mG yT -nX +IW Kt mG yj @@ -960,7 +927,7 @@ Zy Zy pr Kt -aT +Dw mG mG ie @@ -1034,7 +1001,7 @@ Zy Zy pr Kt -QH +aT AI mG mG @@ -1046,7 +1013,7 @@ TL su aM aM -Si +su su su su @@ -1083,7 +1050,7 @@ aM aM aM ot -mC +su su hq hq @@ -1116,7 +1083,7 @@ Rp Kt eM su -su +Si aM aM aM @@ -1153,7 +1120,7 @@ Kt Kt eM su -Si +su aM su aM @@ -1350,7 +1317,7 @@ hq hq su su -mC +su su sA su @@ -1414,7 +1381,7 @@ vk su aM su -mC +su su su kd @@ -1525,13 +1492,13 @@ eM su su su -Dw +aM aM aM aM su mC -su +iw su aM aM @@ -1569,7 +1536,7 @@ su su su su -Si +su aM aM ot @@ -1936,7 +1903,7 @@ hY hY Kt qA -ax +nX Rp Kt hY diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/dronelord.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/dronelord.dmm index 4ed3794f0d..83851fcf2e 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/dronelord.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/dronelord.dmm @@ -11,9 +11,6 @@ /area/submap/dronelord) "ax" = ( /obj/structure/table/glass, -/obj/random/firstaid, -/obj/random/firstaid, -/obj/random/firstaid, /obj/machinery/light/poi, /turf/simulated/shuttle/floor/white, /area/submap/dronelord) @@ -57,7 +54,6 @@ /turf/simulated/shuttle/floor/purple, /area/submap/dronelord) "dw" = ( -/obj/item/gun/projectile/heavysniper, /obj/item/tank/jetpack/oxygen, /turf/simulated/shuttle/floor/black, /area/submap/dronelord) @@ -111,7 +107,7 @@ /area/submap/dronelord) "jy" = ( /obj/structure/table/glass, -/obj/item/storage/firstaid/clotting, +/obj/item/storage/firstaid/o2, /turf/simulated/shuttle/floor/white, /area/submap/dronelord) "ko" = ( @@ -191,7 +187,7 @@ /area/submap/dronelord) "xz" = ( /obj/structure/table/glass, -/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid, /turf/simulated/shuttle/floor/white, /area/submap/dronelord) "yh" = ( @@ -212,8 +208,6 @@ "En" = ( /obj/structure/closet/secure_closet/guncabinet, /obj/item/gun/projectile/giskard/olivaw, -/obj/item/gun/energy/lasershotgun, -/obj/item/gun/energy/particle/cannon, /turf/simulated/shuttle/floor/red, /area/submap/dronelord) "Fc" = ( @@ -312,11 +306,6 @@ }, /turf/simulated/shuttle/floor/yellow, /area/submap/dronelord) -"RI" = ( -/obj/item/tank/jetpack/oxygen, -/obj/item/gun/projectile/automatic/sts35, -/turf/simulated/shuttle/floor/black, -/area/submap/dronelord) "RV" = ( /turf/template_noop, /area/template_noop) @@ -346,8 +335,8 @@ /area/submap/dronelord) "Uz" = ( /obj/structure/table/standard, -/obj/item/card/emag/used, /obj/machinery/light/poi, +/obj/random/contraband, /turf/simulated/shuttle/floor/purple, /area/submap/dronelord) "VO" = ( @@ -356,7 +345,6 @@ "WO" = ( /obj/structure/closet/secure_closet/guncabinet, /obj/item/gun/magnetic/matfed, -/obj/item/gun/energy/ionrifle, /obj/item/gun/energy/sickshot, /turf/simulated/shuttle/floor/red, /area/submap/dronelord) @@ -737,7 +725,7 @@ Gi kG mG yh -RI +dw aj tK tK diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/eclipseaqua.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/eclipseaqua.dmm index 81198f2945..1fb5fc9309 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/eclipseaqua.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/eclipseaqua.dmm @@ -162,9 +162,6 @@ /area/template_noop) "mL" = ( /obj/structure/table/steel, -/obj/random/ammo, -/obj/random/ammo, -/obj/random/projectile/random, /obj/effect/floor_decal/corner/grey, /obj/effect/floor_decal/corner/black{ dir = 1 @@ -380,19 +377,16 @@ /obj/structure/table/rack, /obj/random/rigsuit, /obj/item/rig_module/mounted/egun, -/obj/random/energy/highend, /obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/eclipseaqua) "Dw" = ( /obj/structure/table/steel, -/obj/random/ammo, -/obj/random/ammo, -/obj/random/energy/highend, /obj/effect/floor_decal/corner/grey, /obj/effect/floor_decal/corner/black{ dir = 1 }, +/obj/random/maintenance/foodstuff, /turf/simulated/floor/tiled/dark, /area/submap/eclipseaqua) "Ej" = ( @@ -419,7 +413,6 @@ /obj/structure/table/rack, /obj/random/rigsuit, /obj/item/rig_module/chem_dispenser/combat, -/obj/random/energy/highend, /obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/eclipseaqua) @@ -529,7 +522,6 @@ /obj/structure/table/steel, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, /obj/effect/floor_decal/corner/grey, /obj/effect/floor_decal/corner/black{ dir = 1 @@ -592,8 +584,6 @@ /area/submap/eclipseaqua) "Oo" = ( /obj/structure/table/steel, -/obj/random/ammo, -/obj/random/ammo, /obj/random/grenade/lethal, /obj/effect/floor_decal/corner/grey, /obj/effect/floor_decal/corner/black{ @@ -662,7 +652,6 @@ /obj/structure/table/rack, /obj/item/rig/breacher, /obj/item/rig_module/pat_module, -/obj/random/energy/highend, /obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/eclipseaqua) @@ -676,9 +665,9 @@ /area/submap/eclipseaqua) "UH" = ( /obj/structure/table/steel, -/obj/random/ammo, -/obj/random/ammo, -/obj/random/firstaid, +/obj/random/maintenance/research, +/obj/random/maintenance/research, +/obj/random/maintenance/morestuff, /obj/effect/floor_decal/corner/grey, /obj/effect/floor_decal/corner/black{ dir = 1 @@ -742,13 +731,11 @@ /area/submap/eclipseaqua) "Vn" = ( /obj/structure/table/steel, -/obj/random/ammo, -/obj/random/ammo, -/obj/random/gun/random, /obj/effect/floor_decal/corner/grey, /obj/effect/floor_decal/corner/black{ dir = 1 }, +/obj/random/grenade/lethal, /turf/simulated/floor/tiled/dark, /area/submap/eclipseaqua) "Wc" = ( @@ -1451,7 +1438,7 @@ Pf Pf Pf Qu -Dw +Xm sX gA Ry @@ -1594,7 +1581,7 @@ Pf Qu Ry Vg -KI +Dw KI cC Qu @@ -1642,7 +1629,7 @@ Qu nf Vg eK -KI +mL Vg On gA @@ -2019,7 +2006,7 @@ Qu Ry jw JQ -KH +UH Qu Vn Xm @@ -2291,13 +2278,13 @@ Ry jw gA Ry -mL +Xm Qu Pf Pf Pf Qu -UH +Xm Ry gA jw diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/eclipseblob.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/eclipseblob.dmm index 25e434bbe0..2c157ba002 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/eclipseblob.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/eclipseblob.dmm @@ -31,7 +31,9 @@ /turf/simulated/floor/tiled/yellow, /area/submap/eclipseblob) "ez" = ( -/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger, +/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger{ + loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/stack/material/void_opal = 50) + }, /turf/simulated/floor/tiled/red, /area/submap/eclipseblob) "eG" = ( @@ -58,6 +60,13 @@ /obj/structure/blob/normal, /turf/simulated/floor/tiled/dark, /area/submap/eclipseblob) +"fJ" = ( +/obj/structure/table/steel, +/obj/random/maintenance/foodstuff, +/obj/random/maintenance/foodstuff, +/obj/random/maintenance/foodstuff, +/turf/simulated/floor/tiled/red, +/area/submap/eclipseblob) "gb" = ( /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/dark, @@ -74,12 +83,6 @@ /area/submap/eclipseblob) "hH" = ( /obj/structure/table/steel, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, /turf/simulated/floor/tiled/red, /area/submap/eclipseblob) "iI" = ( @@ -91,7 +94,9 @@ /turf/simulated/floor/tiled/dark, /area/submap/eclipseblob) "jl" = ( -/mob/living/simple_mob/humanoid/eclipse/solar/hellhound, +/mob/living/simple_mob/humanoid/eclipse/solar/hellhound{ + loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/stack/material/void_opal = 50) + }, /turf/simulated/floor/tiled/yellow, /area/submap/eclipseblob) "jt" = ( @@ -162,12 +167,6 @@ "sE" = ( /obj/structure/table/steel, /obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/item/stack/material/void_opal, /turf/simulated/floor/tiled/yellow, /area/submap/eclipseblob) "tF" = ( @@ -222,10 +221,6 @@ /obj/structure/table/steel, /obj/random/maintenance/foodstuff, /obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, /turf/simulated/floor/tiled/yellow, /area/submap/eclipseblob) "Ej" = ( @@ -249,6 +244,15 @@ /obj/item/slime_extract/dark_blue, /turf/simulated/floor/tiled/dark, /area/submap/eclipseblob) +"Ic" = ( +/obj/structure/table/steel, +/obj/random/maintenance/foodstuff, +/obj/random/maintenance/foodstuff, +/obj/random/maintenance/foodstuff, +/obj/random/maintenance/foodstuff, +/obj/random/maintenance/foodstuff, +/turf/simulated/floor/tiled/yellow, +/area/submap/eclipseblob) "In" = ( /turf/simulated/shuttle/wall/voidcraft/lightblue, /area/submap/eclipseblob) @@ -739,7 +743,7 @@ np In Cy hH -Cy +sE In gb gb @@ -857,9 +861,9 @@ np np np In -sE -hH Cy +fJ +Ic In gb gb diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/eclipsecargo.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/eclipsecargo.dmm index def8d891c3..b913808b33 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/eclipsecargo.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/eclipsecargo.dmm @@ -20,18 +20,31 @@ /obj/item/gun/energy/clockwork, /turf/simulated/shuttle/floor/purple, /area/submap/eclipsecargo) +"f" = ( +/obj/structure/closet/crate, +/obj/random/ammo, +/obj/random/ammo, +/obj/random/ammo, +/obj/random/material, +/obj/random/contraband, +/turf/simulated/shuttle/floor/black, +/area/submap/eclipsecargo) "g" = ( /obj/structure/bed/chair/bay/comfy/teal{ dir = 1 }, -/mob/living/simple_mob/humanoid/eclipse/solar/hellhound, +/mob/living/simple_mob/humanoid/eclipse/solar/hellhound{ + loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50) + }, /turf/simulated/shuttle/floor/red, /area/submap/eclipsecargo) "h" = ( /obj/structure/bed/chair/bay/comfy/teal{ dir = 1 }, -/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner, +/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner{ + loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50) + }, /turf/simulated/shuttle/floor/red, /area/submap/eclipsecargo) "i" = ( @@ -41,12 +54,9 @@ "j" = ( /obj/structure/closet/crate, /obj/item/mecha_parts/mecha_equipment/cloak, -/obj/random/contraband/nofail, -/obj/random/ammo, -/obj/random/ammo, /obj/random/ammo, /obj/random/material, -/obj/random/material/precious, +/obj/random/contraband, /turf/simulated/shuttle/floor/black, /area/submap/eclipsecargo) "k" = ( @@ -76,7 +86,9 @@ /turf/simulated/shuttle/floor/black, /area/submap/eclipsecargo) "m" = ( -/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger, +/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger{ + loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50) + }, /turf/simulated/shuttle/floor/black, /area/submap/eclipsecargo) "n" = ( @@ -105,6 +117,15 @@ /obj/structure/window/plastitanium/full, /turf/simulated/shuttle/plating, /area/submap/eclipsecargo) +"q" = ( +/obj/structure/closet/crate, +/obj/random/ammo, +/obj/random/ammo, +/obj/random/ammo, +/obj/random/material, +/obj/random/material/precious, +/turf/simulated/shuttle/floor/black, +/area/submap/eclipsecargo) "r" = ( /mob/living/simple_mob/humanoid/eclipse/solar/radiation, /turf/simulated/shuttle/floor/black, @@ -124,12 +145,12 @@ "u" = ( /obj/structure/closet/crate, /obj/item/organ/internal/immunehub/replicant, -/obj/random/contraband/nofail, /obj/random/ammo, /obj/random/ammo, /obj/random/ammo, /obj/random/material, /obj/random/material/precious, +/obj/random/contraband, /turf/simulated/shuttle/floor/black, /area/submap/eclipsecargo) "v" = ( @@ -160,7 +181,6 @@ /area/submap/eclipsecargo) "y" = ( /obj/structure/table/glass, -/obj/item/prop/alien/junk, /turf/simulated/shuttle/floor/red, /area/submap/eclipsecargo) "z" = ( @@ -220,7 +240,6 @@ "H" = ( /obj/structure/closet/crate, /obj/item/mecha_parts/mecha_equipment/weapon/honker, -/obj/random/contraband/nofail, /obj/random/ammo, /obj/random/ammo, /obj/random/ammo, @@ -250,6 +269,16 @@ "K" = ( /turf/simulated/shuttle/floor/red, /area/submap/eclipsecargo) +"L" = ( +/obj/structure/closet/crate, +/obj/random/ammo, +/obj/random/ammo, +/obj/random/ammo, +/obj/random/material, +/obj/random/material/precious, +/obj/random/contraband, +/turf/simulated/shuttle/floor/black, +/area/submap/eclipsecargo) "M" = ( /mob/living/simple_mob/humanoid/eclipse/lunar/silvernoodle, /turf/simulated/shuttle/floor/purple, @@ -275,9 +304,6 @@ "S" = ( /obj/structure/closet/crate, /obj/item/organ/internal/fruitgland, -/obj/random/contraband/nofail, -/obj/random/ammo, -/obj/random/ammo, /obj/random/ammo, /obj/random/material, /obj/random/material/precious, @@ -286,23 +312,20 @@ "T" = ( /obj/structure/closet/crate, /obj/item/organ/internal/augment/armmounted/dartbow, -/obj/random/contraband/nofail, /obj/random/ammo, /obj/random/ammo, /obj/random/ammo, /obj/random/material, /obj/random/material/precious, +/obj/random/contraband, /turf/simulated/shuttle/floor/black, /area/submap/eclipsecargo) "U" = ( /obj/structure/closet/crate, -/obj/random/contraband/nofail, /obj/random/ammo, /obj/random/ammo, /obj/random/ammo, -/obj/random/firstaid, -/obj/random/material, -/obj/random/material/precious, +/obj/random/contraband, /turf/simulated/shuttle/floor/black, /area/submap/eclipsecargo) "V" = ( @@ -310,7 +333,9 @@ /turf/simulated/shuttle/floor/purple, /area/submap/eclipsecargo) "W" = ( -/mob/living/simple_mob/humanoid/eclipse/solar/firemoff, +/mob/living/simple_mob/humanoid/eclipse/solar/firemoff{ + loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50) + }, /turf/simulated/shuttle/floor/black, /area/submap/eclipsecargo) "X" = ( @@ -320,23 +345,16 @@ "Y" = ( /obj/structure/closet/crate, /obj/item/clothing/under/yw/blueshield, -/obj/random/contraband/nofail, -/obj/random/ammo, -/obj/random/ammo, -/obj/random/ammo, -/obj/random/material, -/obj/random/material/precious, +/obj/random/contraband, /turf/simulated/shuttle/floor/black, /area/submap/eclipsecargo) "Z" = ( /obj/structure/closet/crate, -/obj/item/organ/internal/lungs/replicant/mending, -/obj/random/contraband/nofail, -/obj/random/ammo, /obj/random/ammo, /obj/random/ammo, /obj/random/material, /obj/random/material/precious, +/obj/random/contraband, /turf/simulated/shuttle/floor/black, /area/submap/eclipsecargo) @@ -507,7 +525,7 @@ e D B a -o +f a l m @@ -534,7 +552,7 @@ B a S a -o +L a R C @@ -559,7 +577,7 @@ B a T a -o +q a R C @@ -632,7 +650,7 @@ B B B a -o +U a Z a diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/eclipselava.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/eclipselava.dmm index d3749e92be..8ecdb4f7f1 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/eclipselava.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/eclipselava.dmm @@ -44,16 +44,14 @@ /obj/structure/table/rack/shelf, /obj/item/gun/projectile/automatic/sol, /obj/random/contraband, -/obj/random/contraband, -/obj/random/contraband, /obj/machinery/light{ dir = 8 }, +/obj/random/contraband/nofail, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "bI" = ( /obj/structure/table/steel, -/obj/random/maintenance/medical, /obj/machinery/light{ dir = 1 }, @@ -95,13 +93,10 @@ /area/submap/eclipselava) "dB" = ( /obj/structure/table/rack/shelf, -/obj/item/gun/energy/gun/rifle, -/obj/random/contraband, -/obj/random/contraband, -/obj/random/contraband, /obj/machinery/light{ dir = 4 }, +/obj/random/contraband/nofail, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "dE" = ( @@ -143,7 +138,9 @@ /turf/simulated/mineral/floor/ignore_mapgen/sif, /area/submap/eclipselava) "ge" = ( -/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner, +/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner{ + loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50) + }, /turf/simulated/floor/tiled/dark{ temperature = 243.15; oxygen = 20.7263; @@ -185,8 +182,6 @@ /obj/structure/table/hardwoodtable, /obj/random/ammo, /obj/random/ammo, -/obj/random/ammo, -/obj/random/medical/pillbottle, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "hm" = ( @@ -205,15 +200,12 @@ }, /area/submap/eclipselava) "il" = ( -/obj/structure/table/steel, -/obj/random/energy/sec, -/obj/random/maintenance/foodstuff, +/obj/structure/table/rack/shelf, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "iq" = ( /obj/structure/table/steel, /obj/random/rigsuit, -/obj/random/maintenance/medical, /obj/machinery/light{ dir = 4 }, @@ -235,9 +227,7 @@ "jS" = ( /obj/structure/table/rack/shelf, /obj/item/slime_extract/emerald, -/obj/random/contraband, -/obj/random/contraband, -/obj/random/contraband, +/obj/random/contraband/nofail, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "jU" = ( @@ -247,12 +237,14 @@ /turf/simulated/mineral/floor/ignore_mapgen/sif, /area/submap/eclipselava) "la" = ( -/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner{ + loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50) + }, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "mn" = ( @@ -733,8 +725,6 @@ /obj/structure/table/hardwoodtable, /obj/random/ammo, /obj/random/ammo, -/obj/random/ammo, -/obj/random/medical/pillbottle, /obj/machinery/light{ dir = 1 }, @@ -765,23 +755,22 @@ /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "Ed" = ( -/obj/structure/table/steel, -/obj/random/energy, -/obj/random/maintenance/medical, +/obj/structure/table/hardwoodtable, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "Ej" = ( /obj/structure/table/steel, -/obj/random/contraband, /obj/random/maintenance/research, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "El" = ( /obj/structure/table/rack/shelf, /obj/item/cell/device/weapon/recharge/alien, -/obj/random/contraband, -/obj/random/contraband, -/obj/random/contraband, +/obj/random/contraband/nofail, +/obj/random/contraband/nofail, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "En" = ( @@ -869,15 +858,12 @@ "GK" = ( /obj/structure/table/steel, /obj/random/firstaid, -/obj/random/maintenance/medical, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "GM" = ( /obj/structure/table/rack/shelf, /obj/item/slime_extract/ruby, -/obj/random/contraband, -/obj/random/contraband, -/obj/random/contraband, +/obj/random/contraband/nofail, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "GS" = ( @@ -1092,13 +1078,6 @@ /obj/structure/bed/chair/office/light, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) -"Pq" = ( -/obj/structure/table/steel, -/obj/random/contraband, -/obj/random/medical/pillbottle, -/obj/random/maintenance/research, -/turf/simulated/floor/tiled/dark, -/area/submap/eclipselava) "PP" = ( /obj/structure/table/steel, /obj/random/firstaid, @@ -1114,8 +1093,8 @@ /area/submap/eclipselava) "Qr" = ( /obj/structure/table/steel, -/obj/random/firstaid, /obj/random/maintenance/research, +/obj/random/contraband, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "QN" = ( @@ -1301,7 +1280,6 @@ "Ux" = ( /obj/structure/table/steel, /obj/random/maintenance/medical, -/obj/random/maintenance/medical, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "UF" = ( @@ -1330,7 +1308,6 @@ /area/submap/eclipselava) "VR" = ( /obj/structure/table/steel, -/obj/random/contraband, /obj/random/maintenance/research, /obj/item/paper{ info = "The extreme heat of the lava and dragons, along side of the energy of the emitter still are unable to replicate the effects of the solar flare project. The dragons have been gorging themselves on wild life, and bandits seem highly keen for the slime core. Stealth is no longer an option, although our position is heavily fortified. We highly recommend for the Head Admiral to relocate resources and attempts for recreation of the solar project off planet."; @@ -1363,16 +1340,20 @@ /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "XX" = ( -/mob/living/simple_mob/humanoid/eclipse/solar/firemoff, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/mob/living/simple_mob/humanoid/eclipse/solar/firemoff{ + loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50) + }, /turf/simulated/floor/tiled/dark, /area/submap/eclipselava) "Yf" = ( -/mob/living/simple_mob/humanoid/eclipse/solar/hellhound, +/mob/living/simple_mob/humanoid/eclipse/solar/hellhound{ + loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/cell/device/weapon/recharge/alien/hybrid = 50) + }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -2223,7 +2204,7 @@ vN oc dj bp -Ed +LV MO MO wA @@ -2410,7 +2391,7 @@ ZS bp GM bB -El +il bp ZS ZS @@ -3204,8 +3185,8 @@ ZS Ad bp ZK -Pq -Ej +ZK +ZK ZK bp MO @@ -3264,7 +3245,7 @@ MO LC RA qq -il +RA qq MO bp @@ -3316,7 +3297,7 @@ MO XX RA qq -RA +LV qq MO wA @@ -3359,7 +3340,7 @@ ZS ZS Ad bp -En +Ej MO MO qP @@ -3837,7 +3818,7 @@ MO pX Oj Du -hg +Ed pX bp dw diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/eclipsemountain.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/eclipsemountain.dmm index 95df8b4fa9..8fb4b95db5 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/eclipsemountain.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/eclipsemountain.dmm @@ -12,8 +12,10 @@ /turf/simulated/floor/tiled/steel, /area/submap/eclipsemountain) "bN" = ( -/mob/living/simple_mob/humanoid/eclipse/solar/firemoff, /obj/effect/floor_decal/corner/black/diagonal, +/mob/living/simple_mob/humanoid/eclipse/solar/firemoff{ + loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50) + }, /turf/simulated/floor/tiled/dark, /area/submap/eclipsemountain) "bY" = ( @@ -63,7 +65,6 @@ /obj/structure/table/gold, /obj/random/ammo, /obj/random/maintenance/security, -/obj/random/maintenance/research, /obj/machinery/light{ dir = 8 }, @@ -92,8 +93,8 @@ "jt" = ( /obj/structure/table/wooden_reinforced, /obj/random/tool/alien, -/obj/random/contraband, /obj/machinery/light, +/obj/random/contraband, /turf/simulated/floor/wood{ oxygen = 20.7263; nitrogen = 93.7835; @@ -202,6 +203,12 @@ /obj/machinery/telecomms/relay/preset, /turf/simulated/floor/tiled/dark, /area/submap/eclipsemountain) +"sr" = ( +/obj/structure/table/steel, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/random/medical/pillbottle, +/turf/simulated/floor/tiled/dark, +/area/submap/eclipsemountain) "sy" = ( /obj/structure/table/gold, /obj/random/ammo, @@ -287,8 +294,10 @@ /turf/simulated/floor/tiled/steel, /area/submap/eclipsemountain) "vC" = ( -/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner, /obj/effect/floor_decal/corner/grey/diagonal, +/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner{ + loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50) + }, /turf/simulated/floor/tiled/steel, /area/submap/eclipsemountain) "vO" = ( @@ -309,7 +318,6 @@ /area/submap/eclipsemountain) "yy" = ( /obj/structure/table/steel, -/obj/random/firstaid, /obj/random/material/refined, /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/steel, @@ -432,8 +440,10 @@ /turf/simulated/floor/bluegrid, /area/submap/eclipsemountain) "IQ" = ( -/mob/living/simple_mob/humanoid/eclipse/solar/hellhound, /obj/effect/floor_decal/corner/grey/diagonal, +/mob/living/simple_mob/humanoid/eclipse/solar/hellhound{ + loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/cell/device/weapon/recharge/alien/hybrid = 50) + }, /turf/simulated/floor/tiled/steel, /area/submap/eclipsemountain) "Jg" = ( @@ -483,7 +493,6 @@ /obj/structure/table/gold, /obj/random/ammo, /obj/random/maintenance/security, -/obj/random/maintenance/research, /obj/machinery/light, /obj/effect/floor_decal/corner/yellow/diagonal, /turf/simulated/floor/tiled/yellow, @@ -595,15 +604,11 @@ }, /area/submap/eclipsemountain) "Tp" = ( -/obj/structure/table/wooden_reinforced, -/obj/random/contraband, -/obj/random/contraband, -/obj/random/firstaid, -/turf/simulated/floor/wood{ - oxygen = 20.7263; - nitrogen = 93.7835; - temperature = 243.15 - }, +/obj/structure/table/gold, +/obj/random/maintenance/security, +/obj/random/maintenance/research, +/obj/effect/floor_decal/corner/yellow/diagonal, +/turf/simulated/floor/tiled/yellow, /area/submap/eclipsemountain) "TT" = ( /obj/structure/table/rack, @@ -667,7 +672,6 @@ /area/submap/eclipsemountain) "XM" = ( /obj/structure/table/gold, -/obj/random/ammo, /obj/random/maintenance/security, /obj/random/maintenance/research, /obj/machinery/light{ @@ -1324,7 +1328,7 @@ MM MM LV LV -kX +sr kX LV LV @@ -1367,7 +1371,7 @@ MM kx LV yy -Ln +yy LV kx MM @@ -1488,7 +1492,7 @@ JO JO JO JO -bY +QT MM LV LV @@ -1529,8 +1533,8 @@ MM JO JO Tc +QT bY -Tp MM kx qv @@ -1610,7 +1614,7 @@ Cz yY Cz MM -sy +Tp VM ec xO diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/fallenlab.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/fallenlab.dmm index e15aaab7d1..f784514446 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/fallenlab.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/fallenlab.dmm @@ -7,8 +7,6 @@ "aZ" = ( /obj/structure/table/darkglass, /obj/item/ammo_casing/microbattery/medical/burn3, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) "bH" = ( @@ -25,10 +23,20 @@ /mob/living/simple_mob/mechanical/cyber_horror/grey, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) +"dg" = ( +/obj/structure/table/standard, +/obj/random/maintenance/engineering, +/obj/effect/floor_decal/corner/red/diagonal, +/turf/simulated/floor/tiled/dark, +/area/submap/fallenlab) "dx" = ( /obj/effect/floor_decal/corner/red/diagonal, -/mob/living/simple_mob/mechanical/cyber_horror/grey, -/turf/simulated/floor/tiled/dark, +/mob/living/simple_mob/mechanical/cyber_horror/grey{ + loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5) + }, +/turf/simulated/floor/tiled/dark{ + loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5) + }, /area/submap/fallenlab) "eq" = ( /obj/structure/closet/toolcloset, @@ -50,10 +58,12 @@ /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) "fr" = ( -/mob/living/simple_mob/mechanical/cyber_horror/tajaran, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/corner/orange/diagonal, +/mob/living/simple_mob/mechanical/cyber_horror/tajaran{ + loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5) + }, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) "fL" = ( @@ -86,8 +96,6 @@ "gP" = ( /obj/structure/table/standard, /obj/item/ammo_casing/microbattery/medical/haste, -/obj/random/material/refined, -/obj/random/material/precious, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) @@ -181,7 +189,9 @@ /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) "rL" = ( -/mob/living/simple_mob/mechanical/cyber_horror/tajaran, +/mob/living/simple_mob/mechanical/cyber_horror/tajaran{ + loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5) + }, /obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) @@ -189,6 +199,7 @@ /obj/machinery/optable, /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/corner/orange/diagonal, +/obj/random/maintenance/medical, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) "sg" = ( @@ -241,13 +252,11 @@ "vt" = ( /obj/machinery/optable, /obj/effect/floor_decal/corner/orange/diagonal, +/obj/random/maintenance/medical, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) "wi" = ( -/obj/structure/table/standard, -/obj/item/gun/projectile/cell_loaded/medical, -/obj/random/maintenance/medical, -/obj/random/maintenance/engineering, +/obj/structure/table/darkglass, /obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) @@ -369,9 +378,11 @@ /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) "Iw" = ( -/mob/living/simple_mob/mechanical/cyber_horror/tajaran, /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/corner/orange/diagonal, +/mob/living/simple_mob/mechanical/cyber_horror/tajaran{ + loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5) + }, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) "Ix" = ( @@ -386,10 +397,7 @@ /area/submap/fallenlab) "KI" = ( /obj/structure/table/darkglass, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, /obj/effect/floor_decal/corner/red/diagonal, -/obj/random/medical, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) "KR" = ( @@ -419,13 +427,14 @@ "Ni" = ( /obj/structure/table/standard, /obj/item/ammo_casing/microbattery/medical/haste, -/obj/random/maintenance/medical, /obj/random/maintenance/engineering, /obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) "NT" = ( -/mob/living/simple_mob/mechanical/cyber_horror/vox, +/mob/living/simple_mob/mechanical/cyber_horror/vox{ + loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5) + }, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) @@ -443,7 +452,9 @@ /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) "PB" = ( -/mob/living/simple_mob/mechanical/cyber_horror/ling_cyber_horror, +/mob/living/simple_mob/mechanical/cyber_horror/ling_cyber_horror{ + loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5) + }, /obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) @@ -453,14 +464,15 @@ /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) "QH" = ( -/mob/living/simple_mob/mechanical/cyber_horror/tajaran, /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/corner/red/diagonal, +/mob/living/simple_mob/mechanical/cyber_horror/tajaran{ + loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5) + }, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) "Rg" = ( /obj/structure/table/standard, -/obj/random/material/refined, /obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) @@ -500,6 +512,13 @@ /obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/fallenlab) +"Uv" = ( +/obj/effect/floor_decal/corner/orange/diagonal, +/mob/living/simple_mob/mechanical/cyber_horror/tajaran{ + loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5) + }, +/turf/simulated/floor/tiled/dark, +/area/submap/fallenlab) "UG" = ( /obj/machinery/oxygen_pump/mobile/anesthetic, /obj/effect/decal/cleanable/dirt, @@ -621,7 +640,7 @@ cQ bH ki Gi -rL +Uv bH Cx bH @@ -981,7 +1000,7 @@ Gi bH kW bH -qK +wi Gi SX "} @@ -1027,7 +1046,7 @@ Rg dx kh bH -tI +Rg Gi es lh @@ -1035,8 +1054,8 @@ Yn lh es Gi -wi -fY +sg +dg Ni fY Gi diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/frostlake.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/frostlake.dmm index 6e16da4dca..3210894f36 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/frostlake.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/frostlake.dmm @@ -267,7 +267,7 @@ i D i i -O +i i i i @@ -291,7 +291,7 @@ a i i i -n +i A o o @@ -351,7 +351,7 @@ i o o o -J +o o a i @@ -360,7 +360,7 @@ o o o o -O +i i s d @@ -501,7 +501,7 @@ o i o o -J +o o a i @@ -556,7 +556,7 @@ o o o o -O +i a o o @@ -648,7 +648,7 @@ i i a i -O +i i i i @@ -673,7 +673,7 @@ i i i i -n +i i i i diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/frozenlab.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/frozenlab.dmm index 409d0ba83d..b3dc2311b3 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/frozenlab.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/frozenlab.dmm @@ -54,7 +54,9 @@ /turf/simulated/floor/tiled/milspec, /area/submap/frozenlab) "m" = ( -/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger, +/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger{ + loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/storage/belt/medical/alien = 20, /obj/item/reagent_containers/glass/beaker/bluespace = 20) + }, /turf/simulated/floor/tiled/milspec, /area/submap/frozenlab) "n" = ( @@ -82,8 +84,6 @@ /area/template_noop) "s" = ( /obj/structure/table/steel, -/obj/random/firstaid, -/obj/random/maintenance/medical, /obj/random/maintenance/security, /turf/simulated/floor/tiled/milspec, /area/submap/frozenlab) @@ -105,6 +105,12 @@ /mob/living/simple_mob/humanoid/eclipse/solar/cryomancer, /turf/simulated/floor/snow, /area/template_noop) +"x" = ( +/obj/structure/table/steel, +/obj/random/firstaid, +/obj/random/maintenance/security, +/turf/simulated/floor/tiled/milspec, +/area/submap/frozenlab) "z" = ( /obj/machinery/portable_atmospherics/canister/oxygen/prechilled, /obj/machinery/light{ @@ -126,8 +132,12 @@ /turf/simulated/floor/tiled/milspec, /area/submap/frozenlab) "G" = ( -/mob/living/simple_mob/humanoid/eclipse/lunar/silvernoodle, -/turf/simulated/floor/tiled/milspec, +/obj/structure/table/steel, +/turf/simulated/floor/outdoors/shelfice{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 293.15 + }, /area/submap/frozenlab) "H" = ( /obj/random/material/refined, @@ -137,6 +147,14 @@ /obj/item/stack/material/void_opal, /turf/simulated/floor/snow, /area/template_noop) +"J" = ( +/obj/structure/table/steel, +/obj/random/maintenance/security, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/submap/frozenlab) "L" = ( /obj/machinery/atmospherics/unary/freezer, /turf/simulated/floor/outdoors/shelfice{ @@ -147,7 +165,6 @@ /area/submap/frozenlab) "M" = ( /obj/structure/table/steel, -/obj/random/maintenance/medical, /obj/random/maintenance/security, /obj/machinery/light{ dir = 8 @@ -550,7 +567,7 @@ D D D c -W +G T a a @@ -604,7 +621,7 @@ D D D c -R +G T a a @@ -714,7 +731,7 @@ D D c c -G +m a a a @@ -770,8 +787,8 @@ D D c c -X -s +J +x c z a diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/hydroxeno.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/hydroxeno.dmm index edf2dbaa8a..3f34e4e027 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/hydroxeno.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/hydroxeno.dmm @@ -60,17 +60,10 @@ outdoors = 0 }, /area/submap/hydroxeno) -"m" = ( -/obj/item/storage/backpack/holding, -/turf/simulated/floor/water{ - outdoors = 0 - }, -/area/submap/hydroxeno) "n" = ( /obj/effect/alien/weeds, /obj/structure/closet/secure_closet/egg/xenomorph, /obj/item/organ/internal/lungs/replicant/mending, -/obj/item/stolenpackage, /obj/random/maintenance/morestuff, /obj/random/maintenance/morestuff, /obj/random/maintenance/misc, @@ -85,7 +78,6 @@ "p" = ( /obj/effect/alien/weeds, /obj/structure/closet/secure_closet/egg/xenomorph, -/obj/item/stolenpackage, /obj/random/maintenance/morestuff, /obj/random/maintenance/morestuff, /obj/random/maintenance/misc, @@ -100,10 +92,7 @@ "r" = ( /obj/effect/alien/weeds, /obj/structure/closet/secure_closet/egg/xenomorph, -/obj/item/stolenpackage, /obj/random/maintenance/morestuff, -/obj/random/maintenance/morestuff, -/obj/random/maintenance/misc, /obj/item/organ/internal/kidneys/replicant, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/hydroxeno) @@ -112,10 +101,8 @@ /obj/structure/closet/secure_closet/egg/xenomorph, /obj/item/organ/internal/heart/replicant/rage, /obj/item/organ/internal/brainmirror, -/obj/item/stolenpackage, /obj/random/maintenance/morestuff, /obj/random/maintenance/morestuff, -/obj/random/maintenance/misc, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/hydroxeno) "t" = ( @@ -131,7 +118,9 @@ /turf/simulated/mineral, /area/submap/hydroxeno) "w" = ( -/mob/living/simple_mob/animal/space/alien/queen/empress, +/mob/living/simple_mob/animal/space/alien/queen/empress{ + loot_list = list(/obj/item/storage/backpack/holding = 20) + }, /turf/simulated/floor/water{ outdoors = 0 }, @@ -156,7 +145,6 @@ /obj/effect/alien/weeds, /obj/structure/closet/secure_closet/egg/xenomorph, /obj/item/organ/internal/metamorphgland/replicant, -/obj/item/stolenpackage, /obj/random/maintenance/morestuff, /obj/random/maintenance/morestuff, /obj/random/maintenance/misc, @@ -167,7 +155,6 @@ /obj/structure/closet/secure_closet/egg/xenomorph, /obj/random/maintenance/morestuff, /obj/random/maintenance/morestuff, -/obj/item/stolenpackage, /obj/item/organ/internal/intestine/xeno, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/hydroxeno) @@ -177,10 +164,8 @@ "D" = ( /obj/effect/alien/weeds, /obj/structure/closet/secure_closet/egg/xenomorph, -/obj/item/stolenpackage, /obj/random/maintenance/morestuff, /obj/random/maintenance/morestuff, -/obj/random/maintenance/misc, /obj/item/organ/internal/liver/replicant, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/hydroxeno) @@ -224,7 +209,6 @@ /obj/effect/alien/weeds, /obj/structure/closet/secure_closet/egg/xenomorph, /obj/item/organ/internal/immunehub/replicant, -/obj/item/stolenpackage, /obj/random/maintenance/morestuff, /obj/random/maintenance/morestuff, /obj/random/maintenance/misc, @@ -396,12 +380,12 @@ J X J u -k J J J J -H +J +J C C a @@ -463,7 +447,7 @@ a a C v -H +J J y G @@ -539,7 +523,7 @@ J J M J -k +J V F F @@ -697,7 +681,7 @@ J J D J -k +J Q P h @@ -724,7 +708,7 @@ J Q P I -l +I O f f @@ -809,11 +793,11 @@ J J J J -H +J b T P -l +I j J G @@ -825,7 +809,7 @@ a (15,1,1) = {" a C -k +J J J J @@ -868,7 +852,7 @@ J J G J -H +J O f f @@ -881,7 +865,7 @@ J J J Q -k +J J J J @@ -1086,7 +1070,7 @@ a a a v -k +J J J q @@ -1103,7 +1087,7 @@ u H J Q -H +J J J J @@ -1184,7 +1168,7 @@ Q P I I -l +I j J J @@ -1284,7 +1268,7 @@ I I I I -m +I I I j @@ -1348,7 +1332,7 @@ a a C C -k +J X J E @@ -1368,7 +1352,7 @@ J b T P -l +I N j J @@ -1402,7 +1386,7 @@ H J J E -H +J b f f @@ -1478,7 +1462,7 @@ G J J J -k +J C v v @@ -1505,7 +1489,7 @@ C v v C -k +J J J J diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/leppy.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/leppy.dmm index 8eadca979f..2b9de4f375 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/leppy.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/leppy.dmm @@ -27,7 +27,7 @@ /area/submap/leppy) "r" = ( /obj/structure/table/gold, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/mineral/floor/cave{ nitrogen = 93.7835; oxygen = 20.7263; @@ -57,7 +57,6 @@ /area/template_noop) "D" = ( /obj/structure/table/gold, -/obj/random/medical/pillbottle, /turf/simulated/mineral/floor/cave{ nitrogen = 93.7835; oxygen = 20.7263; diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/mausarmy.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/mausarmy.dmm index 112731d76f..42371128e2 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/mausarmy.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/mausarmy.dmm @@ -78,7 +78,6 @@ /obj/random/maintenance/clean, /obj/random/maintenance/engineering, /obj/random/maintenance/medical, -/obj/random/contraband, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/mausarmy) "mQ" = ( @@ -88,6 +87,7 @@ "oS" = ( /obj/effect/floor_decal/corner/blue/diagonal, /obj/structure/closet/crate/secure/lootsafe/numberlock, +/obj/random/cash, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/mausarmy) "pB" = ( @@ -148,7 +148,6 @@ /obj/random/maintenance/clean, /obj/random/maintenance/medical, /obj/random/maintenance/security, -/obj/random/contraband, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/mausarmy) "we" = ( @@ -187,9 +186,7 @@ /obj/structure/table/fancyblack, /obj/random/cash, /obj/random/cash, -/obj/random/cash, /obj/item/stolenpackage, -/obj/item/card/emag/used, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/mausarmy) "zV" = ( @@ -237,10 +234,10 @@ /area/submap/mausarmy) "Do" = ( /obj/effect/floor_decal/corner_techfloor_gray/diagonal, -/obj/effect/landmark/loot_spawn, /obj/machinery/light/poi{ dir = 4 }, +/obj/effect/landmark/loot_spawn/low, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/mausarmy) "DU" = ( @@ -249,7 +246,6 @@ /obj/random/maintenance/clean, /obj/random/maintenance/engineering, /obj/random/maintenance/research, -/obj/random/contraband, /obj/random/rigsuit/chancetofail, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/mausarmy) @@ -272,8 +268,6 @@ /obj/effect/floor_decal/corner/blue/diagonal, /obj/structure/table/fancyblack, /obj/random/cash, -/obj/random/cash, -/obj/random/cash, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/mausarmy) "FO" = ( @@ -286,9 +280,7 @@ "Hr" = ( /obj/effect/floor_decal/corner_techfloor_gray/diagonal, /obj/random/crate, -/obj/item/stolenpackage, /obj/random/maintenance/clean, -/obj/random/maintenance/medical, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/mausarmy) "JM" = ( @@ -326,7 +318,6 @@ "OJ" = ( /obj/effect/floor_decal/corner_techfloor_gray/diagonal, /obj/random/crate, -/obj/item/stolenpackage, /obj/random/maintenance/clean, /obj/random/maintenance/engineering, /obj/random/maintenance/research, @@ -340,15 +331,12 @@ /obj/effect/floor_decal/corner/blue/diagonal, /obj/structure/table/fancyblack, /obj/random/cash, -/obj/random/cash, -/obj/random/cash, /obj/random/rigsuit, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/mausarmy) "Qd" = ( /obj/effect/floor_decal/corner_techfloor_gray/diagonal, /obj/random/crate, -/obj/item/stolenpackage, /obj/random/maintenance/clean, /obj/random/maintenance/security, /turf/simulated/floor/tiled/asteroid_steel, @@ -356,9 +344,7 @@ "Qj" = ( /obj/effect/floor_decal/corner_techfloor_gray/diagonal, /obj/random/crate, -/obj/item/stolenpackage, /obj/random/maintenance/clean, -/obj/random/maintenance/medical, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/mausarmy) @@ -396,10 +382,8 @@ "VC" = ( /obj/effect/floor_decal/corner_techfloor_gray/diagonal, /obj/random/crate, -/obj/item/stolenpackage, /obj/random/maintenance/clean, /obj/random/maintenance/research, -/obj/random/contraband, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/mausarmy) "VE" = ( @@ -695,8 +679,8 @@ Ev vj Ev Ev -Rp -Rp +Ev +Ev Rx Rx Rx @@ -742,12 +726,12 @@ Zm NM Rx vp -Rp +Ev Ev Ev vI Ev -xm +Ev Ev Ev BV @@ -831,7 +815,7 @@ DU Hr Ev ra -Rp +Ev Rx ht CB @@ -851,7 +835,7 @@ CB Rx Qd Ev -Rp +xm Do Ev vj diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/metroidmaze.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/metroidmaze.dmm index 41323d62fb..88b0b950ca 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/metroidmaze.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/metroidmaze.dmm @@ -2,6 +2,19 @@ "a" = ( /turf/simulated/floor/dungeon, /area/submap/metroidmaze) +"b" = ( +/obj/structure/table/standard, +/obj/random/projectile/random, +/obj/random/energy/highend, +/turf/simulated/floor/dungeon, +/area/submap/metroidmaze) +"e" = ( +/obj/structure/table/standard, +/obj/random/projectile/random, +/obj/random/energy/highend, +/obj/random/firstaid, +/turf/simulated/floor/dungeon, +/area/submap/metroidmaze) "p" = ( /turf/simulated/wall/gold{ can_open = 1 @@ -16,6 +29,12 @@ /mob/living/simple_mob/metroid/juvenile/omega, /turf/simulated/floor/dungeon, /area/submap/metroidmaze) +"C" = ( +/obj/structure/table/standard, +/obj/random/projectile/random, +/obj/random/medical/pillbottle, +/turf/simulated/floor/dungeon, +/area/submap/metroidmaze) "D" = ( /turf/template_noop, /area/template_noop) @@ -26,9 +45,7 @@ "F" = ( /obj/structure/table/standard, /obj/random/projectile/random, -/obj/random/energy/highend, /obj/random/firstaid, -/obj/random/medical/pillbottle, /turf/simulated/floor/dungeon, /area/submap/metroidmaze) "Z" = ( @@ -432,7 +449,7 @@ Z a Z Z -F +C a a F @@ -560,10 +577,10 @@ Z a Z Z -F +b a a -F +e Z Z a diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/mousehq.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/mousehq.dmm index ad78bee1e6..54ffa345de 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/mousehq.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/mousehq.dmm @@ -5,7 +5,9 @@ /turf/simulated/floor/bmarble, /area/submap/mousehq) "b" = ( -/mob/living/simple_mob/mechanical/mecha/mouse_tank/manned, +/mob/living/simple_mob/mechanical/mecha/mouse_tank/manned{ + loot_list = list(/obj/item/prop/alien/junk = 50) + }, /turf/simulated/floor/bmarble, /area/submap/mousehq) "c" = ( @@ -27,7 +29,6 @@ /area/submap/mousehq) "g" = ( /obj/structure/table/alien/blue, -/obj/item/prop/alien/junk, /turf/simulated/floor/bmarble, /area/submap/mousehq) "h" = ( @@ -117,7 +118,6 @@ /area/submap/mousehq) "x" = ( /obj/structure/closet/alien, -/obj/item/prop/alien/junk, /turf/simulated/floor/wmarble, /area/submap/mousehq) "y" = ( @@ -151,8 +151,10 @@ /turf/simulated/floor/wmarble, /area/submap/mousehq) "G" = ( -/obj/structure/table/alien/blue, -/obj/item/prop/alien/junk, +/mob/living/simple_mob/mechanical/mecha/mouse_tank/livewire/manned, +/mob/living/simple_mob/mechanical/mecha/mouse_tank/manned{ + loot_list = list(/obj/item/prop/alien/junk = 50) + }, /turf/simulated/floor/wmarble, /area/submap/mousehq) "H" = ( @@ -160,7 +162,9 @@ /turf/simulated/floor/wmarble, /area/submap/mousehq) "J" = ( -/mob/living/simple_mob/mechanical/mecha/mouse_tank/eraticator/manned, +/mob/living/simple_mob/mechanical/mecha/mouse_tank/eraticator/manned{ + loot_list = list(/obj/item/prop/alien/junk = 50) + }, /obj/random/material/refined, /turf/simulated/floor/bmarble, /area/submap/mousehq) @@ -168,7 +172,9 @@ /turf/simulated/mineral/floor/ignore_mapgen/sif, /area/submap/mousehq) "M" = ( -/mob/living/simple_mob/mechanical/mecha/mouse_tank/eraticator/manned, +/mob/living/simple_mob/mechanical/mecha/mouse_tank/eraticator/manned{ + loot_list = list(/obj/item/prop/alien/junk = 50) + }, /turf/simulated/floor/bmarble, /area/submap/mousehq) "N" = ( @@ -205,8 +211,10 @@ /turf/simulated/floor/bmarble, /area/submap/mousehq) "U" = ( -/obj/structure/loot_pile/surface/alien/security, -/turf/simulated/floor/bmarble, +/mob/living/simple_mob/mechanical/mecha/mouse_tank/eraticator/manned{ + loot_list = list(/obj/item/prop/alien/junk = 50) + }, +/turf/simulated/floor/wmarble, /area/submap/mousehq) "V" = ( /turf/template_noop, @@ -217,7 +225,9 @@ /turf/simulated/floor/wmarble, /area/submap/mousehq) "X" = ( -/mob/living/simple_mob/mechanical/mecha/mouse_tank/manned, +/mob/living/simple_mob/mechanical/mecha/mouse_tank/manned{ + loot_list = list(/obj/item/prop/alien/junk = 50) + }, /turf/simulated/floor/wmarble, /area/submap/mousehq) "Y" = ( @@ -228,7 +238,6 @@ /area/submap/mousehq) "Z" = ( /obj/structure/closet/alien, -/obj/item/prop/alien/junk, /turf/simulated/floor/bmarble, /area/submap/mousehq) @@ -316,7 +325,7 @@ Y g W g -G +i O O V @@ -344,13 +353,13 @@ V V O O -j +x f p y p f -z +x O O V @@ -442,7 +451,7 @@ O O O Z -N +U y H y @@ -450,7 +459,7 @@ D y H y -N +U Z O O @@ -723,7 +732,7 @@ y p y p -a +g O V "} @@ -746,7 +755,7 @@ p m s v -D +G y p y @@ -789,7 +798,7 @@ y p y p -a +g O V "} @@ -876,7 +885,7 @@ K O r y -N +U t O y @@ -1172,8 +1181,8 @@ V K O n -j -U +x +Z e O O diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/paperworks.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/paperworks.dmm index ad6c9c33eb..be6dddb46e 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/paperworks.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/paperworks.dmm @@ -58,14 +58,6 @@ /obj/machinery/light/poi, /turf/simulated/floor/tiled/steel, /area/submap/paperworks) -"E" = ( -/obj/structure/closet/crate, -/obj/item/paper{ - info = "In an attempt to expirment on the effects and potential of suns, we used a great deal of resources on constructing a station to orbit a sun. This had wonderful but unntended results. Within the first half year, we had to spend more resources to fish it out of orbit as it was half melted from a solar storm. Most of our intended expirments failed, but there was a great deal of goods we recovered. Attempts are being made to replicate the results, the main target being the Kronos Core."; - name = "Solar Station" - }, -/turf/simulated/floor/tiled/steel, -/area/submap/paperworks) "F" = ( /turf/simulated/wall/rplastihull, /area/submap/paperworks) @@ -86,6 +78,7 @@ "O" = ( /obj/structure/table/gold, /obj/item/soulstone, +/obj/item/salvage/ruin/nanotrasen, /turf/simulated/floor/tiled/steel, /area/submap/paperworks) "Q" = ( @@ -102,10 +95,7 @@ /area/submap/paperworks) "X" = ( /obj/structure/closet/crate, -/obj/item/paper{ - info = "What is fact, fiction, and soon to be fact. It is a great deal of importance is it not. What realms can we traverse, and what are nothing but in our minds. And what can we force out of our minds, and into reality. This is one of our goals to find out."; - name = "Fact and Fiction." - }, +/obj/item/salvage/ruin/nanotrasen, /turf/simulated/floor/tiled/steel, /area/submap/paperworks) "Z" = ( @@ -394,7 +384,7 @@ a F y F -E +X F f F diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/phorondragon.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/phorondragon.dmm index 8aa1254b31..833dd063b7 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/phorondragon.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/phorondragon.dmm @@ -368,7 +368,7 @@ j a j s -W +j j j c @@ -391,7 +391,7 @@ x x x J -S +j j j j @@ -420,7 +420,7 @@ x x x J -j +S j j i @@ -544,7 +544,7 @@ j j j j -W +j j j j @@ -636,7 +636,7 @@ j j j j -W +j s j j @@ -652,7 +652,7 @@ x x x J -j +S j P j @@ -724,7 +724,7 @@ j s j j -S +j J J x @@ -779,7 +779,7 @@ j j j j -S +j J J x @@ -803,7 +803,7 @@ x J J J -S +j J J J diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/piratefortress.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/piratefortress.dmm index 9bdc5fa819..e0b892ca19 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/piratefortress.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/piratefortress.dmm @@ -3,9 +3,6 @@ /obj/item/clothing/glasses/thermal/plain/eyepatch, /obj/structure/closet/crate, /obj/item/stolenpackage, -/obj/item/stolenpackage, -/obj/random/energy/highend, -/obj/item/stolenpackage, /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 }, @@ -14,7 +11,6 @@ "aE" = ( /obj/structure/table/reinforced, /obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, /turf/simulated/floor/tiled/yellow, /area/submap/piratefortress) "bt" = ( @@ -48,8 +44,6 @@ /area/submap/piratefortress) "ck" = ( /obj/structure/closet/crate/secure/loot, -/obj/item/stolenpackage, -/obj/item/card/emag, /obj/item/rig_module/mounted/energy_blade, /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 @@ -122,7 +116,6 @@ /obj/structure/table/reinforced, /obj/random/maintenance/security, /obj/random/maintenance/security, -/obj/random/energy/highend, /obj/effect/floor_decal/corner/paleblue/border{ dir = 6 }, @@ -369,11 +362,11 @@ /obj/item/clothing/glasses/graviton/medgravpatch, /obj/structure/closet/crate, /obj/item/stolenpackage, -/obj/random/energy/highend, /obj/item/stolenpackage, /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 }, +/obj/random/projectile/shotgun, /turf/simulated/floor/tiled/red, /area/submap/piratefortress) "vr" = ( @@ -470,7 +463,6 @@ "xX" = ( /obj/structure/table/gold, /obj/item/aliencoin/gold, -/obj/random/energy/highend, /obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/yellow, /area/submap/piratefortress) @@ -524,11 +516,6 @@ }, /turf/simulated/floor/tiled/red, /area/submap/piratefortress) -"BT" = ( -/obj/structure/table/reinforced, -/obj/random/projectile, -/turf/simulated/floor/tiled/yellow, -/area/submap/piratefortress) "Di" = ( /obj/item/dnainjector/telemut, /turf/simulated/floor/outdoors/rocks, @@ -754,11 +741,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/submap/piratefortress) -"QI" = ( -/obj/structure/table/reinforced, -/obj/random/energy/highend, -/turf/simulated/floor/tiled/yellow, -/area/submap/piratefortress) "QM" = ( /obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/yellow, @@ -777,8 +759,6 @@ /area/submap/piratefortress) "Su" = ( /obj/structure/closet/secure_closet/engineering_electrical, -/obj/item/stolenpackage, -/obj/item/stolenpackage, /turf/simulated/floor/tiled/techfloor/grid, /area/submap/piratefortress) "Td" = ( @@ -792,7 +772,6 @@ /area/submap/piratefortress) "TJ" = ( /obj/structure/table/reinforced, -/obj/random/projectile/shotgun, /obj/random/maintenance/security, /obj/random/maintenance/security, /obj/effect/floor_decal/corner/paleblue/border{ @@ -2097,7 +2076,7 @@ cg DD oX PJ -BT +pA aE pA aE @@ -2146,7 +2125,7 @@ pA aE vr aE -QI +pA ft oX xk diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/piratevessel.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/piratevessel.dmm index 4422975808..edaf100028 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/piratevessel.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/piratevessel.dmm @@ -64,6 +64,13 @@ /obj/item/reagent_containers/glass/bottle/left4zed, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) +"fK" = ( +/obj/structure/closet/crate/secure/loot, +/obj/effect/floor_decal/corner/purple/diagonal, +/obj/random/contraband, +/obj/random/maintenance/morestuff, +/turf/simulated/shuttle/floor/yellow, +/area/submap/piratevessel) "fX" = ( /mob/living/simple_mob/humanoid/pirate/ranged, /obj/effect/floor_decal/corner/purple/diagonal, @@ -89,8 +96,6 @@ "hc" = ( /obj/structure/closet/crate/medical, /obj/effect/floor_decal/corner/purple/diagonal, -/obj/random/contraband, -/obj/random/contraband, /obj/random/maintenance/morestuff, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) @@ -131,13 +136,12 @@ /obj/effect/floor_decal/corner/purple/diagonal, /obj/machinery/light/poi, /obj/random/contraband, -/obj/random/contraband, /obj/random/maintenance/morestuff, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "iP" = ( -/obj/effect/floor_decal/corner/yellow/diagonal, -/obj/random/contraband, +/obj/structure/table/marble, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "ka" = ( @@ -247,8 +251,6 @@ "rw" = ( /obj/structure/table/gold, /obj/effect/floor_decal/corner/yellow/diagonal, -/obj/item/rig_module/fabricator/energy_net, -/obj/item/rig/pmc/security/grey/equipped, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "st" = ( @@ -284,7 +286,6 @@ /obj/effect/floor_decal/corner/purple/diagonal, /obj/random/contraband, /obj/random/contraband, -/obj/random/maintenance/morestuff, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "tX" = ( @@ -343,7 +344,6 @@ /obj/structure/closet/crate/mimic, /obj/effect/floor_decal/corner/purple/diagonal, /obj/random/contraband, -/obj/random/contraband, /obj/random/maintenance/morestuff, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) @@ -351,11 +351,10 @@ /obj/effect/floor_decal/corner/yellow/diagonal, /obj/structure/table/rack/shelf/steel, /obj/random/gun/random, -/obj/random/gun/random, /obj/machinery/light/poi{ dir = 1 }, -/obj/random/contraband, +/obj/random/medical/pillbottle, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "BJ" = ( @@ -368,10 +367,8 @@ /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "Dr" = ( -/obj/effect/floor_decal/corner/yellow/diagonal, -/obj/structure/table/rack/shelf/steel, -/obj/random/contraband, -/obj/item/gun/energy/lasershotgun, +/obj/structure/table/marble, +/obj/random/maintenance/foodstuff, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "Dy" = ( @@ -443,8 +440,7 @@ "Fw" = ( /obj/effect/floor_decal/corner/yellow/diagonal, /obj/structure/table/rack/shelf/steel, -/obj/random/contraband, -/obj/item/gun/energy/lasercannon, +/obj/random/medical/pillbottle, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "Gl" = ( @@ -463,7 +459,6 @@ /obj/structure/closet/crate, /obj/effect/floor_decal/corner/purple/diagonal, /obj/random/contraband, -/obj/random/contraband, /obj/random/maintenance/morestuff, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) @@ -500,14 +495,11 @@ /obj/machinery/light/poi{ dir = 1 }, -/obj/random/contraband, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "Jd" = ( /obj/structure/closet/crate/freezer/nanotrasen, /obj/effect/floor_decal/corner/purple/diagonal, -/obj/random/contraband, -/obj/random/contraband, /obj/random/maintenance/morestuff, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) @@ -556,7 +548,6 @@ /obj/effect/floor_decal/corner/yellow/diagonal, /obj/structure/table/rack/shelf/steel, /obj/random/toolbox, -/obj/random/contraband, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "Mb" = ( @@ -620,18 +611,16 @@ "Pd" = ( /obj/effect/floor_decal/corner/yellow/diagonal, /obj/structure/table/rack/shelf/steel, -/obj/random/gun/random, -/obj/random/gun/random, /obj/machinery/light/poi, -/obj/random/contraband, +/obj/random/medical/pillbottle, +/obj/item/rig_module/fabricator/energy_net, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "PL" = ( /obj/effect/floor_decal/corner/yellow/diagonal, /obj/structure/table/rack/shelf/steel, -/obj/random/firstaid, /obj/machinery/light/poi, -/obj/random/contraband, +/obj/item/rig/pmc/security/grey/equipped, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "PT" = ( @@ -656,9 +645,6 @@ "RN" = ( /obj/structure/closet/crate/carp, /obj/effect/floor_decal/corner/purple/diagonal, -/obj/random/contraband, -/obj/random/contraband, -/obj/random/maintenance/morestuff, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "Sb" = ( @@ -686,23 +672,17 @@ /obj/random/contraband/nofail, /obj/random/contraband/nofail, /obj/random/contraband, -/obj/random/contraband, /obj/random/maintenance/morestuff, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "Uc" = ( /obj/structure/closet/crate/medical/blood, /obj/effect/floor_decal/corner/purple/diagonal, -/obj/random/contraband, -/obj/random/contraband, /obj/random/maintenance/morestuff, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "Un" = ( /obj/structure/table/marble, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, -/obj/random/maintenance/foodstuff, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "Vb" = ( @@ -728,6 +708,12 @@ /obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) +"Wj" = ( +/obj/structure/table/gold, +/obj/effect/floor_decal/corner/yellow/diagonal, +/obj/machinery/recharger, +/turf/simulated/shuttle/floor/yellow, +/area/submap/piratevessel) "Wy" = ( /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/shuttle/floor/yellow, @@ -757,7 +743,9 @@ /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) "YG" = ( -/mob/living/simple_mob/humanoid/pirate/captain, +/mob/living/simple_mob/humanoid/pirate/captain{ + loot_list = list(/obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/card/emag = 50) + }, /obj/effect/floor_decal/corner/yellow/diagonal, /turf/simulated/shuttle/floor/yellow, /area/submap/piratevessel) @@ -1050,7 +1038,7 @@ EC mq xr Wd -tX +iP Wd Fh mq @@ -1101,10 +1089,10 @@ Ev mq bh bT +Dr Un Un -Un -Un +Dr gO Nu mq @@ -1131,9 +1119,9 @@ Ev MZ bh bT +Dr Un -Un -Un +Dr Un gO Nu @@ -1170,7 +1158,7 @@ qW mq Wd Wd -tX +iP Wd Jd mq @@ -1232,7 +1220,7 @@ Wd Wd tX Wd -DY +fK mq dt dt @@ -1309,7 +1297,7 @@ mq MZ mq mq -Dr +Fw BJ BJ BJ @@ -1344,7 +1332,7 @@ BJ cn rw hR -cn +Wj BJ LZ mq @@ -1375,7 +1363,7 @@ BJ YG BJ BJ -iP +BJ PL mq hO diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/piratevox.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/piratevox.dmm index b13b608b97..3b62f4fa38 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/piratevox.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/piratevox.dmm @@ -2,7 +2,6 @@ "cD" = ( /obj/structure/table/rack/shelf/steel, /obj/random/gun/random, -/obj/random/gun/random, /obj/machinery/light/poi{ dir = 1 }, @@ -59,8 +58,6 @@ "fV" = ( /obj/structure/table/standard, /obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/obj/random/gun/random, /turf/simulated/floor/tiled/white, /area/submap/piratevox) "gp" = ( @@ -75,7 +72,6 @@ "hj" = ( /obj/structure/table/rack/shelf/steel, /obj/random/gun/random, -/obj/random/gun/random, /obj/machinery/light/poi, /obj/item/rig/baymed, /turf/simulated/floor/tiled/white, @@ -148,7 +144,6 @@ /area/submap/piratevox) "pK" = ( /obj/structure/table/standard, -/obj/random/gun/random, /turf/simulated/floor/tiled/white, /area/submap/piratevox) "pV" = ( @@ -234,9 +229,9 @@ /turf/template_noop, /area/template_noop) "Dg" = ( -/obj/structure/table/standard, -/obj/random/firstaid, -/obj/random/medical/pillbottle, +/obj/structure/table/rack/shelf/steel, +/obj/random/gun/random, +/obj/item/rig/bayeng, /turf/simulated/floor/tiled/white, /area/submap/piratevox) "Dt" = ( @@ -368,12 +363,6 @@ /obj/structure/bed/chair/bay/shuttle, /turf/simulated/floor/tiled/red, /area/submap/piratevox) -"Wj" = ( -/obj/structure/table/standard, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/turf/simulated/floor/tiled/white, -/area/submap/piratevox) "WN" = ( /obj/structure/table/standard, /obj/item/reagent_containers/spray/cleaner, @@ -387,12 +376,6 @@ /obj/effect/landmark/mobcorpse/vox/boarder_m, /turf/simulated/floor/tiled/white, /area/submap/piratevox) -"YI" = ( -/obj/structure/table/standard, -/obj/random/contraband/nofail, -/obj/random/medical/pillbottle, -/turf/simulated/floor/tiled/white, -/area/submap/piratevox) "YQ" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/machinery/light/poi{ @@ -671,7 +654,7 @@ Cm Cm Cm SL -to +Dg AV Os SL @@ -702,7 +685,7 @@ Cm Cm Cm SL -Dg +An Op Os SL @@ -720,7 +703,7 @@ Os SL pD Op -YI +An SL Cm Cm @@ -733,7 +716,7 @@ Cm Cm Cm SL -Dg +pK ZP Os fD @@ -751,7 +734,7 @@ Ap gp iU Tk -YI +pK SL Cm Cm @@ -764,7 +747,7 @@ Cm Cm Cm SL -Dg +pK ki LP SL @@ -782,7 +765,7 @@ Os SL Os YQ -YI +An SL Cm Cm @@ -1019,11 +1002,11 @@ Cm uQ UL UL -Wj +pK hB Os hB -Wj +pK UL UL uQ @@ -1049,13 +1032,13 @@ Cm ye UL UL -Wj +fV LP Os Tl Os Os -Wj +fV UL UL ye @@ -1079,7 +1062,7 @@ Cm Cm UL UL -Wj +pK rp Os Os @@ -1087,7 +1070,7 @@ Os Os Os OH -Wj +An cK UL Cm @@ -1109,7 +1092,7 @@ Cm Cm ye SL -Wj +pK Os Os Os @@ -1119,7 +1102,7 @@ Os Os Os LP -Wj +fV SL ye Cm @@ -1233,7 +1216,7 @@ Cm Cm ye SL -Wj +pK Os Os Os @@ -1243,7 +1226,7 @@ LP Os Os Os -Wj +pK SL ye Cm @@ -1265,7 +1248,7 @@ Cm Cm UL UL -Wj +An OH Os Os @@ -1273,7 +1256,7 @@ Os Os Os rp -Wj +pK UL UL Cm @@ -1297,13 +1280,13 @@ Cm Cm UL UL -Wj +pK LP Os OH LP Os -Wj +fV UL UL Cm @@ -1333,7 +1316,7 @@ fV pJ pK pJ -fV +An UL UL uQ diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/plontden.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/plontden.dmm index 70050c893c..04ef414c47 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/plontden.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/plontden.dmm @@ -304,9 +304,9 @@ /area/submap/plontden) "HB" = ( /obj/structure/closet/cabinet, -/obj/random/contraband/nofail, -/obj/random/contraband/nofail, -/obj/random/contraband/nofail, +/obj/random/contraband, +/obj/random/contraband, +/obj/random/contraband, /turf/simulated/floor/tiled/yellow, /area/submap/plontden) "HD" = ( diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/settlement.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/settlement.dmm index afcc4f7683..f63585dd4b 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/settlement.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/settlement.dmm @@ -121,11 +121,11 @@ /turf/simulated/floor/tiled/white, /area/submap/settlement) "gl" = ( -/obj/structure/table/standard, -/obj/random/maintenance/foodstuff, -/obj/effect/floor_decal/corner/orange/diagonal, -/obj/random/energy/sec, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/red/diagonal, +/obj/structure/table/rack, +/obj/random/cash, +/obj/random/cash, +/turf/simulated/floor/tiled/red, /area/submap/settlement) "gz" = ( /mob/living/simple_mob/construct/juggernaut, @@ -151,9 +151,7 @@ "hy" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/table/rack, -/obj/random/cash/huge, -/obj/random/cash/huge, -/obj/random/cash/huge, +/obj/random/cash, /turf/simulated/floor/tiled/red, /area/submap/settlement) "hV" = ( @@ -169,7 +167,7 @@ /area/submap/settlement) "im" = ( /obj/structure/table/woodentable, -/obj/random/multiple/gun/projectile/handgun, +/obj/random/energy/sec, /turf/simulated/floor/lino, /area/submap/settlement) "it" = ( @@ -208,7 +206,9 @@ /turf/simulated/floor/tiled/white, /area/submap/settlement) "kg" = ( -/mob/living/simple_mob/humanoid/cultist/magus, +/mob/living/simple_mob/humanoid/cultist/magus{ + loot_list = list(/obj/item/gun/energy/imperial = 40) + }, /turf/simulated/floor/cult, /area/submap/settlement) "km" = ( @@ -267,10 +267,9 @@ "oa" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/table/rack, -/obj/random/cash/huge, -/obj/random/cash/huge, -/obj/random/cash/huge, /obj/random/rigsuit/chancetofail, +/obj/random/cash, +/obj/random/cash, /turf/simulated/floor/tiled/red, /area/submap/settlement) "oq" = ( @@ -587,7 +586,6 @@ "HK" = ( /obj/structure/table/fancyblack, /obj/item/storage/belt/soulstone/full, -/obj/item/gun/energy/imperial, /turf/simulated/floor/cult, /area/submap/settlement) "HR" = ( @@ -684,10 +682,9 @@ "MN" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/table/rack, -/obj/random/cash/huge, -/obj/random/cash/huge, -/obj/random/cash/huge, /obj/random/rigsuit, +/obj/random/cash, +/obj/random/cash, /turf/simulated/floor/tiled/red, /area/submap/settlement) "MS" = ( @@ -1038,7 +1035,7 @@ Mm OI yR lt -xQ +TJ jZ lt lt @@ -1080,7 +1077,7 @@ ft OI GU lt -xQ +TJ jZ lt lt @@ -1210,7 +1207,7 @@ xQ Vp lt lt -gl +xQ xQ rh PG @@ -1519,7 +1516,7 @@ PP PP PP PP -BT +Ja PP PP Fi @@ -2440,7 +2437,7 @@ PG PG TU TU -hy +gl xH TU TU diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/siegepoint.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/siegepoint.dmm index 7bcfc855f5..812224fa50 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/siegepoint.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/siegepoint.dmm @@ -5,8 +5,8 @@ /area/submap/siegepoint) "cm" = ( /obj/structure/table/steel_reinforced, -/obj/random/contraband/nofail, /obj/machinery/light/poi, +/obj/random/contraband, /turf/simulated/floor/tiled/techfloor, /area/submap/siegepoint) "cM" = ( @@ -33,7 +33,8 @@ /area/submap/siegepoint) "gL" = ( /mob/living/simple_mob/humanoid/merc/ranged/smg/sol{ - faction = "neutral" + faction = "neutral"; + loot_list = list(/obj/item/gun/projectile/automatic/c20r = 100, /obj/item/gun/energy/medigun = 20) }, /turf/simulated/floor/tiled/techfloor, /area/submap/siegepoint) @@ -90,11 +91,6 @@ /obj/item/clothing/suit/armor/pcarrier/blue/sol, /turf/simulated/floor/tiled/techfloor, /area/submap/siegepoint) -"lL" = ( -/obj/structure/table/steel_reinforced, -/obj/item/gun/projectile/revolver/lemat, -/turf/simulated/floor/tiled/techfloor, -/area/submap/siegepoint) "nl" = ( /obj/structure/table/steel_reinforced, /obj/random/medical/pillbottle, @@ -129,7 +125,9 @@ /obj/structure/bed/chair/office{ dir = 4 }, -/mob/living/simple_mob/humanoid/pirate/mate/ranged/shotgun, +/mob/living/simple_mob/humanoid/pirate/mate/ranged/shotgun{ + loot_list = list(/obj/item/gun/projectile/shotgun/doublebarrel/quad = 100, /obj/item/clothing/suit/pirate = 100, /obj/item/stack/medical/advanced/bruise_pack = 20) + }, /turf/simulated/floor/tiled/techfloor, /area/submap/siegepoint) "pW" = ( @@ -152,7 +150,8 @@ dir = 1 }, /mob/living/simple_mob/humanoid/merc/ranged/smg/sol{ - faction = "neutral" + faction = "neutral"; + loot_list = list(/obj/item/gun/projectile/automatic/c20r = 100, /obj/item/gun/energy/medigun = 20) }, /turf/simulated/floor/tiled/techfloor, /area/submap/siegepoint) @@ -224,7 +223,7 @@ /area/submap/siegepoint) "zJ" = ( /obj/structure/table/steel_reinforced, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/tiled/techfloor, /area/submap/siegepoint) "zZ" = ( @@ -261,11 +260,6 @@ /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/tiled/techfloor/grid, /area/submap/siegepoint) -"BY" = ( -/obj/structure/table/steel_reinforced, -/obj/item/gun/projectile/revolver/saa, -/turf/simulated/floor/tiled/techfloor, -/area/submap/siegepoint) "Da" = ( /mob/living/simple_mob/humanoid/pirate/ranged/shotgun/armored, /obj/machinery/light/poi{ @@ -299,7 +293,8 @@ "GW" = ( /mob/living/simple_mob/humanoid/merc/ranged{ health = 15; - maxHealth = 15 + maxHealth = 15; + loot_list = list(/obj/item/gun/projectile/colt = 100, /obj/item/stack/medical/advanced/bruise_pack = 20) }, /obj/item/clothing/suit/armor/pcarrier/merc, /turf/simulated/floor/tiled/techfloor, @@ -333,11 +328,6 @@ /obj/structure/bookcase, /turf/simulated/floor/tiled/techfloor, /area/submap/siegepoint) -"Jv" = ( -/obj/structure/table/steel_reinforced, -/obj/random/medical, -/turf/simulated/floor/tiled/techfloor, -/area/submap/siegepoint) "KZ" = ( /obj/structure/cable/cyan{ d2 = 4; @@ -411,7 +401,9 @@ /obj/structure/bed/chair/office{ dir = 8 }, -/mob/living/simple_mob/humanoid/pirate/las/armored, +/mob/living/simple_mob/humanoid/pirate/las/armored{ + loot_list = list(/obj/item/melee/energy/sword/pirate = 100, /obj/item/clothing/suit/armor/material/makeshift = 100, /obj/item/stack/medical/advanced/bruise_pack = 20) + }, /turf/simulated/floor/tiled/techfloor, /area/submap/siegepoint) "Rs" = ( @@ -426,18 +418,15 @@ /turf/simulated/floor/tiled/techfloor, /area/submap/siegepoint) "Tg" = ( -/mob/living/simple_mob/humanoid/pirate/captain, +/mob/living/simple_mob/humanoid/pirate/captain{ + loot_list = list(/obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/salvage/loot/pirate = 50) + }, /turf/simulated/floor/tiled/techfloor, /area/submap/siegepoint) "Tp" = ( /obj/structure/salvageable/autolathe, /turf/simulated/floor/tiled/techfloor, /area/submap/siegepoint) -"We" = ( -/obj/structure/table/steel_reinforced, -/obj/item/gun/energy/medigun, -/turf/simulated/floor/tiled/techfloor, -/area/submap/siegepoint) "Xi" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techfloor, @@ -685,7 +674,7 @@ Pm Pm xK oW -AO +oW oW Da oW @@ -820,7 +809,7 @@ oW oW ZG oW -AO +oW xK FV hs @@ -882,7 +871,7 @@ oW xK wV Yc -Jv +Yc Yc Nv xK @@ -912,7 +901,7 @@ xK Xi xK xK -AO +oW Ap oW Ap @@ -924,7 +913,7 @@ hs (15,1,1) = {" hs xK -zJ +Yc oW oW Lu @@ -968,9 +957,9 @@ wF xK oW Yc -We +Yc oW -lL +Yc xK oW oW @@ -992,7 +981,7 @@ QI oW ZG oW -zJ +Yc xK oW Tg @@ -1004,13 +993,13 @@ ta oW ji xK -AO +oW oW Nv xK wV Yc -Jv +Yc Yc Nv xK @@ -1034,7 +1023,7 @@ oW Yc IW oW -BY +Yc xK oW oW @@ -1076,7 +1065,7 @@ oW oW XH oW -AO +oW xK FV hs @@ -1152,7 +1141,7 @@ gA oW ZG oW -zJ +Yc xK wV oa @@ -1201,7 +1190,7 @@ oW oW xK oW -AO +oW oW oW oW @@ -1286,7 +1275,7 @@ oW oW oW oW -AO +oW fx oW oW diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/solarmoff.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/solarmoff.dmm index 01575a3f68..d7ca059016 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/solarmoff.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/solarmoff.dmm @@ -85,7 +85,9 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/solarmoff) "E" = ( -/mob/living/simple_mob/animal/space/carp/large, +/mob/living/simple_mob/animal/space/carp/large{ + loot_list = list(/obj/item/salvage/ruin/carp = 100) + }, /turf/simulated/floor/water, /area/submap/solarmoff) "F" = ( diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/spooderchurch.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/spooderchurch.dmm index 3fa8f79aea..f8b8b62816 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/spooderchurch.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/spooderchurch.dmm @@ -33,13 +33,12 @@ /area/submap/spooderchurch) "hn" = ( /obj/structure/table/sifwoodentable, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/wood/sif, /area/submap/spooderchurch) "hp" = ( /obj/structure/closet/crate/plastic, -/obj/random/cash/huge, -/obj/random/cash/huge, +/obj/random/cash, /turf/simulated/floor/wood/sif, /area/submap/spooderchurch) "ig" = ( @@ -64,10 +63,8 @@ /area/submap/spooderchurch) "lF" = ( /obj/structure/table/rack/shelf, -/obj/random/energy/highend, -/obj/random/energy/highend, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, +/obj/random/toolbox, +/obj/random/toolbox, /turf/simulated/floor/wood/sif, /area/submap/spooderchurch) "mY" = ( @@ -108,15 +105,7 @@ /area/submap/spooderchurch) "uF" = ( /obj/structure/table/sifwoodentable, -/obj/random/firstaid, -/turf/simulated/floor/wood/sif, -/area/submap/spooderchurch) -"vk" = ( -/obj/structure/table/rack/shelf, -/obj/random/projectile, -/obj/random/projectile, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, +/obj/random/toolbox, /turf/simulated/floor/wood/sif, /area/submap/spooderchurch) "vA" = ( @@ -177,8 +166,7 @@ /turf/simulated/floor/wood/sif, /area/submap/spooderchurch) "zY" = ( -/obj/structure/table/sifwoodentable, -/obj/item/card/emag, +/obj/structure/closet/crate/plastic, /turf/simulated/floor/wood/sif, /area/submap/spooderchurch) "Ah" = ( @@ -323,7 +311,9 @@ /turf/simulated/floor/wood/sif, /area/submap/spooderchurch) "Wb" = ( -/mob/living/simple_mob/humanoid/merc/ranged/deagle, +/mob/living/simple_mob/humanoid/merc/ranged/deagle{ + loot_list = list(/obj/item/gun/projectile/deagle = 100, /obj/item/spellbook/oneuse/smoke = 100) + }, /turf/simulated/floor/wood/sif, /area/submap/spooderchurch) "Xe" = ( @@ -350,7 +340,6 @@ /area/submap/spooderchurch) "ZX" = ( /obj/structure/table/rack/shelf, -/obj/item/spellbook/oneuse/smoke, /turf/simulated/floor/wood/sif, /area/submap/spooderchurch) @@ -549,11 +538,11 @@ Cm Cm JI Bw -hn +Cq xx hn -Ah -hn +zY +Cq FR hn Bw @@ -819,7 +808,7 @@ YO YO Zl Bw -xx +YO YO YO Bw @@ -857,7 +846,7 @@ YO YO lF Bw -VU +zY YO YO Bw @@ -928,12 +917,12 @@ Cm JI Bw YO -zY +Cq YO YO -vk +lF Bw -VU +zY YO YO Bw @@ -1233,13 +1222,13 @@ Cm Pd JI Bw -hn -xx +Cq +YO hn FR hn -xx -hn +YO +Cq Bw tI yY diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/teppifarm.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/teppifarm.dmm index 270e84af18..8ab992c80c 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/teppifarm.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/teppifarm.dmm @@ -61,7 +61,7 @@ /area/submap/teppifarm) "r" = ( /obj/structure/table/woodentable, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/wood/alt, /area/submap/teppifarm) "s" = ( @@ -98,7 +98,6 @@ "A" = ( /obj/structure/table/rack, /obj/item/melee/umbrella/random, -/obj/item/gun/energy/taser/xeno, /turf/simulated/floor/wood/alt, /area/submap/teppifarm) "B" = ( @@ -173,7 +172,6 @@ /obj/effect/decal/cleanable/blood/oil/streak, /obj/structure/table/rack, /obj/item/melee/umbrella/random, -/obj/item/gun/energy/taser/xeno, /turf/simulated/floor/wood/alt, /area/submap/teppifarm) "W" = ( diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/terraformer.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/terraformer.dmm index 0619cf1497..094977d993 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/terraformer.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/terraformer.dmm @@ -232,7 +232,7 @@ I P P P -o +P M "} (10,1,1) = {" @@ -371,7 +371,6 @@ M a M M -o P P P @@ -384,7 +383,8 @@ P P P P -o +P +P M M M diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/vault.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/vault.dmm index 5fa36b8ffb..41aaff0063 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/vault.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/vault.dmm @@ -3,8 +3,10 @@ /turf/simulated/shuttle/floor/alienplating/blue, /area/submap/vault) "b" = ( -/mob/living/simple_mob/mechanical/hivebot/precusor/machinegun, -/turf/simulated/shuttle/floor/alien, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp{ + loot_list = list(/obj/item/prop/alien/junk = 20, /obj/item/prop/alien/junk = 20) + }, +/turf/simulated/shuttle/floor/alienplating/blue, /area/submap/vault) "c" = ( /turf/simulated/shuttle/wall/alien, @@ -14,15 +16,9 @@ /area/template_noop) "e" = ( /obj/structure/table/alien/blue, -/obj/item/prop/alien/junk, -/obj/item/prop/alien/junk, /obj/item/implantcase/chem, /turf/simulated/shuttle/floor/alienplating/blue, /area/submap/vault) -"i" = ( -/obj/structure/loot_pile/surface/alien/security, -/turf/simulated/shuttle/floor/alienplating/blue, -/area/submap/vault) "j" = ( /obj/structure/loot_pile/surface/alien/engineering, /turf/simulated/shuttle/floor/alienplating/blue, @@ -68,10 +64,6 @@ "z" = ( /turf/simulated/shuttle/floor/alien, /area/submap/vault) -"B" = ( -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/radiation, -/turf/simulated/shuttle/floor/alienplating/blue, -/area/submap/vault) "C" = ( /mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp, /turf/simulated/shuttle/floor/alienplating/blue, @@ -95,14 +87,13 @@ /turf/simulated/shuttle/floor/alienplating/external, /area/submap/vault) "G" = ( -/mob/living/simple_mob/mechanical/hivebot/precusor/laser, +/mob/living/simple_mob/mechanical/hivebot/precusor/machinegun{ + loot_list = list(/obj/item/prop/alien/junk = 20, /obj/item/prop/alien/junk = 20, /obj/item/cell/device/weapon/recharge/alien/omni = 5) + }, /turf/simulated/shuttle/floor/alien, /area/submap/vault) "H" = ( /obj/structure/table/alien/blue, -/obj/item/prop/alien/junk, -/obj/item/prop/alien/junk, -/obj/item/cell/device/weapon/recharge/alien/omni/empty, /turf/simulated/shuttle/floor/alienplating/blue, /area/submap/vault) "I" = ( @@ -110,17 +101,17 @@ /turf/simulated/shuttle/floor/alienplating/blue, /area/submap/vault) "J" = ( -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/radiation, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp, /turf/simulated/shuttle/floor/alien, /area/submap/vault) "L" = ( -/mob/living/simple_mob/mechanical/hivebot/support/logistics, +/mob/living/simple_mob/mechanical/hivebot/support/logistics{ + loot_list = list(/obj/item/prop/alien/junk = 20, /obj/item/prop/alien/junk = 20, /obj/item/cell/device/weapon/recharge/alien/omni = 5) + }, /turf/simulated/shuttle/floor/alienplating/blue, /area/submap/vault) "M" = ( /obj/structure/table/alien/blue, -/obj/item/prop/alien/junk, -/obj/item/prop/alien/junk, /obj/item/implantcase/medkit, /turf/simulated/shuttle/floor/alienplating/blue, /area/submap/vault) @@ -143,8 +134,6 @@ "R" = ( /obj/structure/table/alien/blue, /obj/item/gun/energy/alien, -/obj/item/prop/alien/junk, -/obj/item/prop/alien/junk, /turf/simulated/shuttle/floor/alienplating/blue, /area/submap/vault) "V" = ( @@ -166,9 +155,6 @@ /area/submap/vault) "Z" = ( /obj/structure/table/alien/blue, -/obj/item/gun/energy/alien, -/obj/item/prop/alien/junk, -/obj/item/prop/alien/junk, /obj/item/clothing/head/technomancer/apprentice, /turf/simulated/shuttle/floor/alienplating/blue, /area/submap/vault) @@ -513,7 +499,7 @@ c r a a -i +a c c a @@ -633,7 +619,7 @@ a a a c -i +a j c c @@ -856,7 +842,7 @@ V c c a -B +C a z a @@ -1060,7 +1046,7 @@ p p D D -C +b z a J @@ -1102,7 +1088,7 @@ V c c a -B +C a z a @@ -1257,11 +1243,11 @@ c a a a -b +G z G z -b +G a a a @@ -1311,7 +1297,7 @@ c c c j -i +a c a a @@ -1431,7 +1417,7 @@ a a c c -i +a a a c diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/warzone.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/warzone.dmm index bf1af8ce06..987e2ccab6 100644 --- a/modular_chomp/maps/submaps/surface_submaps/valley/warzone.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/valley/warzone.dmm @@ -27,7 +27,7 @@ /area/submap/warzone) "mm" = ( /obj/structure/table/steel_reinforced, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/tiled/techfloor, /area/submap/warzone) "nj" = ( diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/AbandonedLab.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/AbandonedLab.dmm index 50482f0fa5..f92f86ead2 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/AbandonedLab.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/AbandonedLab.dmm @@ -92,6 +92,7 @@ "dI" = ( /obj/item/material/shard, /obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp, /turf/simulated/floor/tiled/steel, /area/submap/AbandonedLab{ requires_power = 0 @@ -99,7 +100,7 @@ "dO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, -/obj/random/maintenance/research, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser, /turf/simulated/floor/tiled/dark, /area/submap/AbandonedLab{ requires_power = 0 @@ -163,7 +164,11 @@ requires_power = 0 }) "gP" = ( -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong{ + size_multiplier = 1.2; + health = 240; + loot_list = list(/obj/item/gun/energy/laser = 5, /obj/item/gun/energy/laser/sleek = 5, /obj/item/gun/energy/gun = 5, /obj/item/gun/energy/sniperrifle = 5) + }, /turf/simulated/floor/tiled/techfloor/grid, /area/submap/AbandonedLab{ requires_power = 0 @@ -201,7 +206,6 @@ }, /obj/random/projectile/shotgun, /obj/random/ammo, -/obj/random/ammo, /obj/item/storage/box/empslite, /obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled/steel, @@ -232,7 +236,6 @@ /obj/machinery/light/poi{ dir = 1 }, -/obj/effect/landmark/loot_spawn/low, /obj/structure/table/rack, /turf/simulated/floor/tiled/dark, /area/submap/AbandonedLab{ @@ -262,7 +265,6 @@ }) "iA" = ( /obj/effect/decal/cleanable/dirt, -/obj/random/maintenance/research, /turf/simulated/floor/reinforced, /area/submap/AbandonedLab{ requires_power = 0 @@ -296,13 +298,6 @@ "jE" = ( /obj/effect/wingrille_spawn, /turf/simulated/wall/iron, -/area/submap/AbandonedLab{ - requires_power = 0 - }) -"jN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/contraband/nofail, -/turf/simulated/floor/tiled/hydro, /area/submap/AbandonedLab{ requires_power = 0 }) @@ -367,7 +362,6 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/random/maintenance/cargo, /turf/simulated/floor/tiled/dark, /area/submap/AbandonedLab{ requires_power = 0 @@ -385,7 +379,6 @@ /obj/effect/floor_decal/industrial/danger{ dir = 1 }, -/obj/random/maintenance/research, /turf/simulated/floor/tiled/dark, /area/submap/AbandonedLab{ requires_power = 0 @@ -513,8 +506,6 @@ }) "rs" = ( /obj/structure/closet/cabinet, -/obj/random/contraband, -/obj/random/contraband, /obj/random/maintenance/medical, /obj/random/cash, /turf/simulated/floor/tiled/steel, @@ -571,7 +562,6 @@ }) "uu" = ( /obj/structure/table/rack/shelf/steel, -/obj/random/energy, /turf/simulated/floor/tiled/techfloor/grid, /area/submap/AbandonedLab{ requires_power = 0 @@ -700,7 +690,9 @@ "AB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid{ + loot_list = list(/obj/item/reagent_containers/glass/beaker/bluespace = 25) + }, /turf/simulated/floor, /area/submap/AbandonedLab{ requires_power = 0 @@ -723,13 +715,6 @@ pixel_y = 24 }, /turf/simulated/floor/tiled/dark, -/area/submap/AbandonedLab{ - requires_power = 0 - }) -"Bb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/loot_spawn/low, -/turf/simulated/floor/reinforced, /area/submap/AbandonedLab{ requires_power = 0 }) @@ -740,7 +725,6 @@ }) "BD" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/loot_spawn/low, /turf/simulated/floor/tiled/old_tile/green, /area/submap/AbandonedLab{ requires_power = 0 @@ -762,7 +746,6 @@ maxHealth = 15 }, /obj/effect/decal/cleanable/dirt, -/obj/random/projectile/scrapped_gun, /obj/item/ammo_casing/a10mm{ dir = 6 }, @@ -809,7 +792,6 @@ }) "DR" = ( /obj/effect/decal/cleanable/dirt, -/obj/random/maintenance/security, /obj/item/material/shard, /turf/simulated/floor/reinforced, /area/submap/AbandonedLab{ @@ -871,7 +853,6 @@ "FN" = ( /obj/structure/table/rack/shelf/steel, /obj/item/stolenpackage, -/obj/item/storage/backpack/holding, /turf/simulated/floor/tiled/techfloor/grid, /area/submap/AbandonedLab{ requires_power = 0 @@ -908,7 +889,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, /obj/effect/decal/remains/human, -/obj/item/broken_gun/ionrifle, /turf/simulated/floor/tiled/dark, /area/submap/AbandonedLab{ requires_power = 0 @@ -924,7 +904,6 @@ /obj/structure/table/standard{ name = "plastic table frame" }, -/obj/effect/landmark/loot_spawn/low, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/AbandonedLab{ requires_power = 0 @@ -958,7 +937,6 @@ "Iz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, -/obj/effect/landmark/loot_spawn/low, /turf/simulated/floor/tiled/dark, /area/submap/AbandonedLab{ requires_power = 0 @@ -967,7 +945,6 @@ /obj/structure/table/glass, /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/glass/beaker/bluespace, /turf/simulated/floor/tiled/steel, /area/submap/AbandonedLab{ requires_power = 0 @@ -1010,9 +987,6 @@ }) "JC" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/spacecash/c500, -/obj/item/spacecash/c500, -/obj/item/spacecash/c500, /obj/structure/window/reinforced/survival_pod, /turf/simulated/floor/tiled/techfloor/grid, /area/submap/AbandonedLab{ @@ -1059,7 +1033,6 @@ "KR" = ( /obj/structure/table/rack/shelf/steel, /obj/item/stolenpackage, -/obj/item/stolenpackage, /obj/structure/window/reinforced/survival_pod, /turf/simulated/floor/tiled/techfloor/grid, /area/submap/AbandonedLab{ @@ -1123,7 +1096,6 @@ }) "ML" = ( /obj/effect/decal/cleanable/dirt, -/obj/random/maintenance/security, /obj/structure/table/steel, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/tiled/steel, @@ -1243,7 +1215,6 @@ }) "QA" = ( /obj/effect/decal/cleanable/cobweb2, -/obj/random/maintenance/cargo, /obj/structure/catwalk, /obj/effect/floor_decal/rust{ pixel_y = 1 @@ -1300,7 +1271,6 @@ }) "Ta" = ( /obj/effect/decal/cleanable/dirt, -/obj/random/maintenance/security, /obj/structure/table/steel, /turf/simulated/floor/tiled/steel, /area/submap/AbandonedLab{ @@ -1387,11 +1357,8 @@ }) "Xo" = ( /obj/effect/floor_decal/rust, -/obj/item/storage/pill_bottle/vermicetol, -/obj/item/storage/pill_bottle/dermaline, -/obj/item/storage/pill_bottle/dexalin_plus, -/obj/item/storage/pill_bottle/carthatoline, /obj/structure/closet/crate, +/obj/random/medical/pillbottle, /turf/simulated/floor/tiled/steel, /area/submap/AbandonedLab{ requires_power = 0 @@ -1445,7 +1412,6 @@ }) "Za" = ( /obj/effect/floor_decal/rust, -/obj/effect/landmark/loot_spawn/low, /turf/simulated/floor/tiled/steel, /area/submap/AbandonedLab{ requires_power = 0 @@ -1467,7 +1433,6 @@ /area/template_noop) "Zr" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/loot_spawn/low, /obj/effect/floor_decal/rust{ pixel_y = 1 }, @@ -1573,7 +1538,7 @@ ku sb gk oI -jN +bI ot SB WZ @@ -1771,7 +1736,7 @@ ie LL yS mQ -Bb +iA mu ku Dh diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBase.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBase.dmm index 7a9409dd39..cd154cc246 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBase.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBase.dmm @@ -50,13 +50,10 @@ "bF" = ( /obj/structure/table/rack, /obj/random/projectile/shotgun, -/obj/random/projectile/shotgun, -/obj/item/gun/projectile/shotgun/pump/combat, /obj/item/ammo_magazine/ammo_box/b12g/flechette, /obj/item/ammo_magazine/ammo_box/b12g/flechette, /obj/item/ammo_magazine/ammo_box/b12g/flechette, /obj/item/ammo_magazine/ammo_box/b12g/flechette, -/obj/item/gun/projectile/shotgun/doublebarrel/quad, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "bS" = ( @@ -112,12 +109,7 @@ /area/submap/DugOutMercs) "dI" = ( /obj/structure/table/rack, -/obj/item/gun/energy/vepr, /obj/item/gun/energy/laser, -/obj/random/energy, -/obj/random/energy, -/obj/item/cell/device/weapon, -/obj/item/cell/device/weapon, /obj/item/cell/device/weapon, /obj/item/cell/device/weapon, /turf/simulated/floor/tiled/techmaint, @@ -164,14 +156,6 @@ nitrogen = 93.7835 }, /area/submap/DugOutMercs) -"fx" = ( -/obj/effect/floor_decal/corner/mauve/diagonal, -/obj/structure/table/standard, -/obj/item/surgical/surgicaldrill/alien, -/obj/machinery/light, -/obj/item/archaeological_find, -/turf/simulated/floor/tiled/techmaint, -/area/submap/DugOutMercs) "fL" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/table/standard, @@ -207,7 +191,6 @@ "hZ" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/corner/red/diagonal, -/obj/item/stolenpackage, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) "iq" = ( @@ -243,15 +226,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) -"jz" = ( -/obj/structure/table/rack, -/obj/item/clothing/suit/armor/laserproof, -/obj/item/clothing/head/helmet/laserproof, -/obj/item/clothing/gloves/arm_guard/laserproof, -/obj/item/clothing/shoes/leg_guard/laserproof, -/obj/item/clothing/suit/armor/pcarrier/laserproof, -/turf/simulated/floor/tiled/techmaint, -/area/submap/DugOutMercs) "kg" = ( /obj/effect/floor_decal/corner/blue/border{ dir = 4 @@ -290,7 +264,8 @@ "lq" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /mob/living/simple_mob/animal/space/carp/large/huge{ - faction = "syndicate" + faction = "syndicate"; + loot_list = list(/obj/item/salvage/ruin/carp = 100) }, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) @@ -361,7 +336,6 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/random/energy, /obj/item/clothing/suit/space/syndicate/black/blue, /obj/item/clothing/head/helmet/space/syndicate/black/blue, /obj/item/tank/oxygen/welded, @@ -393,6 +367,7 @@ /obj/random/maintenance/research, /obj/random/maintenance/research, /obj/random/toolbox, +/obj/item/gun/magnetic/gasthrower, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "pg" = ( @@ -445,7 +420,7 @@ "rl" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/corner/red/diagonal, -/obj/random/cash/huge, +/obj/random/cash, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) "rn" = ( @@ -540,6 +515,7 @@ /obj/random/maintenance/research, /obj/random/maintenance/research, /obj/item/clothing/head/wizard/amp, +/obj/item/cell/device/weapon/recharge/alien/omni, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "ul" = ( @@ -590,7 +566,6 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 5 }, -/obj/random/energy, /obj/item/clothing/suit/space/syndicate/black/blue, /obj/item/clothing/head/helmet/space/syndicate/black/blue, /obj/item/tank/oxygen/welded, @@ -609,8 +584,6 @@ "xC" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/table/standard, -/obj/random/maintenance/research, -/obj/random/maintenance/research, /obj/random/janusmodule, /obj/item/surgical/bone_clamp/alien, /obj/machinery/light{ @@ -624,11 +597,6 @@ /area/submap/DugOutMercs) "yr" = ( /obj/structure/table/rack, -/obj/item/clothing/suit/armor/pcarrier/laserproof, -/obj/item/clothing/suit/armor/laserproof, -/obj/item/clothing/head/helmet/laserproof, -/obj/item/clothing/gloves/arm_guard/laserproof, -/obj/item/clothing/shoes/leg_guard/laserproof, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "yA" = ( @@ -684,9 +652,7 @@ "Ca" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/table/standard, -/obj/item/gun/projectile/revolver/nova, /obj/machinery/light, -/obj/item/archaeological_find, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "Cl" = ( @@ -782,11 +748,11 @@ /area/submap/DugOutMercs) "Ex" = ( /obj/structure/table/rack/shelf, -/obj/random/firstaid, /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/light{ dir = 1 }, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) "EQ" = ( @@ -878,13 +844,6 @@ /obj/structure/railing/grey, /turf/simulated/floor/outdoors/rocks, /area/submap/DugOutMercs) -"Ig" = ( -/obj/effect/floor_decal/corner/mauve/diagonal, -/obj/structure/table/standard, -/obj/item/telecube/randomized, -/obj/item/archaeological_find, -/turf/simulated/floor/tiled/techmaint, -/area/submap/DugOutMercs) "IM" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -912,8 +871,8 @@ /area/submap/DugOutMercs) "Jp" = ( /obj/structure/table/woodentable, -/obj/random/cash/big, /obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/random/cash, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) "Jz" = ( @@ -950,14 +909,12 @@ }, /obj/structure/table/rack, /obj/item/rig/pmc/security, -/obj/item/rig/pmc/medical, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "Lg" = ( /obj/machinery/light, /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/table/woodentable, -/obj/item/stolenpackage, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) "Mh" = ( @@ -1055,7 +1012,7 @@ /obj/structure/table/standard, /obj/random/maintenance/research, /obj/random/maintenance/research, -/obj/random/medical, +/obj/item/telecube/randomized, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "QM" = ( @@ -1095,8 +1052,6 @@ "Sn" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/table/standard, -/obj/item/gun/magnetic/gasthrower, -/obj/item/cell/device/weapon/recharge/alien/omni, /obj/item/archaeological_find, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) @@ -1200,7 +1155,6 @@ }, /obj/structure/table/rack, /obj/item/rig/pmc/security, -/obj/item/rig/pmc/medical, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "Wx" = ( @@ -1248,7 +1202,9 @@ /area/submap/DugOutMercs) "YE" = ( /obj/effect/floor_decal/corner/mauve/diagonal, -/mob/living/simple_mob/humanoid/merc/ranged/technician, +/mob/living/simple_mob/humanoid/merc/ranged/technician{ + loot_list = list(/obj/item/gun/projectile/dartgun = 100, /obj/item/gun/launcher/grenade = 100, /obj/item/grenade/spawnergrenade/manhacks/mercenary = 50, /obj/item/grenade/spawnergrenade/manhacks/mercenary = 30, /obj/item/gun/projectile/revolver/nova = 50) + }, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "YF" = ( @@ -1264,15 +1220,13 @@ /area/submap/DugOutMercs) "YK" = ( /obj/effect/floor_decal/corner/mauve/diagonal, -/obj/item/archaeological_find, -/obj/item/archaeological_find, /obj/structure/table/standard, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "YW" = ( /obj/structure/table/rack/shelf, -/obj/random/medical, /obj/effect/floor_decal/corner/red/diagonal, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) "Zg" = ( @@ -2101,7 +2055,7 @@ pf WY CQ WY -fx +Ca uv De go @@ -2227,7 +2181,7 @@ my wU WY WY -Ig +Sn uv Qf go @@ -2256,7 +2210,7 @@ FZ VX VX uv -jz +yr Ks Mi Vl @@ -2310,7 +2264,7 @@ uv YW Pe Pe -iL +Pe Pe uv Qf diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBaseAlt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBaseAlt.dmm index f8f5014b9f..5837a69f84 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBaseAlt.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBaseAlt.dmm @@ -45,8 +45,8 @@ /area/submap/DugOutMercs) "bp" = ( /obj/structure/table/rack/shelf, -/obj/random/medical, /obj/effect/floor_decal/corner/red/diagonal, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) "bu" = ( @@ -129,9 +129,7 @@ "dp" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/table/standard, -/obj/item/surgical/surgicaldrill/alien, /obj/machinery/light, -/obj/item/archaeological_find, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "dr" = ( @@ -211,14 +209,6 @@ }, /turf/simulated/floor/water/deep, /area/submap/DugOutMercs) -"gc" = ( -/obj/effect/floor_decal/corner/mauve/diagonal, -/obj/structure/table/standard, -/obj/item/gun/projectile/revolver/nova, -/obj/machinery/light, -/obj/item/archaeological_find, -/turf/simulated/floor/tiled/techmaint, -/area/submap/DugOutMercs) "gg" = ( /obj/structure/table/sifwooden_reinforced, /obj/item/material/fishing_net, @@ -257,6 +247,7 @@ /obj/random/maintenance/research, /obj/random/maintenance/research, /obj/random/toolbox, +/obj/item/surgical/surgicaldrill/alien, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "in" = ( @@ -273,15 +264,6 @@ /obj/structure/railing/grey, /turf/simulated/floor/water/deep, /area/submap/DugOutMercs) -"iL" = ( -/obj/structure/table/rack, -/obj/item/clothing/suit/armor/pcarrier/laserproof, -/obj/item/clothing/suit/armor/laserproof, -/obj/item/clothing/head/helmet/laserproof, -/obj/item/clothing/gloves/arm_guard/laserproof, -/obj/item/clothing/shoes/leg_guard/laserproof, -/turf/simulated/floor/tiled/techmaint, -/area/submap/DugOutMercs) "jb" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -298,19 +280,17 @@ /area/submap/DugOutMercs) "jn" = ( /obj/structure/table/woodentable, -/obj/random/cash/big, /obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/random/cash, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) "jp" = ( /obj/structure/table/rack, /obj/random/projectile/shotgun, -/obj/random/projectile/shotgun, /obj/item/ammo_magazine/ammo_box/b12g/flechette, /obj/item/ammo_magazine/ammo_box/b12g/flechette, /obj/item/ammo_magazine/ammo_box/b12g/flechette, /obj/item/ammo_magazine/ammo_box/b12g/flechette, -/obj/item/gun/projectile/shotgun/doublebarrel/quad, /obj/item/gun/projectile/shotgun/pump, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) @@ -413,7 +393,9 @@ /area/submap/DugOutMercs) "nC" = ( /obj/effect/floor_decal/corner/mauve/diagonal, -/mob/living/simple_mob/humanoid/merc/ranged/space/shotgun, +/mob/living/simple_mob/humanoid/merc/ranged/space/shotgun{ + loot_list = list(/obj/item/gun/projectile/shotgun/pump/combat = 100, /obj/item/storage/belt/holding = 40) + }, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "nD" = ( @@ -464,19 +446,12 @@ /area/submap/DugOutMercs) "qo" = ( /obj/effect/floor_decal/corner/mauve/diagonal, -/obj/item/archaeological_find, -/obj/item/archaeological_find, /obj/structure/table/standard, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "qR" = ( /obj/structure/table/rack, -/obj/item/gun/energy/vepr, /obj/item/gun/energy/laser, -/obj/random/energy, -/obj/random/energy, -/obj/item/cell/device/weapon, -/obj/item/cell/device/weapon, /obj/item/cell/device/weapon, /obj/item/cell/device/weapon, /turf/simulated/floor/tiled/techmaint, @@ -547,7 +522,9 @@ /area/submap/DugOutMercs) "uI" = ( /obj/effect/floor_decal/corner/mauve/diagonal, -/mob/living/simple_mob/humanoid/merc/melee/sword/space, +/mob/living/simple_mob/humanoid/merc/melee/sword/space{ + loot_list = list(/obj/item/melee/energy/sword = 100, /obj/item/shield/energy = 100, /obj/item/cell/device/weapon/recharge/alien/omni = 40, /obj/item/gun/projectile/revolver/nova = 50) + }, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "uV" = ( @@ -575,8 +552,6 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 5 }, -/obj/random/material/refined, -/obj/random/material, /turf/simulated/floor/tiled{ nitrogen = 93.7835; oxygen = 20.7263; @@ -601,11 +576,11 @@ /area/submap/DugOutMercs) "wK" = ( /obj/structure/table/rack/shelf, -/obj/random/firstaid, /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/light{ dir = 1 }, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) "wO" = ( @@ -630,7 +605,7 @@ "zi" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/corner/red/diagonal, -/obj/random/cash/huge, +/obj/random/cash, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) "zs" = ( @@ -650,7 +625,6 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 5 }, -/obj/random/energy, /obj/item/clothing/suit/space/syndicate/black/blue, /obj/item/clothing/head/helmet/space/syndicate/black/blue, /obj/item/tank/oxygen/welded, @@ -790,7 +764,6 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, -/obj/random/material/precious, /obj/machinery/light{ dir = 1 }, @@ -843,7 +816,6 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, -/obj/random/material/precious, /turf/simulated/floor/tiled{ nitrogen = 93.7835; oxygen = 20.7263; @@ -891,7 +863,7 @@ dir = 5 }, /obj/structure/table/rack, -/obj/item/rig/ch/precursor, +/obj/random/material/precious, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "Ly" = ( @@ -902,7 +874,7 @@ dir = 10 }, /obj/structure/table/rack, -/obj/item/rig/ch/precursor, +/obj/random/material/precious, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "LU" = ( @@ -945,11 +917,7 @@ /area/submap/DugOutMercs) "Nr" = ( /obj/structure/table/rack, -/obj/item/clothing/suit/armor/laserproof, -/obj/item/clothing/head/helmet/laserproof, -/obj/item/clothing/gloves/arm_guard/laserproof, -/obj/item/clothing/shoes/leg_guard/laserproof, -/obj/item/clothing/suit/armor/pcarrier/laserproof, +/obj/random/material/precious, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "NB" = ( @@ -985,7 +953,9 @@ }, /area/submap/DugOutMercs) "Oz" = ( -/mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced, +/mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced{ + loot_list = list(/obj/item/rig/ch/precursor = 100) + }, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "OC" = ( @@ -1080,14 +1050,6 @@ /obj/machinery/door/airlock/external/bolted, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) -"SW" = ( -/obj/effect/floor_decal/corner/mauve/diagonal, -/obj/structure/table/standard, -/obj/item/storage/pouch/holding, -/obj/random/maintenance/research, -/obj/random/maintenance/research, -/turf/simulated/floor/tiled/techmaint, -/area/submap/DugOutMercs) "SX" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/table/standard, @@ -1116,15 +1078,6 @@ /obj/structure/railing/grey, /turf/simulated/floor/water/deep, /area/submap/DugOutMercs) -"Va" = ( -/obj/effect/floor_decal/corner/mauve/diagonal, -/obj/structure/table/standard, -/obj/random/maintenance/research, -/obj/random/maintenance/research, -/obj/item/storage/belt/holding, -/obj/item/cell/device/weapon/recharge/alien/hybrid, -/turf/simulated/floor/tiled/techmaint, -/area/submap/DugOutMercs) "VI" = ( /obj/structure/bed, /obj/item/bedsheet, @@ -1181,7 +1134,6 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/random/energy, /obj/item/clothing/suit/space/syndicate/black/blue, /obj/item/clothing/head/helmet/space/syndicate/black/blue, /obj/item/tank/oxygen/welded, @@ -1227,8 +1179,6 @@ "Zj" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/table/standard, -/obj/item/gun/magnetic/gasthrower, -/obj/item/cell/device/weapon/recharge/alien/omni, /obj/item/archaeological_find, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) @@ -2059,14 +2009,14 @@ qR Il eO Jt -iL +Nr bu Qu aM bu zs nC -SW +Hc uI qo bu @@ -2110,7 +2060,7 @@ SX RM Hc RM -gc +dp bu Ly kR @@ -2148,7 +2098,7 @@ bu Qu aM bu -Va +Hc RM RM RM @@ -2235,7 +2185,7 @@ bu bp UB UB -RP +UB UB bu Ly diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm index c461dcfa4d..e90edc0c3a 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm @@ -156,8 +156,6 @@ /area/submap/Blackshuttledown) "ax" = ( /obj/structure/table/steel, -/obj/item/gun/projectile/automatic/wt550, -/obj/item/gun/projectile/automatic/p90, /obj/random/rigsuit/chancetofail, /turf/simulated/floor/tiled/steel_grid, /area/submap/Blackshuttledown) @@ -260,7 +258,6 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/random/contraband/nofail, /turf/simulated/floor/tiled/steel, /area/submap/Blackshuttledown) "aP" = ( @@ -308,7 +305,6 @@ /area/submap/Blackshuttledown) "aV" = ( /obj/structure/table/standard, -/obj/item/storage/firstaid/surgery, /obj/effect/floor_decal/corner/green/border{ dir = 10; icon_state = "bordercolor" @@ -488,7 +484,6 @@ /area/submap/Blackshuttledown) "bv" = ( /obj/structure/table/steel, -/obj/random/projectile, /turf/simulated/floor/tiled/yellow, /area/submap/Blackshuttledown) "bw" = ( @@ -565,13 +560,11 @@ /turf/simulated/floor/tiled/yellow, /area/submap/Blackshuttledown) "bI" = ( -/obj/item/stolenpackage, /obj/structure/closet/crate, /obj/random/material/precious, /obj/random/material/precious, /obj/random/material/precious, /obj/random/rigsuit/chancetofail, -/obj/random/projectile, /turf/simulated/floor/tiled/yellow, /area/submap/Blackshuttledown) "bJ" = ( @@ -658,9 +651,6 @@ /area/submap/Blackshuttledown) "bV" = ( /obj/structure/table/steel, -/obj/random/rigsuit/chancetofail, -/obj/random/projectile, -/obj/random/projectile, /turf/simulated/floor/tiled/steel_grid, /area/submap/Blackshuttledown) "bW" = ( @@ -701,7 +691,6 @@ /area/submap/Blackshuttledown) "cc" = ( /obj/structure/table/steel, -/obj/item/gun/projectile/pistol, /obj/machinery/light/small{ dir = 4; pixel_y = 0 @@ -735,7 +724,6 @@ "ch" = ( /obj/structure/table/steel, /obj/random/energy/highend, -/obj/random/energy/highend, /obj/random/rigsuit/chancetofail, /turf/simulated/floor/tiled/steel_grid, /area/submap/Blackshuttledown) @@ -771,7 +759,6 @@ /area/submap/Blackshuttledown) "cl" = ( /obj/structure/table/woodentable, -/obj/random/projectile, /turf/simulated/floor/tiled/steel, /area/submap/Blackshuttledown) "cm" = ( @@ -782,7 +769,7 @@ /area/submap/Blackshuttledown) "cn" = ( /obj/structure/table/woodentable, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/tiled/steel, /area/submap/Blackshuttledown) "co" = ( @@ -830,7 +817,11 @@ /area/submap/Blackshuttledown) "DG" = ( /obj/structure/table/steel, -/obj/random/contraband/nofail, +/obj/random/contraband, +/turf/simulated/floor/tiled/steel, +/area/submap/Blackshuttledown) +"Fp" = ( +/obj/structure/table/steel, /turf/simulated/floor/tiled/steel, /area/submap/Blackshuttledown) "RP" = ( @@ -1564,7 +1555,7 @@ aj bl jW bB -DG +Fp jW bl aj diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveS.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveS.dmm index 16b210053b..ef02fe8da8 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveS.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveS.dmm @@ -82,7 +82,9 @@ }, /area/submap/CaveS) "r" = ( -/mob/living/simple_mob/animal/giant_spider/lurker, +/mob/living/simple_mob/animal/giant_spider/lurker{ + loot_list = list(/obj/item/stock_parts/manipulator/omni = 50) + }, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -116,7 +118,9 @@ }, /area/submap/CaveS) "x" = ( -/mob/living/simple_mob/animal/giant_spider/lurker, +/mob/living/simple_mob/animal/giant_spider/lurker{ + loot_list = list(/obj/item/stock_parts/manipulator/omni = 50) + }, /turf/simulated/floor/outdoors/dirt, /area/submap/CaveS) "y" = ( @@ -166,7 +170,6 @@ /obj/item/reagent_containers/pill/antitox, /obj/item/reagent_containers/pill/antitox, /obj/item/reagent_containers/pill/paracetamol, -/obj/random/firstaid, /turf/simulated/floor, /area/submap/CaveS) "H" = ( @@ -183,7 +186,6 @@ /obj/random/contraband, /obj/random/contraband, /obj/random/contraband, -/obj/random/energy, /obj/item/material/star, /obj/item/material/star, /obj/item/material/star, @@ -227,6 +229,20 @@ /obj/structure/loot_pile/maint/boxfort, /turf/simulated/floor, /area/submap/CaveS) +"W" = ( +/mob/living/simple_mob/animal/giant_spider/lurker{ + loot_list = list(/obj/item/stock_parts/capacitor/omni = 50) + }, +/turf/simulated/floor/outdoors/dirt{ + outdoors = 0 + }, +/area/submap/CaveS) +"Z" = ( +/mob/living/simple_mob/animal/giant_spider/lurker{ + loot_list = list(/obj/item/stock_parts/capacitor/omni = 50) + }, +/turf/simulated/floor/outdoors/dirt, +/area/submap/CaveS) (1,1,1) = {" a @@ -763,7 +779,7 @@ d k k d -x +Z d d d @@ -925,7 +941,7 @@ k k d d -r +W k k k @@ -1356,7 +1372,7 @@ A A k k -r +W d d d @@ -1430,7 +1446,7 @@ d k k d -r +W k A A diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveSAlt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveSAlt.dmm index cefa884e7a..d8e9c5e515 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveSAlt.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveSAlt.dmm @@ -11,8 +11,6 @@ "d" = ( /obj/structure/closet/crate, /obj/random/contraband, -/obj/random/contraband, -/obj/random/energy, /obj/random/energy, /turf/simulated/floor, /area/submap/CaveS) @@ -43,7 +41,9 @@ /turf/simulated/wall, /area/submap/CaveS) "o" = ( -/mob/living/simple_mob/animal/giant_spider/phorogenic, +/mob/living/simple_mob/animal/giant_spider/phorogenic{ + loot_list = list(/obj/item/stock_parts/manipulator/omni = 50) + }, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -68,8 +68,7 @@ /area/submap/CaveS) "t" = ( /obj/structure/closet/crate, -/obj/random/firstaid, -/obj/random/firstaid, +/obj/random/contraband, /turf/simulated/floor, /area/submap/CaveS) "u" = ( @@ -87,18 +86,36 @@ "z" = ( /turf/simulated/mineral/ignore_mapgen, /area/submap/CaveS) +"C" = ( +/mob/living/simple_mob/animal/giant_spider/phorogenic{ + loot_list = list(/obj/item/stock_parts/capacitor/omni = 50) + }, +/turf/simulated/floor/outdoors/dirt{ + outdoors = 0 + }, +/area/submap/CaveS) "D" = ( /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, /area/submap/CaveS) +"F" = ( +/mob/living/simple_mob/animal/giant_spider/phorogenic{ + loot_list = list(/obj/item/stock_parts/scanning_module/omni = 50) + }, +/turf/simulated/floor/outdoors/dirt{ + outdoors = 0 + }, +/area/submap/CaveS) "H" = ( /turf/simulated/floor, /area/submap/CaveS) "I" = ( -/mob/living/simple_mob/animal/giant_spider/phorogenic, /obj/effect/spider/stickyweb, +/mob/living/simple_mob/animal/giant_spider/phorogenic{ + loot_list = list(/obj/item/stock_parts/manipulator/omni = 50) + }, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -106,6 +123,15 @@ "J" = ( /turf/simulated/floor/outdoors/dirt, /area/submap/CaveS) +"K" = ( +/obj/effect/spider/stickyweb, +/mob/living/simple_mob/animal/giant_spider/phorogenic{ + loot_list = list(/obj/item/stock_parts/scanning_module/omni = 50) + }, +/turf/simulated/floor/outdoors/dirt{ + outdoors = 0 + }, +/area/submap/CaveS) "M" = ( /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/outdoors/dirt{ @@ -117,6 +143,15 @@ outdoors = 0 }, /area/submap/CaveS) +"Q" = ( +/obj/effect/spider/stickyweb, +/mob/living/simple_mob/animal/giant_spider/phorogenic{ + loot_list = list(/obj/item/stock_parts/capacitor/omni = 50) + }, +/turf/simulated/floor/outdoors/dirt{ + outdoors = 0 + }, +/area/submap/CaveS) "S" = ( /obj/structure/loot_pile/surface/bones, /obj/item/rig/industrial, @@ -394,7 +429,7 @@ P P P r -I +K z z z @@ -512,7 +547,7 @@ z z z z -I +K P P r @@ -1226,7 +1261,7 @@ P P c P -o +F z z z @@ -1259,7 +1294,7 @@ z z z z -o +C P P H @@ -1355,7 +1390,7 @@ H P z z -I +Q r P P diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm index 5e5d682792..c9ae342aae 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm @@ -293,7 +293,6 @@ /area/submap/Chapel1) "bf" = ( /obj/structure/closet/coffin, -/obj/random/contraband, /obj/effect/decal/remains/mouse, /obj/effect/decal/remains/unathi, /turf/simulated/floor/wood/sif, diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm index 4ce1cecac8..4539772943 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm @@ -305,6 +305,12 @@ /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/wood, /area/submap/DJOutpost1) +"W" = ( +/obj/structure/ghost_pod/manual/lost_drone/dogborg{ + activated = 1 + }, +/turf/template_noop, +/area/template_noop) (1,1,1) = {" a @@ -552,7 +558,7 @@ a o u C -a +W a a a diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomP.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomP.dmm index e9fe007243..44d31d42cd 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomP.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomP.dmm @@ -330,11 +330,6 @@ /obj/effect/floor_decal/borderfloor, /turf/simulated/floor/tiled, /area/submap/DoomP) -"bg" = ( -/obj/structure/table/standard, -/obj/random/firstaid, -/turf/simulated/floor/tiled, -/area/submap/DoomP) "bh" = ( /obj/machinery/door/airlock/hatch, /turf/simulated/floor/tiled, @@ -391,13 +386,7 @@ "br" = ( /obj/structure/table/rack, /obj/item/cell/device/weapon, -/obj/item/cell/device/weapon, -/obj/item/cell/device/weapon, -/obj/item/cell/device/weapon, /obj/random/energy, -/obj/random/energy, -/obj/random/energy/highend, -/obj/random/energy/highend, /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) "bs" = ( @@ -952,11 +941,6 @@ /obj/effect/map_helper/no_phaseshift, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/DoomP) -"Xj" = ( -/obj/structure/table/standard, -/obj/item/stolenpackage, -/turf/simulated/floor/tiled, -/area/submap/DoomP) "XV" = ( /obj/structure/table/darkglass, /obj/item/gun/energy/imperial, @@ -2501,7 +2485,7 @@ ad at aA aO -Xj +aN be bC JU @@ -2625,7 +2609,7 @@ as at aB aO -bg +aN be at at diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomPAlt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomPAlt.dmm index f12dac1dc2..abfafd7d49 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomPAlt.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomPAlt.dmm @@ -355,11 +355,6 @@ }, /turf/simulated/floor/tiled, /area/submap/DoomP) -"tP" = ( -/obj/structure/table/standard, -/obj/item/stolenpackage, -/turf/simulated/floor/tiled, -/area/submap/DoomP) "tX" = ( /obj/item/mine/phoron, /turf/simulated/floor/wood{ @@ -997,13 +992,7 @@ "Ya" = ( /obj/structure/table/rack, /obj/item/cell/device/weapon, -/obj/item/cell/device/weapon, -/obj/item/cell/device/weapon, -/obj/item/cell/device/weapon, /obj/random/energy, -/obj/random/energy, -/obj/random/energy/highend, -/obj/random/energy/highend, /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) "Yi" = ( @@ -1019,11 +1008,6 @@ }, /turf/simulated/floor/tiled/white, /area/submap/DoomP) -"YL" = ( -/obj/structure/table/standard, -/obj/random/firstaid, -/turf/simulated/floor/tiled, -/area/submap/DoomP) "YM" = ( /obj/effect/floor_decal/corner/lime{ dir = 10 @@ -2576,7 +2560,7 @@ Hw Yl ZH zO -tP +CT KR RT HL @@ -2700,7 +2684,7 @@ bK Yl jH zO -YL +CT KR Yl Yl diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Drugden.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Drugden.dmm index d9604468d7..13048532a8 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Drugden.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Drugden.dmm @@ -237,7 +237,6 @@ "W" = ( /obj/structure/closet/cabinet, /obj/random/mre, -/obj/random/medical/lite, /turf/simulated/floor/carpet, /area/submap/Drugd) diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod3.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod3.dmm index 68cde0066f..f996f5628c 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod3.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod3.dmm @@ -111,6 +111,12 @@ /obj/structure/grille, /turf/simulated/shuttle/plating, /area/submap/Epod3) +"w" = ( +/obj/structure/ghost_pod/manual/lost_drone/dogborg{ + activated = 1 + }, +/turf/template_noop, +/area/submap/Epod3) (1,1,1) = {" a @@ -271,7 +277,7 @@ a (14,1,1) = {" a b -b +w b b b diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod4.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod4.dmm index cc4848a402..eea6a5f5a0 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod4.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod4.dmm @@ -106,6 +106,12 @@ /obj/structure/flora/grass/brown, /turf/simulated/floor/outdoors/dirt, /area/submap/Epod4) +"J" = ( +/obj/structure/ghost_pod/manual/lost_drone/dogborg{ + activated = 1 + }, +/turf/simulated/floor/outdoors/dirt, +/area/submap/Epod4) (1,1,1) = {" a @@ -145,7 +151,7 @@ a a b c -c +J c e f diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm index 6ceed46e98..c8e95e4384 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm @@ -40,13 +40,6 @@ outdoors = 0 }, /area/submap/FrostflyNest) -"j" = ( -/obj/random/humanoidremains, -/obj/random/gun/random, -/turf/simulated/floor/outdoors/dirt{ - outdoors = 0 - }, -/area/submap/FrostflyNest) "k" = ( /obj/random/medical/pillbottle, /turf/simulated/floor/outdoors/dirt{ @@ -101,7 +94,7 @@ d d d h -j +g e f d @@ -112,7 +105,7 @@ d d d f -i +e e e h diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/MCamp1.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/MCamp1.dmm index 5e1224ed17..26bf942c0a 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/MCamp1.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/MCamp1.dmm @@ -77,7 +77,6 @@ /obj/structure/table/standard, /mob/living/simple_mob/mechanical/viscerator, /mob/living/simple_mob/mechanical/viscerator, -/obj/random/energy, /turf/simulated/floor/plating/sif/planetuse, /area/submap/MilitaryCamp1) "u" = ( @@ -116,7 +115,6 @@ /area/submap/MilitaryCamp1) "C" = ( /obj/structure/table, -/obj/random/firstaid, /turf/simulated/floor/plating/sif/planetuse, /area/submap/MilitaryCamp1) "D" = ( diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1.dmm index b4346e9e6e..01ea284f72 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1.dmm @@ -19,7 +19,6 @@ "ae" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/drinks/cans/waterbottle, -/obj/random/medical, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "af" = ( @@ -45,7 +44,6 @@ /obj/item/clothing/mask/smokable/cigarette/cigar, /obj/item/material/ashtray/glass, /obj/effect/spider/stickyweb, -/obj/random/medical, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "ak" = ( @@ -225,7 +223,6 @@ /area/submap/Manor1) "aT" = ( /obj/structure/closet/cabinet, -/obj/random/projectile/shotgun, /obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat, /obj/item/clothing/shoes/boots/winter/climbing, /turf/simulated/floor/holofloor/wood, @@ -537,12 +534,10 @@ /obj/structure/closet/crate, /obj/item/stack/cable_coil/random_belt, /obj/random/cash, -/obj/random/contraband, -/obj/random/contraband/nofail, -/obj/random/cash/huge, /obj/item/stack/material/gold{ amount = 18 }, +/obj/random/cash, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "ca" = ( @@ -560,8 +555,6 @@ "cc" = ( /obj/structure/closet/cabinet, /obj/item/cell/device/weapon, -/obj/item/cell/device/weapon, -/obj/random/energy, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "cd" = ( @@ -598,9 +591,8 @@ /obj/item/flame/lighter/random, /obj/random/powercell, /obj/random/contraband, -/obj/random/contraband/nofail, -/obj/random/cash/huge, /obj/item/material/sword, +/obj/random/cash, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "cj" = ( @@ -628,13 +620,11 @@ "cn" = ( /obj/structure/closet/crate, /obj/item/storage/wallet/random, -/obj/random/contraband, -/obj/random/contraband/nofail, -/obj/random/cash/huge, /obj/item/stack/material/tritium{ amount = 20 }, /obj/item/cell/super, +/obj/random/cash, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "co" = ( @@ -715,7 +705,6 @@ "cD" = ( /obj/structure/closet/crate, /obj/item/gun/energy/locked/frontier/handbow, -/obj/item/gun/energy/locked/frontier/handbow, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "cE" = ( @@ -822,7 +811,6 @@ "eI" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/sandwich, -/obj/item/gun/projectile/revolver/cappeacekeeper, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "eL" = ( @@ -841,7 +829,6 @@ "fo" = ( /obj/structure/table/rack, /obj/random/firstaid, -/obj/random/firstaid, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "fx" = ( @@ -1000,13 +987,6 @@ /obj/random/humanoidremains, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) -"nr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spider/stickyweb/dark, -/obj/item/gun/energy/medigun, -/turf/simulated/floor/carpet/purcarpet, -/area/submap/Manor1) "nP" = ( /mob/living/simple_mob/animal/giant_spider/frost, /obj/effect/spider/stickyweb, @@ -1023,7 +1003,9 @@ /turf/simulated/floor/carpet/bcarpet, /area/submap/Manor1) "pl" = ( -/mob/living/simple_mob/animal/giant_spider/broodmother, +/mob/living/simple_mob/animal/giant_spider/broodmother{ + loot_list = list(/obj/item/royal_spider_egg = 100, /obj/item/gun/energy/medigun = 60, /obj/item/gun/energy/pummeler = 40) + }, /obj/effect/spider/stickyweb/dark, /turf/simulated/floor/carpet/purcarpet, /area/submap/Manor1) @@ -1224,7 +1206,6 @@ /area/submap/Manor1) "DW" = ( /obj/structure/table/woodentable, -/obj/item/gun/energy/locked/frontier/rifle, /obj/item/clothing/suit/storage/hooded/techpriest{ armor = list("melee"=20,"bullet"=10,"laser"=50,"energy"=60,"bomb"=25,"bio"=50,"rad"=25) }, @@ -1467,7 +1448,6 @@ "RX" = ( /obj/structure/table/woodentable, /obj/item/gun/energy/hooklauncher/ring, -/obj/random/medical/pillbottle, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "Sl" = ( @@ -1517,11 +1497,6 @@ /obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/hydro, /area/submap/Manor1) -"WG" = ( -/obj/structure/table/woodentable, -/obj/random/medical, -/turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) "WS" = ( /obj/effect/spider/stickyweb, /turf/simulated/floor/carpet/turcarpet, @@ -1550,7 +1525,6 @@ /obj/item/bone/ribs, /obj/item/bone/ribs, /obj/item/bone/skull, -/obj/item/gun/energy/pummeler, /turf/simulated/floor/carpet/purcarpet, /area/submap/Manor1) "YP" = ( @@ -2707,7 +2681,7 @@ aQ bU BE ie -nr +cP cP MZ cP @@ -3642,7 +3616,7 @@ eA KN an ab -WG +al ag ag ag diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1Alt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1Alt.dmm index ed4d3f016a..7a2b44860c 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1Alt.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1Alt.dmm @@ -261,11 +261,6 @@ }, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) -"jQ" = ( -/obj/structure/table/woodentable, -/obj/random/projectile/shotgun, -/turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) "jT" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled/hydro, @@ -296,7 +291,6 @@ "kh" = ( /obj/structure/closet/crate, /obj/item/gun/energy/locked/frontier/handbow, -/obj/item/gun/energy/locked/frontier/handbow, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "kn" = ( @@ -455,7 +449,6 @@ /area/submap/Manor1) "pm" = ( /obj/structure/closet/cabinet, -/obj/random/projectile/shotgun, /obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat, /obj/item/clothing/shoes/boots/winter/climbing, /turf/simulated/floor/holofloor/wood, @@ -508,7 +501,6 @@ /obj/item/clothing/head/hood/winter, /obj/item/clothing/shoes/boots/winter/climbing, /obj/item/clothing/suit/storage/hooded/wintercoat, -/obj/random/contraband, /obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) @@ -569,13 +561,10 @@ "sM" = ( /obj/structure/closet/crate, /obj/item/stack/cable_coil/random_belt, -/obj/random/cash, -/obj/random/contraband, -/obj/random/contraband/nofail, -/obj/random/cash/huge, /obj/item/stack/material/gold{ amount = 18 }, +/obj/random/cash, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "sR" = ( @@ -607,7 +596,6 @@ "tK" = ( /obj/structure/table/rack, /obj/random/firstaid, -/obj/random/firstaid, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "tO" = ( @@ -737,7 +725,6 @@ /obj/item/clothing/mask/smokable/cigarette/cigar, /obj/item/material/ashtray/glass, /obj/effect/spider/stickyweb, -/obj/random/medical, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "xK" = ( @@ -822,11 +809,6 @@ /obj/item/bedsheet, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) -"Ay" = ( -/obj/structure/table/woodentable, -/obj/random/medical, -/turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) "AS" = ( /obj/random/trash, /turf/simulated/floor/holofloor/wood, @@ -934,13 +916,6 @@ }, /turf/simulated/floor/tiled/hydro, /area/submap/Manor1) -"EN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spider/stickyweb/dark, -/obj/item/gun/energy/medigun, -/turf/simulated/floor/carpet/purcarpet, -/area/submap/Manor1) "EW" = ( /obj/structure/simple_door/wood, /turf/simulated/floor/carpet/purcarpet, @@ -950,7 +925,6 @@ /obj/item/flame/lighter/random, /obj/random/powercell, /obj/random/contraband, -/obj/random/contraband/nofail, /obj/random/cash/huge, /obj/item/material/sword, /turf/simulated/floor/holofloor/wood, @@ -1000,8 +974,10 @@ /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "GY" = ( -/mob/living/simple_mob/animal/giant_spider/broodmother, /obj/effect/spider/stickyweb/dark, +/mob/living/simple_mob/animal/giant_spider/broodmother{ + loot_list = list(/obj/item/royal_spider_egg = 100, /obj/item/gun/energy/medigun = 60, /obj/item/gun/energy/pummeler = 40) + }, /turf/simulated/floor/carpet/purcarpet, /area/submap/Manor1) "Hi" = ( @@ -1012,8 +988,6 @@ "Ho" = ( /obj/structure/closet/cabinet, /obj/item/cell/device/weapon, -/obj/item/cell/device/weapon, -/obj/random/energy, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "HX" = ( @@ -1160,7 +1134,6 @@ /obj/item/bone/ribs, /obj/item/bone/ribs, /obj/item/bone/skull, -/obj/item/gun/energy/pummeler, /mob/living/simple_mob/animal/passive/mouse/white, /turf/simulated/floor/carpet/purcarpet, /area/submap/Manor1) @@ -1188,13 +1161,11 @@ "Nl" = ( /obj/structure/closet/crate, /obj/item/storage/wallet/random, -/obj/random/contraband, -/obj/random/contraband/nofail, -/obj/random/cash/huge, /obj/item/stack/material/tritium{ amount = 20 }, /obj/item/cell/super, +/obj/random/cash, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "Nq" = ( @@ -1291,7 +1262,6 @@ "QA" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/drinks/cans/waterbottle, -/obj/random/medical, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "QI" = ( @@ -2701,7 +2671,7 @@ sR ml Yq lk -EN +Sf Sf NW Fp @@ -3552,7 +3522,7 @@ CY cT Ef CY -jQ +Zg Ua yD Nq @@ -3636,7 +3606,7 @@ xK Zo gQ CY -Ay +Zg rh rh rh diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Rockybase.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Rockybase.dmm index e422581ee9..214e41b3f1 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Rockybase.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Rockybase.dmm @@ -1140,6 +1140,12 @@ /obj/effect/gibspawner/human, /turf/template_noop, /area/template_noop) +"Hx" = ( +/obj/structure/ghost_pod/manual/lost_drone/dogborg{ + activated = 1 + }, +/turf/simulated/floor/holofloor/lino, +/area/submap/Rockybase) (1,1,1) = {" aa @@ -1763,7 +1769,7 @@ ai ai ai at -aE +Hx aE bm at diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/borglab.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/borglab.dmm index 5397a7db21..4ad973d474 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/borglab.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/borglab.dmm @@ -276,11 +276,6 @@ }, /turf/simulated/floor/tiled/dark, /area/submap/BorgLab) -"jR" = ( -/obj/effect/floor_decal/techfloor/orange, -/obj/item/broken_gun/ionrifle, -/turf/simulated/floor/reinforced, -/area/submap/BorgLab) "kj" = ( /obj/effect/floor_decal/rust, /obj/random/junk, @@ -548,11 +543,6 @@ }, /turf/simulated/floor/plating, /area/submap/BorgLab) -"ub" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/item/stolenpackage, -/turf/simulated/floor/reinforced, -/area/submap/BorgLab) "ug" = ( /obj/machinery/door/window/brigdoor/westright{ dir = 2; @@ -1082,7 +1072,6 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 1 }, -/obj/item/broken_gun/laserrifle, /turf/simulated/floor/reinforced, /area/submap/BorgLab) "Pf" = ( @@ -1137,7 +1126,6 @@ /obj/structure/closet/l3closet/general, /obj/effect/floor_decal/rust, /obj/random/maintenance/medical, -/obj/random/maintenance/medical, /obj/random/maintenance/research, /obj/random/maintenance/research, /obj/effect/floor_decal/rust/color_rustedcee, @@ -1260,7 +1248,6 @@ dir = 1 }, /obj/random/maintenance, -/obj/random/maintenance/medical, /obj/effect/floor_decal/rust/color_rustedcee, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/tiled, @@ -1361,12 +1348,6 @@ /obj/structure/sign/department/xenolab, /turf/simulated/wall/r_wall, /area/submap/BorgLab) -"WK" = ( -/obj/effect/floor_decal/rust, -/obj/effect/floor_decal/rust, -/obj/item/broken_gun/laser_retro, -/turf/simulated/floor/plating, -/area/submap/BorgLab) "WQ" = ( /turf/simulated/wall/r_wall, /area/submap/BorgLab) @@ -1805,7 +1786,7 @@ YZ YD VU tx -jR +HA WQ WQ RG @@ -2092,7 +2073,7 @@ iY RG WQ WQ -WK +TU xO Vc mB @@ -2121,7 +2102,7 @@ WQ WQ KX Nj -ub +Vc YD iS Yk diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/borglabAlt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/borglabAlt.dmm index db4cd28fed..17acb9614d 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/borglabAlt.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/borglabAlt.dmm @@ -567,11 +567,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, /area/submap/BorgLab) -"wx" = ( -/obj/effect/floor_decal/techfloor/orange, -/obj/item/broken_gun/ionrifle, -/turf/simulated/floor/reinforced, -/area/submap/BorgLab) "wY" = ( /mob/living/simple_mob/mechanical/cyber_horror/cat_cyber_horror, /obj/random/trash, @@ -1006,12 +1001,6 @@ }, /turf/simulated/floor/tiled, /area/submap/BorgLab) -"Lj" = ( -/obj/effect/floor_decal/rust, -/obj/effect/floor_decal/rust, -/obj/item/broken_gun/laser_retro, -/turf/simulated/floor/plating, -/area/submap/BorgLab) "Lm" = ( /obj/structure/table/rack/shelf/steel, /obj/item/stack/material/phoron{ @@ -1117,7 +1106,6 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 1 }, -/obj/item/broken_gun/laserrifle, /turf/simulated/floor/reinforced, /area/submap/BorgLab) "NM" = ( @@ -1790,7 +1778,7 @@ ZB tC WS pv -wx +EV iK iK SL @@ -2077,7 +2065,7 @@ tt SL iK iK -Lj +hp Cb vS pU diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters.dmm index 4cfb7fab41..b78e1118d7 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters.dmm @@ -149,7 +149,6 @@ /area/submap/BountyHunters) "rt" = ( /obj/structure/table/steel, -/obj/random/projectile, /obj/machinery/recharger, /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/concrete, @@ -188,8 +187,8 @@ /area/submap/BountyHunters) "uu" = ( /obj/structure/table/steel, -/obj/random/maintenance/medical, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/random/material/precious, /turf/simulated/floor/concrete, /area/submap/BountyHunters) "uC" = ( diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters2.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters2.dmm index 55aa6dc9ca..eb44e4a7ec 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters2.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters2.dmm @@ -1,10 +1,9 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aB" = ( /obj/structure/table/steel, -/obj/random/projectile, /obj/machinery/recharger, -/obj/item/gun/projectile/automatic/fal, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/random/material/precious, /turf/simulated/floor/concrete, /area/submap/BountyHunters) "aF" = ( @@ -52,9 +51,8 @@ /area/submap/BountyHunters) "eH" = ( /obj/structure/table/steel, -/obj/random/maintenance/medical, -/obj/item/storage/firstaid/clotting, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/random/material/precious, /turf/simulated/floor/concrete, /area/submap/BountyHunters) "eY" = ( @@ -378,12 +376,6 @@ }, /turf/simulated/floor/outdoors/dirt, /area/submap/BountyHunters) -"KF" = ( -/obj/structure/table/steel, -/obj/random/maintenance/medical, -/obj/effect/floor_decal/corner/grey/diagonal, -/turf/simulated/floor/concrete, -/area/submap/BountyHunters) "Ly" = ( /obj/structure/grille, /obj/structure/grille, @@ -825,7 +817,7 @@ Wj mf yz aB -KF +eH Pr rC rC diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/chasm.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/chasm.dmm index 8cc6c4e8c5..05b03a28e4 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/chasm.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/chasm.dmm @@ -4,8 +4,8 @@ /turf/simulated/floor/outdoors/dirt, /area/template_noop) "aE" = ( -/obj/item/storage/firstaid/bonemed, -/turf/simulated/floor/outdoors/rocks{ +/obj/item/storage/firstaid, +/turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, /area/submap/Chasm) @@ -113,7 +113,8 @@ /mob/living/simple_mob/vore/jelly{ health = 150; maxHealth = 150; - name = "Cavern jelly blob" + name = "Cavern jelly blob"; + loot_list = list(/obj/item/storage/firstaid/bonemed = 10) }, /turf/simulated/floor/plating, /area/submap/Chasm) @@ -362,12 +363,6 @@ /obj/random/humanoidremains, /turf/simulated/floor/plating, /area/submap/Chasm) -"DH" = ( -/mob/living/simple_mob/vore/jelly, -/turf/simulated/floor/outdoors/rocks{ - outdoors = 0 - }, -/area/submap/Chasm) "DI" = ( /obj/random/junk, /turf/simulated/floor/outdoors/dirt, @@ -520,7 +515,6 @@ /obj/structure/cliff/automatic/corner{ dir = 6 }, -/obj/effect/landmark/loot_spawn, /turf/simulated/floor/outdoors/rocks{ outdoors = 0 }, @@ -661,12 +655,13 @@ }, /area/submap/Chasm) "Zn" = ( +/obj/item/bone/skull, /mob/living/simple_mob/vore/jelly{ health = 150; maxHealth = 150; - name = "Cavern jelly blob" + name = "Cavern jelly blob"; + loot_list = list(/obj/item/storage/firstaid/bonemed = 10) }, -/obj/item/bone/skull, /turf/simulated/floor/outdoors/rocks{ outdoors = 0 }, @@ -675,7 +670,8 @@ /mob/living/simple_mob/vore/jelly{ health = 150; maxHealth = 150; - name = "Cavern jelly blob" + name = "Cavern jelly blob"; + loot_list = list(/obj/item/storage/firstaid/bonemed = 10) }, /turf/simulated/floor/outdoors/rocks{ outdoors = 0 @@ -776,7 +772,7 @@ pk ua ua Sc -DH +ZS Kz DI cj @@ -791,7 +787,7 @@ Sc Sc ua ua -Lt +aE Kv Tp Aq @@ -820,7 +816,7 @@ Kv Tp NU Rz -aE +Rz BU Za Kv @@ -1088,7 +1084,7 @@ hR hR Ee Kv -DH +ZS Sc Sc ua @@ -1126,7 +1122,7 @@ ua ua ua Sc -DH +ZS Kv Ee cj diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/chemspill2.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/chemspill2.dmm index 433a81ecb2..0571ecc649 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/chemspill2.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/chemspill2.dmm @@ -50,10 +50,6 @@ /obj/item/stack/rods, /turf/simulated/floor/water/contaminated, /area/submap/ChemSpill2) -"p" = ( -/obj/random/firstaid, -/turf/simulated/floor/outdoors/dirt/sif, -/area/submap/ChemSpill2) "q" = ( /obj/random/tech_supply, /obj/random/energy, @@ -521,7 +517,7 @@ e b b b -p +t q b b @@ -587,7 +583,7 @@ b b b b -t +b b b f diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/deathden.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/deathden.dmm index 1f6a824f8f..e574fb7797 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/deathden.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/deathden.dmm @@ -26,7 +26,6 @@ /turf/simulated/floor/wood/sif, /area/submap/DeathDen) "bk" = ( -/obj/random/maintenance/medical, /turf/simulated/floor/wood/sif, /area/submap/DeathDen) "by" = ( @@ -51,7 +50,6 @@ /turf/simulated/floor/wood/sif/broken, /area/submap/DeathDen) "dL" = ( -/obj/random/maintenance/medical, /obj/random/junk, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/sif, @@ -636,7 +634,6 @@ /obj/structure/window/reinforced/tinted/frosted{ dir = 8 }, -/obj/item/gun/projectile/shotgun/doublebarrel/sawn, /turf/simulated/floor/tiled/freezer, /area/submap/DeathDen) "DH" = ( @@ -653,7 +650,6 @@ pixel_x = 6; pixel_y = 4 }, -/obj/item/gun/projectile/deagle, /turf/simulated/floor/wood/sif/broken, /area/submap/DeathDen) "EL" = ( diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/deathdenAlt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/deathdenAlt.dmm index 38eed83da4..bde7a799f3 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/deathdenAlt.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/deathdenAlt.dmm @@ -389,7 +389,6 @@ }, /area/submap/DeathDen) "CJ" = ( -/obj/random/maintenance/medical, /obj/random/junk, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance/engineering, @@ -568,7 +567,6 @@ /obj/structure/window/reinforced/tinted/frosted{ dir = 8 }, -/obj/item/gun/projectile/shotgun/doublebarrel/sawn, /turf/simulated/floor/tiled/freezer, /area/submap/DeathDen) "Mz" = ( diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/demonpool.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/demonpool.dmm index cb210fb8f9..f57b30bc54 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/demonpool.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/demonpool.dmm @@ -109,10 +109,6 @@ /obj/effect/gibspawner/human/xenochimera, /turf/simulated/floor/cult, /area/submap/DemonPool) -"hQ" = ( -/obj/effect/landmark/loot_spawn, -/turf/simulated/floor/cult, -/area/submap/DemonPool) "hW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -648,7 +644,6 @@ "YK" = ( /obj/structure/table/woodentable, /obj/item/pen/fountain, -/obj/item/stolenpackage, /turf/simulated/floor, /area/submap/DemonPool) "Zc" = ( @@ -1075,7 +1070,7 @@ qQ XB si jt -hQ +oi Yk eR Jo diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/derelictengine.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/derelictengine.dmm index cb880759b6..e84ae056bc 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/derelictengine.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/derelictengine.dmm @@ -3,7 +3,9 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp{ + loot_list = list(/obj/item/prop/alien/junk = 20, /obj/item/prop/alien/junk = 20) + }, /turf/simulated/floor/tiled/techfloor{ temperature = 243.15; oxygen = 20.7263; @@ -172,10 +174,12 @@ /turf/template_noop, /area/template_noop) "cE" = ( -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser, /obj/effect/floor_decal/techfloor{ dir = 8 }, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser{ + loot_list = list(/obj/item/prop/alien/junk = 20) + }, /turf/simulated/shuttle/floor/alienplating/external, /area/submap/DerelictEngine) "cH" = ( @@ -348,7 +352,6 @@ /area/submap/DerelictEngine) "fn" = ( /obj/structure/table/alien/blue, -/obj/item/storage/belt/utility/alien, /turf/simulated/shuttle/floor/alienplating/external, /area/submap/DerelictEngine) "fp" = ( @@ -874,7 +877,9 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/radiation, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/radiation{ + loot_list = list(/obj/item/prop/alien/junk = 20) + }, /turf/simulated/shuttle/floor/alienplating/external, /area/submap/DerelictEngine) "lV" = ( @@ -1341,7 +1346,9 @@ d2 = 8; icon_state = "4-8" }, -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser{ + loot_list = list(/obj/item/prop/alien/junk = 20) + }, /obj/item/material/shard/phoron{ pixel_x = 7; pixel_y = 10 @@ -1663,9 +1670,6 @@ dir = 6 }, /obj/structure/closet/alien, -/obj/item/prop/alien/junk, -/obj/item/prop/alien/junk, -/obj/item/prop/alien/junk, /obj/item/implanter/adrenalin, /turf/simulated/floor/tiled/techfloor{ temperature = 243.15; @@ -1751,10 +1755,11 @@ }, /area/submap/DerelictEngine) "vU" = ( -/obj/structure/table/alien/blue, -/obj/item/prop/alien/junk, -/turf/simulated/shuttle/floor/alienplating/external, -/area/submap/DerelictEngine) +/mob/living/simple_mob/mechanical/hivebot/swarm{ + loot_list = list(/obj/item/prop/alien/junk = 20) + }, +/turf/template_noop, +/area/template_noop) "wd" = ( /obj/machinery/porta_turret/alien/destroyed, /turf/simulated/shuttle/floor/alienplating/external, @@ -2069,7 +2074,9 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 4 }, -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid{ + loot_list = list(/obj/item/prop/alien/junk = 20) + }, /turf/simulated/floor/tiled/techfloor{ temperature = 243.15; oxygen = 20.7263; @@ -2309,17 +2316,6 @@ nitrogen = 93.7835 }, /area/submap/DerelictEngine) -"Bo" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/item/gun/energy/sniperrifle, -/turf/simulated/shuttle/floor/alien{ - nitrogen = 93.7835; - oxygen = 20.7263; - temperature = 243.15 - }, -/area/submap/DerelictEngine) "Bs" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -2502,7 +2498,9 @@ }, /area/submap/DerelictEngine) "Ee" = ( -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline{ + loot_list = list(/obj/item/prop/alien/junk = 20) + }, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -2577,9 +2575,6 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/prop/alien/junk, -/obj/item/prop/alien/junk, -/obj/item/surgical/bone_clamp/alien, /obj/item/surgical/hemostat/alien, /obj/item/surgical/scalpel/alien, /turf/simulated/shuttle/floor/alienplating/external, @@ -2681,8 +2676,6 @@ /area/submap/DerelictEngine) "FS" = ( /obj/structure/closet/alien, -/obj/item/prop/alien/junk, -/obj/item/prop/alien/junk, /obj/item/shield_projector/line, /turf/simulated/floor/tiled/techfloor{ temperature = 243.15; @@ -3049,7 +3042,6 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 4 }, -/obj/item/prop/alien/junk, /turf/simulated/floor/tiled/techfloor{ temperature = 243.15; oxygen = 20.7263; @@ -3273,7 +3265,9 @@ /turf/simulated/shuttle/floor/alienplating/external, /area/submap/DerelictEngine) "Nr" = ( -/mob/living/simple_mob/mechanical/hivebot/swarm, +/mob/living/simple_mob/mechanical/hivebot/swarm{ + loot_list = list(/obj/item/prop/alien/junk = 20) + }, /turf/simulated/floor/outdoors/dirt/sif/planetuse, /area/template_noop) "Ns" = ( @@ -3343,7 +3337,9 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid{ + loot_list = list(/obj/item/prop/alien/junk = 20) + }, /obj/effect/decal/remains/xeno, /turf/simulated/floor/tiled/techfloor{ temperature = 243.15; @@ -3374,7 +3370,9 @@ d2 = 8; icon_state = "4-8" }, -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser{ + loot_list = list(/obj/item/prop/alien/junk = 20) + }, /turf/simulated/floor/plating{ oxygen = 20.7263; temperature = 243.15; @@ -3611,7 +3609,9 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/mob/living/simple_mob/mechanical/hivebot/tank/armored/anti_bullet, +/mob/living/simple_mob/mechanical/hivebot/tank/armored/anti_bullet{ + loot_list = list(/obj/item/prop/alien/junk = 20) + }, /turf/simulated/floor/tiled/techfloor{ temperature = 243.15; oxygen = 20.7263; @@ -3699,7 +3699,9 @@ /area/template_noop) "SJ" = ( /obj/effect/decal/cleanable/generic, -/mob/living/simple_mob/mechanical/hivebot/precusor/laser, +/mob/living/simple_mob/mechanical/hivebot/precusor/laser{ + loot_list = list(/obj/item/prop/alien/junk = 20, /obj/item/prop/alien/junk = 20, /obj/item/storage/belt/utility/alien = 50) + }, /turf/simulated/floor/plating{ oxygen = 20.7263; temperature = 243.15; @@ -3727,10 +3729,12 @@ }, /area/submap/DerelictEngine) "SV" = ( -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid, /obj/effect/floor_decal/techfloor{ dir = 4 }, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid{ + loot_list = list(/obj/item/prop/alien/junk = 20) + }, /turf/simulated/shuttle/floor/alienplating/external, /area/submap/DerelictEngine) "SW" = ( @@ -3855,7 +3859,9 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/radiation, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp{ + loot_list = list(/obj/item/prop/alien/junk = 20, /obj/item/prop/alien/junk = 20) + }, /turf/simulated/shuttle/floor/alienplating/external, /area/submap/DerelictEngine) "Um" = ( @@ -4125,9 +4131,12 @@ }, /area/submap/DerelictEngine) "Xm" = ( -/obj/structure/table/alien/blue, -/obj/item/prop/alien/junk, -/obj/item/prop/alien/junk, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline{ + loot_list = list(/obj/item/prop/alien/junk = 20) + }, /turf/simulated/shuttle/floor/alienplating/external, /area/submap/DerelictEngine) "Xp" = ( @@ -4358,7 +4367,7 @@ SF SF SF -ap +vU SF SF Qv @@ -4502,7 +4511,7 @@ SF SF "} (4,1,1) = {" -ap +vU SF fJ jl @@ -4760,7 +4769,7 @@ dG Vb Vb Ue -Bo +iW Vb HH sG @@ -5147,7 +5156,7 @@ je je BR je -Xm +fn fO SB Ga @@ -5245,7 +5254,7 @@ jO je BR je -vU +fn fO SB lV @@ -5395,7 +5404,7 @@ mI CV fO DA -Ee +Xm by wh xR @@ -5622,7 +5631,7 @@ Qv SF SF SF -ap +vU SF SF SF @@ -5779,7 +5788,7 @@ SF SF SF SF -ap +vU SF SF SF @@ -5814,7 +5823,7 @@ SF SF SF SF -ap +vU SF Qv KU @@ -5903,7 +5912,7 @@ KU KU KU SF -ap +vU KU SF SF @@ -5929,7 +5938,7 @@ SF SF SF SF -ap +vU SF SF SF diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbase.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbase.dmm index 6e13170da6..d586734908 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbase.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbase.dmm @@ -131,14 +131,6 @@ "hp" = ( /turf/template_noop, /area/template_noop) -"hA" = ( -/obj/structure/table/woodentable, -/obj/item/stolenpackage, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/submap/DogBase) "hZ" = ( /obj/machinery/power/smes/buildable/point_of_interest, /obj/structure/cable/green{ @@ -427,7 +419,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/human, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/outdoors/dirt, /area/submap/DogBase) "yl" = ( @@ -435,7 +427,7 @@ /obj/effect/decal/remains/deer, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/outdoors/dirt, /area/submap/DogBase) "yx" = ( @@ -462,7 +454,6 @@ "AY" = ( /obj/structure/closet/secure_closet/guncabinet, /obj/random/projectile, -/obj/random/projectile, /obj/effect/floor_decal/corner/red/border{ dir = 1 }, @@ -483,7 +474,7 @@ /area/submap/DogBase) "BB" = ( /obj/structure/table/woodentable, -/obj/random/cash/big, +/obj/random/cash, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "BY" = ( @@ -508,7 +499,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/item/bone, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/outdoors/dirt, /area/submap/DogBase) "Dt" = ( @@ -558,7 +549,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/random/cash/huge, +/obj/random/cash, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "Gf" = ( @@ -578,9 +569,6 @@ /area/submap/DogBase) "GJ" = ( /obj/structure/closet/secure_closet/guncabinet, -/obj/random/projectile, -/obj/random/projectile, -/obj/effect/landmark/loot_spawn, /obj/effect/floor_decal/corner/red/border{ dir = 1 }, @@ -596,7 +584,7 @@ /area/submap/DogBase) "HM" = ( /obj/structure/table/woodentable, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "Iz" = ( @@ -644,13 +632,6 @@ /mob/living/simple_mob/mechanical/viscerator/mercenary, /turf/simulated/floor/plating, /area/submap/DogBase) -"Lm" = ( -/obj/effect/landmark/loot_spawn, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/turf/simulated/floor/tiled/dark, -/area/submap/DogBase) "LJ" = ( /obj/effect/decal/remains/tajaran, /turf/template_noop, @@ -767,12 +748,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/outdoors/dirt, /area/template_noop) -"Rz" = ( -/obj/structure/table/woodentable, -/obj/item/radio/phone, -/obj/random/contraband/nofail, -/turf/simulated/floor/tiled/dark, -/area/submap/DogBase) "RW" = ( /obj/machinery/light{ dir = 8 @@ -850,7 +825,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, -/obj/random/cash/huge, +/obj/random/cash, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "Xz" = ( @@ -1308,7 +1283,7 @@ OS Bk Yr HF -Rz +Ok wI Wq Ni @@ -1329,7 +1304,7 @@ hp Hl Hl Bk -hA +lm Wq Iz lX @@ -1393,7 +1368,7 @@ hp Hl Hl Bk -hA +lm Wq BB lX @@ -1436,7 +1411,7 @@ OS Bk Yr VG -HM +Iz wI lb hl @@ -1498,7 +1473,7 @@ ab tz qg Bk -Lm +ec se se se diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm index 7afcc8bc59..e5abd73d38 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm @@ -26,7 +26,7 @@ /obj/effect/decal/remains/deer, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/outdoors/dirt/sif/planetuse, /area/submap/DogBase) "bF" = ( @@ -191,7 +191,6 @@ /obj/effect/decal/remains/deer, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/random/maintenance/medical, /turf/simulated/floor/outdoors/dirt/sif/planetuse, /area/submap/DogBase) "ja" = ( @@ -230,9 +229,6 @@ /area/submap/DogBase) "lt" = ( /obj/structure/closet/secure_closet/guncabinet, -/obj/random/projectile, -/obj/random/projectile, -/obj/effect/landmark/loot_spawn, /obj/effect/floor_decal/corner/red/border{ dir = 1; icon_state = "bordercolor" @@ -300,13 +296,6 @@ }, /turf/simulated/floor/plating, /area/submap/DogBase) -"pg" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/landmark/loot_spawn, -/turf/simulated/floor/tiled/dark, -/area/submap/DogBase) "pT" = ( /obj/machinery/light{ dir = 1 @@ -345,7 +334,6 @@ "sm" = ( /obj/structure/closet/secure_closet/guncabinet, /obj/random/projectile, -/obj/random/projectile, /obj/effect/floor_decal/corner/red/border{ dir = 1; icon_state = "bordercolor" @@ -479,14 +467,6 @@ }, /turf/simulated/floor, /area/submap/DogBase) -"CX" = ( -/obj/structure/table/woodentable, -/obj/item/stolenpackage, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/submap/DogBase) "Dz" = ( /obj/effect/floor_decal/corner/red/border{ dir = 1; @@ -614,7 +594,7 @@ /area/submap/DogBase) "KH" = ( /obj/structure/table/woodentable, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "KW" = ( @@ -631,18 +611,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/outdoors/dirt/sif/planetuse, /area/submap/DogBase) -"LV" = ( -/obj/structure/table/woodentable, -/obj/item/radio/phone, -/obj/random/contraband/nofail, -/turf/simulated/floor/tiled/dark, -/area/submap/DogBase) "MF" = ( /obj/structure/dogbed, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/item/bone, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/outdoors/dirt/sif/planetuse, /area/submap/DogBase) "MW" = ( @@ -701,7 +675,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/human, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/outdoors/dirt/sif/planetuse, /area/submap/DogBase) "Qj" = ( @@ -816,7 +790,7 @@ dir = 1; icon_state = "bordercolor" }, -/obj/random/cash/huge, +/obj/random/cash, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "UM" = ( @@ -828,7 +802,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/random/cash/huge, +/obj/random/cash, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "Vi" = ( @@ -880,7 +854,7 @@ /area/template_noop) "YI" = ( /obj/structure/table/woodentable, -/obj/random/cash/big, +/obj/random/cash, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "YK" = ( @@ -1247,7 +1221,7 @@ dn dp Vi tE -pg +to JD JD ky @@ -1313,7 +1287,7 @@ XA tE fP kl -LV +Zn RO ja ao @@ -1334,7 +1308,7 @@ Ge gW gW tE -CX +NA ja bb Sc @@ -1398,7 +1372,7 @@ Ge gW gW tE -CX +NA ja YI Sc diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/frostoasis.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/frostoasis.dmm index db3e778adf..49f78b3879 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/frostoasis.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/frostoasis.dmm @@ -207,7 +207,6 @@ "EW" = ( /obj/structure/table/standard, /obj/item/gift, -/obj/item/gun/energy/temperature, /turf/simulated/floor/wood/broken, /area/submap/FrostOasis) "Fl" = ( diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/lonewolf.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/lonewolf.dmm index 2d4a47854b..ba59dd9304 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/lonewolf.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/lonewolf.dmm @@ -8,7 +8,7 @@ /area/submap/lonewolf) "f" = ( /obj/effect/decal/remains/ribcage, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/outdoors/dirt, /area/submap/lonewolf) "g" = ( @@ -17,7 +17,7 @@ /area/submap/lonewolf) "j" = ( /obj/effect/decal/remains/tajaran, -/obj/random/contraband/nofail, +/obj/random/contraband, /turf/simulated/floor/outdoors/dirt, /area/submap/lonewolf) "l" = ( diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/spider1.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/spider1.dmm index 7e3036c058..873a176818 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/spider1.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/spider1.dmm @@ -14,7 +14,9 @@ /turf/template_noop, /area/submap/spider1) "e" = ( -/obj/effect/spider/eggcluster/small/frost, +/obj/effect/spider/eggcluster/small/frost{ + faction = "awaymission" + }, /turf/template_noop, /area/submap/spider1) "f" = ( diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/wolfden.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/wolfden.dmm index 7874c7b5df..9fcb0f18a6 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/wolfden.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/wolfden.dmm @@ -121,13 +121,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/outdoors/dirt, /area/submap/WolfDen) -"A" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/maintenance/security, -/turf/simulated/floor/outdoors/dirt{ - outdoors = 0 - }, -/area/submap/WolfDen) "C" = ( /obj/random/trash_pile, /turf/simulated/floor/outdoors/dirt, @@ -175,7 +168,6 @@ }, /area/submap/WolfDen) "O" = ( -/obj/random/gun/random, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -257,7 +249,7 @@ o o d O -X +O o o o @@ -278,7 +270,7 @@ o Z o v -A +I w e J diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/xenohive.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/xenohive.dmm index de19fc49a6..521898ccf8 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/xenohive.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/xenohive.dmm @@ -14,11 +14,7 @@ "bq" = ( /obj/structure/closet/secure_closet/egg/xenomorph, /obj/effect/alien/weeds, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/obj/random/maintenance/engineering, /obj/random/plushie, -/obj/item/organ/internal/augment/armmounted, /obj/item/organ/internal/intestine, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 @@ -128,8 +124,10 @@ /turf/simulated/floor/tiled/steel_dirty, /area/submap/XenoHive) "jY" = ( -/mob/living/simple_mob/animal/space/alien/queen/empress, /obj/effect/alien/weeds, +/mob/living/simple_mob/animal/space/alien/queen/empress{ + loot_list = list(/obj/item/storage/backpack/holding = 20) + }, /turf/simulated/floor, /area/submap/XenoHive) "kl" = ( @@ -401,7 +399,6 @@ /obj/structure/table, /obj/effect/alien/weeds, /obj/effect/decal/cleanable/dirt, -/obj/item/storage/backpack/holding, /turf/simulated/floor, /area/submap/XenoHive) "Ir" = ( @@ -495,7 +492,6 @@ "QC" = ( /obj/structure/closet/secure_closet/egg/xenomorph, /obj/effect/alien/weeds, -/obj/item/stolenpackage, /obj/item/organ/internal/fruitgland, /obj/item/organ/internal/intestine/xeno, /turf/simulated/floor/outdoors/rocks{ diff --git a/modular_chomp/sound/items/salvage/salvagedrop.ogg b/modular_chomp/sound/items/salvage/salvagedrop.ogg new file mode 100644 index 0000000000000000000000000000000000000000..1a018cf3777d996887a1cadbd55edea83e93ea4a GIT binary patch literal 30360 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 literal 0 HcmV?d00001 diff --git a/modular_chomp/sound/items/salvage/salvagepickup.ogg b/modular_chomp/sound/items/salvage/salvagepickup.ogg new file mode 100644 index 0000000000000000000000000000000000000000..0e9a3d0ea92e3c61b87b43edb3facdb315c2be76 GIT binary patch literal 18174 zcmafaWmp_bv+(TV5*&gDcM{y)HR$5*P6+MR>E5Glyb@x6()^B)9AqTVE$3_0!mddcC+B*dCkrBnw5p+4?7w3WA0$; zXlDLi5K1(K5?R?f{!q#6tWEwA1i}6DO(7<(0Rlt-fXW%4L8{OhFBpSROqpPlSZvJp zh(JsMGmw}~L3fziIi9>AS1eqY?!!bp1o$HmChCC`94U%O9!xE$l^8@T2!+CVp*ZV5 zI1I7>+$4Fepj1&rlHg4i9@L<1o*Uv|NnR}sC~l7|7+vgZMo!Zg|+~m z_bX2DuxJTkFas~*t6(w?Gh84Z0CMx_BJ=2wF$imsfdK%(5K+PDcOo84AReqCMnQa` z4F??v01?V36Imb=yCsuIrJYFqx9mieF%8%LEo^_qWdJ}~1y#}s2jQ=r82}*W@(U~`_&-=bY2BJ>lKW2&&i6v8`-S zm7_0ARz?16KQgH8#o!6d;#K}=HVLOM&U}x|Q1XvC$^Hxt04V(?p2Q^ipK?Y#j!CV8 z1ue|eY@E|-k`Pz(`4m^}CSTo!5dCZ4RcN_!HP%Wo*Zx1{pRPk^IT_U1|LF*QAHMSl z?;ce$#(%mA9Z=vMj`UxDldYwapQ0L_Vp2NiP{I~e!I7NifK1}*t8m+^aG6hY>Z@_- zLp1C)Q|xscU6)hMm#=--|5wpR_}fJ+0N_icq)()vPu%2*rIHn~8ejlK;Q!3X$e(nv zn>>kBvWe8ziI$!zCFvRa>Ddfre^~&GKP-Q)$Rdx(Qjf?IkJ!ENM62|alF|&up`xRf zs>AdZUE{Z>k@xwrILKlG(5%ePah|-1)&Djbopn| z_;&yR0Cn&S&hR9$A{OoT8bj1!F-&RpP)qHVYV$xL-^3nWHl^@OZ-OV+dpd$7VH{W#^ef?BdeJu;!>yT+zSN)IX>zd}; z*XH{DbFS;x3e$~>^Ruqg5ZCoN*X?xs0rpc)ZrjdZEw0PR9j7nD&6sgNq?EEr9&~zb#;$Oe1kibW4hiRs&Car-!Rp6)#|WC zSskLUX})+3(Y*47He%z-cO4%xe+@Nx=xj=s@wIQ^3Cc%EV+gbbyJ`0NT7H{*4;^eS zuDVd!nvsqwfmSD%P$B4?hbIOAumT-SNN5Ej@Dmom56%=<5Dmu(f-VL0!SSj+_`xH* z^aReTV)UgUs;W`=LGipa)Xs0^=sp)J%gKKZo)e?52~pLttDMcyiQ){N(xEGCP?n1- zEhN;n<&=sR9mq^dTxr*hiAl@~Uss@i^ZR)wlEN0VcKs*;mq zg|-T+3QbH7s!B}`+A0%9`dKYGn;NJpdDb~))hH-IUXB&2%Asa^PSlFI0Lzq)x)0B^ zs z?JM7D^}m?L5JL`#CKQumzOJSJho{k17hhxc55``XJ5+bxb@e*Ln3u1~;jrcO{@WRU zKLGrKMF4WaL>kgO^n@r(e_I6&+@NDCDnlNG0o_UqF;wNCYa{+UXjsDX85M`H77GZ6 z`YK`qbc>8h{v&Ik&CD(%8AOnZ;Y zheXdA%?tlIIT>mx<7igI!h#tc`H#*RaLD;D`Dx zo^1v10YPah=k7`n#0u5A`PF3|kIOtIQ%a^Pw3k^Yu zd7!R}FG@=Q!86WBdPy4a*MCI-0H;SoEh0;Fgw?W?9Feu8R7{ROlvR9)tcYF>nLLEt zIg%XwxmQEJ7rL=yzygR+6R?OVv%mnTXc$5WqO>CK>Y>rCm|3U{2NP@f>PF%gI18m+`2m}ir;70Bg#v(%KJ*o) z9}WX^l2|IV4_-Q~A3+8h4MVR1pbG)$A_q%IaD*j%uIZlKI0IopgOqEAFg_VsiQQ&KW8_774~kdaeTP`+Ur9HgS6p{9Dn$iT$H$UsHO$jn3umF|U7 zq1EKJ<5%^0-|ybwoW=kQ+d&Ie*O4A9#|AqRn3W5qe{)5 z&Pfep8b5Y2`8++C8)Es9>}RRVsBWbyc*H+A1uUgOzI*j0Ri^d1WXWtB8Ty+oT{sC} zYU1D8Rt?q4*_KB2@yOL%p!NeJQcAJBCqN(|g2Yo_;PR~u^NLzmed&tYP|)Pe?=gkX z5~%2_Nfhm*9kVrp1x{9{z~YD67p`Tnk@KWRPFp^Onx>31QvULr-%mpUY@jQs_0lNS|{UffZdc(}z2gO|P$uU|uoN(`(xqA{8!>gmd zFJ8fZ=Td=lKv%-mo68pNOy)^z!g!i))*tVF8-3mbfRUcQ;w~R_5i(!`u*<_$OZ`WH;H_Qh^FUI0IwrB5mzqecP<6z2x7~MV#h# ze8huaN)HvAWkqm-ck1#pp&WhbhQcvls@EBuMh&PhV|Jf;ik3DDpAm>9m&blx7ex>R z<3=>p1+}J~^PCDF=Di|Hcuk@w|ia%79zd;)UUVAU5&aSt1 zNq2~qED0$pTR!&;PPV54%LAqCi+C@HRhHNe72mobkHB#NWR*FeUKi0s$x4ES7i>bL zN2fI#rDL5xxA^DSs?rIl>3qASp<%}=1p-zjt!+r_hbyz3pT+s*9pYjq>av+Ba_W41 z>>9U8%pe^>JDtL>z=U_gWDbV)oaaiNhYZll;k|E^iMdb)ZpF*^!vr7ZysPXXf9 zciFKXl)DRj&6S1$!rvg=GiPT!{`6`5_;^~qc{i2Tp+q%vx63}ZWA_teHs6If;&(Dr zp$drDw0bUF_5}5{9O(D#U=i|LF1hk-oIgB_R=M|g@4}dAZdq{OOTxYb0VXMR%W9{c zO~t;aQ+x3!pSx1I5YIn$G?jMpKR?$s!~(&_Tlh_{#!iBRjL?99L0MayPsy`sc*Vu- zYqrx?OJV&NOz(rv9(BX+Dj|T2v47B_-=@rR0f@u3DD$js>*da}t*_eQV|yXDmyBZF z?&RF}WLIolAk#RwU{+{FO0E!y_Lmtwl+`;{?HDSma))KKXq=HrqN#<~9UkP3Tr36q znC8_T=R|TU!vPCTEzK>fBhUMdONOzU#i`;iU+54WR`Jb$UYzD$sw|>2Gw(?CKo>y; z%s^Czogc@Pdw;f-X9$wNs}dId^n#Yy(m;a;&c`^<+RC3_n+zTpqgCbG{DRr(PJO=h z<)^-|cLdS##T6clouyKd6FM0R-~puaul5ackXPF?Jb!D_(Y)7orttV!T)8rQINy#- zA0v$m_?Rlmt(_?81~mWyLYJ#7?;rg9G47+^Xj|RPEb-s3uU3zp6`h~kzVx?4^)XH+ z=!}@A6ilQ6CMpQrdlkw%eRo9f6a1>)pG?$(^~d8=b`?Fz#eEDdrY^3pH4|lBW;iu~ zu4H-JZo#$uEb&T}n|0HZO!n)6RbsDg!M)UVM8HhnTu?F?+uK z#-qa)_j%xafqky!vhF3#k>(4O^zzG{Pu~L8v5GY7wNk8!X)X(onkw$QhF`Bw%PLiaZ$haaGs35-u{3MwllVu zxPbWz1fYCzve%!_<(dvP=;l?uE7!Rm=JCFAXr<)*M)Sbu)q%$EVn`x$U0ejC0R)V3 zrnThA_y!KhmtHwOtLAgbAiRYey0}Jj(HBHl$Vn#^Q2}yg*UoL~vOfu%v=i1ZmMGLF zzUSLN-BbaY>BfwZJxYVb{N!kUIwYPHEeq0E8hA;5fpLKOa zNC6MSm&ZCxjtiXwCr!srq8$BFh*v>iJx#@%#r48~MMXM*>_IRigmTRDb+3OGn|o-O zVZ!{{Qa9$Dn_$Yg+v8n4hy$_?Ui8fr&qD@&_}g$a^~rniay1?~l9tS7+bPtp>0Wv% z&Dd6s=Qy&u7;m0DJYk061O_kzM)g~E%y`|tjJ0eQgICDQyW&4GU-lMfPxyzmwLc+omF8|)u-jB9cO12lG}l+A_DVmYrh`9W3yv`fpAMQ1f-*vHfO!rygxN# zO0zf`G{x5Vzyk7y6dI4blp?Tzj7eM(i_TYGUaW)38E8C2yERii05=a1OG6Z1>?uhF z1b_iQXHI^Ktxoajty&4wHo?%0`)2~9w*J?Ef}+R6kza)b9uU7(mmAXAnUeRTO`o`~ zF)nG8gWlP-+WQDoqoCd99#=t;EMaXqEEoq-73fkm#7gPxV~cs+x}lYiRjOE)?RIPP zgzn{Csr{yy7!Xj}GL3(H{1}aICmonMaLfw=a&RB@uCyx|UbsC|>=P^Id%1@j>(68L z-UoMoCsF}8l)l8xoVX$8!U6RhtTCIue$Hx+m#syo4I}oi?B2ScWS*j5I*+QI;}dHl z=V4RBFDw9sK)?Y^C;=aLt-OAQv36ml;ApY)%DMBTGs*80CHATnulqQVJyi9~O)MA@ z1n40#ofsrT3QIkFADEluAgYgW75ZwR6IM6|ZUN~i?PjGSNZSP8!OdryoXq*w^l^uJ*;h`)&_EURu4;A%KXyz|Z~mc)J{C$oX_J*gjp)?_NL} z5uiT-DZ|%k^?7VDe~f;zIO3aW34V1~E`a ziF`+2crVpiQzyp2HcBv8ib%Tl>i|g0Cxg*9;e%C;Vp1W`115g+-A1g}e68F9*x7NHG8^?g>U|HJuTKWDo zQl`P2jqK4yKa7~bWXZ$Z>zaN_fl?CBB6%^|GIVIrX1-2&n5~l3-b^)zpt1?(2QF;Q zw{=C`ES|Y`TOtV`^!pS>&eQ4XNA{|Hq|1m6cIi9+ITxdEFFiG}gqx~68}$hl}aQtQ>)F6cq{sv=vX=DUy@WDDGbKhdkc-Ieh{PO!h%Iw4V97KfnV4r*~f*S$1b7iaN|2Wq9c2 zP&(i$m+aXUW;2}o?{fG9Fo7?;3k&T<@jqH2X5DiwC%-|2Wt8&c}VF9|(#$6_D5!`x?Hg9hcUgdd0`zg|q;Bl9;om=J)|fD^ZMYME*un~^;c~$|YMfiC zCIVf}Cpq_7&)!`L?%sCezJ->!C)cf-&la19qNIwgfSvwwS@5wM0ZJJVka^NmckwLA zr6JDgqC2gne5Io_mwomAF?l@)b)5Yigch_=4EL0v9?NcN?UWI;wP&OT1%!i?6_i`{^A(9mp0TbVah*di!$gjFYL(~8+g*`t)g}UP~Q3S9eQoC4#Cum2aD#JS?rZ0lVhB= zC@qI7GNk7mn=Un?+Mc>+%Vs*Ylm$m;t#(D%iB!$z+?`1URUE`bsl%`bW(V~F4pBi> zX2|K9mSI)ud_jVJuYs!Ta=Iq&@-Tv7t^h^DP}1uXaIMU!BBy0+D!T<($ROYf(5oB7#K<(G-SOE$9%kYF@0m~p%xuo<2RV%yPQGA+#&Wq<^S!P?z zB>9~23cp-U-2B7G89X+uw=ZI@W4eN^YDGEJ8+(l}_~C>xR?0?@=`QvStq5r9(z-{^ z5InSxE(b}d9BalpNV}|&hpW}fBIroPBYB;WzcIt2$|YtBmncXn4-%{l;+Yv0|!a~)8~0y z9Ch62>R!&rxSb#~{rOET>Wi!O^fWR)(s$E!oTJ;={Cz=@{7BDxDKBzc$ZgKXbGi0N zq9Ea-oY?h+G0eZ3 zn2)NaN^g8NGO=&t_b#zg(0o|a-e>;R;H=to2^(y?RlUU5@ndP|tjSU)lB!G2qSDIv zmC+iUGT=ur`h(*YgJ{C2+3m~8EAgV$nD1qAUTWYWtF~ljt1_c~r;cocXq9wAA6`Et zQ|fiEx^CPe74)2G%%7Yz*{uush)A!IAingqwc)K8_+N}Zo?ecuRGxVDfEV8tY`Ya$ zwpQod(CrECIGgJ4^9PzQV91fY)+s|L5{I(_b^CP>cRWrXQ7Z?x542q#eBfu^jwPAj zZ@lmwf8nju1aIog-c=tQIsb5*h^ZxAjCMp8S@xN2V}CIIgm5N}E&#~huh$+_mXnBJ zxACyN4o^y~3{kL2Uk#Z0ex#gi3bSxDIKk_EEL4Ofi@MG-%zxT0d(rVx%iFhZ2+4L3 zZB62Po(?Zd;agvA1;^465=iasto1f(zfolqx&p$|=yOCDTmS2F<&<>3{H~yIMR8^P zhP&p{*|Vdxs@Y%-Y-yM#O0-0{Pw2Q{?AGarEwhwF&T1Wui`3x-=HuGAIVQz1kY8Lt z9!XHc*Rc}!noO(IaZZmH?}%UAD>w=x0{|Y<=yc83HJm1@j8gJfv+Kp`Ic?4<=V>Fj z-{C7liC4`E(5x{=HhIhoL{lk`Wd*ZT?gZ*9haC$I70*ucUuILoUb&Wv>qkV}6ttg_ z5_4A>HA!%Gm00W(5ldUL+0I%`mV76Vp1`MiDjp9%vKf_2;MI!yl0QPOcUHiTBecX0 ziFky2XKyS?_p_dxG~Hc87iDej)bgddsktA-FfZ&!-jt6Gf&ao|_H4p$<;Il(fCD^e)-YwSRj0x>V^=NvW5{yQN7WT^ znWXJ%4w^o;qsRe(^^*pVbHzu@k(?!c+$t8xgE~(q9IB|cBHdl_v;hkkaE_7R^LJL) zb)lx)6(JWA(HE$ra(E3Z4`E;%Jn9iDiyCLkTb2p%YbU+^+dtFGRZ zn8#gTaBS1ZU-`rd79xlVv#19PjISh~Sih}@#;78R2V;DP$I`-fYZmsRO}ybD=w}IO zgzy~mtYf;DpAPim!N8K~HAg$U)fd0mV)evbB5&|X;MXf`QO~?_XLOLny77pp;8l=E zpb-pEEbYta^Y+S_7r~kHHHTMiiEDdp`dWyrFC-d7H7YfUw5n?-3+pU8js$#}EXdbw zLaJU4ZXFHFvm~t(dBe^4T(>O4EFISCumz@)^=j-oIo{Fx^IBb9>{JkxA9K2Gnx#xn zO7Qc%Xai(h{+`6^B77B~k~N3lyn6bkzyJsMoFRsx*9oU7m9K43sx5acZ)J86l{syC zFL*^e^uXTDqw=m+2UDQr;n-N6GL=0KbiRLT6P_o=W;P_jBmfQ^#6lVt;JVdOcdLJg zI5uvt`cgfgF8j#Jooj5HPjt9g7cW`AT?;HuZV!67w%?*YU%k6*_?_1#?KY-IQA=y) zPFyP~MXN74#P&l4>kG5NWZ#0l30a53yYIP5aqTc$0+=q5Ek@rf_s6Wf$=c%eX7O|H z?cA$%`eka}mQE*j>JyIx=+bGJ&t$PRpI&p_hS^moaGRM{VSOpb?WsT6%EI4+reD`^!H}H~N`x>7X|CAl=++S{X9G zvFClzVWXG(86~3V2A-UP=6;ixw?`qaSrxS=h%x(0S6&S3xB!E1zW0S?VS}Pe)Hk^a z(KI~TTKLP;x5>Wtbo)L{@O4s5H`D$@|9dGHs+VOS*29j z?Du~Suc1?Hc=4+0Ot>tX%}$d6pO-r!--R+9try#Z?C|A0CIAS1RYx>@1HlCeKE&Q!EM~gnhbbE5M4CW zvVe2yc_UzuIsQ&YYABTcD^sef-@esgOutvvUQE{ugWA>>`N1b-eRExY9TXMsP%pSe z7L3*q)Ka|rgptniF8d$M5`Yx}h#ghSfh_G8vVcZ}x`T@9uR4O4EKfN2*hp=c?~5_R z;YS1-3EIrThbsT87Z&X?O ziM?-NEM!v)qd;&sa)A(!{wD_xcHpn(ZMre?_=cw=`mI?^I97*L+r$+~LcJGLD_eP* zxyfSlJy*CuiiJ9lto;-iymIWw>!3-`mlZeYyc{=@fJIivGcGR+Hh;f!vv{3y(bn?X zX*?n5tk8kXq)#^~NT{At`LK2#iEEnM*G8@bbx3C-Yu$cs4a}%5yz#Hrdg;3h;y#{p zrqj6rAC7Ij3eF=sr^v2+)8S+{p$Qe| zhuh*4f$5xA{j;rC)o==5-suhChIRdv#=w4^t1xT?!qLXa6py& zO=yCU?Ed1H9{(OB5(*40yd^r|h>w_JaasvI01@!%IjuOpMWCJeC0(GYzO-}L=QL(G z!`FZ~@$M(L5$wB&`|OS1s`@(H>U_DI{LpuzZ;dA7NJo4SRP~WVIOv%eRn157)j;*E z2!{~`4DXBE=qkAfBI-)0Q>WQj)%X(Pb|C_L?b%EN=?*a;C1{7fl8JC6I#eGcgC6+w zq$G1RYRJGq&+T}Te#qYBCEDcoETu1q7Gh-3){O#Sd;*g5C$`J_m@T$xE=ruC&>Y|NC=&DNgo`M7j;61x);1trGC+d$O z^rC&rcc87C7jn3Ya})&jeGoEIR?KWeR9-2|IVN1)HYw$F-k%g0zU}blTwPd%9|p|u z#_kSQ)ZUpaam&@d8t=yXuFJj(IeIW6BQK1v!0 zT+_RG9?*de@A3uDS&U%BrfVXITUw}Ild*(~G`MLi`5!BX|U{p|%x)HRZ= zMyNTu5K{ICnV~b+C#zMoE8H5R>7Sumv)8l9IR5O) z)#j@R^zdo3jHUTS?V){u1ApCJw_kie*7Tv9Oa18P60h~l(Bz;I*y5`pnzp`E+=kB$ zNakwdT5upCmF{B6x|1nc!Y8?UW4HPZ+{Tx-+G8XPPz1nA_2wFJ_zoVz|9b4J0t8dSP)F~+A0T;@2y0AQ##o0YJ6xc)sOw}=_8#{H;)&)m; zqxm9lS%>xtef*dP+GqQXJ2$RxE4 z>mcJeIABZQ&c@@;uV=0c9%a1pyuz(y)<=uaVw_rYW}qy2Ljiqigef&KhV~) znEK&s>nmrVKcO@Vc3*2CW2vy=9hLYABlG(Ql^osaVDqhtw{s7E>sq*(gus?iNlyW{ zr!5hc5!{cQ9otwkPD2ytS4$yA=3DC3)dx{^F~jG)aq9vixLbT}GLJ%|aO$8m!}vJH zQ`(626K<)ubHbtr&W`W){Z%Q=Qp9gP!%YxZxYEp5YR84fL7*1^)A&+R@kJlZG9~FR zrX+b~Vf_@w>TB>8A1ik6$%!*4fC_lmH!?OLpFdL-s;}Tk0zaH@9m^WI0h$qr2>LN5 z#EK`10%-X!YKm1Q78146!+NOQa;}H5_Z1S`|z>+5R~z@1PuIiYTTl`t+N?m z#cKR&q+Rm(NK`d<>8Nsbw^_&yQgvGi$T^ES4KK1|VwPq$W` zr9-lNJ)cu=>)*aB{Aj+N^ZYXN;`YMN$H!-d3^Z0%+NfC;=Fe|DXHz>Bs8?jso|Pq@ zR$4JVc1HkTSlK&^w})7k(`bdWo|NiNGd&_;f_T_zFN}2TdS{1JJ~*^@bWwGT&-F9X z`;2HVi8sA!W7^xDP@R2ibj#(uq%I>WOs|HFFx9i02m2t6TC0Iid~!7nP#eS zdvX$!WJ<0-h!JK4AYy?>=*~2VV67(=nwhPwlb^XHI6VVnDADnY9yma~Km(*kT1ycR zi4df)>|+pTO0U!za~W<+iAd><>(1JMiajD=4hQ>v$Qwim8ab@>*7|ZNe7F?AG4xim zX^_7)sK5|BBV=wXbk*k*T=WtQ^EEX0Dr8l6s`X>*YA7vHi^ohMo(mzi;}!kcr9L;fQZD_DW}|hdp~CEGuKB(G_O!%s=1$p7)S8CSEtZ)&x*yYqPb>m%2n(}Pjmj?&rNp*4i84W)mu(Mac zJURsrMX_Jb7xHz8zn9VA6=&}~VzVn+a~&M4>`6b|929$;5G*>chc{1aWVsCtyLL+W z`ZerZQ=3%M3a#~oh2@sOiRZbl%LS~Ed(T&Mc5EahgE! z`&>e+f~+!ieNf5CyYjbKkC%AccaY5W&locaMRyU~8U`QV`k`}a_iuHBPm+;04_tU! zr5f!OslGzZ?dj=zZ)hsihdH+Oi?5O^<9JwAM&8dPuYN_ZA`Z60^P~iS>0rV-(HX0X;xQe z>V2R#A@goDdSqxYnH*3f(7u6Q6d%H$&fDl9mA0mBf5nbfO95&VIZ-1k8&^oxk^qd% zrVT8GZcAqcZv3R@ucqC6%=cZpGO@^8syLi(K4oWvfVUfu!$Vzk7%p zp3Sm{xv}PpT`k_V2$F^XT z)%7TUc2WRz8MWu;=mcX4hQ^Ef8Nel~;3BfSWpI1vIp5!s{|*f|-rP zQ)+&tTJCO|u?3ZD!Rim;iB!(eA!MLUNpMLu^ESN7eKs>R68jJ}ve+&h!oWJ-&f`ds zZ|hZWXHle60NgeaE?jN-E#Yzz6h3D+f=#W4K1{uORh|? zCL=4!dVxf8K?d#|(DY&~q^`$fLOscM%F88|zzjkDOL`PlM&u1 zXCJS!`-)wnMFg*_FDwlQ>(42E227^1X#wsg%W4b*qnlzzBpBLXO+LW+KUPl2iZqWr z`QN?psIv_BfN^|uOCKW`t6EaX$mY!K3CPZi!E|$#(BsN(o}IC95H(vRmJboQkbU4x zmve`Gew#OftTd+@#` zqG7!*_zbvOOZz~nXz=}r^SN8J;v>Fw+@QgjgP|^7tNnaWnE!FlJ(7{VTW1-1IvWKvtHrFH_X~EK#AFf1q&lHU9<6Q<|Gzc0J7F-QRRXXq* zfU|knQzF@RoY#rX^Sochxku=DGWnH@o{4|gZD5Fgq@5T^>$OdBoD zjQ*KiDB@1xfCpEj_~Q9*{w8by_-|4u@F#y02AU(F#E~mZ(?S8wxTIsEVq#z(X(VH0 zWFV)YfF@?vl(uv?Hg?z5mY3w^lpCkGndP0#s{*sFCE&I`*p&Dg^~&^PZP6V)A?*EpTrk!(G}>=V`jfzcbxV7jCAeThH18a9k@0V zR=|}i5?uJP!EzPTKtCYY?K8qQlUFX0OTJxm+*n-%j?O7>q@aX+4}Ni_-@B51m)fcE zSx`?GD_`-twzLc)7;qairV4Gy!r5j|ykM=}+Y&%*U5$Zj>-sEvyU z4i-d2U(&Rs-`A>7WP!C|wnSQg-u#k|Ml++!6$R=%Sq)JUD@o&&G?q_s-Q|aB&|rtD zw2eN{0b)RILYJ_7-7pt&qprNAZjPOK$qi94w5iOB7NpNFlJya&;z64%A}b_K4ZT8ZZWUKe7(+e^pUe? zrht&FB2DUi1Ou=l@oi9b5(ox;xeK^R$1aaxFlJ7R^rBlX9SA-NZMFYoR0_bV`)LEbWNn;0=a7n>1@owA(>T-loDTB9BY6W zQW*u=Z#CgVYACVKKkmXRFQzOFCZ9z!GGh&WFRwROo|{Yu(vP07MayN8R7~9Z?PBHA zd*U)u<*A8iqlGl*NuQU7D--uyT96VCu9Q1ViZM#pVY+MRT$AScU3^o~Zg$9&KwILi z4~@vlWL9~#vBz$%&L_0mq0X^$7ADLk3%J@dD?WjW+MDHNWp|Q4`@@IJ$ZW3k4Q|@U zDZh&C;kgc@!KW^?s=Uwv&&?}1oe)iOA@@Pk+P>;=z(y%3^+{;Mg0-r}nX-YlmD8Nr z>PKlrgw}|@^@MtS;qUTA%_dK0K79-G?Z5E#`!vQ0==D&%!wumi#35#gsG5#_7={+I z=C4(LFj;lPX?}(kVR~J3D!ragtAx>*)rgn%JQX8pShkV&-C15{4pTSAQ)|IP-_2on z;OnJjD(sH;64l)n33D`g-t0F~r4MOT#Q{60B`{v~5J$u=abfe9Kmfv)$cwWdj~aA% z&?%rHC~^30uI=v&WL(j?427Od=SR5gb$ z>NN&9z(rrZ^$tt{C;<6~=61TCP+9LNyR*UZc6-UC@2Z0xq2)nAyqY~VXp`eX%)hAg z7c&JnIWb_=M}TF`*HZ24SRzo%9VTPla6gT`)umw|b#0gi&En2oUui0E@q4Xe;h5Ry zx8=2^t7Che1-m6gzbbXoiHC&&3J}Nsh!gR+fE%;;Emq3SoEldUA`Ag8L~v<3(aEp@ zI#9av81CFiIuZv%w@Rvy>jguj-77`U+AvLf5)<1^U2lX3Dcls)6Bs%eU>k@Mu4W+~ z0DlM8GorryY;aEyB6`CP{<*j^RT~n8hwo)se>PLip+MJ}tK|XpiJ^dCsiMK)#4h@Y z1oj0mIBL({`OIk9k*M9pU)ZlP|Hip!KhnGIgM0c*{HB^vh@i-^<+V_w$;cECV>`gm%+%@S?$+sTa zrAFj@&*HSw=jmTIK7Z;E7Sd9^*z_PyN%a)MqSH+s>F;j~AAG_vv2L!(f-S>=rg?Bi zR7^ZKHlijke9A0>W{DI>zpEm!Kcv?lJk|vP5_S@>BIxaFhh&rg$tY_YR2Ki%%gX>F_|zR zvZ}DMRs(=7o+yl05fV0o7=_jwBQVQL`}V$@Q&Df@5hNLBBYz3BSoitF7RQw=h%e%1 zI<>T~$wm-I&SX!E(qo-#I`dEX>LxlYQtr~-ZETVAukYB~LM1n@(B;myUCKXLNaote zmD|7)zvJvI#GZz~b99I%4KyF)8#knZ*Tk;-f3JNQPZ=1p*UgsxnJS#in^o!XGG z-J0s>7e+T!dQ6RcaU*A5fMgPKbl15OsKbJ(ib`A*-qWk$0P$xe*__4TWRHn8+jJLV zHct0XM`y&_4!z6!RY$$n?Ai0G6jH(Pe2-hF3W=gx910Zoy2CZx={I-}vGhNsXVWC+6K0yEQoQCht#E8yKedRBZDn*19*-ULkZsfRJrUR&N^T|3XrWfjRmD-vY z-3Q9q*N*e*iR$2Q6B7hS^|G7&@w@ z0_;8uhMSj|nfkLU1W3I0+UvX=!bWO2I)i0(v85lS@fgOW@GBV|=<9G7;JsZ~A$M8b z8w$I5lKFyWon`Oq$=jTIywb^^9lXNjgrd#UO(Smu2Z%sDo5PQZi&P}o@rD`HzCi3I zia@5gH<^Z$*Y&WhQs1BNs7=k%Y08<9Ds5P%bVihVner6mFzT;qt!~VU^r2$OK&mi4 zh&W5=*g0%Nk*hlseqLbWTpf9+0CM=8)GYiE%GJ=&4BLO9g6-z0DL;YyhVe}-!^v;T z?5J$+0GbwwdiFK#*X?WJrhd|&^B*3U6*J7X_w3)}F&!Xu{BQtUpEs%Mjns2gi*;=( z&1_#cbcecGgV!v#9`v?8yPYVTzr23hC;nt67c00UK}J|GXfhR|jM_N1iO<~ws;%lj z$v87H94+z9+`<=hqGWeop11;;B)mQHPNi&OK_@5KG(({O-+<<@AL zBHXs5sFbIlF}FS0D6eHG)gr;SY$RN%clBLU?9niF$LEDlX8vX3sFX|Q=>7T{8^8R- z4&Jwr9$et8li~;Lw|6YU&eegm?ZdV$La`HCl&xsh+xH~p$zI~!9c`j&YHCIq49VBH z2a~U0-B{VaLK+@EXQRgO|MJ(!Xd% zeHkP+8#L1#vZzOQu)&3&3lET{GC5S~5&~KvKq?T`)>7^QTc8LZ6Z*g9-S-8P*LSpx z{VAzS#Uw72>nfpgR|+}}xH1`zScUf?8cUBA)(nI;_QEUH!Zc&-aw*W0m)kQ|b4yt- zn@V$I2W(IpxjvHjB_DXF9+%Ho-R_Q}aU7cfH>!x8(xf3RVBs=SAj#;3=j1lb7&Px83ENq;slCF!(A`0lJ#v8_w%90QLrdpNqhooc7) ztkgco{m?6#q(Wva*h|#?{{m10ul&4r#LG`&v4!-KAnr-`c~7_YfST#+BK5*Tf_M^4 zSd^wiyo~wSc*!rS#|q1?pEwY{hy=FXi+HhohQ*u+4rDgAi3DcR3IeM1X|EFK=WReG zEu82tumBd&06vGjjZ+^nCoHgl|FZ-tVYG}cp#ka1cu|5PfYqu#DC64Ome2w>$$_O* zZmKpCBhQW!Jiwv)Ho@fCa|Dcsr@$8WHoY(l7O=39+|{D(Xf?rwz>N7>75m*yr# zCm!H^E2Yw}d1wDM6pcv+)vc`TH(zE0eH#isW~}|PkL7+)fWuz_F=NM5$DE5J0U3s# zp~#2`w4_Dzxq_Jd=66@!Zge%6soh}`tEL@L6!ZgPL@9~aR=6CBSBU%fjP!ATF5CK& zqI26nBywD(9YCWZv5&mdmj&`5*!Z=TxUD6fO5ZLA<^an2bMUO#g@o6a&3TYvVy+RT zSeVgAH3n1JSKp;z7Ur-yyk`rvX!KZx2+qLUDH5KRJf`b+P_G(Td_z0!B%!%UvZtUcurBFkpUtrRy2q3)WNHY@Gy{-5cGJ7|n10RENywfDD{ zVi9a$^b~>tAP@`y06GA@i+cXQjk)W+AKq-Rzxih4d|FKJz4tE8-|ob87AnOrYH@bm pHDz^O*5%-zGJ@6B)zwuoC%5D!^Zf%@Ha}Vd;B*MU0!RQ9764ao*m(c| literal 0 HcmV?d00001 diff --git a/modular_chomp/sound/items/taperecorder_drop.ogg b/modular_chomp/sound/items/taperecorder_drop.ogg new file mode 100644 index 0000000000000000000000000000000000000000..6e3c151140eedd8a776ac35431c8bd8196bb4cc1 GIT binary patch literal 12951 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 M&F(Odl8UALUsEFk)c^nh literal 0 HcmV?d00001 diff --git a/modular_chomp/sound/items/taperecorder_pickup.ogg b/modular_chomp/sound/items/taperecorder_pickup.ogg new file mode 100644 index 0000000000000000000000000000000000000000..941640aefd1b20c245eb93aacc6703680d9ea72d GIT binary patch literal 27155 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
QjI2Y-?#$D)Uk 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 ZOy5;w&lYQv~&b literal 0 HcmV?d00001 diff --git a/vorestation.dme b/vorestation.dme index 65dd4a1b01..2f443abddd 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -5094,6 +5094,8 @@ #include "modular_chomp\code\modules\research\designs\weapons.dm" #include "modular_chomp\code\modules\research\designs\circuits\circuits.dm" #include "modular_chomp\code\modules\research\lathes\protolathe.dm" +#include "modular_chomp\code\modules\salvage\bags.dm" +#include "modular_chomp\code\modules\salvage\salvage.dm" #include "modular_chomp\code\modules\shieldgen\shield_capacitor.dm" #include "modular_chomp\code\modules\shieldgen\shield_gen.dm" #include "modular_chomp\code\modules\spells\spells.dm"