cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 09:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Martial Arts Mastery (#10089)

Browse Source
This commit is contained in:
Geeves
2020-11-17 11:28:04 +02:00
committed by GitHub
parent cbb9e5f2d3
commit 6822e76484
24 changed files with 141 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/projectiles/gun.dm
View File

@@ -189,8 +189,9 @@
if(ishuman(M))
var/mob/living/carbon/human/A = M
if(A.martial_art?.no_guns)
to_chat(A, SPAN_WARNING("[A.martial_art.no_guns_message]"))
var/no_guns_check = A.check_no_guns()
if(no_guns_check)
to_chat(A, SPAN_WARNING("[no_guns_check]")) // the proc returns the no_guns_message
return FALSE
if((M.is_clumsy()) && prob(40)) //Clumsy handling

3
code/modules/projectiles/projectile.dm
View File

@@ -196,6 +196,9 @@
playsound(target_mob, /decl/sound_category/bulletflyby_sound, 50, 1)
return FALSE
if(result == PROJECTILE_DODGED)
return FALSE
var/impacted_organ = parse_zone(def_zone)
if(istype(target_mob, /mob/living/simple_animal))
var/mob/living/simple_animal/SA = target_mob