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

Update mind.dm

Browse Source
This commit is contained in:
LetterJay
2017-10-18 06:27:40 -05:00
committed by GitHub
parent 2ecb4c216c
commit f4faabc87c
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mind.dm
-13
View File
@@ -1435,19 +1435,6 @@
add_antag_datum(head) add_antag_datum(head)
special_role = "Head Revolutionary" special_role = "Head Revolutionary"
<<<<<<< HEAD
SSticker.mode.forge_revolutionary_objectives(src)
SSticker.mode.greet_revolutionary(src,0)
var/list/L = current.get_contents()
var/obj/item/device/assembly/flash/flash = locate() in L
qdel(flash)
take_uplink()
var/fail = 0
fail |= !SSticker.mode.equip_revolutionary(current)
=======
>>>>>>> bfc5a2c... Datum rev & related upgrades to base datum antag (#31630)
/datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/S) /datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/S)
spell_list += S spell_list += S
S.action.Grant(current) S.action.Grant(current)