cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-22 11:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8157 from mwerezak/gun-rewrite

Browse Source 
Better handling of mob projectile passthrough and embedding + some gun tweaks
This commit is contained in:
Chinsky
2015-02-21 07:52:58 +03:00
parent 6bd495fc47 09afd35798
commit 2b2332cfc1
8 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_defense.dm
+2 -2
View File
@@ -38,9 +38,9 @@ emp_act
return -1 // complete projectile permutation
//Shrapnel
if (P.can_embed())
if(P.can_embed())
var/armor = getarmor_organ(organ, "bullet")
if(P.embed && prob(20 + max(P.damage - armor, -10)))
if(prob(20 + max(P.damage - armor, -10)))
var/obj/item/weapon/shard/shrapnel/SP = new()
SP.name = (P.name != "shrapnel")? "[P.name] shrapnel" : "shrapnel"
SP.desc = "[SP.desc] It looks like it was fired from [P.shot_from]."