Changes the way embedding works

This commit is contained in:
Anewbe
2016-10-11 21:29:49 -05:00
parent 32f87cac86
commit 5bfc0c851e
9 changed files with 74 additions and 23 deletions
@@ -2,8 +2,6 @@
name = "dart"
icon_state = "dart"
damage = 5
sharp = 1
embed = 1 //the dart is shot fast enough to pierce space suits, so I guess splintering inside the target can be a thing. Should be rare due to low damage.
var/reagent_amount = 15
kill_count = 15 //shorter range
+3 -2
View File
@@ -53,9 +53,10 @@
var/eyeblur = 0
var/drowsy = 0
var/agony = 0
var/embed = 0 // whether or not the projectile can embed itself in the mob
var/reflected = 0 // This should be set to 1 if reflected by any means, to prevent infinite reflections.
embed_chance = 0 //Base chance for a projectile to embed
var/hitscan = 0 // whether the projectile should be hitscan
var/step_delay = 1 // the delay between iterations if not a hitscan projectile
@@ -86,7 +87,7 @@
//Checks if the projectile is eligible for embedding. Not that it necessarily will.
/obj/item/projectile/proc/can_embed()
//embed must be enabled and damage type must be brute
if(!embed || damage_type != BRUTE)
if(embed_chance == 0 || damage_type != BRUTE)
return 0
return 1
@@ -5,7 +5,7 @@
damage_type = BRUTE
nodamage = 0
check_armour = "bullet"
embed = 1
embed_chance = 20 //Modified in the actual embed process, but this should keep embed chance about the same
sharp = 1
var/mob_passthrough_check = 0
@@ -140,7 +140,7 @@
name = "rubber bullet"
damage = 5
agony = 40
embed = 0
embed_chance = 0
sharp = 0
check_armour = "melee"
@@ -155,7 +155,7 @@
name = "beanbag"
damage = 20
agony = 60
embed = 0
embed_chance = 0
sharp = 0
check_armour = "melee"
@@ -172,7 +172,7 @@
/obj/item/projectile/bullet/shotgun/ion
name = "ion slug"
damage = 15
embed = 0
embed_chance = 0
sharp = 0
check_armour = "melee"
@@ -224,7 +224,7 @@
/obj/item/projectile/bullet/burstbullet
name = "exploding bullet"
damage = 20
embed = 0
embed_chance = 0
edge = 1
/obj/item/projectile/bullet/gyro/on_hit(var/atom/target, var/blocked = 0)
@@ -235,7 +235,7 @@
/obj/item/projectile/bullet/blank
invisibility = 101
damage = 1
embed = 0
embed_chance = 0
/* Practice */
@@ -255,7 +255,7 @@
damage_type = HALLOSS
damage = 0
nodamage = 1
embed = 0
embed_chance = 0
sharp = 0
/obj/item/projectile/bullet/pistol/cap/process()
@@ -152,7 +152,7 @@
name = "bullet"
icon_state = "bullet"
damage = 1 // stop trying to murderbone with a fake gun dumbass!!!
embed = 0 // nope
embed_chance = 0 // nope
nodamage = 1
damage_type = HALLOSS
muzzle_type = /obj/effect/projectile/bullet/muzzle