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

Merge branch 'master' into upstream-merge-37476

Browse Source
This commit is contained in:
deathride58
2018-05-06 07:07:02 +00:00
committed by GitHub
parent 892cb0a1be 11c1e8fbf7
commit 6a07a66cb3
738 changed files with 10463 additions and 18840 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/spell_types/construct_spells.dm
+2 -2
View File
@@ -91,14 +91,14 @@
action_icon_state = "summonsoulstone"
action_background_icon_state = "bg_demon"
summon_type = list(/obj/item/device/soulstone)
summon_type = list(/obj/item/soulstone)
/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/cult
cult_req = 1
charge_max = 3600
/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/noncult
summon_type = list(/obj/item/device/soulstone/anybody)
summon_type = list(/obj/item/soulstone/anybody)
/obj/effect/proc_holder/spell/targeted/forcewall/cult
name = "Shield"
code/modules/spells/spell_types/devil.dm
+1 -1
View File
@@ -21,7 +21,7 @@
item_type = /obj/item/twohanded/pitchfork/demonic/ascended
/obj/effect/proc_holder/spell/targeted/conjure_item/violin
item_type = /obj/item/device/instrument/violin/golden
item_type = /obj/item/instrument/violin/golden
desc = "A devil's instrument of choice. Use this to summon/unsummon your golden violin."
invocation_type = "whisper"
invocation = "I aint have this much fun since Georgia."
code/modules/spells/spell_types/lichdom.dm
+1 -1
View File
@@ -34,7 +34,7 @@
for(var/obj/item in hand_items)
// I ensouled the nuke disk once. But it's probably a really
// mean tactic, so probably should discourage it.
if((item.flags_1 & ABSTRACT_1) || (item.flags_1 & NODROP_1) || (item.flags_2 & STATIONLOVING_2))
if((item.flags_1 & ABSTRACT_1) || (item.flags_1 & NODROP_1) || item.SendSignal(COMSIG_ITEM_IMBUE_SOUL, user))
continue
marked_item = item
to_chat(M, "<span class='warning'>You begin to focus your very being into [item]...</span>")
code/modules/spells/spell_types/rightandwrong.dm
+2 -2
View File
@@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(summoned_magic, list(
/obj/item/voodoo,
/obj/item/warpwhistle,
/obj/item/clothing/suit/space/hardsuit/shielded/wizard,
/obj/item/device/immortality_talisman,
/obj/item/immortality_talisman,
/obj/item/melee/ghost_sword))
GLOBAL_LIST_INIT(summoned_special_magic, list(
@@ -78,7 +78,7 @@ GLOBAL_LIST_INIT(summoned_special_magic, list(
/obj/item/storage/belt/wands/full,
/obj/item/antag_spawner/contract,
/obj/item/gun/magic/staff/chaos,
/obj/item/device/necromantic_stone,
/obj/item/necromantic_stone,
/obj/item/blood_contract))
// If true, it's the probability of triggering "survivor" antag.