diff --git a/_maps/map_files/domotan/domotan_west.dmm b/_maps/map_files/domotan/domotan_west.dmm
index 54d5707f8..017935631 100644
--- a/_maps/map_files/domotan/domotan_west.dmm
+++ b/_maps/map_files/domotan/domotan_west.dmm
@@ -324,7 +324,7 @@
/obj/item/reagent_containers/glass/cup/golden/poison,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/rogue/carpet/lord/right,
-/area/rogue/outdoors/oldfort)
+/area/rogue/under/cave/oldfort)
"cx" = (
/obj/machinery/light/rogue/firebowl/stump,
/turf/open/floor/rogue/grassyel,
@@ -572,7 +572,7 @@
/obj/item/reagent_containers/glass/cup/golden/poison,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/rogue/carpet/lord/left,
-/area/rogue/outdoors/oldfort)
+/area/rogue/under/cave/oldfort)
"eE" = (
/obj/structure/spider/stickyweb,
/obj/effect/decal/cleanable/dirt/dust,
@@ -597,8 +597,7 @@
/turf/open/lava/acid,
/area/rogue/under/cave/lostkeep)
"eL" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/rogue/carpet/lord/center,
+/turf/open/floor/rogue/cobble,
/area/rogue/outdoors/oldfort)
"eN" = (
/obj/structure/fluff/walldeco/bigpainting/lake{
@@ -657,7 +656,7 @@
"eY" = (
/obj/item/reagent_containers/food/snacks/rogue/meat/salami,
/turf/open/floor/rogue/blocks,
-/area/rogue/under/cave/oldfort)
+/area/rogue/outdoors/oldfort)
"eZ" = (
/obj/item/natural/fibers,
/turf/open/floor/rogue/naturalstone,
@@ -708,7 +707,7 @@
/obj/item/roguegem/random,
/obj/item/roguecoin/gold/pile,
/turf/open/floor/rogue/wood,
-/area/rogue/outdoors/oldfort)
+/area/rogue/under/cave/oldfort)
"fG" = (
/obj/structure/bars,
/turf/open/floor/rogue/cobble/mossy,
@@ -1566,7 +1565,7 @@
},
/obj/item/roguecoin/gold/pile,
/turf/open/floor/rogue/wood,
-/area/rogue/outdoors/oldfort)
+/area/rogue/under/cave/oldfort)
"lk" = (
/obj/effect/decal/mossy{
dir = 8
@@ -2688,9 +2687,16 @@
"tb" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/roguegem/random,
-/mob/living/simple_animal/hostile/retaliate/rogue/minotaur/axe,
+/mob/living/simple_animal/hostile/retaliate/rogue/minotaur/axe{
+ name = "Einar the Unbroken";
+ maxHealth = 1200;
+ health = 3000;
+ melee_damage_upper = 125;
+ melee_damage_lower = 85;
+ faction = list("undead")
+ },
/turf/open/floor/rogue/carpet/lord/left,
-/area/rogue/outdoors/oldfort)
+/area/rogue/under/cave/oldfort)
"tc" = (
/turf/open/floor/rogue/cobble/mossy,
/area/rogue/outdoors/oldfort)
@@ -2946,7 +2952,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/roguegem/random,
/turf/open/floor/rogue/carpet/lord/right,
-/area/rogue/outdoors/oldfort)
+/area/rogue/under/cave/oldfort)
"uY" = (
/obj/machinery/light/rogue/lanternpost{
dir = 8
@@ -3229,9 +3235,10 @@
/turf/open/floor/rogue/ruinedwood,
/area/rogue/indoors/shelter/woods)
"wZ" = (
+/obj/effect/decal/cleanable/blood/old,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/roguegem/random,
-/turf/open/floor/rogue/wood,
+/obj/structure/trap/skeleton,
+/turf/open/floor/rogue/blocks,
/area/rogue/outdoors/oldfort)
"xa" = (
/obj/structure/fluff/railing/rampart{
@@ -4253,7 +4260,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/trap/skeleton,
/turf/open/floor/rogue/blocks,
-/area/rogue/under/cave/oldfort)
+/area/rogue/outdoors/oldfort)
"DB" = (
/turf/closed/wall/mineral/rogue/stone,
/area/rogue/under/cave/oldtown)
@@ -4270,7 +4277,7 @@
dir = 4;
icon_state = "roofg"
},
-/area/rogue/under/cave/oldfort)
+/area/rogue/outdoors/oldfort)
"DK" = (
/obj/structure/fluff/railing/border{
dir = 4
@@ -4344,7 +4351,7 @@
desc = "An old throne bearing the banner of the Shirleighs, though this one seems frightfully in disrepair. Its age is without obvious number."
},
/turf/open/floor/rogue/carpet/lord/center,
-/area/rogue/outdoors/oldfort)
+/area/rogue/under/cave/oldfort)
"Ei" = (
/obj/structure/flora/roguegrass/water/reeds,
/obj/structure/flora/roguegrass,
@@ -4865,8 +4872,8 @@
/turf/open/floor/rogue/cobble/mossy,
/area/rogue/indoors/shelter/woods)
"HL" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/rogue/wood,
+/obj/effect/spawner/trap,
+/turf/open/floor/rogue/blocks,
/area/rogue/outdoors/oldfort)
"HM" = (
/obj/item/needle/thorn,
@@ -4936,7 +4943,8 @@
/turf/open/floor/rogue/cobble,
/area/rogue/outdoors/woods/west)
"Il" = (
-/turf/closed/wall/mineral/rogue/decostone,
+/obj/structure/fluff/statue/gargoyle,
+/turf/open/floor/rogue/blocks,
/area/rogue/outdoors/oldfort)
"Im" = (
/turf/open/transparent/openspace,
@@ -5102,10 +5110,6 @@
},
/turf/open/floor/rogue/grassyel,
/area/rogue/outdoors/woods/berkleigh)
-"Ji" = (
-/obj/structure/fluff/railing/rampart,
-/turf/open/floor/rogue/blocks,
-/area/rogue/under/cave/oldfort)
"Jk" = (
/obj/structure/fluff/railing/border{
dir = 4
@@ -5200,7 +5204,7 @@
},
/obj/structure/fermenting_barrel/cursedwine,
/turf/open/floor/rogue/wood,
-/area/rogue/outdoors/oldfort)
+/area/rogue/under/cave/oldfort)
"Kd" = (
/obj/structure/flora/ausbushes/sparsegrass,
/obj/structure/fluff/railing/rampart{
@@ -5730,9 +5734,9 @@
/turf/open/floor/rogue/cobble/mossy,
/area/rogue/indoors/shelter/woods)
"Nk" = (
-/obj/item/roguegem/random,
-/obj/item/roguegem/random,
-/turf/open/floor/rogue/wood,
+/obj/effect/spawner/lootdrop/roguetown/dungeon/misc,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/rogue/blocks,
/area/rogue/outdoors/oldfort)
"Nn" = (
/turf/open/floor/rogue/blocks,
@@ -5856,7 +5860,7 @@
dir = 4;
icon_state = "roofg"
},
-/area/rogue/under/cave/oldfort)
+/area/rogue/outdoors/oldfort)
"Oo" = (
/obj/item/natural/stone,
/obj/structure/spider/stickyweb,
@@ -6175,7 +6179,7 @@
/turf/open/floor/rogue/rooftop{
icon_state = "roofg"
},
-/area/rogue/under/cave/oldfort)
+/area/rogue/outdoors/oldfort)
"Qn" = (
/obj/structure/gravemarker,
/turf/open/floor/rogue/sand,
@@ -6197,7 +6201,7 @@
/obj/item/roguegem/random,
/obj/item/roguecoin/gold/pile,
/turf/open/floor/rogue/wood,
-/area/rogue/outdoors/oldfort)
+/area/rogue/under/cave/oldfort)
"Qx" = (
/obj/effect/spawner/lootdrop/roguetown/dungeon/armor,
/obj/effect/decal/cleanable/dirt/dust,
@@ -6418,7 +6422,7 @@
"Sg" = (
/obj/effect/spawner/trap,
/turf/open/floor/rogue/cobble,
-/area/rogue/under/cave/oldfort)
+/area/rogue/outdoors/oldfort)
"Sh" = (
/turf/open/water/pond,
/area/rogue/outdoors/woods/west)
@@ -56046,7 +56050,7 @@ Uw
qT
IH
KA
-BW
+Il
rJ
by
by
@@ -56280,10 +56284,10 @@ by
by
Id
Id
-sI
-sI
-sI
-sI
+KA
+KA
+KA
+KA
KA
KA
KA
@@ -56537,9 +56541,9 @@ by
by
Id
Id
-sI
+KA
Kb
-Nk
+rQ
Qw
CM
CZ
@@ -56794,10 +56798,10 @@ by
by
Id
Id
-sI
+KA
fz
-HL
-HL
+LW
+LW
Wx
qq
qq
@@ -57051,10 +57055,10 @@ by
by
Id
Id
-sI
-Il
+KA
+wA
lj
-wZ
+yu
Wx
qq
qq
@@ -57308,8 +57312,8 @@ by
by
Id
Id
-sI
-sI
+KA
+KA
eB
tb
LN
@@ -57565,10 +57569,10 @@ by
by
Id
Id
-sI
-sI
+KA
+KA
Eh
-eL
+zp
aN
jh
zp
@@ -57822,8 +57826,8 @@ by
by
Id
Id
-sI
-sI
+KA
+KA
cu
uT
os
@@ -58079,7 +58083,7 @@ by
by
Id
Id
-sI
+KA
wA
je
Gy
@@ -58336,7 +58340,7 @@ by
by
Id
Id
-sI
+KA
Wj
LW
yu
@@ -58593,7 +58597,7 @@ by
by
Id
Id
-sI
+KA
YR
rQ
Cg
@@ -58850,7 +58854,7 @@ by
by
Id
Id
-sI
+KA
KA
KA
KA
@@ -58873,7 +58877,7 @@ gV
CL
kj
KA
-BW
+Il
rJ
by
by
@@ -60155,9 +60159,9 @@ hQ
qq
Hb
iU
-Hb
-Hb
-Ji
+eL
+eL
+lY
by
by
by
@@ -60413,8 +60417,8 @@ hW
Hb
KA
Sg
-qq
-Ji
+qF
+lY
lT
Lz
by
@@ -60669,10 +60673,10 @@ PH
SM
la
KA
-Hb
-hW
-Ji
-BW
+eL
+RQ
+lY
+Il
rJ
by
by
@@ -60926,9 +60930,9 @@ vF
Hb
la
KA
-Hb
-hQ
-Ji
+eL
+wZ
+lY
Gx
vf
by
@@ -61183,9 +61187,9 @@ KA
KA
KA
KA
-Hb
-JX
-Ji
+eL
+II
+lY
lT
Lz
by
@@ -61435,15 +61439,15 @@ FG
IN
Pf
TU
-qq
-XS
-qq
-qq
-qq
-hW
-qq
-Ji
-BW
+qF
+HL
+qF
+qF
+qF
+RQ
+qF
+lY
+Il
rJ
by
by
@@ -61692,14 +61696,14 @@ FG
FG
Pf
KA
-qq
-JX
+qF
+II
DA
-hW
-Sf
-hW
-qq
-Ji
+RQ
+Nk
+RQ
+qF
+lY
Gx
vf
by
@@ -61950,13 +61954,13 @@ QV
QV
KA
eY
-hW
-qq
-qq
-qq
-qq
-qq
-Ji
+RQ
+qF
+qF
+qF
+qF
+qF
+lY
by
by
by
diff --git a/_maps/map_files/domotan/old_doma.dmm b/_maps/map_files/domotan/old_doma.dmm
index 6efaded66..a64d3ca21 100644
--- a/_maps/map_files/domotan/old_doma.dmm
+++ b/_maps/map_files/domotan/old_doma.dmm
@@ -199,10 +199,21 @@
/area/rogue/indoors/shelter/town/dwarf)
"anL" = (
/obj/structure/closet/crate/roguecloset,
-/obj/item/flashlight/flare/torch/lantern,
-/obj/item/flashlight/flare/torch/lantern,
-/obj/item/flashlight/flare/torch/metal,
-/obj/item/flashlight/flare/torch/metal,
+/obj/item/clothing/head/roguetown/akanhood,
+/obj/item/clothing/head/roguetown/akanhood,
+/obj/item/clothing/head/roguetown/akanhood,
+/obj/item/clothing/head/roguetown/roguehood/iliopehood,
+/obj/item/clothing/head/roguetown/roguehood/iliopehood,
+/obj/item/clothing/head/roguetown/roguehood/iliopehood,
+/obj/item/clothing/head/roguetown/roguehood/gani,
+/obj/item/clothing/head/roguetown/roguehood/gani,
+/obj/item/clothing/head/roguetown/roguehood/gani,
+/obj/item/clothing/head/roguetown/roguehood/golerkanhhood,
+/obj/item/clothing/head/roguetown/roguehood/golerkanhhood,
+/obj/item/clothing/head/roguetown/roguehood/golerkanhhood,
+/obj/item/clothing/head/roguetown/mjallidhornhood,
+/obj/item/clothing/head/roguetown/mjallidhornhood,
+/obj/item/clothing/head/roguetown/mjallidhornhood,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"aod" = (
@@ -1541,9 +1552,8 @@
/turf/open/floor/rogue/blocks/bluestone,
/area/rogue/outdoors/exposed/town/keep)
"bWH" = (
-/obj/structure/bookcase,
-/obj/item/book/rogue/iliope,
/obj/item/book/rogue/bibble,
+/obj/structure/bookcase/random/archive,
/obj/item/book/rogue/bibble,
/turf/open/floor/carpet/red,
/area/rogue/indoors/town/church)
@@ -1977,14 +1987,11 @@
/turf/open/floor/rogue/blocks/stonered,
/area/rogue/indoors/town/garrison)
"cpA" = (
-/obj/structure/mirror,
-/obj/effect/decal/cobbleedge{
- dir = 1
- },
/obj/item/reagent_containers/glass/bucket/wooden{
pixel_x = -6;
pixel_y = 15
},
+/obj/item/bath/soap,
/obj/item/natural/cloth,
/turf/open/floor/rogue/tile/bath,
/area/rogue/indoors/town/church)
@@ -2867,6 +2874,9 @@
/area/rogue/outdoors/town)
"dlm" = (
/obj/structure/bookcase/random/archive,
+/obj/item/book/rogue/hrundir_the_blue,
+/obj/item/book/rogue/bibble,
+/obj/item/book/rogue/bibble,
/turf/open/floor/carpet/red,
/area/rogue/indoors/town/church)
"dls" = (
@@ -3477,12 +3487,18 @@
/area/rogue/indoors/town/manor)
"dUS" = (
/obj/structure/closet/crate/roguecloset,
-/obj/item/rope/chain,
-/obj/item/rope/chain,
-/obj/item/rope/chain,
-/obj/item/rope,
-/obj/item/rope,
-/obj/item/rope,
+/obj/item/clothing/suit/roguetown/shirt/robe/akan,
+/obj/item/clothing/suit/roguetown/shirt/robe/akan,
+/obj/item/clothing/suit/roguetown/shirt/robe/akan,
+/obj/item/clothing/suit/roguetown/shirt/robe/visires,
+/obj/item/clothing/suit/roguetown/shirt/robe/visires,
+/obj/item/clothing/suit/roguetown/shirt/robe/visires,
+/obj/item/clothing/suit/roguetown/shirt/robe/gani,
+/obj/item/clothing/suit/roguetown/shirt/robe/gani,
+/obj/item/clothing/suit/roguetown/shirt/robe/gani,
+/obj/item/clothing/suit/roguetown/shirt/robe/mjallidhorn,
+/obj/item/clothing/suit/roguetown/shirt/robe/mjallidhorn,
+/obj/item/clothing/suit/roguetown/shirt/robe/mjallidhorn,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"dVe" = (
@@ -3666,11 +3682,12 @@
/turf/open/floor/rogue/tile/bath,
/area/rogue/indoors/town/vault)
"eiu" = (
-/obj/structure/bookcase/random/reference,
/obj/item/book/rogue/yeoldecookingmanual,
-/obj/item/book/rogue/law,
/obj/item/book/rogue/cooking,
/obj/item/book/rogue/hrundir_the_blue,
+/obj/structure/bookcase/random/archive,
+/obj/item/book/rogue/bibble,
+/obj/item/book/rogue/bibble,
/turf/open/floor/carpet/red,
/area/rogue/indoors/town/church)
"eiw" = (
@@ -5756,7 +5773,6 @@
/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{
@@ -7030,12 +7046,15 @@
/turf/open/floor/rogue/herringbone,
/area/rogue/indoors/town)
"hTO" = (
-/obj/item/flashlight/flare/torch/lantern,
-/obj/item/flashlight/flare/torch/metal,
-/obj/item/flashlight/flare/torch/metal,
/obj/structure/closet/crate/roguecloset,
/obj/item/flashlight/flare/torch/lantern,
-/obj/item/storage/backpack/rogue/satchel,
+/obj/item/flashlight/flare/torch/lantern,
+/obj/item/flashlight/flare/torch/lantern,
+/obj/item/flashlight/flare/torch/lantern,
+/obj/item/flashlight/flare/torch/lantern,
+/obj/item/flashlight/flare/torch/lantern,
+/obj/item/flashlight/flare/torch/lantern,
+/obj/item/flashlight/flare/torch/lantern,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"hTY" = (
@@ -8317,19 +8336,15 @@
/turf/open/floor/rogue/twig/platform,
/area/rogue/indoors/shelter/town)
"jlD" = (
-/obj/structure/closet/crate/chest/neu,
-/obj/item/natural/bundle/stick{
- amount = 10
- },
-/obj/item/natural/bundle/stick{
- amount = 10
- },
-/obj/item/natural/bundle/stick{
- amount = 10
- },
-/obj/item/natural/bundle/stick{
- amount = 10
- },
+/obj/item/rope,
+/obj/item/rope,
+/obj/structure/closet/crate/chest/neu_iron,
+/obj/item/rope,
+/obj/item/rope,
+/obj/item/rope/chain,
+/obj/item/rope/chain,
+/obj/item/rope/chain,
+/obj/item/rope/chain,
/turf/open/floor/rogue/churchrough,
/area/rogue/indoors/town/church)
"jlQ" = (
@@ -8344,6 +8359,12 @@
/area/rogue/outdoors/town/roofs)
"jlX" = (
/obj/structure/closet/crate/roguecloset,
+/obj/item/storage/backpack/rogue/satchel,
+/obj/item/storage/backpack/rogue/satchel,
+/obj/item/flashlight/flare/torch/lantern,
+/obj/item/flashlight/flare/torch/lantern,
+/obj/item/flashlight/flare/torch/lantern,
+/obj/item/flashlight/flare/torch/lantern,
/obj/item/storage/belt/rogue/surgery_bag/full,
/turf/open/floor/rogue/churchrough,
/area/rogue/indoors/town/church)
@@ -8496,12 +8517,22 @@
/area/rogue/outdoors/town/roofs)
"jtE" = (
/obj/structure/closet/crate/roguecloset,
-/obj/item/storage/backpack/rogue/satchel,
-/obj/item/storage/backpack/rogue/satchel,
-/obj/item/flashlight/flare/torch/lantern,
-/obj/item/flashlight/flare/torch/lantern,
-/obj/item/flashlight/flare/torch/lantern,
-/obj/item/flashlight/flare/torch/lantern,
+/obj/item/clothing/shoes/roguetown/gladiator,
+/obj/item/clothing/shoes/roguetown/gladiator,
+/obj/item/clothing/shoes/roguetown/gladiator,
+/obj/item/clothing/shoes/roguetown/gladiator,
+/obj/item/clothing/shoes/roguetown/gladiator,
+/obj/item/clothing/shoes/roguetown/gladiator,
+/obj/item/clothing/shoes/roguetown/gladiator,
+/obj/item/clothing/shoes/roguetown/gladiator,
+/obj/item/clothing/suit/roguetown/shirt/robe/akan,
+/obj/item/clothing/suit/roguetown/shirt/robe/akan,
+/obj/item/clothing/suit/roguetown/shirt/robe/visires,
+/obj/item/clothing/suit/roguetown/shirt/robe/visires,
+/obj/item/clothing/suit/roguetown/shirt/robe/gani,
+/obj/item/clothing/suit/roguetown/shirt/robe/gani,
+/obj/item/clothing/suit/roguetown/shirt/robe/mjallidhorn,
+/obj/item/clothing/suit/roguetown/shirt/robe/mjallidhorn,
/turf/open/floor/rogue/churchrough,
/area/rogue/indoors/town/church)
"jtF" = (
@@ -9123,9 +9154,9 @@
/turf/open/floor/rogue/ruinedwood,
/area/rogue/outdoors/town)
"jXP" = (
-/obj/effect/landmark/start/druid,
-/turf/open/floor/rogue/ruinedwood/turned,
-/area/rogue/indoors/shelter/woods)
+/obj/structure/mirror,
+/turf/open/floor/rogue/tile/bath,
+/area/rogue/indoors/town/church)
"jXU" = (
/obj/structure/fluff/railing/border{
dir = 4
@@ -11021,10 +11052,8 @@
/turf/open/floor/rogue/cobble,
/area/rogue/under/town/basement/keep)
"lXP" = (
-/obj/item/rope,
-/obj/item/rope,
-/obj/structure/closet/crate/chest/neu_iron,
/obj/machinery/light/rogue/torchholder/l,
+/obj/item/roguebin/water,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"lXX" = (
@@ -11167,6 +11196,25 @@
/obj/structure/closet/crate/chest/crate{
name = "produce crate"
},
+/obj/structure/roguemachine/withdraw,
+/obj/item/reagent_containers/food/snacks/fish/carp{
+ icon_state = "carpcom"
+ },
+/obj/item/reagent_containers/food/snacks/fish/carp{
+ icon_state = "carpcom"
+ },
+/obj/item/reagent_containers/food/snacks/fish/carp{
+ icon_state = "carpcom"
+ },
+/obj/item/reagent_containers/food/snacks/fish/carp{
+ icon_state = "carpcom"
+ },
+/obj/item/reagent_containers/food/snacks/fish/carp{
+ icon_state = "carpcom"
+ },
+/obj/item/reagent_containers/food/snacks/fish/carp{
+ icon_state = "carpcom"
+ },
/obj/item/reagent_containers/food/snacks/grown/onion/rogue,
/obj/item/reagent_containers/food/snacks/grown/onion/rogue,
/obj/item/reagent_containers/food/snacks/grown/onion/rogue,
@@ -11179,7 +11227,7 @@
/obj/item/reagent_containers/food/snacks/grown/cabbage/rogue,
/obj/item/reagent_containers/food/snacks/grown/cabbage/rogue,
/obj/item/reagent_containers/food/snacks/grown/cabbage/rogue,
-/obj/structure/roguemachine/withdraw,
+/obj/item/reagent_containers/food/snacks/grown/cabbage/rogue,
/turf/open/floor/rogue/cobble/mossy,
/area/rogue/indoors/town/church)
"mcK" = (
@@ -11218,6 +11266,9 @@
/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,
+/obj/structure/closet/crate/chest/neu_iron{
+ name = "All-Aspect chest"
+ },
/turf/open/floor/rogue/blocks/green,
/area/rogue/indoors/town/church)
"mff" = (
@@ -12334,9 +12385,9 @@
/turf/open/floor/rogue/ruinedwood,
/area/rogue/outdoors/exposed/town/keep)
"nfK" = (
-/obj/item/roguebin/water,
-/turf/open/floor/rogue/tile/checkeralt,
-/area/rogue/indoors/town/church)
+/obj/structure/flora/ausbushes/reedbush,
+/turf/open/floor/rogue/dirt/road,
+/area/rogue/outdoors/town)
"nfV" = (
/obj/structure/stairs{
dir = 1
@@ -12521,6 +12572,7 @@
"npP" = (
/obj/structure/bed/rogue/inn/wool,
/obj/item/bedsheet/brown,
+/obj/effect/landmark/start/druid,
/turf/open/floor/rogue/ruinedwood/turned,
/area/rogue/indoors/shelter/woods)
"npT" = (
@@ -13093,8 +13145,8 @@
/area/rogue/indoors/town/church/chapel)
"nTa" = (
/obj/structure/bed/rogue,
-/obj/effect/landmark/start/puritan,
/obj/item/bedsheet/rogue/cloth,
+/obj/effect/landmark/start/templar,
/turf/open/floor/carpet/royalblack,
/area/rogue/indoors/town/church)
"nTr" = (
@@ -13311,10 +13363,10 @@
/area/rogue/indoors/town/garrison)
"oeo" = (
/obj/structure/bed/rogue,
-/obj/effect/landmark/start/templar{
+/obj/item/bedsheet/rogue/cloth,
+/obj/effect/landmark/start/puritan{
dir = 1
},
-/obj/item/bedsheet/rogue/cloth,
/turf/open/floor/carpet/royalblack,
/area/rogue/indoors/town/church)
"oes" = (
@@ -13778,8 +13830,7 @@
"oCg" = (
/obj/structure/mineral_door/wood{
dir = 4;
- lockid = "tavern";
- locked = 1
+ lockid = "tavern"
},
/turf/open/floor/rogue/herringbone,
/area/rogue/indoors/town/tavern)
@@ -14047,10 +14098,6 @@
/obj/item/kitchen/rollingpin,
/obj/item/rogueweapon/huntingknife/chefknife,
/obj/item/flint,
-/obj/item/cooking/platter,
-/obj/item/cooking/platter,
-/obj/item/cooking/platter,
-/obj/item/cooking/platter,
/obj/item/soap,
/obj/item/natural/cloth,
/obj/item/natural/cloth,
@@ -14175,7 +14222,6 @@
/turf/open/floor/carpet/red,
/area/rogue/indoors/town/tavern)
"oZR" = (
-/obj/machinery/light/rogue/torchholder/l,
/turf/open/water/bath{
desc = "clear, lightly foamy water, perfect for dipping into after a long day."
},
@@ -14446,18 +14492,22 @@
/obj/structure/closet/crate/chest/crate{
name = "grain crate"
},
-/obj/item/reagent_containers/food/snacks/grown/oat,
-/obj/item/reagent_containers/food/snacks/grown/oat,
-/obj/item/reagent_containers/food/snacks/grown/oat,
-/obj/item/reagent_containers/food/snacks/grown/oat,
-/obj/item/reagent_containers/food/snacks/grown/oat,
-/obj/item/reagent_containers/food/snacks/grown/oat,
/obj/item/reagent_containers/food/snacks/grown/wheat,
/obj/item/reagent_containers/food/snacks/grown/wheat,
/obj/item/reagent_containers/food/snacks/grown/wheat,
/obj/item/reagent_containers/food/snacks/grown/wheat,
/obj/item/reagent_containers/food/snacks/grown/wheat,
/obj/item/reagent_containers/food/snacks/grown/wheat,
+/obj/item/reagent_containers/food/snacks/grown/wheat,
+/obj/item/reagent_containers/food/snacks/grown/wheat,
+/obj/item/reagent_containers/food/snacks/grown/oat,
+/obj/item/reagent_containers/food/snacks/grown/oat,
+/obj/item/reagent_containers/food/snacks/grown/oat,
+/obj/item/reagent_containers/food/snacks/grown/oat,
+/obj/item/reagent_containers/food/snacks/grown/oat,
+/obj/item/reagent_containers/food/snacks/grown/oat,
+/obj/item/reagent_containers/food/snacks/grown/oat,
+/obj/item/reagent_containers/food/snacks/grown/oat,
/turf/open/floor/rogue/cobble/mossy,
/area/rogue/indoors/town/church)
"prc" = (
@@ -14641,7 +14691,11 @@
},
/area/rogue/outdoors/town/roofs)
"pyy" = (
-/obj/effect/landmark/start/priest,
+/obj/structure/bed/rogue,
+/obj/item/bedsheet/rogue/cloth,
+/obj/effect/landmark/start/orthodoxist{
+ dir = 1
+ },
/turf/open/floor/carpet/royalblack,
/area/rogue/indoors/town/church)
"pzg" = (
@@ -15255,10 +15309,12 @@
/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,
+/obj/item/quiver/silver_arrows,
+/obj/item/quiver/silver_arrows,
+/obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve,
+/obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve,
/turf/open/floor/rogue/tile/checkeralt,
/area/rogue/indoors/town/church)
"qbk" = (
@@ -17805,6 +17861,13 @@
},
/turf/open/floor/rogue/concrete,
/area/rogue/indoors/town/cell)
+"sYV" = (
+/obj/effect/decal/cobbleedge{
+ dir = 1
+ },
+/obj/machinery/light/rogue/torchholder/r,
+/turf/open/floor/rogue/tile/bath,
+/area/rogue/indoors/town/church)
"sZh" = (
/obj/structure/chair/wood/rogue/fancy{
dir = 1
@@ -19466,14 +19529,9 @@
/turf/open/floor/rogue/ruinedwood,
/area/rogue/indoors/town/magician)
"uSB" = (
-/obj/structure/closet/crate/roguecloset,
-/obj/item/clothing/suit/roguetown/shirt/tunic/white,
-/obj/item/clothing/suit/roguetown/shirt/tunic/white,
/obj/effect/decal/cobbleedge{
dir = 1
},
-/obj/item/natural/cloth,
-/obj/item/natural/cloth,
/turf/open/floor/rogue/tile/bath,
/area/rogue/indoors/town/church)
"uSH" = (
@@ -21288,8 +21346,17 @@
/turf/open/floor/rogue/blocks,
/area/rogue/under/town/basement/keep)
"wOh" = (
-/obj/item/needle/thorn,
/obj/structure/closet/crate/chest/neu,
+/obj/item/reagent_containers/food/snacks/rogue/crackerscooked,
+/obj/item/reagent_containers/food/snacks/rogue/crackerscooked,
+/obj/item/reagent_containers/food/snacks/rogue/crackerscooked,
+/obj/item/reagent_containers/food/snacks/rogue/crackerscooked,
+/obj/item/reagent_containers/food/snacks/rogue/crackerscooked,
+/obj/item/reagent_containers/food/snacks/rogue/crackerscooked,
+/obj/item/reagent_containers/food/snacks/rogue/crackerscooked,
+/obj/item/reagent_containers/food/snacks/rogue/crackerscooked,
+/obj/item/reagent_containers/food/snacks/rogue/crackerscooked,
+/obj/item/reagent_containers/food/snacks/rogue/crackerscooked,
/turf/open/floor/rogue/cobble,
/area/rogue/indoors/town/garrison)
"wOw" = (
@@ -21562,10 +21629,24 @@
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/town)
"wZh" = (
-/obj/structure/bed/rogue,
-/obj/effect/landmark/start/orthodoxist,
-/obj/item/bedsheet/rogue/cloth,
-/turf/open/floor/carpet/royalblack,
+/obj/structure/closet/crate/roguecloset,
+/obj/item/clothing/shoes/roguetown/gladiator,
+/obj/item/clothing/shoes/roguetown/gladiator,
+/obj/item/clothing/shoes/roguetown/gladiator,
+/obj/item/clothing/shoes/roguetown/gladiator,
+/obj/item/clothing/shoes/roguetown/gladiator,
+/obj/item/clothing/shoes/roguetown/gladiator,
+/obj/item/clothing/suit/roguetown/shirt/tunic/random,
+/obj/item/clothing/suit/roguetown/shirt/tunic/random,
+/obj/item/clothing/suit/roguetown/shirt/tunic/random,
+/obj/item/clothing/suit/roguetown/shirt/tunic/random,
+/obj/item/clothing/suit/roguetown/shirt/tunic/random,
+/obj/item/clothing/suit/roguetown/shirt/tunic/random,
+/obj/item/natural/cloth,
+/obj/item/natural/cloth,
+/obj/item/natural/cloth,
+/obj/item/natural/cloth,
+/turf/open/floor/rogue/tile/bath,
/area/rogue/indoors/town/church)
"wZI" = (
/obj/structure/mineral_door/wood{
@@ -21918,6 +21999,7 @@
"xtF" = (
/obj/structure/bed/rogue,
/obj/item/bedsheet/rogue/wool,
+/obj/effect/landmark/start/priest,
/turf/open/floor/carpet/royalblack,
/area/rogue/indoors/town/church)
"xvb" = (
@@ -22490,10 +22572,6 @@
"yeM" = (
/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,
@@ -23686,7 +23764,7 @@ nCB
nCB
oLM
cSP
-jXP
+rNL
apH
hwG
utA
@@ -23820,7 +23898,7 @@ oLM
cjY
rNL
rNL
-jXP
+rNL
aod
oLM
xHI
@@ -24083,7 +24161,7 @@ nCB
oLM
lov
rNL
-jXP
+rNL
rNL
aPP
oLM
@@ -27327,7 +27405,7 @@ kqx
uGC
iIg
hye
-pyy
+ofW
ofW
hye
gBn
@@ -27601,7 +27679,7 @@ hye
ikc
jfL
jfL
-nfK
+jfL
hye
paV
paV
@@ -28123,8 +28201,8 @@ hye
uGT
hye
dpE
-bGP
pKl
+jfL
hye
xtl
nHZ
@@ -28256,7 +28334,7 @@ jfL
hye
hye
hye
-hye
+bGP
hye
xtl
nHZ
@@ -28778,7 +28856,7 @@ nCB
kqx
kqx
uGC
-uGC
+hye
hye
eBb
hye
@@ -28910,9 +28988,9 @@ nCB
kqx
uGC
uGC
-lAA
hye
cpA
+uSB
oZR
hye
wHl
@@ -28922,7 +29000,7 @@ hye
nTa
nHZ
nHZ
-oeo
+pyy
hye
gOj
jpE
@@ -29042,8 +29120,8 @@ nCB
fLK
kqx
uGC
-uGC
hye
+jXP
uSB
iHM
hye
@@ -29051,7 +29129,7 @@ qaN
jfL
jfL
hye
-wZh
+nTa
nHZ
nHZ
oeo
@@ -29174,19 +29252,19 @@ nCB
fLK
kqx
uGC
-uGC
-hye
-hye
hye
+wZh
+sYV
+iHM
hye
gtQ
jfL
pYt
hye
-wZh
+nTa
stD
nHZ
-oeo
+pyy
hye
hye
hye
@@ -29306,10 +29384,10 @@ nCB
nCB
fLK
kqx
-uGC
-uGC
-kWd
-kWd
+hye
+hye
+hye
+hye
hye
yeM
bFa
@@ -29582,8 +29660,8 @@ nIj
kqx
kqx
kqx
-jzP
-nIj
+kqx
+nfK
nIj
hUG
nIj
@@ -29682,7 +29760,7 @@ xhW
xhW
xhW
xhW
-rpm
+xhW
aEd
piT
fuA
@@ -38836,7 +38914,7 @@ tOh
tOh
mwk
eti
-jgF
+vgD
vgD
ezB
cCg
@@ -39339,7 +39417,7 @@ eDk
lOm
aJX
aJX
-aJX
+mTr
mTr
hye
hye
@@ -39471,7 +39549,7 @@ aJX
aJX
aJX
aJX
-aJX
+mTr
mTr
hye
tJg
@@ -39603,7 +39681,7 @@ aJX
aJX
aJX
aJX
-aJX
+mTr
mTr
hye
bgp
@@ -39735,7 +39813,7 @@ aJX
aJX
aJX
aJX
-aJX
+mTr
mTr
hye
fWX
@@ -39867,8 +39945,8 @@ aJX
aJX
aJX
aJX
-aJX
-aJX
+mTr
+mTr
hye
hye
hye
diff --git a/code/datums/stress/positive_events.dm b/code/datums/stress/positive_events.dm
index 826621fd6..26a77dc07 100644
--- a/code/datums/stress/positive_events.dm
+++ b/code/datums/stress/positive_events.dm
@@ -43,6 +43,16 @@
stressadd = -4
desc = span_blue("I love you sweet leaf.")
+/datum/stressevent/westleachtea
+ timer = 5 MINUTES
+ stressadd = -4
+ desc = span_blue("An energising and refreshing tea.")
+
+/datum/stressevent/swampweedtea
+ timer = 5 MINUTES
+ stressadd = -4
+ desc = span_blue("A calming and relaxing tea.")
+
/datum/stressevent/high
timer = 5 MINUTES
stressadd = -4
diff --git a/code/modules/farming/crafting_recipes.dm b/code/modules/farming/crafting_recipes.dm
index 3483a2f6b..e55c5d7d4 100644
--- a/code/modules/farming/crafting_recipes.dm
+++ b/code/modules/farming/crafting_recipes.dm
@@ -36,6 +36,17 @@
skillcraft = /datum/skill/craft/carpentry
time = 4 SECONDS
+/datum/crafting_recipe/roguetown/dryflower
+ name = "dry fyritius"
+ result = /obj/item/reagent_containers/food/snacks/grown/rogue/fyritiusdry
+ reqs = list(/obj/item/reagent_containers/food/snacks/grown/rogue/fyritius = 1)
+ structurecraft = /obj/structure/fluff/dryingrack
+ time = 2 SECONDS
+ verbage_simple = "dry"
+ verbage = "dries"
+ craftsound = null
+ skillcraft = null
+
/datum/crafting_recipe/roguetown/dryleaf
name = "dry swampweed"
result = /obj/item/reagent_containers/food/snacks/grown/rogue/sweetleafdry
diff --git a/code/modules/farming/produce.dm b/code/modules/farming/produce.dm
index 56f4d905d..ba3d06e4e 100644
--- a/code/modules/farming/produce.dm
+++ b/code/modules/farming/produce.dm
@@ -230,7 +230,7 @@
/obj/item/reagent_containers/food/snacks/grown/rogue/pipeweeddry
seed = null
- name = "westleach leaf"
+ name = "dried westleach"
desc = "A dried leaf."
icon_state = "westleachd"
dry = TRUE
@@ -241,7 +241,7 @@
/obj/item/reagent_containers/food/snacks/grown/rogue/sweetleafdry
seed = null
- name = "swampweed"
+ name = "dried swampweed"
desc = "It's dried."
icon_state = "swampweedd"
dry = TRUE
@@ -250,6 +250,17 @@
grind_results = list(/datum/reagent/drug/space_drugs = 5)
eat_effect = /datum/status_effect/debuff/badmeal
+/obj/item/reagent_containers/food/snacks/grown/rogue/fyritiusdry
+ seed = null
+ name = "dried fyritius"
+ desc = "A dried flower. The drying process has only turned the flower's warmth into an almost stinging heat."
+ icon_state = "fyritiusd"
+ dry = TRUE
+ pipe_reagents = list(/datum/reagent/toxin/fyritiusnectar = 30)
+ list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin/fyritiusnectar = 5)
+ grind_results = list(/datum/reagent/toxin/fyritiusnectar = 5)
+ eat_effect = /datum/status_effect/debuff/badmeal
+
/obj/item/reagent_containers/food/snacks/grown/onion/rogue
name = "onion"
desc = ""
diff --git a/code/modules/power/roguelighting.dm b/code/modules/power/roguelighting.dm
index 314cd1105..59942c5cd 100644
--- a/code/modules/power/roguelighting.dm
+++ b/code/modules/power/roguelighting.dm
@@ -836,6 +836,37 @@
pot.reagents.remove_reagent(/datum/reagent/water, 1)
return
+ if(W.type in subtypesof(/obj/item/reagent_containers/food/snacks/rogue/herb))
+ if(!pot.reagents.has_reagent(/datum/reagent/water, 33))
+ to_chat(user, "Not enough water.")
+ return TRUE
+ if(pot.reagents.chem_temp < 374)
+ to_chat(user, "[pot] isn't boiling!")
+ return
+ if(do_after(user,2 SECONDS, target = src))
+ user.visible_message("[user] places [W] into the pot.")
+ playsound(src.loc, 'sound/items/Fish_out.ogg', 20, TRUE)
+ pot.reagents.remove_reagent(/datum/reagent/water, 32)
+ if(istype(W, /obj/item/reagent_containers/food/snacks/rogue/herb/pipeweeddry_sliced))
+ qdel(W)
+ sleep(800)
+ playsound(src, "bubbles", 30, TRUE)
+ pot.reagents.add_reagent(/datum/reagent/consumable/soup/tea/westleach, 32)
+ pot.reagents.remove_reagent(/datum/reagent/water, 1)
+ if(istype(W, /obj/item/reagent_containers/food/snacks/rogue/herb/sweetleafdry_sliced))
+ qdel(W)
+ sleep(900)
+ playsound(src, "bubbles", 30, TRUE)
+ pot.reagents.add_reagent(/datum/reagent/consumable/soup/tea/swampweed, 32)
+ pot.reagents.remove_reagent(/datum/reagent/water, 1)
+ if(istype(W, /obj/item/reagent_containers/food/snacks/rogue/herb/fyritiusdry_sliced))
+ qdel(W)
+ sleep(1000)
+ playsound(src, "bubbles", 30, TRUE)
+ pot.reagents.add_reagent(/datum/reagent/consumable/soup/tea/fyritius, 32)
+ pot.reagents.remove_reagent(/datum/reagent/water, 1)
+ return
+
diff --git a/code/modules/roguetown/roguejobs/alchemist/reagents.dm b/code/modules/roguetown/roguejobs/alchemist/reagents.dm
index b92638899..81ba4208e 100644
--- a/code/modules/roguetown/roguejobs/alchemist/reagents.dm
+++ b/code/modules/roguetown/roguejobs/alchemist/reagents.dm
@@ -112,7 +112,7 @@
alpha = 173
/datum/reagent/medicine/manapot/on_mob_life(mob/living/carbon/M)
- M.rogstam_add(10)
+ M.rogstam_add(25)
..()
. = 1
diff --git a/html/changelog.html b/html/changelog.html
index f2fdb6be5..14f11eb91 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -52,6 +52,17 @@
-->
+
26 June 2025
+
Furrycactus updated:
+
+ - Makes some QoL map fixes around Old Doma.
+ - Adds three new herbal teas - Swampweed, Westleach, and Fyritius. Swampweed makes you high, Westleach restores a little bit of fatigue, Fyritius is a powerful health potion that will kill you quickly if you drink more than a tiny bit.
+
+
Hocka updated:
+
+ - Archer's Apprentice and Warden's Apprentice now get their appropriate skill modifiers.
+
+
22 June 2025
Furrycactus updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c27181ef5..36381675d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -178,3 +178,12 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY encore_genchangelog.p
one Bandit subclass.
Hocka:
- refactor: Refactored the quiver code.
+2025-06-26:
+ Furrycactus:
+ - rscadd: Makes some QoL map fixes around Old Doma.
+ - rscadd: Adds three new herbal teas - Swampweed, Westleach, and Fyritius. Swampweed
+ makes you high, Westleach restores a little bit of fatigue, Fyritius is a powerful
+ health potion that will kill you quickly if you drink more than a tiny bit.
+ Hocka:
+ - bugfix: Archer's Apprentice and Warden's Apprentice now get their appropriate
+ skill modifiers.
diff --git a/icons/roguetown/items/produce.dmi b/icons/roguetown/items/produce.dmi
index b3e4ef1c4..fe34ddbcc 100644
Binary files a/icons/roguetown/items/produce.dmi and b/icons/roguetown/items/produce.dmi differ
diff --git a/modular/Neu_Food/code/NeuFood.dm b/modular/Neu_Food/code/NeuFood.dm
index 02f7b052a..c04ea31e2 100644
--- a/modular/Neu_Food/code/NeuFood.dm
+++ b/modular/Neu_Food/code/NeuFood.dm
@@ -314,6 +314,152 @@
color = "#9e559c"
taste_description = "something rancid"
+/* ........ Teas ................ */// These are made in the pot in the exact same way you make soups and stews, but they have different effects depending on the type of tea and are more mechanically involved than just food. Better than smoking, worse than alchemy.
+
+/datum/reagent/consumable/soup/tea
+ name = "tea"
+ metabolization_rate = 0.1
+ taste_description = "bitterness"
+ var/trippy = FALSE //Does this tea make you trip?
+
+/datum/reagent/consumable/soup/tea/on_mob_end_metabolize(mob/living/M)
+ if(trippy)
+ SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "[type]_high")
+
+/datum/reagent/consumable/soup/tea/westleach
+ name = "westleach tea"
+ description = "An energising brew. Popular with sleep deprived soldiers, or peasants rising before dawn."
+ color = "#aa2c1665"
+ reagent_state = LIQUID
+ nutriment_factor = 1
+ taste_mult = 4
+ hydration = 10
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ taste_description = "tart aromatic tea"
+
+/datum/reagent/consumable/soup/tea/westleach/on_mob_metabolize(mob/living/M)
+ M.add_stress(/datum/stressevent/westleachtea)
+ ..()
+
+/datum/reagent/consumable/soup/tea/westleach/on_mob_life(mob/living/carbon/M)
+ if(prob(1))
+ var/tea_message = pick("You feel alert.", "You feel energised.", "You feel refreshed.")
+ to_chat(M, span_notice("[tea_message]"))
+
+/datum/reagent/consumable/soup/tea/westleach/on_mob_life(mob/living/carbon/M)
+ M.rogstam_add(10)
+ ..()
+ . = 1
+
+/datum/reagent/consumable/soup/tea/swampweed
+ name = "swampweed tea"
+ description = "A relaxing and calming brew. A common herbal remedy and sleep aid, for peasantry and nobility alike."
+ color = "#47210a81"
+ trippy = TRUE
+ overdose_threshold = 50
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ taste_description = "bitter earthy tea"
+
+/datum/reagent/consumable/soup/tea/swampweed/on_mob_life(mob/living/carbon/M)
+ M.set_drugginess(30)
+ if(prob(1))
+ var/tea_message = pick("You feel relaxed.", "You feel calm.", "You feel like your anxieties are less of a burden.")
+ to_chat(M, span_notice("[tea_message]"))
+ if(prob(5))
+ if(M.gender == FEMALE)
+ M.emote(pick("twitch_s","giggle"))
+ else
+ M.emote(pick("twitch_s","chuckle"))
+ M.apply_status_effect(/datum/status_effect/buff/weed)
+ ..()
+
+/datum/reagent/consumable/soup/tea/swampweed/on_mob_end_metabolize(mob/living/M)
+ M.clear_fullscreen("weedsm")
+ M.update_body_parts_head_only()
+
+/datum/reagent/consumable/soup/tea/swampweed/on_mob_metabolize(mob/living/M)
+ ..()
+ M.set_drugginess(30)
+ M.update_body_parts_head_only()
+ M.overlay_fullscreen("weedsm", /atom/movable/screen/fullscreen/weedsm)
+
+/atom/movable/screen/fullscreen/weedsm
+ icon_state = "smok"
+ plane = BLACKNESS_PLANE
+ layer = AREA_LAYER
+ blend_mode = 0
+ alpha = 100
+ show_when_dead = FALSE
+
+/atom/movable/screen/fullscreen/weedsm/Initialize()
+ . = ..()
+ filters += filter(type="angular_blur",x=5,y=5,size=1)
+
+/datum/reagent/consumable/soup/tea/swampweed/overdose_start(mob/living/M)
+ to_chat(M, span_danger("I start tripping hard!"))
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/overdose, name)
+
+/datum/reagent/drug/space_drugs/overdose_process(mob/living/M)
+ M.adjustToxLoss(0.1*REM, 0)
+ M.adjustOxyLoss(1.1*REM, 0)
+ ..()
+
+/datum/reagent/consumable/soup/tea/fyritius // Inteded to be a more available healing potion alternative to characters that live out in the wild but don't have alchemy skill. Potent and strong healing, but will probably kill you dead if you're not careful with it. Risk and reward.
+ name = "fyritius tea"
+ description = "An ever-simmering, dangerous brew. Old wives tales and outdated apothecary journals speak of this tea as having potent medicinal properties, but twice as terrible consequences if not portioned carefully."
+ color = "#ff99007e"
+ reagent_state = LIQUID
+ nutriment_factor = 1
+ taste_mult = 4
+ hydration = 10
+ metabolization_rate = 1.5 * REAGENTS_METABOLISM
+ overdose_threshold = 15
+ taste_description = "burning floral tea"
+
+/datum/reagent/consumable/soup/tea/fyritius/on_mob_life(mob/living/carbon/M)
+ if(prob(1))
+ var/tea_message = pick("You feel warmth blossom outwards from your chest. It's just slightly too hot to be comfortable.", "You feel your blood almost simmering with heat, bringing relief and faint stinging pain in equal measure.")
+ to_chat(M, span_notice("[tea_message]"))
+
+/datum/reagent/consumable/soup/tea/fyritius/on_mob_life(mob/living/carbon/M)
+ if(volume >= 60)
+ M.reagents.remove_reagent(/datum/reagent/consumable/soup/tea/fyritius, 2) //No overhealing.
+ var/list/wCount = M.get_wounds()
+ if(M.blood_volume < BLOOD_VOLUME_NORMAL)
+ M.blood_volume = min(M.blood_volume+50, BLOOD_VOLUME_MAXIMUM)
+ else
+ M.blood_volume = min(M.blood_volume+10, BLOOD_VOLUME_MAXIMUM)
+ if(wCount.len > 0)
+ M.heal_wounds(3)
+ M.update_damage_overlays()
+ M.adjustBruteLoss(-2*REM, 0)
+ M.adjustFireLoss(-2*REM, 0)
+ M.adjustOxyLoss(-2, 0)
+ M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -2*REM)
+ M.adjustCloneLoss(-2*REM, 0)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(!istype(H.dna.species, /datum/species/werewolf))
+ M.adjust_nutrition(-0.5*REM)
+ ..()
+ . = 1
+
+/datum/reagent/consumable/soup/tea/fyritius/overdose_start(mob/living/M)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(!istype(H.dna.species, /datum/species/werewolf))
+ H.playsound_local(H, 'sound/misc/heroin_rush.ogg', 100, FALSE)
+ H.visible_message(span_warning("A terrible fever-flush seizes [H], and burning blisters begin to spread!"))
+ . = 1
+
+/datum/reagent/consumable/soup/tea/fyritius/overdose_process(mob/living/M)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(!istype(H.dna.species, /datum/species/werewolf))
+ M.adjustFireLoss(6, 0)
+ M.adjustToxLoss(2, 0)
+ ..()
+ . = 1
/* * * * * * * * * * * * * * * *
* *
diff --git a/modular/Neu_Food/code/raw/NeuFood_herbs.dm b/modular/Neu_Food/code/raw/NeuFood_herbs.dm
new file mode 100644
index 000000000..a9dfd7d10
--- /dev/null
+++ b/modular/Neu_Food/code/raw/NeuFood_herbs.dm
@@ -0,0 +1,43 @@
+/* * * * * * * * * * * **
+ * *
+ * NeuFood *
+ * (Herbs) *
+ * *
+ * * * * * * * * * * * **/
+
+
+/* .................. Westleach ................... */
+/obj/item/reagent_containers/food/snacks/grown/rogue/pipeweeddry
+ desc = "A dried leaf."
+ slices_num = 1
+ slice_path = /obj/item/reagent_containers/food/snacks/rogue/herb/pipeweeddry_sliced
+ tastes = list("sweet" = 1,"bitterness" = 1)
+ chopping_sound = TRUE
+
+/obj/item/reagent_containers/food/snacks/rogue/herb/pipeweeddry_sliced
+ name = "crushed westleach"
+ icon_state = "westleachd_crushed"
+
+/* .................. Swampweed ................... */
+/obj/item/reagent_containers/food/snacks/grown/rogue/sweetleafdry
+ desc = "It's dried."
+ slices_num = 1
+ slice_path = /obj/item/reagent_containers/food/snacks/rogue/herb/sweetleafdry_sliced
+ tastes = list("sweet" = 1,"bitterness" = 1)
+ chopping_sound = TRUE
+
+/obj/item/reagent_containers/food/snacks/rogue/herb/sweetleafdry_sliced
+ name = "crushed swampweed"
+ icon_state = "swampweedd_crushed"
+
+/* .................. Fyritius ................... */
+/obj/item/reagent_containers/food/snacks/grown/rogue/fyritiusdry
+ desc = "A dried flower. The drying process has only turned the flower's warmth into an almost stinging heat."
+ slices_num = 1
+ slice_path = /obj/item/reagent_containers/food/snacks/rogue/herb/fyritiusdry_sliced
+ tastes = list("tastes like a burning coal and fire" = 1)
+ chopping_sound = TRUE
+
+/obj/item/reagent_containers/food/snacks/rogue/herb/fyritiusdry_sliced
+ name = "crushed fyritius"
+ icon_state = "fyritiusd_crushed"
diff --git a/modular/Neu_Food/icons/food.dmi b/modular/Neu_Food/icons/food.dmi
index 035ba259c..5fc694854 100644
Binary files a/modular/Neu_Food/icons/food.dmi and b/modular/Neu_Food/icons/food.dmi differ
diff --git a/modular_azurepeak/virtues/combat.dm b/modular_azurepeak/virtues/combat.dm
index fdb7844a5..ece349c20 100644
--- a/modular_azurepeak/virtues/combat.dm
+++ b/modular_azurepeak/virtues/combat.dm
@@ -130,7 +130,7 @@
custom_text = "Increases axe skill by 1, minimum apprentice. Increases tracking by 1, minimum apprentice. Capped at journeyman."
added_stashed_items = list("Iron Axe" = /datum/supply_pack/rogue/weapons/axe,
)
-/datum/virtue/combat/archer/apply_to_human(mob/living/carbon/human/recipient)
+/datum/virtue/combat/axeman/apply_to_human(mob/living/carbon/human/recipient)
if(recipient.mind?.get_skill_level(/datum/skill/combat/axes) < SKILL_LEVEL_APPRENTICE)
recipient.mind?.adjust_skillrank_up_to(/datum/skill/combat/axes, SKILL_LEVEL_APPRENTICE, silent = TRUE)
else
diff --git a/roguetown.dme b/roguetown.dme
index 0ff657c6a..928a1de23 100644
--- a/roguetown.dme
+++ b/roguetown.dme
@@ -3553,6 +3553,7 @@
#include "modular\Neu_Food\code\raw\NeuFood_meat.dm"
#include "modular\Neu_Food\code\raw\NeuFood_processed.dm"
#include "modular\Neu_Food\code\raw\NeuFood_veggies.dm"
+#include "modular\Neu_Food\code\raw\NeuFood_herbs.dm"
#include "modular\ze_genesis_call\genesis_call.dm"
#include "modular_azurepeak\_statpacks.dm"
#include "modular_azurepeak\_virtue.dm"