Skip to content

Commit

Permalink
The Void Horrors, Xenomorph Expansion (Citadel-Station-13#6787)
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
Expands upon the Xenomorph Rehaul project, beautifying the code,
separating it into its own category and sub-categories. Also adds a few
new Xenomorphs and re balances some of the older ones.
<!-- 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
Beautifies and cleans Xenomorph code, adds a few new gimmick xenomorphs
as well.
<!-- 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. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. 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. -->

:cl:
add: Burster, Sprinter, Berserker and Inferno
qol: Made Xenomorph code prettier and easier to add/remove from
balance: Re balances some older Xenomorphs
imageadd: Adds sprites for the Burster, Sprinter, Berserker and Inferno
Xenomorphs
/: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. -->
  • Loading branch information
@Athena148
Athena148 authored Oct 6, 2024
1 parent 84d3bea commit 03b8320
Show file tree
Hide file tree
Showing 27 changed files with 1,071 additions and 981 deletions.
4 changes: 3 additions & 1 deletion citadel.dme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3880,7 +3880,6 @@
#include "code\modules\mob\living\simple_mob\subtypes\animal\sif\savik.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\sif\shantak.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\sif\sif.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\space\alien.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\space\bats.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\space\bear.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\space\carp.dm"
Expand All @@ -3893,6 +3892,9 @@
#include "code\modules\mob\living\simple_mob\subtypes\animal\space\space.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\space\space_vr.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\space\worm.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\xenomorph\xenomorph.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\xenomorph\xenomorph_abilities.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\xenomorph\xenomorph_catalogue.dm"
#include "code\modules\mob\living\simple_mob\subtypes\blob\blob.dm"
#include "code\modules\mob\living\simple_mob\subtypes\blob\spore.dm"
#include "code\modules\mob\living\simple_mob\subtypes\horror\bradley.dm"
Expand Down
10 changes: 5 additions & 5 deletions code/__HELPERS/global_lists.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -740,11 +740,11 @@ var/global/list/xenobio_gold_mobs_hostile = list(
/mob/living/simple_mob/animal/sif/savik,
/mob/living/simple_mob/animal/sif/shantak,
// /mob/living/simple_mob/animal/sif/siffet,
/mob/living/simple_mob/animal/space/alien/warrior,
/mob/living/simple_mob/animal/space/alien/drone,
/mob/living/simple_mob/animal/space/alien/basic_spitter,
/mob/living/simple_mob/animal/space/alien/adv_spitter,
/mob/living/simple_mob/animal/space/alien/vanguard,
/mob/living/simple_mob/animal/space/xenomorph/warrior,
/mob/living/simple_mob/animal/space/xenomorph/drone,
/mob/living/simple_mob/animal/space/xenomorph/neurotoxin_spitter,
/mob/living/simple_mob/animal/space/xenomorph/acid_spitter,
/mob/living/simple_mob/animal/space/xenomorph/vanguard,
/mob/living/simple_mob/animal/space/bats,
/mob/living/simple_mob/animal/space/bear,
/mob/living/simple_mob/animal/space/carp,
Expand Down
38 changes: 19 additions & 19 deletions code/game/objects/mob_spawner.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,10 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
icon = 'icons/screen/actions/actions.dmi'
icon_state = "alien_egg"
spawn_types = list(
/mob/living/simple_mob/animal/space/alien/drone = 20,
/mob/living/simple_mob/animal/space/alien/warrior = 10,
/mob/living/simple_mob/animal/space/alien/vanguard = 5,
/mob/living/simple_mob/animal/space/alien/monarch = 1
/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
)

/obj/structure/mob_spawner/scanner/xenos/royal
Expand All @@ -224,7 +224,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
icon = 'icons/screen/actions/actions.dmi'
icon_state = "alien_egg"
spawn_types = list(
/mob/living/simple_mob/animal/space/alien/monarch = 5
/mob/living/simple_mob/animal/space/xenomorph/monarch = 5
)

////////////////////////////////////
Expand Down Expand Up @@ -381,30 +381,30 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
name = "Alien Spawner"
prob_fall = 10
mobs_to_pick_from = list(
/mob/living/simple_mob/animal/space/alien/drone = 1
/mob/living/simple_mob/animal/space/xenomorph/drone = 1
)

/obj/mob_spawner/alien/easy
name = "Easy Alien Spawner"
mobs_to_pick_from = list(
/mob/living/simple_mob/animal/space/alien/warrior = 1,
/mob/living/simple_mob/animal/space/alien/drone = 2,
/mob/living/simple_mob/animal/space/alien/basic_spitter = 1,
/mob/living/simple_mob/animal/space/xenomorph/warrior = 1,
/mob/living/simple_mob/animal/space/xenomorph/drone = 2,
/mob/living/simple_mob/animal/space/xenomorph/neurotoxin_spitter = 1,
)

/obj/mob_spawner/alien/medium
name = "Medium Alien Spawner"
mobs_to_pick_from = list(
/mob/living/simple_mob/animal/space/alien/warrior = 2,
/mob/living/simple_mob/animal/space/alien/drone = 3,
/mob/living/simple_mob/animal/space/alien/basic_spitter = 2,
/mob/living/simple_mob/animal/space/xenomorph/warrior = 2,
/mob/living/simple_mob/animal/space/xenomorph/drone = 3,
/mob/living/simple_mob/animal/space/xenomorph/neurotoxin_spitter = 2,
)

/obj/mob_spawner/alien/hard
name = "Hard Alien Spawner"
mobs_to_pick_from = list(
/mob/living/simple_mob/animal/space/alien/warrior = 4,
/mob/living/simple_mob/animal/space/alien/adv_spitter = 4,
/mob/living/simple_mob/animal/space/xenomorph/warrior = 4,
/mob/living/simple_mob/animal/space/xenomorph/acid_spitter = 4,
)

/obj/structure/mob_spawner/scanner/corgi
Expand Down Expand Up @@ -453,10 +453,10 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
icon = 'icons/screen/actions/actions.dmi'
icon_state = "alien_egg"
spawn_types = list(
/mob/living/simple_mob/animal/space/alien/drone = 20,
/mob/living/simple_mob/animal/space/alien/warrior = 10,
/mob/living/simple_mob/animal/space/alien/basic_spitter = 5,
/mob/living/simple_mob/animal/space/alien/monarch = 1
/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
Expand All @@ -472,5 +472,5 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
icon = 'icons/screen/actions/actions.dmi'
icon_state = "alien_egg"
spawn_types = list(
/mob/living/simple_mob/animal/space/alien/monarch = 5,
/mob/living/simple_mob/animal/space/xenomorph/monarch = 5,
)
8 changes: 4 additions & 4 deletions code/game/objects/structures/crates_lockers/largecrate.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,15 +226,15 @@

/obj/structure/largecrate/animal/dangerous
name = "Dangerous Predator carrier"
starts_with = list(/mob/living/simple_mob/animal/space/alien/warrior)
starts_with = list(/mob/living/simple_mob/animal/space/xenomorph/warrior)

/obj/structure/largecrate/animal/dangerous/Initialize(mapload)
starts_with = list(pick(/mob/living/simple_mob/animal/space/carp/large,
/mob/living/simple_mob/vore/aggressive/deathclaw,
/mob/living/simple_mob/vore/aggressive/dino,
/mob/living/simple_mob/animal/space/alien/drone,
/mob/living/simple_mob/animal/space/alien/basic_spitter,
/mob/living/simple_mob/animal/space/alien/monarch,
/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 ..()

Expand Down
2 changes: 1 addition & 1 deletion code/modules/awaymissions/loot_vr.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
new /obj/item/clothing/suit/storage/hooded/carp_costume(C)
else if(prob(50))
if(live_cargo) // Something else very much alive and angry.
var/spawn_type = pick(/mob/living/simple_mob/animal/space/alien/warrior, /mob/living/simple_mob/animal/space/alien/drone, /mob/living/simple_mob/animal/space/alien/basic_spitter)
var/spawn_type = pick(/mob/living/simple_mob/animal/space/xenomorph/warrior, /mob/living/simple_mob/animal/space/xenomorph/drone, /mob/living/simple_mob/animal/space/xenomorph/neurotoxin_spitter)
new spawn_type(C)
else // Just a costume.
new /obj/item/clothing/head/xenos(C)
Expand Down
10 changes: 5 additions & 5 deletions code/modules/events/xenoinfestation.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@
var/obj/machinery/atmospherics/component/unary/vent_pump/V = pick(vents)
switch(xeno_type)
if(QUEEN)
new /mob/living/simple_mob/animal/space/alien/monarch(V.loc)
new /mob/living/simple_mob/animal/space/xenomorph/monarch(V.loc)
if(PRAE)
new /mob/living/simple_mob/animal/space/alien/vanguard(V.loc)
new /mob/living/simple_mob/animal/space/xenomorph/vanguard(V.loc)
if(SENTINEL)
new /mob/living/simple_mob/animal/space/alien/basic_spitter(V.loc)
new /mob/living/simple_mob/animal/space/xenomorph/neurotoxin_spitter(V.loc)
if(DRONE)
new /mob/living/simple_mob/animal/space/alien/drone(V.loc)
new /mob/living/simple_mob/animal/space/xenomorph/drone(V.loc)
if(HUNTER)
new /mob/living/simple_mob/animal/space/alien/warrior(V.loc)
new /mob/living/simple_mob/animal/space/xenomorph/warrior(V.loc)
spawn_types[xeno_type]--

/datum/event/xeno_infestation/proc/log_this()
Expand Down
Loading

0 comments on commit 03b8320

Please sign in to comment.