Ryll Ryll
1f1bddfe4f
Projectiles are assigned the ability to try embedding by the presence of a shrapnel_type variable being set on them, whether or not they actually have a set of embedding stats in their embedding var. By default, children of /obj/projectile/bullet have a shrapnel type set to a generic embedded bullet item, including things like foam darts and lollypop projectiles which shouldn't be able to embed (and certainly not embed as a bullet). While they had their embedding vars set to null, they still had their shrapnel_type set to the embedded bullet type, meaning shooting a person with a dart gun or whatever would leave a failed shrapnel item on the ground where they weren't supposed to. This fixes that by requiring both a defined shrapnel_type AND a defined embedding var for the embedding stats. Any projectiles without both won't be able to try embedding. I also manually put 'shrapnel_type = null' on any bullet subtypes with embedding = null just to be safe and for consistency.
120 lines
3.2 KiB
Plaintext
120 lines
3.2 KiB
Plaintext
// 7.62x38mmR (Nagant Revolver)
|
|
|
|
/obj/projectile/bullet/n762
|
|
name = "7.62x38mmR bullet"
|
|
damage = 60
|
|
|
|
// .50AE (Desert Eagle)
|
|
|
|
/obj/projectile/bullet/a50ae
|
|
name = ".50AE bullet"
|
|
damage = 60
|
|
|
|
// .38 (Detective's Gun)
|
|
|
|
/obj/projectile/bullet/c38
|
|
name = ".38 bullet"
|
|
damage = 25
|
|
ricochets_max = 2
|
|
ricochet_chance = 50
|
|
ricochet_auto_aim_angle = 10
|
|
ricochet_auto_aim_range = 3
|
|
wound_bonus = -20
|
|
bare_wound_bonus = 10
|
|
embedding = list(embed_chance=15, fall_chance=2, jostle_chance=2, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=3, jostle_pain_mult=5, rip_time=10)
|
|
|
|
/obj/projectile/bullet/c38/match
|
|
name = ".38 Match bullet"
|
|
ricochets_max = 4
|
|
ricochet_chance = 100
|
|
ricochet_auto_aim_angle = 40
|
|
ricochet_auto_aim_range = 5
|
|
ricochet_incidence_leeway = 50
|
|
ricochet_decay_chance = 1
|
|
ricochet_decay_damage = 1
|
|
|
|
/obj/projectile/bullet/c38/match/bouncy
|
|
name = ".38 Rubber bullet"
|
|
damage = 10
|
|
stamina = 30
|
|
armour_penetration = -30
|
|
ricochets_max = 6
|
|
ricochet_incidence_leeway = 0
|
|
ricochet_chance = 130
|
|
ricochet_decay_damage = 0.8
|
|
shrapnel_type = null
|
|
sharpness = SHARP_NONE
|
|
embedding = null
|
|
|
|
// premium .38 ammo from cargo, weak against armor, lower base damage, but excellent at embedding and causing slice wounds at close range
|
|
/obj/projectile/bullet/c38/dumdum
|
|
name = ".38 DumDum bullet"
|
|
damage = 15
|
|
armour_penetration = -30
|
|
ricochets_max = 0
|
|
sharpness = SHARP_EDGED
|
|
wound_bonus = 20
|
|
bare_wound_bonus = 20
|
|
embedding = list(embed_chance=75, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
|
|
wound_falloff_tile = -5
|
|
embed_falloff_tile = -15
|
|
|
|
/obj/projectile/bullet/c38/trac
|
|
name = ".38 TRAC bullet"
|
|
damage = 10
|
|
ricochets_max = 0
|
|
|
|
/obj/projectile/bullet/c38/trac/on_hit(atom/target, blocked = FALSE)
|
|
. = ..()
|
|
var/mob/living/carbon/M = target
|
|
if(!istype(M))
|
|
return
|
|
var/obj/item/implant/tracking/c38/imp
|
|
for(var/obj/item/implant/tracking/c38/TI in M.implants) //checks if the target already contains a tracking implant
|
|
imp = TI
|
|
return
|
|
if(!imp)
|
|
imp = new /obj/item/implant/tracking/c38(M)
|
|
imp.implant(M)
|
|
|
|
/obj/projectile/bullet/c38/hotshot //similar to incendiary bullets, but do not leave a flaming trail
|
|
name = ".38 Hot Shot bullet"
|
|
damage = 20
|
|
ricochets_max = 0
|
|
|
|
/obj/projectile/bullet/c38/hotshot/on_hit(atom/target, blocked = FALSE)
|
|
. = ..()
|
|
if(iscarbon(target))
|
|
var/mob/living/carbon/M = target
|
|
M.adjust_fire_stacks(6)
|
|
M.IgniteMob()
|
|
|
|
/obj/projectile/bullet/c38/iceblox //see /obj/projectile/temp for the original code
|
|
name = ".38 Iceblox bullet"
|
|
damage = 20
|
|
var/temperature = 100
|
|
ricochets_max = 0
|
|
|
|
/obj/projectile/bullet/c38/iceblox/on_hit(atom/target, blocked = FALSE)
|
|
. = ..()
|
|
if(isliving(target))
|
|
var/mob/living/M = target
|
|
M.adjust_bodytemperature(((100-blocked)/100)*(temperature - M.bodytemperature))
|
|
|
|
// .357 (Syndie Revolver)
|
|
|
|
/obj/projectile/bullet/a357
|
|
name = ".357 bullet"
|
|
damage = 60
|
|
wound_bonus = -70
|
|
|
|
// admin only really, for ocelot memes
|
|
/obj/projectile/bullet/a357/match
|
|
name = ".357 match bullet"
|
|
ricochets_max = 5
|
|
ricochet_chance = 140
|
|
ricochet_auto_aim_angle = 50
|
|
ricochet_auto_aim_range = 6
|
|
ricochet_incidence_leeway = 80
|
|
ricochet_decay_chance = 1
|