diff --git a/code/modules/projectiles/guns/projectile/improvised.dm b/code/modules/projectiles/guns/projectile/improvised.dm index 2b1e10c5989..a7e22f11c8b 100644 --- a/code/modules/projectiles/guns/projectile/improvised.dm +++ b/code/modules/projectiles/guns/projectile/improvised.dm @@ -17,6 +17,17 @@ origin_tech = "combat=2;materials=2" handle_casings = CYCLE_CASINGS load_method = SINGLE_CASING + +/obj/item/weapon/gun/projectile/shotgun/improvised/special_check(var/mob/living/carbon/human/M) + if(prob(20 - (loaded.len * 10))) + M.visible_message("[M]'s weapon blows up, shattering into pieces!","[src] blows up in your face!", "You hear a loud bang!") + M.take_organ_damage(0,30) + M.drop_item() + new /obj/item/weapon/material/shard/shrapnel(get_turf(src)) + qdel(src) + return 0 + return 1 + /obj/item/weapon/gun/projectile/shotgun/improvised/attackby(var/obj/item/A as obj, mob/user as mob) if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter)) diff --git a/html/changelogs/alberyk-PR-498.yml b/html/changelogs/alberyk-PR-498.yml new file mode 100644 index 00000000000..85017b3c27e --- /dev/null +++ b/html/changelogs/alberyk-PR-498.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Alberyk + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "The improvised shotgun has now a chance to explode when being fired."