From fc88bce4b6070bfd8be7df8ebdc7b7e40d025f39 Mon Sep 17 00:00:00 2001 From: Dorsisdwarf Date: Fri, 5 Jun 2015 14:05:32 +0100 Subject: [PATCH 1/3] sets default shotgun ammo to slugs, makes syndicate ammo bag actually have ammo in it --- code/datums/uplink_item.dm | 9 ++++++++- .../objects/items/weapons/storage/backpack.dm | 18 ++++++++++++++++++ .../crates_lockers/closets/syndicate.dm | 2 +- .../projectiles/ammunition/magazines.dm | 10 ++++++++-- 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 7f6db7d1388..064bacab6e2 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -268,10 +268,17 @@ var/list/uplink_items = list() cost = 2 gamemodes = list(/datum/game_mode/nuclear,/datum/game_mode/gang) +/datum/uplink_item/ammo/bullslug + name = "Drum Magazine - 12g Slugs" + desc = "An additional 8-round slug magazine for use in the Bulldog shotgun. Now 8 times less likely to shoot your pals." + item = /obj/item/ammo_box/magazine/m12g + cost = 2 + gamemodes = list(/datum/game_mode/nuclear) + /datum/uplink_item/ammo/bullbuck name = "Drum Magazine - 12g Buckshot" desc = "An additional 8-round buckshot magazine for use in the Bulldog shotgun. Front towards enemy." - item = /obj/item/ammo_box/magazine/m12g + item = /obj/item/ammo_box/magazine/m12g/buckshot cost = 2 gamemodes = list(/datum/game_mode/nuclear) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 778252c04f1..fa3dd85a5e5 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -278,6 +278,24 @@ item_state = "duffle-syndieammo" slowdown = 0 +/obj/item/weapon/storage/backpack/dufflebag/syndieammo/loaded + desc = "A large dufflebag, packed to the brim with Bulldog shotgun ammo." + +/obj/item/weapon/storage/backpack/dufflebag/syndieammo/loaded/New() + ..() + contents = list() + new /obj/item/ammo_box/magazine/m12g(src) + new /obj/item/ammo_box/magazine/m12g(src) + new /obj/item/ammo_box/magazine/m12g(src) + new /obj/item/ammo_box/magazine/m12g(src) + new /obj/item/ammo_box/magazine/m12g(src) + new /obj/item/ammo_box/magazine/m12g(src) + new /obj/item/ammo_box/magazine/m12g/buckshot(src) + new /obj/item/ammo_box/magazine/m12g/stun(src) + new /obj/item/ammo_box/magazine/m12g/dragon(src) + return + + /obj/item/weapon/storage/backpack/dufflebag/captain name = "captain's dufflebag" desc = "A large dufflebag for holding extra captainly goods." diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 13dbc939b43..a08178c61e8 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -31,7 +31,7 @@ new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/weapon/storage/box/teargas(src) new /obj/item/weapon/storage/backpack/dufflebag/syndiemed(src) - new /obj/item/weapon/storage/backpack/dufflebag/syndieammo(src) + new /obj/item/weapon/storage/backpack/dufflebag/syndieammo/loaded(src) new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src) new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src) new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src) diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index b1296f8b2cf..7f96f70209d 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -203,10 +203,11 @@ obj/item/ammo_box/magazine/tommygunm45 icon_state = "a762-[round(ammo_count(),10)]" + /obj/item/ammo_box/magazine/m12g - name = "shotgun magazine (12g buckshot)" + name = "shotgun magazine (12g slugs)" icon_state = "m12gb" - ammo_type = /obj/item/ammo_casing/shotgun/buckshot + ammo_type = /obj/item/ammo_casing/shotgun origin_tech = "combat=3;syndicate=1" caliber = "shotgun" max_ammo = 8 @@ -215,6 +216,11 @@ obj/item/ammo_box/magazine/tommygunm45 ..() icon_state = "[initial(icon_state)]-[Ceiling(ammo_count(0)/8)*8]" +/obj/item/ammo_box/magazine/m12g/buckshot + name = "shotgun magazine (12g buckshot slugs)" + icon_state = "m12gb" + ammo_type = /obj/item/ammo_casing/shotgun/buckshot + /obj/item/ammo_box/magazine/m12g/stun name = "shotgun magazine (12g taser slugs)" icon_state = "m12gs" From 7afd81e083f54fff29f2e523e555549ef6ffcbc3 Mon Sep 17 00:00:00 2001 From: Dorsisdwarf Date: Thu, 11 Jun 2015 08:09:36 +0100 Subject: [PATCH 2/3] removes loaded bag from locker, adds to uplink at discounted price. Lowers cost of least-used ammo type --- code/datums/uplink_item.dm | 9 ++++++++- .../structures/crates_lockers/closets/syndicate.dm | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 064bacab6e2..09beb53e7e8 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -268,6 +268,13 @@ var/list/uplink_items = list() cost = 2 gamemodes = list(/datum/game_mode/nuclear,/datum/game_mode/gang) +/datum/uplink_item/ammo/ammobag + name = "Ammo Duffelbag - Shotgun Ammo Grab Bag" + desc = "A duffelbag filled with Bulldog ammo to kit out an entire team, at a discounted price." + item = /obj/item/weapon/storage/backpack/dufflebag/syndieammo/loaded + cost = 10 //bulk buyer's discount. Very useful if you're buying a mech and dont have TC left to buy people non-shotgun guns + gamemodes = list(/datum/game_mode/nuclear) + /datum/uplink_item/ammo/bullslug name = "Drum Magazine - 12g Slugs" desc = "An additional 8-round slug magazine for use in the Bulldog shotgun. Now 8 times less likely to shoot your pals." @@ -293,7 +300,7 @@ var/list/uplink_items = list() name = "Drum Magazine - 12g Dragon's Breath" desc = "An alternative 8-round dragon's breath magazine for use in the Bulldog shotgun. I'm a fire starter, twisted fire starter!" item = /obj/item/ammo_box/magazine/m12g/dragon - cost = 3 + cost = 2 gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/ammo/carbine diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index a08178c61e8..b6ad237fbba 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -31,7 +31,6 @@ new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/weapon/storage/box/teargas(src) new /obj/item/weapon/storage/backpack/dufflebag/syndiemed(src) - new /obj/item/weapon/storage/backpack/dufflebag/syndieammo/loaded(src) new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src) new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src) new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src) From 74af78651de895f90e38b7dad353ee25c1006030 Mon Sep 17 00:00:00 2001 From: Dorsisdwarf Date: Fri, 12 Jun 2015 22:41:29 +0100 Subject: [PATCH 3/3] fixes #10000 "no changelog for nuke op PR, Jordie tracked down dorsisdwarf with an axe" --- html/changelogs/Dorsisdwarf-9800-nukeops.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 html/changelogs/Dorsisdwarf-9800-nukeops.yml diff --git a/html/changelogs/Dorsisdwarf-9800-nukeops.yml b/html/changelogs/Dorsisdwarf-9800-nukeops.yml new file mode 100644 index 00000000000..e7d2d895ab2 --- /dev/null +++ b/html/changelogs/Dorsisdwarf-9800-nukeops.yml @@ -0,0 +1,15 @@ + +# Your name. +author: Dorsisdwarf + +# 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 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: + - tweak: "Syndicate Bulldog Shotguns now use slug ammo instead of buckshot by default" + - rscadd: "Nuke Ops can now buy team grab-bags of bulldog ammo at a discount."