cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7494 from FalseIncarnate/swords-yea-swords

Browse Source 
Adds Highlander Style: The Martial Art of Highlanders
This commit is contained in:
Fox McCloud
2017-06-09 23:57:17 -04:00
committed by GitHub
parent 38d31616a5 c2ad198203
commit 2c38612b76
6 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+2 -2
View File
@@ -1985,8 +1985,8 @@
to_chat(src, "<span class='warning'>Your fingers don't fit in the trigger guard!</span>")
return 0
if(martial_art && martial_art.name == "The Sleeping Carp") //great dishonor to famiry
to_chat(src, "<span class='warning'>Use of ranged weaponry would bring dishonor to the clan.</span>")
if(martial_art && martial_art.no_guns) //great dishonor to famiry
to_chat(src, "<span class='warning'>[martial_art.no_guns_message]</span>")
return 0
return .