mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2025-12-09 11:16:53 +00:00
Xenomorph Monarch Fixes/Rebalance (#7418)
<!-- 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 Applies a nerf to Monarch's charge, no longer instantaneous. Lowers Monarch's burn/energy resist, burn should work better against it since Xenomorphs are weak to fire. Axes **any** and all mentions of natural spawn positions, this should never spawn naturally. It is a boss mob. <!-- 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 This has been an issue for a while, but the natural spawn points for the Monarch were the last straw. Oopsies. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> 🆑 balance: lowers Monarch's burn resist, makes charge not instant. fix: Removes any reference to the Monarch spawning naturally, probable or not. /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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. -->
This commit is contained in:
@@ -207,8 +207,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
|
||||
spawn_types = list(
|
||||
/mob/living/simple_mob/animal/space/xenomorph/drone = 20,
|
||||
/mob/living/simple_mob/animal/space/xenomorph/warrior = 10,
|
||||
/mob/living/simple_mob/animal/space/xenomorph/vanguard = 5,
|
||||
/mob/living/simple_mob/animal/space/xenomorph/monarch = 1
|
||||
/mob/living/simple_mob/animal/space/xenomorph/vanguard = 5
|
||||
)
|
||||
|
||||
/obj/structure/mob_spawner/scanner/xenos/royal
|
||||
@@ -223,9 +222,6 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
|
||||
anchored = 1
|
||||
icon = 'icons/screen/actions/actions.dmi'
|
||||
icon_state = "alien_egg"
|
||||
spawn_types = list(
|
||||
/mob/living/simple_mob/animal/space/xenomorph/monarch = 5
|
||||
)
|
||||
|
||||
////////////////////////////////////
|
||||
//Invisible mob spawner. This one spawns mobs until depleted. Often used in caves.
|
||||
@@ -456,7 +452,6 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
|
||||
/mob/living/simple_mob/animal/space/xenomorph/drone = 20,
|
||||
/mob/living/simple_mob/animal/space/xenomorph/warrior = 10,
|
||||
/mob/living/simple_mob/animal/space/xenomorph/neurotoxin_spitter = 5,
|
||||
/mob/living/simple_mob/animal/space/xenomorph/monarch = 1
|
||||
)
|
||||
|
||||
/obj/structure/mob_spawner/scanner/xenos/royal
|
||||
@@ -471,6 +466,3 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
|
||||
anchored = 1
|
||||
icon = 'icons/screen/actions/actions.dmi'
|
||||
icon_state = "alien_egg"
|
||||
spawn_types = list(
|
||||
/mob/living/simple_mob/animal/space/xenomorph/monarch = 5,
|
||||
)
|
||||
|
||||
@@ -233,7 +233,6 @@
|
||||
/mob/living/simple_mob/vore/aggressive/dino,
|
||||
/mob/living/simple_mob/animal/space/xenomorph/drone,
|
||||
/mob/living/simple_mob/animal/space/xenomorph/neurotoxin_spitter,
|
||||
/mob/living/simple_mob/animal/space/xenomorph/monarch,
|
||||
/mob/living/simple_mob/vore/aggressive/corrupthound))
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -98,8 +98,6 @@
|
||||
while(spawn_types[xeno_type] > 0)
|
||||
var/obj/machinery/atmospherics/component/unary/vent_pump/V = pick(vents)
|
||||
switch(xeno_type)
|
||||
if(QUEEN)
|
||||
new /mob/living/simple_mob/animal/space/xenomorph/monarch(V.loc)
|
||||
if(PRAE)
|
||||
new /mob/living/simple_mob/animal/space/xenomorph/vanguard(V.loc)
|
||||
if(SENTINEL)
|
||||
|
||||
@@ -273,10 +273,10 @@
|
||||
health = 1500
|
||||
maxHealth = 1500
|
||||
armor_legacy_mob = list(
|
||||
"melee" = 60,
|
||||
"melee" = 40,
|
||||
"bullet" = 50,
|
||||
"laser" = 80,
|
||||
"energy" = 80,
|
||||
"laser" = 15,
|
||||
"energy" = 20,
|
||||
"bomb" = 20,
|
||||
"bio" = 100,
|
||||
"rad" = 100,
|
||||
@@ -299,8 +299,8 @@
|
||||
special_attack_max_range = 12 //Normal view range is 7 this can begin charging from outside normal view You may expand it.
|
||||
special_attack_cooldown = 15 SECONDS
|
||||
var/charging = 0
|
||||
var/charging_warning = 0 SECONDS
|
||||
var/charge_damage_mode = DAMAGE_MODE_PIERCE | DAMAGE_MODE_SHARP ///You may want to change this
|
||||
var/charging_warning = 2 SECONDS
|
||||
var/charge_damage_mode = DAMAGE_MODE_PIERCE | DAMAGE_MODE_PIERCE ///You may want to change this
|
||||
var/charge_damage_flag = ARMOR_MELEE
|
||||
var/charge_damage_tier = 4.5
|
||||
var/charge_damage = 60
|
||||
|
||||
Reference in New Issue
Block a user