diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/eventsubtype.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/eventsubtype.dm index 3ce644e4ee..202dec76cb 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/eventsubtype.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/eventsubtype.dm @@ -144,13 +144,13 @@ maxHealth = 600 health = 600 loot_list = list(/obj/item/prop/alien/junk = 100, - /obj/item/multitool/alien = 20, - /obj/item/stack/cable_coil/alien = 20, - /obj/item/tool/crowbar/alien = 20, - /obj/item/tool/screwdriver/alien = 20, - /obj/item/weldingtool/alien = 20, - /obj/item/tool/wirecutters/alien = 20, - /obj/item/tool/wrench/alien = 20, + /obj/item/multitool/alien = 60, + /obj/item/stack/cable_coil/alien = 60, + /obj/item/tool/crowbar/alien = 60, + /obj/item/tool/screwdriver/alien = 60, + /obj/item/weldingtool/alien = 60, + /obj/item/tool/wirecutters/alien = 60, + /obj/item/tool/wrench/alien = 60, /obj/item/cell/device/weapon/recharge/alien = 30, /obj/item/perfect_tele/alien = 100 ) @@ -418,19 +418,19 @@ /obj/item/prop/nanoweave/lime catalogue_data = list(/datum/category_item/catalogue/anomalous/limedisc) - icon_state = "limedisc" + icon_state = "limedisk" /obj/item/prop/nanoweave/cyan catalogue_data = list(/datum/category_item/catalogue/anomalous/cyandisc) - icon_state = "cyandisc" + icon_state = "cyandisk" /obj/item/prop/nanoweave/orange catalogue_data = list(/datum/category_item/catalogue/anomalous/orangedisc) - icon_state = "orangedisc" + icon_state = "orangedisk" /obj/item/prop/nanoweave/terraformers catalogue_data = list(/datum/category_item/catalogue/anomalous/terraformers) - icon_state = "orangedisc" + icon_state = "reddisk" /datum/category_item/catalogue/anomalous/cyandisc diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm index 7f063c8b50..85adca3df3 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm @@ -34,7 +34,7 @@ icon_state = "powertower" icon_living = "powertower" faction = FACTION_HIVEBOT - movement_cooldown = 7 + movement_cooldown = 10 size_multiplier = 2 maxHealth = 500 health = 500 @@ -91,7 +91,7 @@ icon_state = "bluetower" icon_living = "bluetower" faction = FACTION_HIVEBOT - movement_cooldown = 7 + movement_cooldown = 10 size_multiplier = 2 maxHealth = 500 health = 500 @@ -100,18 +100,18 @@ anchored = 1 armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 50, bio = 100, rad = 100) loot_list = list(/obj/item/prop/alien/junk = 100, - /obj/item/multitool/alien = 10, - /obj/item/stack/cable_coil/alien = 10, - /obj/item/tool/crowbar/alien = 10, - /obj/item/tool/screwdriver/alien = 10, - /obj/item/weldingtool/alien = 10, - /obj/item/tool/wirecutters/alien = 10, - /obj/item/tool/wrench/alien = 10, - /obj/item/cell/device/weapon/recharge/alien = 20, - /obj/item/prop/nanoweave/terraformers = 30, - /obj/item/prop/nanoweave/cyan = 30, - /obj/item/prop/nanoweave/lime = 30, - /obj/item/perfect_tele/alien = 50 + /obj/item/multitool/alien = 30, + /obj/item/stack/cable_coil/alien = 30, + /obj/item/tool/crowbar/alien = 30, + /obj/item/tool/screwdriver/alien = 30, + /obj/item/weldingtool/alien = 30, + /obj/item/tool/wirecutters/alien = 30, + /obj/item/tool/wrench/alien = 30, + /obj/item/cell/device/weapon/recharge/alien = 40, + /obj/item/prop/nanoweave/terraformers = 50, + /obj/item/prop/nanoweave/cyan = 50, + /obj/item/prop/nanoweave/lime = 50, + /obj/item/perfect_tele/alien = 100 ) /mob/living/simple_mob/mechanical/mecha/eclipse/hivebot/nanoweavetower/do_special_attack(atom/A) diff --git a/modular_chomp/icons/mob/hivebot.dmi b/modular_chomp/icons/mob/hivebot.dmi index 4553dcc0c9..8683492a50 100644 Binary files a/modular_chomp/icons/mob/hivebot.dmi and b/modular_chomp/icons/mob/hivebot.dmi differ diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/XenoWeaveMajor.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/XenoWeaveMajor.dmm index ee0feb6911..db7b2f76c6 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/XenoWeaveMajor.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/XenoWeaveMajor.dmm @@ -1,4 +1,24 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/machinery/door/blast/puzzle{ + id = "nanoweavePOI" + }, +/turf/simulated/shuttle/floor/alienplating/blue, +/area/submap/XenoWeaveMajor) +"ab" = ( +/turf/simulated/shuttle/floor/alienplating/blue, +/area/submap/XenoWeaveMajor) +"ac" = ( +/obj/machinery/door/blast/regular, +/turf/simulated/shuttle/floor/alien/blue, +/area/submap/XenoWeaveMajor) +"ad" = ( +/obj/structure/table/darkglass, +/obj/machinery/button/remote/blast_door{ + id = "nanoweavePOI" + }, +/turf/simulated/shuttle/floor/alien/blue, +/area/submap/XenoWeaveMajor) "an" = ( /mob/living/simple_mob/mechanical/mecha/eclipse/hivebot/nanoweavetower, /turf/simulated/shuttle/floor/alien/blue, @@ -771,7 +791,7 @@ wC hg bO Se -Wj +ed Wj Wj Wj @@ -822,10 +842,10 @@ KM Se Qw jb +jb cB Wj xK -jb mJ wC wC @@ -871,6 +891,7 @@ ed KM jV wC +wC dE Wj dE @@ -881,7 +902,6 @@ wC wC wC wC -wC ot ot ot @@ -910,21 +930,21 @@ TP TP wC wC -XE +wC +wC +wC +wC +TR jb jb jb mJ -Wj -Wj -Wj -jV +wC wC dE Wj dE wC -XE jb jb jb @@ -959,21 +979,21 @@ TP TP wC wC -TR -jb -jb -jb -jb -jb -jb -jb -mJ +wC +wC +wC +wC +wC +wC +TN +wC +wC +wC wC dE Wj dE wC -dE Wj Wj Wj @@ -1008,13 +1028,14 @@ TP TP wC wC -TN wC wC wC wC wC wC +kg +wC wC wC wC @@ -1022,7 +1043,6 @@ dE Wj dE wC -dE Wj Wj Wj @@ -1057,21 +1077,21 @@ wC wC wC wC +wC +wC +wC +wC +wC +wC kg wC wC wC wC -wC -wC -wC -wC -wC dE Wj dE wC -dE Wj Wj xK @@ -1106,13 +1126,14 @@ wC wC wC wC -kg wC wC wC wC wC wC +Xb +wC wC wC wC @@ -1120,7 +1141,6 @@ dE Wj dE wC -dE Wj Wj TC @@ -1151,25 +1171,25 @@ ot TP wC wC +ad +Wj wC -wC -wC -wC -Xb -wC -wC -wC -wC -wC -wC -wC -wC +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab wC dE Wj dE wC -dE Wj Wj iL @@ -1201,9 +1221,9 @@ TP wC wC wC +Wj wC -wC -wC +ab Wj Wj Wj @@ -1213,12 +1233,12 @@ Wj Wj Wj Wj +ab wC dE Wj dE wC -dE Wj Wj Wj @@ -1250,9 +1270,9 @@ TP wC wC mZ -mZ -wC +Wj wC +ab Wj XE jb @@ -1262,12 +1282,12 @@ jb jb UV Wj +ab wC dE Wj dE wC -TR jb jb jb @@ -1299,9 +1319,9 @@ Yg wC wC mZ -mZ -wC -wC +Wj +ac +ab Wj dE Wj @@ -1311,7 +1331,8 @@ Wj Wj dE Wj -wC +ab +aa jV ed jV @@ -1320,7 +1341,6 @@ wC wC wC wC -wC dE Wj dE @@ -1348,9 +1368,9 @@ TP wC wC mZ -mZ wC wC +ab Wj dE Wj @@ -1360,7 +1380,8 @@ UV Wj dE Wj -wC +ab +aa jV ed hH @@ -1369,7 +1390,6 @@ jb jb jb jb -jb mJ Wj dE @@ -1399,7 +1419,7 @@ wC SI wC wC -wC +ab Wj dE Wj @@ -1409,7 +1429,8 @@ dE Wj dE Wj -wC +ab +aa dE Wj Wj @@ -1420,7 +1441,6 @@ Wj Wj Wj Wj -Wj dE wC wC @@ -1446,9 +1466,9 @@ TP wC wC mZ -mZ wC wC +ab Wj dE Wj @@ -1458,7 +1478,8 @@ mJ Wj dE Wj -wC +ab +aa Dz HW Rf @@ -1467,7 +1488,6 @@ jb jb jb jb -jb cB Wj dE @@ -1495,9 +1515,9 @@ Yg wC wC mZ -mZ -wC -wC +Wj +ac +ab Wj dE Wj @@ -1507,7 +1527,8 @@ Wj Wj dE Wj -wC +ab +aa Dz HW Dz @@ -1516,7 +1537,6 @@ wC wC wC wC -wC dE Wj dE @@ -1544,9 +1564,9 @@ Yg wC wC mZ -mZ -wC +Wj wC +ab Wj TR jb @@ -1556,12 +1576,12 @@ jb jb mJ Wj +ab wC dE Wj dE wC -XE jb jb jb @@ -1593,9 +1613,9 @@ TP wC wC wC +Wj wC -wC -wC +ab Wj Wj Wj @@ -1605,12 +1625,12 @@ Wj Wj Wj Wj +ab wC dE Wj dE wC -dE Wj Wj Wj @@ -1641,25 +1661,25 @@ ot TP wC wC +ad +Wj wC -wC -wC -wC -wC -wC -wC -wC -wC -wC -wC -wC -TN +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab wC dE Wj dE wC -dE Wj Wj xK @@ -1700,15 +1720,15 @@ wC wC wC wC +TN +wC wC wC -kg wC dE Wj dE wC -dE Wj Wj TC @@ -1749,15 +1769,15 @@ wC wC wC wC -wC -wC kg wC +wC +wC +wC dE Wj dE wC -dE Wj Wj iL @@ -1798,15 +1818,15 @@ wC wC wC wC +kg +wC wC wC -Xb wC dE Wj dE wC -dE Wj Wj Wj @@ -1841,21 +1861,21 @@ ot ot wC wC -XE -jb -jb -jb -jb -jb -jb -jb -UV +wC +wC +wC +wC +wC +wC +Xb +wC +wC +wC wC dE Wj dE wC -dE Wj Wj Wj @@ -1890,21 +1910,21 @@ ot ot wC wC -TR +wC +wC +wC +wC +XE jb jb jb -cB -Wj -Wj -Wj -Dz +UV +wC wC dE Wj dE wC -TR jb jb jb @@ -1946,8 +1966,9 @@ wC TR cB Wj -HW -EB +Wj +dE +wC wC dE Wj @@ -1959,7 +1980,6 @@ wC wC wC wC -wC ot ot ot @@ -1998,10 +2018,10 @@ HW KM hH me +jb mJ Wj iL -jb UV tc Vv @@ -2046,7 +2066,7 @@ TR ZW ed Se -Wj +KM Wj Wj Wj @@ -2094,8 +2114,8 @@ wC wC HQ Zh -Wj -Wj +HW +HW Wj Wj Wj