cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes to holy explosion and the spawned nades (#56424)

Browse Source
This commit is contained in:
Tlaltecuhtli
2021-02-02 17:49:46 +01:00
committed by GitHub
parent d45477f79c
commit e662841936
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+15 -13
View File
@@ -131,14 +131,19 @@
required_reagents = list(/datum/reagent/water = 1, /datum/reagent/potassium = 1)
strengthdiv = 20
/datum/chemical_reaction/reagent_explosion/potassium_explosion/holyboom
/datum/chemical_reaction/reagent_explosion/holyboom
required_reagents = list(/datum/reagent/water/holywater = 1, /datum/reagent/potassium = 1)
strengthdiv = 20
/datum/chemical_reaction/reagent_explosion/potassium_explosion/holyboom/on_reaction(datum/reagents/holder, created_volume)
/datum/chemical_reaction/reagent_explosion/holyboom/on_reaction(datum/reagents/holder, created_volume)
if(created_volume >= 150)
playsound(get_turf(holder.my_atom), 'sound/effects/pray.ogg', 80, FALSE, round(created_volume/48))
strengthdiv = 8
for(var/mob/living/simple_animal/revenant/R in get_hearers_in_view(7,get_turf(holder.my_atom)))
///turf where to play sound
var/turf/T = get_turf(holder.my_atom)
///special size for anti cult effect
var/effective_size = round(created_volume/48)
playsound(T, 'sound/effects/pray.ogg', 80, FALSE, effective_size)
for(var/mob/living/simple_animal/revenant/R in get_hearers_in_view(7,T))
var/deity
if(GLOB.deity)
deity = GLOB.deity
@@ -148,17 +153,14 @@
R.stun(20)
R.reveal(100)
R.adjustHealth(50)
addtimer(CALLBACK(src, .proc/divine_explosion, round(created_volume/48,1),get_turf(holder.my_atom)), 2 SECONDS)
for(var/mob/living/carbon/C in get_hearers_in_view(effective_size,T))
if(iscultist(C))
to_chat(C, "<span class='userdanger'>The divine explosion sears you!</span>")
C.Paralyze(40)
C.adjust_fire_stacks(5)
C.IgniteMob()
..()
/datum/chemical_reaction/reagent_explosion/potassium_explosion/holyboom/proc/divine_explosion(size, turf/T)
for(var/mob/living/carbon/C in get_hearers_in_view(size,T))
if(iscultist(C))
to_chat(C, "<span class='userdanger'>The divine explosion sears you!</span>")
C.Paralyze(40)
C.adjust_fire_stacks(5)
C.IgniteMob()
/datum/chemical_reaction/gunpowder
results = list(/datum/reagent/gunpowder = 3)
required_reagents = list(/datum/reagent/saltpetre = 1, /datum/reagent/medicine/c2/multiver = 1, /datum/reagent/sulfur = 1)