diff --git a/code/game/objects/items/weapons/highlander_swords.dm b/code/game/objects/items/weapons/highlander_swords.dm index 284a909a227..22686b90c96 100644 --- a/code/game/objects/items/weapons/highlander_swords.dm +++ b/code/game/objects/items/weapons/highlander_swords.dm @@ -5,7 +5,7 @@ /datum/martial_art/highlander name = "Highlander Style" deflection_chance = 100 - can_use_guns = 0 + no_guns = TRUE no_guns_message = "You'd never stoop so low as to use the weapon of a COWARD!" diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 625a2846429..10b3e8f3ad0 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -7,8 +7,8 @@ var/datum/martial_art/base = null // The permanent style var/deflection_chance = 0 //Chance to deflect projectiles var/help_verb = null - var/can_use_guns = 1 //set to zero to prevent users of this style from using guns (sleeping carp, highlander). They can still pick them up, but not fire them. - var/no_guns_message = "" //message to tell the style user if they try and use a gun while can_use_guns = 0 (DISHONORABRU!) + var/no_guns = FALSE //set to TRUE to prevent users of this style from using guns (sleeping carp, highlander). They can still pick them up, but not fire them. + var/no_guns_message = "" //message to tell the style user if they try and use a gun while no_guns = TRUE (DISHONORABRU!) /datum/martial_art/proc/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) return 0 diff --git a/code/modules/martial_arts/sleeping_carp.dm b/code/modules/martial_arts/sleeping_carp.dm index 12ae14f153f..c6af4679552 100644 --- a/code/modules/martial_arts/sleeping_carp.dm +++ b/code/modules/martial_arts/sleeping_carp.dm @@ -8,7 +8,7 @@ name = "The Sleeping Carp" deflection_chance = 100 help_verb = /mob/living/carbon/human/proc/sleeping_carp_help - can_use_guns = 0 + no_guns = TRUE no_guns_message = "Use of ranged weaponry would bring dishonor to the clan." /datum/martial_art/the_sleeping_carp/proc/check_streak(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index cd1e53e7290..e8737175b23 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1985,7 +1985,7 @@ to_chat(src, "Your fingers don't fit in the trigger guard!") return 0 - if(martial_art && !martial_art.can_use_guns) //great dishonor to famiry + if(martial_art && martial_art.no_guns) //great dishonor to famiry to_chat(src, "[martial_art.no_guns_message]") return 0