From 9c5628d86d1a860897780cafc3e8376952028a1c Mon Sep 17 00:00:00 2001 From: Lhars Date: Mon, 16 Dec 2024 10:14:03 -0400 Subject: [PATCH 1/7] 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! --- _maps/custom/roguetown2.dmm | 10 +- _maps/map_files/backup2/roguetown.dmm | 8 +- _maps/map_files/dun_manor/azure_coast.dmm | 2 +- _maps/map_files/dun_manor/azure_forest.dmm | 163 ++++------ _maps/map_files/dun_manor/dun_manor.dmm | 26 +- _maps/map_files/generic/CentCom.dmm | 22 +- _maps/map_files/grimoria/roguetown.dmm | 8 +- _maps/map_files/grimoria/roguetown2.dmm | 10 +- _maps/map_files/oldtown/oldtown.dmm | 18 +- _maps/map_files/otherz/bog.dmm | 4 +- _maps/map_files/otherz/smallforest.dmm | 8 +- _maps/map_files/rockhill/rockhill.dmm | 42 +-- _maps/map_files/roguetest/roguetest.dmm | 22 +- _maps/map_files/roguetown/old/roguetown.dmm | 16 +- _maps/map_files/roguetown/roguetown.dmm | 8 +- _maps/map_files/roguetown2/roguetown2.dmm | 10 +- _maps/templates/smalldungeons.dm | 8 +- code/modules/cargo/packsrogue/Knave.dm | 6 +- code/modules/cargo/packsrogue/Sellsword.dm | 2 +- code/modules/cargo/packsrogue/weapons.dm | 18 +- code/modules/clothing/rogueclothes/quiver.dm | 279 +++++------------- .../roguetown/adventurer/types/antag/knave.dm | 4 +- .../adventurer/types/antag/sellsword.dm | 2 +- .../adventurer/types/combat/amazon.dm | 2 +- .../adventurer/types/combat/barbarian.dm | 2 +- .../adventurer/types/combat/dwarfranger.dm | 2 +- .../adventurer/types/combat/ranger.dm | 4 +- .../adventurer/types/combat/rare/sentinel.dm | 2 +- .../adventurer/types/combat/rogue.dm | 2 +- .../adventurer/types/pilgrim/hunter.dm | 2 +- .../roguetown/garrison/gatemaster.dm | 2 +- .../roguetown/garrison/manorguard.dm | 2 +- .../job_types/roguetown/garrison/townguard.dm | 2 +- .../roguetown/mercenaries/classes/anthrax.dm | 2 +- .../mercenaries/classes/boltslinger.dm | 2 +- .../mercenaries/classes/condottiero.dm | 2 +- .../mercenaries/classes/grenzelhoft.dm | 2 +- .../mercenaries/classes/steppesman.dm | 2 +- .../job_types/roguetown/yeomen/merchant.dm | 2 +- .../job_types/roguetown/youngfolk/squire.dm | 2 +- .../roguetown/roguecrafting/leather.dm | 4 +- .../roguetown/roguemachine/drugmachine.dm | 2 +- code/modules/roguetown/roguestock/import.dm | 6 +- 43 files changed, 294 insertions(+), 450 deletions(-) diff --git a/_maps/custom/roguetown2.dmm b/_maps/custom/roguetown2.dmm index 2b0e4ec13..f7c0ca367 100644 --- a/_maps/custom/roguetown2.dmm +++ b/_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) diff --git a/_maps/map_files/backup2/roguetown.dmm b/_maps/map_files/backup2/roguetown.dmm index a55945a0a..0ddd45078 100644 --- a/_maps/map_files/backup2/roguetown.dmm +++ b/_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) diff --git a/_maps/map_files/dun_manor/azure_coast.dmm b/_maps/map_files/dun_manor/azure_coast.dmm index 9d0dd8a5a..e577bf3c2 100644 --- a/_maps/map_files/dun_manor/azure_coast.dmm +++ b/_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" = ( diff --git a/_maps/map_files/dun_manor/azure_forest.dmm b/_maps/map_files/dun_manor/azure_forest.dmm index 3fa15eab8..4295f630b 100644 --- a/_maps/map_files/dun_manor/azure_forest.dmm +++ b/_maps/map_files/dun_manor/azure_forest.dmm @@ -547,10 +547,6 @@ /obj/machinery/light/rogue/wallfire/candle/blue, /turf/open/floor/rogue/hexstone, /area/rogue/under/town/basement) -"es" = ( -/obj/machinery/light/rogue/firebowl/stump, -/turf/open/floor/rogue/dirt/road, -/area/rogue/indoors/shelter/mountains) "ew" = ( /turf/open/transparent/openspace, /area/rogue/outdoors/woods) @@ -1084,7 +1080,7 @@ dir = 1 }, /turf/open/floor/rogue/cobblerock, -/area/rogue/indoors/shelter/mountains) +/area/rogue/outdoors/mountains) "jj" = ( /turf/open/water/sewer, /area/rogue/under/cave/dungeon1/gethsmane/inner) @@ -1164,9 +1160,6 @@ "jK" = ( /turf/closed/mineral/rogue/bedrock, /area/rogue/under/town/basement) -"jM" = ( -/turf/open/floor/rogue/cobblerock, -/area/rogue/indoors/shelter/mountains) "jQ" = ( /mob/living/carbon/human/species/skeleton/npc/no_equipment, /turf/open/floor/rogue/hexstone, @@ -1267,10 +1260,6 @@ icon_state = "vertw" }, /area/rogue/indoors) -"kt" = ( -/obj/structure/fluff/railing/wood, -/turf/open/floor/rogue/dirt, -/area/rogue/indoors/shelter/mountains) "ku" = ( /obj/effect/spawner/lootdrop/roguetown/dungeon/tools, /turf/open/floor/rogue/greenstone, @@ -1905,12 +1894,6 @@ /obj/structure/fermenting_barrel/random/beer, /turf/open/floor/rogue/blocks, /area/rogue/under/town/basement) -"pH" = ( -/obj/structure/fluff/railing/wood{ - dir = 1 - }, -/turf/open/floor/rogue/dirt, -/area/rogue/indoors/shelter/mountains) "pL" = ( /obj/machinery/light/rogue/firebowl/stump, /turf/open/floor/rogue/dirt/road, @@ -2048,8 +2031,8 @@ /turf/open/floor/rogue/dirt/road, /area/rogue/under/cavewet/bogcaves) "qV" = ( -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, /obj/structure/table/wood/bar{ icon_state = "longtable"; dir = 1 @@ -3256,7 +3239,7 @@ dir = 1 }, /turf/open/floor/rogue/cobblerock, -/area/rogue/indoors/shelter/mountains) +/area/rogue/outdoors/mountains) "AY" = ( /obj/structure/stairs/stone{ dir = 1; @@ -3746,7 +3729,7 @@ dir = 1 }, /turf/open/floor/rogue/naturalstone, -/area/rogue/indoors/shelter/mountains) +/area/rogue/outdoors/mountains) "Fl" = ( /turf/closed/wall/mineral/rogue/tent{ dir = 1 @@ -3818,7 +3801,7 @@ "FM" = ( /obj/structure/far_travel, /turf/open/floor/rogue/cobblerock, -/area/rogue/indoors/shelter/mountains) +/area/rogue/outdoors/mountains) "FO" = ( /turf/closed/wall/mineral/rogue/wooddark/end, /area/rogue/indoors) @@ -3843,9 +3826,6 @@ /obj/effect/spawner/lootdrop/roguetown/sewers, /turf/open/floor/rogue/dirt/road, /area/rogue/indoors) -"Gh" = ( -/turf/open/floor/rogue/naturalstone, -/area/rogue/indoors/shelter/mountains) "Gi" = ( /turf/open/transparent/openspace, /area/rogue/under/town/basement) @@ -3912,9 +3892,6 @@ /obj/structure/fluff/alch, /turf/open/floor/rogue/greenstone, /area/rogue/under/town/basement) -"GO" = ( -/turf/open/floor/rogue/dirt/road, -/area/rogue/indoors/shelter/mountains) "GR" = ( /obj/item/grown/log/tree/small, /obj/item/grown/log/tree/stick, @@ -4717,9 +4694,6 @@ "Nb" = ( /turf/open/floor/rogue/ruinedwood/turned, /area/rogue/indoors/shelter/woods) -"Nc" = ( -/turf/open/floor/rogue/grass, -/area/rogue/indoors/shelter/mountains) "Ne" = ( /turf/open/water/cleanshallow, /area/rogue/under/cave) @@ -5152,12 +5126,6 @@ /obj/item/grown/log/tree/small, /turf/open/floor/rogue/dirt, /area/rogue/outdoors/woods) -"RA" = ( -/obj/structure/fluff/railing/wood{ - dir = 1 - }, -/turf/open/floor/rogue/grass, -/area/rogue/indoors/shelter/mountains) "RB" = ( /obj/structure/flora/newtree, /obj/structure/flora/newtree, @@ -5751,9 +5719,6 @@ /mob/living/simple_animal/hostile/retaliate/rogue/mudcrab, /turf/open/water/cleanshallow, /area/rogue/outdoors/woods) -"Wh" = ( -/turf/open/floor/rogue/dirt, -/area/rogue/indoors/shelter/mountains) "Wk" = ( /obj/structure/fluff/railing/fence{ dir = 1 @@ -6126,7 +6091,7 @@ name = "AZURE PEAK - EAST" }, /turf/open/floor/rogue/grass, -/area/rogue/indoors/shelter/mountains) +/area/rogue/outdoors/mountains) "ZM" = ( /obj/item/grown/log/tree, /obj/item/grown/log/tree/stick, @@ -81672,8 +81637,8 @@ rj GH GH GH -Nc -Gh +zu +HO gU gU gU @@ -81826,10 +81791,10 @@ rj rj rj rj -Wh +Ug GH -Nc -jM +zu +Jx Fk gU gU @@ -81983,10 +81948,10 @@ rj rj rj rj -GO -jM -jM -jM +dP +Jx +Jx +Jx AX FM gU @@ -82139,11 +82104,11 @@ rj rj rj rj -kt -jM -jM -jM -jM +eH +Jx +Jx +Jx +Jx jg FM gU @@ -82296,11 +82261,11 @@ rj rj rj rj -kt -jM -jM -jM -jM +eH +Jx +Jx +Jx +Jx AX FM gU @@ -82453,11 +82418,11 @@ rj rj rj rj -kt +eH ZL -jM -jM -Gh +Jx +Jx +HO Fk gU gU @@ -82611,11 +82576,11 @@ rj rj rj rj -GO -jM -Nc -jM -Gh +dP +Jx +zu +Jx +HO gU gU gU @@ -82767,12 +82732,12 @@ rj rj rj rj -Nc -RA -jM -es -Nc -Gh +zu +Jr +Jx +pL +zu +HO gU gU gU @@ -82924,10 +82889,10 @@ rj rj rj rj -Wh -RA -jM -Wh +Ug +Jr +Jx +Ug GH GH GH @@ -83081,10 +83046,10 @@ rj rj rj rj -GO -pH -jM -GO +dP +EB +Jx +dP GH GH GH @@ -83239,10 +83204,10 @@ rj rj rj rj -pH -jM -jM -Nc +EB +Jx +Jx +zu GH GH gU @@ -83397,9 +83362,9 @@ rj rj rj Ug -Nc -jM -Nc +zu +Jx +zu GH GH gU @@ -83555,8 +83520,8 @@ rj rj rj dP -jM -jM +Jx +Jx GH GH gU @@ -83713,8 +83678,8 @@ rj rj Ug Jr -jM -Nc +Jx +zu GH gU gU @@ -83870,8 +83835,8 @@ rj rj rj EB -jM -jM +Jx +Jx GH gU gU @@ -84028,7 +83993,7 @@ rj rj EB zu -jM +Jx GH gU gU @@ -84185,7 +84150,7 @@ rj rj Ug zu -jM +Jx GH gU gU diff --git a/_maps/map_files/dun_manor/dun_manor.dmm b/_maps/map_files/dun_manor/dun_manor.dmm index fc4e33fa3..7ef9b99a2 100644 --- a/_maps/map_files/dun_manor/dun_manor.dmm +++ b/_maps/map_files/dun_manor/dun_manor.dmm @@ -5930,7 +5930,7 @@ /area/rogue/outdoors/town) "fZy" = ( /obj/structure/closet/crate/chest, -/obj/item/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, /obj/item/flashlight/flare/torch/lantern, /obj/item/rope/chain, /turf/open/floor/rogue/wood, @@ -10283,7 +10283,7 @@ /area/rogue/indoors) "kCo" = ( /obj/structure/rack/rogue, -/obj/item/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, /obj/item/gun/ballistic/revolver/grenadelauncher/bow, /turf/open/floor/rogue/cobble, /area/rogue/indoors/town) @@ -13047,7 +13047,7 @@ "njH" = ( /obj/machinery/light/rogue/torchholder/r, /obj/structure/rack/rogue, -/obj/item/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, /turf/open/floor/rogue/cobble, /area/rogue/indoors/town) "njK" = ( @@ -15554,13 +15554,13 @@ /turf/open/floor/rogue/naturalstone, /area/rogue/under/cave) "pDE" = ( -/obj/item/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, /obj/structure/closet/crate/roguecloset, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, /turf/open/floor/rogue/blocks, /area/rogue/under/town/basement) "pEc" = ( @@ -18908,11 +18908,11 @@ }, /area/rogue/under/cave) "sRU" = ( -/obj/item/quiver/bolts, -/obj/item/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, /obj/structure/closet/crate/roguecloset, -/obj/item/quiver/bolts, -/obj/item/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, /turf/open/floor/rogue/blocks, /area/rogue/under/town/basement) "sRV" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index b7ebee509..f27ee3f5d 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -1541,11 +1541,11 @@ icon_state = "tablewood2"; dir = 10 }, -/obj/item/quiver/bolts, -/obj/item/quiver/bolts, -/obj/item/quiver/bolts, -/obj/item/quiver/bolts, -/obj/item/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, /turf/open/floor/rogue/dirt, /area/rogue/outdoors) "nh" = ( @@ -2472,12 +2472,12 @@ icon_state = "tablewood2"; dir = 10 }, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, /turf/open/floor/rogue/dirt, /area/rogue/outdoors) "Vu" = ( diff --git a/_maps/map_files/grimoria/roguetown.dmm b/_maps/map_files/grimoria/roguetown.dmm index 073f348dd..91ed96168 100644 --- a/_maps/map_files/grimoria/roguetown.dmm +++ b/_maps/map_files/grimoria/roguetown.dmm @@ -104,7 +104,7 @@ "cy" = (/obj/structure/closet/crate/coffin,/turf/open/floor/rogue/blocks{icon_state = "bluestone"},/area/rogue/under/town/basement) "cz" = (/obj/effect/landmark/mapGenerator/rogue/decap{endTurfX = 128; endTurfY = 128},/turf/closed/mineral/rogue/bedrock,/area/rogue/outdoors/mountains/decap) "cA" = (/obj/structure/table/wood{icon_state = "longtable_mid"; dir = 1},/turf/open/floor/rogue/blocks/paving/vert,/area/rogue/under/town/basement) -"cB" = (/obj/structure/table/wood{icon_state = "longtable_mid"; dir = 1},/obj/item/quiver/arrows,/turf/open/floor/rogue/ruinedwood/turned,/area/rogue/indoors) +"cB" = (/obj/structure/table/wood{icon_state = "longtable_mid"; dir = 1},/obj/item/ammo_holder/quiver/arrows,/turf/open/floor/rogue/ruinedwood/turned,/area/rogue/indoors) "cC" = (/obj/structure/stairs{icon_state = "stairs"; dir = 1},/turf/open/floor/rogue/woodturned,/area/rogue/indoors/town/tavern) "cD" = (/obj/effect/landmark/start/villager,/turf/open/floor/rogue/wood,/area/rogue/indoors/town/tavern) "cE" = (/turf/closed/wall/mineral/rogue/wooddark/window,/area/rogue/indoors) @@ -643,7 +643,7 @@ "pY" = (/obj/machinery/light/rogue/wallfire{pixel_y = 32},/turf/open/floor/rogue/carpet/lord/center,/area/rogue/indoors/town/manor) "pZ" = (/obj/structure/table/wood{icon_state = "longtable_mid"; dir = 1},/turf/open/floor/carpet/royalblack,/area/rogue/indoors/town) "qa" = (/mob/living/simple_animal/hostile/retaliate/rogue/bigrat,/turf/open/floor/rogue/dirt/road,/area/rogue/indoors) -"qc" = (/obj/structure/closet/crate/roguecloset,/obj/item/quiver/arrows,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town) +"qc" = (/obj/structure/closet/crate/roguecloset,/obj/item/ammo_holder/quiver/arrows,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town) "qd" = (/obj/structure/chair/wood/rogue{icon_state = "chair2"; dir = 8},/turf/open/floor/rogue/wood,/area/rogue/indoors/town/church) "qg" = (/obj/structure/bed/rogue,/turf/open/floor/rogue/blocks/stonered,/area/rogue/indoors/town/dwarfin) "qi" = (/obj/structure/bed/rogue/inn/hay,/turf/open/floor/rogue/ruinedwood{icon_state = "vertw"; dir = 1},/area/rogue/indoors) @@ -1403,7 +1403,7 @@ "KF" = (/obj/structure/lever{redstone_id = "outside2"},/turf/open/floor/rogue/blocks/newstone/alt,/area/rogue/indoors/town/shop) "KG" = (/obj/structure/fluff/railing/wood{dir = 1; pixel_y = -1},/turf/open/floor/rogue/blocks/newstone/alt,/area/rogue/indoors/town/shop) "KH" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/rogueweapon/pitchfork,/turf/open/floor/rogue/cobblerock,/area/rogue/indoors/town) -"KI" = (/obj/structure/closet/crate/roguecloset,/obj/item/quiver/bolts,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town) +"KI" = (/obj/structure/closet/crate/roguecloset,/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town) "KJ" = (/turf/open/floor/rogue/blocks/stonered,/area/rogue/indoors) "KK" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/reagent_containers/powder/flour,/obj/item/rogueweapon/huntingknife/cleaver,/turf/open/floor/rogue/tile{icon_state = "tile"},/area/rogue/indoors/town/tavern) "KO" = (/obj/machinery/light/rogue/wallfire/candle/blue,/turf/open/floor/rogue/cobble,/area/rogue/under/town/basement) @@ -1972,7 +1972,7 @@ "YZ" = (/obj/structure/chair/wood/rogue/fancy{icon_state = "chair1"; dir = 4},/turf/open/floor/rogue/wood,/area/rogue/indoors/town/church) "Za" = (/obj/structure/closet/crate/roguecloset,/obj/item/reagent_containers/food/snacks/smallrat,/turf/open/floor/rogue/hexstone,/area/rogue/indoors/town) "Zb" = (/mob/living/simple_animal/hostile/retaliate/rogue/cow,/turf/open/floor/rogue/grass,/area/rogue/under/town/basement) -"Zc" = (/obj/structure/closet/crate/chest,/obj/item/quiver/bolts,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue/indoors/town) +"Zc" = (/obj/structure/closet/crate/chest,/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue/indoors/town) "Ze" = (/obj/structure/mineral_door/wood{locked = 1; lockid = "merchant"},/turf/open/floor/rogue/tile{icon_state = "linoleum"},/area/rogue/indoors) "Zf" = (/obj/machinery/light/rogue/lanternpost{dir = 1},/turf/open/floor/rogue/cobblerock,/area/rogue/indoors) "Zh" = (/turf/open/floor/rogue/carpet/lord/left,/area/rogue/indoors/town/manor) diff --git a/_maps/map_files/grimoria/roguetown2.dmm b/_maps/map_files/grimoria/roguetown2.dmm index 946c831c5..5aad27627 100644 --- a/_maps/map_files/grimoria/roguetown2.dmm +++ b/_maps/map_files/grimoria/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{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) "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{icon_state = "stonestairs"; dir = 4},/turf/open/floor/rogue/church,/area/rogue/indoors/town/church/chapel) "FI" = (/obj/structure/fluff/walldeco/church/line{icon_state = "churchslate"; dir = 1},/turf/open/floor/rogue/churchmarble,/area/rogue/indoors/town/church/chapel) "FJ" = (/obj/structure/fluff/walldeco/church/line{icon_state = "churchslate"; dir = 1},/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{icon_state = "churchtable"; dir = 1},/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{icon_state = "chair1"; dir = 1},/turf/open/floor/carpet/royalblack,/area/rogue/indoors/town/garrison) "Jo" = (/obj/structure/roguewindow/openclose{icon_state = "woodwindowdir"; dir = 8},/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{icon_state = "vertw"; dir = 1},/area/rogue/indoors/town) "KY" = (/obj/structure/roguewindow/openclose{icon_state = "woodwindowdir"; dir = 4},/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{icon_state = "iron_corner"; dir = 4},/area/rogue/indoors/town/dwarfin) "Ld" = (/obj/structure/bed/rogue/inn/hay,/turf/open/floor/rogue/ruinedwood{icon_state = "vertw"; dir = 1},/area/rogue/indoors/town) diff --git a/_maps/map_files/oldtown/oldtown.dmm b/_maps/map_files/oldtown/oldtown.dmm index 884dac206..a8225cd74 100644 --- a/_maps/map_files/oldtown/oldtown.dmm +++ b/_maps/map_files/oldtown/oldtown.dmm @@ -561,7 +561,7 @@ "akO" = (/obj/machinery/light/rogue/firebowl/stump,/turf/open/floor/rogue/cobblerock,/area/rogue/outdoors/rtfield) "akP" = (/obj/item/roguemachine/mastermail,/turf/open/floor/rogue/hexstone,/area/rogue/outdoors/town) "akQ" = (/turf/open/floor/carpet/royalblack,/area/rogue/outdoors/town/roofs) -"akR" = (/obj/structure/rack/rogue,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/quiver/arrows,/obj/item/quiver/arrows,/obj/item/quiver/arrows,/obj/item/quiver/arrows,/obj/machinery/light/rogue/torchholder/c,/turf/open/floor/rogue/ruinedwood/spiral,/area/rogue/indoors) +"akR" = (/obj/structure/rack/rogue,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/ammo_holder/quiver/arrows,/obj/item/ammo_holder/quiver/arrows,/obj/item/ammo_holder/quiver/arrows,/obj/item/ammo_holder/quiver/arrows,/obj/machinery/light/rogue/torchholder/c,/turf/open/floor/rogue/ruinedwood/spiral,/area/rogue/indoors) "akS" = (/turf/open/floor/rogue/blocks{icon_state = "paving"},/area/rogue/under/town/sewer) "akT" = (/turf/open/floor/rogue/woodturned,/area/rogue/indoors/town/tavern) "akU" = (/obj/structure/chair/wood/rogue,/turf/open/floor/rogue/cobble,/area/rogue/indoors/town/tavern) @@ -686,7 +686,7 @@ "ank" = (/obj/structure/fluff/walldeco/sparrowflag{pixel_y = 32},/turf/open/floor/rogue/wood,/area/rogue/indoors/town/garrison) "anl" = (/obj/structure/fluff/walldeco/stone{pixel_y = 32},/turf/open/floor/rogue/wood,/area/rogue/indoors) "anm" = (/obj/structure/table/wood,/obj/structure/mirror{pixel_x = 28; pixel_y = 0},/obj/item/reagent_containers/glass/bottle/rogue/manapot,/turf/open/floor/rogue/wood,/area/rogue/indoors/town/church) -"ann" = (/obj/structure/closet/crate/roguecloset,/obj/item/quiver/bolts,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison) +"ann" = (/obj/structure/closet/crate/roguecloset,/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison) "ano" = (/obj/structure/closet/crate/chest,/obj/item/rope,/obj/item/rope,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison) "anp" = (/obj/structure/rack/rogue,/turf/open/floor/rogue/wood,/area/rogue/indoors/town/garrison) "anq" = (/obj/structure/closet/crate/chest{lockid = "priest"},/obj/item/clothing/cloak/stole/red,/obj/item/clothing/cloak/chasuble,/turf/open/floor/carpet/royalblack,/area/rogue/indoors/town/church) @@ -694,7 +694,7 @@ "ans" = (/obj/structure/bed/rogue,/turf/open/floor/carpet/royalblack,/area/rogue/indoors/town/church) "ant" = (/obj/structure/mineral_door/wood{locked = 1; lockid = "vault"},/turf/open/floor/rogue/cobble,/area/rogue/under/town/basement) "anu" = (/obj/structure/table/wood,/obj/item/candle/yellow/lit,/turf/open/floor/carpet/royalblack,/area/rogue/indoors/town/church) -"anv" = (/obj/structure/closet/crate/roguecloset,/obj/item/quiver/arrows,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison) +"anv" = (/obj/structure/closet/crate/roguecloset,/obj/item/ammo_holder/quiver/arrows,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison) "anw" = (/obj/structure/table/wood{icon_state = "tablewood1"},/obj/item/rogue/instrument/drum,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison) "anx" = (/obj/structure/rack/rogue,/obj/item/rogueweapon/huntingknife/idagger/steel,/turf/open/floor/rogue/ruinedwood{icon_state = "horzw"},/area/rogue/indoors/town/garrison) "any" = (/obj/structure/rack/rogue,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/turf/open/floor/rogue/ruinedwood{icon_state = "horzw"},/area/rogue/indoors/town/garrison) @@ -1192,7 +1192,7 @@ "awZ" = (/obj/item/paper/confession,/obj/item/paper/confession,/obj/item/paper/confession,/obj/item/paper/confession,/obj/item/paper/confession,/obj/structure/closet/crate/chest,/turf/open/floor/rogue/herringbone,/area/rogue/under/town/basement) "axa" = (/obj/structure/closet/crate/roguecloset,/obj/item/storage/backpack/rogue/satchel,/turf/open/floor/rogue/hexstone,/area/rogue/under/town/basement) "axb" = (/obj/structure/chair/wood/rogue/fancy{dir = 4},/turf/open/floor/carpet/inn,/area/rogue/outdoors/town) -"axc" = (/obj/structure/closet/crate/roguecloset,/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,/obj/item/quiver,/obj/item/ammo_casing/caseless/rogue/bolt,/obj/item/ammo_casing/caseless/rogue/bolt,/obj/item/ammo_casing/caseless/rogue/bolt,/obj/item/ammo_casing/caseless/rogue/bolt,/turf/open/floor/rogue/hexstone,/area/rogue/under/town/basement) +"axc" = (/obj/structure/closet/crate/roguecloset,/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,/obj/item/ammo_holder/quiver,/obj/item/ammo_casing/caseless/rogue/bolt,/obj/item/ammo_casing/caseless/rogue/bolt,/obj/item/ammo_casing/caseless/rogue/bolt,/obj/item/ammo_casing/caseless/rogue/bolt,/turf/open/floor/rogue/hexstone,/area/rogue/under/town/basement) "axd" = (/obj/structure/bed/rogue/shit,/turf/open/floor/rogue/herringbone,/area/rogue/under/town/basement) "axe" = (/obj/item/reagent_containers/food/snacks/cracker,/obj/item/reagent_containers/food/snacks/cracker,/obj/item/reagent_containers/food/snacks/cracker,/obj/item/reagent_containers/food/snacks/cracker,/obj/structure/closet/crate/chest,/turf/open/floor/rogue/herringbone,/area/rogue/under/town/basement) "axf" = (/obj/machinery/light/rogue/wallfire/candle/blue/l,/turf/open/floor/rogue/blocks,/area/rogue/under/town/basement) @@ -1409,7 +1409,7 @@ "aBi" = (/obj/structure/stairs{dir = 1},/obj/structure/fluff/railing/border{dir = 4},/turf/open/floor/rogue/ruinedwood{icon_state = "horzw"},/area/rogue/outdoors/town) "aBj" = (/obj/item/grown/log/tree/stick,/obj/item/grown/log/tree/stick,/obj/item/grown/log/tree/stick,/turf/open/floor/rogue/cobble,/area/rogue/indoors/town/dwarfin) "aBk" = (/obj/item/flint,/obj/structure/closet/crate/chest,/turf/open/floor/rogue/cobble,/area/rogue/indoors/town/dwarfin) -"aBl" = (/obj/structure/rack/rogue,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/quiver/arrows,/obj/item/quiver/arrows,/obj/item/quiver/arrows,/obj/item/quiver/arrows,/obj/machinery/light/rogue/torchholder/c{dir = 1; pixel_y = -6},/turf/open/floor/rogue/blocks,/area/rogue/under) +"aBl" = (/obj/structure/rack/rogue,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/ammo_holder/quiver/arrows,/obj/item/ammo_holder/quiver/arrows,/obj/item/ammo_holder/quiver/arrows,/obj/item/ammo_holder/quiver/arrows,/obj/machinery/light/rogue/torchholder/c{dir = 1; pixel_y = -6},/turf/open/floor/rogue/blocks,/area/rogue/under) "aBm" = (/obj/structure/chair/bench/couch,/obj/effect/landmark/start/prince,/turf/open/floor/rogue/wood,/area/rogue/indoors/town/manor) "aBn" = (/turf/closed/wall/mineral/rogue/wooddark/vertical,/area/rogue/indoors) "aBo" = (/obj/structure/table/wood{icon_state = "map6"},/turf/open/floor/rogue/tile{icon_state = "bfloorz"},/area/rogue/indoors/town/manor) @@ -1865,7 +1865,7 @@ "aKb" = (/obj/effect/landmark/start/vagrant,/turf/open/floor/rogue/dirt/road,/area/rogue/outdoors/town) "aKd" = (/turf/closed/wall/mineral/rogue/wooddark,/area/rogue/outdoors/town) "aKe" = (/obj/structure/rack/rogue,/obj/item/rogueweapon/spear,/turf/open/floor/rogue/concrete,/area/rogue/indoors) -"aKf" = (/obj/structure/rack/rogue,/obj/item/quiver/arrows,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/turf/open/floor/rogue/concrete,/area/rogue/indoors) +"aKf" = (/obj/structure/rack/rogue,/obj/item/ammo_holder/quiver/arrows,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/turf/open/floor/rogue/concrete,/area/rogue/indoors) "aKg" = (/obj/structure/rack/rogue,/obj/item/rogueweapon/shield/tower,/turf/open/floor/rogue/concrete,/area/rogue/indoors) "aKh" = (/obj/structure/rack/rogue,/obj/item/rogueweapon/sword/iron,/turf/open/floor/rogue/concrete,/area/rogue/indoors) "aKi" = (/obj/structure/floordoor/gatehatch/outer{redstone_id = "gatelava"},/turf/open/transparent/openspace,/area/rogue/indoors) @@ -1878,9 +1878,9 @@ "aKr" = (/obj/structure/floordoor/gatehatch/inner{redstone_id = "gatelava"},/obj/structure/kybraxor{pixel_x = -32; pixel_y = -32},/turf/open/transparent/openspace,/area/rogue/indoors) "aKs" = (/obj/structure/floordoor/gatehatch/inner{redstone_id = "gatelava"},/turf/open/transparent/openspace,/area/rogue/indoors) "aKv" = (/obj/structure/table/wood{icon_state = "longtable"},/turf/open/floor/rogue/concrete,/area/rogue/indoors) -"aKw" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/quiver/bolts,/turf/open/floor/rogue/concrete,/area/rogue/indoors) +"aKw" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/concrete,/area/rogue/indoors) "aKx" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,/turf/open/floor/rogue/concrete,/area/rogue/indoors) -"aKy" = (/obj/structure/table/wood{icon_state = "longtable_mid"; dir = 1},/obj/item/quiver/bolts,/turf/open/floor/rogue/concrete,/area/rogue/indoors) +"aKy" = (/obj/structure/table/wood{icon_state = "longtable_mid"; dir = 1},/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/concrete,/area/rogue/indoors) "aKz" = (/obj/structure/table/wood{icon_state = "longtable"; dir = 1},/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,/turf/open/floor/rogue/concrete,/area/rogue/indoors) "aKB" = (/obj/structure/winch{gid = "townin"; redstone_id = "townin"},/turf/open/floor/rogue/cobble,/area/rogue/indoors) "aKD" = (/obj/structure/mineral_door/bars{lockid = "garrison"},/turf/open/floor/rogue/dirt/road,/area/rogue/outdoors/town) @@ -2411,7 +2411,7 @@ "lTf" = (/obj/effect/decal/cobbleedge{dir = 1; icon_state = "borderfall"},/turf/open/floor/rogue/cobble,/area/rogue/indoors) "lTi" = (/obj/structure/mineral_door/wood/donjon/stone{lockid = "physician"; locked = 1},/turf/open/floor/rogue/churchbrick,/area/rogue/indoors/town/manor) "lTj" = (/obj/structure/mineral_door/wood/donjon{dir = 8; locked = 1; lockid = "garrison"; max_integrity = 9999},/turf/open/floor/rogue/blocks,/area/rogue/indoors/town/garrison) -"lVW" = (/obj/structure/closet/crate/chest,/obj/item/quiver/bolts,/turf/open/floor/rogue/tile,/area/rogue/indoors/town/garrison) +"lVW" = (/obj/structure/closet/crate/chest,/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/tile,/area/rogue/indoors/town/garrison) "lWx" = (/obj/structure/chair/wood{dir = 4},/obj/effect/landmark/start/bogmaster{dir = 4},/turf/open/floor/rogue/ruinedwood/spiral,/area/rogue/indoors) "lYp" = (/turf/open/floor/rogue/ruinedwood{icon_state = "vertw"},/area/rogue/outdoors/town/roofs) "lZA" = (/turf/closed/mineral/rogue/bedrock,/area/rogue/outdoors/bog) diff --git a/_maps/map_files/otherz/bog.dmm b/_maps/map_files/otherz/bog.dmm index 59a6f44f5..97a8dc109 100644 --- a/_maps/map_files/otherz/bog.dmm +++ b/_maps/map_files/otherz/bog.dmm @@ -444,7 +444,7 @@ "Ob" = (/turf/open/floor/rogue/dirt,/area/rogue/under/cavewet/bogcaves) "Og" = (/turf/open/floor/rogue/grass,/area/rogue/outdoors/bog) "On" = (/obj/structure/fluff/railing/border{icon_state = "border"; dir = 8},/turf/open/floor/rogue/ruinedwood/spiral,/area/rogue/indoors) -"Oq" = (/obj/structure/rack/rogue,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/quiver/arrows,/obj/item/quiver/arrows,/obj/item/quiver/arrows,/obj/item/quiver/arrows,/obj/machinery/light/rogue/torchholder{pixel_y = 26},/turf/open/floor/rogue/ruinedwood/spiral,/area/rogue/indoors) +"Oq" = (/obj/structure/rack/rogue,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/ammo_holder/quiver/arrows,/obj/item/ammo_holder/quiver/arrows,/obj/item/ammo_holder/quiver/arrows,/obj/item/ammo_holder/quiver/arrows,/obj/machinery/light/rogue/torchholder{pixel_y = 26},/turf/open/floor/rogue/ruinedwood/spiral,/area/rogue/indoors) "Ou" = (/obj/effect/landmark/start/desertriderlate{dir = 8},/turf/open/floor/rogue/naturalstone,/area/rogue/under/cavewet/bogcaves) "Ov" = (/obj/structure/fluff/railing/border{icon_state = "border"; dir = 5},/turf/open/floor/rogue/blocks/paving,/area/rogue/under/town/basement) "Oy" = (/obj/structure/flora/roguetree/stump,/obj/effect/landmark/start/adventurer{dir = 8},/turf/open/floor/rogue/dirt,/area/rogue/outdoors/bog) @@ -543,7 +543,7 @@ "WU" = (/obj/structure/stairs,/turf/open/floor/rogue/ruinedwood/spiral,/area/rogue/indoors) "WY" = (/obj/machinery/light/rogue/torchholder{icon_state = "torchwall1"; dir = 8},/turf/open/floor/rogue/blocks,/area/rogue/indoors) "Xe" = (/obj/structure/mineral_door/wood{locked = 1; lockid = "garrison"},/turf/open/floor/rogue/cobble,/area/rogue/indoors) -"Xi" = (/obj/structure/rack/rogue,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/quiver/arrows,/obj/item/quiver/arrows,/obj/item/quiver/arrows,/obj/item/quiver/arrows,/obj/machinery/light/rogue/torchholder{dir = 1; pixel_y = -6},/turf/open/floor/rogue/blocks,/area/rogue/under/town/basement) +"Xi" = (/obj/structure/rack/rogue,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/obj/item/ammo_holder/quiver/arrows,/obj/item/ammo_holder/quiver/arrows,/obj/item/ammo_holder/quiver/arrows,/obj/item/ammo_holder/quiver/arrows,/obj/machinery/light/rogue/torchholder{dir = 1; pixel_y = -6},/turf/open/floor/rogue/blocks,/area/rogue/under/town/basement) "Xj" = (/obj/structure/fluff/wallclock,/turf/open/floor/rogue/ruinedwood/spiral,/area/rogue/indoors) "Xk" = (/obj/structure/closet/crate/drawer,/turf/open/floor/rogue/ruinedwood/spiral,/area/rogue/indoors) "Xx" = (/obj/structure/closet/crate/drawer{pixel_y = 16},/obj/item/roguekey/butcher,/obj/item/roguekey/butcher,/turf/open/floor/rogue/twig,/area/rogue/indoors) diff --git a/_maps/map_files/otherz/smallforest.dmm b/_maps/map_files/otherz/smallforest.dmm index e6712d583..67856538b 100644 --- a/_maps/map_files/otherz/smallforest.dmm +++ b/_maps/map_files/otherz/smallforest.dmm @@ -1771,10 +1771,10 @@ /obj/item/gun/ballistic/revolver/grenadelauncher/bow, /obj/item/gun/ballistic/revolver/grenadelauncher/bow, /obj/item/gun/ballistic/revolver/grenadelauncher/bow, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, /turf/open/floor/rogue/dirt/road, /area/rogue/under/town/basement) "Ty" = ( diff --git a/_maps/map_files/rockhill/rockhill.dmm b/_maps/map_files/rockhill/rockhill.dmm index 45ec52713..61c2fa99a 100644 --- a/_maps/map_files/rockhill/rockhill.dmm +++ b/_maps/map_files/rockhill/rockhill.dmm @@ -1577,7 +1577,7 @@ /obj/structure/table/wood{ icon_state = "longtable" }, -/obj/item/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, /turf/open/floor/rogue/ruinedwood{ icon_state = "weird1" }, @@ -3270,8 +3270,8 @@ /area/rogue/indoors) "czb" = ( /obj/structure/rack/rogue, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, /obj/machinery/light/rogue/torchholder/l, /turf/open/floor/rogue/cobble, /area/rogue/under/town/basement) @@ -3936,8 +3936,8 @@ /area/rogue/outdoors/woods) "dfS" = ( /obj/structure/rack/rogue, -/obj/item/quiver/bolts, -/obj/item/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, /turf/open/floor/rogue/cobble, /area/rogue/under/town/basement) "dgD" = ( @@ -4886,7 +4886,7 @@ /area/rogue/indoors/town/dwarfin) "eeK" = ( /obj/structure/closet/crate/chest, -/obj/item/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, /obj/item/rogueweapon/flail/sflail, /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow, /turf/open/floor/rogue/tile, @@ -5618,10 +5618,10 @@ /obj/item/gun/ballistic/revolver/grenadelauncher/bow, /obj/item/gun/ballistic/revolver/grenadelauncher/bow, /obj/item/gun/ballistic/revolver/grenadelauncher/bow, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, /obj/machinery/light/rogue/torchholder{ dir = 1; pixel_y = -6 @@ -12461,10 +12461,10 @@ /obj/item/gun/ballistic/revolver/grenadelauncher/bow, /obj/item/gun/ballistic/revolver/grenadelauncher/bow, /obj/item/gun/ballistic/revolver/grenadelauncher/bow, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, /obj/machinery/light/rogue/torchholder{ pixel_y = 26 }, @@ -13049,8 +13049,8 @@ }, /area/rogue/under/town/basement) "nfG" = ( -/obj/item/quiver/bolts, -/obj/item/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, /obj/structure/rack/rogue, /turf/open/floor/rogue/woodturned, /area/rogue/indoors/town/garrison) @@ -15571,7 +15571,7 @@ /area/rogue/indoors/town/garrison) "pUz" = ( /obj/structure/rack/rogue, -/obj/item/quiver, +/obj/item/ammo_holder/quiver, /turf/open/floor/rogue/cobble, /area/rogue/under/town/basement) "pVE" = ( @@ -21342,10 +21342,10 @@ /area/rogue/indoors/town/church/chapel) "wiU" = ( /obj/structure/rack/rogue, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, /turf/open/floor/rogue/woodturned, /area/rogue/indoors/town/garrison) "wjr" = ( diff --git a/_maps/map_files/roguetest/roguetest.dmm b/_maps/map_files/roguetest/roguetest.dmm index 5266e0a15..ec98f258c 100644 --- a/_maps/map_files/roguetest/roguetest.dmm +++ b/_maps/map_files/roguetest/roguetest.dmm @@ -982,11 +982,11 @@ icon_state = "tablewood2"; dir = 10 }, -/obj/item/quiver/bolts, -/obj/item/quiver/bolts, -/obj/item/quiver/bolts, -/obj/item/quiver/bolts, -/obj/item/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, /turf/open/floor/rogue/dirt, /area/rogue/outdoors) "cz" = ( @@ -1007,12 +1007,12 @@ icon_state = "tablewood2"; dir = 10 }, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, -/obj/item/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, /turf/open/floor/rogue/dirt, /area/rogue/outdoors) "cB" = ( diff --git a/_maps/map_files/roguetown/old/roguetown.dmm b/_maps/map_files/roguetown/old/roguetown.dmm index 51a841368..c48541f12 100644 --- a/_maps/map_files/roguetown/old/roguetown.dmm +++ b/_maps/map_files/roguetown/old/roguetown.dmm @@ -687,7 +687,7 @@ "ank" = (/obj/structure/fluff/walldeco/sparrowflag{pixel_y = 32},/turf/open/floor/rogue/wood,/area/rogue) "anl" = (/obj/structure/fluff/walldeco/stone{pixel_x = 0; pixel_y = 32},/turf/open/floor/rogue/wood,/area/rogue) "anm" = (/obj/structure/table/wood,/obj/structure/mirror{pixel_x = 28; pixel_y = 0},/obj/item/reagent_containers/glass/bottle/rogue/manapot,/turf/open/floor/rogue/wood,/area/rogue) -"ann" = (/obj/structure/closet/crate/roguecloset,/obj/item/quiver/bolts,/turf/open/floor/rogue/blocks,/area/rogue) +"ann" = (/obj/structure/closet/crate/roguecloset,/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/blocks,/area/rogue) "ano" = (/obj/structure/closet/crate/chest,/obj/item/rope,/obj/item/rope,/turf/open/floor/rogue/blocks,/area/rogue) "anp" = (/obj/structure/rack/rogue,/turf/open/floor/rogue/wood,/area/rogue) "anq" = (/obj/structure/closet/crate/chest{lockid = "priest"},/obj/item/clothing/cloak/stole/red,/obj/item/clothing/cloak/chasuble,/turf/open/floor/carpet/royalblack,/area/rogue) @@ -695,7 +695,7 @@ "ans" = (/obj/structure/bed/rogue,/turf/open/floor/carpet/royalblack,/area/rogue) "ant" = (/obj/structure/mineral_door/wood{locked = 1; lockid = "vault"},/turf/open/floor/rogue/cobble,/area/rogue) "anu" = (/obj/structure/table/wood,/obj/item/candle/yellow/lit,/turf/open/floor/carpet/royalblack,/area/rogue) -"anv" = (/obj/structure/closet/crate/roguecloset,/obj/item/quiver/arrows,/turf/open/floor/rogue/blocks,/area/rogue) +"anv" = (/obj/structure/closet/crate/roguecloset,/obj/item/ammo_holder/quiver/arrows,/turf/open/floor/rogue/blocks,/area/rogue) "anw" = (/obj/structure/table/wood{icon_state = "tablewood1"},/obj/item/rogue/instrument/drum,/turf/open/floor/rogue/blocks,/area/rogue) "anx" = (/obj/structure/rack/rogue,/obj/item/rogueweapon/huntingknife/idagger/steel,/turf/open/floor/rogue/ruinedwood{icon_state = "horzw"},/area/rogue) "any" = (/obj/structure/rack/rogue,/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/turf/open/floor/rogue/ruinedwood{icon_state = "horzw"},/area/rogue) @@ -730,7 +730,7 @@ "aob" = (/obj/structure/fluff/railing/border{icon_state = "border"; dir = 9},/turf/open/floor/rogue/woodturned,/area/rogue) "aoc" = (/obj/machinery/light/rogue/firebowl,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue) "aod" = (/obj/structure/closet/crate/chest,/obj/item/rope/chain,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue) -"aoe" = (/obj/structure/closet/crate/chest,/obj/item/quiver/bolts,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue) +"aoe" = (/obj/structure/closet/crate/chest,/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue) "aof" = (/obj/structure/mineral_door/wood{icon_state = "wcr"; locked = 1; lockid = "sheriff"},/turf/open/floor/rogue/wood,/area/rogue) "aog" = (/obj/structure/chair/wood/rogue/fancy{icon_state = "chair1"; dir = 1},/turf/open/floor/carpet/royalblack,/area/rogue) "aoh" = (/obj/structure/roguewindow/openclose{icon_state = "woodwindowdir"; dir = 8},/turf/closed/wall/mineral/rogue/craftstone,/area/rogue) @@ -946,7 +946,7 @@ "asj" = (/obj/structure/rack/rogue,/obj/item/rogueweapon/spear,/turf/open/floor/rogue/ruinedwood,/area/rogue/indoors) "ask" = (/obj/structure/roguewindow/openclose{icon_state = "woodwindowdir"; dir = 4},/turf/open/floor/rogue/ruinedwood,/area/rogue/indoors) "asl" = (/obj/structure/mineral_door/wood/red{locked = 1; lockid = "woodsm"},/turf/open/floor/rogue/ruinedwood,/area/rogue/indoors) -"asm" = (/obj/structure/rack/rogue,/obj/item/quiver/arrows,/turf/open/floor/rogue/ruinedwood,/area/rogue/indoors) +"asm" = (/obj/structure/rack/rogue,/obj/item/ammo_holder/quiver/arrows,/turf/open/floor/rogue/ruinedwood,/area/rogue/indoors) "asn" = (/obj/machinery/light/rogue/firebowl,/turf/open/floor/rogue/ruinedwood{icon_state = "horzw"},/area/rogue/indoors) "aso" = (/obj/machinery/light/rogue/wallfire/candle/r,/turf/open/floor/rogue/ruinedwood,/area/rogue/indoors) "asp" = (/obj/structure/closet/crate/roguecloset,/obj/item/clothing/suit/roguetown/shirt/rags,/obj/item/clothing/suit/roguetown/shirt/rags,/obj/item/clothing/suit/roguetown/shirt/rags,/obj/item/reagent_containers/food/snacks/rogue/crackerscooked,/turf/open/floor/rogue/ruinedwood,/area/rogue/indoors) @@ -1196,7 +1196,7 @@ "awZ" = (/obj/item/paper/confession,/obj/item/paper/confession,/obj/item/paper/confession,/obj/item/paper/confession,/obj/item/paper/confession,/obj/structure/closet/crate/chest,/turf/open/floor/rogue/herringbone,/area/rogue) "axa" = (/obj/structure/closet/crate/roguecloset,/obj/item/storage/backpack/rogue/satchel,/turf/open/floor/rogue/hexstone,/area/rogue) "axb" = (/obj/effect/decal/cleanable/blood/old,/turf/open/floor/rogue/blocks,/area/rogue) -"axc" = (/obj/structure/closet/crate/roguecloset,/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,/obj/item/quiver,/obj/item/ammo_casing/caseless/rogue/bolt,/obj/item/ammo_casing/caseless/rogue/bolt,/obj/item/ammo_casing/caseless/rogue/bolt,/obj/item/ammo_casing/caseless/rogue/bolt,/turf/open/floor/rogue/hexstone,/area/rogue) +"axc" = (/obj/structure/closet/crate/roguecloset,/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,/obj/item/ammo_holder/quiver,/obj/item/ammo_casing/caseless/rogue/bolt,/obj/item/ammo_casing/caseless/rogue/bolt,/obj/item/ammo_casing/caseless/rogue/bolt,/obj/item/ammo_casing/caseless/rogue/bolt,/turf/open/floor/rogue/hexstone,/area/rogue) "axd" = (/obj/structure/bed/rogue/shit,/turf/open/floor/rogue/herringbone,/area/rogue) "axe" = (/obj/item/reagent_containers/food/snacks/cracker,/obj/item/reagent_containers/food/snacks/cracker,/obj/item/reagent_containers/food/snacks/cracker,/obj/item/reagent_containers/food/snacks/cracker,/obj/structure/closet/crate/chest,/turf/open/floor/rogue/herringbone,/area/rogue) "axf" = (/obj/machinery/light/rogue/wallfire/candle/blue/l,/turf/open/floor/rogue/blocks,/area/rogue) @@ -1875,7 +1875,7 @@ "aKc" = (/obj/structure/stairs{icon_state = "stairs"; dir = 4},/turf/open/floor/rogue/cobble,/area/rogue/outdoors/town) "aKd" = (/turf/closed/wall/mineral/rogue/wooddark,/area/rogue/outdoors/town) "aKe" = (/obj/structure/rack/rogue,/obj/item/rogueweapon/spear,/turf/open/floor/rogue/concrete,/area/rogue/outdoors/town) -"aKf" = (/obj/structure/rack/rogue,/obj/item/quiver/arrows,/turf/open/floor/rogue/concrete,/area/rogue/outdoors/town) +"aKf" = (/obj/structure/rack/rogue,/obj/item/ammo_holder/quiver/arrows,/turf/open/floor/rogue/concrete,/area/rogue/outdoors/town) "aKg" = (/obj/structure/rack/rogue,/obj/item/rogueweapon/shield/tower,/turf/open/floor/rogue/concrete,/area/rogue/outdoors/town) "aKh" = (/obj/structure/rack/rogue,/obj/item/rogueweapon/sword/iron,/turf/open/floor/rogue/concrete,/area/rogue/outdoors/town) "aKi" = (/obj/structure/floordoor/gatehatch/outer{redstone_id = "gatelava"},/turf/open/transparent/openspace,/area/rogue/outdoors/town) @@ -1892,9 +1892,9 @@ "aKt" = (/obj/structure/table/wood,/obj/item/candle/yellow/lit,/obj/structure/bars{icon_state = "barsbent"; layer = 2.81},/turf/open/floor/rogue/blocks,/area/rogue/outdoors/town) "aKu" = (/obj/structure/mineral_door/wood/donjon{dir = 4; icon_state = "donjondir"; lockid = "walls"},/turf/open/floor/rogue/cobble,/area/rogue/outdoors/town) "aKv" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/gun/ballistic/revolver/grenadelauncher/bow,/turf/open/floor/rogue/concrete,/area/rogue/outdoors/town) -"aKw" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/quiver/bolts,/turf/open/floor/rogue/concrete,/area/rogue/outdoors/town) +"aKw" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/concrete,/area/rogue/outdoors/town) "aKx" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,/turf/open/floor/rogue/concrete,/area/rogue/outdoors/town) -"aKy" = (/obj/structure/table/wood{icon_state = "longtable_mid"; dir = 1},/obj/item/quiver/bolts,/turf/open/floor/rogue/concrete,/area/rogue/outdoors/town) +"aKy" = (/obj/structure/table/wood{icon_state = "longtable_mid"; dir = 1},/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/concrete,/area/rogue/outdoors/town) "aKz" = (/obj/structure/table/wood{icon_state = "longtable"; dir = 1},/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,/turf/open/floor/rogue/concrete,/area/rogue/outdoors/town) "aKA" = (/obj/structure/table/wood,/turf/open/floor/rogue/cobble,/area/rogue/outdoors/town) "aKB" = (/obj/structure/winch{gid = "townout"},/turf/open/floor/rogue/cobble,/area/rogue/outdoors/town) diff --git a/_maps/map_files/roguetown/roguetown.dmm b/_maps/map_files/roguetown/roguetown.dmm index 81d3df687..3a4d2c291 100644 --- a/_maps/map_files/roguetown/roguetown.dmm +++ b/_maps/map_files/roguetown/roguetown.dmm @@ -111,7 +111,7 @@ "cw" = (/obj/effect/landmark/events/testportal{aportalloc = "manor"},/turf/open/floor/rogue/tile/masonic{dir = 1},/area/rogue/indoors/town/manor) "cy" = (/obj/structure/closet/crate/coffin,/turf/open/floor/rogue/blocks{icon_state = "bluestone"},/area/rogue/under/town/basement) "cA" = (/obj/structure/table/wood{dir = 1; icon_state = "longtable_mid"},/turf/open/floor/rogue/blocks/paving/vert,/area/rogue/under/town/basement) -"cB" = (/obj/structure/table/wood{dir = 1; icon_state = "longtable_mid"},/obj/item/quiver/arrows,/turf/open/floor/rogue/ruinedwood/turned,/area/rogue/indoors) +"cB" = (/obj/structure/table/wood{dir = 1; icon_state = "longtable_mid"},/obj/item/ammo_holder/quiver/arrows,/turf/open/floor/rogue/ruinedwood/turned,/area/rogue/indoors) "cC" = (/obj/structure/stairs{dir = 1; icon_state = "stairs"},/turf/open/floor/rogue/woodturned,/area/rogue/indoors/town/tavern) "cD" = (/obj/effect/landmark/start/villager,/turf/open/floor/rogue/wood,/area/rogue/indoors/town/tavern) "cE" = (/turf/closed/wall/mineral/rogue/wooddark/window,/area/rogue/indoors) @@ -660,7 +660,7 @@ "pY" = (/obj/machinery/light/rogue/wallfire{pixel_y = 32},/turf/open/floor/rogue/carpet/lord/center,/area/rogue/indoors/town/manor) "pZ" = (/obj/structure/table/wood{dir = 1; icon_state = "longtable_mid"},/turf/open/floor/carpet/royalblack,/area/rogue/indoors/town) "qa" = (/mob/living/simple_animal/hostile/retaliate/rogue/bigrat,/turf/open/floor/rogue/dirt/road,/area/rogue/indoors) -"qc" = (/obj/structure/closet/crate/roguecloset,/obj/item/quiver/arrows,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town) +"qc" = (/obj/structure/closet/crate/roguecloset,/obj/item/ammo_holder/quiver/arrows,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town) "qd" = (/obj/structure/chair/wood/rogue{dir = 8; icon_state = "chair2"},/turf/open/floor/rogue/wood,/area/rogue/indoors/town/church) "qg" = (/obj/structure/bed/rogue,/turf/open/floor/rogue/blocks/stonered,/area/rogue/indoors/town/dwarfin) "qi" = (/obj/structure/bed/rogue/inn/hay,/turf/open/floor/rogue/ruinedwood{dir = 1; icon_state = "vertw"},/area/rogue/indoors) @@ -1444,7 +1444,7 @@ "KF" = (/obj/structure/lever{redstone_id = "outside2"},/turf/open/floor/rogue/blocks/newstone/alt,/area/rogue/indoors/town/shop) "KG" = (/obj/structure/fluff/railing/wood{dir = 1; pixel_y = -1},/turf/open/floor/rogue/blocks/newstone/alt,/area/rogue/indoors/town/shop) "KH" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/rogueweapon/pitchfork,/turf/open/floor/rogue/cobblerock,/area/rogue/indoors/town) -"KI" = (/obj/structure/closet/crate/roguecloset,/obj/item/quiver/bolts,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town) +"KI" = (/obj/structure/closet/crate/roguecloset,/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/blocks,/area/rogue/indoors/town) "KJ" = (/turf/open/floor/rogue/blocks/stonered,/area/rogue/indoors) "KK" = (/obj/structure/table/wood{icon_state = "longtable"},/obj/item/reagent_containers/powder/flour,/obj/item/rogueweapon/huntingknife/cleaver,/turf/open/floor/rogue/tile{icon_state = "tile"},/area/rogue/indoors/town/tavern) "KL" = (/obj/structure/flora/roguegrass/water,/turf/open/water/swamp,/area/rogue/outdoors/mountains/decap) @@ -2029,7 +2029,7 @@ "YZ" = (/obj/structure/chair/wood/rogue/fancy{dir = 4; icon_state = "chair1"},/turf/open/floor/rogue/wood,/area/rogue/indoors/town/church) "Za" = (/obj/structure/closet/crate/roguecloset,/obj/item/reagent_containers/food/snacks/smallrat,/turf/open/floor/rogue/hexstone,/area/rogue/indoors/town) "Zb" = (/mob/living/simple_animal/hostile/retaliate/rogue/cow,/turf/open/floor/rogue/grass,/area/rogue/under/town/basement) -"Zc" = (/obj/structure/closet/crate/chest,/obj/item/quiver/bolts,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue/indoors/town) +"Zc" = (/obj/structure/closet/crate/chest,/obj/item/ammo_holder/quiver/bolts,/turf/open/floor/rogue/tile{icon_state = "chess"},/area/rogue/indoors/town) "Ze" = (/obj/structure/mineral_door/wood{locked = 1; lockid = "merchant"},/turf/open/floor/rogue/tile{icon_state = "linoleum"},/area/rogue/indoors) "Zf" = (/obj/machinery/light/rogue/lanternpost{dir = 1},/turf/open/floor/rogue/cobblerock,/area/rogue/indoors) "Zh" = (/turf/open/floor/rogue/carpet/lord/left,/area/rogue/indoors/town/manor) diff --git a/_maps/map_files/roguetown2/roguetown2.dmm b/_maps/map_files/roguetown2/roguetown2.dmm index 5892f76ef..16e0f0462 100644 --- a/_maps/map_files/roguetown2/roguetown2.dmm +++ b/_maps/map_files/roguetown2/roguetown2.dmm @@ -5978,7 +5978,7 @@ /obj/structure/table/wood{ icon_state = "longtable" }, -/obj/item/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, /turf/open/floor/rogue/ruinedwood{ icon_state = "weird1" }, @@ -6254,7 +6254,7 @@ /area/rogue/outdoors/town/roofs) "Av" = ( /obj/structure/closet/crate/roguecloset, -/obj/item/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, /turf/open/floor/rogue/blocks, /area/rogue/indoors/town/garrison) "Aw" = ( @@ -6313,7 +6313,7 @@ /area/rogue/outdoors/town/roofs) "AH" = ( /obj/structure/closet/crate/roguecloset, -/obj/item/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, /turf/open/floor/rogue/blocks, /area/rogue/indoors/town/garrison) "AI" = ( @@ -7759,7 +7759,7 @@ /area/rogue/indoors/town/garrison) "FW" = ( /obj/structure/closet/crate/chest, -/obj/item/quiver/bolts, +/obj/item/ammo_holder/quiver/bolts, /obj/item/rogueweapon/flail/sflail, /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow, /turf/open/floor/rogue/tile, @@ -8658,7 +8658,7 @@ /obj/structure/closet/crate/roguecloset, /obj/item/gun/ballistic/revolver/grenadelauncher/bow, /obj/item/natural/saddle, -/obj/item/quiver/arrows, +/obj/item/ammo_holder/quiver/arrows, /turf/open/floor/rogue/ruinedwood, /area/rogue/outdoors/mountains) "Jq" = ( diff --git a/_maps/templates/smalldungeons.dm b/_maps/templates/smalldungeons.dm index 298d56c48..3842f874e 100644 --- a/_maps/templates/smalldungeons.dm +++ b/_maps/templates/smalldungeons.dm @@ -82,8 +82,8 @@ /obj/item/gun/ballistic/revolver/grenadelauncher/bow = 2, /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve = 2, /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow = 2, - /obj/item/quiver/arrows = 2, - /obj/item/quiver/bolts = 2, + /obj/item/ammo_holder/quiver/arrows = 2, + /obj/item/ammo_holder/quiver/bolts = 2, /obj/item/rogueweapon/mace/woodclub/crafted = 3, /obj/item/rogueweapon/mace/steel/morningstar =2, /obj/item/rogueweapon/mace/cudgel = 2, @@ -251,8 +251,8 @@ /obj/item/gun/ballistic/revolver/grenadelauncher/bow = 2, /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve = 2, /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow = 2, - /obj/item/quiver/arrows = 2, - /obj/item/quiver/bolts = 2, + /obj/item/ammo_holder/quiver/arrows = 2, + /obj/item/ammo_holder/quiver/bolts = 2, /obj/item/rogueweapon/mace/woodclub/crafted = 3, /obj/item/rogueweapon/mace/steel/morningstar =2, /obj/item/rogueweapon/mace/cudgel = 2, diff --git a/code/modules/cargo/packsrogue/Knave.dm b/code/modules/cargo/packsrogue/Knave.dm index 8184742dd..172f09d39 100644 --- a/code/modules/cargo/packsrogue/Knave.dm +++ b/code/modules/cargo/packsrogue/Knave.dm @@ -86,18 +86,18 @@ /datum/supply_pack/rogue/Knave/quiver name = "Empty Quiver" cost = 5 - contains = list(/obj/item/quiver) + contains = list(/obj/item/ammo_holder/quiver) /datum/supply_pack/rogue/Knave/quivers/arrows name = "Quiver of Arrows" cost = 10 - contains = list(/obj/item/quiver/arrows) + contains = list(/obj/item/ammo_holder/quiver/arrows) /datum/supply_pack/rogue/Knave/quivers/bolts name = "Quiver of Bolts" cost = 20 - contains = list(/obj/item/quiver/bolts) + contains = list(/obj/item/ammo_holder/quiver/bolts) diff --git a/code/modules/cargo/packsrogue/Sellsword.dm b/code/modules/cargo/packsrogue/Sellsword.dm index cb199f015..7260e4e8f 100644 --- a/code/modules/cargo/packsrogue/Sellsword.dm +++ b/code/modules/cargo/packsrogue/Sellsword.dm @@ -164,7 +164,7 @@ /datum/supply_pack/rogue/weapons/Sellsword/bolts name = "Quiver of Bolts" cost = 20 - contains = list(/obj/item/quiver/bolts) + contains = list(/obj/item/ammo_holder/quiver/bolts) /datum/supply_pack/rogue/Sellsword/crossbow diff --git a/code/modules/cargo/packsrogue/weapons.dm b/code/modules/cargo/packsrogue/weapons.dm index e0b735731..7ed1ee460 100644 --- a/code/modules/cargo/packsrogue/weapons.dm +++ b/code/modules/cargo/packsrogue/weapons.dm @@ -98,9 +98,9 @@ name = "Quiver" cost = 15 contains = list( - /obj/item/quiver, - /obj/item/quiver, - /obj/item/quiver, + /obj/item/ammo_holder/quiver, + /obj/item/ammo_holder/quiver, + /obj/item/ammo_holder/quiver, ) /datum/supply_pack/rogue/weapons/arrow @@ -133,18 +133,18 @@ name = "Quiver of Arrows" cost = 50 contains = list( - /obj/item/quiver/arrows, - /obj/item/quiver/arrows, - /obj/item/quiver/arrows, + /obj/item/ammo_holder/quiver/arrows, + /obj/item/ammo_holder/quiver/arrows, + /obj/item/ammo_holder/quiver/arrows, ) /datum/supply_pack/rogue/weapons/quivers/bolts name = "Quiver of Bolts" cost = 50 contains = list( - /obj/item/quiver/bolts, - /obj/item/quiver/bolts, - /obj/item/quiver/bolts, + /obj/item/ammo_holder/quiver/bolts, + /obj/item/ammo_holder/quiver/bolts, + /obj/item/ammo_holder/quiver/bolts, ) /* diff --git a/code/modules/clothing/rogueclothes/quiver.dm b/code/modules/clothing/rogueclothes/quiver.dm index a135d2657..738b1a81c 100644 --- a/code/modules/clothing/rogueclothes/quiver.dm +++ b/code/modules/clothing/rogueclothes/quiver.dm @@ -1,26 +1,39 @@ -/obj/item/quiver - name = "quiver" +/obj/item/ammo_holder desc = "" - icon_state = "quiver0" - item_state = "quiver" icon = 'icons/roguetown/weapons/ammo.dmi' - lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi' w_class = WEIGHT_CLASS_BULKY - slot_flags = ITEM_SLOT_HIP|ITEM_SLOT_BACK - resistance_flags = FIRE_PROOF + resistance_flags = NONE max_integrity = 0 equip_sound = 'sound/blank.ogg' bloody_icon_state = "bodyblood" alternate_worn_layer = UNDER_CLOAK_LAYER strip_delay = 20 - var/max_storage = 20 - var/list/arrows = list() + var/max_storage + var/list/ammo = list() sewrepair = TRUE + var/list/ammo_type -/obj/item/quiver/attack_turf(turf/T, mob/living/user) - if(arrows.len >= max_storage) +/obj/item/ammo_holder/quiver + name = "quiver" + icon_state = "quiver0" + item_state = "quiver" + lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi' + slot_flags = ITEM_SLOT_HIP|ITEM_SLOT_BACK + max_storage = 20 + ammo_type = list (/obj/item/ammo_casing/caseless/rogue/arrow, /obj/item/ammo_casing/caseless/rogue/bolt) + +/obj/item/ammo_holder/bullet + name = "bullet pouch" + icon_state = "pouch0" + item_state = "pouch" + slot_flags = ITEM_SLOT_HIP|ITEM_SLOT_NECK + max_storage = 10 + ammo_type = list(/obj/item/ammo_casing) //common denominator type for runelock and arquebus bullets + +/obj/item/ammo_holder/quiver/attack_turf(turf/T, mob/living/user) + if(ammo.len >= max_storage) to_chat(user, span_warning("Your [src.name] is full!")) return to_chat(user, span_notice("You begin to gather the ammunition...")) @@ -29,240 +42,106 @@ if(!eatarrow(arrow)) break -/obj/item/quiver/proc/eatarrow(obj/A) +/obj/item/ammo_holder/quiver/proc/eatarrow(obj/A) if(A.type in subtypesof(/obj/item/ammo_casing/caseless/rogue)) - if(arrows.len < max_storage) + if(ammo.len < max_storage) A.forceMove(src) - arrows += A + ammo += A update_icon() return TRUE else return FALSE -/obj/item/quiver/attackby(obj/A, loc, params) - if(A.type in subtypesof(/obj/item/ammo_casing/caseless/rogue)) - if(arrows.len < max_storage) - A.forceMove(src) - arrows += A - update_icon() - else - to_chat(loc, span_warning("Full!")) - return +/obj/item/ammo_holder/attackby(obj/A, loc, params) + for(var/i in ammo_type) + if(istype(A, i)) + if(ammo.len < max_storage) + A.forceMove(src) + ammo += A + update_icon() + else + to_chat(loc, span_warning("Full!")) + return if(istype(A, /obj/item/gun/ballistic/revolver/grenadelauncher/bow)) var/obj/item/gun/ballistic/revolver/grenadelauncher/bow/B = A - if(arrows.len && !B.chambered) - for(var/AR in arrows) + if(ammo.len && !B.chambered) + for(var/AR in ammo) if(istype(AR, /obj/item/ammo_casing/caseless/rogue/arrow)) - arrows -= AR + ammo -= AR B.attackby(AR, loc, params) break return ..() -/obj/item/quiver/attack_right(mob/user) - if(arrows.len) - var/obj/O = arrows[arrows.len] - arrows -= O +/obj/item/ammo_holder/attack_right(mob/user) + if(ammo.len) + var/obj/O = ammo[ammo.len] + ammo -= O O.forceMove(user.loc) user.put_in_hands(O) update_icon() return TRUE -/obj/item/quiver/examine(mob/user) +/obj/item/ammo_holder/examine(mob/user) . = ..() - if(arrows.len) - . += span_notice("[arrows.len] inside.") + if(ammo.len) + . += span_notice("[ammo.len] inside.") -/obj/item/quiver/update_icon() - if(arrows.len) - icon_state = "quiver1" +/obj/item/ammo_holder/update_icon() + if(ammo.len) + icon_state = "[item_state]1" else - icon_state = "quiver0" + icon_state = "[item_state]0" -/obj/item/quiver/arrows/Initialize() +/obj/item/ammo_holder/quiver/arrows/Initialize() . = ..() for(var/i in 1 to max_storage) var/obj/item/ammo_casing/caseless/rogue/arrow/iron/A = new() - arrows += A + ammo += A update_icon() -/obj/item/quiver/bolts/Initialize() +/obj/item/ammo_holder/quiver/bolts/Initialize() . = ..() for(var/i in 1 to max_storage) var/obj/item/ammo_casing/caseless/rogue/bolt/A = new() - arrows += A + ammo += A update_icon() -/* -/obj/item/quiver/Parrows/Initialize() + +/obj/item/ammo_holder/bullet/runed/Initialize() . = ..() for(var/i in 1 to max_storage) - var/obj/item/ammo_casing/caseless/rogue/arrow/poison/A = new() - arrows += A + var/obj/item/ammo_casing/caseless/runelock/R = new() + ammo += R update_icon() -/obj/item/quiver/Pbolts/Initialize() +/obj/item/ammo_holder/bullet/lead/Initialize() . = ..() for(var/i in 1 to max_storage) - var/obj/item/ammo_casing/caseless/rogue/bolt/poison/A = new() - arrows += A + var/obj/item/ammo_casing/caseless/lead/B = new() + ammo += B update_icon() -*/ - - -/obj/item/javelinquiver - name = "javelin quiver" - desc = "" - icon_state = "quiver0" - item_state = "quiver" - icon = 'icons/roguetown/weapons/ammo.dmi' - lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi' - w_class = WEIGHT_CLASS_BULKY - slot_flags = ITEM_SLOT_HIP|ITEM_SLOT_BACK - resistance_flags = NONE - max_integrity = 0 - equip_sound = 'sound/blank.ogg' - bloody_icon_state = "bodyblood" - alternate_worn_layer = UNDER_CLOAK_LAYER - strip_delay = 20 - var/max_storage = 5 - var/list/arrows = list() - sewrepair = TRUE - -/obj/item/javelinquiver/attack_turf(turf/T, mob/living/user) - if(arrows.len >= max_storage) - to_chat(user, span_warning("Your [src.name] is full!")) - return - to_chat(user, span_notice("You begin to gather the javelins...")) - for(var/obj/item/rogueweapon/spear/javelin/javelin in T.contents) - if(do_after(user, 5)) - if(!eatarrow(javelin)) - break - -/obj/item/javelinquiver/proc/eatarrow(obj/A) - if(istype(A,/obj/item/rogueweapon/spear/javelin)) - if(arrows.len < max_storage) - A.forceMove(src) - arrows += A - update_icon() - return TRUE - else - return FALSE - -/obj/item/javelinquiver/attackby(obj/A, loc, params) - if(istype(A,/obj/item/rogueweapon/spear/javelin)) - if(arrows.len < max_storage) - A.forceMove(src) - arrows += A - update_icon() - else - to_chat(loc, span_warning("Full!")) - return - ..() - -/obj/item/javelinquiver/attack_right(mob/user) - if(arrows.len) - var/obj/O = arrows[arrows.len] - arrows -= O - O.forceMove(user.loc) - user.put_in_hands(O) - update_icon() - return TRUE - -/obj/item/javelinquiver/examine(mob/user) +/* +/obj/item/ammo_holder/bullet/grapeshot/Initialize() . = ..() - if(arrows.len) - . += span_notice("[arrows.len] inside.") - -/obj/item/javelinquiver/update_icon() - if(arrows.len) - icon_state = "quiver1" - else - icon_state = "quiver0" + for(var/i in 1 to max_storage) + var/obj/item/ammo_casing/caseless/grapeshot/B = new() + ammo += B + update_icon() +NOTE: Grapeshot doesn't exist??? +*/ -/obj/item/javelinquiver/Initialize() +/* +/obj/item/ammo_holder/Parrows/Initialize() ..() for(var/i in 1 to max_storage) - var/obj/item/rogueweapon/spear/javelin/A = new() + var/obj/item/ammo_casing/caseless/rogue/arrow/poison/A = new() arrows += A update_icon() -//GUN SHIT - -/obj/item/bulletpouch - name = "bullet pouch" - desc = "" - icon_state = "pouch0" - item_state = "pouch" - icon = 'icons/roguetown/weapons/ammo.dmi' - lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi' - w_class = WEIGHT_CLASS_BULKY - slot_flags = ITEM_SLOT_HIP|ITEM_SLOT_BACK - resistance_flags = FIRE_PROOF - max_integrity = 0 - equip_sound = 'sound/blank.ogg' - bloody_icon_state = "bodyblood" - alternate_worn_layer = UNDER_CLOAK_LAYER - strip_delay = 20 - var/max_storage = 10 - var/list/bullets = list() - sewrepair = TRUE - - - -/obj/item/bulletpouch/bullet/Initialize() - . = ..() +/obj/item/ammo_holder/Pbolts/Initialize() + ..() for(var/i in 1 to max_storage) - var/obj/item/ammo_casing/caseless/lead/B = new() - bullets += B + var/obj/item/ammo_casing/caseless/rogue/bolt/poison/A = new() + arrows += A update_icon() - -/obj/item/bulletpouch/attack_turf(turf/T, mob/living/user) - if(bullets.len >= max_storage) - to_chat(user, span_warning("Your [src.name] is full!")) - return - to_chat(user, span_notice("You begin to gather the ammunition...")) - for(var/obj/item/ammo_casing/caseless/lead in T.contents) - if(do_after(user, 5)) - if(!eatbullet(bullets)) - break - -/obj/item/bulletpouch/proc/eatbullet(obj/A) - if(bullets.len < max_storage) - A.forceMove(src) - bullets += A - update_icon() - return TRUE - else - return FALSE - -/obj/item/bulletpouch/attackby(obj/A, loc, params) - if(bullets.len < max_storage) - A.forceMove(src) - bullets += A - update_icon() - else - to_chat(loc, span_warning("Full!")) - return - ..() - -/obj/item/bulletpouch/attack_right(mob/user) - if(bullets.len) - var/obj/O = bullets[bullets.len] - bullets -= O - O.forceMove(user.loc) - user.put_in_hands(O) - update_icon() - return TRUE - -/obj/item/bulletpouch/examine(mob/user) - . = ..() - if(bullets.len) - . += span_notice("[bullets.len] inside.") - -/obj/item/bulletpouch/update_icon() - if(bullets.len) - icon_state = "pouch1" - else - icon_state = "pouch0" +*/ diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/antag/knave.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/antag/knave.dm index 77cdf16fc..0c908e8b9 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/antag/knave.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/antag/knave.dm @@ -53,7 +53,7 @@ switch(weapon_choice) if("Crossbow & Dagger") //Rogue backl= /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow //we really need to make this not a grenade launcher subtype - beltr = /obj/item/quiver/bolts + beltr = /obj/item/ammo_holder/quiver/bolts cloak = /obj/item/clothing/cloak/raincloak/mortus //cool cloak beltl = /obj/item/rogueweapon/huntingknife/idagger/steel backr = /obj/item/storage/backpack/rogue/satchel @@ -62,7 +62,7 @@ if("Bow & Sword") //Poacher backl= /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve beltl = /obj/item/rogueweapon/sword/short - beltr = /obj/item/quiver/arrows + beltr = /obj/item/ammo_holder/quiver/arrows head = /obj/item/clothing/head/roguetown/helmet/leather/volfhelm //cool hat backr = /obj/item/storage/backpack/rogue/satchel backpack_contents = list(/obj/item/needle/thorn = 1, /obj/item/natural/cloth = 1, /obj/item/restraints/legcuffs/beartrap = 2) //poacher gets mantraps diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/antag/sellsword.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/antag/sellsword.dm index f5fc1fb3a..88fd74a14 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/antag/sellsword.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/antag/sellsword.dm @@ -50,7 +50,7 @@ switch(weapon_choice) if("Spear & Crossbow") //Deserter watchman. Maybe should be shield and spear? spear and crossbow is kinda clumsy backl= /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow //we really need to make this not a grenade launcher subtype - beltr = /obj/item/quiver/bolts + beltr = /obj/item/ammo_holder/quiver/bolts r_hand = /obj/item/rogueweapon/spear/billhook head = /obj/item/clothing/head/roguetown/helmet/kettle if("Sword & Buckler") //Mercenary on the wrong side of the law diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm index caa12cf5f..340716bb6 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm @@ -30,7 +30,7 @@ neck = /obj/item/storage/belt/rogue/pouch/coins/poor beltl = /obj/item/rogueweapon/huntingknife backl = /obj/item/storage/backpack/rogue/satchel - backr = /obj/item/javelinquiver + //backr = /obj/item/javelinquiver Commented out due to being out of scope of the quiver fix PR armor = /obj/item/clothing/suit/roguetown/armor/chainmail/bikini wrists = /obj/item/clothing/wrists/roguetown/bracers/leather shoes = /obj/item/clothing/shoes/roguetown/boots diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm index 88fe01b91..976a77540 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm @@ -90,7 +90,7 @@ H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) beltr = /obj/item/rogueweapon/stoneaxe/woodcut r_hand = /obj/item/gun/ballistic/revolver/grenadelauncher/bow - l_hand = /obj/item/quiver/arrows + l_hand = /obj/item/ammo_holder/quiver/arrows belt = /obj/item/storage/belt/rogue/leather neck = /obj/item/storage/belt/rogue/pouch/coins/poor beltl = /obj/item/rogueweapon/huntingknife diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm index e389ff47a..3ed21ec6c 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm @@ -20,7 +20,7 @@ backr = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow backl = /obj/item/storage/backpack/rogue/satchel beltr = /obj/item/rogueweapon/stoneaxe/woodcut - beltl = /obj/item/quiver/bolts + beltl = /obj/item/ammo_holder/quiver/bolts armor = /obj/item/clothing/suit/roguetown/armor/leather/hide wrists = /obj/item/clothing/wrists/roguetown/bracers/leather backpack_contents = list(/obj/item/rogueweapon/huntingknife = 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm index 1c99bc92a..a38129e3e 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm @@ -31,7 +31,7 @@ backl = /obj/item/storage/backpack/rogue/satchel beltr = /obj/item/flashlight/flare/torch/lantern backpack_contents = list(/obj/item/bait = 1, /obj/item/rogueweapon/huntingknife = 1) - beltl = /obj/item/quiver/arrows + beltl = /obj/item/ammo_holder/quiver/arrows H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/maces, 2, TRUE) @@ -74,7 +74,7 @@ backl = /obj/item/storage/backpack/rogue/satchel beltr = /obj/item/flashlight/flare/torch/lantern backpack_contents = list(/obj/item/rogueweapon/huntingknife/idagger/steel/special = 1) - beltl = /obj/item/quiver/arrows + beltl = /obj/item/ammo_holder/quiver/arrows H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/maces, 3, TRUE) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm index 2fcfac013..4f94f2181 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm @@ -41,7 +41,7 @@ backl = /obj/item/storage/backpack/rogue/satchel beltr = /obj/item/rogueweapon/sword/sabre backpack_contents = list(/obj/item/bait = 1, /obj/item/rogueweapon/huntingknife/idagger/silver/elvish = 1) - beltl = /obj/item/quiver/arrows + beltl = /obj/item/ammo_holder/quiver/arrows H.change_stat("perception", 5) H.change_stat("endurance", 2) H.change_stat("speed", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm index 5dba9fc68..df1b95513 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm @@ -106,7 +106,7 @@ backl = /obj/item/storage/backpack/rogue/satchel beltl = /obj/item/rogueweapon/huntingknife/idagger/silver/elvish backr = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow - beltr = /obj/item/quiver/bolts + beltr = /obj/item/ammo_holder/quiver/bolts ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC) ADD_TRAIT(H, TRAIT_SEEPRICES_SHITTY, TRAIT_GENERIC) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/hunter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/hunter.dm index a764aad0e..a7e97316c 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/hunter.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/hunter.dm @@ -18,7 +18,7 @@ backr = /obj/item/storage/backpack/rogue/satchel r_hand = /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve belt = /obj/item/storage/belt/rogue/leather - beltr = /obj/item/quiver/arrows + beltr = /obj/item/ammo_holder/quiver/arrows beltl = /obj/item/flashlight/flare/torch/lantern backpack_contents = list(/obj/item/flint = 1, /obj/item/bait = 1, /obj/item/rogueweapon/huntingknife = 1) gloves = /obj/item/clothing/gloves/roguetown/leather diff --git a/code/modules/jobs/job_types/roguetown/garrison/gatemaster.dm b/code/modules/jobs/job_types/roguetown/garrison/gatemaster.dm index ff561715c..21f31501d 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/gatemaster.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/gatemaster.dm @@ -48,7 +48,7 @@ shoes = /obj/item/clothing/shoes/roguetown/boots belt = /obj/item/storage/belt/rogue/leather/black beltl = /obj/item/rogueweapon/mace/cudgel - beltr = /obj/item/quiver/arrows + beltr = /obj/item/ammo_holder/quiver/arrows backr = /obj/item/storage/backpack/rogue/satchel/black backl = /obj/item/gun/ballistic/revolver/grenadelauncher/bow backpack_contents = list(/obj/item/keyring/gatemaster = 1, /obj/item/rogueweapon/huntingknife/idagger/steel/special = 1, /obj/item/rope/chain = 1) diff --git a/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm b/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm index d55a9b57a..9f03e9876 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm @@ -150,7 +150,7 @@ //I feel bad they have full hands round-start but this is the price you have for being given a satchel. l_hand = /obj/item/rogueweapon/shield/tower r_hand = /obj/item/rogueweapon/sword/short - beltr = /obj/item/quiver/bolts + beltr = /obj/item/ammo_holder/quiver/bolts backl = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow backpack_contents = list(/obj/item/rogueweapon/huntingknife/idagger/steel/special = 1, /obj/item/rope/chain = 1) diff --git a/code/modules/jobs/job_types/roguetown/garrison/townguard.dm b/code/modules/jobs/job_types/roguetown/garrison/townguard.dm index 458d2ef8b..9664154c1 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/townguard.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/townguard.dm @@ -133,7 +133,7 @@ Archer is basically a 'bounty-catcher' in function, less specialized at close-qu head = /obj/item/clothing/head/roguetown/roguehood/red //To-do: Make a guard hood come in kingdom's colors. armor = /obj/item/clothing/suit/roguetown/armor/leather //So they get default-dodge expert usage. - beltr = /obj/item/quiver/bolts + beltr = /obj/item/ammo_holder/quiver/bolts backl = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow backr = /obj/item/storage/backpack/rogue/satchel/black beltl = /obj/item/storage/keyring/guardcastle diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/classes/anthrax.dm b/code/modules/jobs/job_types/roguetown/mercenaries/classes/anthrax.dm index e45c43c2b..62a557e39 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/classes/anthrax.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/classes/anthrax.dm @@ -57,7 +57,7 @@ mask = /obj/item/clothing/mask/rogue/shepherd/shadowmask neck = /obj/item/clothing/neck/roguetown/chaincoif/iron backr = /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve //Coupled with the racial PER malus, abysmal damage, but good for poison arrows. - beltr = /obj/item/quiver/arrows + beltr = /obj/item/ammo_holder/quiver/arrows beltl = /obj/item/rogueweapon/sword/sabre/glaive H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/classes/boltslinger.dm b/code/modules/jobs/job_types/roguetown/mercenaries/classes/boltslinger.dm index 0af8f0797..63717da34 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/classes/boltslinger.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/classes/boltslinger.dm @@ -15,7 +15,7 @@ belt = /obj/item/storage/belt/rogue/leather armor = /obj/item/clothing/suit/roguetown/armor/plate/half beltr = /obj/item/rogueweapon/sword/iron - beltl = /obj/item/quiver/bolts + beltl = /obj/item/ammo_holder/quiver/bolts backr = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow backl = /obj/item/storage/backpack/rogue/satchel shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/classes/condottiero.dm b/code/modules/jobs/job_types/roguetown/mercenaries/classes/condottiero.dm index 732b2226b..c131c6b5e 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/classes/condottiero.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/classes/condottiero.dm @@ -16,7 +16,7 @@ armor = /obj/item/clothing/suit/roguetown/armor/leather/studded backl = /obj/item/storage/backpack/rogue/satchel beltl = /obj/item/rogueweapon/sword/short - beltr = /obj/item/quiver/bolts + beltr = /obj/item/ammo_holder/quiver/bolts backr = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow shirt = /obj/item/clothing/suit/roguetown/armor/gambeson pants = /obj/item/clothing/under/roguetown/trou/leather diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/classes/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/mercenaries/classes/grenzelhoft.dm index d0e36c97f..ee8fe094a 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/classes/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/classes/grenzelhoft.dm @@ -81,7 +81,7 @@ H.change_stat("perception", 2) r_hand = /obj/item/gun/ballistic/handgonne beltl = /obj/item/powderflask - backl = /obj/item/bulletpouch/bullet + backl = /obj/item/ammo_holder/bullet/lead //General gear regardless of class. wrists = /obj/item/clothing/wrists/roguetown/bracers diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/classes/steppesman.dm b/code/modules/jobs/job_types/roguetown/mercenaries/classes/steppesman.dm index 6dedd953f..06bf014c9 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/classes/steppesman.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/classes/steppesman.dm @@ -18,7 +18,7 @@ cloak = /obj/item/clothing/cloak/raincloak/furcloak wrists = /obj/item/clothing/wrists/roguetown/bracers/leather beltr = /obj/item/rogueweapon/whip - beltl= /obj/item/quiver/arrows + beltl= /obj/item/ammo_holder/quiver/arrows shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt pants = /obj/item/clothing/under/roguetown/trou/leather neck = /obj/item/storage/belt/rogue/pouch/coins/poor diff --git a/code/modules/jobs/job_types/roguetown/yeomen/merchant.dm b/code/modules/jobs/job_types/roguetown/yeomen/merchant.dm index f65acebe4..b1f38ddd3 100644 --- a/code/modules/jobs/job_types/roguetown/yeomen/merchant.dm +++ b/code/modules/jobs/job_types/roguetown/yeomen/merchant.dm @@ -47,7 +47,7 @@ pants = /obj/item/clothing/under/roguetown/tights/sailor belt = /obj/item/storage/belt/rogue/leather/rope beltl = /obj/item/storage/keyring/merchant - beltr = /obj/item/bulletpouch + beltr = /obj/item/ammo_holder/bullet/lead id = /obj/item/clothing/ring/gold r_hand = /obj/item/gun/ballistic/arquebus_pistol l_hand = /obj/item/powderflask diff --git a/code/modules/jobs/job_types/roguetown/youngfolk/squire.dm b/code/modules/jobs/job_types/roguetown/youngfolk/squire.dm index 4f0827bea..a1ee11101 100644 --- a/code/modules/jobs/job_types/roguetown/youngfolk/squire.dm +++ b/code/modules/jobs/job_types/roguetown/youngfolk/squire.dm @@ -129,7 +129,7 @@ category_tags = list(CTAG_SQUIRE) /datum/outfit/job/roguetown/squire/skirmisher/pre_equip(mob/living/carbon/human/H) - beltr = /obj/item/quiver/arrows + beltr = /obj/item/ammo_holder/quiver/arrows armor = /obj/item/clothing/suit/roguetown/armor/leather/studded backl = /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve gloves = /obj/item/clothing/gloves/roguetown/leather diff --git a/code/modules/roguetown/roguecrafting/leather.dm b/code/modules/roguetown/roguecrafting/leather.dm index bd4604d8c..636892eb6 100644 --- a/code/modules/roguetown/roguecrafting/leather.dm +++ b/code/modules/roguetown/roguecrafting/leather.dm @@ -46,14 +46,14 @@ /datum/crafting_recipe/roguetown/leather/quiver name = "quiver" - result = /obj/item/quiver + result = /obj/item/ammo_holder/quiver reqs = list(/obj/item/natural/hide = 2, /obj/item/natural/fibers = 2) sellprice = 30 /datum/crafting_recipe/roguetown/leather/bulletpouch name = "bullet pouch" - result = /obj/item/bulletpouch + result = /obj/item/ammo_holder/bullet reqs = list(/obj/item/natural/hide = 2, /obj/item/natural/fibers = 2) sellprice = 30 diff --git a/code/modules/roguetown/roguemachine/drugmachine.dm b/code/modules/roguetown/roguemachine/drugmachine.dm index 72867ae37..adce46a82 100644 --- a/code/modules/roguetown/roguemachine/drugmachine.dm +++ b/code/modules/roguetown/roguemachine/drugmachine.dm @@ -240,7 +240,7 @@ held_items[/obj/item/clothing/gloves/roguetown/fingerless] = list("PRICE" = rand(16,31),"NAME" = "gloves with 6 holes") held_items[/obj/item/clothing/head/roguetown/roguehood/black] = list("PRICE" = rand(43,45),"NAME" = "black hood") held_items[/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow] = list("PRICE" = rand(58,88),"NAME" = "crossed bow") - held_items[/obj/item/quiver/bolts] = list("PRICE" = rand(33,57),"NAME" = "quiver w/ bolts")*/ + held_items[/obj/item/ammo_holder/quiver/bolts] = list("PRICE" = rand(33,57),"NAME" = "quiver w/ bolts")*/ #undef DRUGRADE_MONEYA #undef DRUGRADE_MONEYB diff --git a/code/modules/roguetown/roguestock/import.dm b/code/modules/roguetown/roguestock/import.dm index b59dac04c..b67964ff1 100644 --- a/code/modules/roguetown/roguestock/import.dm +++ b/code/modules/roguetown/roguestock/import.dm @@ -127,9 +127,9 @@ new /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow(src) new /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow(src) new /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow(src) - new /obj/item/quiver/bolts(src) - new /obj/item/quiver/bolts(src) - new /obj/item/quiver/bolts(src) + new /obj/item/ammo_holder/quiver/bolts(src) + new /obj/item/ammo_holder/quiver/bolts(src) + new /obj/item/ammo_holder/quiver/bolts(src) /datum/roguestock/import/saigabuck name = "Saigabuck" From 81cae7d8dc528ecad00f5a5834110a51433e2727 Mon Sep 17 00:00:00 2001 From: Lhars Date: Mon, 16 Dec 2024 10:24:46 -0400 Subject: [PATCH 2/7] Update traits.dm --- code/datums/special_traits/traits/traits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/special_traits/traits/traits.dm b/code/datums/special_traits/traits/traits.dm index 7dea03bd3..ac9433a90 100644 --- a/code/datums/special_traits/traits/traits.dm +++ b/code/datums/special_traits/traits/traits.dm @@ -108,7 +108,7 @@ character.mind.adjust_skillrank_up_to(/datum/skill/combat/crossbows, 5, TRUE) character.mind.adjust_skillrank_up_to(/datum/skill/combat/bows, 4, TRUE) character.mind.special_items["Crossbow"] = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow - character.mind.special_items["Bolts"] = /obj/item/quiver/bolts + character.mind.special_items["Bolts"] = /obj/item/ammo_holder/quiver/bolts /datum/special_trait/mule name = "Mule" From 6b6e30c8a80c0efd1f5e85571b2c71ad7419636b Mon Sep 17 00:00:00 2001 From: Lhars Date: Thu, 19 Dec 2024 20:16:41 -0400 Subject: [PATCH 3/7] Merges be merging --- code/modules/jobs/job_types/roguetown/garrison/manorguard.dm | 4 ++-- code/modules/jobs/job_types/roguetown/garrison/townguard.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm b/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm index c9f374f51..9da7d2e8b 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm @@ -166,9 +166,9 @@ backr = /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve if("Arquebus") H.mind.adjust_skillrank(/datum/skill/combat/firearms, 1, TRUE) - r_hand = /obj/item/ammo_holder/bullets/lead + r_hand = /obj/item/gun/ballistic/arquebus beltr = /obj/item/powderflask - backl = /obj/item/bulletpouch/bullet + backl = /obj/item/ammo_holder/bullet/lead backpack_contents = list(/obj/item/rogueweapon/huntingknife/idagger/steel/special = 1, /obj/item/rope/chain = 1) H.verbs |= /mob/proc/haltyell diff --git a/code/modules/jobs/job_types/roguetown/garrison/townguard.dm b/code/modules/jobs/job_types/roguetown/garrison/townguard.dm index ee09df514..06040544f 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/townguard.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/townguard.dm @@ -158,7 +158,7 @@ Archer is basically a 'bounty-catcher' in function, less specialized at close-qu H.mind.adjust_skillrank(/datum/skill/combat/firearms, 1, TRUE) r_hand = /obj/item/gun/ballistic/arquebus beltr = /obj/item/powderflask - backl = /item/ammo_holder/bullet/lead + backl = /obj/item/ammo_holder/bullet/lead // Added to baliff under assumption townguard.dm will not be enabled. From c1158e87835baee216fefc200ceca38e597e2b19 Mon Sep 17 00:00:00 2001 From: Lhars Date: Thu, 19 Dec 2024 20:18:43 -0400 Subject: [PATCH 4/7] Update musketeer.dm --- .../job_types/roguetown/adventurer/types/combat/musketeer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/musketeer.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/musketeer.dm index 17c79f2fe..85c1fb769 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/musketeer.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/musketeer.dm @@ -21,7 +21,7 @@ backl = /obj/item/storage/backpack/rogue/satchel/musketeer backr = /obj/item/gun/ballistic/arquebus beltr = /obj/item/rogueweapon/sword/rapier - beltl = /obj/item/bulletpouch/bullet + beltl = /obj/item/ammo_holder/bullet/lead shoes = /obj/item/clothing/shoes/roguetown/boots H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) From fcef7f33a571804df72165d74431afb2dc6f4d42 Mon Sep 17 00:00:00 2001 From: Lhars Date: Fri, 20 Dec 2024 13:10:44 -0400 Subject: [PATCH 5/7] 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. --- .../jobs/job_types/roguetown/garrison/manorguard.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm b/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm index 9da7d2e8b..f55a3f1d4 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm @@ -123,9 +123,9 @@ H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/maces, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) //Only effects draw and reload time. - H.mind.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) //Only effects draw times. - H.mind.adjust_skillrank(/datum/skill/combat/firearms, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) //Only effects draw and reload time. + H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) //Only effects draw times. + H.mind.adjust_skillrank(/datum/skill/combat/firearms, 3, TRUE) //Normal shared skill section. H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) @@ -151,8 +151,6 @@ //I feel bad they have full hands round-start but this is the price you have for being given a satchel. l_hand = /obj/item/rogueweapon/shield/tower r_hand = /obj/item/rogueweapon/sword/short - beltr = /obj/item/ammo_holder/quiver/bolts - backl = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow var/weapons = list("Crossbow","Bow", "Arquebus") var/weapon_choice = input("Choose your weapon.", "TAKE UP ARMS") as anything in weapons switch(weapon_choice) @@ -168,7 +166,7 @@ H.mind.adjust_skillrank(/datum/skill/combat/firearms, 1, TRUE) r_hand = /obj/item/gun/ballistic/arquebus beltr = /obj/item/powderflask - backl = /obj/item/ammo_holder/bullet/lead + neck = /obj/item/ammo_holder/bullet/lead backpack_contents = list(/obj/item/rogueweapon/huntingknife/idagger/steel/special = 1, /obj/item/rope/chain = 1) H.verbs |= /mob/proc/haltyell From 4fb9f3edc31d84553f9fa889c5fa04bde01c82e3 Mon Sep 17 00:00:00 2001 From: Lhars Date: Fri, 20 Dec 2024 13:14:44 -0400 Subject: [PATCH 6/7] Update townguard.dm And now the fix for the town guard --- code/modules/jobs/job_types/roguetown/garrison/townguard.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/jobs/job_types/roguetown/garrison/townguard.dm b/code/modules/jobs/job_types/roguetown/garrison/townguard.dm index 06040544f..1be6296d8 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/townguard.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/townguard.dm @@ -108,7 +108,7 @@ Archer is basically a 'bounty-catcher' in function, less specialized at close-qu ..() H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/firearms, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) //Why master? Because all it does is effect draw time, which is strength x skill / 1.2. (Bow is just skill / 1.0). You get poor bonus strength, so you get skill to offset. + H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) //Why master? Because all it does is effect draw time, which is strength x skill / 1.2. (Bow is just skill / 1.0). You get poor bonus strength, so you get skill to offset. / Why not make the strongest ranged weapon even better? :^) Nerfed bonus to skill to 1, heck you H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/knives, 4, TRUE) @@ -147,7 +147,7 @@ Archer is basically a 'bounty-catcher' in function, less specialized at close-qu H.set_blindness(0) switch(weapon_choice) if("Crossbow") - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 1, TRUE) beltr = /obj/item/ammo_holder/quiver/bolts backl = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow if("Bow") @@ -158,7 +158,7 @@ Archer is basically a 'bounty-catcher' in function, less specialized at close-qu H.mind.adjust_skillrank(/datum/skill/combat/firearms, 1, TRUE) r_hand = /obj/item/gun/ballistic/arquebus beltr = /obj/item/powderflask - backl = /obj/item/ammo_holder/bullet/lead + neck = /obj/item/ammo_holder/bullet/lead // Added to baliff under assumption townguard.dm will not be enabled. From 83014197de1126e8e4928bcf5e1fb250bf4feeda Mon Sep 17 00:00:00 2001 From: Lhars Date: Mon, 23 Dec 2024 14:47:30 -0400 Subject: [PATCH 7/7] Fine keep your gorgets --- code/modules/jobs/job_types/roguetown/garrison/manorguard.dm | 2 +- code/modules/jobs/job_types/roguetown/garrison/townguard.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm b/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm index f55a3f1d4..b771ca6a1 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm @@ -166,7 +166,7 @@ H.mind.adjust_skillrank(/datum/skill/combat/firearms, 1, TRUE) r_hand = /obj/item/gun/ballistic/arquebus beltr = /obj/item/powderflask - neck = /obj/item/ammo_holder/bullet/lead + l_hand = /obj/item/ammo_holder/bullet/lead backpack_contents = list(/obj/item/rogueweapon/huntingknife/idagger/steel/special = 1, /obj/item/rope/chain = 1) H.verbs |= /mob/proc/haltyell diff --git a/code/modules/jobs/job_types/roguetown/garrison/townguard.dm b/code/modules/jobs/job_types/roguetown/garrison/townguard.dm index 1be6296d8..a2d581e7a 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/townguard.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/townguard.dm @@ -158,7 +158,7 @@ Archer is basically a 'bounty-catcher' in function, less specialized at close-qu H.mind.adjust_skillrank(/datum/skill/combat/firearms, 1, TRUE) r_hand = /obj/item/gun/ballistic/arquebus beltr = /obj/item/powderflask - neck = /obj/item/ammo_holder/bullet/lead + l_hand = /obj/item/ammo_holder/bullet/lead // Added to baliff under assumption townguard.dm will not be enabled.