Merge pull request #9 from Yawet330/ashies

Ashies
This commit is contained in:
ReturnToZender
2023-01-17 14:59:30 -06:00
committed by GitHub
3 changed files with 15 additions and 6 deletions

View File

@@ -235,11 +235,14 @@
return ..()
/obj/effect/mob_spawn/ghost_role/human/ash_walker/allow_spawn(mob/user, silent = FALSE)
if(!(user.key in team.players_spawned))//one per person unless you get a bonus spawn
return TRUE
if(!silent)
to_chat(user, span_warning("You have exhausted your usefulness to the Necropolis."))
return FALSE
if(!(user.key in team.players_spawned))// Repurpose this to give a slight blurb on spawning in.
to_chat(user, span_notice("The Necropolis welcomes a new Servant. Listen to your fellow Ashwalkers, learn and be observant. Do not go out of your way to bring hostiles to your tribe."))
//if(!silent) //We remove this in order to allow people to respawn indefinitely without a snide comment.
//to_chat(user, span_warning("You have exhausted your usefulness to the Necropolis."))
if(!team) //Nonmodular addition. This wont be changed anytime soon, and should fix errors when attempting to adminspawn it.
to_chat(user, span_warning("The Necropolis is in Anarchy! The binds that Hold your Kin together have fallen apart. No further life can be produced here."))
return FALSE
return TRUE //Always return true (Infinite Egg Takes)
/obj/effect/mob_spawn/ghost_role/human/ash_walker/special(mob/living/carbon/human/spawned_human)
// SKYRAT EDIT MOVE
@@ -252,7 +255,7 @@
spawned_human.mind.add_antag_datum(/datum/antagonist/ashwalker, team)
spawned_human.remove_language(/datum/language/common)
//spawned_human.remove_language(/datum/language/common) -Nonmodular removal. Allows Ashwalkers to speak common and properly learn other languages.
team.players_spawned += (spawned_human.key)
eggshell.egg = null
QDEL_NULL(eggshell)

View File

@@ -0,0 +1,5 @@
/datum/component/ash_age
/// the amount of minutes after each upgrade
var/stage_time = 5 MINUTES //I hate this

View File

@@ -5047,6 +5047,7 @@
#include "interface\menu.dm"
#include "interface\stylesheet.dm"
#include "interface\skin.dmf"
#include "modular_bubbers\modules\Ashwalkers\ashwalkerunfucking.dm"
#include "modular_skyrat\master_files\code\_globalvars\configuration.dm"
#include "modular_skyrat\master_files\code\_globalvars\lists\ambience.dm"
#include "modular_skyrat\master_files\code\_globalvars\lists\chat.dm"