diff --git a/_maps/map_files/domotan/old_doma.dmm b/_maps/map_files/domotan/old_doma.dmm
index e6a91595e..6efaded66 100644
--- a/_maps/map_files/domotan/old_doma.dmm
+++ b/_maps/map_files/domotan/old_doma.dmm
@@ -5749,27 +5749,29 @@
/turf/open/floor/rogue/blocks/stonered,
/area/rogue/outdoors/town)
"gtQ" = (
-/obj/item/clothing/neck/roguetown/psicross/mjallidhorn,
-/obj/item/clothing/neck/roguetown/psicross/mjallidhorn,
-/obj/item/clothing/suit/roguetown/shirt/robe/mjallidhorn,
-/obj/item/clothing/suit/roguetown/shirt/robe/mjallidhorn,
-/obj/item/clothing/head/roguetown/mjallidhornhood,
-/obj/item/clothing/head/roguetown/mjallidhornhood,
-/obj/item/clothing/cloak/templar/mjallidhorn,
-/obj/item/clothing/cloak/templar/mjallidhorn,
-/obj/item/clothing/cloak/templar/mjallidhorn/frost,
-/obj/item/clothing/cloak/templar/mjallidhorn/frost,
+/obj/item/clothing/neck/roguetown/psicross/golerkanh,
+/obj/item/clothing/neck/roguetown/psicross/golerkanh,
+/obj/item/clothing/neck/roguetown/psicross/gani,
+/obj/item/clothing/neck/roguetown/psicross/gani,
+/obj/item/clothing/cloak/templar/golerkanh,
+/obj/item/clothing/cloak/templar/gani,
+/obj/item/clothing/cloak/templar/gani,
+/obj/item/clothing/head/roguetown/ganimask,
+/obj/item/clothing/cloak/templar/golerkanh/earth,
+/obj/item/clothing/cloak/templar/golerkanh/earth,
/obj/structure/closet/crate/chest/neu_iron{
- name = "Frost chest"
+ name = "Earth chest"
},
-/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/iron,
-/obj/item/clothing/under/roguetown/chainlegs/iron,
-/obj/item/clothing/under/roguetown/chainlegs/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/under/roguetown/chainlegs/silver,
+/obj/item/clothing/under/roguetown/chainlegs/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"gue" = (
@@ -10117,28 +10119,6 @@
},
/turf/open/floor/rogue/wood,
/area/rogue/indoors/town/magician)
-"lcl" = (
-/obj/item/clothing/neck/roguetown/psicross/visires,
-/obj/item/clothing/neck/roguetown/psicross/visires,
-/obj/item/clothing/cloak/templar/visires,
-/obj/item/clothing/cloak/templar/visires,
-/obj/item/clothing/cloak/templar/visires/fire,
-/obj/item/clothing/cloak/templar/visires/fire,
-/obj/structure/closet/crate/chest/neu_iron{
- name = "Fire chest"
- },
-/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visires/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visires/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/iron,
-/obj/item/clothing/under/roguetown/chainlegs/iron,
-/obj/item/clothing/under/roguetown/chainlegs/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
-/turf/open/floor/rogue/tile/checkeralt,
-/area/rogue/indoors/town/church)
"lcv" = (
/obj/structure/stairs{
dir = 4
@@ -11219,9 +11199,25 @@
/turf/open/floor/rogue/ruinedwood/turned,
/area/rogue/indoors/town/garrison)
"med" = (
-/obj/structure/fluff/walldeco/katholikos_banner{
- pixel_y = 25
- },
+/obj/item/clothing/neck/roguetown/psicross/wood/katholikos,
+/obj/item/clothing/neck/roguetown/psicross/silver,
+/obj/item/clothing/neck/roguetown/psicross/silver,
+/obj/item/clothing/cloak/all_aspect/alt,
+/obj/item/clothing/cloak/all_aspect/alt,
+/obj/item/clothing/cloak/all_aspect,
+/obj/item/clothing/cloak/all_aspect,
+/obj/item/clothing/cloak/templar/all_aspect,
+/obj/item/clothing/cloak/templar/all_aspect,
+/obj/item/clothing/under/roguetown/heavy_leather_pants,
+/obj/item/clothing/under/roguetown/heavy_leather_pants,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/under/roguetown/chainlegs/silver,
+/obj/item/clothing/under/roguetown/chainlegs/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/indoors/town/church)
"mff" = (
@@ -11470,34 +11466,23 @@
/turf/open/floor/rogue/church,
/area/rogue/outdoors/town/roofs)
"mrx" = (
-/obj/item/rogueweapon/huntingknife/idagger/steel,
-/obj/item/rogueweapon/huntingknife/idagger/silver,
-/obj/item/rogueweapon/huntingknife/cleaver/combat,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/clothing/neck/roguetown/psicross/wood/katholikos,
-/obj/item/clothing/neck/roguetown/psicross,
-/obj/item/clothing/neck/roguetown/psicross/g,
+/obj/item/clothing/neck/roguetown/psicross/akan,
+/obj/item/clothing/neck/roguetown/psicross/akan,
+/obj/item/clothing/cloak/templar/akan,
+/obj/item/clothing/cloak/templar/akan,
+/obj/item/clothing/cloak/templar/iliope,
+/obj/item/clothing/cloak/templar/iliope,
/obj/structure/closet/crate/chest/neu_iron{
- name = "Katholikos chest"
+ name = "Air chest"
},
-/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/iron,
-/obj/item/clothing/neck/roguetown/psicross/silver,
-/obj/item/clothing/neck/roguetown/psicross/silver,
-/obj/item/clothing/cloak/all_aspect/alt,
-/obj/item/clothing/cloak/all_aspect/alt,
-/obj/item/clothing/cloak/all_aspect,
-/obj/item/clothing/cloak/all_aspect,
-/obj/item/clothing/cloak/templar/all_aspect,
-/obj/item/clothing/cloak/templar/all_aspect,
-/obj/item/clothing/under/roguetown/heavy_leather_pants,
-/obj/item/clothing/under/roguetown/heavy_leather_pants,
-/obj/item/clothing/under/roguetown/chainlegs/iron,
-/obj/item/clothing/under/roguetown/chainlegs/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/under/roguetown/chainlegs/silver,
+/obj/item/clothing/under/roguetown/chainlegs/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/akan/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/akan/silver,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"mrR" = (
@@ -15196,6 +15181,28 @@
/obj/structure/roguewindow/openclose,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/garrison)
+"pYt" = (
+/obj/item/clothing/neck/roguetown/psicross/visires,
+/obj/item/clothing/neck/roguetown/psicross/visires,
+/obj/item/clothing/cloak/templar/visires,
+/obj/item/clothing/cloak/templar/visires,
+/obj/item/clothing/cloak/templar/visires/fire,
+/obj/item/clothing/cloak/templar/visires/fire,
+/obj/structure/closet/crate/chest/neu_iron{
+ name = "Fire chest"
+ },
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/under/roguetown/chainlegs/silver,
+/obj/item/clothing/under/roguetown/chainlegs/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visires/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visires/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/silver,
+/turf/open/floor/rogue/tile/checkeralt,
+/area/rogue/indoors/town/church)
"pYC" = (
/obj/structure/fluff/railing/border,
/turf/open/floor/rogue/cobble,
@@ -15245,29 +15252,13 @@
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/shelter/town/dwarf)
"qaN" = (
-/obj/item/clothing/neck/roguetown/psicross/golerkanh,
-/obj/item/clothing/neck/roguetown/psicross/golerkanh,
-/obj/item/clothing/neck/roguetown/psicross/gani,
-/obj/item/clothing/neck/roguetown/psicross/gani,
-/obj/item/clothing/cloak/templar/golerkanh,
-/obj/item/clothing/cloak/templar/gani,
-/obj/item/clothing/cloak/templar/gani,
-/obj/item/clothing/head/roguetown/ganimask,
-/obj/item/clothing/cloak/templar/golerkanh/earth,
-/obj/item/clothing/cloak/templar/golerkanh/earth,
-/obj/structure/closet/crate/chest/neu_iron{
- name = "Earth chest"
- },
-/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/iron,
-/obj/item/clothing/under/roguetown/chainlegs/iron,
-/obj/item/clothing/under/roguetown/chainlegs/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
+/obj/structure/rack/rogue,
+/obj/item/quiver/silver_bolts,
+/obj/item/quiver/silver_bolts,
+/obj/item/quiver/silver_bolts,
+/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
+/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
+/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"qbk" = (
@@ -15762,6 +15753,9 @@
pixel_y = 9
},
/obj/item/clothing/neck/roguetown/psicross/silver,
+/obj/structure/fluff/walldeco/katholikos_banner{
+ pixel_y = 25
+ },
/turf/open/floor/rogue/blocks/green,
/area/rogue/indoors/town/church)
"qGK" = (
@@ -21096,7 +21090,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/rack/rogue,
/obj/item/gwstrap,
-/obj/item/rogueweapon/greatsword/zwei,
+/obj/item/rogueweapon/greatsword/silver,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"wHH" = (
@@ -22494,23 +22488,29 @@
/turf/open/floor/rogue/cobblerock,
/area/rogue/outdoors/exposed/town/keep)
"yeM" = (
-/obj/item/clothing/neck/roguetown/psicross/akan,
-/obj/item/clothing/neck/roguetown/psicross/akan,
-/obj/item/clothing/cloak/templar/akan,
-/obj/item/clothing/cloak/templar/akan,
-/obj/item/clothing/cloak/templar/iliope,
-/obj/item/clothing/cloak/templar/iliope,
+/obj/item/clothing/neck/roguetown/psicross/mjallidhorn,
+/obj/item/clothing/neck/roguetown/psicross/mjallidhorn,
+/obj/item/clothing/suit/roguetown/shirt/robe/mjallidhorn,
+/obj/item/clothing/suit/roguetown/shirt/robe/mjallidhorn,
+/obj/item/clothing/head/roguetown/mjallidhornhood,
+/obj/item/clothing/head/roguetown/mjallidhornhood,
+/obj/item/clothing/cloak/templar/mjallidhorn,
+/obj/item/clothing/cloak/templar/mjallidhorn,
+/obj/item/clothing/cloak/templar/mjallidhorn/frost,
+/obj/item/clothing/cloak/templar/mjallidhorn/frost,
/obj/structure/closet/crate/chest/neu_iron{
- name = "Air chest"
+ name = "Frost chest"
},
-/obj/item/clothing/head/roguetown/helmet/heavy/akan/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/akan/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/iron,
-/obj/item/clothing/under/roguetown/chainlegs/iron,
-/obj/item/clothing/under/roguetown/chainlegs/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/half/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/under/roguetown/chainlegs/silver,
+/obj/item/clothing/under/roguetown/chainlegs/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/half/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver/alt,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver/alt,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"yeT" = (
@@ -28915,7 +28915,7 @@ hye
cpA
oZR
hye
-lcl
+wHl
jWf
jfL
hye
@@ -29181,7 +29181,7 @@ hye
hye
gtQ
jfL
-wHl
+pYt
hye
wZh
stD
diff --git a/_maps/map_files/templates/hellwatch/z3/q1_v1.dmm b/_maps/map_files/templates/hellwatch/z3/q1_v1.dmm
index 074e2b116..e408eafca 100644
--- a/_maps/map_files/templates/hellwatch/z3/q1_v1.dmm
+++ b/_maps/map_files/templates/hellwatch/z3/q1_v1.dmm
@@ -59,10 +59,10 @@
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
-/obj/item/quiver/bolts,
-/obj/item/quiver/bolts,
-/obj/item/quiver/bolts,
-/obj/item/quiver/bolts,
+/obj/item/quiver/silver_bolts,
+/obj/item/quiver/silver_bolts,
+/obj/item/quiver/silver_bolts,
+/obj/item/quiver/silver_bolts,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"nk" = (
@@ -95,18 +95,20 @@
/area/rogue/outdoors/woods/churchfort/basement)
"rg" = (
/obj/structure/closet/crate/roguecloset/dark,
-/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visires/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visires/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/akan/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/akan/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron,
+/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/akan/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/akan/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visires/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visires/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver/alt,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver/alt,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"sz" = (
@@ -260,12 +262,16 @@
/area/rogue/outdoors/woods/churchfort/basement)
"QB" = (
/obj/structure/rack/rogue,
-/obj/item/rogueweapon/flail,
-/obj/item/rogueweapon/flail,
-/obj/item/rogueweapon/mace/spiked,
-/obj/item/rogueweapon/mace/spiked,
-/obj/item/rogueweapon/sword/long/exe,
-/obj/item/rogueweapon/sword/long/exe,
+/obj/item/rogueweapon/katar/silver,
+/obj/item/rogueweapon/katar/silver,
+/obj/item/rogueweapon/flail/silver,
+/obj/item/rogueweapon/flail/silver,
+/obj/item/rogueweapon/stoneaxe/silver,
+/obj/item/rogueweapon/stoneaxe/silver,
+/obj/item/rogueweapon/mace/silver,
+/obj/item/rogueweapon/mace/silver,
+/obj/item/rogueweapon/sword/long/silver,
+/obj/item/rogueweapon/sword/long/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"Rc" = (
diff --git a/_maps/map_files/templates/hellwatch/z3/q1_v2.dmm b/_maps/map_files/templates/hellwatch/z3/q1_v2.dmm
index c633df1b4..d9e8ab5e1 100644
--- a/_maps/map_files/templates/hellwatch/z3/q1_v2.dmm
+++ b/_maps/map_files/templates/hellwatch/z3/q1_v2.dmm
@@ -151,18 +151,20 @@
/area/rogue/outdoors/woods/churchfort/basement)
"xE" = (
/obj/structure/closet/crate/roguecloset/dark,
-/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visires/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visires/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/akan/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/akan/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron,
+/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/akan/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/akan/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visires/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visires/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver/alt,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver/alt,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"xQ" = (
@@ -319,10 +321,10 @@
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
-/obj/item/quiver/bolts,
-/obj/item/quiver/bolts,
-/obj/item/quiver/bolts,
-/obj/item/quiver/bolts,
+/obj/item/quiver/silver_bolts,
+/obj/item/quiver/silver_bolts,
+/obj/item/quiver/silver_bolts,
+/obj/item/quiver/silver_bolts,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"OL" = (
@@ -333,12 +335,16 @@
/area/rogue/outdoors/woods/churchfort/basement)
"SD" = (
/obj/structure/rack/rogue,
-/obj/item/rogueweapon/flail,
-/obj/item/rogueweapon/flail,
-/obj/item/rogueweapon/mace/spiked,
-/obj/item/rogueweapon/mace/spiked,
-/obj/item/rogueweapon/sword/long/exe,
-/obj/item/rogueweapon/sword/long/exe,
+/obj/item/rogueweapon/katar/silver,
+/obj/item/rogueweapon/katar/silver,
+/obj/item/rogueweapon/flail/silver,
+/obj/item/rogueweapon/flail/silver,
+/obj/item/rogueweapon/stoneaxe/silver,
+/obj/item/rogueweapon/stoneaxe/silver,
+/obj/item/rogueweapon/mace/silver,
+/obj/item/rogueweapon/mace/silver,
+/obj/item/rogueweapon/sword/long/silver,
+/obj/item/rogueweapon/sword/long/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"US" = (
diff --git a/_maps/map_files/templates/hellwatch/z3/q1_v3.dmm b/_maps/map_files/templates/hellwatch/z3/q1_v3.dmm
index c411403e6..fa33f8806 100644
--- a/_maps/map_files/templates/hellwatch/z3/q1_v3.dmm
+++ b/_maps/map_files/templates/hellwatch/z3/q1_v3.dmm
@@ -7,12 +7,16 @@
/area/rogue/outdoors/woods/churchfort/basement)
"cC" = (
/obj/structure/rack/rogue,
-/obj/item/rogueweapon/flail,
-/obj/item/rogueweapon/flail,
-/obj/item/rogueweapon/mace/spiked,
-/obj/item/rogueweapon/mace/spiked,
-/obj/item/rogueweapon/sword/long/exe,
-/obj/item/rogueweapon/sword/long/exe,
+/obj/item/rogueweapon/katar/silver,
+/obj/item/rogueweapon/katar/silver,
+/obj/item/rogueweapon/flail/silver,
+/obj/item/rogueweapon/flail/silver,
+/obj/item/rogueweapon/stoneaxe/silver,
+/obj/item/rogueweapon/stoneaxe/silver,
+/obj/item/rogueweapon/mace/silver,
+/obj/item/rogueweapon/mace/silver,
+/obj/item/rogueweapon/sword/long/silver,
+/obj/item/rogueweapon/sword/long/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"dO" = (
@@ -65,10 +69,10 @@
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
/obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
-/obj/item/quiver/bolts,
-/obj/item/quiver/bolts,
-/obj/item/quiver/bolts,
-/obj/item/quiver/bolts,
+/obj/item/quiver/silver_bolts,
+/obj/item/quiver/silver_bolts,
+/obj/item/quiver/silver_bolts,
+/obj/item/quiver/silver_bolts,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"jt" = (
@@ -180,18 +184,20 @@
/area/rogue/outdoors/woods/churchfort/basement)
"Eo" = (
/obj/structure/closet/crate/roguecloset/dark,
-/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visires/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/visires/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/akan/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/akan/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron,
-/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron,
+/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/akan/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/akan/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visires/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visires/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver/alt,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver/alt,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver,
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"EP" = (
diff --git a/_maps/map_files/templates/hellwatch/z3/q3_v1.dmm b/_maps/map_files/templates/hellwatch/z3/q3_v1.dmm
index fe37f759d..8862a3c68 100644
--- a/_maps/map_files/templates/hellwatch/z3/q3_v1.dmm
+++ b/_maps/map_files/templates/hellwatch/z3/q3_v1.dmm
@@ -1,18 +1,18 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aD" = (
/obj/structure/closet/crate/roguecloset/dark,
-/obj/item/clothing/suit/roguetown/armor/plate/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/iron,
-/obj/item/clothing/neck/roguetown/chaincoif/iron,
-/obj/item/clothing/neck/roguetown/chaincoif/iron,
-/obj/item/clothing/neck/roguetown/chaincoif/iron,
-/obj/item/clothing/neck/roguetown/chaincoif/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
+/obj/item/clothing/suit/roguetown/armor/plate/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/neck/roguetown/chaincoif/silver,
+/obj/item/clothing/neck/roguetown/chaincoif/silver,
+/obj/item/clothing/neck/roguetown/chaincoif/silver,
+/obj/item/clothing/neck/roguetown/chaincoif/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"aU" = (
@@ -147,7 +147,7 @@
dir = 1;
icon_state = "longtable"
},
-/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/iron,
+/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/silver,
/turf/open/floor/carpet/royalblack,
/area/rogue/outdoors/woods/churchfort/basement)
"nI" = (
@@ -236,18 +236,18 @@
/area/rogue/outdoors/woods/churchfort/basement)
"Bd" = (
/obj/structure/closet/crate/roguecloset/dark,
-/obj/item/clothing/gloves/roguetown/plate/iron,
-/obj/item/clothing/gloves/roguetown/plate/iron,
-/obj/item/clothing/gloves/roguetown/plate/iron,
-/obj/item/clothing/gloves/roguetown/plate/iron,
-/obj/item/clothing/shoes/roguetown/boots/armor/iron,
-/obj/item/clothing/shoes/roguetown/boots/armor/iron,
-/obj/item/clothing/shoes/roguetown/boots/armor/iron,
-/obj/item/clothing/shoes/roguetown/boots/armor/iron,
-/obj/item/clothing/under/roguetown/platelegs/iron,
-/obj/item/clothing/under/roguetown/platelegs/iron,
-/obj/item/clothing/under/roguetown/platelegs/iron,
-/obj/item/clothing/under/roguetown/platelegs/iron,
+/obj/item/clothing/shoes/roguetown/boots/armor/silver,
+/obj/item/clothing/shoes/roguetown/boots/armor/silver,
+/obj/item/clothing/shoes/roguetown/boots/armor/silver,
+/obj/item/clothing/shoes/roguetown/boots/armor/silver,
+/obj/item/clothing/gloves/roguetown/plate/silver,
+/obj/item/clothing/gloves/roguetown/plate/silver,
+/obj/item/clothing/gloves/roguetown/plate/silver,
+/obj/item/clothing/gloves/roguetown/plate/silver,
+/obj/item/clothing/under/roguetown/platelegs/silver,
+/obj/item/clothing/under/roguetown/platelegs/silver,
+/obj/item/clothing/under/roguetown/platelegs/silver,
+/obj/item/clothing/under/roguetown/platelegs/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"BN" = (
@@ -261,10 +261,12 @@
/obj/item/gwstrap,
/obj/item/gwstrap,
/obj/item/gwstrap,
+/obj/item/gwstrap,
+/obj/item/rogueweapon/spear/billhook/silver,
+/obj/item/rogueweapon/spear/billhook/silver,
+/obj/item/rogueweapon/greatsword/silver,
+/obj/item/rogueweapon/greatsword/silver,
/obj/effect/decal/cleanable/cobweb,
-/obj/item/rogueweapon/mace/goden,
-/obj/item/rogueweapon/greatsword/zwei,
-/obj/item/rogueweapon/eaglebeak/lucerne,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"CW" = (
diff --git a/_maps/map_files/templates/hellwatch/z3/q3_v2.dmm b/_maps/map_files/templates/hellwatch/z3/q3_v2.dmm
index d603e494f..f015b8d39 100644
--- a/_maps/map_files/templates/hellwatch/z3/q3_v2.dmm
+++ b/_maps/map_files/templates/hellwatch/z3/q3_v2.dmm
@@ -84,10 +84,12 @@
/obj/item/gwstrap,
/obj/item/gwstrap,
/obj/item/gwstrap,
+/obj/item/gwstrap,
+/obj/item/rogueweapon/spear/billhook/silver,
+/obj/item/rogueweapon/spear/billhook/silver,
+/obj/item/rogueweapon/greatsword/silver,
+/obj/item/rogueweapon/greatsword/silver,
/obj/effect/decal/cleanable/cobweb,
-/obj/item/rogueweapon/mace/goden,
-/obj/item/rogueweapon/greatsword/zwei,
-/obj/item/rogueweapon/eaglebeak/lucerne,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"mr" = (
@@ -240,18 +242,18 @@
/area/rogue/outdoors/woods/churchfort/basement)
"ym" = (
/obj/structure/closet/crate/roguecloset/dark,
-/obj/item/clothing/suit/roguetown/armor/plate/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/iron,
-/obj/item/clothing/neck/roguetown/chaincoif/iron,
-/obj/item/clothing/neck/roguetown/chaincoif/iron,
-/obj/item/clothing/neck/roguetown/chaincoif/iron,
-/obj/item/clothing/neck/roguetown/chaincoif/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
+/obj/item/clothing/suit/roguetown/armor/plate/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/neck/roguetown/chaincoif/silver,
+/obj/item/clothing/neck/roguetown/chaincoif/silver,
+/obj/item/clothing/neck/roguetown/chaincoif/silver,
+/obj/item/clothing/neck/roguetown/chaincoif/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"yv" = (
@@ -298,18 +300,18 @@
/area/rogue/outdoors/woods/churchfort/basement)
"FD" = (
/obj/structure/closet/crate/roguecloset/dark,
-/obj/item/clothing/gloves/roguetown/plate/iron,
-/obj/item/clothing/gloves/roguetown/plate/iron,
-/obj/item/clothing/gloves/roguetown/plate/iron,
-/obj/item/clothing/gloves/roguetown/plate/iron,
-/obj/item/clothing/shoes/roguetown/boots/armor/iron,
-/obj/item/clothing/shoes/roguetown/boots/armor/iron,
-/obj/item/clothing/shoes/roguetown/boots/armor/iron,
-/obj/item/clothing/shoes/roguetown/boots/armor/iron,
-/obj/item/clothing/under/roguetown/platelegs/iron,
-/obj/item/clothing/under/roguetown/platelegs/iron,
-/obj/item/clothing/under/roguetown/platelegs/iron,
-/obj/item/clothing/under/roguetown/platelegs/iron,
+/obj/item/clothing/shoes/roguetown/boots/armor/silver,
+/obj/item/clothing/shoes/roguetown/boots/armor/silver,
+/obj/item/clothing/shoes/roguetown/boots/armor/silver,
+/obj/item/clothing/shoes/roguetown/boots/armor/silver,
+/obj/item/clothing/gloves/roguetown/plate/silver,
+/obj/item/clothing/gloves/roguetown/plate/silver,
+/obj/item/clothing/gloves/roguetown/plate/silver,
+/obj/item/clothing/gloves/roguetown/plate/silver,
+/obj/item/clothing/under/roguetown/platelegs/silver,
+/obj/item/clothing/under/roguetown/platelegs/silver,
+/obj/item/clothing/under/roguetown/platelegs/silver,
+/obj/item/clothing/under/roguetown/platelegs/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"Gk" = (
@@ -325,7 +327,7 @@
dir = 1;
icon_state = "longtable"
},
-/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect,
+/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/silver,
/turf/open/floor/carpet/royalblack,
/area/rogue/outdoors/woods/churchfort/basement)
"Kd" = (
diff --git a/_maps/map_files/templates/hellwatch/z3/q3_v3.dmm b/_maps/map_files/templates/hellwatch/z3/q3_v3.dmm
index 324863039..32a80d03f 100644
--- a/_maps/map_files/templates/hellwatch/z3/q3_v3.dmm
+++ b/_maps/map_files/templates/hellwatch/z3/q3_v3.dmm
@@ -133,7 +133,7 @@
dir = 1;
icon_state = "longtable"
},
-/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect,
+/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/silver,
/turf/open/floor/carpet/royalblack,
/area/rogue/outdoors/woods/churchfort/basement)
"pR" = (
@@ -367,26 +367,28 @@
/obj/item/gwstrap,
/obj/item/gwstrap,
/obj/item/gwstrap,
+/obj/item/gwstrap,
+/obj/item/rogueweapon/spear/billhook/silver,
+/obj/item/rogueweapon/spear/billhook/silver,
+/obj/item/rogueweapon/greatsword/silver,
+/obj/item/rogueweapon/greatsword/silver,
/obj/effect/decal/cleanable/cobweb,
-/obj/item/rogueweapon/mace/goden,
-/obj/item/rogueweapon/greatsword/zwei,
-/obj/item/rogueweapon/eaglebeak/lucerne,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"Tu" = (
/obj/structure/closet/crate/roguecloset/dark,
-/obj/item/clothing/gloves/roguetown/plate/iron,
-/obj/item/clothing/gloves/roguetown/plate/iron,
-/obj/item/clothing/gloves/roguetown/plate/iron,
-/obj/item/clothing/gloves/roguetown/plate/iron,
-/obj/item/clothing/shoes/roguetown/boots/armor/iron,
-/obj/item/clothing/shoes/roguetown/boots/armor/iron,
-/obj/item/clothing/shoes/roguetown/boots/armor/iron,
-/obj/item/clothing/shoes/roguetown/boots/armor/iron,
-/obj/item/clothing/under/roguetown/platelegs/iron,
-/obj/item/clothing/under/roguetown/platelegs/iron,
-/obj/item/clothing/under/roguetown/platelegs/iron,
-/obj/item/clothing/under/roguetown/platelegs/iron,
+/obj/item/clothing/shoes/roguetown/boots/armor/silver,
+/obj/item/clothing/shoes/roguetown/boots/armor/silver,
+/obj/item/clothing/shoes/roguetown/boots/armor/silver,
+/obj/item/clothing/shoes/roguetown/boots/armor/silver,
+/obj/item/clothing/gloves/roguetown/plate/silver,
+/obj/item/clothing/gloves/roguetown/plate/silver,
+/obj/item/clothing/gloves/roguetown/plate/silver,
+/obj/item/clothing/gloves/roguetown/plate/silver,
+/obj/item/clothing/under/roguetown/platelegs/silver,
+/obj/item/clothing/under/roguetown/platelegs/silver,
+/obj/item/clothing/under/roguetown/platelegs/silver,
+/obj/item/clothing/under/roguetown/platelegs/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"TX" = (
@@ -399,18 +401,18 @@
/area/rogue/outdoors/woods/churchfort/basement)
"Wd" = (
/obj/structure/closet/crate/roguecloset/dark,
-/obj/item/clothing/suit/roguetown/armor/plate/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/iron,
-/obj/item/clothing/suit/roguetown/armor/plate/iron,
-/obj/item/clothing/neck/roguetown/chaincoif/iron,
-/obj/item/clothing/neck/roguetown/chaincoif/iron,
-/obj/item/clothing/neck/roguetown/chaincoif/iron,
-/obj/item/clothing/neck/roguetown/chaincoif/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
-/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/iron,
+/obj/item/clothing/suit/roguetown/armor/plate/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/silver,
+/obj/item/clothing/suit/roguetown/armor/plate/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver,
+/obj/item/clothing/neck/roguetown/chaincoif/silver,
+/obj/item/clothing/neck/roguetown/chaincoif/silver,
+/obj/item/clothing/neck/roguetown/chaincoif/silver,
+/obj/item/clothing/neck/roguetown/chaincoif/silver,
/turf/open/floor/rogue/blocks/green,
/area/rogue/outdoors/woods/churchfort/basement)
"Wf" = (
diff --git a/code/game/objects/items/rogueweapons/melee/axes.dm b/code/game/objects/items/rogueweapons/melee/axes.dm
index 6ef545790..725fc4a3a 100644
--- a/code/game/objects/items/rogueweapons/melee/axes.dm
+++ b/code/game/objects/items/rogueweapons/melee/axes.dm
@@ -270,13 +270,26 @@
/obj/item/rogueweapon/stoneaxe/silver
name = "silver war axe"
- desc = "A one-handed war axe forged of silver."
+ desc = "A war axe forged of silver. Katholikos imagery is inscribed along the length of the blade."
icon_state = "silveraxe"
- force = 24
- possible_item_intents = list(/datum/intent/axe/cut,/datum/intent/axe/chop)
+ force = 25
+ force_wielded = 30
minstr = 6
max_blade_int = 400
smeltresult = /obj/item/ingot/silver
- gripped_intents = null
wdefense = 4
is_silver = TRUE
+ possible_item_intents = list(/datum/intent/axe/cut)
+ gripped_intents = list(/datum/intent/axe/cut,/datum/intent/axe/chop)
+
+/obj/item/rogueweapon/stoneaxe/silver/getonmobprop(tag)
+ . = ..()
+ if(tag)
+ switch(tag)
+ if("gen")
+ return list("shrink" = 0.5,"sx" = -9,"sy" = -8,"nx" = 9,"ny" = -7,"wx" = -7,"wy" = -8,"ex" = 3,"ey" = -8,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 90,"sturn" = -90,"wturn" = -90,"eturn" = 90,"nflip" = 0,"sflip" = 8,"wflip" = 8,"eflip" = 0)
+ if("wielded")
+ return list("shrink" = 0.6,"sx" = 2,"sy" = -8,"nx" = -6,"ny" = -3,"wx" = 3,"wy" = -4,"ex" = 4,"ey" = -3,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = -44,"sturn" = 45,"wturn" = 47,"eturn" = 33,"nflip" = 8,"sflip" = 0,"wflip" = 0,"eflip" = 0)
+ if("onbelt")
+ return list("shrink" = 0.3,"sx" = -2,"sy" = -5,"nx" = 4,"ny" = -5,"wx" = 0,"wy" = -5,"ex" = 2,"ey" = -5,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0)
+
diff --git a/code/game/objects/items/rogueweapons/melee/blunt.dm b/code/game/objects/items/rogueweapons/melee/blunt.dm
index 2b396de1d..39dad612b 100644
--- a/code/game/objects/items/rogueweapons/melee/blunt.dm
+++ b/code/game/objects/items/rogueweapons/melee/blunt.dm
@@ -51,11 +51,10 @@
/obj/item/rogueweapon/mace/silver
name = "silver war hammer"
- desc = "A light war hammer forged of silver."
+ desc = "A war hammer forged of pure silver. Katholikos imagery is inscribed across the metal."
icon_state = "silverhammer"
- force = 24
- gripped_intents = null
- possible_item_intents = list(/datum/intent/mace/strike, /datum/intent/mace/smash)
+ force = 25
+ force_wielded = 30
wdefense = 4
smeltresult = /obj/item/ingot/silver
smelt_bar_num = 2
@@ -150,6 +149,18 @@
damfactor = 0.9
item_d_type = "stab"
+/obj/item/rogueweapon/mace/silver/getonmobprop(tag)
+ . = ..()
+ if(tag)
+ switch(tag)
+ if("gen")
+ return list("shrink" = 0.5,"sx" = -9,"sy" = -8,"nx" = 9,"ny" = -7,"wx" = -7,"wy" = -8,"ex" = 3,"ey" = -8,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 90,"sturn" = -90,"wturn" = -90,"eturn" = 90,"nflip" = 0,"sflip" = 8,"wflip" = 8,"eflip" = 0)
+ if("wielded")
+ return list("shrink" = 0.6,"sx" = 2,"sy" = -8,"nx" = -6,"ny" = -3,"wx" = 3,"wy" = -4,"ex" = 4,"ey" = -3,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = -44,"sturn" = 45,"wturn" = 47,"eturn" = 33,"nflip" = 8,"sflip" = 0,"wflip" = 0,"eflip" = 0)
+ if("onbelt")
+ return list("shrink" = 0.3,"sx" = -2,"sy" = -5,"nx" = 4,"ny" = -5,"wx" = 0,"wy" = -5,"ex" = 2,"ey" = -5,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0)
+
+
/obj/item/rogueweapon/mace/woodclub
force = 15
force_wielded = 18
diff --git a/code/game/objects/items/rogueweapons/melee/flail.dm b/code/game/objects/items/rogueweapons/melee/flail.dm
index 5272d92af..f048f57e2 100644
--- a/code/game/objects/items/rogueweapons/melee/flail.dm
+++ b/code/game/objects/items/rogueweapons/melee/flail.dm
@@ -85,12 +85,21 @@
/obj/item/rogueweapon/flail/sflail
+ name = "steel flail"
force = 30
icon_state = "flail"
desc = "This is a swift, steel flail. Strikes hard and far."
smeltresult = /obj/item/ingot/steel
minstr = 5
+/obj/item/rogueweapon/flail/silver
+ force = 30
+ name = "silver flail"
+ icon_state = "silverflail"
+ desc = "This is a swift, silver flail. Strikes hard and far. Katholikos imagery is inscribed across the metal."
+ is_silver = TRUE
+ smeltresult = /obj/item/ingot/silver
+ minstr = 5
/datum/intent/whip/lash
name = "lash"
diff --git a/code/game/objects/items/rogueweapons/melee/knives.dm b/code/game/objects/items/rogueweapons/melee/knives.dm
index e8ad0d543..c4665b56c 100644
--- a/code/game/objects/items/rogueweapons/melee/knives.dm
+++ b/code/game/objects/items/rogueweapons/melee/knives.dm
@@ -172,7 +172,7 @@
penfactor = 30
/obj/item/rogueweapon/huntingknife/idagger
- possible_item_intents = list(/datum/intent/dagger/thrust,/datum/intent/dagger/cut, /datum/intent/dagger/thrust/pick)
+ possible_item_intents = list(/datum/intent/dagger/thrust, /datum/intent/dagger/cut, /datum/intent/dagger/chop/cleaver, /datum/intent/dagger/thrust/pick)
force = 15
max_integrity = 100
name = "iron dagger"
@@ -204,6 +204,11 @@
icon_state = "spdagger"
wdefense = 6
+/obj/item/rogueweapon/huntingknife/idagger/steel/parrying/church
+ icon_state = "silver_pdagger"
+ name = "silver parrying dagger"
+ desc = "This is a parrying dagger made of inscribed silver, used to catch opponent's weapons in the handguard. It's a bit more dull, however."
+
/obj/item/rogueweapon/huntingknife/idagger/steel/special
icon_state = "sdaggeralt"
@@ -211,12 +216,16 @@
name = "silver dagger"
desc = "This silver dagger can be the bane of vampires and werewolves."
icon_state = "sildagger"
- smeltresult = null
+ force = 18
sellprice = 50
smeltresult = /obj/item/ingot/silver
last_used = 0
is_silver = TRUE
+/obj/item/rogueweapon/huntingknife/idagger/silver/church
+ icon_state = "silver_daggeralt"
+ desc = "This silver dagger is a favoured blade for Katholikos scouts and agents. Religious imagery is inscribed down the blade."
+
/obj/item/rogueweapon/huntingknife/idagger/silver/pickup(mob/user)
. = ..()
var/mob/living/carbon/human/H = user
diff --git a/code/game/objects/items/rogueweapons/melee/polearms.dm b/code/game/objects/items/rogueweapons/melee/polearms.dm
index 42824aec6..383a19ff0 100644
--- a/code/game/objects/items/rogueweapons/melee/polearms.dm
+++ b/code/game/objects/items/rogueweapons/melee/polearms.dm
@@ -168,6 +168,13 @@
wdefense = 6
throwforce = 15
+/obj/item/rogueweapon/spear/billhook/silver
+ name = "silver billhook"
+ desc = "A neat hook, forged of pure silver. Katholikos imagery is inscribed along the length of the blade."
+ is_silver = TRUE
+ icon_state = "silverbillhook"
+ smeltresult = /obj/item/ingot/silver
+
/obj/item/rogueweapon/spear/improvisedbillhook
force = 12
force_wielded = 25
@@ -250,6 +257,12 @@
smeltresult = /obj/item/ingot/iron
max_blade_int = 200
+/obj/item/rogueweapon/halberd/naginata
+ name = "naginata"
+ desc = "A Cudese polearm with a long bladed end."
+ icon_state = "naginata"
+ item_state = "naginata"
+
/datum/intent/spear/cut/halberd
damfactor = 0.9
swingdelay = 10
@@ -325,7 +338,7 @@
/obj/item/rogueweapon/greatsword
force = 12
- force_wielded = 30
+ force_wielded = 35
possible_item_intents = list(/datum/intent/sword/chop,/datum/intent/sword/strike) //bash is for nonlethal takedowns, only targets limbs
gripped_intents = list(/datum/intent/sword/cut/zwei, /datum/intent/sword/chop, /datum/intent/sword/thrust/zwei, /datum/intent/sword/strike)
name = "greatsword"
@@ -380,6 +393,22 @@
smeltresult = /obj/item/ingot/steel
smelt_bar_num = 3
+/obj/item/rogueweapon/greatsword/silver
+ name = "silver claymore"
+ desc = "A claymore, forged of pure silver. Katholikos imagery is inscribed along the length of the blade."
+ is_silver = TRUE
+ icon_state = "silverclaymore"
+ item_state = "silverclaymore"
+ smeltresult = /obj/item/ingot/silver
+ smelt_bar_num = 3
+ sellprice = 300
+
+/obj/item/rogueweapon/greatsword/odachi
+ name = "odachi"
+ desc = "A long curved blade originating in Cudao, too unwieldly to be handled one-handed. Larger than its sibling, the Tachi."
+ icon_state = "odachi"
+ item_state = "odachi"
+
/obj/item/rogueweapon/estoc
name = "estoc"
desc = "A sword possessed of a long and tapered blade that is intended to be thrust between the \
diff --git a/code/game/objects/items/rogueweapons/melee/special.dm b/code/game/objects/items/rogueweapons/melee/special.dm
index e9dfe1ad7..0b9b13d80 100644
--- a/code/game/objects/items/rogueweapons/melee/special.dm
+++ b/code/game/objects/items/rogueweapons/melee/special.dm
@@ -256,3 +256,11 @@
return list("shrink" = 0.4,"sx" = -7,"sy" = -4,"nx" = 7,"ny" = -4,"wx" = -3,"wy" = -4,"ex" = 1,"ey" = -4,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 110,"sturn" = -110,"wturn" = -110,"eturn" = 110,"nflip" = 0,"sflip" = 8,"wflip" = 8,"eflip" = 0)
if("onbelt")
return list("shrink" = 0.3,"sx" = -2,"sy" = -5,"nx" = 4,"ny" = -5,"wx" = 0,"wy" = -5,"ex" = 2,"ey" = -5,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0)
+
+/obj/item/rogueweapon/katar/silver
+ force = 18
+ name = "silver katar"
+ desc = "A silver blade that sits above the user's fist. Commonly used by those proficient at unarmed fighting. This one is engraved with Katholikos imagery along the blade."
+ icon_state = "silver_katar"
+ smeltresult = /obj/item/ingot/silver
+ is_silver = TRUE
diff --git a/code/game/objects/items/rogueweapons/melee/swords.dm b/code/game/objects/items/rogueweapons/melee/swords.dm
index 12fa69ee1..80a8d6042 100644
--- a/code/game/objects/items/rogueweapons/melee/swords.dm
+++ b/code/game/objects/items/rogueweapons/melee/swords.dm
@@ -107,6 +107,37 @@
minstr = 4
wdefense = 4
+/obj/item/rogueweapon/sword/short/silver
+ name = "silver short sword"
+ desc = "A short, silver sword made for stabbing. Katholikos imagery is engraved down the length of the blade."
+ force = 18
+ is_silver = TRUE
+ icon_state = "silverswordshort"
+
+/obj/item/rogueweapon/sword/katana
+ name = "katana"
+ desc = "A slightly curved sword originating in Cudao, sharpened to a razor's edge."
+ force = 20
+ possible_item_intents = list(/datum/intent/sword/cut, /datum/intent/sword/thrust)
+ gripped_intents = list(/datum/intent/sword/cut, /datum/intent/sword/thrust)
+ icon_state = "katana"
+ item_state = "katana"
+ minstr = 4
+ wdefense = 4
+
+/obj/item/rogueweapon/sword/tachi
+ icon_state = "tachi"
+ item_state = "tachi"
+ icon = 'icons/roguetown/weapons/32.dmi'
+ name = "tachi"
+ desc = "A slightly curved sword originating in Cudao, sharpened to a razor's edge. Longer than its sibling, the Katana."
+ force = 25
+ force_wielded = 30
+ possible_item_intents = list(/datum/intent/sword/cut, /datum/intent/sword/thrust, /datum/intent/sword/strike)
+ gripped_intents = list(/datum/intent/sword/cut, /datum/intent/sword/thrust, /datum/intent/sword/strike, /datum/intent/sword/chop)
+ bigboy = 1
+ wlength = WLENGTH_LONG
+
/obj/item/rogueweapon/sword/long
force = 25
force_wielded = 30
@@ -378,6 +409,7 @@
if("onbelt")
return list("shrink" = 0.5,"sx" = -4,"sy" = -6,"nx" = 5,"ny" = -6,"wx" = 0,"wy" = -6,"ex" = -1,"ey" = -6,"nturn" = 100,"sturn" = 156,"wturn" = 90,"eturn" = 180,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0)
+
/datum/intent/sword/strike
name = "pommel strike"
icon_state = "instrike"
@@ -443,7 +475,7 @@
sellprice = 10
/obj/item/rogueweapon/sword/iron/short
- name = "short sword"
+ name = "iron short sword"
desc = "An archaic iron sword."
icon_state = "iswordshort"
possible_item_intents = list(/datum/intent/sword/cut/short, /datum/intent/sword/thrust/short)
@@ -618,6 +650,12 @@
max_blade_int = 300
wdefense = 7
+/obj/item/rogueweapon/sword/rapier/silver
+ name = "silver rapier"
+ icon_state = "silver_rapier"
+ desc = "A duelist's weapon forged in pure silver, inscribed with Katholikos imagery. Bane of the night creatures and heretics alike. An Inquisitor's weapon."
+ sellprice = 140
+
/obj/item/rogueweapon/sword/cutlass
name = "cutlass"
desc = "Used by pirates and deckhands."
@@ -662,6 +700,17 @@
smelt_bar_num = 2
max_blade_int = 150
max_integrity = 200
+ sellprice = 150
+
+/obj/item/rogueweapon/sword/long/silver
+ name = "silver longsword"
+ desc = "A longsword forged of pure silver. Katholikos imagery is inscribed down the length of the blade."
+ icon_state = "silverlongsword"
+ item_state = "silverlongsword"
+ is_silver = TRUE
+ smeltresult = /obj/item/ingot/silver
+ smelt_bar_num = 2
+ sellprice = 200
/obj/item/rogueweapon/sword/long/blackflamb
force = 20
diff --git a/code/game/objects/items/rogueweapons/ranged/ammo.dm b/code/game/objects/items/rogueweapons/ranged/ammo.dm
index 030ab9b4d..b5b1e895a 100644
--- a/code/game/objects/items/rogueweapons/ranged/ammo.dm
+++ b/code/game/objects/items/rogueweapons/ranged/ammo.dm
@@ -9,6 +9,17 @@
dropshrink = 0.6
max_integrity = 10
force = 10
+
+/obj/item/ammo_casing/caseless/rogue/bolt/silver
+ name = "silver bolt"
+ desc = "A bolt of pure silver, favoured by the agents of the Katholikos."
+ projectile_type = /obj/projectile/bullet/reusable/bolt/silver
+ icon_state = "silver_bolt"
+ is_silver = TRUE
+ dropshrink = 0.6
+ max_integrity = 10
+ force = 10
+
/*
/obj/item/ammo_casing/caseless/rogue/bolt/poison
name = "poisoned bolt"
@@ -60,6 +71,22 @@
var/mob/living/carbon/M = target
M.reagents.add_reagent(/datum/reagent/toxin/mutetoxin, 7) //not gonna kill anyone, but they will be quite quiet
*/
+
+/obj/projectile/bullet/reusable/bolt/silver
+ name = "silver bolt"
+ damage = 70
+ damage_type = BRUTE
+ armor_penetration = 50
+ icon = 'icons/roguetown/weapons/ammo.dmi'
+ icon_state = "bolt_proj"
+ ammo_type = /obj/item/ammo_casing/caseless/rogue/bolt/silver
+ range = 15
+ hitsound = 'sound/combat/hits/hi_arrow2.ogg'
+ embedchance = 100
+ woundclass = BCLASS_STAB
+ flag = "bullet"
+ speed = 0.5
+
/obj/item/ammo_casing/caseless/rogue/arrow
name = "arrow"
desc = "A wooden shaft with a pointy iron end."
@@ -127,6 +154,10 @@
name = "bone arrow"
ammo_type = /obj/item/ammo_casing/caseless/rogue/arrow/bone
+/obj/projectile/bullet/reusable/arrow/silver
+ name = "silver arrow"
+ ammo_type = /obj/item/ammo_casing/caseless/rogue/arrow/silver
+
/obj/item/ammo_casing/caseless/rogue/arrow/stone
name = "stone arrow"
desc = "A wooden shaft with a jagged rock on the end."
@@ -141,6 +172,14 @@
max_integrity = 5
projectile_type = /obj/projectile/bullet/reusable/arrow/bone
+/obj/item/ammo_casing/caseless/rogue/arrow/silver
+ name = "silver arrow"
+ desc = "A wooden shaft with an arrowhead of pure silver, a favoured choice for Katholikos scouts."
+ icon_state = "silver_arrow"
+ max_integrity = 5
+ is_silver = TRUE
+ projectile_type = /obj/projectile/bullet/reusable/arrow/silver
+
/obj/item/ammo_casing/caseless/rogue/arrow/poison
name = "poisoned arrow"
desc = "A wooden shaft with a pointy iron end. This one is stained green with floral toxins."
diff --git a/code/modules/clothing/rogueclothes/armor.dm b/code/modules/clothing/rogueclothes/armor.dm
index f2afeeba3..35cc05c73 100644
--- a/code/modules/clothing/rogueclothes/armor.dm
+++ b/code/modules/clothing/rogueclothes/armor.dm
@@ -84,21 +84,32 @@
desc = "A longer iron maille that protects the legs."
icon_state = "iron_hauberk"
item_state = "iron_hauberk"
- max_integrity = 230
smeltresult = /obj/item/ingot/iron
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver
+ name = "silver hauberk"
+ desc = "A longer silver maille that protects the legs."
+ icon_state = "silver_hauberk"
+ item_state = "silver_hauberk"
+ smeltresult = /obj/item/ingot/silver
+
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted
name = "steel fluted hauberk"
- desc = "A steel maille, of a pattern popularized by Aelondan templars."
+ desc = "A steel maille, of a pattern popularized by templars of the Katholikos."
icon_state = "flutedhauberk"
item_state = "flutedhauberk"
/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/iron
name = "iron fluted hauberk"
- desc = "An iron maille, of a pattern popularized by Aelondan templars."
+ desc = "An iron maille, of a pattern popularized by templars of the Katholikos."
icon_state = "iron_flutedhauberk"
item_state = "iron_flutedhauberk"
- max_integrity = 230
+
+/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver
+ name = "silver fluted hauberk"
+ desc = "A silver maille, of a pattern popularized by templars of the Katholikos."
+ icon_state = "silver_flutedhauberk"
+ item_state = "silver_flutedhauberk"
/obj/item/clothing/suit/roguetown/armor/chainmail/bikini
name = "steel chainmail bikini"
@@ -147,6 +158,15 @@
max_integrity = 255
smelt_bar_num = 3
+/obj/item/clothing/suit/roguetown/armor/plate/silver
+ name = "silver half-plate"
+ desc = "Plate armor with pauldrons. Forged from silver and inscribed with Katholikos imagery, fit for hunting the creatures of the night."
+ icon_state = "silver_halfplate"
+ item_state = "silver_halfplate"
+ smeltresult = /obj/item/ingot/iron
+ max_integrity = 325
+ smelt_bar_num = 3
+
/obj/item/clothing/suit/roguetown/armor/plate/bikini
name = "steel half-plate bikini"
desc = "Half plate in bikini form, still just as protective somehow. Save for the stomach."
@@ -216,6 +236,14 @@
smeltresult = /obj/item/ingot/iron
smelt_bar_num = 4
+/obj/item/clothing/suit/roguetown/armor/plate/full/silver
+ name = "silver plate armor"
+ desc = "Full silver plate. Leg protecting tassets, groin cup, armored vambraces - a full set engraved with Katholikos imagery. Fit for hunting the most dangerous beasts of the night."
+ icon_state = "silver_plate"
+ item_state = "silver_plate"
+ max_integrity = 410
+ smeltresult = /obj/item/ingot/silver
+
/obj/item/clothing/suit/roguetown/armor/plate/full/bikini
name = "steel fullplate bikini"
desc = "Full plate in bikini form, full package and full exposure."
@@ -246,6 +274,14 @@
armor_class = ARMOR_CLASS_MEDIUM
smelt_bar_num = 2
+/obj/item/clothing/suit/roguetown/armor/plate/half/silver
+ name = "silver breastplate"
+ desc = "A basic cuirass of silver, protective and moderately durable. It is inscribed with Katholikos imagery."
+ icon_state = "silver_cuirass"
+ max_integrity = 315
+ smeltresult = /obj/item/ingot/silver
+ armor_class = ARMOR_CLASS_MEDIUM
+
/obj/item/clothing/suit/roguetown/armor/plate/half/elven
name = "elven guardian cuirass"
desc = "A cuirass made of steel with a thin decorative gold plating. Lightweight and durable."
diff --git a/code/modules/clothing/rogueclothes/cloaks.dm b/code/modules/clothing/rogueclothes/cloaks.dm
index 616fa9e18..96dc7bab8 100644
--- a/code/modules/clothing/rogueclothes/cloaks.dm
+++ b/code/modules/clothing/rogueclothes/cloaks.dm
@@ -1363,3 +1363,13 @@
icon_state = "naledisash"
item_state = "naledisash"
desc = "A limp piece of fabric traditionally used to fasten bags that are too baggy, but in modern days has become more of a fashion statement than anything."
+
+/obj/item/clothing/cloak/straw
+ name = "straw cloak"
+ desc = "A lightweight and water-repellant cloak fashioned from woven rice straw, originating in Cudao."
+ icon_state = "straw_cloak"
+ alternate_worn_layer = TABARD_LAYER
+ mob_overlay_icon = 'icons/roguetown/clothing/onmob/cloaks.dmi'
+ slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_SHIRT|ITEM_SLOT_CLOAK
+ r_sleeve_status = SLEEVE_NORMAL
+ l_sleeve_status = SLEEVE_NORMAL
diff --git a/code/modules/clothing/rogueclothes/feet.dm b/code/modules/clothing/rogueclothes/feet.dm
index ad2e486bb..cb6eec19e 100644
--- a/code/modules/clothing/rogueclothes/feet.dm
+++ b/code/modules/clothing/rogueclothes/feet.dm
@@ -157,6 +157,14 @@
anvilrepair = /datum/skill/craft/armorsmithing
smeltresult = /obj/item/ingot/iron
+/obj/item/clothing/shoes/roguetown/boots/armor/silver
+ name = "silver plated boots"
+ desc = "Boots forged of a set of silver plates, inscribed with Katholikos imagery."
+ icon_state = "silver_armorboots"
+ item_state = "silver_armorboots"
+ max_integrity = 200
+ smeltresult = /obj/item/ingot/silver
+
/obj/item/clothing/shoes/roguetown/boots/armor/iron/red
name = "red iron plated boots"
color = "#b81865"
diff --git a/code/modules/clothing/rogueclothes/gloves.dm b/code/modules/clothing/rogueclothes/gloves.dm
index 62fbd6d8d..7c1846cb1 100644
--- a/code/modules/clothing/rogueclothes/gloves.dm
+++ b/code/modules/clothing/rogueclothes/gloves.dm
@@ -76,7 +76,7 @@
sewrepair = TRUE
/obj/item/clothing/gloves/roguetown/chain
- name = "chain gauntlets"
+ name = "steel chain gauntlets"
desc = ""
icon_state = "cgloves"
armor = list("blunt" = 60, "slash" = 100, "stab" = 80, "bullet" = 20, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
@@ -96,11 +96,19 @@
item_state = "psydongloveschains"
/obj/item/clothing/gloves/roguetown/chain/iron
+ name = "iron chain gauntlets"
icon_state = "icgloves"
anvilrepair = /datum/skill/craft/armorsmithing
smeltresult = /obj/item/ingot/iron
max_integrity = 115
+/obj/item/clothing/gloves/roguetown/chain/silver
+ name = "silver chain gauntlets"
+ icon_state = "silver_cgloves"
+ anvilrepair = /datum/skill/craft/armorsmithing
+ smeltresult = /obj/item/ingot/silver
+ max_integrity = 125
+
//rogtodo sprites for this
/obj/item/clothing/gloves/roguetown/plate
name = "steel plate gauntlets"
@@ -119,9 +127,17 @@
/obj/item/clothing/gloves/roguetown/plate/iron
name = "iron plate gauntlets"
+ icon_state = "igauntlets"
max_integrity = 135
smeltresult = /obj/item/ingot/iron
+/obj/item/clothing/gloves/roguetown/plate/silver
+ name = "silver plate gauntlets"
+ desc = "Silver plate gauntlets, inscribed with Katholikos imagery."
+ icon_state = "silver_gauntlets"
+ max_integrity = 175
+ smeltresult = /obj/item/ingot/silver
+
/obj/item/clothing/gloves/roguetown/grenzelgloves
name = "grenzelhoft gloves"
desc = ""
diff --git a/code/modules/clothing/rogueclothes/hats.dm b/code/modules/clothing/rogueclothes/hats.dm
index 30e497482..a97ac2bd0 100644
--- a/code/modules/clothing/rogueclothes/hats.dm
+++ b/code/modules/clothing/rogueclothes/hats.dm
@@ -714,14 +714,13 @@
smeltresult = /obj/item/ingot/steel
max_integrity = 250
-/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect
+/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/barbute
name = "steel katholikos barbute"
desc = "A barbute styled with Katholikos imagery."
icon_state = "psydonbarbute"
item_state = "psydonbarbute"
-
-/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/iron
+/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/barbute/iron
name = "iron katholikos barbute"
desc = "A barbute styled with Katholikos imagery."
icon_state = "iron_psydonbarbute"
@@ -729,6 +728,14 @@
smeltresult = /obj/item/ingot/iron
max_integrity = 150
+/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/barbute/silver
+ name = "silver katholikos barbute"
+ desc = "A barbute styled with Katholikos imagery, in gleaming silver."
+ icon_state = "silver_psydonbarbute"
+ item_state = "silver_psydonbarbute"
+ smeltresult = /obj/item/ingot/silver
+ max_integrity = 225
+
/obj/item/clothing/head/roguetown/helmet/heavy/guard
name = "savoyard"
desc = "A helmet with a menacing visage."
@@ -739,6 +746,28 @@
smeltresult = /obj/item/ingot/steel
smelt_bar_num = 2
+/obj/item/clothing/head/roguetown/helmet/heavy/samurai
+ name = "steel samurai helmet"
+ desc = "A steel Cudese helmet with a menacing visage, evocative of a demon, intended to strike terror into the foe beholding it."
+ icon_state = "samurai"
+ item_state = "samurai"
+ emote_environment = 3
+ flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR
+ block2add = FOV_RIGHT|FOV_LEFT
+ smeltresult = /obj/item/ingot/steel
+ smelt_bar_num = 2
+
+/obj/item/clothing/head/roguetown/helmet/heavy/samurai/iron
+ name = "iron samurai helmet"
+ desc = "An iron Cudese helmet with a menacing visage, evocative of a demon, intended to strike terror into the foe beholding it."
+ icon_state = "iron_samurai"
+ item_state = "iron_samurai"
+ emote_environment = 3
+ flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR
+ block2add = FOV_RIGHT|FOV_LEFT
+ smeltresult = /obj/item/ingot/iron
+ smelt_bar_num = 2
+
/obj/item/clothing/head/roguetown/helmet/heavy/sheriff
name = "barred helmet"
desc = "A helmet which offers good protection to the face at the expense of vision."
@@ -929,6 +958,13 @@
smeltresult = /obj/item/ingot/iron
max_integrity = 150
+/obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/silver
+ name = "silver visires helmet"
+ icon_state = "silver_astratahelm"
+ item_state = "silver_astratahelm"
+ smeltresult = /obj/item/ingot/silver
+ max_integrity = 225
+
/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect
name ="steel aspect armet"
desc = "Headwear commonly worn by Templars in service to the Inquisition of the Katholikos."
@@ -948,6 +984,13 @@
smeltresult = /obj/item/ingot/iron
max_integrity = 150
+/obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/silver
+ name ="silver aspect armet"
+ icon_state = "silver_psydonarmet"
+ item_state = "silver_psydonarmet"
+ smeltresult = /obj/item/ingot/silver
+ max_integrity = 225
+
/obj/item/clothing/head/roguetown/helmet/heavy/akan
name = "steel helmet of skies"
desc = "Headwear commonly worn by Templars in service to Akan. As light as a feather, as free as can be."
@@ -968,7 +1011,14 @@
smeltresult = /obj/item/ingot/iron
max_integrity = 150
-/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn
+/obj/item/clothing/head/roguetown/helmet/heavy/akan/silver
+ name = "silver helmet of skies"
+ icon_state = "silver_nochelm"
+ item_state = "silver_nochelm"
+ smeltresult = /obj/item/ingot/silver
+ max_integrity = 225
+
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/alt
name = "steel mjallidhorn helmet"
desc = "Headwear commonly worn by Templars in service to Mjallidhorn. Let its skeletal features remind you of the only thing which is guaranteed in life. You will die."
icon_state = "necrahelm"
@@ -980,12 +1030,12 @@
smeltresult = /obj/item/ingot/steel
smelt_bar_num = 2
-/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron
- name = "iron mjallidhorn helmet"
- icon_state = "necrahelm"
- item_state = "necrahelm"
- smeltresult = /obj/item/ingot/iron
- max_integrity = 150
+/obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver/alt
+ name = "silver mjallidhorn helmet"
+ icon_state = "silver_necrahelm"
+ item_state = "silver_necrahelm"
+ smeltresult = /obj/item/ingot/silver
+ max_integrity = 225
/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm
name = "steel earthen helmet"
@@ -1006,6 +1056,13 @@
smeltresult = /obj/item/ingot/iron
max_integrity = 150
+/obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver
+ name = "silver earthen helmet"
+ icon_state = "silver_dendorhelm"
+ item_state = "silver_dendorhelm"
+ smeltresult = /obj/item/ingot/silver
+ max_integrity = 225
+
/obj/item/clothing/head/roguetown/helmet/bascinet
name = "bascinet"
desc = "A steel bascinet helmet without a visor protecting the the head and ears."
@@ -1443,3 +1500,11 @@
desc = "A feathered leather hat, to show them all your superiority."
icon_state = "duelhat"
sewrepair = TRUE
+
+/obj/item/clothing/head/roguetown/cudese_straw_hat
+ name = "cudese straw hat"
+ desc = "A straw hat popular in Cudao, water-resistant and good at keeping the sun off."
+ icon_state = "cudese_straw_hat"
+ item_state = "cudese_straw_hat"
+ sewrepair = TRUE
+ color = "#fbc588"
diff --git a/code/modules/clothing/rogueclothes/mask.dm b/code/modules/clothing/rogueclothes/mask.dm
index 7c71d15d3..0a18cc127 100644
--- a/code/modules/clothing/rogueclothes/mask.dm
+++ b/code/modules/clothing/rogueclothes/mask.dm
@@ -129,6 +129,13 @@
max_integrity = 200
smeltresult = /obj/item/ingot/steel
+/obj/item/clothing/mask/rogue/facemask/silver
+ name = "silver mask"
+ desc = "The faceless silver mask of the Katholikos' Confessors. They conceal the identities of those who must do the dangerous work in the dark to root out heresy."
+ icon_state = "silver_mask"
+ max_integrity = 175
+ smeltresult = /obj/item/ingot/silver
+
/obj/item/clothing/mask/rogue/facemask/goldmask
name = "Gold Mask"
icon_state = "goldmask"
diff --git a/code/modules/clothing/rogueclothes/neck.dm b/code/modules/clothing/rogueclothes/neck.dm
index 795007842..02968b482 100644
--- a/code/modules/clothing/rogueclothes/neck.dm
+++ b/code/modules/clothing/rogueclothes/neck.dm
@@ -88,6 +88,13 @@
smeltresult = /obj/item/ingot/iron
max_integrity = 150
+/obj/item/clothing/neck/roguetown/chaincoif/silver
+ name = "silver chain coif"
+ icon_state = "silver_chaincoif"
+ anvilrepair = /datum/skill/craft/armorsmithing
+ smeltresult = /obj/item/ingot/silver
+ max_integrity = 175
+
/obj/item/clothing/neck/roguetown/chaincoif/full
name = "full chain coif"
icon_state = "fchaincoif"
diff --git a/code/modules/clothing/rogueclothes/pants.dm b/code/modules/clothing/rogueclothes/pants.dm
index a512ae1f2..4ba3d19ba 100644
--- a/code/modules/clothing/rogueclothes/pants.dm
+++ b/code/modules/clothing/rogueclothes/pants.dm
@@ -173,6 +173,7 @@
l_sleeve_status = SLEEVE_NOMOD
resistance_flags = FIRE_PROOF
armor_class = ARMOR_CLASS_MEDIUM
+ max_integrity = 200
/obj/item/clothing/under/roguetown/brayette
name = "brayette"
@@ -200,6 +201,13 @@
anvilrepair = /datum/skill/craft/armorsmithing
smeltresult = /obj/item/ingot/iron
+/obj/item/clothing/under/roguetown/chainlegs/silver
+ name = "silver chain chausses"
+ icon_state = "silver_chain_legs"
+ max_integrity = 175
+ anvilrepair = /datum/skill/craft/armorsmithing
+ smeltresult = /obj/item/ingot/silver
+
/obj/item/clothing/under/roguetown/chainlegs/iron/red
name = "red iron chain chausses"
color = "#b81865"
@@ -234,6 +242,13 @@
max_integrity = 150
smeltresult = /obj/item/ingot/iron
+/obj/item/clothing/under/roguetown/platelegs/silver
+ name = "silver plate chausses"
+ desc = "Reinforced silver armor to protect the legs, inscribed with Katholikos imagery."
+ icon_state = "silver_plate_legs"
+ item_state = "silver_plate_legs"
+ max_integrity = 200
+ smeltresult = /obj/item/ingot/silver
/obj/item/clothing/under/roguetown/chainlegs/skirt
name = "steel chain skirt"
diff --git a/code/modules/clothing/rogueclothes/quiver.dm b/code/modules/clothing/rogueclothes/quiver.dm
index 3f4bb87d6..7465c32eb 100644
--- a/code/modules/clothing/rogueclothes/quiver.dm
+++ b/code/modules/clothing/rogueclothes/quiver.dm
@@ -16,57 +16,61 @@
alternate_worn_layer = UNDER_CLOAK_LAYER
strip_delay = 20
var/max_storage = 20
- var/list/arrows = list()
+ var/list/ammo = list()
+ var/list/allowed_ammo = list(/obj/item/ammo_casing/caseless/rogue/arrow, /obj/item/ammo_casing/caseless/rogue/bolt)
sewrepair = TRUE
/obj/item/quiver/attack_turf(turf/T, mob/living/user)
- if(arrows.len >= max_storage)
+ 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..."))
for(var/obj/item/ammo_casing/caseless/rogue/arrow in T.contents)
if(do_after(user, 5))
- if(!eatarrow(arrow))
+ if(!eatammo(arrow))
break
-/obj/item/quiver/proc/eatarrow(obj/A)
- if(A.type in subtypesof(/obj/item/ammo_casing/caseless/rogue))
- if(arrows.len < max_storage)
- A.forceMove(src)
- arrows += A
- update_icon()
+/obj/item/quiver/proc/check_ammo(obj/A)
+ for(var/i in allowed_ammo)
+ if(istype(A, i))
return TRUE
- else
- return FALSE
+
+/obj/item/quiver/proc/eatammo(obj/A)
+ if(check_ammo(A) && ammo.len < max_storage)
+ A.forceMove(src)
+ 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)
- if(ismob(loc))
- var/mob/M = loc
- M.doUnEquip(A, TRUE, src, TRUE, silent = TRUE)
- else
- A.forceMove(src)
- arrows += 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
+
+ if(ammo.len < max_storage)
+ if(check_ammo(A))
+ if(ismob(loc))
+ var/mob/M = loc
+ M.doUnEquip(A, TRUE, src, TRUE, silent = TRUE)
+ else
+ A.forceMove(src)
+ ammo += A
+ update_icon()
+
..()
/obj/item/quiver/attack_right(mob/user)
- if(arrows.len)
- var/obj/O = arrows[arrows.len]
- arrows -= O
+ if(ammo.len)
+ var/obj/O = ammo[ammo.len]
+ ammo -= O
O.forceMove(user.loc)
user.put_in_hands(O)
update_icon()
@@ -74,11 +78,11 @@
/obj/item/quiver/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)
+ if(ammo.len)
icon_state = "quiver1"
else
icon_state = "quiver0"
@@ -87,14 +91,14 @@
. = ..()
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()
. = ..()
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()
@@ -111,4 +115,16 @@
arrows += A
update_icon()
*/
+/obj/item/quiver/silver_arrows/Initialize()
+ . = ..()
+ for(var/i in 1 to max_storage)
+ var/obj/item/ammo_casing/caseless/rogue/arrow/silver/A = new()
+ ammo += A
+ update_icon()
+/obj/item/quiver/silver_bolts/Initialize()
+ . = ..()
+ for(var/i in 1 to max_storage)
+ var/obj/item/ammo_casing/caseless/rogue/bolt/silver/A = new()
+ ammo += A
+ update_icon()
diff --git a/code/modules/clothing/rogueclothes/shirts.dm b/code/modules/clothing/rogueclothes/shirts.dm
index 8614b52c2..40a80ceaa 100644
--- a/code/modules/clothing/rogueclothes/shirts.dm
+++ b/code/modules/clothing/rogueclothes/shirts.dm
@@ -372,3 +372,39 @@
desc = "A billowing tunic made of the finest silks and softest fabrics. Inlaid with golden thread, this is the height of fashion for the wealthiest of wearers."
icon_state = "stewardtunic"
item_state = "stewardtunic"
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic
+ slot_flags = ITEM_SLOT_SHIRT|ITEM_SLOT_ARMOR
+ name = "cudese tunic"
+ desc = "A tunic originating from Cudao."
+ body_parts_covered = CHEST|GROIN|ARMS|LEGS|VITALS
+ icon_state = "cudese_tunic"
+ boobed = FALSE
+ r_sleeve_status = SLEEVE_NORMAL
+ l_sleeve_status = SLEEVE_NORMAL
+ flags_inv = HIDECROTCH|HIDEBOOB
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/green
+ color = CLOTHING_GREEN
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/blue
+ color = CLOTHING_BLUE
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/red
+ color = CLOTHING_RED
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/purple
+ color = CLOTHING_PURPLE
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/white
+ color = CLOTHING_WHITE
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/black
+ color = CLOTHING_BLACK
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/ucolored
+ color = COLOR_GRAY
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/random/Initialize()
+ color = pick(CLOTHING_PURPLE, CLOTHING_RED, CLOTHING_BLUE, CLOTHING_GREEN, CLOTHING_BLACK, CLOTHING_WHITE, COLOR_GRAY)
+ ..()
diff --git a/code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/confessor.dm b/code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/confessor.dm
index 657112af4..20678489d 100644
--- a/code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/confessor.dm
+++ b/code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/confessor.dm
@@ -25,16 +25,16 @@
beltr = /obj/item/rogueweapon/mace/cudgel
wrists = /obj/item/clothing/neck/roguetown/psicross/silver
gloves = /obj/item/clothing/gloves/roguetown/leather/black
- beltl = /obj/item/rogueweapon/huntingknife/idagger/steel/special
+ beltl = /obj/item/rogueweapon/huntingknife/idagger/silver/church
backr = /obj/item/storage/backpack/rogue/satchel/black
belt = /obj/item/storage/belt/rogue/leather
pants = /obj/item/clothing/under/roguetown/trou/leather
armor = /obj/item/clothing/suit/roguetown/armor/leather/studded
shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random
shoes = /obj/item/clothing/shoes/roguetown/boots
- mask = /obj/item/clothing/mask/rogue/facemask
+ mask = /obj/item/clothing/mask/rogue/facemask/silver
head = /obj/item/clothing/head/roguetown/roguehood/black
- backpack_contents = list(/obj/item/storage/keyring/puritan = 1, /obj/item/lockpickring/mundane = 1, /obj/item/rogueweapon/huntingknife/idagger/steel/parrying = 1)
+ backpack_contents = list(/obj/item/storage/keyring/puritan = 1, /obj/item/lockpickring/mundane = 1, /obj/item/rogueweapon/huntingknife/idagger/steel/parrying/church = 1)
H.change_stat("strength", -1) // weasel
H.change_stat("endurance", 3)
H.change_stat("perception", 2)
diff --git a/code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/disciple.dm b/code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/disciple.dm
index 8eb35f674..9eca8d78d 100644
--- a/code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/disciple.dm
+++ b/code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/disciple.dm
@@ -1,6 +1,6 @@
/datum/advclass/disciple
name = "Disciple"
- tutorial = "Disciples are Otavan martial artists, recruited by the Inquisition for their iron physique. Elemental Monks."
+ tutorial = "Disciples are martial artists, recruited by the Inquisition for their iron physique. Elemental Monks."
allowed_sexes = list(MALE, FEMALE)
allowed_races = RACES_ALL_KINDS
outfit = /datum/outfit/job/roguetown/disciple
@@ -17,6 +17,7 @@
neck = /obj/item/clothing/neck/roguetown/psicross/silver
belt = /obj/item/storage/belt/rogue/leather/black
beltl = /obj/item/storage/belt/rogue/pouch/coins/mid
+ beltr = /obj/item/rogueweapon/katar/silver
id = /obj/item/clothing/ring/silver
backl = /obj/item/storage/backpack/rogue/satchel
backpack_contents = list(/obj/item/storage/keyring/puritan = 1)
diff --git a/code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/psydoniantemplar.dm b/code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/psydoniantemplar.dm
index f172dcc94..2dfd98a98 100644
--- a/code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/psydoniantemplar.dm
+++ b/code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/psydoniantemplar.dm
@@ -14,21 +14,23 @@
cloak = /obj/item/clothing/cloak/all_aspect
backr = /obj/item/rogueweapon/shield/tower/metal
gloves = /obj/item/clothing/gloves/roguetown/chain/all_aspect
- neck = /obj/item/clothing/neck/roguetown/chaincoif/iron
- pants = /obj/item/clothing/under/roguetown/chainlegs/iron
+ neck = /obj/item/clothing/neck/roguetown/chaincoif/silver
+ pants = /obj/item/clothing/under/roguetown/chainlegs/silver
backl = /obj/item/storage/backpack/rogue/satchel/black
shirt = /obj/item/clothing/suit/roguetown/armor/gambeson/heavy
shoes = /obj/item/clothing/shoes/roguetown/psydonboots
- armor = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/iron
- head = /obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/iron
+ armor = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/silver
belt = /obj/item/storage/belt/rogue/leather/black
beltl = /obj/item/storage/belt/rogue/pouch/coins/mid
id = /obj/item/clothing/ring/silver
backpack_contents = list(/obj/item/storage/keyring/puritan = 1)
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/axes, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/maces, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
@@ -56,22 +58,26 @@
/datum/outfit/job/roguetown/katholikostemplar/choose_loadout(mob/living/carbon/human/H)
. = ..()
- var/weapons = list("Bastard Sword","Zweihander","Flail","Mace","Spear")
+ var/weapons = list("Axe","Longsword","Billhook","Flail","Mace","Claymore")
var/weapon_choice = input(H,"Choose your weapon.", "TAKE UP ARMS") as anything in weapons
switch(weapon_choice)
- if("Bastard Sword")
- H.put_in_hands(new /obj/item/rogueweapon/sword/long/exe(H), TRUE)
+ if("Axe")
+ H.put_in_hands(new /obj/item/rogueweapon/stoneaxe/silver(H), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/axes, 1, TRUE)
+ if("Longsword")
+ H.put_in_hands(new /obj/item/rogueweapon/sword/long/silver(H), TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
- if("Zweihander")
- H.put_in_hands(new /obj/item/rogueweapon/greatsword/zwei(H), TRUE)
+ if("Billhook")
+ H.put_in_hands(new /obj/item/rogueweapon/spear/billhook/silver(H), TRUE)
H.put_in_hands(new /obj/item/gwstrap(H), TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE)
if("Flail")
- H.put_in_hands(new /obj/item/rogueweapon/flail(H), TRUE)
+ H.put_in_hands(new /obj/item/rogueweapon/flail/silver(H), TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE)
if("Mace")
- H.put_in_hands(new /obj/item/rogueweapon/mace(H), TRUE)
+ H.put_in_hands(new /obj/item/rogueweapon/mace/silver(H), TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/maces, 1, TRUE)
- if("Spear")
- H.put_in_hands(new /obj/item/rogueweapon/spear(H), TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE)
+ if("Claymore")
+ H.put_in_hands(new /obj/item/rogueweapon/greatsword/silver(H), TRUE)
+ H.put_in_hands(new /obj/item/gwstrap(H), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
diff --git a/code/modules/jobs/job_types/roguetown/Inquisition/puritan.dm b/code/modules/jobs/job_types/roguetown/Inquisition/puritan.dm
index 5d721c6fc..2a0add9f6 100644
--- a/code/modules/jobs/job_types/roguetown/Inquisition/puritan.dm
+++ b/code/modules/jobs/job_types/roguetown/Inquisition/puritan.dm
@@ -37,8 +37,8 @@
beltr = /obj/item/storage/belt/rogue/pouch/coins/rich
head = /obj/item/clothing/head/roguetown/puritan
gloves = /obj/item/clothing/gloves/roguetown/leather
- beltl = /obj/item/rogueweapon/sword/rapier
- backpack_contents = list(/obj/item/storage/keyring/puritan = 1, /obj/item/rogueweapon/huntingknife/idagger/silver = 1, /obj/item/rogueweapon/huntingknife/idagger/steel/parrying = 1, /obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/iron = 1)
+ beltl = /obj/item/rogueweapon/sword/rapier/silver
+ backpack_contents = list(/obj/item/storage/keyring/puritan = 1, /obj/item/rogueweapon/huntingknife/idagger/silver/church = 1, /obj/item/rogueweapon/huntingknife/idagger/steel/parrying/church = 1, /obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/barbute/silver = 1)
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 4, TRUE)
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/antag/ronin.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/antag/ronin.dm
new file mode 100644
index 000000000..1f56d587c
--- /dev/null
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/antag/ronin.dm
@@ -0,0 +1,82 @@
+/datum/advclass/ronin
+ name = "Ronin"
+ tutorial = "A disgraced Samurai of Cudao, fallen from grace. Perhaps you took too many contracts for unscrupulous buyers, perhaps you disgraced yourself thoroughly on a previous job, or perhaps you even killed your own master. Whatever led you down this path, the shame was too great to return to your old life."
+ allowed_sexes = list(MALE, FEMALE)
+ allowed_races = RACES_SHUNNED_UP
+ outfit = /datum/outfit/job/roguetown/bandit/ronin
+ category_tags = list(CTAG_BANDIT)
+ cmode_music = 'sound/music/combat_yinbladesmen.ogg'
+
+/datum/outfit/job/roguetown/bandit/ronin/pre_equip(mob/living/carbon/human/H)
+ ..()
+ H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/maces, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE)
+ 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/swords, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE)
+ H.change_stat("strength", 2)
+ H.change_stat("endurance", 3)
+ H.change_stat("constitution", 2)
+ H.change_stat("perception", 1)
+ ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)
+ ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
+ belt = /obj/item/storage/belt/rogue/leather/black
+ beltr = /obj/item/quiver/arrows
+ id = /obj/item/mattcoin
+ neck = /obj/item/clothing/neck/roguetown/chaincoif/iron/blk
+ cloak = /obj/item/clothing/cloak/straw
+ shirt = /obj/item/clothing/suit/roguetown/armor/gambeson/heavy/blk
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/samurai/iron/blk
+ armor = /obj/item/clothing/suit/roguetown/armor/brigandine/coatplates/iron/blk
+ pants = /obj/item/clothing/under/roguetown/platelegs/iron/blk
+ shoes = /obj/item/clothing/shoes/roguetown/boots/armor/iron/blk
+ gloves = /obj/item/clothing/gloves/roguetown/plate/iron/blk
+ backl = /obj/item/storage/backpack/rogue/satchel/black
+ backpack_contents = list(/obj/item/flashlight/flare/torch/lantern = 1, /obj/item/storage/belt/rogue/pouch/coins/poor = 1)
+
+ var/weapons = list("Katana & Recurve Bow","Tachi & Buckler","Odachi","Naginata")
+ var/weapon_choice = input(H,"Choose your weapon.", "TAKE UP ARMS") as anything in weapons
+ switch(weapon_choice)
+ if("Katana & Recurve Bow")
+ H.put_in_hands(new /obj/item/rogueweapon/sword/katana(H), TRUE)
+ H.put_in_hands(new /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve(H), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE)
+ if("Tachi & Buckler")
+ H.put_in_hands(new /obj/item/rogueweapon/sword/tachi(H), TRUE)
+ H.put_in_hands(new /obj/item/rogueweapon/shield/buckler(H), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/shields, 1, TRUE)
+ if("Odachi")
+ H.put_in_hands(new /obj/item/rogueweapon/greatsword/odachi(H), TRUE)
+ H.put_in_hands(new /obj/item/gwstrap(H), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
+ if("Naginata")
+ H.put_in_hands(new /obj/item/rogueweapon/halberd/naginata(H), TRUE)
+ H.put_in_hands(new /obj/item/gwstrap(H), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE)
+
+//Funny dye stuff
+/obj/item/clothing/neck/roguetown/chaincoif/iron/blk
+ color = CLOTHING_GREY
+
+/obj/item/clothing/head/roguetown/helmet/heavy/samurai/iron/blk
+ color = CLOTHING_GREY
+
+/obj/item/clothing/suit/roguetown/armor/brigandine/coatplates/iron/blk
+ color = CLOTHING_GREY
+
+/obj/item/clothing/under/roguetown/platelegs/iron/blk
+ color = CLOTHING_GREY
+
+/obj/item/clothing/gloves/roguetown/plate/iron/blk
+ color = CLOTHING_GREY
diff --git a/code/modules/jobs/job_types/roguetown/church/templar.dm b/code/modules/jobs/job_types/roguetown/church/templar.dm
index 47b594def..f0734c748 100644
--- a/code/modules/jobs/job_types/roguetown/church/templar.dm
+++ b/code/modules/jobs/job_types/roguetown/church/templar.dm
@@ -59,8 +59,9 @@
wrists = /obj/item/clothing/wrists/roguetown/wrappings
shoes = /obj/item/clothing/shoes/roguetown/sandals
belt = /obj/item/storage/belt/rogue/leather/black
- beltl = /obj/item/storage/belt/rogue/pouch/coins/mid
+ beltl = /obj/item/rogueweapon/katar/silver
beltr = /obj/item/storage/keyring/puritan
+ backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/mid = 1)
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE)
@@ -102,8 +103,8 @@
H.verbs += list(/mob/living/carbon/human/proc/devotionreport, /mob/living/carbon/human/proc/clericpray)
/datum/advclass/templar/crusader
- name = "Templar"
- tutorial = "You are a templar of the Church, trained in heavy weaponry and zealous warfare. You are the instrument of your God's wrath, clad in steel and faith."
+ name = "Crusader"
+ tutorial = "You are a templar of the Church, trained in heavy weaponry and zealous warfare. You are the instrument of your God's wrath, clad in silver and faith."
outfit = /datum/outfit/job/roguetown/templar/crusader
category_tags = list(CTAG_TEMPLAR)
@@ -117,34 +118,34 @@
cloak = /obj/item/clothing/cloak/tabard/crusader/tief
switch(H.patron?.type)
if(/datum/patron/elemental/visires)
- head = /obj/item/clothing/head/roguetown/helmet/heavy/visires/iron
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/visires/silver
cloak = /obj/item/clothing/cloak/templar/visires
if(/datum/patron/elemental/gani)
- head = /obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver
cloak = /obj/item/clothing/cloak/tabard/crusader/gani
if(/datum/patron/elemental/mjallidhorn)
- head = /obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver
cloak = /obj/item/clothing/cloak/templar/mjallidhorn
if(/datum/patron/elemental/akan)
- head = /obj/item/clothing/head/roguetown/helmet/heavy/akan/iron
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/akan/silver
cloak = /obj/item/clothing/cloak/tabard/crusader/akan
- if(/datum/patron/all_aspect)
- cloak = /obj/item/clothing/cloak/tabard/crusader/all_aspect
backr = /obj/item/rogueweapon/shield/tower/metal
backl = /obj/item/storage/backpack/rogue/satchel
- gloves = /obj/item/clothing/gloves/roguetown/chain/iron
- neck = /obj/item/clothing/neck/roguetown/chaincoif/iron
- pants = /obj/item/clothing/under/roguetown/chainlegs/iron
+ gloves = /obj/item/clothing/gloves/roguetown/chain/silver
+ neck = /obj/item/clothing/neck/roguetown/chaincoif/silver
+ pants = /obj/item/clothing/under/roguetown/chainlegs/silver
shirt = /obj/item/clothing/suit/roguetown/armor/gambeson/heavy
shoes = /obj/item/clothing/shoes/roguetown/boots
- armor = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/iron
+ armor = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver
belt = /obj/item/storage/belt/rogue/leather/black
beltl = /obj/item/storage/belt/rogue/pouch/coins/mid
beltr = /obj/item/storage/keyring/puritan
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/axes, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/maces, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
@@ -185,22 +186,25 @@
/datum/outfit/job/roguetown/templar/crusader/choose_loadout(mob/living/carbon/human/H)
. = ..()
- var/weapons = list("Bastard Sword","Flail","Mace","Spear")
+ var/weapons = list("Axe","Longsword","Billhook","Flail","Mace")
var/weapon_choice = input(H,"Choose your weapon.", "TAKE UP ARMS") as anything in weapons
switch(weapon_choice)
- if("Bastard Sword")
- H.put_in_hands(new /obj/item/rogueweapon/sword/long(H), TRUE)
+ if("Axe")
+ H.put_in_hands(new /obj/item/rogueweapon/stoneaxe/silver(H), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/axes, 1, TRUE)
+ if("Longsword")
+ H.put_in_hands(new /obj/item/rogueweapon/sword/long/silver(H), TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
+ if("Billhook")
+ H.put_in_hands(new /obj/item/rogueweapon/spear/billhook/silver(H), TRUE)
+ H.put_in_hands(new /obj/item/gwstrap(H), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE)
if("Flail")
- H.put_in_hands(new /obj/item/rogueweapon/flail(H), TRUE)
+ H.put_in_hands(new /obj/item/rogueweapon/flail/silver(H), TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE)
if("Mace")
- H.put_in_hands(new /obj/item/rogueweapon/mace(H), TRUE)
+ H.put_in_hands(new /obj/item/rogueweapon/mace/silver(H), TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/maces, 1, TRUE)
- if("Spear")
- H.put_in_hands(new /obj/item/rogueweapon/spear(H), TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE)
-
/datum/advclass/templar/heavyranger
name = "Ranger-Zealot"
@@ -218,28 +222,26 @@
cloak = /obj/item/clothing/cloak/tabard/crusader/tief
switch(H.patron?.type)
if(/datum/patron/elemental/visires)
- head = /obj/item/clothing/head/roguetown/helmet/heavy/visires/iron
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/visires/silver
cloak = /obj/item/clothing/cloak/templar/visires
if(/datum/patron/elemental/gani)
- head = /obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver
cloak = /obj/item/clothing/cloak/tabard/crusader/gani
if(/datum/patron/elemental/mjallidhorn)
- head = /obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver
cloak = /obj/item/clothing/cloak/templar/mjallidhorn
if(/datum/patron/elemental/akan)
- head = /obj/item/clothing/head/roguetown/helmet/heavy/akan/iron
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/akan/silver
cloak = /obj/item/clothing/cloak/tabard/crusader/akan
- if(/datum/patron/all_aspect)
- cloak = /obj/item/clothing/cloak/tabard/crusader/all_aspect
- gloves = /obj/item/clothing/gloves/roguetown/chain/iron
+ gloves = /obj/item/clothing/gloves/roguetown/chain/silver
neck = /obj/item/storage/belt/rogue/pouch/coins/mid
- pants = /obj/item/clothing/under/roguetown/chainlegs/iron
+ pants = /obj/item/clothing/under/roguetown/chainlegs/silver
shirt = /obj/item/clothing/suit/roguetown/armor/gambeson/heavy
shoes = /obj/item/clothing/shoes/roguetown/boots
- armor = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/iron
+ armor = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver
belt = /obj/item/storage/belt/rogue/leather/black/puritan
beltr = /obj/item/flashlight/flare/torch/lantern
- beltl = /obj/item/rogueweapon/sword/iron/short
+ beltl = /obj/item/rogueweapon/sword/short/silver
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE)
@@ -290,11 +292,11 @@
switch(weapon_choice)
if("Crossbow")
H.put_in_hands(new /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow(H), FALSE)
- H.put_in_hands(new /obj/item/quiver/bolts(H), FALSE)
+ H.put_in_hands(new /obj/item/quiver/silver_bolts(H), FALSE)
H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 1, TRUE)
if("Longbow")
H.put_in_hands(new /obj/item/gun/ballistic/revolver/grenadelauncher/bow/longbow(H), FALSE)
- H.put_in_hands(new /obj/item/quiver/arrows(H), FALSE)
+ H.put_in_hands(new /obj/item/quiver/silver_arrows(H), FALSE)
H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE)
/datum/advclass/templar/lightranger
@@ -313,19 +315,17 @@
cloak = /obj/item/clothing/cloak/tabard/crusader/tief
switch(H.patron?.type)
if(/datum/patron/elemental/visires)
- head = /obj/item/clothing/head/roguetown/helmet/heavy/visires/iron
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/visires/silver
cloak = /obj/item/clothing/cloak/templar/visires
if(/datum/patron/elemental/gani)
- head = /obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/iron
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver
cloak = /obj/item/clothing/cloak/tabard/crusader/gani
if(/datum/patron/elemental/mjallidhorn)
- head = /obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/iron
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver
cloak = /obj/item/clothing/cloak/templar/mjallidhorn
if(/datum/patron/elemental/akan)
- head = /obj/item/clothing/head/roguetown/helmet/heavy/akan/iron
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/akan/silver
cloak = /obj/item/clothing/cloak/tabard/crusader/akan
- if(/datum/patron/all_aspect)
- cloak = /obj/item/clothing/cloak/tabard/crusader/all_aspect
gloves = /obj/item/clothing/gloves/roguetown/leather
neck = /obj/item/storage/belt/rogue/pouch/coins/mid
pants= /obj/item/clothing/under/roguetown/trou/leather
@@ -335,7 +335,7 @@
belt = /obj/item/storage/belt/rogue/leather/black/puritan
beltl = /obj/item/flashlight/flare/torch/lantern
backl = /obj/item/storage/backpack/rogue/satchel
- backpack_contents = list(/obj/item/rogueweapon/huntingknife = 1)
+ backpack_contents = list(/obj/item/rogueweapon/huntingknife/idagger/silver/church = 1)
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE)
@@ -386,9 +386,9 @@
switch(weapon_choice)
if("Crossbow")
H.put_in_hands(new /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow(H), FALSE)
- H.put_in_hands(new /obj/item/quiver/bolts(H), FALSE)
+ H.put_in_hands(new /obj/item/quiver/silver_bolts(H), FALSE)
H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE)
if("Recurve Bow")
H.put_in_hands(new /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve(H), FALSE)
- H.put_in_hands(new /obj/item/quiver/arrows(H), FALSE)
+ H.put_in_hands(new /obj/item/quiver/silver_arrows(H), FALSE)
H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE)
diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/classes/yinbladesmen.dm b/code/modules/jobs/job_types/roguetown/mercenaries/classes/yinbladesmen.dm
new file mode 100644
index 000000000..f1e2dff69
--- /dev/null
+++ b/code/modules/jobs/job_types/roguetown/mercenaries/classes/yinbladesmen.dm
@@ -0,0 +1,151 @@
+/datum/advclass/mercenary/yinbladesman
+ name = "Yin Bladesmen"
+ tutorial = "Mysterious, renowned, and expensive - these traditional bladesmen carry on martial traditions passed down from the survivors of the Kui Empire. With Cudao's airships, these mercenaries can be seen far and wide in the East and West, spreading word of their tradition through their ferocity on the battlefield. Though mercenaries working for coin, these bladesmen hold their honour in highest regard and carry out their tasks with a grave sense of duty, making them popular bodyguards for the wealthy and elite, though they can be found in the employ of anyone who can afford their high price."
+ allowed_sexes = list(MALE, FEMALE)
+ allowed_races = RACES_ALL_KINDS
+ outfit = /datum/outfit/job/roguetown/mercenary/yinbladesman
+ category_tags = list(CTAG_MERCENARY)
+ cmode_music = 'sound/music/combat_yinbladesmen.ogg'
+
+/datum/outfit/job/roguetown/mercenary/yinbladesman/pre_equip(mob/living/carbon/human/H)
+ ..()
+
+ // CLASS ARCHETYPES
+ H.adjust_blindness(-3)
+ var/classes = list("Samurai","Ninja")
+ var/classchoice = input("Choose your archetypes", "Available archetypes") as anything in classes
+
+ switch(classchoice)
+ if("Samurai")
+ H.set_blindness(0)
+ to_chat(H, span_warning("You are a Samurai of Cudao, an armoured swordsman experienced with a variety of weapons."))
+ H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/maces, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE)
+ 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/swords, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE)
+ H.change_stat("strength", 2)
+ H.change_stat("endurance", 3)
+ H.change_stat("constitution", 2)
+ H.change_stat("perception", 1)
+ ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)
+ ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
+ belt = /obj/item/storage/belt/rogue/leather
+ beltr = /obj/item/quiver/arrows
+ neck = /obj/item/clothing/neck/roguetown/chaincoif/iron
+ cloak = /obj/item/clothing/cloak/straw
+ shirt = /obj/item/clothing/suit/roguetown/armor/gambeson/heavy
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/samurai/iron
+ armor = /obj/item/clothing/suit/roguetown/armor/brigandine/coatplates/iron
+ pants = /obj/item/clothing/under/roguetown/platelegs/iron
+ shoes = /obj/item/clothing/shoes/roguetown/boots/armor/iron
+ gloves = /obj/item/clothing/gloves/roguetown/plate/iron
+ backl = /obj/item/storage/backpack/rogue/satchel
+ backpack_contents = list(/obj/item/flashlight/flare/torch/lantern = 1, /obj/item/storage/belt/rogue/pouch/coins/poor = 1)
+
+ var/weapons = list("Katana & Recurve Bow","Tachi & Buckler","Odachi","Naginata")
+ var/weapon_choice = input(H,"Choose your weapon.", "TAKE UP ARMS") as anything in weapons
+ switch(weapon_choice)
+ if("Katana & Recurve Bow")
+ H.put_in_hands(new /obj/item/rogueweapon/sword/katana(H), TRUE)
+ H.put_in_hands(new /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve(H), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE)
+ if("Tachi & Buckler")
+ H.put_in_hands(new /obj/item/rogueweapon/sword/tachi(H), TRUE)
+ H.put_in_hands(new /obj/item/rogueweapon/shield/buckler(H), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/shields, 1, TRUE)
+ if("Odachi")
+ H.put_in_hands(new /obj/item/rogueweapon/greatsword/odachi(H), TRUE)
+ H.put_in_hands(new /obj/item/gwstrap(H), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
+ if("Naginata")
+ H.put_in_hands(new /obj/item/rogueweapon/halberd/naginata(H), TRUE)
+ H.put_in_hands(new /obj/item/gwstrap(H), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE)
+
+ if("Ninja")
+ H.set_blindness(0)
+ to_chat(H, span_warning("You are a Ninja of Cudao, a rogue or assassin that utilises a curious combination of blade and magic."))
+ H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE)
+ 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/swords, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/alchemy, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE)
+ H.change_stat("strength", 1)
+ H.change_stat("endurance", 2)
+ H.change_stat("perception", 3)
+ H.change_stat("speed", 1)
+ H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/touch/darkvision)
+ H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/featherfall)
+ H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/smoke)
+ H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/invisibility)
+ if(H.mind)
+ H.mind.adjust_spellpoints(-4)//No ninjas with lightning bolt or fireball or blade burst pls. I understand the fantasy but it would be far too busted. You get what you start with.
+ ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
+ ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
+ belt = /obj/item/storage/belt/rogue/leather/black
+ beltl = /obj/item/rogueweapon/huntingknife/idagger/steel/parrying
+ beltr = /obj/item/quiver/arrows
+ neck = /obj/item/clothing/neck/roguetown/coif/blk
+ shirt = /obj/item/clothing/suit/roguetown/armor/gambeson/heavy/blk
+ mask = /obj/item/clothing/mask/rogue/ragmask/blk
+ armor = /obj/item/clothing/suit/roguetown/armor/leather/heavy/belted/blk
+ pants = /obj/item/clothing/under/roguetown/heavy_leather_pants/blk
+ shoes = /obj/item/clothing/shoes/roguetown/boots
+ gloves = /obj/item/clothing/gloves/roguetown/fingerless_leather/blk
+ backr = /obj/item/storage/backpack/rogue/satchel/black
+ backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/poor = 1, /obj/item/lockpickring/mundane = 1)
+
+ var/weapons = list("Katana & Recurve Bow","Dagger & Longbow")
+ var/weapon_choice = input(H,"Choose your weapon.", "TAKE UP ARMS") as anything in weapons
+ switch(weapon_choice)
+ if("Katana & Recurve Bow")
+ H.put_in_hands(new /obj/item/rogueweapon/sword/katana(H), TRUE)
+ H.put_in_hands(new /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve(H), TRUE)
+ H.put_in_hands(new /obj/item/quiver/arrows(H), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE)
+ if("Dagger & Longbow")
+ H.put_in_hands(new /obj/item/rogueweapon/huntingknife/idagger/steel/special(H), TRUE)
+ H.put_in_hands(new /obj/item/gun/ballistic/revolver/grenadelauncher/bow/longbow(H), TRUE)
+ H.put_in_hands(new /obj/item/quiver/arrows(H), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE)
+
+// Funny recolours for the Ninja stuff.
+/obj/item/clothing/mask/rogue/ragmask/blk
+ color = CLOTHING_GREY
+
+/obj/item/clothing/suit/roguetown/armor/leather/heavy/belted/blk
+ color = CLOTHING_GREY
+
+/obj/item/clothing/under/roguetown/heavy_leather_pants/blk
+ color = CLOTHING_GREY
+
+/obj/item/clothing/gloves/roguetown/fingerless_leather/blk
+ color = CLOTHING_GREY
+
+/obj/item/clothing/suit/roguetown/armor/gambeson/heavy/blk
+ color = CLOTHING_GREY
+
+/obj/item/clothing/neck/roguetown/coif/blk
+ color = CLOTHING_GREY
diff --git a/code/modules/roguetown/roguecrafting/sewing.dm b/code/modules/roguetown/roguecrafting/sewing.dm
index 5dee9b0c4..19241aa7c 100644
--- a/code/modules/roguetown/roguecrafting/sewing.dm
+++ b/code/modules/roguetown/roguecrafting/sewing.dm
@@ -91,6 +91,13 @@
/obj/item/natural/fibers = 2)
craftdiff = 1
+/datum/crafting_recipe/roguetown/sewing/cudese_tunic
+ name = "cudese tunic"
+ result = list(/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/random)
+ reqs = list(/obj/item/natural/cloth = 2,
+ /obj/item/natural/fibers = 2)
+ craftdiff = 1
+
/datum/crafting_recipe/roguetown/sewing/tights
name = "tights"
result = list(/obj/item/clothing/under/roguetown/tights/random)
@@ -125,6 +132,12 @@
reqs = list(/obj/item/natural/fibers = 3)
craftdiff = 1
+/datum/crafting_recipe/roguetown/sewing/cudese_strawhat
+ name = "cudese straw hat"
+ result = list(/obj/item/clothing/head/roguetown/cudese_straw_hat)
+ reqs = list(/obj/item/natural/fibers = 3)
+ craftdiff = 1
+
/datum/crafting_recipe/roguetown/sewing/sack
name = "sack hood"
result = list(/obj/item/clothing/head/roguetown/menacing)
@@ -249,6 +262,12 @@
name = "bog surcoat"
result = list(/obj/item/clothing/cloak/stabard/bog)
+/datum/crafting_recipe/roguetown/sewing/straw_cloak
+ name = "straw cloak"
+ result = list(/obj/item/clothing/cloak/straw)
+ reqs = list(/obj/item/natural/fibers = 6)
+ craftdiff = 2
+
/datum/crafting_recipe/roguetown/sewing/robe
name = "robes"
result = list(/obj/item/clothing/suit/roguetown/shirt/robe)
diff --git a/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/armor.dm b/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/armor.dm
index 909ce9022..39eab192f 100644
--- a/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/armor.dm
+++ b/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/armor.dm
@@ -392,6 +392,125 @@
created_item = /obj/item/storage/belt/rogue/leather/plaquesilver
craftdiff = 3
+/datum/anvil_recipe/armor/silver/hauberk
+ name = "Silver Hauberk"
+ req_bar = /obj/item/ingot/silver
+ created_item = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/flutedhauberk
+ name = "Silver Fluted Hauberk"
+ req_bar = /obj/item/ingot/silver
+ created_item = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/breastplate
+ name = "Silver Breastplate (+1 Silver)"
+ req_bar = /obj/item/ingot/silver
+ additional_items = list(/obj/item/ingot/silver)
+ created_item = /obj/item/clothing/suit/roguetown/armor/plate/half/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/halfplate
+ name = "Silver Half-plate (+2 Silver)"
+ req_bar = /obj/item/ingot/silver
+ additional_items = list(/obj/item/ingot/silver, /obj/item/ingot/silver)
+ created_item = /obj/item/clothing/suit/roguetown/armor/plate/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/fullplate
+ name = "Silver Full-plate (+3 Silver)"
+ req_bar = /obj/item/ingot/silver
+ additional_items = list(/obj/item/ingot/silver, /obj/item/ingot/silver, /obj/item/ingot/silver)
+ created_item = /obj/item/clothing/suit/roguetown/armor/plate/full/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/chainglove
+ name = "Silver Chain Gloves"
+ req_bar = /obj/item/ingot/silver
+ created_item = /obj/item/clothing/gloves/roguetown/chain/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/plateglove
+ name = "Silver Plate Gauntlets"
+ req_bar = /obj/item/ingot/silver
+ created_item = /obj/item/clothing/gloves/roguetown/plate/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/chainlegs
+ name = "Silver Chain Chausses"
+ req_bar = /obj/item/ingot/silver
+ created_item = /obj/item/clothing/under/roguetown/chainlegs/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/boot
+ name = "Silver Plate Boots (+1 Silver)"
+ req_bar = /obj/item/ingot/silver
+ created_item = /obj/item/clothing/shoes/roguetown/boots/armor/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/chainlegs
+ name = "Silver Plate Chausses (+1 Silver)"
+ req_bar = /obj/item/ingot/silver
+ created_item = /obj/item/clothing/under/roguetown/platelegs/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/mjallidhornhelm
+ name = "Silver Helmet of Frost (+1 Silver)"
+ req_bar = /obj/item/ingot/silver
+ additional_items = list(/obj/item/ingot/silver)
+ created_item = /obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/mjallidhornhelmalt
+ name = "Silver Helmet of Frost, Alt (+1 Silver)"
+ req_bar = /obj/item/ingot/silver
+ additional_items = list(/obj/item/ingot/silver)
+ created_item = /obj/item/clothing/head/roguetown/helmet/heavy/mjallidhorn/silver/alt
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/ganihelm
+ name = "Silver Helmet of Earth (+1 Silver)"
+ req_bar = /obj/item/ingot/silver
+ additional_items = list(/obj/item/ingot/silver)
+ created_item = /obj/item/clothing/head/roguetown/helmet/heavy/ganihelm/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/golerkanhhelm
+ name = "Silver Helmet of the Forge (+1 Silver)"
+ req_bar = /obj/item/ingot/silver
+ additional_items = list(/obj/item/ingot/silver)
+ created_item = /obj/item/clothing/head/roguetown/helmet/heavy/golerkanh/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/visireshhelm
+ name = "Silver Helmet of Fire (+1 Silver)"
+ req_bar = /obj/item/ingot/silver
+ additional_items = list(/obj/item/ingot/silver)
+ created_item = /obj/item/clothing/head/roguetown/helmet/heavy/visireshelm/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/visireshhelmalt
+ name = "Silver Helmet of Fire, Alt (+1 Silver)"
+ req_bar = /obj/item/ingot/silver
+ additional_items = list(/obj/item/ingot/silver)
+ created_item = /obj/item/clothing/head/roguetown/helmet/heavy/visires/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/allaspect
+ name = "Silver All-Aspect Armet (+1 Silver)"
+ req_bar = /obj/item/ingot/silver
+ additional_items = list(/obj/item/ingot/silver)
+ created_item = /obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/armor/silver/allaspectalt
+ name = "Silver Katholikos Barbute (+1 Silver)"
+ req_bar = /obj/item/ingot/silver
+ additional_items = list(/obj/item/ingot/silver)
+ created_item = /obj/item/clothing/head/roguetown/helmet/heavy/all_aspect/barbute/silver
+ craftdiff = 2
+
// --------- GOLD RECIPES-----------
/datum/anvil_recipe/armor/gold/belt
diff --git a/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/weapons.dm b/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/weapons.dm
index a4c8cc561..e51f452a9 100644
--- a/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/weapons.dm
+++ b/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/weapons.dm
@@ -310,31 +310,88 @@
craftdiff = 3
/datum/anvil_recipe/weapons/silver/dagger
- name = "Dagger"
+ name = "Ceremonial Silver Dagger"
req_bar = /obj/item/ingot/silver
created_item = /obj/item/rogueweapon/huntingknife/idagger/silver
craftdiff = 2
+/datum/anvil_recipe/weapons/silver/daggeralt
+ name = "Silver Dueling Dagger"
+ req_bar = /obj/item/ingot/silver
+ created_item = /obj/item/rogueweapon/huntingknife/idagger/silver/church
+ craftdiff = 2
+
+/datum/anvil_recipe/weapons/silver/daggerparrying
+ name = "Silver Parrying Dagger"
+ req_bar = /obj/item/ingot/silver
+ created_item = /obj/item/rogueweapon/huntingknife/idagger/steel/parrying/church
+ craftdiff = 2
+
/datum/anvil_recipe/weapons/silver/sword
name = "Silver Sword (+1 Silver)"
req_bar = /obj/item/ingot/silver
additional_items = list(/obj/item/ingot/silver)
created_item = /obj/item/rogueweapon/sword/silver
- craftdiff = 3
+ craftdiff = 2
/datum/anvil_recipe/weapons/silver/waraxe
name = "Silver War Axe (+1 Silver, +1 Stick)"
req_bar = /obj/item/ingot/silver
additional_items = list(/obj/item/ingot/silver, /obj/item/grown/log/tree/stick)
created_item = /obj/item/rogueweapon/stoneaxe/silver
- craftdiff = 3
+ craftdiff = 2
/datum/anvil_recipe/weapons/silver/warhammer
name = "Silver War Hammer (+1 Silver, +1 Stick)"
req_bar = /obj/item/ingot/silver
additional_items = list(/obj/item/ingot/silver, /obj/item/grown/log/tree/stick)
created_item = /obj/item/rogueweapon/mace/silver
- craftdiff = 3
+ craftdiff = 2
+
+/datum/anvil_recipe/weapons/silver/longsword
+ name = "Silver Longsword (+1 Silver)"
+ req_bar = /obj/item/ingot/silver
+ additional_items = list(/obj/item/ingot/silver)
+ created_item = /obj/item/rogueweapon/sword/long/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/weapons/silver/shortsword
+ name = "Silver Short Sword"
+ req_bar = /obj/item/ingot/silver
+ created_item = /obj/item/rogueweapon/sword/short/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/weapons/silver/greatsword
+ name = "Silver Claymore (+2 Silver)"
+ req_bar = /obj/item/ingot/silver
+ additional_items = list(/obj/item/ingot/silver, /obj/item/ingot/silver)
+ created_item = /obj/item/rogueweapon/greatsword/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/weapons/silver/rapier
+ name = "Silver Rapier"
+ req_bar = /obj/item/ingot/silver
+ created_item = /obj/item/rogueweapon/sword/rapier/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/weapons/silver/billhook
+ name = "Silver Bilhook (+1 Small Log)"
+ req_bar = /obj/item/ingot/silver
+ additional_items = list(/obj/item/grown/log/tree/small)
+ created_item = /obj/item/rogueweapon/spear/billhook/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/weapons/silver/katar
+ name = "Silver Katar"
+ req_bar = /obj/item/ingot/silver
+ created_item = /obj/item/rogueweapon/katar/silver
+ craftdiff = 2
+
+/datum/anvil_recipe/weapons/silver/flail
+ name = "Silver Flail"
+ req_bar = /obj/item/ingot/silver
+ created_item = /obj/item/rogueweapon/flail/silver
+ craftdiff = 2
// ------ BRONZE ------
diff --git a/html/changelog.html b/html/changelog.html
index 7dcd5c550..f2fdb6be5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -52,6 +52,17 @@
-->
+
22 June 2025
+
Furrycactus updated:
+
+ - Adds a bunch of silver armour and weapons, and gives them to the Church militant roles.
+ - Adds several new weapons from Cudao, two new Mercenary subclasses, and one Bandit subclass.
+
+
Hocka updated:
+
+ - Refactored the quiver code.
+
+
07 June 2025
jb updated:
@@ -135,92 +146,6 @@ kyres1 updated:
- Added a tutorial area accessible from the roundstart spawn where people can learn the game safely.
- Tidies up a lot of turf smoothing problems.
-
-
14 April 2025
-
Furrycactus updated:
-
- - Gives Ranger-Knight its missing satchel.
- - Fixes the duplicate recurve bow selection.
-
-
Peppermint updated:
-
- - Adds some gloves to the loadout.
- - Fixes loadout yet agaiin
-
-
kyres1 updated:
-
- - Adjusts armor values to be roughly the original stats with an extra hit or two worth of integrity.
- - Gives greater orcs like marauders and ravagers better armor piercing.
- - Gives fiends armor piercing capability.
- - Allows very few ranged mobs to target players from beyond the line of sight.
- - Gives dragons one hundred percent armor piercing.
- - Gives a bunch of different mobs the ability to smash environmental objects and circumvent chokepoints.
- - Adds resistance against bleeding to most mobs. This will prevent unintended behavior with cutting weapons bleeding boss mobs to death in seconds.
-
-
-
13 April 2025
-
jb updated:
-
- - Refactor the time system to be agnostic of the world.time, it now uses a subsystem that incrments game times ticks ever time it is called.
- - Fix Day/Night cycle.
- - Upgrade to 516.
-
-
-
12 April 2025
-
Furrycactus updated:
-
- - Some quick last minute fixes for the Witch job. Re-adds cleric abilities to all the subclasses, and fixes the Heretic subclass patron issue.
- - Adds randomised templates for the Fort Hellwatch dungeon.
- - Made numerous adjustments to the divine Miracles allocated to the various Church and Adventurer roles.
- - Reduced the availability of greatweapons in job loadouts significantly.
-
-
Peppermint updated:
-
- - Loadout Buffs
- - Deletes all the sex noises.
- - Restricts tiefling to certain roles.
-
-
kyres1 updated:
-
- - Resprites some wall candle sprites.
- - Resprites the Roguetown machines with placeholders to be less grimdark.
- - Removes chesty overlays from most female sprites. Sheesh.
- - Makes sunlight way brighter.
- - Adds forty-eight new underground template spawners.
- - Adds randomized mob spawners for mapping.
- - Adds an outrageous amount of underground templates.
- - Adds skeleton and spider traps.
- - Adds lava traps.
- - Resprites remains and adds new sprites for subtle traps.
- - Adds banditlate spawns to the bandit ship. Duh.
- - Fixes missing random vampire latejoin portals creating runtimes.
- - Fixes some area runtimes in the CentComm zlevel.
- - Removes lava from a couple snow templates to fix runtimes.
- - Corrects missing paths for the troll dens and lava pits underground. This caused templates to not spawn correctly.
- - Fixes some of the cave templates being completely blocked in by rocks. Oops.
- - Adds a new title screen.
- - Disables testing mode again.
- - Adds a bunch of new templates for forests, beaches and highlands areas.
- - Fixes Tieflings not being selectable whatsoever in the character menu, somehow.
-
-
kyres1, The Lancer updated:
-
- - Adds new sprites for the gate in the throneroom.
- - Remaps the throne room slightly to fit new colors.
- - Adds a new description for the lesser demon race.
- - Adds new machines.
-
-
-
10 April 2025
-
AuthorNameHere updated:
-
- - This change is to test the automated github action for generating the changelog when master is merged into release.
- - Sync changelog prefixes.
-
-
jb updated:
-
- - Fix changelog gen and slightly clean up old files.
-