cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] You can now remove embedded objects directly with a hemostat (#3097)

Browse Source 
* You can now remove embedded objects directly with a hemostat (#56637)

* You can now remove embedded objects directly with a hemostat

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-02-05 21:19:35 +00:00
committed by GitHub
co-authored by Ryll Ryll
parent 81c8c4a86f
commit b5f101661d
7 changed files with 73 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile/bullets.dm
+2 -2
View File
@@ -9,9 +9,9 @@
sharpness = SHARP_POINTY
impact_effect_type = /obj/effect/temp_visual/impact_effect
shrapnel_type = /obj/item/shrapnel/bullet
embedding = list(embed_chance=15, fall_chance=2, jostle_chance=0, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.5, pain_mult=3, rip_time=10)
embedding = list(embed_chance=20, fall_chance=2, jostle_chance=0, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.5, pain_mult=3, rip_time=10)
wound_falloff_tile = -5
embed_falloff_tile = -5
embed_falloff_tile = -3
/obj/projectile/bullet/smite
name = "divine retribution"
code/modules/projectiles/projectile/bullets/revolver.dm
+4 -3
View File
@@ -21,7 +21,8 @@
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)
embedding = list(embed_chance=25, fall_chance=2, jostle_chance=2, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=3, jostle_pain_mult=5, rip_time=1 SECONDS)
embed_falloff_tile = -4
/obj/projectile/bullet/c38/match
name = ".38 Match bullet"
@@ -55,7 +56,7 @@
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)
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=1 SECONDS)
wound_falloff_tile = -5
embed_falloff_tile = -15
@@ -106,7 +107,7 @@
/obj/projectile/bullet/a357
name = ".357 bullet"
damage = 60
wound_bonus = -70
wound_bonus = -30
// admin only really, for ocelot memes
/obj/projectile/bullet/a357/match