diff --git a/code/datums/ammo/misc.dm b/code/datums/ammo/misc.dm index 28610f283df2..d7ba89b83c5b 100644 --- a/code/datums/ammo/misc.dm +++ b/code/datums/ammo/misc.dm @@ -184,7 +184,7 @@ /datum/ammo/flare/starshell/set_bullet_traits() LAZYADD(traits_to_give, list( BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff), - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary, stacks = 1) + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary, stacks = 2) )) /datum/ammo/souto diff --git a/code/datums/ammo/shrapnel.dm b/code/datums/ammo/shrapnel.dm index 836e142489e1..1db9f7b61631 100644 --- a/code/datums/ammo/shrapnel.dm +++ b/code/datums/ammo/shrapnel.dm @@ -39,7 +39,7 @@ name = ".22 hornet round" icon_state = "hornet_round" flags_ammo_behavior = AMMO_BALLISTIC - damage = 20 + damage = 8 shrapnel_chance = 0 shell_speed = AMMO_SPEED_TIER_3//she fast af boi penetration = ARMOR_PENETRATION_TIER_5 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index de2a328de370..c7d03afe9c33 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -477,7 +477,7 @@ if(mapload) return INITIALIZE_HINT_QDEL . = ..() - fuel = rand(30 SECONDS, 60 SECONDS) + fuel = rand(4.5 MINUTES, 5.5 MINUTES) /obj/item/device/flashlight/flare/on/illumination/chemical name = "chemical light" diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm index e669a27ab1a7..28b3d308a92e 100644 --- a/code/game/objects/items/explosives/grenades/marines.dm +++ b/code/game/objects/items/explosives/grenades/marines.dm @@ -182,10 +182,10 @@ desc = "Functions identically to the standard AGM-F 40mm grenade, except instead of exploding into shrapnel, the hornet shell shoots off holo-targeting .22lr rounds. The equivalent to buckshot at-range." icon_state = "grenade_hornet" item_state = "grenade_hornet_active" - shrapnel_count = 5 + shrapnel_count = 15 shrapnel_type = /datum/ammo/bullet/shrapnel/hornet_rounds direct_hit_shrapnel = 5 - dispersion_angle = 15//tight cone + dispersion_angle = 25//tight cone /obj/item/explosive/grenade/high_explosive/airburst/starshell name = "\improper M74 AGM-S Star Shell"