mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-27 06:54:18 +01:00
Cult buffs. (#17373)
* 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
co-authored by
Fluffy
Matt Atlas
Fluffy
Matt Atlas
parent
8c27f481db
commit
0a3531b09e
@@ -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
|
||||
)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
# balance
|
||||
# admin
|
||||
# backend
|
||||
# security
|
||||
# refactor
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: MattAtlas
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- tweak: "The blood boil rune now explains how it works better. It also now affects all mobs within 5 tiles of it, without respecting eyesight."
|
||||
- tweak: "The cult altar heal now refreshes every 15 seconds instead of every 2 minutes. It also restores blood now."
|
||||
- tweak: "Buffed cult robes to match heavy armour."
|
||||
Reference in New Issue
Block a user