diff --git a/code/datums/elements/cult_halo.dm b/code/datums/elements/cult_halo.dm index 39a6e2d6a33..b62947d212e 100644 --- a/code/datums/elements/cult_halo.dm +++ b/code/datums/elements/cult_halo.dm @@ -24,7 +24,7 @@ SIGNAL_HANDLER ADD_TRAIT(target, TRAIT_CULT_HALO, CULT_TRAIT) - var/mutable_appearance/new_halo_overlay = mutable_appearance('icons/effects/32x64.dmi', "halo[rand(1, 6)]", -HALO_LAYER) + var/mutable_appearance/new_halo_overlay = mutable_appearance('icons/effects/cult/halo.dmi', "halo[rand(1, 6)]", -HALO_LAYER) if (ishuman(target)) var/mob/living/carbon/human/human_parent = target new /obj/effect/temp_visual/cult/sparks(get_turf(human_parent), human_parent.dir) diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm index 1c079ff3bf2..9c41da052a8 100644 --- a/code/game/objects/effects/forcefields.dm +++ b/code/game/objects/effects/forcefields.dm @@ -19,7 +19,7 @@ /obj/effect/forcefield/cult desc = "An unholy shield that blocks all attacks." name = "glowing wall" - icon = 'icons/effects/cult_effects.dmi' + icon = 'icons/effects/cult/effects.dmi' icon_state = "cultshield" can_atmos_pass = ATMOS_PASS_NO timeleft = 200 diff --git a/code/game/objects/effects/temporary_visuals/cult.dm b/code/game/objects/effects/temporary_visuals/cult.dm index 1a77d2427cd..7dda4fccfa9 100644 --- a/code/game/objects/effects/temporary_visuals/cult.dm +++ b/code/game/objects/effects/temporary_visuals/cult.dm @@ -1,6 +1,6 @@ //temporary visual effects(/obj/effect/temp_visual) used by cult stuff /obj/effect/temp_visual/cult - icon = 'icons/effects/cult_effects.dmi' + icon = 'icons/effects/cult/effects.dmi' randomdir = FALSE duration = 10 @@ -18,13 +18,13 @@ icon_state = "bloodout" /obj/effect/temp_visual/dir_setting/cult/phase // The veil shifter teleport - icon = 'icons/effects/cult_effects.dmi' + icon = 'icons/effects/cult/effects.dmi' name = "phase glow" duration = 7 icon_state = "cultin" /obj/effect/temp_visual/dir_setting/cult/phase/out - icon = 'icons/effects/cult_effects.dmi' + icon = 'icons/effects/cult/effects.dmi' icon_state = "cultout" /obj/effect/temp_visual/cult/sac diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 5985c178b9e..157aa425f13 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -256,6 +256,7 @@ /obj/item/nullrod/claymore/darkblade name = "dark blade" desc = "Spread the glory of the dark gods!" + icon = 'icons/obj/cult/items_and_weapons.dmi' icon_state = "cultblade" inhand_icon_state = "cultblade" worn_icon_state = "cultblade" @@ -477,7 +478,7 @@ /obj/item/nullrod/clown name = "clown dagger" desc = "Used for absolutely hilarious sacrifices." - icon = 'icons/obj/wizard.dmi' + icon = 'icons/obj/cult/items_and_weapons.dmi' icon_state = "clownrender" inhand_icon_state = "render" worn_icon_state = "render" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 1f8e0905ed3..d8411c7c823 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1324,7 +1324,7 @@ /obj/item/toy/toy_dagger name = "toy dagger" desc = "A cheap plastic replica of a dagger. Produced by THE ARM Toys, Inc." - icon = 'icons/obj/wizard.dmi' + icon = 'icons/obj/cult/items_and_weapons.dmi' icon_state = "render" inhand_icon_state = "cultdagger" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 0510dcd2dc7..4515f047733 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -340,7 +340,7 @@ /obj/structure/girder/cult name = "runed girder" desc = "Framework made of a strange and shockingly cold metal. It doesn't seem to have any bolts." - icon = 'icons/obj/cult.dmi' + icon = 'icons/obj/cult/structures.dmi' icon_state= "cultgirder" can_displace = FALSE diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 493095a8a25..1b4268765a2 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -268,7 +268,7 @@ var/mob/living/carbon/human/H = target H.hallucination = max(H.hallucination, 120) SEND_SOUND(ranged_ability_user, sound('sound/effects/ghost.ogg',0,1,50)) - var/image/C = image('icons/effects/cult_effects.dmi',H,"bloodsparkles", ABOVE_MOB_LAYER) + var/image/C = image('icons/effects/cult/effects.dmi',H,"bloodsparkles", ABOVE_MOB_LAYER) add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, NONE) addtimer(CALLBACK(H,/atom/.proc/remove_alt_appearance,"cult_apoc",TRUE), 2400, TIMER_OVERRIDE|TIMER_UNIQUE) to_chat(ranged_ability_user,span_cult("[H] has been cursed with living nightmares!")) @@ -803,7 +803,7 @@ /obj/item/melee/blood_magic/manipulator/attack_self(mob/living/user) if(IS_CULTIST(user)) var/static/list/spells = list( - "Bloody Halberd (150)" = image(icon = 'icons/obj/items_and_weapons.dmi', icon_state = "occultpoleaxe0"), + "Bloody Halberd (150)" = image(icon = 'icons/obj/cult/items_and_weapons.dmi', icon_state = "occultpoleaxe0"), "Blood Bolt Barrage (300)" = image(icon = 'icons/obj/guns/ballistic.dmi', icon_state = "arcane_barrage"), "Blood Beam (500)" = image(icon = 'icons/obj/items_and_weapons.dmi', icon_state = "disintegrate") ) diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 2ffccba5a53..8138c7e74e6 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -9,7 +9,7 @@ /obj/item/melee/cultblade/dagger name = "ritual dagger" desc = "A strange dagger said to be used by sinister groups for \"preparing\" a corpse before sacrificing it to their dark gods." - icon = 'icons/obj/wizard.dmi' + icon = 'icons/obj/cult/items_and_weapons.dmi' icon_state = "render" inhand_icon_state = "cultdagger" worn_icon_state = "render" @@ -55,6 +55,7 @@ Striking a noncultist, however, will tear their flesh."} /obj/item/melee/cultblade name = "eldritch longsword" desc = "A sword humming with unholy energy. It glows with a dim red light." + icon = 'icons/obj/cult/items_and_weapons.dmi' icon_state = "cultblade" inhand_icon_state = "cultblade" worn_icon_state = "cultblade" @@ -133,6 +134,7 @@ Striking a noncultist, however, will tear their flesh."} light_color = COLOR_RED attack_verb_continuous = list("cleaves", "slashes", "tears", "lacerates", "hacks", "rips", "dices", "carves") attack_verb_simple = list("cleave", "slash", "tear", "lacerate", "hack", "rip", "dice", "carve") + icon = 'icons/obj/cult/items_and_weapons.dmi' icon_state = "cultbastard" inhand_icon_state = "cultbastard" hitsound = 'sound/weapons/bladeslice.ogg' @@ -442,7 +444,7 @@ Striking a noncultist, however, will tear their flesh."} hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/cult_shield /obj/item/clothing/suit/hooded/cultrobes/cult_shield/setup_shielding() - AddComponent(/datum/component/shielded, recharge_start_delay = 0 SECONDS, shield_icon_file = 'icons/effects/cult_effects.dmi', shield_icon = "shield-cult", run_hit_callback = CALLBACK(src, .proc/shield_damaged)) + AddComponent(/datum/component/shielded, recharge_start_delay = 0 SECONDS, shield_icon_file = 'icons/effects/cult/effects.dmi', shield_icon = "shield-cult", run_hit_callback = CALLBACK(src, .proc/shield_damaged)) /// A proc for callback when the shield breaks, since cult robes are stupid and have different effects /obj/item/clothing/suit/hooded/cultrobes/cult_shield/proc/shield_damaged(mob/living/wearer, attack_text, new_current_charges) @@ -520,8 +522,8 @@ Striking a noncultist, however, will tear their flesh."} /obj/item/shuttle_curse name = "cursed orb" desc = "You peer within this smokey orb and glimpse terrible fates befalling the emergency escape shuttle. " - icon = 'icons/obj/cult.dmi' - icon_state ="shuttlecurse" + icon = 'icons/obj/cult/items_and_weapons.dmi' + icon_state = "shuttlecurse" ///how many times has the shuttle been cursed so far? var/static/totalcurses = 0 ///when was the first shuttle curse? @@ -595,7 +597,7 @@ Striking a noncultist, however, will tear their flesh."} /obj/item/cult_shift name = "veil shifter" desc = "This relic instantly teleports you, and anything you're pulling, forward by a moderate distance." - icon = 'icons/obj/cult.dmi' + icon = 'icons/obj/cult/items_and_weapons.dmi' icon_state ="shifter" var/uses = 4 @@ -702,6 +704,7 @@ Striking a noncultist, however, will tear their flesh."} /obj/item/melee/cultblade/halberd name = "bloody halberd" desc = "A halberd with a volatile axehead made from crystallized blood. It seems linked to its creator. And, admittedly, more of a poleaxe than a halberd." + icon = 'icons/obj/cult/items_and_weapons.dmi' icon_state = "occultpoleaxe0" base_icon_state = "occultpoleaxe" inhand_icon_state = "occultpoleaxe0" diff --git a/code/modules/antagonists/cult/cult_structure_archives.dm b/code/modules/antagonists/cult/cult_structure_archives.dm index dfc035f3845..efb6fe48198 100644 --- a/code/modules/antagonists/cult/cult_structure_archives.dm +++ b/code/modules/antagonists/cult/cult_structure_archives.dm @@ -20,11 +20,11 @@ OUTPUT_ITEMS = list(/obj/item/clothing/glasses/hud/health/night/cultblind), ), CURSE_ORB = list( - PREVIEW_IMAGE = image(icon = 'icons/obj/cult.dmi', icon_state = "shuttlecurse"), + PREVIEW_IMAGE = image(icon = 'icons/obj/cult/items_and_weapons.dmi', icon_state = "shuttlecurse"), OUTPUT_ITEMS = list(/obj/item/shuttle_curse), ), VEIL_WALKER = list( - PREVIEW_IMAGE = image(icon = 'icons/obj/cult.dmi', icon_state = "shifter"), + PREVIEW_IMAGE = image(icon = 'icons/obj/cult/items_and_weapons.dmi', icon_state = "shifter"), OUTPUT_ITEMS = list(/obj/item/cult_shift, /obj/item/flashlight/flare/culttorch), ), ) diff --git a/code/modules/antagonists/cult/cult_structure_forge.dm b/code/modules/antagonists/cult/cult_structure_forge.dm index ee845e6bd74..bdc14ed64cf 100644 --- a/code/modules/antagonists/cult/cult_structure_forge.dm +++ b/code/modules/antagonists/cult/cult_structure_forge.dm @@ -24,7 +24,7 @@ OUTPUT_ITEMS = list(/obj/item/clothing/suit/hooded/cultrobes/berserker), ), ELDRITCH_SWORD = list( - PREVIEW_IMAGE = image(icon = 'icons/obj/items_and_weapons.dmi', icon_state = "cultblade"), + PREVIEW_IMAGE = image(icon = 'icons/obj/cult/items_and_weapons.dmi', icon_state = "cultblade"), OUTPUT_ITEMS = list(/obj/item/melee/cultblade), ), ) diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index ee42c636c22..bfe1514dc7e 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -1,6 +1,6 @@ // Cult buildings! /obj/structure/destructible/cult - icon = 'icons/obj/cult.dmi' + icon = 'icons/obj/cult/structures.dmi' break_sound = 'sound/hallucinations/veryfar_noise.ogg' density = TRUE anchored = TRUE @@ -179,7 +179,7 @@ /obj/effect/gateway name = "gateway" desc = "You're pretty sure that abyss is staring back." - icon = 'icons/obj/cult.dmi' + icon = 'icons/obj/cult/structures.dmi' icon_state = "hole" density = TRUE anchored = TRUE diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 26bb1101312..42a478627a1 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -976,7 +976,7 @@ structure_check() searches for nearby cultist structures required for the invoca images += B if(!IS_CULTIST(M)) if(M.client) - var/image/C = image('icons/effects/cult_effects.dmi',M,"bloodsparkles", ABOVE_MOB_LAYER) + var/image/C = image('icons/effects/cult/effects.dmi',M,"bloodsparkles", ABOVE_MOB_LAYER) add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, NONE) addtimer(CALLBACK(M,/atom/.proc/remove_alt_appearance,"cult_apoc",TRUE), duration) images += C diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm index 6fa23628684..cd32ccec532 100644 --- a/code/modules/awaymissions/mission_code/Academy.dm +++ b/code/modules/awaymissions/mission_code/Academy.dm @@ -84,7 +84,7 @@ /obj/structure/academy_wizard_spawner name = "Academy Defensive System" desc = "Made by Abjuration, Inc." - icon = 'icons/obj/cult.dmi' + icon = 'icons/obj/cult/structures.dmi' icon_state = "forge" anchored = TRUE max_integrity = 200 diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index c560a46294d..93355b1828f 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -9,7 +9,7 @@ /obj/narsie name = "Nar'Sie" desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees." - icon = 'icons/obj/narsie.dmi' + icon = 'icons/obj/cult/narsie.dmi' icon_state = "narsie" anchored = TRUE appearance_flags = LONG_GLIDE @@ -57,7 +57,7 @@ var/area/area = get_area(src) if(area) - var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/cult_effects.dmi', "ghostalertsie") + var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/cult/effects.dmi', "ghostalertsie") notify_ghosts("Nar'Sie has risen in [area]. Reach out to the Geometer to be given a new shell for your soul.", source = src, alert_overlay = alert_overlay, action = NOTIFY_ATTACK) narsie_spawn_animation() diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index 7c87d74c1b4..8def3775a8e 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -111,7 +111,7 @@ /obj/item/knife/envy //Envy's knife: Found in the Envy ruin. Attackers take on the appearance of whoever they strike. name = "envy's knife" desc = "Their success will be yours." - icon = 'icons/obj/wizard.dmi' + icon = 'icons/obj/cult/items_and_weapons.dmi' icon_state = "render" inhand_icon_state = "knife" lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' diff --git a/icons/effects/cult_effects.dmi b/icons/effects/cult/effects.dmi similarity index 100% rename from icons/effects/cult_effects.dmi rename to icons/effects/cult/effects.dmi diff --git a/icons/effects/32x64.dmi b/icons/effects/cult/halo.dmi similarity index 100% rename from icons/effects/32x64.dmi rename to icons/effects/cult/halo.dmi diff --git a/icons/obj/cult.dmi b/icons/obj/cult.dmi deleted file mode 100644 index 66e94bad71f..00000000000 Binary files a/icons/obj/cult.dmi and /dev/null differ diff --git a/icons/obj/cult/items_and_weapons.dmi b/icons/obj/cult/items_and_weapons.dmi new file mode 100644 index 00000000000..d4bf3c80717 Binary files /dev/null and b/icons/obj/cult/items_and_weapons.dmi differ diff --git a/icons/obj/narsie.dmi b/icons/obj/cult/narsie.dmi similarity index 100% rename from icons/obj/narsie.dmi rename to icons/obj/cult/narsie.dmi diff --git a/icons/obj/narsie_small.dmi b/icons/obj/cult/narsie_small.dmi similarity index 100% rename from icons/obj/narsie_small.dmi rename to icons/obj/cult/narsie_small.dmi diff --git a/icons/obj/cult/structures.dmi b/icons/obj/cult/structures.dmi new file mode 100644 index 00000000000..0ec02c412ba Binary files /dev/null and b/icons/obj/cult/structures.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index fd9247ca7ba..9c11366342e 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/icons/obj/wizard.dmi b/icons/obj/wizard.dmi index ecc9c557469..9f24fc4762a 100644 Binary files a/icons/obj/wizard.dmi and b/icons/obj/wizard.dmi differ