diff --git a/code/modules/antagonists/cult/cult_armor.dm b/code/modules/antagonists/cult/cult_armor.dm index 3bff16cf191..6afd0fa2a46 100644 --- a/code/modules/antagonists/cult/cult_armor.dm +++ b/code/modules/antagonists/cult/cult_armor.dm @@ -231,64 +231,6 @@ icon_state = "cult_hoodalt" armor_type = /obj/item/clothing/suit/hooded/cultrobes/cult_shield::armor_type -/** - * Flagellant's robes - * Special type gained from the daemon forge. - * Provides negative armor and no protection against space, - * but gives you a 30% (60% if hooded) speed boost to the user. - */ -/obj/item/clothing/suit/hooded/cultrobes/berserker - name = "flagellant's robes" - desc = "Blood-soaked robes infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage. Provides an even greater speed boost if its hood is worn." - armor_type = /datum/armor/cultrobes_berserker - slowdown = -0.3 //the hood gives an additional -0.3 if you have it flipped up, for a total of -0.6 - hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/berserkerhood - ///Boolean on whether we've given the forced gravity trait, to keep track of it. - var/gave_gravity = FALSE - -/datum/armor/cultrobes_berserker - melee = -45 - bullet = -45 - laser = -45 - energy = -55 - bomb = -45 - -/obj/item/clothing/suit/hooded/cultrobes/berserker/equipped(mob/living/user, slot) - . = ..() - if(!(slot_flags & slot)) - return - START_PROCESSING(SSprocessing, src) - -/obj/item/clothing/suit/hooded/cultrobes/berserker/dropped(mob/living/user) - STOP_PROCESSING(SSprocessing, src) - gave_gravity = FALSE - return ..() - -/obj/item/clothing/suit/hooded/cultrobes/berserker/process(seconds_per_tick) - var/mob/living/carbon/wearer = loc - if(!istype(wearer)) - return ..() - - if(IS_CULTIST(wearer)) - if (!gave_gravity) - return - wearer.RemoveElement(/datum/element/forced_gravity, gravity = 6, ignore_turf_gravity = TRUE, can_override = FALSE) - gave_gravity = FALSE - return - - if(gave_gravity) - return - - gave_gravity = TRUE - wearer.AddElement(/datum/element/forced_gravity, gravity = 6, ignore_turf_gravity = TRUE, can_override = FALSE) - to_chat(wearer, span_warning("As you equip [src], everything begins to feel a whole lot heavier!")) - -/obj/item/clothing/head/hooded/cult_hoodie/berserkerhood - name = "flagellant's hood" - desc = "A blood-soaked hood infused with dark magic." - armor_type = /obj/item/clothing/suit/hooded/cultrobes/berserker::armor_type - slowdown = /obj/item/clothing/suit/hooded/cultrobes/berserker::slowdown - /** * Zealot's blindfold * Version of night vision health HUDs that only cultists can use. diff --git a/code/modules/antagonists/cult/cult_structure_forge.dm b/code/modules/antagonists/cult/cult_structure_forge.dm index 016df8c7594..689cdd2edcb 100644 --- a/code/modules/antagonists/cult/cult_structure_forge.dm +++ b/code/modules/antagonists/cult/cult_structure_forge.dm @@ -22,11 +22,6 @@ OUTPUT_ITEMS = list(/obj/item/clothing/suit/hooded/cultrobes/hardened), RADIAL_DESC = "Smiths a set of [/obj/item/clothing/suit/hooded/cultrobes/hardened::name], a robust suit of armor that can withstand space.", ), - FLAGELLANT_ARMOR = list( - PREVIEW_IMAGE = image(icon = 'icons/obj/clothing/suits/armor.dmi', icon_state = "cultrobes"), - OUTPUT_ITEMS = list(/obj/item/clothing/suit/hooded/cultrobes/berserker), - RADIAL_DESC = "Smiths a set of [/obj/item/clothing/suit/hooded/cultrobes/berserker::name], a robe which makes you far more vulnerable to damage, but drastically increases your speed.", - ), ELDRITCH_SWORD = list( PREVIEW_IMAGE = image(icon = 'icons/obj/weapons/sword.dmi', icon_state = "cultblade"), OUTPUT_ITEMS = list(/obj/item/melee/cultblade), diff --git a/code/modules/deathmatch/deathmatch_loadouts.dm b/code/modules/deathmatch/deathmatch_loadouts.dm index 80d1a9875ee..2cfceda067b 100644 --- a/code/modules/deathmatch/deathmatch_loadouts.dm +++ b/code/modules/deathmatch/deathmatch_loadouts.dm @@ -945,9 +945,9 @@ desc = "Prove Nar'sie's superiority with your well-balanced blood magicks." //species_override = /datum/species/plasmaman - head = /obj/item/clothing/head/hooded/cult_hoodie/berserkerhood + head = /obj/item/clothing/head/hooded/cult_hoodie neck = /obj/item/clothing/neck/heretic_focus/crimson_medallion - suit = /obj/item/clothing/suit/hooded/cultrobes/berserker + suit = /obj/item/clothing/suit/hooded/cultrobes suit_store = /obj/item/melee/sickly_blade/cursed uniform = /obj/item/clothing/under/color/red id_trim = null