diff --git a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm index 2a0f1b7f46c..a1ce61ab941 100644 --- a/code/game/gamemodes/cult/cult_comms.dm +++ b/code/game/gamemodes/cult/cult_comms.dm @@ -29,7 +29,7 @@ if(istype(user, /mob/living/simple_animal/slaughter/cult)) //Harbringers of the Slaughter my_message = "Harbringer of the Slaughter: [message]" else - my_message = "[(ishuman(user) ? "Acolyte" : "Construct")] [user]: [message]" + my_message = "[(ishuman(user) ? "Acolyte" : "Construct")] [user]: [message]" for(var/mob/M in mob_list) if(iscultist(M)) to_chat(M, my_message) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index eb731099936..4f9bdbbc5d7 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -42,11 +42,11 @@ throwforce = 25 var/cooldown = 0 -/obj/item/weapon/melee/cultblade/dagger/afterattack(mob/living/target, mob/living/carbon/human/user) +/obj/item/weapon/melee/cultblade/dagger/attack(mob/living/target as mob, mob/living/carbon/human/user as mob) ..() if(ishuman(target)) var/mob/living/carbon/human/bleeder = target - if(cooldown <= world.time && prob(50) && (!bleeder.stat || (!bleeder.species.flags & NO_BLOOD))) + if(!(cooldown > world.time) && (!bleeder.stat || !(bleeder.species.flags & NO_BLOOD))) visible_message("The runes on the blade absorb the blood of [target]!") bleeder.drip(500) cooldown = world.time + 2400 @@ -130,8 +130,8 @@ /obj/item/clothing/suit/hooded/cultrobes/cult_shield name = "empowered cultist armor" desc = "Empowered garb which creates a powerful shield around the user." - icon_state = "cult_armor" - item_state = "cult_armor" + icon_state = "cult_armour" + item_state = "cult_armour" w_class = 4 armor = list(melee = 50, bullet = 40, laser = 50,energy = 30, bomb = 50, bio = 30, rad = 30) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index b07c300f687..42da9da4bef 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -149,7 +149,7 @@ var/pickedtype var/otheritem //ie:helmet.. switch(choice) - if("Shielded Robe") + if("Shielded Hardsuit") pickedtype = /obj/item/clothing/suit/hooded/cultrobes/cult_shield if("Flagellant's Robe") pickedtype = /obj/item/clothing/suit/hooded/cultrobes/berserker diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css index 3829cbd3f48..d7113d9c089 100644 --- a/goon/browserassets/css/browserOutput.css +++ b/goon/browserassets/css/browserOutput.css @@ -320,6 +320,9 @@ h1.alert, h2.alert {color: #000000;} .say_quote {font-family: Georgia, Verdana, sans-serif;} .cult {color: #800080; font-weight: bold; font-style: italic;} .cultspeech {color: #7F0000; font-style: italic;} +.cultitalic {color: #960000; font-style: italic;} +.cultlarge {color: #960000; font-weight: bold; font-size: 3;} +.narsie {color: #960000; font-weight: bold; font-size: 15;} .interface {color: #330033;} .big {font-size: 150%;} .reallybig {font-size: 175%;} diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 170a034f95b..832cd670f51 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index e9fd284f49c..7be5fe5ab92 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ