Merge pull request #962 from ZomgPonies/superhero2

Superhero Overhaul Bugfix #1
This commit is contained in:
Fox-McCloud
2015-05-07 02:18:08 -04:00
6 changed files with 18 additions and 4 deletions
+1 -1
View File
@@ -1397,7 +1397,7 @@
usr.client.cmd_admin_slimeize(H)
else if(href_list["makeslime"])
else if(href_list["makesuper"])
if(!check_rights(R_SPAWN)) return
var/mob/living/carbon/human/H = locate(href_list["makesuper"])
+14 -1
View File
@@ -5,6 +5,7 @@
/datum/superheroes
var/name
var/desc
var/class
var/list/default_genes = list(REGEN, NO_BREATH, RESIST_COLD)
var/list/default_spells = list()
@@ -51,9 +52,14 @@
H.equip_to_slot_or_del(W, slot_wear_id)
H.regenerate_icons()
H << desc
/datum/superheroes/owlman
name = "Owlman"
class = "Superhero"
desc = "You are Owlman, the oldest and some say greatest superhero this station has ever known. You have faced countless \
foes, and protected the station for years. Your tech gadgets make you a force to be reckoned with. You are the hero this \
station deserves."
/datum/superheroes/owlman/equip(var/mob/living/carbon/human/H)
..()
@@ -70,6 +76,9 @@
name = "The Griffin"
default_spells = list(/obj/effect/proc_holder/spell/wizard/targeted/recruit)
class = "Supervillain"
desc = "You are The Griffin, the ultimate supervillain. You thrive on chaos and have no respect for the supposed authority \
of the command staff of this station. Along with your gang of dim-witted yet trusty henchmen, you will be able to execute \
the most dastardly plans."
/datum/superheroes/griffin/equip(var/mob/living/carbon/human/H)
..()
@@ -82,8 +91,11 @@
/datum/superheroes/lightnian
name = "LightnIan"
default_spells = list(/obj/effect/proc_holder/spell/wizard/targeted/lightning/lightnian)
class = "Superhero"
desc = "You are LightnIan, the lord of lightning! A freak electrical accident while working in the station's kennel \
has given you mastery over lightning and a peculiar desire to sniff butts. Although you are a recent addition to the \
station's hero roster, you intend to leave your mark."
default_spells = list(/obj/effect/proc_holder/spell/wizard/targeted/lightning/lightnian)
/datum/superheroes/lightnian/equip(var/mob/living/carbon/human/H)
..()
@@ -112,6 +124,7 @@
charge_max = 450
clothes_req = 0
range = 1 //Adjacent to user
icon_power_button = "spell_greytide"
var/recruiting = 0
/obj/effect/proc_holder/spell/wizard/targeted/recruit/cast(list/targets)