Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

grand core buff to let its moves just affect any dead thing #17258

Merged
merged 1 commit into from Jan 4, 2023
Merged

grand core buff to let its moves just affect any dead thing #17258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/mining/lavaland/necropolis_chests.dm
View file
Open in desktop
Expand Up @@ -1889,9 +1889,9 @@ GLOBAL_LIST_EMPTY(bloodmen_list)
return
if(NOBLOOD in H.dna.species.species_traits)
H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 8) //brain damage wont stop you from running away so opting for that instead of poison or breath damage
to_chat(H, "<span class ='userdanger'>Your head pounds as you produce bloodlings!</span>")
to_chat(H, span_notice("Your head pounds as you produce bloodlings!"))
else
to_chat(H, "<span class ='userdanger'>You spill your blood, and it comes to life as bloodlings!</span>")
to_chat(H, span_notice("You spill your blood, and it comes to life as bloodlings!"))
H.blood_volume -= 35
spawn_atom_to_turf(/mob/living/simple_animal/hostile/asteroid/hivelordbrood/bloodling, owner, 3, TRUE) //think 1 in 4 is a good chance of not being targeted by fauna
next_expulsion = world.time + cooldown
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
View file
Open in desktop
Expand Up @@ -444,7 +444,7 @@
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/bloodling/Life()
var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/bloodman/L
if(isturf(loc))
for(var/mob/living/carbon/human/M in view(src,1))
for(var/mob/living/M in view(src,1))
if(M.stat == DEAD && GLOB.bloodmen_list.len <= 2) //max of 3 bloodmen to minimize shitshows
L = new(M.loc)
L.stored_mob = M
Expand Down
4 changes: 2 additions & 2 deletions code/modules/spells/spell_types/conjure.dm
View file
Open in desktop
Expand Up @@ -121,10 +121,10 @@
var/turf/T = get_step(usr, spawndir)
if(NOBLOOD in user.dna.species.species_traits)
user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
to_chat(usr, span_notice("<span class ='userdanger'>You can almost feel your brain writhing as you call your bloodmen to you.</span>"))
to_chat(usr, span_notice("You can almost feel your brain writhing as you call your bloodmen to you."))
else
user.blood_volume -= 15
to_chat(usr, span_notice("<span class ='userdanger'>You feel yourself becoming paler with every minion called.</span>"))
to_chat(usr, span_notice("You feel yourself becoming paler with every minion called."))
if(T)
bloodman.forceMove(T)
playsound(usr, 'sound/magic/exit_blood.ogg', 100, 1)
14 changes: 7 additions & 7 deletions code/modules/spells/spell_types/godhand.dm
View file
Open in desktop
Expand Up @@ -148,23 +148,23 @@
color = "#FF0000"

/obj/item/melee/touch_attack/raisehand/afterattack(atom/target, mob/living/carbon/user, proximity)
var/mob/living/carbon/human/M = target
if(!ishuman(M) || M.stat != DEAD)
to_chat(user, span_notice("You must be targeting a dead humanoid!"))
var/mob/living/M = target
if(M.stat != DEAD)
to_chat(user, span_notice("Your target must be dead!"))
return
if(GLOB.bloodmen_list.len > 2)
to_chat(user, span_notice("You can't control that many minions!"))
return
if(NOBLOOD in M.dna.species.species_traits)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
to_chat(M, span_notice("Your head pounds as you raise a bloodman!"))
if(NOBLOOD in user.dna.species.species_traits)
user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
to_chat(user, span_notice("Your head pounds as you raise a bloodman!"))
else
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/bloodman/L = new(M.loc)
L.stored_mob = M
M.forceMove(L)
qdel(src)
user.blood_volume -= 25
user.blood_volume -= 25
to_chat(user, span_notice("You curse the body with your blood, leaving you feeling a bit light-headed."))

/obj/item/melee/touch_attack/pacifism
Expand Down