diff --git a/code/game/gamemodes/cult/cult_datums.dm b/code/game/gamemodes/cult/cult_datums.dm index b08632f0359..f55d335ae24 100644 --- a/code/game/gamemodes/cult/cult_datums.dm +++ b/code/game/gamemodes/cult/cult_datums.dm @@ -1,5 +1,3 @@ -//cult datums by FalseIncarnate - /datum/cult_info var/name = "Cult of Nar'Sie" var/theme = "blood" @@ -86,6 +84,7 @@ entity_title1 = "The Silent One" entity_title2 = "The One Who Beckons" entity_title3 = "The Ferryman of Oblivion" + entity_icon_state = "legion" cult_wall_icon_state = "deathcult" cult_floor_icon_state = "carpet-broken" @@ -93,13 +92,13 @@ artificer_name = "Boneshaper" behemoth_name = "Draugr" - behemoth_icon_state = "horror" + behemoth_icon_state = "Draugr" wraith_name = "Wraith" - wraith_icon_state = "stand" + wraith_icon_state = "Wraith" juggernaut_name = "Wight" - juggernaut_icon_state = "horror" + juggernaut_icon_state = "Draugr" harvester_name = "Psychopomp" diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 876748838ae..d45c979de2f 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -334,3 +334,19 @@ else to_chat(C, "The veil cannot be torn here!") + + +/obj/item/clothing/suit/space/eva/plasmaman/cultist + name = "plasmaman cultist armor" + icon_state = "plasmaman_cult" + item_state = "plasmaman_cult" + desc = "A bulky suit of armour, menacing with red energy. It looks like it would fit a plasmaman." + slowdown = 1 + armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) + +/obj/item/clothing/head/helmet/space/eva/plasmaman/cultist + name = "plasmaman cultist helmet" + icon_state = "plasmamanCult_helmet0" + base_state = "plasmamanCult_helmet" + desc = "A helmet designed by cultists. It glows menacingly with unearthly flames." + armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 7d046c82180..24b3a2208d2 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -278,7 +278,11 @@ var/mob/living/carbon/human/H = user user.visible_message("Otherworldly armor suddenly appears on [user]!", \ "You speak the words of the talisman, arming yourself!") - H.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), slot_wear_suit) + if(H.get_species() == "Plasmaman") + H.equip_to_slot(new /obj/item/clothing/suit/space/eva/plasmaman/cultist(H), slot_wear_suit) + H.equip_to_slot(new /obj/item/clothing/head/helmet/space/eva/plasmaman/cultist(H), slot_head) + else + H.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/cultpack(user), slot_back) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes) H.put_in_hands(new /obj/item/weapon/melee/cultblade(user)) diff --git a/code/game/magic/Uristrunes.dm b/code/game/magic/Uristrunes.dm index ed881c71fb1..b645aa819f5 100644 --- a/code/game/magic/Uristrunes.dm +++ b/code/game/magic/Uristrunes.dm @@ -22,6 +22,9 @@ var/runetype = "rune" runetype = "rune" else if(ticker.mode.cultdat.theme == "fire") runetype = "fire-rune" + else if(ticker.mode.cultdat.theme == "death") + runetype = "death-rune" + if(lookup in rune_cache) return rune_cache[lookup] diff --git a/icons/effects/uristrunes.dmi b/icons/effects/uristrunes.dmi index e9675c48a90..13c40bcf858 100644 Binary files a/icons/effects/uristrunes.dmi and b/icons/effects/uristrunes.dmi differ diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi index 5171dfdaced..d32275dc52b 100644 Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ diff --git a/icons/mob/species/plasmaman/helmet.dmi b/icons/mob/species/plasmaman/helmet.dmi index 258ea305d23..bc47b78d03f 100644 Binary files a/icons/mob/species/plasmaman/helmet.dmi and b/icons/mob/species/plasmaman/helmet.dmi differ diff --git a/icons/mob/species/plasmaman/suit.dmi b/icons/mob/species/plasmaman/suit.dmi index 3a4720378f7..f61a5a0e805 100644 Binary files a/icons/mob/species/plasmaman/suit.dmi and b/icons/mob/species/plasmaman/suit.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi index bb2fa4120e8..bcfa32a558e 100644 Binary files a/icons/obj/clothing/species/plasmaman/hats.dmi and b/icons/obj/clothing/species/plasmaman/hats.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/suits.dmi b/icons/obj/clothing/species/plasmaman/suits.dmi index ae07299ff8b..86f4e6ede2e 100644 Binary files a/icons/obj/clothing/species/plasmaman/suits.dmi and b/icons/obj/clothing/species/plasmaman/suits.dmi differ diff --git a/icons/obj/narsie.dmi b/icons/obj/narsie.dmi index 55ab046eb42..6571ee3d11d 100644 Binary files a/icons/obj/narsie.dmi and b/icons/obj/narsie.dmi differ diff --git a/icons/turf/walls/cult_wall.dmi b/icons/turf/walls/cult_wall.dmi index 052b3f4f8cd..fa3fd530c00 100644 Binary files a/icons/turf/walls/cult_wall.dmi and b/icons/turf/walls/cult_wall.dmi differ