cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-13 11:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5713 from Citadel-Station-13/upstream-merge-35930

Browse Source 
[MIRROR] Blood Cult Conversion Fixes
This commit is contained in:
deathride58
2018-02-26 00:28:29 +00:00
committed by GitHub
parent 2c84c6a040 51e2001a6e
commit 509148f7f3
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/antagonists/cult/blood_magic.dm
View File

@@ -525,7 +525,7 @@
. = ..() . = ..()
//Construction: Creates a construct shell out of 25 metal sheets, or converts plasteel into runed metal //Construction: Creates a construct shell out of 50 metal sheets, or converts plasteel into runed metal
/obj/item/melee/blood_magic/construction /obj/item/melee/blood_magic/construction
name = "Corrupting Aura" name = "Corrupting Aura"
desc = "Corrupts metal and plasteel into more sinister forms." desc = "Corrupts metal and plasteel into more sinister forms."
@@ -546,12 +546,12 @@
to_chat(user, "<span class='warning'>You need 50 metal to produce a construct shell!</span>") to_chat(user, "<span class='warning'>You need 50 metal to produce a construct shell!</span>")
else if(istype(target, /obj/item/stack/sheet/plasteel)) else if(istype(target, /obj/item/stack/sheet/plasteel))
var/obj/item/stack/sheet/plasteel/candidate = target var/obj/item/stack/sheet/plasteel/candidate = target
var/quantity = min(candidate.amount, uses) var/quantity = candidate.amount
uses -= quantity if(candidate.use(quantity))
new /obj/item/stack/sheet/runed_metal(T,quantity) uses --
candidate.use(quantity) new /obj/item/stack/sheet/runed_metal(T,quantity)
to_chat(user, "<span class='warning'>A dark cloud eminates from you hand and swirls around the plasteel, transforming it into runed metal!</span>") to_chat(user, "<span class='warning'>A dark cloud eminates from you hand and swirls around the plasteel, transforming it into runed metal!</span>")
SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25)) SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
else if(istype(target,/mob/living/silicon/robot)) else if(istype(target,/mob/living/silicon/robot))
var/mob/living/silicon/robot/candidate = target var/mob/living/silicon/robot/candidate = target
if(candidate.mmi) if(candidate.mmi)

3
code/modules/antagonists/cult/runes.dm
View File

@@ -133,7 +133,8 @@ structure_check() searches for nearby cultist structures required for the invoca
var/C = pick_n_take(invokers) var/C = pick_n_take(invokers)
if(!C) if(!C)
break break
chanters += C if(C != user)
chanters += C
return chanters return chanters
/obj/effect/rune/proc/invoke(var/list/invokers) /obj/effect/rune/proc/invoke(var/list/invokers)

1
code/modules/spells/spell_types/construct_spells.dm
View File

@@ -302,6 +302,7 @@
/obj/effect/proc_holder/spell/targeted/inflict_handler/juggernaut /obj/effect/proc_holder/spell/targeted/inflict_handler/juggernaut
name = "Gauntlet Echo" name = "Gauntlet Echo"
alpha = 180
amt_dam_brute = 30 amt_dam_brute = 30
amt_knockdown = 50 amt_knockdown = 50
sound = 'sound/weapons/punch3.ogg' sound = 'sound/weapons/punch3.ogg'