From 0a88fea949510b41cddee2de513709b2290a51e7 Mon Sep 17 00:00:00 2001 From: RKz Date: Tue, 9 Apr 2024 20:32:53 -0400 Subject: [PATCH] cult adjustments --- .../LavaRuins/lavaland_surface_cultaltar.dmm | 4 +- _maps/map_files/RadStation/RadStation.dmm | 2 +- code/controllers/subsystem/traumas.dm | 2 +- code/modules/antagonists/cult/blood_magic.dm | 4 +- code/modules/antagonists/cult/cult_items.dm | 87 +++++++++---------- .../mission_code/stationCollision.dm | 2 +- code/modules/cargo/exports/lavaland.dm | 2 +- code/modules/clothing/outfits/standard.dm | 4 +- .../hostile/mining_mobs/hivelord.dm | 2 +- code/modules/spells/spell.dm | 4 +- 10 files changed, 55 insertions(+), 58 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm index 206189a8defc7..215e8cae2858a 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm @@ -44,7 +44,7 @@ "l" = ( /obj/effect/decal/remains/human, /obj/item/clothing/shoes/cult, -/obj/item/clothing/suit/cultrobes, +/obj/item/clothing/suit/hooded/cultrobes, /turf/open/floor/engine/cult{ initial_gas_mix = "o2=14;n2=5;co2=13;TEMP=300" }, @@ -80,7 +80,7 @@ "q" = ( /obj/effect/decal/remains/human, /obj/item/clothing/shoes/cult, -/obj/item/clothing/suit/cultrobes, +/obj/item/clothing/suit/hooded/cultrobes, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/engine/cult{ initial_gas_mix = "o2=14;n2=5;co2=13;TEMP=300" diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm index 09d27979763d7..b846fc60e3178 100644 --- a/_maps/map_files/RadStation/RadStation.dmm +++ b/_maps/map_files/RadStation/RadStation.dmm @@ -38911,7 +38911,7 @@ /turf/open/floor/plating, /area/quartermaster/office) "mjq" = ( -/obj/item/clothing/suit/cultrobes/alt, +/obj/item/clothing/suit/hooded/cultrobes/alt, /obj/item/toy/toy_dagger, /turf/open/floor/iron/cult, /area/chapel/office) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 31bdb15ca5d2d..5953b1ae0efb9 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -161,7 +161,7 @@ SUBSYSTEM_DEF(traumas) "the supernatural" = typecacheof(list( /obj/structure/destructible/cult, /obj/item/tome, /obj/item/melee/cultblade, /obj/item/cult_bastard, /obj/item/restraints/legcuffs/bola/cult, - /obj/item/clothing/suit/cultrobes, /obj/item/clothing/suit/space/hardsuit/cult, + /obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/suit/hooded/cultrobes/hardened, /obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/head/hooded/cult_hoodie, /obj/effect/rune, /obj/item/stack/sheet/runed_metal, /obj/machinery/door/airlock/cult, /obj/eldritch/narsie, /obj/item/soulstone, /obj/item/clockwork, diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 501990340e02e..f69778c645e55 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -664,8 +664,8 @@ var/mob/living/carbon/C = target C.visible_message("Otherworldly armor suddenly appears on [C]!") C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black,ITEM_SLOT_ICLOTHING) - C.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), ITEM_SLOT_OCLOTHING) - C.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(user), ITEM_SLOT_HEAD) + C.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), ITEM_SLOT_OCLOTHING) + C.equip_to_slot_or_del(new /obj/item/clothing/head/hooded/cult_hoodie/alt(user), ITEM_SLOT_HEAD) C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult/alt(user), ITEM_SLOT_FEET) C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), ITEM_SLOT_BACK) if(C == user) diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 23b0f1b4984bd..84c30312c89cf 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -277,7 +277,11 @@ Striking a noncultist, however, will tear their flesh."} . = ..() -/obj/item/clothing/head/culthood + +//THE DRIP + + +/obj/item/clothing/head/hooded/cult_hoodie name = "ancient cultist hood" icon = 'icons/obj/clothing/head/helmet.dmi' worn_icon = 'icons/mob/clothing/head/helmet.dmi' @@ -291,7 +295,7 @@ Striking a noncultist, however, will tear their flesh."} heat_protection = HEAD max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT -/obj/item/clothing/suit/cultrobes +/obj/item/clothing/suit/hooded/cultrobes name = "ancient cultist robes" desc = "A ragged, dusty set of robes. Strange letters line the inside." icon_state = "cultrobes" @@ -306,37 +310,30 @@ Striking a noncultist, however, will tear their flesh."} max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT -/obj/item/clothing/head/culthood/alt +/obj/item/clothing/head/hooded/cult_hoodie/alt name = "cultist hood" desc = "An armored hood worn by the followers of Nar'Sie." icon_state = "cult_hoodalt" - item_state = "cult_hoodalt" - -/obj/item/clothing/head/culthood/alt/ghost - item_flags = DROPDEL - -/obj/item/clothing/head/culthood/alt/ghost/Initialize(mapload) - . = ..() - ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT) + item_state = null -/obj/item/clothing/suit/cultrobes/alt +/obj/item/clothing/suit/hooded/cultrobes/alt name = "cultist robes" desc = "An armored set of robes worn by the followers of Nar'Sie." icon_state = "cultrobesalt" - item_state = "cultrobesalt" + item_state = null + hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/alt -/obj/item/clothing/suit/cultrobes/alt/ghost +/obj/item/clothing/suit/hooded/cultrobes/alt/ghost item_flags = DROPDEL -/obj/item/clothing/suit/cultrobes/alt/ghost/Initialize(mapload) +/obj/item/clothing/suit/hooded/cultrobes/alt/ghost/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT) - /obj/item/clothing/head/magus name = "magus helm" icon_state = "magus" - item_state = "magus" + item_state = null desc = "A helm worn by the followers of Nar'Sie." flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEARS|HIDEEYES|HIDESNOUT armor = list(MELEE = 50, BULLET = 30, LASER = 50, ENERGY = 20, BOMB = 25, BIO = 10, RAD = 0, FIRE = 10, ACID = 10, STAMINA = 50) @@ -346,32 +343,44 @@ Striking a noncultist, however, will tear their flesh."} name = "magus robes" desc = "A set of armored robes worn by the followers of Nar'Sie." icon_state = "magusred" - item_state = "magusred" + icon = 'icons/obj/clothing/suits/wizard.dmi' + worn_icon = 'icons/mob/clothing/suits/wizard.dmi' + item_state = null body_parts_covered = CHEST|GROIN|LEGS|ARMS allowed = list(/obj/item/tome, /obj/item/melee/cultblade) armor = list(MELEE = 50, BULLET = 30, LASER = 50, ENERGY = 20, BOMB = 25, BIO = 10, RAD = 0, FIRE = 10, ACID = 10, STAMINA = 50) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT -/obj/item/clothing/head/helmet/space/hardsuit/cult +/obj/item/clothing/suit/hooded/cultrobes/hardened + name = "\improper Nar'Sien hardened armor" + desc = "A heavily-armored exosuit worn by warriors of the Nar'Sien cult. It can withstand hard vacuum." + icon_state = "cult_armor" + item_state = null + w_class = WEIGHT_CLASS_BULKY + allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/tank/internals) + armor = list(MELEE = 70, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 30, BIO = 30, RAD = 30, FIRE = 40, ACID = 75, STAMINA = 50) + hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/hardened + clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL + flags_inv = HIDEGLOVES | HIDEJUMPSUIT + min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT + max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT + resistance_flags = NONE + +/obj/item/clothing/head/hooded/cult_hoodie/hardened name = "\improper Nar'Sien hardened helmet" desc = "A heavily-armored helmet worn by warriors of the Nar'Sien cult. It is reinforced by hard vacuum." icon_state = "cult_helmet" - item_state = "cult_helmet" + item_state = null armor = list(MELEE = 70, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 30, BIO = 30, RAD = 30, FIRE = 40, ACID = 75, STAMINA = 50) - light_system = NO_LIGHT_SUPPORT - actions_types = list() + clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SNUG_FIT | HEADINTERNALS + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT + min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT + max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT + flash_protect = 2 + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + resistance_flags = NONE high_pressure_multiplier = 0.5 -/obj/item/clothing/suit/space/hardsuit/cult - name = "\improper Nar'Sien hardened armor" - icon_state = "cult_armor" - item_state = "cult_armor" - desc = "A heavily-armored exosuit worn by warriors of the Nar'Sien cult." - w_class = WEIGHT_CLASS_BULKY - allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/tank/internals/) - armor = list(MELEE = 70, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 30, BIO = 30, RAD = 30, FIRE = 40, ACID = 75, STAMINA = 50) - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/cult - /obj/item/sharpener/cult name = "eldritch whetstone" desc = "A block, empowered by dark magic. Sharp weapons will be enhanced when used on the stone." @@ -388,13 +397,9 @@ Striking a noncultist, however, will tear their flesh."} name = "empowered cultist armor" desc = "Empowered armor which creates a powerful shield around the user." icon_state = "cult_armor" - icon = 'icons/obj/clothing/suits/armor.dmi' - worn_icon = 'icons/mob/clothing/suits/armor.dmi' item_state = null w_class = WEIGHT_CLASS_BULKY armor = list(MELEE = 40, BULLET = 30, LASER = 40, ENERGY = 30, BOMB = 50, BIO = 30, RAD = 30, FIRE = 50, ACID = 60, STAMINA = 40) - body_parts_covered = CHEST|GROIN|LEGS|ARMS - allowed = list(/obj/item/tome, /obj/item/melee/cultblade) hoodtype = /obj/item/clothing/head/hooded/cult_hoodie /// if anyone can equip this. used by the prefs menu var/allow_any = FALSE @@ -414,13 +419,11 @@ Striking a noncultist, however, will tear their flesh."} if(new_current_charges == 0) wearer.visible_message("The runed shield around [wearer] suddenly disappears!") -/obj/item/clothing/head/hooded/cult_hoodie +/obj/item/clothing/head/hooded/cult_hoodie/cult_shield name = "empowered cultist helmet" desc = "Empowered helmet which creates a powerful shield around the user." icon_state = "cult_hoodalt" armor = list(MELEE = 40, BULLET = 30, LASER = 40, ENERGY = 30, BOMB = 50, BIO = 30, RAD = 30, FIRE = 50, ACID = 60, STAMINA = 40) - body_parts_covered = HEAD - flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS /obj/item/clothing/suit/hooded/cultrobes/cult_shield/equipped(mob/living/user, slot) ..() @@ -434,11 +437,7 @@ Striking a noncultist, however, will tear their flesh."} /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." - icon_state = "cultrobes" - item_state = "cultrobes" - flags_inv = HIDEJUMPSUIT allowed = list(/obj/item/tome, /obj/item/melee/cultblade) - body_parts_covered = CHEST|GROIN|LEGS|ARMS armor = list(MELEE = -45, BULLET = -45, LASER = -45, ENERGY = -45, BOMB = -45, BIO = -45, RAD = -45, FIRE = 0, ACID = 0, STAMINA = 40) slowdown = -0.6 hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/berserkerhood @@ -446,8 +445,6 @@ Striking a noncultist, however, will tear their flesh."} /obj/item/clothing/head/hooded/cult_hoodie/berserkerhood name = "flagellant's hood" desc = "Blood-soaked hood infused with dark magic." - icon_state = "culthood" - flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, STAMINA = 0) /obj/item/clothing/suit/hooded/cultrobes/berserker/equipped(mob/living/user, slot) diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index 49fda7d9921aa..2d7e1b9253f80 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -133,6 +133,6 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]") l_set = 1 new /obj/item/gun/energy/mindflayer(src) new /obj/item/soulstone(src) - new /obj/item/clothing/suit/space/hardsuit/cult(src) + new /obj/item/clothing/suit/hooded/cultrobes/hardened(src) //new /obj/item/teleportation_scroll(src) new /obj/item/stack/ore/diamond(src) diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm index c544834246e20..0396ad326da5c 100644 --- a/code/modules/cargo/exports/lavaland.dm +++ b/code/modules/cargo/exports/lavaland.dm @@ -12,7 +12,7 @@ /obj/item/katana/cursed, /obj/item/clothing/glasses/godeye, /obj/item/melee/ghost_sword, - /obj/item/clothing/suit/space/hardsuit/cult, + /obj/item/clothing/suit/hooded/cultrobes/hardened, /obj/item/voodoo, /obj/item/grenade/clusterbuster/inferno, /obj/item/clothing/neck/necklace/memento_mori, diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index d6d0c2804ea46..e35ee98c280da 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -309,9 +309,9 @@ name = "Cultist Ghost" uniform = /obj/item/clothing/under/color/black/ghost - suit = /obj/item/clothing/suit/cultrobes/alt/ghost + suit = /obj/item/clothing/suit/hooded/cultrobes/alt/ghost shoes = /obj/item/clothing/shoes/cult/alt/ghost - head = /obj/item/clothing/head/culthood/alt/ghost + head = /obj/item/clothing/shoes/cult/alt/ghost r_hand = /obj/item/melee/cultblade/ghost /datum/outfit/wizard diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index c9cfd437ab0b3..393ac89a1bae9 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -356,7 +356,7 @@ mask = /obj/item/clothing/mask/breath if("Cultist") uniform = /obj/item/clothing/under/costume/roman - suit = /obj/item/clothing/suit/cultrobes + suit = /obj/item/clothing/suit/hooded/cultrobes suit_store = /obj/item/tome shoes = /obj/item/clothing/shoes/cult r_pocket = /obj/item/restraints/legcuffs/bola/cult diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm index e59332f984548..732365c6ab2ee 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -224,10 +224,10 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th to_chat(H, "I don't feel strong enough without my hat.") return FALSE if(cult_req) //CULT_REQ CLOTHES CHECK - if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/cult)) + if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/hooded/cultrobes/hardened)) to_chat(H, "I don't feel strong enough without my armor.") return FALSE - if(!istype(H.head, /obj/item/clothing/head/magus) && !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/cult)) + if(!istype(H.head, /obj/item/clothing/head/magus) && !istype(H.head, /obj/item/clothing/head/hooded/cult_hoodie/hardened)) to_chat(H, "I don't feel strong enough without my helmet.") return FALSE else