Buffs the Battlemage Armor, deletes Battlemage Armor charges (#21999)

* Buffs the Battlemage Armor, deletes Battlemage Armor charges

* Update code/modules/clothing/suits/wiz_robe.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update spellbook.dm

* Update code/game/gamemodes/wizard/spellbook.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/clothing/suits/wiz_robe.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update wiz_robe.dm

* Update wiz_robe.dm

* Update wiz_robe.dm

* Balance team suggestions

* Update spellbook.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
PopeDaveThe3th
2023-08-28 13:16:42 +01:00
committed by GitHub
co-authored by Henri215 DGamerL
parent 86a8690907
commit 4386ff381d
2 changed files with 16 additions and 35 deletions
+14 -26
View File
@@ -186,27 +186,30 @@
/obj/item/clothing/suit/space/hardsuit/shielded/wizard
name = "battlemage armor"
desc = "Not all wizards are afraid of getting up close and personal. Not spaceproof despite its appearance."
desc = "Not all wizards are afraid of getting up close and personal."
icon_state = "hardsuit-wiz"
item_state = "wiz_hardsuit"
recharge_rate = 0
///The amount of charges the suit currently has
current_charges = 15
recharge_cooldown = INFINITY
///The max number of charges the suit can hold
max_charges = 15
shield_state = "shield-red"
shield_on = "shield-red"
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard
armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, RAD = 10, FIRE = INFINITY, ACID = INFINITY)
armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 25, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
slowdown = 0
resistance_flags = FIRE_PROOF | ACID_PROOF
magical = TRUE
/obj/item/clothing/suit/space/hardsuit/shielded/wizard/arch
desc = "For the arch wizard in need of additional protection."
recharge_rate = 1
recharge_cooldown = 0
recharge_rate = 5
recharge_cooldown = 0 SECONDS
current_charges = 15
max_charges = 15
recharge_delay = 1 SECONDS
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard/arch
@@ -217,9 +220,9 @@
icon_state = "hardsuit0-wiz"
item_state = "wiz_helm"
item_color = "wiz"
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, RAD = 10, FIRE = INFINITY, ACID = INFINITY)
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 25, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
actions_types = list() //No inbuilt light
resistance_flags = FIRE_PROOF | ACID_PROOF
magical = TRUE
@@ -231,18 +234,3 @@
desc = "A truly protective helmet."
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
/obj/item/wizard_armour_charge
name = "battlemage shield charges"
desc = "A powerful rune that will increase the number of hits a suit of battlemage armour can take before failing.."
icon = 'icons/effects/effects.dmi'
icon_state = "electricity2"
/obj/item/wizard_armour_charge/afterattack(obj/item/clothing/suit/space/hardsuit/shielded/wizard/W, mob/user)
. = ..()
if(!istype(W))
to_chat(user, "<span class='warning'>The rune can only be used on battlemage armour!</span>")
return
W.current_charges += 8
to_chat(user, "<span class='notice'>You charge [W]. It can now absorb [W.current_charges] hits.</span>")
qdel(src)