shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cult fixes

Browse Source
This commit is contained in:
Linzolle
2019-09-20 16:38:37 -05:00
parent 8182eda2cb
commit deeceafb77
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/cult/blood_magic.dm
+9 -5
View File
@@ -644,6 +644,10 @@
desc = "A spell that will absorb blood from anything you touch.<br>Touching cultists and constructs can heal them.<br><b>Clicking the hand will potentially let you focus the spell into something stronger.</b>" desc = "A spell that will absorb blood from anything you touch.<br>Touching cultists and constructs can heal them.<br><b>Clicking the hand will potentially let you focus the spell into something stronger.</b>"
color = "#7D1717" color = "#7D1717"
/obj/item/melee/blood_magic/manipulator/examine(mob/user)
. = ..()
to_chat(user, "<span class='cultitalic'>The [name] currently has <b>[uses]</b> blood charges left.</span>")
/obj/item/melee/blood_magic/manipulator/afterattack(atom/target, mob/living/carbon/human/user, proximity) /obj/item/melee/blood_magic/manipulator/afterattack(atom/target, mob/living/carbon/human/user, proximity)
if(proximity) if(proximity)
if(ishuman(target)) if(ishuman(target))
@@ -678,9 +682,9 @@
if(ratio>1) if(ratio>1)
ratio = 1 ratio = 1
uses -= round(overall_damage) uses -= round(overall_damage)
H.visible_message("<span class='warning'>[H] is fully healed by [H==user ? "[H.p_their()]":"[H]'s"]'s blood magic!</span>") H.visible_message("<span class='warning'>[H] is fully healed by [H==user ? "[H.p_their()]":"[user]'s"] blood magic!</span>")
else else
H.visible_message("<span class='warning'>[H] is partially healed by [H==user ? "[H.p_their()]":"[H]'s"] blood magic.</span>") H.visible_message("<span class='warning'>[H] is partially healed by [H==user ? "[H.p_their()]":"[user]'s"] blood magic.</span>")
uses = 0 uses = 0
ratio *= -1 ratio *= -1
H.adjustOxyLoss((overall_damage*ratio) * (H.getOxyLoss() / overall_damage), 0) H.adjustOxyLoss((overall_damage*ratio) * (H.getOxyLoss() / overall_damage), 0)
@@ -762,7 +766,7 @@
switch(choice) switch(choice)
if("Blood Spear (150)") if("Blood Spear (150)")
if(uses < 150) if(uses < 150)
to_chat(user, "<span class='cultitalic'>You need 200 charges to perform this rite.</span>") to_chat(user, "<span class='cultitalic'>You need 150 charges to perform this rite.</span>")
else else
uses -= 150 uses -= 150
var/turf/T = get_turf(user) var/turf/T = get_turf(user)
@@ -778,7 +782,7 @@
"<span class='cultitalic'>A [rite.name] materializes at your feet.</span>") "<span class='cultitalic'>A [rite.name] materializes at your feet.</span>")
if("Blood Bolt Barrage (300)") if("Blood Bolt Barrage (300)")
if(uses < 300) if(uses < 300)
to_chat(user, "<span class='cultitalic'>You need 400 charges to perform this rite.</span>") to_chat(user, "<span class='cultitalic'>You need 300 charges to perform this rite.</span>")
else else
var/obj/rite = new /obj/item/gun/ballistic/shotgun/boltaction/enchanted/arcane_barrage/blood() var/obj/rite = new /obj/item/gun/ballistic/shotgun/boltaction/enchanted/arcane_barrage/blood()
uses -= 300 uses -= 300
@@ -790,7 +794,7 @@
qdel(rite) qdel(rite)
if("Blood Beam (500)") if("Blood Beam (500)")
if(uses < 500) if(uses < 500)
to_chat(user, "<span class='cultitalic'>You need 600 charges to perform this rite.</span>") to_chat(user, "<span class='cultitalic'>You need 500 charges to perform this rite.</span>")
else else
var/obj/rite = new /obj/item/blood_beam() var/obj/rite = new /obj/item/blood_beam()
uses -= 500 uses -= 500
code/modules/antagonists/cult/cult_items.dm
+1
View File
@@ -666,6 +666,7 @@
righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi' righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
slot_flags = 0 slot_flags = 0
force = 17 force = 17
force_unwielded = 17
force_wielded = 24 force_wielded = 24
throwforce = 40 throwforce = 40
throw_speed = 2 throw_speed = 2