cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 09:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes some bullet embeds bullet embeds (#90104)

Browse Source 
## About The Pull Request

Subtyping bullet for futureproofing.

(These specific bullets didn't get `stealthy_embed`)

## Changelog

🆑 Melbert
fix: Some niche bullets are now hidden when embedded
/🆑
This commit is contained in:
MrMelbert
2025-03-19 14:41:09 -05:00
committed by GitHub
parent 9b1578cdfb
commit d8455d6636
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/projectiles/projectile/bullets.dm
View File

@@ -18,11 +18,11 @@
damage = 10 damage = 10
/datum/embedding/bullet /datum/embedding/bullet
embed_chance=20 embed_chance = 20
fall_chance=2 fall_chance = 2
jostle_chance=0 jostle_chance = 0
ignore_throwspeed_threshold=TRUE ignore_throwspeed_threshold = TRUE
pain_stam_pct=0.5 pain_stam_pct = 0.5
pain_mult=3 pain_mult = 3
rip_time=10 rip_time = 1 SECONDS
stealthy_embed = TRUE stealthy_embed = TRUE

9
code/modules/projectiles/projectile/bullets/junk.dm
View File

@@ -4,7 +4,7 @@
name = "junk bullet" name = "junk bullet"
icon_state = "trashball" icon_state = "trashball"
damage = 30 damage = 30
embed_type = /datum/embedding/bullet_junk embed_type = /datum/embedding/bullet/junk
/// What biotype does our junk projectile especially harm? /// What biotype does our junk projectile especially harm?
var/extra_damage_mob_biotypes = MOB_ROBOTIC var/extra_damage_mob_biotypes = MOB_ROBOTIC
/// How much do we multiply our total base damage? /// How much do we multiply our total base damage?
@@ -28,7 +28,7 @@
if(finalized_damage) if(finalized_damage)
living_target.apply_damage(finalized_damage, damagetype = extra_damage_type, def_zone = BODY_ZONE_CHEST, wound_bonus = wound_bonus) living_target.apply_damage(finalized_damage, damagetype = extra_damage_type, def_zone = BODY_ZONE_CHEST, wound_bonus = wound_bonus)
/datum/embedding/bullet_junk /datum/embedding/bullet/junk
embed_chance = 15 embed_chance = 15
fall_chance = 3 fall_chance = 3
jostle_chance = 4 jostle_chance = 4
@@ -37,6 +37,7 @@
pain_mult = 5 pain_mult = 5
jostle_pain_mult = 6 jostle_pain_mult = 6
rip_time = 1 SECONDS rip_time = 1 SECONDS
stealthy_embed = FALSE
/obj/projectile/bullet/incendiary/fire/junk /obj/projectile/bullet/incendiary/fire/junk
name = "burning oil" name = "burning oil"
@@ -75,11 +76,11 @@
name = "junk ripper bullet" name = "junk ripper bullet"
icon_state = "redtrac" icon_state = "redtrac"
damage = 10 damage = 10
embed_type = /datum/embedding/bullet_junk_ripper embed_type = /datum/embedding/bullet/junk/ripper
wound_bonus = 10 wound_bonus = 10
bare_wound_bonus = 30 bare_wound_bonus = 30
/datum/embedding/bullet_junk_ripper /datum/embedding/bullet/junk/ripper
embed_chance = 100 embed_chance = 100
fall_chance = 3 fall_chance = 3
jostle_chance = 4 jostle_chance = 4

8
code/modules/projectiles/projectile/bullets/pistol.dm
View File

@@ -3,9 +3,9 @@
/obj/projectile/bullet/c9mm /obj/projectile/bullet/c9mm
name = "9mm bullet" name = "9mm bullet"
damage = 30 damage = 30
embed_type = /datum/embedding/bullet_c9mm embed_type = /datum/embedding/bullet/c9mm
/datum/embedding/bullet_c9mm /datum/embedding/bullet/c9mm
embed_chance = 15 embed_chance = 15
fall_chance = 3 fall_chance = 3
jostle_chance = 4 jostle_chance = 4
@@ -79,13 +79,13 @@
name = ".160 smart bullet" name = ".160 smart bullet"
icon_state = "smartgun" icon_state = "smartgun"
damage = 10 damage = 10
embed_type = /datum/embedding/bullet_c160smart embed_type = /datum/embedding/bullet/c160smart
speed = 0.5 speed = 0.5
homing_turn_speed = 5 homing_turn_speed = 5
homing_inaccuracy_min = 4 homing_inaccuracy_min = 4
homing_inaccuracy_max = 10 homing_inaccuracy_max = 10
/datum/embedding/bullet_c160smart /datum/embedding/bullet/c160smart
embed_chance = 10 embed_chance = 10
fall_chance = 5 fall_chance = 5
jostle_chance = 3 jostle_chance = 3

9
code/modules/projectiles/projectile/bullets/revolver.dm
View File

@@ -21,10 +21,10 @@
ricochet_auto_aim_range = 3 ricochet_auto_aim_range = 3
wound_bonus = -20 wound_bonus = -20
bare_wound_bonus = 10 bare_wound_bonus = 10
embed_type = /datum/embedding/bullet_c38 embed_type = /datum/embedding/bullet/c38
embed_falloff_tile = -4 embed_falloff_tile = -4
/datum/embedding/bullet_c38 /datum/embedding/bullet/c38
embed_chance = 25 embed_chance = 25
fall_chance = 2 fall_chance = 2
jostle_chance = 2 jostle_chance = 2
@@ -75,11 +75,11 @@
sharpness = SHARP_EDGED sharpness = SHARP_EDGED
wound_bonus = 20 wound_bonus = 20
bare_wound_bonus = 20 bare_wound_bonus = 20
embed_type = /datum/embedding/bullet_c38_dumdum embed_type = /datum/embedding/bullet/c38/dumdum
wound_falloff_tile = -5 wound_falloff_tile = -5
embed_falloff_tile = -15 embed_falloff_tile = -15
/datum/embedding/bullet_c38_dumdum /datum/embedding/bullet/c38/dumdum
embed_chance = 75 embed_chance = 75
fall_chance = 3 fall_chance = 3
jostle_chance = 4 jostle_chance = 4
@@ -188,4 +188,3 @@
if(reagents & NO_REACT) //first impact on a noncarbon if(reagents & NO_REACT) //first impact on a noncarbon
reagents.flags &= ~(NO_REACT) reagents.flags &= ~(NO_REACT)
reagents.handle_reactions() reagents.handle_reactions()