Test Merge - Quiver fix (#107)

* Test Merge - Quiver fix

This should fix an issue with the quivers causing StrongDMM to be unstable. Tested locally by two separate testers. Please test merge this!

* Update traits.dm

* Merges be merging

* Update musketeer.dm

* Fix n' Nerf

Corrected the ammo pouch going into the wrong slot, preventing it from spawning. Nerfed the ranged skills of the boltman as, with their weapon choice, they would have 5 (!) skill in their weapon of choice.

* Update townguard.dm

And now the fix for the town guard

* Fine keep your gorgets

_maps/custom/roguetown2.dmm

@@ -1598,7 +1598,7 @@
 "EM" = (/obj/machinery/light/rogue/wallfire/candle/blue/r,/turf/open/floor/rogue/ruinedwood{icon_state = "vertw"},/area/rogue/indoors/town/magician)
 "EN" = (/obj/structure/closet/crate/chest,/turf/open/floor/rogue/tile{icon_state = "greenstone"},/area/rogue/indoors/town/magician)
 "EO" = (/turf/closed/wall/mineral/rogue/wood,/area/rogue/indoors/town/manor)
-"EP" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/quiver/arrows,/turf/open/floor/rogue/ruinedwood{icon_state = "weird1"},/area/rogue/indoors/town/manor)
+"EP" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/ammo_holder/quiver/arrows,/turf/open/floor/rogue/ruinedwood{icon_state = "weird1"},/area/rogue/indoors/town/manor)
 "EQ" = (/obj/structure/table/wood{dir = 1; icon_state = "longtable"},/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/turf/open/floor/rogue/ruinedwood{icon_state = "weird1"},/area/rogue/indoors/town/manor)
 "ER" = (/obj/machinery/light/rogue/torchholder/c,/turf/open/floor/rogue/ruinedwood{icon_state = "weird1"},/area/rogue/indoors/town/manor)
 "ES" = (/obj/structure/closet/crate/chest,/turf/open/floor/rogue/ruinedwood{icon_state = "weird1"},/area/rogue/indoors/town/manor)
@@ -1645,7 +1645,7 @@
 "FH" = (/obj/structure/stairs/stone{dir = 4; icon_state = "stonestairs"},/turf/open/floor/rogue/church,/area/rogue/indoors/town/church/chapel)
 "FI" = (/obj/structure/fluff/walldeco/church/line{dir = 1; icon_state = "churchslate"},/turf/open/floor/rogue/churchmarble,/area/rogue/indoors/town/church/chapel)
 "FJ" = (/obj/structure/fluff/walldeco/church/line{dir = 1; icon_state = "churchslate"},/obj/machinery/light/rogue/torchholder/c,/turf/open/floor/rogue/churchmarble,/area/rogue/indoors/town/church/chapel)
-"FK" = (/obj/structure/closet/crate/roguecloset,/obj/item/quiver/bolts,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison)
+"FK" = (/obj/structure/closet/crate/roguecloset,/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison)
 "FL" = (/obj/structure/closet/crate/chest,/obj/item/rope,/obj/item/rope,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison)
 "FM" = (/obj/structure/rack/rogue,/turf/open/floor/rogue/wood,/area/rogue/indoors/town/garrison)
 "FN" = (/obj/structure/bars/grille,/turf/open/transparent/openspace,/area/rogue/indoors/town/garrison)
@@ -1654,7 +1654,7 @@
 "FQ" = (/obj/structure/table/church,/obj/item/candle/yellow,/turf/open/floor/rogue/churchmarble,/area/rogue/indoors/town/church/chapel)
 "FR" = (/obj/structure/table/church/m,/obj/item/reagent_containers/glass/cup/golden,/turf/open/floor/rogue/churchmarble,/area/rogue/indoors/town/church/chapel)
 "FS" = (/obj/structure/table/church{dir = 1; icon_state = "churchtable"},/turf/open/floor/rogue/churchmarble,/area/rogue/indoors/town/church/chapel)
-"FT" = (/obj/structure/closet/crate/roguecloset,/obj/item/quiver/arrows,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison)
+"FT" = (/obj/structure/closet/crate/roguecloset,/obj/item/ammo_holder/quiver/arrows,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison)
 "FU" = (/obj/structure/table/wood{icon_state = "tablewood1"},/obj/item/rogue/instrument/drum,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison)
 "FV" = (/obj/structure/rack/rogue,/obj/item/rogueweapon/huntingknife/idagger/steel,/turf/open/floor/rogue/ruinedwood{icon_state = "horzw"},/area/rogue/indoors/town/garrison)
 "FW" = (/turf/open/floor/rogue/ruinedwood{icon_state = "horzw"},/area/rogue/indoors/town/garrison)
@@ -1828,7 +1828,7 @@
 "Ji" = (/obj/machinery/light/rogue/firebowl,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue/indoors/town/garrison)
 "Jj" = (/obj/item/roguebin/water,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue/indoors/town/garrison)
 "Jk" = (/obj/structure/closet/crate/chest,/obj/item/rope/chain,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue/indoors/town/garrison)
-"Jl" = (/obj/structure/closet/crate/chest,/obj/item/quiver/bolts,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue/indoors/town/garrison)
+"Jl" = (/obj/structure/closet/crate/chest,/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue/indoors/town/garrison)
 "Jm" = (/obj/structure/mineral_door/wood{icon_state = "wcr"; locked = 1; lockid = "sheriff"},/turf/open/floor/rogue/wood,/area/rogue/indoors/town/garrison)
 "Jn" = (/obj/structure/chair/wood/rogue/fancy{dir = 1; icon_state = "chair1"},/turf/open/floor/carpet/royalblack,/area/rogue/indoors/town/garrison)
 "Jo" = (/obj/structure/roguewindow/openclose{dir = 8; icon_state = "woodwindowdir"},/turf/open/floor/rogue/wood,/area/rogue/indoors/town/garrison)
@@ -1921,7 +1921,7 @@
 "KX" = (/obj/structure/closet/crate/roguecloset/inn/chest,/turf/open/floor/rogue/ruinedwood{dir = 1; icon_state = "vertw"},/area/rogue/indoors/town)
 "KY" = (/obj/structure/roguewindow/openclose{dir = 4; icon_state = "woodwindowdir"},/turf/open/floor/rogue/ruinedwood,/area/rogue/outdoors/mountains)
 "KZ" = (/obj/structure/mineral_door/wood/red{locked = 1; lockid = "woodsm"},/turf/open/floor/rogue/ruinedwood,/area/rogue/outdoors/mountains)
-"La" = (/obj/structure/rack/rogue,/obj/item/quiver/arrows,/turf/open/floor/rogue/ruinedwood,/area/rogue/outdoors/mountains)
+"La" = (/obj/structure/rack/rogue,/obj/item/ammo_holder/quiver/arrows,/turf/open/floor/rogue/ruinedwood,/area/rogue/outdoors/mountains)
 "Lb" = (/turf/closed/wall/mineral/rogue/pipe{icon_state = "iron_corner"},/area/rogue/indoors/town/dwarfin)
 "Lc" = (/turf/closed/wall/mineral/rogue/pipe{dir = 4; icon_state = "iron_corner"},/area/rogue/indoors/town/dwarfin)
 "Ld" = (/obj/structure/bed/rogue/inn/hay,/turf/open/floor/rogue/ruinedwood{dir = 1; icon_state = "vertw"},/area/rogue/indoors/town)

_maps/map_files/backup2/roguetown.dmm

@@ -320,7 +320,7 @@
 "gu" = (/obj/structure/chair/wood/rogue,/turf/open/floor/rogue/wood,/area/rogue/indoors/town)
 "gv" = (/obj/structure/lever/wall{dir = 8; redstone_id = "stewardshutter"},/turf/open/floor/rogue/hexstone,/area/rogue/indoors/town)
 "gw" = (/obj/structure/chair/bench/ultimacouch,/turf/open/floor/carpet/royalblack,/area/rogue/indoors/town/bath)
-"gx" = (/obj/structure/closet/crate/roguecloset,/obj/item/quiver/bolts,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison)
+"gx" = (/obj/structure/closet/crate/roguecloset,/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison)
 "gy" = (/turf/open/floor/rogue/ruinedwood{icon_state = "horzw"},/area/rogue/indoors/town/dwarfin)
 "gz" = (/turf/open/floor/rogue/blocks/stonered/tiny,/area/rogue/indoors/town/manor)
 "gB" = (/obj/structure/chair/bench/ultimacouch/r{icon_state = "ultimacochright"},/obj/effect/landmark/start/nightmaiden,/turf/open/floor/carpet/royalblack,/area/rogue/indoors/town/bath)
@@ -773,7 +773,7 @@
 "pL" = (/obj/structure/ladder,/turf/open/floor/rogue/ruinedwood{icon_state = "weird1"},/area/rogue/indoors/town/manor)
 "pM" = (/obj/structure/fluff/railing/border{icon_state = "border"; dir = 4},/turf/closed/wall/mineral/rogue/wooddark/vertical,/area/rogue/indoors/town/dwarfin)
 "pN" = (/obj/structure/closet/crate/chest,/obj/item/reagent_containers/glass/cup/wooden,/obj/item/reagent_containers/glass/cup/wooden,/turf/open/floor/rogue/herringbone,/area/rogue/indoors/town/church)
-"pO" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/quiver/arrows,/turf/open/floor/rogue/ruinedwood{icon_state = "weird1"},/area/rogue/indoors/town/manor)
+"pO" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/ammo_holder/quiver/arrows,/turf/open/floor/rogue/ruinedwood{icon_state = "weird1"},/area/rogue/indoors/town/manor)
 "pP" = (/obj/structure/table/wood{icon_state = "longtable"; dir = 1},/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/turf/open/floor/rogue/ruinedwood{icon_state = "weird1"},/area/rogue/indoors/town/manor)
 "pQ" = (/obj/machinery/light/rogue/torchholder/c,/turf/open/floor/rogue/ruinedwood{icon_state = "weird1"},/area/rogue/indoors/town/manor)
 "pR" = (/obj/structure/closet/crate/chest,/turf/open/floor/rogue/ruinedwood{icon_state = "weird1"},/area/rogue/indoors/town/manor)
@@ -1972,7 +1972,7 @@
 "Ug" = (/obj/structure/table/wood{icon_state = "largetable"; dir = 10},/turf/open/floor/rogue/cobble,/area/rogue/indoors/town)
 "Uh" = (/obj/structure/table/wood{icon_state = "tablewood2"; dir = 10},/obj/structure/mirror{pixel_x = -28},/turf/open/floor/rogue/tile{icon_state = "greenstone"},/area/rogue/under/town/basement)
 "Uk" = (/obj/effect/decal/cleanable/cobweb/cobweb2,/turf/open/floor/rogue/cobble,/area/rogue/under/town/basement)
-"Ul" = (/obj/structure/closet/crate/chest,/obj/item/quiver/bolts,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue/indoors/town/garrison)
+"Ul" = (/obj/structure/closet/crate/chest,/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue/indoors/town/garrison)
 "Um" = (/turf/open/floor/rogue/ruinedwood/chevron,/area/rogue/outdoors/exposed/dwarf)
 "Un" = (/obj/structure/fluff/railing/border{icon_state = "border"; dir = 9},/turf/open/floor/rogue/ruinedwood{icon_state = "wooden_floort"},/area/rogue/outdoors/town)
 "Uo" = (/obj/structure/closet/dirthole/closed,/turf/open/floor/rogue/dirt,/area/rogue/outdoors/town)
@@ -2093,7 +2093,7 @@
 "XI" = (/obj/structure/mineral_door/wood/fancywood{locked = 1; lockid = "hand"; name = "Hand's Chambers"},/turf/open/floor/rogue/carpet,/area/rogue/indoors/town/manor)
 "XJ" = (/obj/structure/table/wood{icon_state = "tablewood1"},/obj/item/candle/yellow/lit,/turf/open/floor/rogue/tile{icon_state = "greenstone"},/area/rogue/under/town/basement)
 "XQ" = (/obj/item/flashlight/flare/torch/lantern,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue/indoors/town/garrison)
-"XV" = (/obj/structure/closet/crate/roguecloset,/obj/item/quiver/arrows,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison)
+"XV" = (/obj/structure/closet/crate/roguecloset,/obj/item/ammo_holder/quiver/arrows,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison)
 "XX" = (/obj/structure/chair/wood/rogue{icon_state = "chair2"; dir = 4},/turf/open/floor/rogue/wood,/area/rogue/indoors/town)
 "XY" = (/obj/structure/bookcase,/obj/item/book/random,/obj/item/book/random,/obj/item/book/random,/turf/open/floor/rogue/wood,/area/rogue/indoors/town/magician)
 "XZ" = (/obj/structure/stairs{icon_state = "stairs"; dir = 4},/turf/open/floor/rogue/blocks/stonered/tiny,/area/rogue/indoors/town/bath)

_maps/map_files/dun_manor/azure_coast.dmm

@@ -5643,7 +5643,7 @@
 /obj/structure/closet/crate/chest/old_crate,
 /obj/item/reagent_containers/glass/bottle/rogue/wine,
 /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve,
-/obj/item/quiver/arrows,
+/obj/item/ammo_holder/quiver/arrows,
 /turf/open/floor/rogue/ruinedwood/spiral,
 /area/rogue/under/town/basement)
 "Uh" = (