cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 00:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cult buffs. (#17373)

Browse Source 
* Cult buffs.

* Update code/game/gamemodes/cult/structures/altar.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
This commit is contained in:
Matt Atlas
2023-10-05 21:20:49 +02:00
committed by GitHub
parent 8c27f481db
commit 0a3531b09e
5 changed files with 56 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/gamemodes/cult/items/clothes.dm
View File

@@ -7,8 +7,8 @@
body_parts_covered = HEAD|EYES
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MEDIUM,
laser = ARMOR_LASER_MEDIUM,
bullet = ARMOR_BALLISTIC_CARBINE,
laser = ARMOR_LASER_RIFLE,
bomb = ARMOR_BOMB_PADDED,
bio = ARMOR_BIO_SMALL
)
@@ -34,8 +34,8 @@
allowed = list(/obj/item/book/tome, /obj/item/melee/cultblade)
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MEDIUM,
laser = ARMOR_LASER_MEDIUM,
bullet = ARMOR_BALLISTIC_CARBINE,
laser = ARMOR_LASER_RIFLE,
bomb = ARMOR_BOMB_PADDED,
bio = ARMOR_BIO_SMALL
)

4
code/game/gamemodes/cult/runes/blood_boil.dm
View File

@@ -1,6 +1,6 @@
/datum/rune/blood_boil
name = "blood boiling rune"
desc = "A rune used to evaporate the blood of the non-believers. Show them the will of the Dark One!"
desc = "A rune used to evaporate the blood of the non-believers. Show them the will of the Dark One! This rune needs three cultists around it (within a 1 tile radius) to be used. It will then damage any non-cultists in a 5 tile area, without respecting eyesight."
rune_flags = NO_TALISMAN
/datum/rune/blood_boil/do_rune_action(mob/living/user, atom/movable/A) //cultists need at least one DANGEROUS rune. Even if they're all stealthy.
@@ -10,7 +10,7 @@
if(iscultist(C) && !C.stat)
cultists += C
if(length(cultists) >= 3)
for(var/mob/living/carbon/M in viewers(user))
for(var/mob/living/carbon/M in orange(5, user))
if(iscultist(M))
continue
var/obj/item/nullrod/N = locate() in M

7
code/game/gamemodes/cult/structures/altar.dm
View File

@@ -9,7 +9,7 @@
. = ..()
if(iscultist(user) && ishuman(user))
if(last_use <= world.time)
last_use = world.time + 1200 // Cooldown of two minutes
last_use = world.time + 15 SECONDS // Cooldown of 15 seconds.
var/mob/living/carbon/human/H = user
H.heal_overall_damage(20, 20)
to_chat(H, SPAN_CULT("You begin your prayer to Nar'Sie, your wounds slowly closing up..."))
@@ -29,6 +29,11 @@
if(do_after(user, 2 SECONDS, do_flags = DO_USER_UNIQUE_ACT | DO_FAIL_FEEDBACK | DO_SHOW_PROGRESS))
O.status &= ~ORGAN_BROKEN
O.update_damages()
if(NOT_FLAG(H.species.flags, NO_BLOOD))
var/total_blood = REAGENT_VOLUME(H.vessel, /singleton/reagent/blood)
var/blood_to_add = H.species.blood_volume * 0.45
if(total_blood < blood_to_add)
H.vessel.add_reagent(/singleton/reagent/blood, blood_to_add, temperature = H.species.body_temperature)
else
to_chat(user, SPAN_WARNING("This altar isn't ready to be prayed at yet."))
else

2
code/modules/mob/living/carbon/human/human_damage.dm
View File

@@ -362,7 +362,7 @@ This function restores the subjects blood to max.
/mob/living/carbon/human/proc/restore_blood()
if(!(species.flags & NO_BLOOD))
var/total_blood = REAGENT_VOLUME(vessel, /singleton/reagent/blood)
vessel.add_reagent(/singleton/reagent/blood,560.0-total_blood, temperature = species.body_temperature)
vessel.add_reagent(/singleton/reagent/blood, species.blood_volume - total_blood, temperature = species.body_temperature)
/*