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

last tweaks

Browse Source
This commit is contained in:
Fox-McCloud
2017-07-01 01:44:02 -04:00
parent bf7b43ded5
commit 04b9394d34
15 changed files with 3 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_defense.dm
+1 -15
View File
@@ -8,7 +8,7 @@ emp_act
*/
/mob/living/carbon/human/bullet_act(var/obj/item/projectile/P, var/def_zone)
/mob/living/carbon/human/bullet_act(obj/item/projectile/P, def_zone)
if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam))
if(check_reflect(def_zone)) // Checks if you've passed a reflection% check
@@ -41,20 +41,6 @@ emp_act
. = bullet_act(P, "chest") //act on chest instead
return
//Shrapnel
if(P.damage_type == BRUTE)
var/armor = getarmor_organ(organ, "bullet")
if((P.embed && prob(20 + max(P.damage - armor, -10))))
var/obj/item/weapon/shard/shrapnel/SP = new()
SP.name = "[P.name] shrapnel"
if(P.ammo_casing && P.ammo_casing.caliber)
SP.desc = "[SP.desc] It looks like it is a [P.ammo_casing.caliber] caliber round."
else
SP.desc = "[SP.desc] The round's caliber is unidentifiable."
throw_alert("embeddedobject", /obj/screen/alert/embeddedobject)
organ.embedded_objects |= SP
SP.forceMove(src)
organ.add_autopsy_data(P.name, P.damage) // Add the bullet's name to the autopsy data
return (..(P , def_zone))
code/modules/mob/living/silicon/robot/drone/drone_items.dm
-4
View File
@@ -260,10 +260,6 @@
stored_comms["glass"]++
else if(istype(W,/obj/item/ammo_casing))
stored_comms["metal"]++
else if(istype(W,/obj/item/weapon/shard/shrapnel))
stored_comms["metal"]++
stored_comms["metal"]++
stored_comms["metal"]++
else if(istype(W,/obj/item/weapon/shard))
stored_comms["glass"]++
stored_comms["glass"]++