Skip to content

Commit

Permalink
Hivebot Changes (#3709)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Repaths most hivebots (they were.. wacky)
reduces strong hivebot spawn chances
gives hivebots a real projectile
Big Hivebot

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
wasteplanet enrichment project 2024
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
balance: Hivebots now have some armor and real bullets. Please bring
guns to waste planets.

/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: Bjarl <[email protected]>
  • Loading branch information
Erikafox and Erikafox authored Nov 14, 2024
1 parent e5c6036 commit 15b7b99
Show file tree
Hide file tree
Showing 10 changed files with 133 additions and 136 deletions.
6 changes: 3 additions & 3 deletions _maps/RandomRuins/SpaceRuins/onehalf.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1401,7 +1401,7 @@
/obj/effect/turf_decal/industrial/warning/corner{
dir = 1
},
/mob/living/simple_animal/hostile/hivebot/range,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/onehalf)
"qC" = (
Expand Down Expand Up @@ -1606,7 +1606,7 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"zS" = (
/mob/living/simple_animal/hostile/hivebot/range,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/onehalf)
"Af" = (
Expand Down Expand Up @@ -1969,7 +1969,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/wood,
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/hivebot/range,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/wood/airless,
/area/ruin/space/has_grav/onehalf)
"OW" = (
Expand Down
32 changes: 16 additions & 16 deletions _maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
/turf/open/floor/plasteel/dark,
/area/ruin/wasteplanet/tradepost/barracks)
"aM" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/overmap_encounter/planetoid/cave/explored)
"aQ" = (
Expand Down Expand Up @@ -90,7 +90,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/structure/foamedmetal/iron,
/turf/open/floor/pod,
/area/ruin/wasteplanet/tradepost/center)
Expand All @@ -116,7 +116,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 1
},
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged,
/mob/living/simple_animal/hostile/hivebot/ranged,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
dir = 1
},
Expand Down Expand Up @@ -382,7 +382,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 6
},
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
/obj/item/trash/plate,
/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
Expand All @@ -394,7 +394,7 @@
/turf/open/floor/pod,
/area/ruin/wasteplanet/tradepost/center)
"ew" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/overmap_encounter/planetoid/cave/explored)
"ez" = (
Expand Down Expand Up @@ -608,7 +608,7 @@
/obj/effect/decal/cleanable/blood/tracks,
/obj/item/paper_bin,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/item/trash/plate,
/obj/item/ammo_casing/spent,
/turf/open/floor/pod,
Expand Down Expand Up @@ -851,7 +851,7 @@
/obj/effect/decal/cleanable/oil/streak{
icon_state = "streak2"
},
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 4
},
Expand Down Expand Up @@ -897,7 +897,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"kr" = (
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/concrete/pavement/wasteplanet,
/area/overmap_encounter/planetoid/cave/explored)
"ks" = (
Expand Down Expand Up @@ -1575,7 +1575,7 @@
"rN" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/holopad/secure,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/corner/opaque/yellow/full,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
Expand Down Expand Up @@ -2354,7 +2354,7 @@
/obj/effect/decal/cleanable/oil/streak{
icon_state = "streak2"
},
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/pod,
/area/ruin/wasteplanet/tradepost/center)
"zO" = (
Expand Down Expand Up @@ -2502,7 +2502,7 @@
/turf/open/floor/pod/dark,
/area/ruin/wasteplanet/tradepost/center)
"BN" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/turf/open/floor/plating/asteroid/wasteplanet/lit,
/area/overmap_encounter/planetoid/wasteplanet/explored)
"Cb" = (
Expand Down Expand Up @@ -2949,7 +2949,7 @@
/turf/open/floor/plasteel/tech,
/area/ruin/wasteplanet/tradepost/barracks)
"FK" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/item/ammo_casing/spent,
/turf/open/floor/concrete/pavement/wasteplanet,
/area/overmap_encounter/planetoid/cave/explored)
Expand Down Expand Up @@ -3229,7 +3229,7 @@
/turf/open/floor/wood/walnut,
/area/ruin/wasteplanet/tradepost/center)
"IM" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/concrete/pavement/wasteplanet,
/area/overmap_encounter/planetoid/cave/explored)
"IN" = (
Expand Down Expand Up @@ -3579,7 +3579,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"LW" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged,
/mob/living/simple_animal/hostile/hivebot/ranged,
/obj/item/ammo_casing/spent,
/turf/open/floor/concrete/pavement/wasteplanet,
/area/overmap_encounter/planetoid/cave/explored)
Expand Down Expand Up @@ -3988,7 +3988,7 @@
/turf/open/floor/pod,
/area/ruin/wasteplanet/tradepost/center)
"Qn" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/turf/open/floor/plating/wasteplanet/rust,
/area/overmap_encounter/planetoid/wasteplanet/explored)
"QB" = (
Expand Down Expand Up @@ -4694,7 +4694,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 8
},
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/obj/structure/door_assembly/door_assembly_com,
/turf/open/floor/pod,
/area/ruin/wasteplanet/tradepost/center)
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/WasteRuins/wasteplanet_unhonorable.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
/turf/open/floor/plating/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_radiation)
"gx" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet,
/mob/living/simple_animal/hostile/hivebot,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_radiation)
"gM" = (
Expand Down Expand Up @@ -684,7 +684,7 @@
/turf/open/floor/plating/asteroid/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_radiation)
"Mh" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_radiation)
"Mq" = (
Expand Down
24 changes: 12 additions & 12 deletions _maps/RandomRuins/WasteRuins/wasteplanet_yard.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
/turf/open/floor/plasteel/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/ship)
"bB" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet,
/mob/living/simple_animal/hostile/hivebot,
/turf/open/floor/plating/wasteplanet/rust,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/bay)
"bD" = (
Expand Down Expand Up @@ -289,7 +289,7 @@
/turf/open/floor/plasteel/dark/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/canteen)
"cP" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/effect/decal/cleanable/blood/old,
/obj/effect/mob_spawn/human/corpse/charredskeleton,
/obj/item/wrench/combat,
Expand Down Expand Up @@ -331,7 +331,7 @@
"dw" = (
/obj/effect/turf_decal/industrial/hatch/orange,
/obj/structure/closet/crate/large,
/mob/living/simple_animal/hostile/hivebot/wasteplanet,
/mob/living/simple_animal/hostile/hivebot,
/turf/open/floor/plasteel/dark/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/bay)
"dI" = (
Expand Down Expand Up @@ -939,7 +939,7 @@
/turf/open/floor/plasteel/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/dorms)
"kP" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged,
/mob/living/simple_animal/hostile/hivebot/ranged,
/obj/structure/railing{
dir = 4
},
Expand Down Expand Up @@ -1367,7 +1367,7 @@
/turf/open/floor/plating/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/bay)
"pt" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/structure/sign/warning/docking{
pixel_x = 32
},
Expand Down Expand Up @@ -1606,7 +1606,7 @@
/turf/open/floor/plating/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/canteen)
"sf" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet,
/mob/living/simple_animal/hostile/hivebot,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/ruin/wasteplanet)
"sm" = (
Expand Down Expand Up @@ -2402,7 +2402,7 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
/mob/living/simple_animal/hostile/hivebot/wasteplanet,
/mob/living/simple_animal/hostile/hivebot,
/turf/open/floor/plating/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/bay)
"CV" = (
Expand Down Expand Up @@ -2966,7 +2966,7 @@
/turf/open/floor/plasteel/dark/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/canteen)
"KG" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/obj/structure/catwalk/over,
/turf/open/floor/plating/wasteplanet/lit,
/area/ruin/wasteplanet)
Expand Down Expand Up @@ -3148,7 +3148,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
/mob/living/simple_animal/hostile/hivebot/wasteplanet,
/mob/living/simple_animal/hostile/hivebot,
/obj/machinery/light/directional/west,
/turf/open/floor/plating/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/bay)
Expand Down Expand Up @@ -3367,7 +3367,7 @@
/turf/open/floor/plasteel/dark/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/bay)
"QS" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/plating/wasteplanet/lit,
/area/ruin/wasteplanet)
"Ri" = (
Expand Down Expand Up @@ -3945,7 +3945,7 @@
/turf/open/floor/plasteel/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/canteen)
"Yp" = (
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
/mob/living/simple_animal/hostile/hivebot/strong,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/canteen)
Expand Down Expand Up @@ -4007,7 +4007,7 @@
/area/ruin/wasteplanet/wasteplanet_shipbreaking/canteen)
"YW" = (
/obj/effect/turf_decal/industrial/hatch/orange,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
/mob/living/simple_animal/hostile/hivebot/ranged,
/turf/open/floor/plating/wasteplanet/lit,
/area/ruin/wasteplanet)
"Za" = (
Expand Down
38 changes: 20 additions & 18 deletions code/datums/mapgen/planetary/WasteGenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@

mob_spawn_list = list(
//hivebots, not too difficult
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 70,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 40,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 30,
/mob/living/simple_animal/hostile/hivebot/strong = 20,
/mob/living/simple_animal/hostile/hivebot/ranged = 40,
/mob/living/simple_animal/hostile/hivebot/ranged/rapid = 30,
//bots, are hostile
/mob/living/simple_animal/bot/firebot/rockplanet = 15,
/mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3,
Expand Down Expand Up @@ -253,9 +253,9 @@
/obj/effect/spawner/minefield = 2
)
mob_spawn_list = list( //nor organics, more biased towards hivebots though
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 50,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 50,
/mob/living/simple_animal/hostile/hivebot/strong = 20,
/mob/living/simple_animal/hostile/hivebot/ranged = 50,
/mob/living/simple_animal/hostile/hivebot/ranged/rapid = 50,
/mob/living/simple_animal/bot/firebot/rockplanet = 15,
/mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3,
/mob/living/simple_animal/hostile/abandoned_minebot = 15,
Expand Down Expand Up @@ -320,9 +320,9 @@
/obj/effect/spawner/random/anomaly/waste/cave = 1
)
mob_spawn_list = list(
/mob/living/simple_animal/hostile/hivebot/strong/rockplanet = 70,
/mob/living/simple_animal/hostile/hivebot/range/rockplanet = 40,
/mob/living/simple_animal/hostile/hivebot/rapid/rockplanet = 30,
/mob/living/simple_animal/hostile/hivebot/strong = 20,
/mob/living/simple_animal/hostile/hivebot/ranged = 40,
/mob/living/simple_animal/hostile/hivebot/ranged/rapid = 30,
/mob/living/simple_animal/bot/firebot/rockplanet = 15,
/mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3,
/mob/living/simple_animal/hostile/abandoned_minebot = 15,
Expand Down Expand Up @@ -403,9 +403,9 @@
/obj/effect/spawner/random/mine = 8,
)
mob_spawn_list = list( //nor organics, more biased towards hivebots though
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 50,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 50,
/mob/living/simple_animal/hostile/hivebot/strong = 20,
/mob/living/simple_animal/hostile/hivebot/ranged = 50,
/mob/living/simple_animal/hostile/hivebot/ranged/rapid = 50,
/mob/living/simple_animal/bot/firebot/rockplanet = 15,
/mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3,
/mob/living/simple_animal/hostile/abandoned_minebot = 15,
Expand All @@ -430,9 +430,11 @@
/obj/structure/foamedmetal = 100,
)
mob_spawn_list = list( //Whoops! All hivebots!
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 50,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 50
/mob/living/simple_animal/hostile/hivebot/strong = 20,
/mob/living/simple_animal/hostile/hivebot/ranged = 40,
/mob/living/simple_animal/hostile/hivebot/ranged/rapid = 20,
/mob/living/simple_animal/hostile/hivebot = 20,
/mob/living/simple_animal/hostile/hivebot/defender = 10
)
mob_spawn_chance = 30
feature_spawn_list = list(
Expand Down Expand Up @@ -467,9 +469,9 @@
/obj/effect/spawner/random/waste/salvageable = 40,
)
mob_spawn_list = list(
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 50,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 50,
/mob/living/simple_animal/hostile/hivebot/strong = 80,
/mob/living/simple_animal/hostile/hivebot/ranged = 50,
/mob/living/simple_animal/hostile/hivebot/ranged/rapid = 50,
/mob/living/simple_animal/bot/firebot/rockplanet = 15,
/mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3,
/mob/living/simple_animal/hostile/abandoned_minebot = 15,
Expand Down
Loading

0 comments on commit 15b7b99

Please sign in to comment.