mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 19:47:22 +01:00
its getting hot in here....
This commit is contained in:
@@ -42,14 +42,14 @@
|
||||
throwforce = 25
|
||||
var/cooldown = 0
|
||||
|
||||
/obj/item/weapon/melee/cultblade/dagger/attack(mob/living/target, mob/living/carbon/human/user)
|
||||
/obj/item/weapon/melee/cultblade/dagger/afterattack(mob/living/target, mob/living/carbon/human/user)
|
||||
..()
|
||||
if(cooldown <= world.time && prob(50) && !target.stat)
|
||||
if(ishuman(target))
|
||||
if(ishuman(target))
|
||||
var/mob/living/carbon/human/bleeder = target
|
||||
if(cooldown <= world.time && prob(50) && (!bleeder.stat || (!bleeder.species.flags & NO_BLOOD)))
|
||||
visible_message("<span class='warning'>The runes on the blade absorb the blood of [target]!</span>")
|
||||
var/mob/living/carbon/human/H = target
|
||||
H.drip(500)
|
||||
cooldown = world.time + 2400
|
||||
bleeder.drip(500)
|
||||
cooldown = world.time + 2400
|
||||
|
||||
|
||||
/obj/item/weapon/legcuffs/bolas/cult
|
||||
|
||||
@@ -226,9 +226,6 @@
|
||||
if(ticker.mode.name == "cult")
|
||||
if(!canbypass == 1)//not an admin-tome, check things
|
||||
var/datum/game_mode/cult/cult_mode = ticker.mode
|
||||
if(!("eldergod" in cult_mode.objectives) || !("slughter" in cult_mode.objectives))
|
||||
to_chat(user, "<span class='warning'>[cult_mode.cultdat.entity_name]'s power does not wish to be unleashed!</span>")
|
||||
return
|
||||
if(!cult_mode.narsie_condition_cleared)
|
||||
to_chat(user, "<span class='warning'>There is still more to do before unleashing [cult_mode.cultdat.entity_name] power!</span>")
|
||||
return
|
||||
@@ -238,6 +235,9 @@
|
||||
if(cult_mode.demons_summoned)
|
||||
to_chat(user, "<span class='cultlarge'>\"We are already here. There is no need to try to summon us now.\"</span>")
|
||||
return
|
||||
if(!("eldergod" in cult_mode.objectives) || !("slughter" in cult_mode.objectives))
|
||||
to_chat(user, "<span class='warning'>[cult_mode.cultdat.entity_name]'s power does not wish to be unleashed!</span>")
|
||||
return
|
||||
var/confirm_final = alert(user, "This is the FINAL step to summon Nar-Sie, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for Nar-Sie!", "No")
|
||||
if(confirm_final == "No")
|
||||
to_chat(user, "<span class='cult'>You decide to prepare further before scribing the rune.</span>")
|
||||
@@ -254,8 +254,8 @@
|
||||
var/mob/living/carbon/human/H = user
|
||||
var/dam_zone = pick("head", "chest", "groin", "l_arm", "l_hand", "r_arm", "r_hand", "l_leg", "l_foot", "r_leg", "r_foot")
|
||||
var/obj/item/organ/external/affecting = H.get_organ(ran_zone(dam_zone))
|
||||
user.visible_message("<span class='warning'>[user] cuts open their \the [affecting] and begins writing in their own blood!</span>", "<span class='cult'>You slice open your [affecting] and begin drawing a sigil of [ticker.mode.cultdat.entity_title3].</span>")
|
||||
user.apply_damage(initial(rune_to_scribe.scribe_damage), ticker.mode.cultdat.dam_type, affecting)
|
||||
user.visible_message("<span class='warning'>[user] cuts open their \The [affecting] and begins writing in their own blood!</span>", "<span class='cult'>You slice open your [affecting] and begin drawing a sigil of [ticker.mode.cultdat.entity_title3].</span>")
|
||||
user.apply_damage(initial(rune_to_scribe.scribe_damage), BRUTE , affecting)
|
||||
if(!do_after(user, initial(rune_to_scribe.scribe_delay)-scribereduct, target = get_turf(user)))
|
||||
for(var/V in shields)
|
||||
var/obj/machinery/shield/S = V
|
||||
|
||||
@@ -39,7 +39,7 @@ var/runetype = "rune"
|
||||
I.Blend(icon('icons/effects/uristrunes.dmi', "[runetype]-[1 << i]"), ICON_OVERLAY)
|
||||
|
||||
|
||||
I.SwapColor(rgb(0, 0, 0, 100), rgb(100, 0, 0, 200))
|
||||
I.SwapColor(rgb(0, 0, 0, 100), rgb(100, 0, 0, 200))//TO DO COMMENT:NEED TO ADJUST FOR DIFFRNET CULTS
|
||||
I.SwapColor(rgb(0, 0, 0, 50), rgb(150, 0, 0, 200))
|
||||
|
||||
for(var/x = 1, x <= 32, x++)
|
||||
|
||||
@@ -8,10 +8,8 @@
|
||||
|
||||
/turf/simulated/wall/cult/New()
|
||||
new /obj/effect/overlay/temp/cult/turf(src)
|
||||
..()
|
||||
//if(ticker.mode.cultdat.theme != "blood")//THE ONLY REASON THIS IS COMMENTED OUT IF CUASE I NEED TO FIGURE OUT THIS SHIT WITH WALL SMOOTHING
|
||||
// icon = 'icons/turf/walls/cult_[ticker.mode.cultdat.theme]_wall.dmi'//CALM YOUR TITS
|
||||
icon_state = ticker.mode.cultdat.cult_wall_icon_state
|
||||
..()
|
||||
|
||||
/turf/simulated/wall/cult/artificer
|
||||
name = "runed stone wall"
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
..()
|
||||
name = "[ticker.mode.cultdat.get_name(const_type)] ([rand(1, 1000)])"
|
||||
real_name = ticker.mode.cultdat.get_name(const_type)
|
||||
icon_living = ticker.mode.cultdat.get_icon(const_type)
|
||||
icon_state = ticker.mode.cultdat.get_icon(const_type)
|
||||
for(var/spell in construct_spells)
|
||||
AddSpell(new spell(null))
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.6 KiB |
Reference in New Issue
Block a user