From 8e2dc381edeeb5141fa510000cb8ac9370d3ee35 Mon Sep 17 00:00:00 2001 From: Thunder12345 Date: Wed, 10 Dec 2014 19:34:27 +0000 Subject: [PATCH 1/5] FRAG-12 + admins.txt + FRAG-12 shotgun shells, created from the unloaded technological shotshell + Adding myself to admins.txt --- code/modules/crafting/recipes.dm | 10 ++++++++++ .../projectiles/ammunition/ammo_casings.dm | 8 +++++++- .../modules/projectiles/projectile/bullets.dm | 11 +++++++++++ config/admins.txt | 1 + icons/obj/ammo.dmi | Bin 15778 -> 15908 bytes 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 6a53af52426..51287eaf20b 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -117,6 +117,16 @@ tools = list(/obj/item/weapon/screwdriver) time = 5 +/datum/table_recipe/frag12 + name = "FRAG-12 Shell" + result = /obj/item/ammo_casing/shotgun/frag12 + reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, + /datum/reagent/glycerol = 5, + /datum/reagent/toxin/acid = 5, + /datum/reagent/toxin/acid/polyacid = 5,) + tools = list(/obj/item/weapon/screwdriver) + time = 5 + /datum/table_recipe/ishotgun name = "Improvised Shotgun" result = /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index a53b80ca1ed..abbab8f89ab 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -96,6 +96,12 @@ icon_state = "ishell" projectile_type = /obj/item/projectile/bullet/incendiary/shell +/obj/item/ammo_casing/shotgun/frag12 + name = "FRAG-12 slug" + desc = "A high explosive shotgun slug" + icon_state = "heshell" + projectile_type = /obj/item/projectile/bullet/frag12 + /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath name = "dragonsbreath shell" desc = "A shotgun shell which fires a spread of incendiary pellets." @@ -157,4 +163,4 @@ desc = "A cased high explosive grenade that can only be activated once fired out of a grenade launcher." caliber = "40mm" icon_state = "40mmHE" - projectile_type = /obj/item/projectile/bullet/a40mm \ No newline at end of file + projectile_type = /obj/item/projectile/bullet/a40mm diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index a3634a488f6..ede74f0e7d3 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -96,6 +96,17 @@ SpinAnimation() +/obj/item/projectile/bullet/frag12 + name ="explosive slug" + damage = 45 + weaken = 5 + + +/obj/item/projectile/bullet/frag12/on_hit(atom/target, blocked = 0) + explosion(target, -1, -1, 1) + return 1 + + /obj/item/projectile/bullet/mime damage = 20 diff --git a/config/admins.txt b/config/admins.txt index e888262a285..e484b955124 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -69,3 +69,4 @@ steelpoint = Game Master phil235 = Game Master xxnoob = Game Master tkdrg = Game Master +thunder12345 = Game Master diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 200bed93b1beeaede38bb4460916af5291bb1640..367ef6ee23469769b07557f93897429fb420095b 100644 GIT binary patch literal 15908 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 literal 15778 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 From a0476d975e646887948138e66ca747e215987aea Mon Sep 17 00:00:00 2001 From: Thunder12345 Date: Wed, 10 Dec 2014 20:52:17 +0000 Subject: [PATCH 2/5] Movin' house Moved /obj/item/projectile/bullet/frag12 from code\modules\projectiles\projectile\bullets.dm to code\modules\projectiles\projectile\special.dm --- code/modules/projectiles/projectile/bullets.dm | 11 ----------- code/modules/projectiles/projectile/special.dm | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index ede74f0e7d3..a3634a488f6 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -96,17 +96,6 @@ SpinAnimation() -/obj/item/projectile/bullet/frag12 - name ="explosive slug" - damage = 45 - weaken = 5 - - -/obj/item/projectile/bullet/frag12/on_hit(atom/target, blocked = 0) - explosion(target, -1, -1, 1) - return 1 - - /obj/item/projectile/bullet/mime damage = 20 diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index a359fb02159..337ccb32d8c 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -168,3 +168,14 @@ obj/item/projectile/kinetic/New() if(!gun) qdel(src) gun.create_portal(src) + + +/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0) + explosion(target, -1, 0, 2) + return 1 + + +/obj/item/projectile/bullet/frag12 + name ="explosive slug" + damage = 25 + weaken = 5 \ No newline at end of file From 3bc8b4f77721c81c1b45ca4a2380933fa8069cc9 Mon Sep 17 00:00:00 2001 From: Thunder12345 Date: Thu, 11 Dec 2014 07:19:32 +0000 Subject: [PATCH 3/5] Description update Changed the description of the FRAG-12. --- code/modules/projectiles/ammunition/ammo_casings.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index abbab8f89ab..4cf1351fbf1 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -98,7 +98,7 @@ /obj/item/ammo_casing/shotgun/frag12 name = "FRAG-12 slug" - desc = "A high explosive shotgun slug" + desc = "A high explosive breaching round for a 12 gauge shotgun." icon_state = "heshell" projectile_type = /obj/item/projectile/bullet/frag12 From 1a46c70fff8f7e21064a2bbeb0ba62972f98020e Mon Sep 17 00:00:00 2001 From: Thunder12345 Date: Fri, 12 Dec 2014 10:10:02 +0000 Subject: [PATCH 4/5] The changeloggening Added changelog file for the FRAG-12. --- .../Thunder12345-grenade_slugs-6300.yml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/Thunder12345-grenade_slugs-6300.yml diff --git a/html/changelogs/Thunder12345-grenade_slugs-6300.yml b/html/changelogs/Thunder12345-grenade_slugs-6300.yml new file mode 100644 index 00000000000..019afefb33f --- /dev/null +++ b/html/changelogs/Thunder12345-grenade_slugs-6300.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 +# rscdel (general adding of nice things) +# rscadd (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +# tgs (TG-ported fixes?) +################################# + +# Your name. +author: Thunder12345 + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in single (') or double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a new FRAG-12 explosive shotgun shell, built from the unloaded technological shell, using tablecrafting. Constructed using an unloaded technological tech shell, 5 units sulphuric acid, 5 units polytrinic acid, 5 units glycerol, and requires a screwdriver." From e6757817f48a6a5046f43eb57d0285ddc6e74b70 Mon Sep 17 00:00:00 2001 From: Thunder12345 Date: Sat, 13 Dec 2014 16:00:57 +0000 Subject: [PATCH 5/5] The changeloggening 2: Electric boogaloo Fixed the changelog --- .../Thunder12345-grenade_slugs-6300.yml | 32 +------------------ 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/html/changelogs/Thunder12345-grenade_slugs-6300.yml b/html/changelogs/Thunder12345-grenade_slugs-6300.yml index 019afefb33f..b77f4ef1665 100644 --- a/html/changelogs/Thunder12345-grenade_slugs-6300.yml +++ b/html/changelogs/Thunder12345-grenade_slugs-6300.yml @@ -1,36 +1,6 @@ -################################ -# 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 -# rscdel (general adding of nice things) -# rscadd (general deleting of nice things) -# imageadd -# imagedel -# spellcheck (typo fixes) -# experiment -# tgs (TG-ported fixes?) -################################# - -# Your name. author: Thunder12345 -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -#delete-after: True +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, this gets changed to [] after reading. Just remove the brackets when you add new shit. -# Please surround your changes in single (') or double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. changes: - rscadd: "Added a new FRAG-12 explosive shotgun shell, built from the unloaded technological shell, using tablecrafting. Constructed using an unloaded technological tech shell, 5 units sulphuric acid, 5 units polytrinic acid, 5 units glycerol, and requires a screwdriver."