mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-11 07:59:08 +01:00
Merge pull request #640 from ArchieBeepBoop/revenant
Revenant Fixes & Balancing
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
#define REVENANT_SPAWN_THRESHOLD 20
|
||||
#define REVENANT_SPAWN_THRESHOLD 15
|
||||
#define ABDUCTOR_MAX_TEAMS 4 // blame TG for not using the defines files
|
||||
|
||||
//////////////////////////////////////////////
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
AltClickNoInteract(src, A)
|
||||
return
|
||||
|
||||
if(ishuman(A))
|
||||
if(iscarbon(A))
|
||||
if(A in drained_mobs)
|
||||
to_chat(src, "<span class='revenwarning'>[A]'s soul is dead and empty.</span>" )
|
||||
else if(in_range(src, A))
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
|
||||
//Harvest; activated ly clicking the target, will try to drain their essence.
|
||||
/mob/living/simple_animal/revenant/proc/Harvest(mob/living/carbon/human/target)
|
||||
/mob/living/simple_animal/revenant/proc/Harvest(mob/living/carbon/target)
|
||||
if(!castcheck(0))
|
||||
return
|
||||
if(draining)
|
||||
@@ -206,7 +206,7 @@
|
||||
if(!L.on) //wait, wait, don't shock me
|
||||
return
|
||||
flick("[L.base_state]2", L)
|
||||
for(var/mob/living/carbon/human/M in view(shock_range, L))
|
||||
for(var/mob/living/carbon/M in view(shock_range, L))
|
||||
if(M == user)
|
||||
continue
|
||||
L.Beam(M,icon_state="purple_lightning",time=5)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#define REVENANT_SPAWN_THRESHOLD 20
|
||||
#define REVENANT_SPAWN_THRESHOLD 15
|
||||
|
||||
/datum/round_event_control/revenant
|
||||
name = "Spawn Revenant" // Did you mean 'griefghost'?
|
||||
@@ -19,7 +19,7 @@
|
||||
/datum/round_event/ghost_role/revenant/spawn_role()
|
||||
if(!ignore_mobcheck)
|
||||
var/deadMobs = 0
|
||||
for(var/mob/M in GLOB.dead_mob_list)
|
||||
for(var/mob/living/carbon/M in GLOB.dead_mob_list)
|
||||
deadMobs++
|
||||
if(deadMobs < REVENANT_SPAWN_THRESHOLD)
|
||||
message_admins("Event attempted to spawn a revenant, but there were only [deadMobs]/[REVENANT_SPAWN_THRESHOLD] dead mobs.")
|
||||
|
||||
Reference in New Issue
Block a user