From 2cb22ac64705bedad48976db17d69feb7bcb7827 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Tue, 5 May 2015 19:52:38 -0400 Subject: [PATCH] Finished adding LightnIan and the spells datum stuff --- code/datums/spells/lightning.dm | 3 +- code/modules/clothing/head/misc.dm | 2 +- code/modules/clothing/suits/miscellaneous.dm | 1 + code/modules/mob/living/carbon/superheros.dm | 31 ++++++++++++++++++-- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/code/datums/spells/lightning.dm b/code/datums/spells/lightning.dm index 9e4994b5b9d..a8b1d454572 100644 --- a/code/datums/spells/lightning.dm +++ b/code/datums/spells/lightning.dm @@ -3,7 +3,7 @@ desc = "Throws a lightning bolt at the nearby enemy. Classic." charge_type = "recharge" charge_max = 300 - clothes_req = 1 + clothes_req = 0 invocation = "UN'LTD P'WAH!" invocation_type = "shout" range = 7 @@ -13,6 +13,7 @@ var/energy = 0 var/ready = 0 var/image/halo = null + icon_power_button = "spell_tech" /obj/effect/proc_holder/spell/wizard/targeted/lightning/Click() if(!ready) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index e0741ed1ac7..753f0454fe7 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -237,7 +237,7 @@ desc = "Woof!" icon_state = "corgihead" item_state = "chickensuit" - flags = BLOCKHAIR + flags = BLOCKHAIR | NODROP siemens_coefficient = 2.0 /obj/item/clothing/head/bearpelt diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 1655618eb8f..6b5b86e00f5 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -156,6 +156,7 @@ body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET flags_inv = HIDESHOES|HIDEJUMPSUIT siemens_coefficient = 2.0 + flags = NODROP /obj/item/clothing/suit/monkeysuit name = "Monkey Suit" diff --git a/code/modules/mob/living/carbon/superheros.dm b/code/modules/mob/living/carbon/superheros.dm index 7d6891bcfb8..9de25fcd5d1 100644 --- a/code/modules/mob/living/carbon/superheros.dm +++ b/code/modules/mob/living/carbon/superheros.dm @@ -12,12 +12,18 @@ /datum/superheros/proc/assign_genes(var/mob/living/carbon/human/H) if(default_genes.len) - for(var/gene in default_genes.len) + for(var/gene in default_genes) H.mutations |= gene H.update_mutations() return /datum/superheros/proc/assign_spells(var/mob/living/carbon/human/H) + if(default_spells.len) + for(var/spell in default_spells) + var/obj/effect/proc_holder/spell/wizard/S = spell + if(!S) return + H.spell_list += new S + H.update_power_buttons() return @@ -64,7 +70,26 @@ H.regenerate_icons() -/* Dont fill out until ready (sprites + powers) + /datum/superheros/lightnian name = "LightnIan" -*/ + default_genes = list(REGEN, NO_BREATH) + default_spells = list(/obj/effect/proc_holder/spell/wizard/targeted/lightning) + +/datum/superheros/lightnian/equip(var/mob/living/carbon/human/H) + ..() + + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/brown(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(H), slot_gloves) + + var/obj/item/weapon/card/id/syndicate/W = new(H) + W.name = "[H.real_name]'s ID Card (Superhero)" + W.access = get_all_accesses() + W.assignment = "Superhero" + W.registered_name = H.real_name + H.equip_to_slot_or_del(W, slot_wear_id) + + H.regenerate_icons()