From 37368641a4a260fad601447ab87924d9a793bc7f Mon Sep 17 00:00:00 2001
From: NPC1314 <110836368+NPC1314@users.noreply.github.com>
Date: Thu, 19 Dec 2024 21:08:21 +0100
Subject: [PATCH] Last of the christmas stuff (#1257)
* misc
* misco
* jeee
* nitemaster
* ll
* ok
* yeah
* okd
* laa
* Update nightman.dm
* Update scrap.dm
* d
* dd
* lll
* Update apparel.dm
* Update amazon.dm
* ok
* jo
* Update stonekeep.dme
* stuff
* ok
* last
---
_maps/custom/roguehamlet.dmm | 2 +-
_maps/custom/roguetown.dmm | 2 +-
.../roguetown/otherz/roguehamlet.dmm | 2 +-
.../map_files/roguetown/otherz/smalldecap.dmm | 2 +-
_maps/map_files/stonehamlet/stonehamlet.dmm | 915 ++++++++++--------
code/__DEFINES/jobs.dm | 2 +-
code/game/objects/effects/landmarks.dm | 13 +-
code/game/objects/structures/fluff.dm | 6 +-
code/game/objects/structures/tables_racks.dm | 9 +-
code/modules/clothing/rogueclothes/cloaks.dm | 14 -
code/modules/clothing/rogueclothes/hats.dm | 18 +-
code/modules/clothing/rogueclothes/pants.dm | 18 +
code/modules/clothing/rogueclothes/storage.dm | 44 +-
.../adventurer/types/combat/amazon.dm | 4 +-
.../adventurer/types/combat/barbarian.dm | 56 +-
.../adventurer/types/combat/cleric.dm | 25 +-
.../adventurer/types/combat/dbomb.dm | 40 +-
.../adventurer/types/combat/dwarfranger.dm | 45 +-
.../roguetown/adventurer/types/combat/mage.dm | 19 +-
.../roguetown/adventurer/types/combat/monk.dm | 4 +-
.../adventurer/types/combat/ranger.dm | 66 +-
.../adventurer/types/combat/rare/qatil.dm | 28 +-
.../adventurer/types/combat/rare/sentinel.dm | 42 +-
.../types/combat/rare/swashbuckler.dm | 16 +-
.../types/combat/rare/treasurehunter.dm | 43 +-
.../types/combat/rare/witchhunter.dm | 29 +-
.../adventurer/types/combat/rogue.dm | 60 +-
.../adventurer/types/combat/warrior.dm | 109 ++-
.../adventurer/types/pilgrim/blacksmith.dm | 2 +-
.../adventurer/types/pilgrim/cheesemaker.dm | 2 +-
.../adventurer/types/pilgrim/physicker.dm | 25 +-
.../job_types/roguetown/apprentices/squire.dm | 2 +-
.../job_types/roguetown/nobility/feldsher.dm | 14 +-
.../jobs/job_types/roguetown/nobility/lord.dm | 2 +-
.../job_types/roguetown/nobility/merchant.dm | 2 +-
.../job_types/roguetown/nobility/nightman.dm | 65 +-
.../roguetown/other/merc_classes/anthrax.dm | 22 +-
.../roguetown/other/merc_classes/blackoak.dm | 2 +-
.../other/merc_classes/boltslinger.dm | 22 +-
.../other/merc_classes/grenzelhoft.dm | 31 +-
.../roguetown/other/merc_classes/marauder.dm | 31 +-
.../other/merc_classes/steppesman.dm | 17 +-
.../other/merc_classes/underdweller.dm | 20 +-
.../roguetown/other/merc_classes/valorian.dm | 32 +-
.../roguetown/other/merc_classes/zybantine.dm | 26 +-
.../job_types/roguetown/other/mercenary.dm | 1 +
.../job_types/roguetown/peasants/bathmaid.dm | 2 +-
.../job_types/roguetown/peasants/soilson.dm | 2 +-
.../job_types/roguetown/temple/acolyte.dm | 2 +-
.../jobs/job_types/roguetown/temple/priest.dm | 2 +-
.../roguetown/roguecrafting/leather.dm | 7 +
.../roguetown/roguecrafting/structure.dm | 20 +-
.../roguetown/roguecrafting/weaving.dm | 5 +-
.../roguetown/roguemachine/drugmachine.dm | 6 +-
.../roguetown/roguemachine/merchant.dm | 52 +-
.../spells/roguetown/acolyte/pestra.dm | 16 +-
icons/turf/roguefloor.dmi | Bin 463912 -> 463404 bytes
modular/Mapping/Mapping_aides.dm | 10 +-
58 files changed, 1128 insertions(+), 947 deletions(-)
diff --git a/_maps/custom/roguehamlet.dmm b/_maps/custom/roguehamlet.dmm
index 769dbb877d..5da7892a6d 100644
--- a/_maps/custom/roguehamlet.dmm
+++ b/_maps/custom/roguehamlet.dmm
@@ -8864,7 +8864,7 @@
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/town)
"jrk" = (
-/obj/item/roguestatue/silver/gnome,
+/obj/item/roguestatue/gnome,
/turf/open/floor/rogue/tile/masonic/inverted,
/area/rogue/indoors/town/magician)
"jrP" = (
diff --git a/_maps/custom/roguetown.dmm b/_maps/custom/roguetown.dmm
index fd23e67867..eac7961e1e 100644
--- a/_maps/custom/roguetown.dmm
+++ b/_maps/custom/roguetown.dmm
@@ -6252,7 +6252,7 @@
/area/rogue/indoors/town/dwarfin)
"wy" = (
/obj/effect/landmark/start/nightman{
- name = "Nightman"
+ name = "Niteman"
},
/turf/open/floor/carpet/royalblack,
/area/rogue/indoors/town/bath)
diff --git a/_maps/map_files/roguetown/otherz/roguehamlet.dmm b/_maps/map_files/roguetown/otherz/roguehamlet.dmm
index fcfe400455..39bb898da1 100644
--- a/_maps/map_files/roguetown/otherz/roguehamlet.dmm
+++ b/_maps/map_files/roguetown/otherz/roguehamlet.dmm
@@ -10606,7 +10606,7 @@
/obj/item/reagent_containers/glass/bottle/rogue/poison,
/obj/item/clothing/mask/cigarette/rollie/mindbreaker,
/obj/item/reagent_containers/food/snacks/produce/jacksberry/poison,
-/obj/item/keyring/nightman,
+/obj/item/keyring/niteman,
/turf/open/floor/rogue/ruinedwood/chevron,
/area/rogue/indoors/town)
"lGN" = (
diff --git a/_maps/map_files/roguetown/otherz/smalldecap.dmm b/_maps/map_files/roguetown/otherz/smalldecap.dmm
index 59c587d93e..f42755ba56 100644
--- a/_maps/map_files/roguetown/otherz/smalldecap.dmm
+++ b/_maps/map_files/roguetown/otherz/smalldecap.dmm
@@ -726,7 +726,7 @@
/area/rogue/under/cavelava)
"su" = (
/obj/structure/table/wood/reinforced,
-/obj/item/roguestatue/silver/gnome,
+/obj/item/roguestatue/gnome,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/rogue/herringbone,
/area/rogue/under/cavelava)
diff --git a/_maps/map_files/stonehamlet/stonehamlet.dmm b/_maps/map_files/stonehamlet/stonehamlet.dmm
index 7e71753f8d..e42f3df1f8 100644
--- a/_maps/map_files/stonehamlet/stonehamlet.dmm
+++ b/_maps/map_files/stonehamlet/stonehamlet.dmm
@@ -546,14 +546,6 @@
},
/turf/open/floor/rogue/wood/nosmooth,
/area/rogue/indoors/town)
-"aBS" = (
-/obj/structure/chair/stool/rogue,
-/obj/effect/landmark/start/watchman{
- dir = 8;
- name = "Garrison Archer"
- },
-/turf/open/floor/rogue/ruinedwood/spiral,
-/area/rogue/outdoors/town/roofs)
"aBY" = (
/obj/machinery/light/rogue/torchholder/r,
/turf/open/floor/rogue/dirt,
@@ -638,7 +630,6 @@
dir = 6
},
/obj/effect/decal/cleanable/greenglow,
-/obj/structure/fermenting_barrel/water,
/turf/open/floor/rogue/hexstone,
/area/rogue/indoors/town/magician)
"aGl" = (
@@ -986,7 +977,7 @@
pixel_y = 32
},
/obj/structure/closet/crate/roguecloset/dark,
-/obj/item/reagent_containers/glass/bottle/rogue/wine,
+/obj/effect/spawner/roguemap/alcohol/wine,
/obj/item/clothing/mask/cigarette/rollie/trippy,
/obj/structure/fluff/walldeco/bath/wallrope{
dir = 8;
@@ -1063,7 +1054,9 @@
/turf/open/floor/rogue/dirt/road,
/area/rogue/outdoors/exposed/town/hamlet)
"bbX" = (
-/obj/effect/decal/cleanable/blood/footprints,
+/obj/effect/decal/cleanable/blood_neu/tracks{
+ dir = 1
+ },
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/rtfield/hamlet)
"bci" = (
@@ -1374,6 +1367,12 @@
/obj/effect/landmark/start/guardsman,
/turf/open/floor/rogue/wood/saiga,
/area/rogue/indoors/town/garrison)
+"buo" = (
+/obj/effect/landmark/start/villager{
+ dir = 4
+ },
+/turf/open/floor/rogue/grass,
+/area/rogue/outdoors/exposed/town/hamlet)
"buu" = (
/turf/open/floor/rogue/cobble/alt,
/area/rogue/indoors/town)
@@ -1805,10 +1804,7 @@
/turf/open/floor/rogue/concrete,
/area/rogue/indoors/town/cell)
"bPq" = (
-/obj/structure/mineral_door/wood/fancywood{
- lockid = "nightmaiden";
- name = "bedroom"
- },
+/obj/structure/roguetent/preopen,
/turf/open/floor/rogue/ruinedwood/spiralfade,
/area/rogue/indoors/town/bath/redhouse)
"bPr" = (
@@ -2001,10 +1997,12 @@
/obj/item/mortar{
pixel_y = 5
},
-/obj/structure/table/wood/reinforced,
/obj/item/pestle{
pixel_y = 7
},
+/obj/structure/table/stone_end{
+ dir = 8
+ },
/turf/open/floor/rogue/hexstone,
/area/rogue/indoors/town/magician)
"bWE" = (
@@ -2190,7 +2188,7 @@
"cgo" = (
/obj/structure/table/wood/plain_alt,
/turf/open/floor/rogue/woodturned/saiga,
-/area/rogue/under/town/basement)
+/area/rogue/indoors/town/bath/redhouse)
"cgH" = (
/obj/structure/flora/roguegrass,
/turf/open/floor/rogue/rooftop,
@@ -2255,7 +2253,9 @@
/obj/effect/decal/turfedge_neu{
dir = 5
},
-/obj/machinery/light/rogue/firebowl/standing,
+/obj/machinery/light/rogue/torchholder{
+ pixel_y = 28
+ },
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/exposed/town/hamlet)
"clF" = (
@@ -2452,9 +2452,6 @@
/obj/structure/bars/pipe{
dir = 1
},
-/obj/machinery/light/rogue/wallfire/candle/l{
- pixel_y = 28
- },
/turf/open/floor/rogue/tile/bath,
/area/rogue/indoors/town/bath/redhouse)
"cyt" = (
@@ -2788,12 +2785,9 @@
first_time_text = "STONEHILL CASTLE"
})
"cRV" = (
-/obj/structure/fluff/railing/border{
- dir = 1;
- icon_state = "border"
- },
-/turf/open/floor/rogue/twig,
-/area/rogue/indoors/soilsons)
+/obj/machinery/light/rogue/wallfire/candle,
+/turf/open/floor/rogue/wood/saiga,
+/area/rogue/indoors/town/garrison)
"cSb" = (
/obj/structure/fluff/railing/border{
dir = 8;
@@ -3067,10 +3061,20 @@
"dgP" = (
/turf/open/floor/rogue/twig,
/area/rogue/indoors/soilsons)
+"dhb" = (
+/obj/structure/fluff/railing/border{
+ dir = 4;
+ icon_state = "border"
+ },
+/obj/structure/fluff/railing/border{
+ dir = 5;
+ pixel_y = -21
+ },
+/turf/open/floor/rogue/ruinedwood/chevron,
+/area/rogue/indoors/town/bath/redhouse)
"dht" = (
-/obj/structure/closet/crate/chest/neu_iron,
-/obj/item/alch/swampdust,
-/obj/item/alch/tobaccodust,
+/obj/structure/fermenting_barrel/water,
+/obj/machinery/light/rogue/wallfire/candle/blue/l,
/turf/open/floor/rogue/hexstone,
/area/rogue/indoors/town/magician)
"dhF" = (
@@ -3141,6 +3145,12 @@
},
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/rtfield/hamlet)
+"dmX" = (
+/obj/machinery/light/rogue/torchholder{
+ pixel_y = 26
+ },
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/outdoors/town/roofs)
"dnb" = (
/obj/structure/fluff/walldeco/vinez/l{
dir = 4
@@ -3153,7 +3163,11 @@
pixel_x = 8;
pixel_y = 7
},
-/turf/open/floor/carpet/royalblack,
+/obj/item/clothing/mask/cigarette/rollie/nicotine{
+ pixel_x = -2;
+ pixel_y = 4
+ },
+/turf/open/floor/rogue/ruinedwood/chevron,
/area/rogue/indoors/town/bath/redhouse)
"doi" = (
/obj/structure/flora/roguegrass,
@@ -3604,12 +3618,6 @@
"dNW" = (
/turf/open/floor/rogue/herringbone,
/area/rogue/under/town/basement)
-"dOa" = (
-/obj/structure/roguemachine/drugmachine{
- pixel_y = -6
- },
-/turf/closed/wall/mineral/rogue/stonebrick/reddish,
-/area/rogue/indoors/town/bath/redhouse)
"dOe" = (
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/rogue/dirt/road,
@@ -3657,6 +3665,10 @@
},
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/rtfield/plague_district)
+"dPI" = (
+/obj/effect/landmark/start/villager,
+/turf/open/floor/rogue/grass,
+/area/rogue/outdoors/exposed/town/hamlet)
"dPM" = (
/obj/structure/flora/roguegrass,
/obj/structure/fluff/railing/border{
@@ -3678,7 +3690,6 @@
/turf/open/transparent/openspace,
/area/rogue/outdoors/mountains)
"dQg" = (
-/obj/item/chair/stool/bar/rogue/crafted,
/obj/structure/roguemachine/vendor/inn_hamlet{
density = 0;
pixel_y = -32
@@ -4117,7 +4128,7 @@
/area/rogue/under/town/basement)
"ejQ" = (
/turf/open/floor/rogue/woodturned/saiga,
-/area/rogue/under/town/basement)
+/area/rogue/indoors/town/bath/redhouse)
"ejS" = (
/obj/effect/decal/turfedge_neu{
dir = 1;
@@ -4776,12 +4787,9 @@
/turf/closed/wall/mineral/rogue/stone,
/area/rogue/indoors/town/magician)
"eLR" = (
-/obj/structure/table/wood{
- dir = 1;
- icon_state = "longtable"
- },
-/obj/item/reagent_containers/glass/bottle/rogue/wine{
- pixel_y = 9
+/obj/structure/table/vtable/v2,
+/obj/item/clothing/mask/cigarette/pipe/westman{
+ pixel_y = 8
},
/turf/open/floor/rogue/tile/masonic/inverted,
/area/rogue/indoors/town/magician)
@@ -4835,6 +4843,10 @@
dir = 6;
icon_state = "border"
},
+/obj/structure/fluff/walldeco/bath/wallpipes{
+ pixel_x = 18;
+ pixel_y = 24
+ },
/turf/open/floor/rogue/tile/bath,
/area/rogue/indoors/town/bath/redhouse)
"eOe" = (
@@ -4916,7 +4928,7 @@
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/exposed/town/hamlet)
"eRz" = (
-/obj/structure/fluff/statue/small,
+/obj/structure/fluff/statue/small/copper,
/turf/open/water/cleanshallow,
/area/rogue/outdoors/exposed/manorgarri)
"eRB" = (
@@ -5013,7 +5025,6 @@
first_time_text = "STONEHILL CASTLE"
})
"eUw" = (
-/obj/structure/table/wood/reinf_long,
/obj/machinery/light/rogue/cauldron,
/turf/open/floor/rogue/cobble/alt,
/area/rogue/indoors/town/magician)
@@ -5294,9 +5305,7 @@
/obj/item/paper/scroll,
/obj/item/paper/scroll,
/obj/item/paper/scroll,
-/obj/item/rogueweapon/knife/dagger/steel,
-/obj/item/clothing/mask/cigarette/rollie/mindbreaker,
-/turf/open/floor/carpet/royalblack,
+/turf/open/floor/rogue/ruinedwood/chevron,
/area/rogue/indoors/town/bath/redhouse)
"fhC" = (
/obj/structure/roguemachine/stockpile,
@@ -5480,7 +5489,8 @@
lockid = "nightman";
name = "masters room"
},
-/turf/open/floor/rogue/herringbone,
+/obj/effect/decal/shadow_floor,
+/turf/open/floor/rogue/ruinedwood/chevron,
/area/rogue/indoors/town/bath/redhouse)
"fqu" = (
/obj/structure/fluff/railing/border{
@@ -5493,7 +5503,7 @@
/obj/structure/bed/rogue/wooldouble,
/obj/item/bedsheet/rogue/fabric_double,
/obj/machinery/light/rogue/wallfire/candle/r,
-/turf/open/floor/carpet/royalblack,
+/turf/open/floor/carpet/red,
/area/rogue/indoors/town/bath/redhouse)
"fqW" = (
/obj/structure/roguewindow/openclose{
@@ -5602,6 +5612,10 @@
dir = 1
},
/obj/machinery/light/rogue/oven/south,
+/obj/structure/fluff/railing/border{
+ dir = 5;
+ pixel_y = -21
+ },
/turf/open/floor/rogue/dirt/road,
/area/rogue/indoors/soilsons)
"fvh" = (
@@ -6096,9 +6110,6 @@
name = "cooks bed"
},
/obj/structure/fluff/nest,
-/obj/effect/landmark/start/cook{
- icon_state = "arrow"
- },
/turf/open/floor/rogue/naturalstone,
/area/rogue/under/town/basement)
"fYq" = (
@@ -6328,7 +6339,7 @@
},
/obj/item/bedsheet/rogue/wool,
/turf/open/floor/rogue/woodturned/saiga,
-/area/rogue/under/town/basement)
+/area/rogue/indoors/town/bath/redhouse)
"gkd" = (
/turf/closed/mineral/rogue,
/area/rogue/indoors/town/vault)
@@ -6519,7 +6530,7 @@
/area/rogue/outdoors/exposed/under/basement)
"gtA" = (
/obj/structure/rack/rogue,
-/obj/item/roguestatue/silver/gnome,
+/obj/item/roguestatue/gnome,
/turf/open/floor/rogue/concrete,
/area/rogue/indoors/town/magician)
"gtN" = (
@@ -6709,9 +6720,9 @@
/obj/item/paper/scroll,
/obj/item/natural/feather{
pixel_x = 5;
- pixel_y = -5
+ pixel_y = 7
},
-/turf/open/floor/carpet/royalblack,
+/turf/open/floor/rogue/ruinedwood/chevron,
/area/rogue/indoors/town/bath/redhouse)
"gFp" = (
/obj/effect/spawner/roguemap/treeorstump,
@@ -6756,7 +6767,7 @@
/turf/open/floor/rogue/tile/masonic/single,
/area/rogue/indoors/town/dwarfin)
"gGu" = (
-/obj/effect/decal/cleanable/blood/gibs,
+/obj/effect/decal/cleanable/blood_neu/random,
/obj/item/reagent_containers/food/snacks/rogue/meat/steak,
/turf/open/floor/rogue/dirt,
/area/rogue/indoors)
@@ -6813,8 +6824,8 @@
first_time_text = "STONEHILL CASTLE"
})
"gIz" = (
-/obj/structure/table/wood{
- icon_state = "tablewood3"
+/obj/structure/table/stone{
+ dir = 4
},
/obj/item/clothing/neck/roguetown/psycross,
/turf/open/floor/rogue/blocks,
@@ -6978,6 +6989,7 @@
/obj/effect/decal/shadow_floor{
dir = 6
},
+/obj/item/clothing/suit/roguetown/shirt/robe/bath,
/turf/open/floor/rogue/tile/bath,
/area/rogue/indoors/town/bath/redhouse)
"gTA" = (
@@ -7079,13 +7091,10 @@
/turf/open/transparent/openspace,
/area/rogue/indoors/town/magician)
"hbE" = (
-/obj/structure/table/wood{
- icon_state = "longtable"
- },
+/obj/structure/table/vtable,
/obj/item/reagent_containers/glass/cup/skull{
pixel_y = 12
},
-/obj/item/storage/box/matches,
/turf/open/floor/rogue/tile/masonic/single,
/area/rogue/indoors/town/magician)
"hbO" = (
@@ -7206,6 +7215,7 @@
/obj/structure/table/wood/plain_alt,
/obj/item/natural/feather,
/obj/item/paper,
+/obj/item/book/rogue/advice_weaving,
/turf/open/floor/rogue/woodturned/saiga,
/area/rogue/indoors/town/tailor)
"hgo" = (
@@ -7231,6 +7241,13 @@
},
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/rtfield/hamlet)
+"hhs" = (
+/obj/structure/fluff/walldeco/bath/wallpipes{
+ pixel_x = -20;
+ pixel_y = 12
+ },
+/turf/open/floor/rogue/ruinedwood/chevron,
+/area/rogue/indoors/town/bath/redhouse)
"hht" = (
/turf/open/floor/rogue/dirt,
/area/rogue/under/catacombs)
@@ -7259,7 +7276,7 @@
dir = 10
},
/obj/item/reagent_containers/glass/bowl,
-/turf/open/floor/rogue/dirt/road,
+/turf/open/floor/rogue/twig,
/area/rogue/indoors/soilsons)
"hlA" = (
/obj/structure/flora/roguegrass,
@@ -7268,9 +7285,8 @@
/area/rogue/outdoors/mountains)
"hlB" = (
/obj/item/candle/yellow,
-/obj/structure/table/wood{
- dir = 10;
- icon_state = "tablewood2"
+/obj/structure/table/stone_end{
+ dir = 4
},
/turf/open/floor/rogue/blocks,
/area/rogue/under/town/basement)
@@ -7355,8 +7371,7 @@
/obj/item/reagent_containers/food/snacks/produce/jacksberry/poison,
/obj/item/reagent_containers/glass/bottle/rogue/poison,
/obj/structure/closet/crate/chest/neu_fancy,
-/obj/item/paper/nitemaiden_certificate,
-/turf/open/floor/carpet/royalblack,
+/turf/open/floor/carpet/red,
/area/rogue/indoors/town/bath/redhouse)
"hsL" = (
/turf/closed/mineral/rogue,
@@ -7379,12 +7394,13 @@
/obj/effect/decal/shadow_floor{
dir = 10
},
+/obj/item/clothing/suit/roguetown/shirt/robe/bath,
/turf/open/floor/rogue/tile/bath,
/area/rogue/indoors/town/bath/redhouse)
"hus" = (
/obj/machinery/light/rogue/wallfire/candle/l,
/turf/open/floor/rogue/woodturned/saiga,
-/area/rogue/under/town/basement)
+/area/rogue/indoors/town/bath/redhouse)
"hvf" = (
/obj/structure/flora/roguetree/burnt,
/turf/open/transparent/openspace,
@@ -7452,21 +7468,20 @@
/turf/open/floor/rogue/woodturned/nosmooth,
/area/rogue/indoors/town)
"hyO" = (
-/obj/structure/table/wood{
- icon_state = "longtable"
- },
+/obj/structure/closet/crate/chest/neu_fancy,
/obj/item/paper{
- pixel_y = 7
+ pixel_x = -5;
+ pixel_y = 5
},
/obj/item/paper{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/natural/feather{
- pixel_x = 3;
- pixel_y = 9
+/obj/item/paper{
+ pixel_x = -5;
+ pixel_y = 5
},
-/turf/open/floor/carpet/royalblack,
+/turf/open/floor/rogue/herringbone,
/area/rogue/under/town/basement)
"hyV" = (
/obj/structure/table/wood/treestump,
@@ -7577,6 +7592,7 @@
/obj/effect/decal/shadow_floor{
dir = 10
},
+/obj/item/clothing/suit/roguetown/shirt/robe/bath,
/turf/open/floor/rogue/tile/bath,
/area/rogue/indoors/town/bath/redhouse)
"hDE" = (
@@ -7660,7 +7676,9 @@
/area/rogue/outdoors/rtfield/hamlet)
"hHu" = (
/obj/structure/roguetent,
-/obj/effect/decal/cleanable/blood/footprints,
+/obj/effect/decal/cleanable/blood_neu/tracks{
+ dir = 1
+ },
/turf/open/floor/rogue/grass,
/area/rogue/indoors)
"hIc" = (
@@ -7737,6 +7755,7 @@
/obj/effect/decal/shadow_floor{
dir = 6
},
+/obj/item/clothing/suit/roguetown/shirt/robe/bath,
/turf/open/floor/rogue/tile/bath,
/area/rogue/indoors/town/bath/redhouse)
"hLl" = (
@@ -7843,6 +7862,8 @@
/obj/item/alch/waterdust,
/obj/item/alch/runedust,
/obj/item/alch/runedust,
+/obj/item/alch/tobaccodust,
+/obj/item/alch/swampdust,
/turf/open/floor/rogue/hexstone,
/area/rogue/indoors/town/magician)
"hPq" = (
@@ -8077,9 +8098,8 @@
/obj/item/clothing/suit/roguetown/shirt/tunic/random,
/obj/item/clothing/suit/roguetown/shirt/tunic/random,
/obj/item/clothing/suit/roguetown/shirt/dress/gen/sexy,
-/obj/item/paper/nitemaiden_certificate,
/turf/open/floor/rogue/wood/saiga,
-/area/rogue/under/town/basement)
+/area/rogue/indoors/town/bath/redhouse)
"icG" = (
/obj/structure/fluff/walldeco/bath/wallrope,
/turf/closed/wall/mineral/rogue/stonebrick/reddish,
@@ -8113,19 +8133,18 @@
/turf/open/floor/rogue/wood/nosmooth,
/area/rogue/indoors/shelter/rtfield)
"ieO" = (
-/obj/structure/table/wood{
- dir = 1;
- icon_state = "longtable"
+/obj/structure/table/wood/large/corner_blue{
+ dir = 10
},
-/obj/item/reagent_containers/glass/bottle/rogue/redwine{
- pixel_x = 5;
- pixel_y = 11
+/obj/item/paper{
+ pixel_x = -5;
+ pixel_y = 5
},
-/obj/item/reagent_containers/glass/cup/steel{
- pixel_x = -6;
- pixel_y = 20
+/obj/item/natural/feather{
+ pixel_x = 3;
+ pixel_y = 9
},
-/turf/open/floor/carpet/royalblack,
+/turf/open/floor/rogue/herringbone,
/area/rogue/under/town/basement)
"ifd" = (
/obj/structure/bed/rogue/shit,
@@ -8203,12 +8222,8 @@
/turf/open/floor/rogue/wood/nosmooth/saiga,
/area/rogue/outdoors/exposed/manorgarri)
"iiH" = (
-/obj/structure/mineral_door/wood/violet{
- locked = 1;
- lockid = "nightmaiden";
- name = "roof access"
- },
-/turf/open/floor/rogue/ruinedwood/chevron,
+/obj/machinery/light/rogue/wallfire/candle/weak/r,
+/turf/open/floor/rogue/ruinedwood/spiralfade,
/area/rogue/indoors/town/bath/redhouse)
"ijA" = (
/obj/machinery/light/rogue/firebowl/stump{
@@ -8362,7 +8377,9 @@
/turf/open/floor/rogue/hexstone,
/area/rogue/indoors/town/dwarfin)
"iqb" = (
-/obj/structure/table/church,
+/obj/structure/table/churchneu{
+ icon_state = "church_l"
+ },
/turf/open/floor/rogue/sandstone/temple,
/area/rogue/indoors/town/church/chapel)
"iqm" = (
@@ -8561,7 +8578,7 @@
/turf/open/floor/rogue/hexstone,
/area/rogue/indoors/town/magician)
"ixB" = (
-/obj/structure/table/church/m,
+/obj/structure/table/churchneu,
/obj/item/handheld_bell{
pixel_x = -13;
pixel_y = 16
@@ -8758,15 +8775,14 @@
/turf/open/floor/rogue/concrete,
/area/rogue/indoors/town/cell)
"iGb" = (
-/obj/structure/table/wood/reinforced_alter,
+/obj/structure/table/wood/reinforced_alt{
+ dir = 8
+ },
/obj/structure/bars/alt,
/turf/open/floor/rogue/dirt/road,
/area/rogue/indoors/town/dwarfin)
"iGd" = (
/obj/structure/bed/rogue/shit,
-/obj/effect/landmark/start/gravedigger{
- dir = 1
- },
/turf/open/floor/rogue/cobble/alt,
/area/rogue/under/town/basement)
"iGn" = (
@@ -9290,8 +9306,9 @@
first_time_text = "STONEHILL CASTLE"
})
"jlE" = (
-/obj/structure/table/church{
- dir = 1
+/obj/structure/table/churchneu{
+ dir = 1;
+ icon_state = "church_r"
},
/turf/open/floor/rogue/sandstone/temple,
/area/rogue/indoors/town/church/chapel)
@@ -9405,8 +9422,6 @@
"jrk" = (
/obj/structure/closet/crate/chest/neu_fancy,
/obj/item/reagent_containers/powder/spice,
-/obj/item/reagent_containers/powder/spice,
-/obj/item/reagent_containers/powder/spice,
/obj/item/reagent_containers/powder/ozium,
/obj/item/reagent_containers/powder/moondust,
/turf/open/floor/rogue/tile/masonic/inverted,
@@ -9690,7 +9705,7 @@
/turf/closed/wall/mineral/rogue/decostone/cand,
/area/rogue/indoors)
"jEV" = (
-/obj/structure/mineral_door/wood/fancywood{
+/obj/structure/mineral_door/wood/deadbolt{
name = "privy"
},
/obj/effect/decal/turfedge_neu/alt{
@@ -9732,11 +9747,8 @@
/turf/open/floor/rogue/dirt/road,
/area/rogue/under/town/basement)
"jFQ" = (
-/obj/structure/fluff/railing/border{
- dir = 9;
- icon_state = "border"
- },
-/turf/open/floor/rogue/herringbone,
+/obj/machinery/light/rogue/wallfire/candle/weak,
+/turf/open/transparent/openspace,
/area/rogue/indoors/town/bath/redhouse)
"jGc" = (
/obj/structure/fluff/walldeco/bath/wallrope{
@@ -10199,8 +10211,10 @@
first_time_text = "STONEHILL CASTLE"
})
"kcx" = (
-/obj/structure/roguemachine/scomm/r,
-/turf/open/floor/rogue/cobble/alt,
+/obj/structure/roguemachine/scomm{
+ pixel_y = 0
+ },
+/turf/closed/wall/mineral/rogue/stone/moss,
/area/rogue/indoors/town/magician)
"kdB" = (
/obj/structure/fluff/walldeco/stone,
@@ -10308,7 +10322,6 @@
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/mountains)
"kiI" = (
-/obj/item/roguebin/alt,
/obj/structure/fluff/walldeco/bath/six,
/turf/open/floor/rogue/blocks/stonered/tiny,
/area/rogue/indoors/town/bath/redhouse)
@@ -10379,11 +10392,10 @@
/turf/open/floor/rogue/dirt/road,
/area/rogue/outdoors/rtfield/hamlet)
"klW" = (
-/obj/item/reagent_containers/food/snacks/rogue/meat/salami,
-/obj/item/reagent_containers/food/snacks/rogue/meat/salami,
-/obj/structure/closet/crate/chest/old_crate,
-/obj/item/reagent_containers/food/snacks/rogue/cheddar,
-/turf/open/floor/rogue/ruinedwood/chevron,
+/obj/structure/closet/crate/chest/neu_fancy{
+ name = "coin chest"
+ },
+/turf/open/floor/rogue/ruinedwood/spiralfade,
/area/rogue/indoors/town/bath/redhouse)
"kmf" = (
/turf/open/floor/rogue/dirt,
@@ -10404,7 +10416,7 @@
},
/obj/structure/chair/stool/rogue,
/turf/open/floor/rogue/wood/saiga,
-/area/rogue/under/town/basement)
+/area/rogue/indoors/town/bath/redhouse)
"kmF" = (
/obj/structure/fluff/railing/border{
dir = 8;
@@ -10623,10 +10635,6 @@
/area/rogue/indoors/town/manor{
first_time_text = "STONEHILL CASTLE"
})
-"kxE" = (
-/obj/structure/bed/rogue/hay,
-/turf/open/floor/rogue/oak,
-/area/rogue/indoors)
"kyb" = (
/obj/structure/flora/roguegrass,
/obj/structure/fluff/statue/gargoyle,
@@ -10670,7 +10678,7 @@
first_time_text = "STONEHILL CASTLE"
})
"kAp" = (
-/turf/open/floor/carpet/royalblack,
+/turf/open/floor/carpet/red,
/area/rogue/indoors/town/bath/redhouse)
"kAz" = (
/obj/structure/flora/roguegrass/bush/wall/tall,
@@ -10856,6 +10864,14 @@
/obj/structure/roguemachine/scomm,
/turf/open/floor/rogue/cobblerock_alt,
/area/rogue/outdoors/exposed/dwarf)
+"kMq" = (
+/obj/structure/mineral_door/wood/violet{
+ locked = 1;
+ lockid = "nightmaiden";
+ name = "roof access"
+ },
+/turf/open/floor/rogue/ruinedwood/chevron,
+/area/rogue/indoors/town/bath/redhouse)
"kNj" = (
/turf/closed/wall/mineral/rogue/wooddark/vertical,
/area/rogue/indoors/shelter/mountains)
@@ -10969,6 +10985,10 @@
/obj/effect/decal/shadow_floor,
/turf/open/floor/rogue/blocks,
/area/rogue/indoors/town/cell)
+"kUX" = (
+/obj/machinery/light/rogue/firebowl/stump,
+/turf/open/floor/rogue/grass/yelmix,
+/area/rogue/outdoors/rtfield/woodish)
"kVM" = (
/obj/structure/fluff/walldeco/vinez/l{
dir = 10
@@ -11051,6 +11071,13 @@
/obj/structure/closet/dirthole/grave,
/turf/open/floor/rogue/dirt/road,
/area/rogue/outdoors/rtfield/plague_district)
+"kYM" = (
+/obj/item/reagent_containers/food/snacks/rogue/meat/salami,
+/obj/structure/closet/crate/chest/old_crate,
+/obj/item/reagent_containers/food/snacks/rogue/cheddar,
+/obj/machinery/light/rogue/wallfire/candle/weak/l,
+/turf/open/floor/rogue/ruinedwood/chevron,
+/area/rogue/indoors/town/bath/redhouse)
"kYQ" = (
/turf/closed/wall/mineral/rogue/wooddark/window,
/area/rogue/outdoors/exposed/town/hamlet)
@@ -11582,10 +11609,7 @@
},
/area/rogue)
"lBY" = (
-/obj/structure/chair/wood/rogue{
- dir = 4;
- icon_state = "chair2"
- },
+/obj/structure/chair/stool/rogue,
/turf/open/floor/rogue/cobble/alt,
/area/rogue/indoors/town/magician)
"lCm" = (
@@ -11690,7 +11714,9 @@
first_time_text = "Rockhamlet"
})
"lGx" = (
-/obj/effect/decal/cleanable/blood/footprints,
+/obj/effect/decal/cleanable/blood_neu/tracks{
+ dir = 9
+ },
/turf/open/floor/rogue/dirt/road,
/area/rogue/outdoors/rtfield/hamlet)
"lGN" = (
@@ -11763,7 +11789,7 @@
},
/obj/item/bedsheet/rogue/wool,
/turf/open/floor/rogue/wood/saiga,
-/area/rogue/under/town/basement)
+/area/rogue/indoors/town/bath/redhouse)
"lJI" = (
/turf/open/floor/rogue/wood/saiga,
/area/rogue/outdoors/exposed/under/basement)
@@ -12416,15 +12442,16 @@
first_time_text = "STONEHILL CASTLE"
})
"msB" = (
-/obj/structure/table/wood/reinf_long{
- dir = 1
+/obj/structure/table/stone_end{
+ dir = 4
},
/obj/item/clothing/mask/rogue/spectacles/golden{
- pixel_y = 6
+ pixel_x = -7;
+ pixel_y = 4
},
/obj/item/flint{
- pixel_x = 10;
- pixel_y = -7
+ pixel_x = 9;
+ pixel_y = 7
},
/turf/open/floor/rogue/hexstone,
/area/rogue/indoors/town/magician)
@@ -12448,6 +12475,13 @@
dir = 1
},
/area/rogue/outdoors/town/roofs)
+"muP" = (
+/obj/item/reagent_containers/glass/bucket/pot,
+/obj/effect/decal/turfedge_neu/alt{
+ dir = 10
+ },
+/turf/open/floor/rogue/dirt/road,
+/area/rogue/indoors/soilsons)
"muV" = (
/obj/effect/decal/remains/human/old/small,
/obj/structure/flora/roguegrass,
@@ -12557,9 +12591,8 @@
/area/rogue/indoors/town)
"mBF" = (
/obj/item/storage/bag/tray/psy,
-/obj/structure/table/wood{
- dir = 10;
- icon_state = "tablewood2"
+/obj/structure/table/stone_end{
+ dir = 8
},
/obj/item/reagent_containers/glass/bottle/rogue/healthpot,
/turf/open/floor/rogue/blocks,
@@ -12576,7 +12609,7 @@
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/rtfield/hamlet)
"mEx" = (
-/obj/structure/table/church,
+/obj/structure/table/stone_small,
/obj/item/rogueweapon/shovel,
/turf/open/floor/rogue/cobble/alt,
/area/rogue/under/town/basement)
@@ -12669,7 +12702,7 @@
/area/rogue/outdoors/rtfield/hamlet)
"mIZ" = (
/obj/structure/flora/roguegrass/water,
-/obj/structure/fluff/statue/small,
+/obj/structure/fluff/statue/small/copper,
/turf/open/water/cleanshallow,
/area/rogue/outdoors/exposed/manorgarri)
"mJt" = (
@@ -12692,7 +12725,6 @@
/area/rogue/indoors)
"mMb" = (
/obj/structure/chair/bench/couchablack,
-/obj/item/clothing/mask/cigarette/rollie/nicotine,
/turf/open/floor/rogue/tile/masonic/single,
/area/rogue/indoors/town/magician)
"mMc" = (
@@ -12863,7 +12895,7 @@
dir = 9
},
/obj/item/kitchen/spoon,
-/turf/open/floor/rogue/dirt/road,
+/turf/open/floor/rogue/twig,
/area/rogue/indoors/soilsons)
"mRp" = (
/turf/open/floor/rogue/ruinedwood/turned,
@@ -13122,6 +13154,9 @@
/area/rogue/indoors)
"ndi" = (
/obj/structure/chair/stool/rogue,
+/obj/machinery/light/rogue/torchholder{
+ pixel_y = 26
+ },
/turf/open/floor/rogue/ruinedwood/spiral,
/area/rogue/outdoors/town/roofs)
"ndT" = (
@@ -13187,7 +13222,6 @@
/obj/structure/fluff/walldeco/rpainting/forest{
pixel_x = 32
},
-/obj/effect/landmark/start/alchemist,
/obj/item/bedsheet/rogue/double_pelt,
/turf/open/floor/carpet/royalblack,
/area/rogue/under/town/basement)
@@ -13234,7 +13268,6 @@
"njt" = (
/obj/structure/bed/rogue/inn/double,
/obj/item/bedsheet/rogue/double_pelt,
-/obj/effect/landmark/start/innkeep,
/turf/open/floor/rogue/carpet/green,
/area/rogue/indoors/town/tavern/saiga)
"njE" = (
@@ -13346,6 +13379,12 @@
},
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/rtfield/hamlet)
+"nnd" = (
+/obj/effect/landmark/start/villagerlate{
+ dir = 4
+ },
+/turf/open/floor/rogue/grass,
+/area/rogue/outdoors/exposed/town/hamlet)
"nnr" = (
/obj/structure/chair/wood/rogue{
dir = 8;
@@ -13479,12 +13518,11 @@
first_time_text = "STONEHILL CASTLE"
})
"nvR" = (
-/obj/structure/fluff/railing/border{
- dir = 5;
- icon_state = "border"
+/obj/machinery/light/rogue/wallfire/candle/l{
+ pixel_y = -32
},
-/turf/open/floor/rogue/twig,
-/area/rogue/indoors/soilsons)
+/turf/open/floor/rogue/woodturned/saiga,
+/area/rogue/indoors/town/garrison)
"nwa" = (
/obj/structure/composter/halffull,
/turf/open/floor/rogue/dirt/road,
@@ -13539,7 +13577,7 @@
dir = 6
},
/obj/item/reagent_containers/glass/bowl,
-/turf/open/floor/rogue/dirt/road,
+/turf/open/floor/rogue/twig,
/area/rogue/indoors/soilsons)
"nzc" = (
/obj/item/natural/stone,
@@ -14476,7 +14514,9 @@
/turf/open/floor/rogue/naturalstone,
/area/rogue/under/cave/abandoned_mine)
"ouq" = (
-/obj/structure/table/wood/plain_alt,
+/obj/structure/table/wood/reinforced_alt{
+ dir = 8
+ },
/turf/open/floor/rogue/tile{
icon_state = "greenstone"
},
@@ -14519,6 +14559,13 @@
/obj/structure/roguewindow/solid,
/turf/open/floor/rogue/ruinedwood/spiral,
/area/rogue/indoors/town)
+"owE" = (
+/obj/structure/table/wood/reinforced_alt{
+ dir = 4
+ },
+/obj/structure/bars/alt,
+/turf/open/floor/rogue/dirt/road,
+/area/rogue/indoors/town/dwarfin)
"owT" = (
/obj/effect/decal/turfedge_neu/rockalt_edge,
/obj/effect/decal/turfedge_neu/rockalt_edge{
@@ -14821,7 +14868,7 @@
/obj/structure/closet/crate/drawer/random,
/obj/item/roguekey/nitemaiden,
/obj/item/roguekey/nitemaiden,
-/turf/open/floor/carpet/royalblack,
+/turf/open/floor/rogue/ruinedwood/chevron,
/area/rogue/indoors/town/bath/redhouse)
"oGZ" = (
/obj/structure/closet/crate/chest/old_crate,
@@ -14988,11 +15035,10 @@
dir = 8
},
/obj/structure/rack/rogue/shelf/biggest,
-/obj/item/reagent_containers/glass/bottle/rogue/redwine,
-/obj/item/reagent_containers/glass/bottle/rogue/wine/sourwine,
-/obj/item/reagent_containers/glass/bottle/rogue/redwine,
-/obj/item/reagent_containers/glass/bottle/rogue/whitewine,
-/obj/item/reagent_containers/glass/bottle/rogue/whitewine,
+/obj/effect/spawner/roguemap/alcohol/wine,
+/obj/effect/spawner/roguemap/alcohol/wine,
+/obj/effect/spawner/roguemap/alcohol/wine,
+/obj/effect/spawner/roguemap/alcohol/wine,
/turf/open/floor/rogue/dirt/road,
/area/rogue/outdoors/exposed/under/basement)
"oOm" = (
@@ -15044,6 +15090,10 @@
/obj/structure/flora/ausbushes/ppflowers,
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/rtfield/hamlet)
+"oPz" = (
+/obj/machinery/light/rogue/wallfire/candle/weak/l,
+/turf/open/floor/rogue/tile/bath,
+/area/rogue/indoors/town/bath/redhouse)
"oPV" = (
/obj/structure/flora/roguegrass,
/turf/open/floor/rogue/grass,
@@ -15097,7 +15147,7 @@
/area/rogue/outdoors/exposed/under/basement)
"oRK" = (
/obj/structure/ladder,
-/turf/open/floor/rogue/twig,
+/turf/open/floor/rogue/dirt/road,
/area/rogue/indoors/soilsons)
"oRX" = (
/obj/structure/flora/roguegrass,
@@ -15210,7 +15260,7 @@
/area/rogue/under/town/basement)
"oXi" = (
/obj/structure/chair/stool/rogue,
-/obj/effect/landmark/start/captain{
+/obj/effect/landmark/start/sheriff{
dir = 1
},
/turf/open/floor/rogue/cobble/alt,
@@ -15261,9 +15311,7 @@
/obj/effect/decal/turfedge_neu{
dir = 5
},
-/obj/machinery/light/roguestreet/midlamp{
- plane = -1
- },
+/obj/machinery/light/rogue/wallfire/candle/blue/r,
/turf/open/floor/rogue/hexstone,
/area/rogue/indoors/town/magician)
"oYE" = (
@@ -15872,6 +15920,7 @@
/obj/structure/table/wood/large/corner_blue{
dir = 9
},
+/obj/effect/spawner/roguemap/alcohol/wine,
/turf/open/floor/rogue/herringbone,
/area/rogue/indoors/town/bath/redhouse)
"pAW" = (
@@ -16338,9 +16387,11 @@
/turf/closed/wall/mineral/rogue/decostone/chimney,
/area/rogue/outdoors)
"pZz" = (
-/obj/item/rogueweapon/polearm/spear/stone,
-/turf/open/floor/rogue/naturalstone,
-/area/rogue/under/town/sewer)
+/obj/effect/landmark/start/villagerlate{
+ dir = 1
+ },
+/turf/open/floor/rogue/grass,
+/area/rogue/outdoors/exposed/town/hamlet)
"pZB" = (
/obj/structure/bars/pipe{
dir = 8;
@@ -16580,6 +16631,17 @@
},
/turf/open/water/swamp/deep,
/area/rogue/outdoors/rtfield/hamlet)
+"qlr" = (
+/obj/structure/fluff/railing/border,
+/obj/structure/fluff/railing/border{
+ dir = 10;
+ icon_state = "border"
+ },
+/obj/machinery/light/rogue/torchholder{
+ pixel_y = 26
+ },
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/outdoors/town/roofs)
"qls" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 8
@@ -17054,12 +17116,18 @@
/turf/closed/wall/mineral/rogue/stone/moss,
/area/rogue/under/town/sewer)
"qMc" = (
-/obj/effect/landmark/latejoin,
-/turf/open/floor/rogue/dirt,
-/area/rogue/outdoors/rtfield/hamlet)
+/obj/item/reagent_containers/glass/cup/steel{
+ pixel_x = 4;
+ pixel_y = 9
+ },
+/obj/structure/table/wood/large/corner_blue{
+ dir = 6
+ },
+/turf/open/floor/rogue/herringbone,
+/area/rogue/under/town/basement)
"qMk" = (
/obj/item/reagent_containers/food/snacks/smallrat,
-/turf/open/floor/rogue/twig,
+/turf/open/floor/rogue/dirt/road,
/area/rogue/indoors/soilsons)
"qMt" = (
/obj/effect/decal/turfedge_neu/alt_small{
@@ -17168,6 +17236,15 @@
/area/rogue/indoors/town/manor{
first_time_text = "STONEHILL CASTLE"
})
+"qPT" = (
+/obj/structure/closet/crate/chest/old_crate,
+/obj/item/reagent_containers/food/snacks/rogue/frybread,
+/obj/item/reagent_containers/food/snacks/rogue/raisinbread,
+/obj/effect/decal/shadow_floor{
+ dir = 8
+ },
+/turf/open/floor/rogue/ruinedwood/chevron,
+/area/rogue/indoors/town/bath/redhouse)
"qPV" = (
/obj/item/grown/log/tree/small,
/turf/open/floor/rogue/dirt,
@@ -17264,7 +17341,7 @@
/turf/open/floor/rogue/naturalstone,
/area/rogue/under/cave)
"qVi" = (
-/obj/structure/table/wood/reinforced_alter,
+/obj/structure/table/wood/reinforced_alt,
/obj/structure/bars/alt,
/turf/open/floor/rogue/concrete,
/area/rogue/indoors/town/dwarfin)
@@ -17418,6 +17495,10 @@
/area/rogue/indoors/town/manor{
first_time_text = "STONEHILL CASTLE"
})
+"rbE" = (
+/obj/structure/fluff/railing/border,
+/turf/open/transparent/openspace,
+/area/rogue/indoors/soilsons)
"rcE" = (
/obj/structure/flora/roguegrass,
/turf/open/floor/rogue/cobblerock,
@@ -17547,6 +17628,7 @@
/obj/item/book/rogue/advice_soup,
/obj/item/book/rogue/advice_farming,
/obj/item/book/rogue/manners,
+/obj/item/book/rogue/advice_weaving,
/turf/open/floor/rogue/ruinedwood/spiralfade,
/area/rogue/outdoors/exposed/under/basement)
"rix" = (
@@ -17603,6 +17685,12 @@
/obj/effect/sunlight,
/turf/open/water/sewer,
/area/rogue/outdoors/exposed/under/sewer)
+"rkS" = (
+/obj/machinery/light/rogue/wallfire/candle/weak{
+ pixel_y = -17
+ },
+/turf/open/floor/rogue/tile/bath,
+/area/rogue/indoors/town/bath/redhouse)
"rkT" = (
/obj/structure/roguewindow/solid,
/turf/open/floor/rogue/grass,
@@ -17847,7 +17935,7 @@
/area/rogue/indoors/shelter/rtfield)
"rwu" = (
/turf/open/floor/rogue/wood/saiga,
-/area/rogue/under/town/basement)
+/area/rogue/indoors/town/bath/redhouse)
"rxp" = (
/obj/structure/closet/crate/chest/neu,
/turf/open/floor/rogue/ruinedwood/spiralfade,
@@ -17883,10 +17971,6 @@
/area/rogue/indoors/soilsons)
"rye" = (
/obj/structure/chair/stool/rogue,
-/obj/effect/landmark/start/watchman{
- dir = 4;
- name = "Garrison Archer"
- },
/turf/open/floor/rogue/ruinedwood/spiral,
/area/rogue/outdoors/town/roofs)
"ryq" = (
@@ -18088,7 +18172,9 @@
/turf/open/floor/rogue/twig,
/area/rogue/indoors/town/shop)
"rHl" = (
-/obj/structure/table/wood/plain_alt,
+/obj/structure/table/wood/reinforced_alt{
+ dir = 4
+ },
/obj/item/mortar{
pixel_y = 5
},
@@ -18761,11 +18847,10 @@
/turf/open/floor/rogue/naturalstone,
/area/rogue/under/town/caverogue/saltmine)
"svE" = (
-/obj/effect/landmark/start/adventurer{
- dir = 1
- },
-/turf/open/floor/rogue/dirt,
-/area/rogue/outdoors/rtfield/hamlet)
+/obj/structure/flora/roguegrass,
+/obj/machinery/light/rogue/firebowl/stump,
+/turf/open/floor/rogue/grass,
+/area/rogue/outdoors/rtfield/boggish)
"swo" = (
/obj/machinery/light/rogue/cauldron,
/turf/open/floor/rogue/tile{
@@ -18820,10 +18905,6 @@
},
/turf/open/floor/rogue/tile,
/area/rogue/indoors/town/magician)
-"szq" = (
-/obj/effect/landmark/latejoin,
-/turf/open/floor/rogue/dirt/road,
-/area/rogue/outdoors/rtfield/hamlet)
"szw" = (
/turf/open/floor/rogue/blocks,
/area/rogue/indoors/town/garrison)
@@ -18915,11 +18996,10 @@
/turf/open/floor/rogue/dirt,
/area/rogue/outdoors/exposed/under/basement)
"sGp" = (
-/obj/structure/flora/roguegrass,
-/obj/effect/landmark/start/adventurer{
+/obj/effect/landmark/latejoin{
dir = 1
},
-/turf/open/floor/rogue/dirt,
+/turf/open/floor/rogue/dirt/road,
/area/rogue/outdoors/rtfield/hamlet)
"sGM" = (
/obj/structure/fluff/statue/knight/r,
@@ -19016,6 +19096,10 @@
dir = 1
},
/area/rogue/indoors/town/church/chapel)
+"sMW" = (
+/obj/structure/bed/rogue/hay,
+/turf/open/floor/rogue/oak,
+/area/rogue/indoors)
"sMX" = (
/obj/structure/stairs/stone{
dir = 1;
@@ -19034,7 +19118,7 @@
dir = 5
},
/obj/item/kitchen/spoon,
-/turf/open/floor/rogue/dirt/road,
+/turf/open/floor/rogue/twig,
/area/rogue/indoors/soilsons)
"sNy" = (
/turf/closed/mineral/random/rogue,
@@ -19147,6 +19231,10 @@
},
/turf/open/floor/rogue/wood/nosmooth/saiga,
/area/rogue/indoors/town/tailor)
+"sSv" = (
+/obj/structure/fluff/railing/border,
+/turf/open/transparent/openspace,
+/area/rogue/indoors/town/bath/redhouse)
"sSX" = (
/obj/structure/mineral_door/wood{
icon_state = "wcr";
@@ -19255,6 +19343,13 @@
/obj/structure/kneestingers,
/turf/open/water/sewer,
/area/rogue/outdoors/exposed/under/sewer)
+"sZl" = (
+/obj/structure/fluff/railing/border{
+ dir = 4;
+ icon_state = "border"
+ },
+/turf/open/floor/rogue/ruinedwood/chevron,
+/area/rogue/indoors/town/bath/redhouse)
"sZA" = (
/obj/structure/table/wood{
icon_state = "map2"
@@ -19798,7 +19893,9 @@
/area/rogue/outdoors/rtfield/hamlet)
"tBT" = (
/obj/structure/closet/crate/roguecloset,
-/obj/item/clothing/cloak/apron/cook,
+/obj/item/clothing/cloak/apron/cook{
+ name = "butchering apron"
+ },
/obj/item/clothing/suit/roguetown/shirt/robe/feld,
/obj/item/clothing/neck/roguetown/feld,
/obj/item/clothing/mask/rogue/feld,
@@ -19829,11 +19926,7 @@
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/exposed/town/hamlet)
"tCN" = (
-/obj/structure/table/wood/nice/decorated_alt,
-/obj/item/candle/yellow/lit/infinite{
- pixel_x = 8;
- pixel_y = 7
- },
+/obj/item/roguebin/water/gross,
/turf/open/floor/rogue/tile/bath,
/area/rogue/indoors/town/bath/redhouse)
"tDW" = (
@@ -19908,7 +20001,7 @@
/obj/structure/chair/wood/rogue/chair_noble{
dir = 1
},
-/turf/open/floor/carpet/royalblack,
+/turf/open/floor/rogue/ruinedwood/chevron,
/area/rogue/indoors/town/bath/redhouse)
"tIT" = (
/obj/effect/decal/shadow_floor{
@@ -20420,17 +20513,10 @@
/turf/open/floor/rogue/twig,
/area/rogue/under/town/basement)
"ufL" = (
-/obj/structure/closet/crate/chest/old_crate,
-/obj/item/reagent_containers/food/snacks/rogue/frybread,
-/obj/item/reagent_containers/food/snacks/rogue/frybread,
-/obj/item/reagent_containers/food/snacks/rogue/raisinbread,
-/obj/structure/fluff/railing/border{
- dir = 1;
- icon_state = "border"
- },
/obj/effect/decal/shadow_floor{
dir = 8
},
+/obj/structure/roguemachine/drugmachine,
/turf/open/floor/rogue/ruinedwood/chevron,
/area/rogue/indoors/town/bath/redhouse)
"ufN" = (
@@ -20599,9 +20685,8 @@
/obj/structure/closet/crate/drawer/random{
pixel_y = 7
},
-/obj/item/paper/nitemaiden_certificate,
/turf/open/floor/rogue/woodturned/saiga,
-/area/rogue/under/town/basement)
+/area/rogue/indoors/town/bath/redhouse)
"uoh" = (
/obj/structure/handcart{
dir = 4;
@@ -20634,13 +20719,11 @@
/turf/open/floor/rogue/grass,
/area/rogue/outdoors/exposed/town/hamlet)
"upQ" = (
-/obj/structure/table/wood/nice/decorated_alt,
-/obj/item/candle/yellow/lit/infinite{
- pixel_x = 8;
- pixel_y = 7
+/obj/structure/fluff/walldeco/vinez/offset{
+ dir = 6
},
-/turf/open/floor/carpet/inn,
-/area/rogue/indoors/town/bath/redhouse)
+/turf/open/floor/rogue/grass,
+/area/rogue/outdoors/rtfield/hamlet)
"uqi" = (
/turf/open/floor/rogue/naturalstone,
/area/rogue/under/cave/abandoned_mine)
@@ -20727,8 +20810,10 @@
ambush_mobs = list(/mob/living/simple_animal/hostile/retaliate/rogue/wolf = 50, /mob/living/carbon/human/species/human/northern/bum/ambush = 30)
})
"uul" = (
-/obj/structure/closet/crate/chest/neu_fancy{
- name = "coin chest"
+/obj/structure/table/wood/nice/decorated_alt,
+/obj/item/candle/yellow/lit/infinite{
+ pixel_x = -9;
+ pixel_y = 4
},
/turf/open/floor/rogue/ruinedwood/spiralfade,
/area/rogue/indoors/town/bath/redhouse)
@@ -21119,6 +21204,9 @@
/obj/structure/roguemachine/mail{
pixel_y = -32
},
+/obj/effect/landmark/start/dungeoneer{
+ dir = 1
+ },
/turf/open/floor/rogue/wood/saiga,
/area/rogue/indoors/town/garrison)
"uJC" = (
@@ -21436,18 +21524,10 @@
/turf/open/floor/rogue/blocks,
/area/rogue/indoors/town/shop)
"uWr" = (
-/obj/item/roguekey/roomiv{
- name = "Castellan room key"
- },
-/obj/item/roguekey/roomi{
- name = "Duchess suite key"
- },
-/obj/item/roguekey/roomii{
- name = "Wanderer room key"
- },
-/obj/item/roguekey/roomiii{
- name = "Yeoman room key"
- },
+/obj/item/roguekey/roomiv/castellan,
+/obj/item/roguekey/roomi/duchess,
+/obj/item/roguekey/roomii/wanderer,
+/obj/item/roguekey/roomiii/yeoman,
/obj/structure/closet/crate/chest/neu_iron{
locked = 1;
lockid = "tavern";
@@ -21615,6 +21695,10 @@
/obj/item/bedsheet/rogue/pelt,
/turf/open/floor/rogue/wood/saiga,
/area/rogue/indoors/town)
+"veo" = (
+/obj/structure/toilet,
+/turf/open/floor/rogue/blocks/paving,
+/area/rogue/indoors/town/bath/redhouse)
"veA" = (
/obj/effect/decal/shadow_floor,
/turf/open/floor/rogue/cobblerock_alt,
@@ -21939,6 +22023,7 @@
pixel_y = 32
},
/obj/machinery/light/rogue/wallfire/candle/lamp,
+/obj/structure/closet/crate/roguecloset/dark,
/turf/open/floor/rogue/ruinedwood/spiralfade,
/area/rogue/indoors/town/bath/redhouse)
"vyE" = (
@@ -22209,9 +22294,13 @@
"vJF" = (
/obj/structure/table/wood/nice/decorated_alt,
/obj/item/reagent_containers/glass/cup/steel{
- pixel_x = 1;
+ pixel_x = -5;
pixel_y = 9
},
+/obj/item/candle/yellow/lit/infinite{
+ pixel_x = 8;
+ pixel_y = 7
+ },
/turf/open/floor/carpet/inn,
/area/rogue/indoors/town/bath/redhouse)
"vJI" = (
@@ -22351,10 +22440,7 @@
/area/rogue/indoors/town/garrison)
"vVD" = (
/obj/structure/closet/crate/drawer/random,
-/obj/item/clothing/mask/cigarette/rollie/cannabis{
- pixel_x = 2;
- pixel_y = 3
- },
+/obj/item/clothing/mask/rogue/spectacles/golden,
/turf/open/floor/rogue/tile/masonic/single,
/area/rogue/indoors/town/magician)
"vVI" = (
@@ -22364,7 +22450,7 @@
"vVY" = (
/obj/structure/chair/stool/rogue,
/turf/open/floor/rogue/woodturned/saiga,
-/area/rogue/under/town/basement)
+/area/rogue/indoors/town/bath/redhouse)
"vWg" = (
/obj/effect/decal/turfedge_neu{
dir = 10
@@ -22746,7 +22832,7 @@
/turf/closed/wall/mineral/rogue/wooddark,
/area/rogue/outdoors/rtfield/outlaw)
"wks" = (
-/obj/structure/bed/rogue/mediocre,
+/obj/structure/bed/rogue/shit,
/turf/open/floor/rogue/wood/nosmooth/saiga,
/area/rogue/indoors/town)
"wkZ" = (
@@ -22989,10 +23075,6 @@
"wAB" = (
/turf/open/floor/rogue/dirt,
/area/rogue/outdoors/exposed/town/hamlet)
-"wAC" = (
-/obj/structure/toilet,
-/turf/open/floor/rogue/blocks/paving,
-/area/rogue/indoors/town/bath/redhouse)
"wBd" = (
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/egg,
@@ -23028,8 +23110,9 @@
/turf/open/floor/rogue/naturalstone,
/area/rogue/outdoors/rtfield/hamlet)
"wDi" = (
-/obj/structure/table/wood/plain_alt,
-/obj/item/reagent_containers/glass/bucket/pot,
+/obj/effect/decal/turfedge_neu/alt{
+ dir = 10
+ },
/turf/open/floor/rogue/dirt/road,
/area/rogue/indoors/soilsons)
"wDj" = (
@@ -23116,12 +23199,12 @@
/turf/open/floor/rogue/hexstone,
/area/rogue/indoors/town/magician)
"wHV" = (
-/obj/item/roguebin/alt,
/obj/structure/fluff/walldeco/bath/wallpipes{
pixel_x = 16;
pixel_y = 24
},
/obj/structure/fluff/walldeco/bath/seven,
+/obj/item/roguebin,
/turf/open/floor/rogue/blocks/stonered/tiny,
/area/rogue/indoors/town/bath/redhouse)
"wIl" = (
@@ -23468,7 +23551,7 @@
/area/rogue/outdoors/rtfield/plague_district)
"xaf" = (
/obj/machinery/light/rogue/hearth,
-/turf/open/floor/rogue/dirt/road,
+/turf/open/floor/rogue/cobble/alt,
/area/rogue/indoors/soilsons)
"xah" = (
/obj/structure/fluff/railing/border{
@@ -23911,6 +23994,17 @@
},
/turf/open/floor/rogue/ruinedwood/spiralfade,
/area/rogue/indoors/town/shop)
+"xuG" = (
+/obj/structure/fluff/railing/border{
+ dir = 8;
+ icon_state = "border"
+ },
+/obj/structure/fluff/railing/border{
+ dir = 9;
+ pixel_y = -21
+ },
+/turf/open/floor/rogue/herringbone,
+/area/rogue/indoors/town/bath/redhouse)
"xuL" = (
/obj/structure/roguewindow/openclose{
dir = 4
@@ -24076,7 +24170,7 @@
/area/rogue/indoors/town/dwarfin)
"xBl" = (
/turf/closed/wall/mineral/rogue/wooddark/horizontal,
-/area/rogue/under/town/basement)
+/area/rogue/indoors/town/bath/redhouse)
"xBQ" = (
/obj/structure/chair/stool/rogue,
/turf/open/floor/rogue/grass,
@@ -24247,9 +24341,9 @@
/turf/closed/wall/mineral/rogue/decostone/cand,
/area/rogue/indoors/town/tavern/saiga)
"xKY" = (
-/obj/machinery/light/rogue/wallfire/candle/weak,
-/turf/open/transparent/openspace,
-/area/rogue/indoors/town/bath/redhouse)
+/obj/structure/stairs,
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/outdoors/town/roofs)
"xLa" = (
/obj/structure/flora/roguegrass/thorn_bush,
/obj/effect/decal/turfedge_neu/road{
@@ -24636,6 +24730,12 @@
"ycJ" = (
/turf/closed/wall/mineral/rogue/wooddark/end,
/area/rogue/indoors)
+"ycY" = (
+/obj/effect/landmark/start/pilgrim{
+ dir = 8
+ },
+/turf/open/floor/rogue/ruinedwood,
+/area/rogue/outdoors/rtfield/hamlet)
"ydq" = (
/obj/item/chair/rogue,
/turf/open/floor/rogue/herringbone,
@@ -24751,6 +24851,7 @@
/obj/structure/fluff/wallclock{
pixel_y = -32
},
+/obj/item/chair/stool/bar/rogue/crafted,
/turf/open/floor/rogue/cobble/mossy/alt,
/area/rogue/indoors/town/tavern/saiga)
"yir" = (
@@ -34003,7 +34104,7 @@ nSF
lOZ
tYR
rJP
-iGb
+owE
xAF
xAF
xAF
@@ -35349,7 +35450,7 @@ mbn
iox
xqH
xqH
-xqH
+nvR
jbv
fVg
lOZ
@@ -35540,7 +35641,7 @@ wlB
feV
mbn
fkm
-vNy
+cRV
sue
uGG
sue
@@ -35715,7 +35816,7 @@ nSS
tvZ
hsL
psp
-sYX
+psp
ijK
ijK
qLT
@@ -35911,7 +36012,7 @@ hsL
psp
ijK
ijK
-qLT
+ijK
fyR
xnA
qLT
@@ -40987,7 +41088,7 @@ kqy
sGU
ecZ
uGl
-wAC
+veo
vgS
ijK
cZM
@@ -41181,10 +41282,10 @@ kuA
xEM
jNI
ecZ
-wAC
+veo
vgS
ijK
-ijK
+cZM
cZM
hyO
dNW
@@ -41377,9 +41478,9 @@ xMw
xMw
xMw
xMw
-psp
ijK
cZM
+cZM
ieO
dNW
ipb
@@ -41571,10 +41672,10 @@ bwe
bwe
nEL
xMw
-psp
ijK
cZM
cZM
+qMc
bIb
ejK
niT
@@ -41765,11 +41866,11 @@ xMw
uKu
gGM
xMw
-psp
ijK
ijK
cZM
cZM
+cZM
eBM
cZM
cZM
@@ -41960,7 +42061,7 @@ bwe
uLI
xMw
psp
-psp
+ijK
ijK
psp
psp
@@ -42327,8 +42428,8 @@ cZM
psp
psp
psp
-rPA
-pZz
+xnA
+xnA
fyR
xnA
jnQ
@@ -43118,7 +43219,7 @@ kqy
nxn
oDm
sbV
-bwe
+klW
uAH
xMw
xMw
@@ -49870,8 +49971,8 @@ psp
psp
psp
hKd
-vJP
-pLh
+hKd
+skh
vgH
aHa
vJP
@@ -50064,7 +50165,7 @@ psp
psp
vJP
vJP
-ikx
+kUX
hKd
vgH
aHa
@@ -50259,7 +50360,7 @@ psp
psp
ikx
lta
-pLh
+skh
vgH
aHa
vJP
@@ -60030,7 +60131,7 @@ wAB
wAB
dZq
ohj
-dgP
+kZt
msX
sNq
nyQ
@@ -60224,7 +60325,7 @@ lWU
qjF
nHQ
bZQ
-dgP
+kZt
dgP
dgP
vqR
@@ -60354,7 +60455,7 @@ asj
jpH
vWP
xkE
-ljh
+xkE
slK
slK
xkE
@@ -60418,7 +60519,7 @@ oII
qPV
dZq
dVd
-dgP
+kZt
dgP
dgP
dgP
@@ -60548,7 +60649,7 @@ asj
jpH
vWP
xkE
-slK
+xkE
slK
slK
xkE
@@ -60613,8 +60714,8 @@ wAB
luz
bZQ
sjm
-dgP
-dgP
+kZt
+kZt
omH
bZQ
pCV
@@ -60744,7 +60845,7 @@ xkE
xkE
slK
slK
-xkE
+slK
vWP
czT
tEb
@@ -60807,8 +60908,8 @@ wAB
dZq
bZQ
suS
-dgP
-dgP
+kZt
+kZt
urw
dVd
pCV
@@ -61001,8 +61102,8 @@ wAB
oII
oRq
fvf
-nvR
-dgP
+kZt
+kZt
fXC
bZQ
hJE
@@ -61194,9 +61295,9 @@ wAB
wAB
jma
bZQ
-kqA
-cRV
-dgP
+rbE
+kZt
+kZt
kZt
bZQ
tMa
@@ -61777,7 +61878,7 @@ fWZ
iBi
bZQ
xaf
-kZt
+muP
kZt
kki
bZQ
@@ -62227,9 +62328,9 @@ bsm
lmG
bsm
hQx
-svE
-szq
-szq
+hQx
+bsm
+sGp
"}
(66,1,2) = {"
psp
@@ -62421,9 +62522,9 @@ hQx
hQx
hQx
uJn
+uJn
+hQx
sGp
-qMc
-szq
"}
(67,1,2) = {"
psp
@@ -62615,9 +62716,9 @@ bsm
bsm
bsm
bsm
-svE
-szq
-szq
+hQx
+bsm
+sGp
"}
(68,1,2) = {"
psp
@@ -62949,7 +63050,7 @@ tzO
dZq
xkE
vWP
-xkE
+buo
gqx
xkE
xkE
@@ -63142,7 +63243,7 @@ xkE
xkE
wAB
xkE
-xkE
+dPI
xgZ
edO
tzw
@@ -64740,7 +64841,7 @@ psp
psp
psp
psp
-iIw
+psp
psp
psp
psp
@@ -65661,9 +65762,9 @@ bsm
ocQ
xkE
xkE
+pZz
xkE
-xkE
-xkE
+nnd
rzl
rzl
rzl
@@ -65818,7 +65919,7 @@ tsI
kuA
sFL
dDV
-sFL
+oPz
cya
tcZ
fIp
@@ -66597,7 +66698,7 @@ rsQ
rsQ
sFL
sFL
-sFL
+rkS
wVF
fyl
fyl
@@ -66787,7 +66888,7 @@ xMw
sOn
xMw
xMw
-xtl
+jFQ
igN
sFL
sFL
@@ -66981,7 +67082,7 @@ alL
lHH
kuA
xMw
-xKY
+xtl
igN
sFL
bQY
@@ -67563,7 +67664,7 @@ eNw
xPH
xPH
bwe
-xEM
+bPq
xPH
xPH
xEM
@@ -67760,8 +67861,8 @@ bwe
bPq
xPH
xPH
-fYq
-fyl
+xEM
+upQ
roQ
hZX
hZX
@@ -67950,9 +68051,9 @@ xMw
aZa
bwe
ubI
-bwe
+iiH
xEM
-upQ
+xPH
kWv
xEM
dmy
@@ -74044,9 +74145,9 @@ psp
psp
psp
sfJ
-mzw
-emc
-emc
+svE
+ycY
+ycY
mzw
sfJ
sfJ
@@ -82677,7 +82778,7 @@ hZX
hZX
fbL
fbL
-kwX
+qlr
eMo
eMo
ftR
@@ -85459,7 +85560,7 @@ gcU
onY
wwJ
xPy
-kxE
+sMW
gcU
hZX
hZX
@@ -86397,7 +86498,7 @@ wvR
nzO
wdq
qxN
-aBS
+rye
oGx
hZX
hZX
@@ -89330,7 +89431,7 @@ hZX
hZX
hZX
gcU
-kxE
+sMW
iyS
gcU
teW
@@ -89723,7 +89824,7 @@ iyS
gcU
rKK
iyS
-kxE
+sMW
gcU
tmw
hZX
@@ -90200,7 +90301,7 @@ hZX
hZX
hZX
uQd
-kcx
+mWI
hjk
qQN
oYw
@@ -90394,7 +90495,7 @@ hZX
hZX
hZX
uQd
-uQd
+kcx
ary
xHe
xkk
@@ -91225,26 +91326,26 @@ hZX
hZX
hZX
hZX
-wvR
-ydO
-xLU
-ydO
-ydO
-ydO
+xMw
+kMq
+xMw
+xMw
+xMw
+qxN
aux
mMx
qTS
qTS
mMx
uPR
-ydO
+qxN
qxN
qxN
qxN
iMX
gNu
fbL
-qxN
+dmX
fbL
hZX
hZX
@@ -91419,21 +91520,21 @@ tXA
tXA
tXA
tXA
-xLU
-xLU
-xLU
-xLU
-xLU
-xLU
-ydO
-ydO
-ydO
-ydO
-ydO
-ydO
-ydO
-fbL
-fbL
+xEM
+htm
+kYM
+qPT
+xMw
+qxN
+qxN
+qxN
+qxN
+qxN
+qxN
+qxN
+qxN
+qxN
+qxN
qxN
qxN
qxN
@@ -91612,11 +91713,11 @@ qxN
qxN
qxN
qxN
-qxN
-xMw
-iiH
-xMw
-xMw
+xKY
+xEM
+htm
+sZl
+dhb
xMw
xMw
xMw
@@ -91624,8 +91725,8 @@ xMw
xMw
xMw
xEM
-ydO
-oGx
+heO
+qxN
fbL
fbL
fbL
@@ -91810,17 +91911,17 @@ oGx
xEM
htm
hEa
-xtl
+sSv
ufL
-klW
-xMw
+hhs
+xEM
gFk
tIF
-kAp
+htm
xEM
-ydO
oGx
-hZX
+oGx
+oGx
hZX
hZX
hZX
@@ -92004,16 +92105,16 @@ pzV
xEM
pov
mFh
-mFh
-jFQ
+xuG
+rpQ
hMd
-xMw
+xEM
dns
-kAp
-kAp
+htm
+htm
xEM
-ydO
-oGx
+hZX
+hZX
hZX
hZX
hZX
@@ -92202,12 +92303,12 @@ qlB
rpQ
hMd
fqp
-kAp
+htm
kAp
kAp
fYq
-ydO
-oGx
+hZX
+hZX
hZX
hZX
hZX
@@ -92395,13 +92496,13 @@ pzX
vCk
rpQ
uRr
-xMw
+xEM
fhA
kAp
kAp
xEM
-oGx
-oGx
+hZX
+hZX
hZX
hZX
hZX
@@ -92589,7 +92690,7 @@ nLA
dfi
rpQ
wLa
-xMw
+xEM
oGB
fqM
hsE
@@ -92972,16 +93073,16 @@ hZX
hZX
pzV
xMw
-dOa
+xMw
xMw
bHG
xMw
xMw
xMw
-oGx
-oGx
-oGx
-oGx
+xMw
+xMw
+xMw
+xMw
hZX
hZX
hZX
@@ -116058,11 +116159,11 @@ hZX
hZX
hZX
hZX
-hZX
-hZX
-hZX
-hZX
-hZX
+xLU
+xLU
+xLU
+xLU
+xLU
hZX
wvR
wvR
@@ -116252,17 +116353,17 @@ hZX
hZX
hZX
hZX
-hZX
-hZX
-hZX
-hZX
-hZX
-hZX
-hZX
-hZX
-hZX
-hZX
-hZX
+xLU
+xLU
+xLU
+xLU
+xLU
+tXA
+tXA
+tXA
+tXA
+tXA
+tXA
hZX
hZX
hZX
@@ -116446,17 +116547,17 @@ hZX
hZX
hZX
hZX
-hZX
-xLU
-wvR
-xLU
-xLU
-xLU
-xLU
-xLU
-xLU
-xLU
-xLU
+qxN
+qxN
+qxN
+qxN
+qxN
+qxN
+qxN
+qxN
+qxN
+qxN
+qxN
hZX
hZX
hZX
@@ -116640,7 +116741,7 @@ hZX
hZX
hZX
hZX
-hZX
+xLU
xLU
xLU
xLU
@@ -116834,7 +116935,7 @@ hZX
hZX
hZX
hZX
-hZX
+wvR
wvR
wvR
wvR
@@ -117028,7 +117129,7 @@ hZX
hZX
hZX
hZX
-hZX
+wvR
wvR
wvR
wvR
@@ -117222,7 +117323,7 @@ hZX
hZX
hZX
hZX
-hZX
+wvR
wvR
wvR
wvR
@@ -117416,7 +117517,7 @@ hZX
hZX
hZX
hZX
-hZX
+wvR
wvR
wvR
wvR
@@ -117610,7 +117711,7 @@ hZX
hZX
hZX
hZX
-hZX
+sIe
sIe
sIe
sIe
@@ -117804,7 +117905,7 @@ hZX
hZX
hZX
hZX
-hZX
+sIe
sIe
sIe
sIe
diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm
index 352b09cecd..5577b5506b 100644
--- a/code/__DEFINES/jobs.dm
+++ b/code/__DEFINES/jobs.dm
@@ -134,7 +134,7 @@
#define INNKEEP (1<<5)
#define COOK (1<<6)
#define TAILOR (1<<7)
-#define NIGHTMAN (1<<8)
+#define NIGHTMAN (1<<8)
#define NITEMAIDEN (1<<9)
#define ALCHEMIST (1<<10)
#define SCRIBE (1<<11)
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 51161d2c52..f4555af414 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -31,7 +31,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start
name = "start"
icon = 'icons/mob/landmarks.dmi'
- icon_state = "x"
+ icon_state = "arrow"
anchored = TRUE
layer = MOB_LAYER
var/list/jobspawn_override = list()
@@ -87,7 +87,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start/adventurerlate
name = "Adventurerlate"
icon_state = "arrow"
- jobspawn_override = list("Drifter", "Pilgrim", "Adventurer")
+ jobspawn_override = list("Drifter", "Adventurer")
delete_after_roundstart = FALSE
/obj/effect/landmark/start/vagrantlate
@@ -117,7 +117,12 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start/combatlate
name = "Combatlate"
icon_state = "arrow"
- jobspawn_override = list("Drifter", "Pilgrim", "Adventurer", "Mercenary")
+ jobspawn_override = list("Drifter", "Adventurer", "Mercenary")
+ delete_after_roundstart = FALSE
+
+/obj/effect/landmark/start/pilgrim
+ name = "Pilgrim"
+ jobspawn_override = list("Pilgrim")
delete_after_roundstart = FALSE
/obj/effect/landmark/start/lord
@@ -128,7 +133,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
name = "Knight"
icon_state = "arrow"
-/obj/effect/landmark/start/captain
+/obj/effect/landmark/start/sheriff
name = "Captain"
icon_state = "arrow"
diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm
index d809cd76df..d3170c4169 100644
--- a/code/game/objects/structures/fluff.dm
+++ b/code/game/objects/structures/fluff.dm
@@ -855,6 +855,10 @@
icon = 'icons/roguetown/misc/structure.dmi'
icon_state = "elfs"
+/obj/structure/fluff/statue/small/copper
+ name = "old copper statue"
+ color = "#a3bea6"
+
/obj/structure/fluff/statue/pillar
name = "wooden support"
icon = 'icons/roguetown/misc/structure.dmi'
@@ -1164,7 +1168,7 @@
desc = ""
icon = 'icons/roguetown/misc/tallandwide.dmi'
icon_state = "astrata"
- pixel_x = -18
+ pixel_x = -19
/* .................. Necra Shrine ................... */
/obj/structure/fluff/psycross/crafted/shrine/necra
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index ec3dc38296..6300c9d614 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -499,7 +499,7 @@
buildstack = /obj/item/stack/tile/carpet/royalblue
smooth_icon = 'icons/obj/smooth_structures/fancy_table_royalblue.dmi'
-/obj/structure/table/church
+/obj/structure/table/church // old shit
name = "stone table"
desc = ""
icon = 'icons/roguetown/misc/tables.dmi'
@@ -511,8 +511,9 @@
/obj/structure/table/church/m
icon = 'icons/roguetown/misc/tables.dmi'
icon_state = "churchtable_mid"
-/*/................ Stone tables ............... //
-/obj/structure/table/church
+
+//................ Stone tables ............... //
+/obj/structure/table/churchneu
name = "stone table"
desc = ""
icon = 'icons/roguetown/misc/tables.dmi'
@@ -520,7 +521,7 @@
max_integrity = 300
smooth = 0
climb_offset = 10
-*/
+
/obj/structure/table/stone
name = "stone table"
desc = ""
diff --git a/code/modules/clothing/rogueclothes/cloaks.dm b/code/modules/clothing/rogueclothes/cloaks.dm
index 982877993b..5d4fa00166 100644
--- a/code/modules/clothing/rogueclothes/cloaks.dm
+++ b/code/modules/clothing/rogueclothes/cloaks.dm
@@ -1068,17 +1068,3 @@
add_overlay(mutable_appearance('icons/roguetown/clothing/cloaks.dmi', "clasp"))
..()
-
-//................ Silk Pantaloons ............... //
-/obj/item/clothing/under/roguetown/pantaloons
- name = "silk pantaloons"
- icon_state = "pantaloons"
- item_state = "pantaloons"
- color = CLOTHING_WET
- r_sleeve_status = SLEEVE_NOMOD
- l_sleeve_status = SLEEVE_NOMOD
- adjustable = FALSE
-
-/obj/item/clothing/under/roguetown/pantaloons/random/Initialize()
- color = RANDOM_NOBLE_DYES
- ..()
diff --git a/code/modules/clothing/rogueclothes/hats.dm b/code/modules/clothing/rogueclothes/hats.dm
index acc8984e4c..b26a04ca77 100644
--- a/code/modules/clothing/rogueclothes/hats.dm
+++ b/code/modules/clothing/rogueclothes/hats.dm
@@ -478,9 +478,9 @@
name = "chef's hat"
/obj/item/clothing/head/roguetown/tophat
- name = "teller's hat"
+ name = "unusual hat"
icon_state = "tophat"
- color = CLOTHING_SOOT_BLACK
+ color = "#d0a3a3"
@@ -1245,6 +1245,7 @@
flags_inv = HIDEEARS|HIDEHAIR
icon_state = "antlerhood"
item_state = "antlerhood"
+ dynamic_hair_suffix = "+generic"
icon = 'icons/roguetown/clothing/head.dmi'
body_parts_covered = HEAD|HAIR|EARS|NECK
slot_flags = ITEM_SLOT_HEAD
@@ -1255,19 +1256,6 @@
sewrepair = TRUE
blocksound = SOFTHIT
-//............... Saiga skull ............... //
-/obj/item/clothing/head/roguetown/helmet/leather/saiga
- name = "saiga skull"
- desc = "Skull from big game. Looks like it could withstand some damage."
- icon_state = "saigahead"
- item_state = "saigahead"
- mob_overlay_icon = 'icons/roguetown/clothing/onmob/64x64/head.dmi'
- worn_x_dimension = 64
- worn_y_dimension = 64
- flags_inv = HIDEEARS|HIDEFACE
- flags_cover = HEADCOVERSEYES
- body_parts_covered = HEAD|EARS|HAIR|NOSE|EYES
-
/*------------------\
diff --git a/code/modules/clothing/rogueclothes/pants.dm b/code/modules/clothing/rogueclothes/pants.dm
index 11629c17c2..3abebf3fe7 100644
--- a/code/modules/clothing/rogueclothes/pants.dm
+++ b/code/modules/clothing/rogueclothes/pants.dm
@@ -241,6 +241,24 @@
add_overlay(pic)
+//................ Silk Pantaloons ............... //
+/obj/item/clothing/under/roguetown/pantaloons
+ name = "silk pantaloons"
+ icon_state = "pantaloons"
+ item_state = "pantaloons"
+ color = CLOTHING_WET
+ r_sleeve_status = SLEEVE_NOMOD
+ l_sleeve_status = SLEEVE_NOMOD
+ adjustable = FALSE
+
+/obj/item/clothing/under/roguetown/pantaloons/random/Initialize()
+ color = RANDOM_NOBLE_DYES
+ ..()
+
+/obj/item/clothing/under/roguetown/pantaloons/dark
+ color = CLOTHING_DARK_INK
+
+
//..................................................................................................................................
/*---------------\
| |
diff --git a/code/modules/clothing/rogueclothes/storage.dm b/code/modules/clothing/rogueclothes/storage.dm
index 28f015b760..27cd1d99a5 100644
--- a/code/modules/clothing/rogueclothes/storage.dm
+++ b/code/modules/clothing/rogueclothes/storage.dm
@@ -71,6 +71,16 @@
new /obj/item/natural/cloth(src)
new /obj/item/roguekey/mercenary(src)
+/obj/item/storage/belt/rogue/leather/merc_nokey/PopulateContents()
+ new /obj/item/natural/cloth (src)
+ new /obj/item/roguecoin/copper/pile (src)
+/obj/item/storage/belt/rogue/leather/merc_nokey/shalal
+ name = "shalal belt"
+ icon_state = "shalal"
+/obj/item/storage/belt/rogue/leather/merc_nokey/black
+ name = "black belt"
+ icon_state = "blackbelt"
+
/obj/item/storage/belt/rogue/leather/mason/PopulateContents()
new /obj/item/keyring/mason(src)
@@ -84,15 +94,6 @@
new /obj/item/needle/thorn(src)
new /obj/item/keyring/guard(src)
-/obj/item/storage/belt/rogue/leather/mercenary/shalal
- name = "shalal belt"
- icon_state = "shalal"
-
-/obj/item/storage/belt/rogue/leather/mercenary/black
- name = "black belt"
- icon_state = "blackbelt"
-
-
/obj/item/storage/belt/rogue/leather/plaquegold
name = "plaque belt"
desc = "A belt with a golden plaque on its front."
@@ -153,8 +154,11 @@
new /obj/item/rogueweapon/knife/dagger(src)
new /obj/item/needle(src)
-/obj/item/storage/belt/rogue/leather/cloth/bandit
- color = "#ff0000"
+/obj/item/storage/belt/rogue/leather/nitemaster
+ color = "#cfabcb"
+/obj/item/storage/belt/rogue/leather/nitemaster/Initialize()
+ . = ..()
+ new /obj/item/roguecoin/copper/pile (src)
/obj/item/storage/belt/rogue/pouch
name = "pouch"
@@ -246,16 +250,22 @@
//Nitemaiden pouch
/obj/item/storage/belt/rogue/pouch/nitemaiden/PopulateContents()
- new /obj/item/natural/cloth(src)
+ if(prob(50))
+ new /obj/item/paper/feldsher_certificate(src)
+ else
+ new /obj/item/paper/feldsher_certificate/expired(src)
new /obj/item/bath/soap(src)
new /obj/item/roguecoin/copper/pile(src)
-//Amazon pouch
-/obj/item/storage/belt/rogue/pouch/amazon/PopulateContents()
- new /obj/item/natural/cloth(src)
- new /obj/item/ammo_casing/caseless/rogue/dart(src)
- new /obj/item/ammo_casing/caseless/rogue/dart(src)
+//Darts pouch
+/obj/item/storage/belt/rogue/pouch/blowgun/PopulateContents()
+ new /obj/item/ammo_casing/caseless/rogue/dart/poison(src)
+ new /obj/item/ammo_casing/caseless/rogue/dart/poison(src)
+ new /obj/item/ammo_casing/caseless/rogue/dart/poison(src)
+/obj/item/storage/belt/rogue/pouch/burglar/PopulateContents()
+ new /obj/item/roguecoin/copper/pile (src)
+ new /obj/item/lockpick (src)
/obj/item/storage/backpack/rogue/satchel
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm
index 5efe09c388..689976bede 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm
@@ -23,11 +23,10 @@
H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE)
- neck = /obj/item/storage/belt/rogue/pouch/amazon
+ neck = /obj/item/storage/belt/rogue/pouch
backl = /obj/item/rogueweapon/polearm/spear
backr = /obj/item/gun/ballistic/revolver/grenadelauncher/bow
belt = /obj/item/storage/belt/rogue/leather/rope
- beltl = /obj/item/gun/ballistic/revolver/grenadelauncher/blowgun
beltr = /obj/item/quiver/arrows
shoes = /obj/item/clothing/shoes/roguetown/gladiator
wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
@@ -40,3 +39,4 @@
H.change_stat("speed", 1)
ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_NOSTINK, TRAIT_GENERIC)
+
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm
index 26579c93db..016f21fb3f 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm
@@ -1,7 +1,7 @@
/datum/advclass/combat/barbarian
name = "Barbarian"
- tutorial = "Wildmen and warriors all, Barbarians forego the intricacies of modern warfare in favour of raw strength and brutal cunning. Few of them can truly adjust to the civilized, docile lands of lords and ladies."
- allowed_sexes = list(MALE, FEMALE)
+ tutorial = "Wildmen and warriors all, Barbarians embody the fiercest and most primal aspect of Ravox. Raw strength and brutal cunning makes them excellent fighters but poorly adjusted to the civilized, docile lands of lords and ladies."
+ allowed_sexes = list(MALE)
allowed_races = list(
"Humen",
"Half-Elf",
@@ -11,35 +11,13 @@
min_pq = 0
category_tags = list(CTAG_ADVENTURER)
cmode_music = 'sound/music/combat_barbarian.ogg'
-/* Multiclass means this actually does nothing
-/datum/outfit/job/roguetown/adventurer/barbarian
- allowed_patrons = list(/datum/patron/divine/ravox, /datum/patron/divine/abyssor, /datum/patron/divine/necra, /datum/patron/divine/dendor, /datum/patron/godless, /datum/patron/inhumen/graggar)
-*/
+
/datum/outfit/job/roguetown/adventurer/barbarian/pre_equip(mob/living/carbon/human/H)
..()
- H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, 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, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) //funger reference
- H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE)
- H.mind.AddSpell(new /obj/effect/proc_holder/spell/self/barbrage)
+
belt = /obj/item/storage/belt/rogue/leather
shoes = /obj/item/clothing/shoes/roguetown/boots/leather
wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
- if(prob(50))
- backr = /obj/item/storage/backpack/rogue/satchel
- H.change_stat("strength", 3)
- H.change_stat("endurance", 2)
- H.change_stat("constitution", 2)
- H.change_stat("intelligence", -2)
var/armortype = pickweight(list("Cloak" = 5, "Hide" = 3, "Helmet" = 2))
var/weapontype = pickweight(list("Sword" = 4, "Club" = 3, "Axe" = 2)) //clubs and axes share a weapon type
switch(armortype)
@@ -54,14 +32,34 @@
beltr = /obj/item/rogueweapon/sword/iron
H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE)
if("Club")
- beltr = /obj/item/rogueweapon/mace/woodclub
+ beltr = /obj/item/rogueweapon/mace/goden/shillelagh
H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE)
if("Axe")
beltr = /obj/item/rogueweapon/axe/iron
H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE)
+
+ if(H.mind)
+ H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, 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, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, 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", 3)
+ H.change_stat("endurance", 2)
+ H.change_stat("constitution", 2)
+ H.change_stat("intelligence", -2)
+
ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_NOSTINK, TRAIT_GENERIC)
+
+ H.mind.AddSpell(new /obj/effect/proc_holder/spell/self/barbrage)
if(H.dna?.species)
H.dna.species.soundpack_m = new /datum/voicepack/male/warrior()
-// if(H.patron != /datum/patron/divine/ravox) commented out because meant to be superceded by the allowedpatrons but since multiclass that doesnt work.
-// H.set_patron(/datum/patron/divine/ravox)
+ if(H.patron != /datum/patron/divine/ravox)
+ H.set_patron(/datum/patron/divine/ravox)
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm
index 0723dfa574..2dc5d7a835 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm
@@ -22,31 +22,33 @@
/datum/outfit/job/roguetown/adventurer/cleric/pre_equip(mob/living/carbon/human/H)
..()
- H.virginity = TRUE
- armor = /obj/item/clothing/suit/roguetown/armor/cuirass // Halfplate has been made heavy armor, billions must make due.
+ neck = /obj/item/clothing/neck/roguetown/chaincoif/iron
+ wrists = /obj/item/clothing/neck/roguetown/psycross/silver
+ armor = /obj/item/clothing/suit/roguetown/armor/cuirass/iron
shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random
- pants = /obj/item/clothing/under/roguetown/trou/leather
- shoes = /obj/item/clothing/shoes/roguetown/boots/leather
belt = /obj/item/storage/belt/rogue/leather
beltl = /obj/item/rogueweapon/mace
beltr = /obj/item/storage/belt/rogue/pouch/coins/poor
+ pants = /obj/item/clothing/under/roguetown/trou/leather
+ shoes = /obj/item/clothing/shoes/roguetown/boots/leather
switch(H.patron?.name)
if("Astrata")
wrists = /obj/item/clothing/neck/roguetown/psycross/silver/astrata
cloak = /obj/item/clothing/cloak/stabard/templar/astrata
neck = /obj/item/clothing/neck/roguetown/chaincoif
- if("Dendor") // good helmet but no money
+ if("Dendor")
+ head = /obj/item/clothing/head/roguetown/antlerhood
neck = /obj/item/clothing/neck/roguetown/coif
- wrists = /obj/item/clothing/neck/roguetown/psycross/silver/dendor
cloak = /obj/item/clothing/cloak/raincloak/furcloak
+ wrists = /obj/item/clothing/neck/roguetown/psycross/silver/dendor
beltr = /obj/item/rogueweapon/knife/stone
if("Necra")
head = /obj/item/clothing/head/roguetown/padded/deathface
wrists = /obj/item/clothing/neck/roguetown/psycross/silver/necra
cloak = /obj/item/clothing/cloak/stabard/templar/necra
- neck = /obj/item/clothing/neck/roguetown/gorget
+ neck = /obj/item/clothing/neck/roguetown/coif
if("Eora")
wrists = /obj/item/clothing/neck/roguetown/psycross/silver/eora
cloak = /obj/item/clothing/cloak/stabard/templar/eora
@@ -67,11 +69,11 @@
wrists = /obj/item/clothing/neck/roguetown/psycross/silver/malum_steel
cloak = /obj/item/clothing/cloak/stabard/templar/malum
neck = /obj/item/clothing/neck/roguetown/gorget
+ if("Abyssor")
+ wrists = /obj/item/clothing/neck/roguetown/psycross/silver
+ cloak = /obj/item/clothing/cloak/stabard/templar/abyssor
else // Failsafe
cloak = /obj/item/clothing/cloak/tabard/crusader // Give us a generic crusade tabard
- wrists = /obj/item/clothing/neck/roguetown/psycross/silver // Give us a silver psycross for protection against lickers
- neck = /obj/item/clothing/neck/roguetown/chaincoif/iron
-
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE)
@@ -91,7 +93,10 @@
H.change_stat("constitution", 1)
H.change_stat("endurance", 2)
H.change_stat("speed", -1)
+
+ H.virginity = TRUE
ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) // Even if it has limited slots, it is a common drifter role available to anyone. Their armor also is not heavy, so medium armor training is enough
+
var/datum/devotion/cleric_holder/C = new /datum/devotion/cleric_holder(H, H.patron)
C.holder_mob = H
C.update_devotion(50, 50)
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm
index 72b5581978..a4ba64dd21 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm
@@ -9,30 +9,34 @@
/datum/outfit/job/roguetown/adventurer/dbomb/pre_equip(mob/living/carbon/human/H)
..()
+
head = /obj/item/clothing/head/roguetown/helmet/horned
- pants = /obj/item/clothing/under/roguetown/trou
- belt = /obj/item/storage/belt/rogue/leather
- armor = /obj/item/clothing/suit/roguetown/armor/chainmail/iron
wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
- backl = /obj/item/storage/backpack/rogue/backpack
+ armor = /obj/item/clothing/suit/roguetown/armor/chainmail/iron
+ belt = /obj/item/storage/belt/rogue/leather
beltl = /obj/item/rogueweapon/pick
beltr = /obj/item/rogueweapon/hammer
- backpack_contents = list(/obj/item/bomb = 1, /obj/item/flint = 1)
- H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/labor/mining, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/engineering, 5, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/smelting, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)
- H.change_stat("strength", 1)
- H.change_stat("endurance", 1)
+ pants = /obj/item/clothing/under/roguetown/trou
switch(pick(1,2))
if (1)
shoes = /obj/item/clothing/shoes/roguetown/boots/leather
if (2)
shoes = /obj/item/clothing/shoes/roguetown/simpleshoes
+ backl = /obj/item/storage/backpack/rogue/backpack
+ backpack_contents = list(/obj/item/bomb = 2, /obj/item/flint = 1)
+
+ if(H.mind)
+ H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/labor/mining, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/craft/engineering, 5, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/craft/smelting, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)
+
+ H.change_stat("strength", 1)
+ H.change_stat("endurance", 1)
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm
index 03ab6a9c55..1e24755759 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm
@@ -11,37 +11,42 @@
/datum/outfit/job/roguetown/adventurer/dranger/pre_equip(mob/living/carbon/human/H)
..()
+
head = /obj/item/clothing/head/roguetown/roguehood/uncolored
- pants = /obj/item/clothing/under/roguetown/trou/leather
+ cloak = /obj/item/clothing/cloak/raincloak/brown
+ wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
+ r_hand = /obj/item/rogueweapon/sword/scimitar/falchion
+ armor = /obj/item/clothing/suit/roguetown/armor/chainmail/iron // Starts with better armor than a typical ranger (iron chainmail) but has no dodge expert or sneaking skill
shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/random
- shoes = /obj/item/clothing/shoes/roguetown/simpleshoes
belt = /obj/item/storage/belt/rogue/leather
backr = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow
backl = /obj/item/storage/backpack/rogue/satchel
beltl = /obj/item/quiver/bolts
beltr = /obj/item/flashlight/flare/torch/lantern
- armor = /obj/item/clothing/suit/roguetown/armor/chainmail/iron // Starts with better armor than a typical ranger (iron chainmail) but has no dodge expert or sneaking skill
- wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
- r_hand = /obj/item/rogueweapon/sword/scimitar/falchion
- backpack_contents = list(/obj/item/bait = 1)
+ pants = /obj/item/clothing/under/roguetown/trou/leather
+ shoes = /obj/item/clothing/shoes/roguetown/simpleshoes
if(prob(23))
shoes = /obj/item/clothing/shoes/roguetown/boots
if(prob(23))
shoes = /obj/item/clothing/shoes/roguetown/boots/leather
- cloak = /obj/item/clothing/cloak/raincloak/brown
- H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) // In line with basic combat classes
- H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)
+ backpack_contents = list(/obj/item/bait = 1)
+
+ if(H.mind)
+ H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) // In line with basic combat classes
+ H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)
+
H.change_stat("perception", 3)
H.change_stat("speed", 1) // Fast... for a dwarf
+
ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) // Dwarf rangers are no good at dodging, but can wear heavier armor than typical rangers
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm
index a551b72d1c..6be9a68834 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm
@@ -21,13 +21,15 @@
/datum/outfit/job/roguetown/adventurer/mage/pre_equip(mob/living/carbon/human/H)
..()
+
head = /obj/item/clothing/head/roguetown/roguehood/mage
- shoes = /obj/item/clothing/shoes/roguetown/simpleshoes
+ r_hand = /obj/item/rogueweapon/polearm/woodstaff
armor = /obj/item/clothing/suit/roguetown/shirt/robe/mage
belt = /obj/item/storage/belt/rogue/leather/rope
+ shoes = /obj/item/clothing/shoes/roguetown/simpleshoes
backr = /obj/item/storage/backpack/rogue/satchel
beltl = /obj/item/reagent_containers/glass/bottle/rogue/manapot
- r_hand = /obj/item/rogueweapon/polearm/woodstaff
+
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE)
@@ -40,11 +42,14 @@
backl = /obj/item/storage/backpack/rogue/backpack
H.mind.adjust_skillrank(/datum/skill/magic/arcane, 1, TRUE)
H.change_stat("intelligence", 1)
- H.change_stat("strength", -2)
- H.change_stat("intelligence", 3)
- H.change_stat("constitution", -2)
- H.change_stat("endurance", -1)
- H.change_stat("speed", -2)
+
H.mind.adjust_spellpoints(7)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/self/learnspell)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/touch/prestidigitation)
+
+ H.change_stat("strength", -2)
+ H.change_stat("intelligence", 3)
+ H.change_stat("constitution", -2)
+ H.change_stat("endurance", -1)
+ H.change_stat("speed", -2)
+
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm
index 16eaed140b..0e30eb236c 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm
@@ -21,12 +21,12 @@
..()
head = /obj/item/clothing/head/roguetown/roguehood/brown
neck = /obj/item/clothing/neck/roguetown/psycross/silver/ravox
- shoes = /obj/item/clothing/shoes/roguetown/shortboots
cloak = /obj/item/clothing/cloak/raincloak/furcloak/brown
- armor = /obj/item/clothing/suit/roguetown/shirt/robe/plain
wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
+ armor = /obj/item/clothing/suit/roguetown/shirt/robe/plain
belt = /obj/item/storage/belt/rogue/leather/rope
beltr = /obj/item/storage/belt/rogue/pouch/coins/poor
+ shoes = /obj/item/clothing/shoes/roguetown/shortboots
backl = /obj/item/storage/backpack/rogue/backpack
backr = /obj/item/rogueweapon/polearm/woodstaff
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm
index 7aa22fd3b1..43f7e45a4b 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm
@@ -17,50 +17,54 @@
/datum/outfit/job/roguetown/adventurer/ranger/pre_equip(mob/living/carbon/human/H)
..()
- shoes = /obj/item/clothing/shoes/roguetown/boots/leather
- H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE)
- H.mind.adjust_skillrank(/datum/skill/labor/taming, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
+
+ cloak = /obj/item/clothing/cloak/raincloak/brown
+ if(prob(33))
+ cloak = /obj/item/clothing/cloak/raincloak/green
+ wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
+ gloves = /obj/item/clothing/gloves/roguetown/fingerless
+ if(prob(23))
+ gloves = /obj/item/clothing/gloves/roguetown/leather
+ armor = /obj/item/clothing/suit/roguetown/armor/leather/hide
+ shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt
+ belt = /obj/item/storage/belt/rogue/leather
+ beltr = /obj/item/flashlight/flare/torch/lantern
+ beltl = /obj/item/quiver/arrows
if(H.gender == MALE)
pants = /obj/item/clothing/under/roguetown/trou/leather
- shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt
else
pants = /obj/item/clothing/under/roguetown/tights
if(prob(50))
pants = /obj/item/clothing/under/roguetown/tights/black
- shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt
- if(prob(23))
- gloves = /obj/item/clothing/gloves/roguetown/leather
- else
- gloves = /obj/item/clothing/gloves/roguetown/fingerless
- wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
- belt = /obj/item/storage/belt/rogue/leather
- armor = /obj/item/clothing/suit/roguetown/armor/leather/hide
- cloak = /obj/item/clothing/cloak/raincloak/brown
- if(prob(33))
- cloak = /obj/item/clothing/cloak/raincloak/green
+ shoes = /obj/item/clothing/shoes/roguetown/boots/leather
backr = /obj/item/gun/ballistic/revolver/grenadelauncher/bow
backl = /obj/item/storage/backpack/rogue/satchel
- beltr = /obj/item/flashlight/flare/torch/lantern
backpack_contents = list(/obj/item/bait = 1, /obj/item/rogueweapon/knife/hunting = 1)
- beltl = /obj/item/quiver/arrows
+
+ if(H.mind)
+ H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/labor/taming, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
+
H.change_stat("perception", 2)
H.change_stat("endurance", 1)
H.change_stat("speed", 1)
+
ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
+
if(prob(25))
if(!H.has_language(/datum/language/elvish))
H.grant_language(/datum/language/elvish)
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/qatil.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/qatil.dm
index fc2be8ff16..b92d26df6f 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/qatil.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/qatil.dm
@@ -19,6 +19,17 @@
/datum/outfit/job/roguetown/adventurer/qatil/pre_equip(mob/living/carbon/human/H)
..()
+
+ head = /obj/item/clothing/neck/roguetown/keffiyeh/red
+ gloves = /obj/item/clothing/gloves/roguetown/angle
+ armor = /obj/item/clothing/suit/roguetown/armor/leather/splint
+ shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/red
+ belt = /obj/item/storage/belt/rogue/leather/shalal
+ beltr = /obj/item/rogueweapon/knife/dagger/steel/special
+ beltl = /obj/item/storage/belt/rogue/pouch/burglar
+ pants = /obj/item/clothing/under/roguetown/trou/leather
+ shoes = /obj/item/clothing/shoes/roguetown/shalal
+
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/combat/knives, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE)
@@ -34,20 +45,11 @@
H.mind.adjust_skillrank(/datum/skill/misc/stealing, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE)
- H.change_stat("strength", 1)
- H.change_stat("speed", 2)
- H.change_stat("endurance", 1)
- pants = /obj/item/clothing/under/roguetown/trou/leather
- beltr = /obj/item/rogueweapon/knife/dagger/steel/special
- shoes = /obj/item/clothing/shoes/roguetown/shalal
- gloves = /obj/item/clothing/gloves/roguetown/angle
- belt = /obj/item/storage/belt/rogue/leather/shalal
- shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/red
- armor = /obj/item/clothing/suit/roguetown/armor/leather/splint
- backl = /obj/item/storage/backpack/rogue/satchel
- head = /obj/item/clothing/neck/roguetown/keffiyeh/red
- backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/poor, /obj/item/lockpick)
+ H.change_stat("strength", 1)
+ H.change_stat("speed", 2)
+ H.change_stat("endurance", 1)
+
if(!H.has_language(/datum/language/zybantine))
H.grant_language(/datum/language/zybantine)
to_chat(H, "I can speak Zybean with ,z before my speech.")
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm
index 9697705b79..cffabf932e 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm
@@ -22,9 +22,26 @@
horse = /mob/living/simple_animal/hostile/retaliate/rogue/saiga/tame/saddled
return ..()
-
/datum/outfit/job/roguetown/adventurer/sentinel/pre_equip(mob/living/carbon/human/H)
..()
+
+ head = /obj/item/clothing/head/roguetown/helmet/leather
+ neck = /obj/item/clothing/neck/roguetown/chaincoif
+ gloves = /obj/item/clothing/gloves/roguetown/angle
+ armor = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk
+ shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/random
+ belt = /obj/item/storage/belt/rogue/leather
+ beltl = /obj/item/quiver/arrows
+ if(H.gender == MALE)
+ pants = /obj/item/clothing/under/roguetown/trou/leather
+ else
+ pants = /obj/item/clothing/under/roguetown/tights
+ if(prob(50))
+ pants = /obj/item/clothing/under/roguetown/tights/black
+ shoes = /obj/item/clothing/shoes/roguetown/ridingboots
+ backr = /obj/item/gun/ballistic/revolver/grenadelauncher/bow/long
+ backl = /obj/item/rogueweapon/polearm/spear
+
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
@@ -36,26 +53,11 @@
H.mind.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)
- H.change_stat("strength", 1)
- H.change_stat("perception", 2)
- H.change_stat("speed", 1)
- if(H.gender == MALE)
- pants = /obj/item/clothing/under/roguetown/trou/leather
- else
- pants = /obj/item/clothing/under/roguetown/tights
- if(prob(50))
- pants = /obj/item/clothing/under/roguetown/tights/black
- backr = /obj/item/gun/ballistic/revolver/grenadelauncher/bow/long
- beltl = /obj/item/quiver/arrows
- shoes = /obj/item/clothing/shoes/roguetown/ridingboots
- gloves = /obj/item/clothing/gloves/roguetown/angle
- belt = /obj/item/storage/belt/rogue/leather
- shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/random
- armor = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk
- backl = /obj/item/rogueweapon/polearm/spear
- head = /obj/item/clothing/head/roguetown/helmet/leather
- neck = /obj/item/clothing/neck/roguetown/chaincoif
+ H.change_stat("strength", 1)
+ H.change_stat("perception", 2)
+ H.change_stat("speed", 1)
+
if(prob(33))
if(!H.has_language(/datum/language/elvish))
H.grant_language(/datum/language/elvish)
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/swashbuckler.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/swashbuckler.dm
index 68ade6cd20..dac82e065d 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/swashbuckler.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/swashbuckler.dm
@@ -2,7 +2,9 @@
/datum/advclass/combat/swashbuckler
name = "Swashbuckler"
- tutorial = "Woe the Sea King! You awake, dazed from a true festivity of revelry and feasting. The last thing you remember? Your mateys dumping you over the side of the boat as a joke. Now on some Gods foresaken rock, Abyssor will present you with booty and fun, no doubt."
+ tutorial = "Woe the Sea King! You awake, dazed from a true festivity of revelry and feasting.
\
+ The last thing you remember? Your mateys dumping you over the side of the boat as a joke.
\
+ Now on some Gods foresaken rock, Abyssor will present you with booty and fun, no doubt."
allowed_sexes = list(MALE, FEMALE)
allowed_races = list(
"Humen",
@@ -18,15 +20,15 @@
category_tags = list(CTAG_ADVENTURER)
/datum/outfit/job/roguetown/adventurer/swashbuckler
+
+ neck = /obj/item/clothing/neck/roguetown/chaincoif
+ armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/sea
pants = /obj/item/clothing/under/roguetown/tights/sailor
belt = /obj/item/storage/belt/rogue/leather
- armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/sea
- backl = /obj/item/storage/backpack/rogue/satchel
- backr = /obj/item/quiver/bolts
- beltl = /obj/item/rogueweapon/sword/sabre/cutlass
- backr = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow
+ beltr = /obj/item/rogueweapon/sword/sabre/cutlass
+ beltl = /obj/item/quiver/bolts
shoes = /obj/item/clothing/shoes/roguetown/boots
- neck = /obj/item/clothing/neck/roguetown/chaincoif
+ backr = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow
/datum/outfit/job/roguetown/adventurer/swashbuckler/pre_equip(mob/living/carbon/human/H)
..()
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/treasurehunter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/treasurehunter.dm
index 1938557131..9b3276f77c 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/treasurehunter.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/treasurehunter.dm
@@ -19,21 +19,24 @@
/datum/outfit/job/roguetown/adventurer/gravedigger/pre_equip(mob/living/carbon/human/H)
..()
- pants = /obj/item/clothing/under/roguetown/tights/black
- armor = /obj/item/clothing/suit/roguetown/armor/leather/vest/black
- shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black
- backl = /obj/item/storage/backpack/rogue/satchel
- belt = /obj/item/storage/belt/rogue/leather/rope
- backpack_contents = list(/obj/item/rogueweapon/pick = 1, /obj/item/rogueweapon/knife/hunting = 1, /obj/item/lockpickring/mundane)
- gloves = /obj/item/clothing/gloves/roguetown/fingerless
+
+ head = /obj/item/clothing/head/roguetown/helmet/leather/inquisitor
+ neck = /obj/item/storage/belt/rogue/pouch
cloak = /obj/item/clothing/cloak/raincloak/mortus
+ gloves = /obj/item/clothing/gloves/roguetown/fingerless
armor = /obj/item/clothing/suit/roguetown/armor/leather
- shoes = /obj/item/clothing/shoes/roguetown/boots/leather
+ if(prob(50))
+ armor = /obj/item/clothing/suit/roguetown/armor/leather/vest/black
+ shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black
+ belt = /obj/item/storage/belt/rogue/leather/rope
beltr = /obj/item/flashlight/flare/torch/lantern
beltl = /obj/item/rogueweapon/whip // You know why.
+ pants = /obj/item/clothing/under/roguetown/tights/black
+ shoes = /obj/item/clothing/shoes/roguetown/boots/leather
backr = /obj/item/rogueweapon/shovel
- head = /obj/item/clothing/head/roguetown/helmet/leather/inquisitor
- neck = /obj/item/storage/belt/rogue/pouch
+ backl = /obj/item/storage/backpack/rogue/satchel
+ backpack_contents = list(/obj/item/rogueweapon/pick = 1, /obj/item/rogueweapon/knife/hunting = 1, /obj/item/lockpickring/mundane)
+
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE)
@@ -48,12 +51,14 @@
H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
- H.change_stat("strength", 1)
- H.change_stat("perception", 2)
- H.change_stat("intelligence", 1)
- H.change_stat("endurance", 2)
- H.change_stat("speed", 1)
- H.change_stat("fortune", -1) // Tradeoff for never being cursed when graverobbing.
- ADD_TRAIT(H, TRAIT_NOSTINK, TRAIT_GENERIC)
- ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
- ADD_TRAIT(H, TRAIT_GRAVEROBBER, TRAIT_GENERIC)
+
+ H.change_stat("strength", 1)
+ H.change_stat("perception", 2)
+ H.change_stat("intelligence", 1)
+ H.change_stat("endurance", 2)
+ H.change_stat("speed", 1)
+ H.change_stat("fortune", -1) // Tradeoff for never being cursed when graverobbing.
+
+ ADD_TRAIT(H, TRAIT_NOSTINK, TRAIT_GENERIC)
+ ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
+ ADD_TRAIT(H, TRAIT_GRAVEROBBER, TRAIT_GENERIC)
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm
index abb92c8f64..3ca69e0240 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm
@@ -1,7 +1,9 @@
/datum/advclass/combat/puritan
name = "Witch Hunter"
- tutorial = "Witch Hunters dedicate their lives to the eradication of the varied evils infesting Grimoria. They know the vile sorcery of the necromancer, the insidious nature of the cultist and monstrousness of vampires and werevolfs. They also know how best to end them."
+ tutorial = "Witch Hunters dedicate their lives to the eradication of the varied evils infesting Grimoria.
\
+ They know the vile sorcery of the necromancer, the insidious nature of the cultist and monstrousness of vampires and werevolfs.
\
+ They also know how best to end them."
allowed_sexes = list(MALE, FEMALE)
allowed_races = list(
"Humen",
@@ -20,16 +22,17 @@
/datum/outfit/job/roguetown/adventurer/puritan/pre_equip(mob/living/carbon/human/H)
..()
- shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/puritan
- belt = /obj/item/storage/belt/rogue/leather
- shoes = /obj/item/clothing/shoes/roguetown/boots
- pants = /obj/item/clothing/under/roguetown/tights/black
- cloak = /obj/item/clothing/cloak/cape/puritan
+
head = /obj/item/clothing/head/roguetown/helmet/leather/inquisitor
+ neck = /obj/item/clothing/neck/roguetown/chaincoif
+ cloak = /obj/item/clothing/cloak/cape/puritan
gloves = /obj/item/clothing/gloves/roguetown/leather
+ shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/puritan
+ belt = /obj/item/storage/belt/rogue/leather
beltl = /obj/item/rogueweapon/whip/antique/silver
beltr = /obj/item/rogueweapon/sword/rapier/silver
- neck = /obj/item/clothing/neck/roguetown/chaincoif
+ shoes = /obj/item/clothing/shoes/roguetown/boots
+ pants = /obj/item/clothing/under/roguetown/tights/black
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE)
@@ -45,10 +48,7 @@
H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
- H.change_stat("intelligence", 1)
- H.change_stat("strength", 1)
- H.change_stat("perception", 2)
- H.change_stat("constitution", 2)
+
switch(H.patron?.name)
if("Astrata")
wrists = /obj/item/clothing/neck/roguetown/psycross/silver/astrata
@@ -58,6 +58,13 @@
wrists = /obj/item/clothing/neck/roguetown/psycross/silver/pestra
else
wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
+
+ H.change_stat("intelligence", 1)
+ H.change_stat("strength", 1)
+ H.change_stat("perception", 2)
+ H.change_stat("constitution", 2)
+
H.verbs |= /mob/living/carbon/human/proc/torture_victim
+
ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC) //If they have torture variables, they shouldn't be effected by stuff.
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm
index e866b010f0..91f098afb4 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm
@@ -17,42 +17,46 @@
/datum/outfit/job/roguetown/adventurer/rogue/pre_equip(mob/living/carbon/human/H)
..()
- shoes = /obj/item/clothing/shoes/roguetown/boots
- H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/climbing, 5, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/reading, pick(0,1,1), TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 5, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE)
- pants = /obj/item/clothing/under/roguetown/trou/leather
- shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black
+
+ if(prob(30))
+ mask = /obj/item/clothing/mask/rogue/shepherd/rag
+ neck = /obj/item/clothing/neck/roguetown/coif
+ cloak = /obj/item/clothing/cloak/raincloak/mortus
gloves = /obj/item/clothing/gloves/roguetown/leather
if(prob(30))
gloves = /obj/item/clothing/gloves/roguetown/fingerless
- belt = /obj/item/storage/belt/rogue/leather
armor = /obj/item/clothing/suit/roguetown/armor/leather
- cloak = /obj/item/clothing/cloak/raincloak/mortus
- backl = /obj/item/storage/backpack/rogue/satchel
+ shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black
+ belt = /obj/item/storage/belt/rogue/leather/rope
beltr = /obj/item/rogueweapon/knife/dagger/steel
backr = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow
beltl = /obj/item/quiver/bolts
- neck = /obj/item/clothing/neck/roguetown/coif
- if(prob(30))
- mask = /obj/item/clothing/mask/rogue/shepherd/rag
-
+ pants = /obj/item/clothing/under/roguetown/trou/leather
+ shoes = /obj/item/clothing/shoes/roguetown/boots
+ backl = /obj/item/storage/backpack/rogue/satchel
backpack_contents = list(/obj/item/lockpick = 1, /obj/item/rogueweapon/mace/cudgel = 1)
- ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
- ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC) //Rogues are known for commonly lacking standard morals, as well as seeing fucked-shit, so - this tracks.
+
+ if(H.mind)
+ H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/climbing, 5, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/reading, pick(0,1,1), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 5, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE)
+
H.change_stat("strength", -1)
H.change_stat("perception", 2)
H.change_stat("speed", 2)
+
+ ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
+ ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm
index 80f4812d6b..e41fdfc23b 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm
@@ -1,4 +1,5 @@
-//shield sword
+// Onehanded weapon and shield, medium-low armor, one skill 50/50 of being 4 but loads of variety in skills so can pick up most weapons
+
/datum/advclass/combat/sfighter
name = "Warrior"
tutorial = "Wandering sellswords, foolhardy gloryhounds, deserters... many and varied folk turn to the path of the warrior. Very few meet anything greater than the bottom of a tankard or the wrong end of a noose."
@@ -19,52 +20,24 @@
/datum/outfit/job/roguetown/adventurer/sfighter/pre_equip(mob/living/carbon/human/H)
..()
- H.mind.adjust_skillrank(/datum/skill/combat/crossbows, pick(1,2), TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/bows, pick(1,2), TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/knives, pick(1,1,2), TRUE)
- H.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/riding, pick(1,1,2), TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/reading, pick(0,1,1), TRUE)
- if(H.gender == FEMALE)
- H.underwear = "Femleotard"
- H.underwear_color = CLOTHING_SOOT_BLACK
- H.update_body()
shoes = /obj/item/clothing/shoes/roguetown/boots
- gloves = /obj/item/clothing/gloves/roguetown/leather
belt = /obj/item/storage/belt/rogue/leather
pants = /obj/item/clothing/under/roguetown/tights/black
- backl = /obj/item/storage/backpack/rogue/satchel
backr = /obj/item/rogueweapon/shield/wood
beltr = /obj/item/storage/belt/rogue/pouch/coins/poor
- var/armortype = pickweight(list("Ironmail" = 6, "Ironplate" = 3, "Ironplate&Legs" = 1)) // At best they can get an iron breastplate over mail and iron chainleggings
- var/weapontype = pickweight(list("Axe" = 2, "Mace" = 2, "Messer" = 2, "Sword" = 3, "Flail" = 1)) // Rolls for various weapons, all of these are iron tier
- switch(armortype)
- if("Ironmail")
- armor = /obj/item/clothing/suit/roguetown/armor/chainmail/iron
- shirt = /obj/item/clothing/suit/roguetown/armor/gambeson
- if("Ironplate")
- armor = /obj/item/clothing/suit/roguetown/armor/cuirass/iron
- shirt = /obj/item/clothing/suit/roguetown/armor/gambeson/heavy
- if("Ironplate&Legs") // Big roller gets an iron cuirass over iron mail AND iron chain leggings. Lucky them
- armor = /obj/item/clothing/suit/roguetown/armor/cuirass/iron
- shirt = /obj/item/clothing/suit/roguetown/armor/chainmail/iron
- pants = /obj/item/clothing/under/roguetown/chainlegs/iron
+ if(prob(50))
+ pants = /obj/item/clothing/under/roguetown/trou/leather
+ if(prob(50))
+ gloves = /obj/item/clothing/gloves/roguetown/leather
+ var/armortype = pickweight(list("Ironmail" = 3, "Ironplate" = 1, "Leather&Legs" = 2)) // At best they can get an iron breastplate over mail and iron chainleggings
+ var/weapontype = pickweight(list("Axe" = 2, "Messer" = 2, "Sword" = 3, "Flail" = 1)) // Rolls for various weapons, all of these are iron tier
+ var/helmettype = pickweight(list("Leather" = 1, "Pot" = 2, "Plate" = 1))
+ var/necktype = pickweight(list("None" = 2,"Padded" = 1, "Leather" = 2, "Coif" = 1))
switch(weapontype) // We get +1 weapon skill in either axes/maces, swords, or flails depending on our starting weapon
if("Axe")
beltl = /obj/item/rogueweapon/axe/iron
H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE)
- if("Mace")
- beltl = /obj/item/rogueweapon/mace
- H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE)
if("Messer")
beltl = /obj/item/rogueweapon/sword/scimitar/messer
H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
@@ -74,16 +47,64 @@
if("Flail") // Big roller gets one of the best weapons to pair with a shield, even if it is only iron tier. Lucky bastard
beltl = /obj/item/rogueweapon/flail
H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE)
+ switch(helmettype)
+ if("Leather")
+ head = /obj/item/clothing/head/roguetown/helmet/leather/conical
+ if("Pot")
+ head = /obj/item/clothing/head/roguetown/helmet/ironpot
+ if("Plate")
+ head = /obj/item/clothing/head/roguetown/helmet/heavy/ironplate
+ switch(necktype)
+ if("None")
+ if("Padded")
+ neck = /obj/item/clothing/neck/roguetown/coif/cloth
+ if("Leather")
+ neck = /obj/item/clothing/neck/roguetown/coif
+ if("Coif")
+ neck = /obj/item/clothing/neck/roguetown/chaincoif/iron
+ switch(armortype)
+ if("Ironmail")
+ armor = /obj/item/clothing/suit/roguetown/armor/chainmail/iron
+ shirt = /obj/item/clothing/suit/roguetown/armor/gambeson/light
+ if("Ironplate")
+ if(prob(30))
+ neck = /obj/item/clothing/neck/roguetown/gorget
+ armor = /obj/item/clothing/suit/roguetown/armor/cuirass/iron
+ shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/random
+ wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
+ if("Leather&Legs")
+ armor = /obj/item/clothing/suit/roguetown/armor/leather
+ shirt = /obj/item/clothing/suit/roguetown/armor/gambeson
+ pants = /obj/item/clothing/under/roguetown/chainlegs/iron
- if(prob(66))
- neck = /obj/item/clothing/neck/roguetown/gorget
- head = /obj/item/clothing/head/roguetown/helmet/kettle
- else // High roller gets an iron chain coif and nasal helmet
- neck = /obj/item/clothing/neck/roguetown/chaincoif/iron
- head = /obj/item/clothing/head/roguetown/helmet/nasal
+ if(H.gender == FEMALE)
+ H.underwear = "Femleotard"
+ H.underwear_color = CLOTHING_SOOT_BLACK
+ H.update_body()
+ if(H.dna.species.id == "dwarf")
+ head = /obj/item/clothing/head/roguetown/helmet/winged
+ H.cmode_music = 'sound/music/combat_dwarf.ogg'
+ if(prob(10))
+ mask = /obj/item/clothing/mask/rogue/facemask
+
+ if(H.mind)
+ H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, pick(2,3), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, pick(2,3), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/swords, pick(2,3), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/knives, pick(1,2), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/riding, pick(1,1,2), TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/reading, pick(0,1), TRUE)
H.change_stat("strength", 2)
H.change_stat("endurance", 1)
H.change_stat("constitution", 1)
- H.change_stat("intelligence", -1) // Muscle brains
+
ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) // MEDIUM armor training only, this is not a rare drifter, they shouldn't have more armor training than a garrison guard
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/blacksmith.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/blacksmith.dm
index e3063d200c..2898be261a 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/blacksmith.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/blacksmith.dm
@@ -1,5 +1,5 @@
/datum/advclass/pilgrim/blacksmith
- name = "Wandering smith"
+ name = "Wandering Smith"
tutorial = "Hardy worksmen that are at home in the forge, dedicating their lives \
to ceaselessly toil in dedication to Malum."
allowed_sexes = list(MALE, FEMALE)
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/cheesemaker.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/cheesemaker.dm
index aa5d5e285b..77c6566db8 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/cheesemaker.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/cheesemaker.dm
@@ -14,7 +14,7 @@
)
outfit = /datum/outfit/job/roguetown/adventurer/cheesemaker
- category_tags = list(CTAG_PILGRIM, CTAG_TOWNER)
+ category_tags = list(CTAG_PILGRIM)
/datum/outfit/job/roguetown/adventurer/cheesemaker/pre_equip(mob/living/carbon/human/H)
..()
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/physicker.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/physicker.dm
index 7f968a89d1..f930541c99 100644
--- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/physicker.dm
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/physicker.dm
@@ -1,5 +1,5 @@
/datum/advclass/pilgrim/physicker
- name = "Physicker"
+ name = "Wandering Physicker"
tutorial = "Those who fail their studies, or are exiled from the towns they take \
residence as feldshers in, often end up becoming wandering physickers. \
Capable doctors nonetheless, they journey from place to place offering \
@@ -20,16 +20,20 @@
/datum/outfit/job/roguetown/adventurer/physicker/pre_equip(mob/living/carbon/human/H)
..()
- mask = /obj/item/clothing/mask/rogue/phys
head = /obj/item/clothing/head/roguetown/roguehood/phys
- shoes = /obj/item/clothing/shoes/roguetown/boots/leather
+ mask = /obj/item/clothing/mask/rogue/phys
+ neck = /obj/item/clothing/neck/roguetown/phys
+ armor = /obj/item/clothing/suit/roguetown/shirt/robe/phys
shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black
- backr = /obj/item/storage/backpack/rogue/satchel
- pants = /obj/item/clothing/under/roguetown/tights/random
gloves = /obj/item/clothing/gloves/roguetown/leather/phys
- armor = /obj/item/clothing/suit/roguetown/shirt/robe/phys
- neck = /obj/item/clothing/neck/roguetown/phys
- r_hand = /obj/item/storage/backpack/rogue/satchel/surgbag
+ belt = /obj/item/storage/belt/rogue/leather/rope
+ beltr = /obj/item/rogueweapon/knife/cleaver/combat
+ beltl = /obj/item/storage/belt/rogue/pouch/coins/poor
+ pants = /obj/item/clothing/under/roguetown/tights/random
+ shoes = /obj/item/clothing/shoes/roguetown/boots/leather
+ backr = /obj/item/storage/backpack/rogue/satchel
+ backl = /obj/item/storage/backpack/rogue/satchel/surgbag
+ backpack_contents = list(/obj/item/sleepingbag = 1)
H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE)
@@ -37,8 +41,11 @@
H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE)
if(H.age == AGE_OLD)
- H.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE)
+ H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/diagnose)
+
H.change_stat("intelligence", 2)
H.change_stat("speed", 1)
ADD_TRAIT(H, TRAIT_EMPATH, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_NOSTINK, TRAIT_GENERIC)
+ ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
diff --git a/code/modules/jobs/job_types/roguetown/apprentices/squire.dm b/code/modules/jobs/job_types/roguetown/apprentices/squire.dm
index 578a631d9d..1fdb3ac445 100644
--- a/code/modules/jobs/job_types/roguetown/apprentices/squire.dm
+++ b/code/modules/jobs/job_types/roguetown/apprentices/squire.dm
@@ -22,7 +22,7 @@
give_bank_account = TRUE
min_pq = 0
bypass_lastclass = TRUE
- selection_color = "#304529"
+ selection_color = "#6b8063"
/datum/outfit/job/roguetown/squire/pre_equip(mob/living/carbon/human/H)
..()
diff --git a/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm b/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm
index 2151316f63..0a9a3028d7 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm
+++ b/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm
@@ -12,14 +12,11 @@
give_bank_account = 100
min_pq = 1
- //Reason all races allowed is you are basically a very talented court physician; even 'lower races' would find this to be one of the only ways to obtain a sort of nobility.
allowed_races = list(
"Humen",
"Elf",
"Half-Elf",
"Dwarf",
- "Tiefling",
- "Dark Elf",
"Aasimar"
)
allowed_sexes = list(MALE, FEMALE)
@@ -52,10 +49,19 @@
if(H.age == AGE_OLD)
H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE)
+ H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/diagnose)
H.change_stat("strength", -1)
H.change_stat("intelligence", 4)
H.change_stat("constitution", -1)
- ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_EMPATH, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_NOSTINK, TRAIT_GENERIC)
+
+/* ................. Unique Feldsher recipes ................... */
+/datum/crafting_recipe/nitmaiden_license
+ name = "Nitemaiden health license"
+ time = 4 SECONDS
+ reqs = list(/obj/item/paper = 1,
+ /obj/item/natural/feather = 1)
+ result = /obj/item/paper/feldsher_certificate
+ category = CAT_NONE
diff --git a/code/modules/jobs/job_types/roguetown/nobility/lord.dm b/code/modules/jobs/job_types/roguetown/nobility/lord.dm
index 479488da2f..d36fe14545 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/lord.dm
+++ b/code/modules/jobs/job_types/roguetown/nobility/lord.dm
@@ -19,7 +19,7 @@
whitelist_req = FALSE
min_pq = 4
give_bank_account = 500
- selection_color = "#7851A9"
+ selection_color = "#786194"
cmode_music = 'sound/music/combat_noble.ogg'
diff --git a/code/modules/jobs/job_types/roguetown/nobility/merchant.dm b/code/modules/jobs/job_types/roguetown/nobility/merchant.dm
index 441c047eb4..1df2652a05 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/merchant.dm
+++ b/code/modules/jobs/job_types/roguetown/nobility/merchant.dm
@@ -24,7 +24,7 @@
bypass_lastclass = TRUE
give_bank_account = 100
min_pq = 0
- selection_color = "#565ea0"
+ selection_color = "#61679d"
/datum/outfit/job/roguetown/merchant/pre_equip(mob/living/carbon/human/H)
..()
diff --git a/code/modules/jobs/job_types/roguetown/nobility/nightman.dm b/code/modules/jobs/job_types/roguetown/nobility/nightman.dm
index 62aaa56a94..fc3f9cbae7 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/nightman.dm
+++ b/code/modules/jobs/job_types/roguetown/nobility/nightman.dm
@@ -1,60 +1,65 @@
/datum/job/roguetown/niteman
title = "Niteman"
flag = NIGHTMAN
- department_flag = NOBLEMEN
+ department_flag = TOWNERS
faction = "Station"
total_positions = 1
spawn_positions = 1
- f_title = "Nitematron"
allowed_races = list(
"Humen",
"Dwarf",
"Elf",
"Half-Elf",
- "Tiefling",
- "Dark Elf",
- "Aasimar"
)
- tutorial = "You are renting out the bath-house in a joint operation with the Innkeep. Providing security for the bathwenches and helping them find work, or a troublemaking rake that the others hate to tolerate."
+ tutorial = "Even nobles can be disgraced and fall on hard times, despite inheriting a fine bathhouse building.
\
+ For whatever reason you have traded your reputation for a supply of drugs and nitemaidens to employ and profit from. The licenses can be bought from the Feldsher, or just make a forgery yourself to save money.
\
+ Some accuse you of have connections with the Rogues and Bandits of the land but surely its just slander..."
- allowed_sexes = list(MALE, FEMALE)
+ allowed_sexes = list(MALE)
outfit = /datum/outfit/job/roguetown/niteman
display_order = JDO_NITEMAN
- give_bank_account = 100
- min_pq = 1
+ give_bank_account = 120
+ min_pq = 0
bypass_lastclass = TRUE
/datum/outfit/job/roguetown/niteman/pre_equip(mob/living/carbon/human/H)
..()
+ head = /obj/item/clothing/head/roguetown/roguehood/brown
armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/niteman
- shoes = /obj/item/clothing/shoes/roguetown/shortboots
- belt = /obj/item/storage/belt/rogue/leather/rope
- beltr = /obj/item/keyring/niteman
- beltl = /obj/item/storage/belt/rogue/pouch/coins/mid
+ shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/webs
+ pants = /obj/item/clothing/under/roguetown/trou/leather
+ shoes = /obj/item/clothing/shoes/roguetown/nobleboot
+ belt = /obj/item/storage/belt/rogue/leather/nitemaster
+ beltr = /obj/item/rogueweapon/knife/dagger/steel/special
+ beltl = /obj/item/keyring/niteman
ADD_TRAIT(H, TRAIT_GOODLOVER, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC)
if(H.mind)
- H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) // Need the strongarm to wrestle people out of the baths
- H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) // Don't make me regret these levels.
+ H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE)
- H.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE)
+ H.mind.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
- H.change_stat("strength", 1)
- H.change_stat("intelligence", -1)
+ H.change_stat("speed", 1)
+ H.change_stat("intelligence", 1)
+ H.change_stat("perception", 2)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/forgery_nitmaiden)
+ if(H.dna?.species)
+ if(H.dna.species.id == "human")
+ H.dna.species.soundpack_m = new /datum/voicepack/male/zeth()
+
+/* ................. Unique Nitemaster recipes ................... */
+/datum/crafting_recipe/forgery_nitmaiden
+ name = "Forge nitemaiden license"
+ time = 4 SECONDS
+ reqs = list(/obj/item/paper = 1,
+ /obj/item/natural/feather = 1)
+ result = /obj/item/paper/feldsher_certificate/fake
+ category = CAT_NONE
- if(H.gender == MALE)
- pants = /obj/item/clothing/under/roguetown/trou/leather
- armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/niteman
- if(H.dna?.species)
- if(H.dna.species.id == "human")
- H.dna.species.soundpack_m = new /datum/voicepack/male/zeth()
- if(H.dna.species.id == "elf")
- armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/sea
- if(H.dna.species.id == "dwarf")
- armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/sea
- else
- pants = /obj/item/clothing/under/roguetown/tights
diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/anthrax.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/anthrax.dm
index 6d1dafb642..9316269490 100644
--- a/code/modules/jobs/job_types/roguetown/other/merc_classes/anthrax.dm
+++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/anthrax.dm
@@ -11,11 +11,13 @@
/datum/outfit/job/roguetown/mercenary/anthrax/pre_equip(mob/living/carbon/human/H)
..()
- shoes = /obj/item/clothing/shoes/roguetown/boots
+
belt = /obj/item/storage/belt/rogue/leather/black
pants = /obj/item/clothing/under/roguetown/trou/shadowpants
+ shoes = /obj/item/clothing/shoes/roguetown/boots
backl = /obj/item/storage/backpack/rogue/satchel
- backpack_contents = list(/obj/item/roguekey/mercenary, /obj/item/storage/belt/rogue/pouch/coins/poor, /obj/item/rogueweapon/knife/dagger/steel/dirk)
+ backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/poor, /obj/item/rogueweapon/knife/dagger/steel/dirk)
+
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE)
@@ -31,11 +33,11 @@
H.verbs |= /mob/living/carbon/human/proc/torture_victim //Secret police training owing to their origins.
if(H.gender == FEMALE) //Melee defense-oriented brute, heavy lean towards non-lethal takedowns and capture.
- armor = /obj/item/clothing/suit/roguetown/armor/cuirass/iron/shadowplate
- gloves = /obj/item/clothing/gloves/roguetown/chain/iron/shadowgauntlets
- wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
mask = /obj/item/clothing/mask/rogue/facemask/shadowfacemask
neck = /obj/item/clothing/neck/roguetown/gorget
+ gloves = /obj/item/clothing/gloves/roguetown/chain/iron/shadowgauntlets
+ wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
+ armor = /obj/item/clothing/suit/roguetown/armor/cuirass/iron/shadowplate
backr = /obj/item/rogueweapon/shield/tower/spidershield
beltr = /obj/item/rogueweapon/whip/spiderwhip
@@ -52,15 +54,15 @@
ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)
if(H.gender == MALE) //Squishy hit-and-runner assassin.
- shirt = /obj/item/clothing/suit/roguetown/shirt/shadowshirt
- armor = /obj/item/clothing/suit/roguetown/armor/gambeson/shadowrobe
- cloak = /obj/item/clothing/cloak/half/shadowcloak
- gloves = /obj/item/clothing/gloves/roguetown/fingerless/shadowgloves
mask = /obj/item/clothing/mask/rogue/shepherd/shadowmask
neck = /obj/item/clothing/neck/roguetown/chaincoif/iron
- backr = /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve //Coupled with the racial PER malus, abysmal damage, but good for poison arrows.
+ cloak = /obj/item/clothing/cloak/half/shadowcloak
+ gloves = /obj/item/clothing/gloves/roguetown/fingerless/shadowgloves
+ armor = /obj/item/clothing/suit/roguetown/armor/gambeson/shadowrobe
+ shirt = /obj/item/clothing/suit/roguetown/shirt/shadowshirt
beltr = /obj/item/quiver/arrows
beltl = /obj/item/rogueweapon/sword/sabre/stalker
+ backr = /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve //Coupled with the racial PER malus, abysmal damage, but good for poison arrows.
H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE)
diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/blackoak.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/blackoak.dm
index 4bcff0f3e3..e4127ee894 100644
--- a/code/modules/jobs/job_types/roguetown/other/merc_classes/blackoak.dm
+++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/blackoak.dm
@@ -16,7 +16,7 @@
cloak = /obj/item/clothing/cloak/half/red
head = /obj/item/clothing/head/roguetown/helmet/sallet/elven
gloves = /obj/item/clothing/gloves/roguetown/angle
- belt = /obj/item/storage/belt/rogue/leather/mercenary/black
+ belt = /obj/item/storage/belt/rogue/leather/merc_nokey/black
armor = /obj/item/clothing/suit/roguetown/armor/cuirass/elven
backr = /obj/item/rogueweapon/polearm/spear
backl = /obj/item/storage/backpack/rogue/satchel
diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/boltslinger.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/boltslinger.dm
index fe0e97a7cc..205128220a 100644
--- a/code/modules/jobs/job_types/roguetown/other/merc_classes/boltslinger.dm
+++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/boltslinger.dm
@@ -18,20 +18,20 @@
/datum/outfit/job/roguetown/mercenary/boltslinger/pre_equip(mob/living/carbon/human/H)
..()
- shoes = /obj/item/clothing/shoes/roguetown/boots/leather
- cloak = /obj/item/clothing/cloak/half
+
head = /obj/item/clothing/head/roguetown/helmet/kettle
+ neck = /obj/item/clothing/neck/roguetown/chaincoif/iron
+ cloak = /obj/item/clothing/cloak/half
gloves = /obj/item/clothing/gloves/roguetown/angle
- belt = /obj/item/storage/belt/rogue/leather/mercenary
armor = /obj/item/clothing/suit/roguetown/armor/cuirass/iron
+ shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black
+ belt = /obj/item/storage/belt/rogue/leather/mercenary
beltr = /obj/item/rogueweapon/sword/iron
beltl = /obj/item/quiver/bolts
- backr = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow
- backl = /obj/item/storage/backpack/rogue/satchel
- shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black
pants = /obj/item/clothing/under/roguetown/tights/black
- neck = /obj/item/clothing/neck/roguetown/chaincoif/iron
- backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/poor, /obj/item/rogueweapon/knife/hunting)
+ shoes = /obj/item/clothing/shoes/roguetown/boots/leather
+ backr = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow
+
if(H.mind)//crossbow mercenary with armor training 4 weapon skills and a ranged weapon
H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE)
@@ -49,8 +49,8 @@
H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
+ H.change_stat("perception", 3)
+ H.change_stat("endurance", 1)
+ H.change_stat("strength", 1)
- H.change_stat("perception", 3)
- H.change_stat("endurance", 1)
- H.change_stat("strength", 1)
ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)
diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/grenzelhoft.dm
index 6cd935be29..31ead079f5 100644
--- a/code/modules/jobs/job_types/roguetown/other/merc_classes/grenzelhoft.dm
+++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/grenzelhoft.dm
@@ -14,6 +14,19 @@
/datum/outfit/job/roguetown/mercenary/grenzelhoft/pre_equip(mob/living/carbon/human/H)
..()
+
+ head = /obj/item/clothing/head/roguetown/helmet/skullcap/grenzelhoft
+ neck = /obj/item/clothing/neck/roguetown/chaincoif/iron
+ gloves = /obj/item/clothing/gloves/roguetown/angle/grenzel
+ armor = /obj/item/clothing/suit/roguetown/armor/cuirass/grenzelhoft
+ shirt = /obj/item/clothing/suit/roguetown/shirt/grenzelhoft
+ belt = /obj/item/storage/belt/rogue/leather/merc_nokey
+ beltr = /obj/item/storage/belt/rogue/pouch/coins/poor
+ beltl = /obj/item/rogueweapon/mace/cudgel
+ pants = /obj/item/clothing/under/roguetown/grenzelpants
+ shoes = /obj/item/clothing/shoes/roguetown/grenzelhoft
+ backr = /obj/item/rogueweapon/sword/long/greatsword/zwei
+
if(H.mind)//big weapon user that can interchange for a mace/shield, 4 weapon skills, warrior has 7 skills
H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE)
@@ -33,30 +46,18 @@
H.underwear = "Femleotard"
H.underwear_color = CLOTHING_SOOT_BLACK
H.update_body()
-
if(H.dna.species.id == "dwarf")
H.skin_tone = SKIN_COLOR_GRENZDWARF
if(H.dna.species.id == "human")
H.skin_tone = SKIN_COLOR_GRENZELHOFT
-
- beltr = /obj/item/storage/belt/rogue/pouch/coins/poor
- neck = /obj/item/clothing/neck/roguetown/chaincoif/iron
- pants = /obj/item/clothing/under/roguetown/grenzelpants
- shoes = /obj/item/clothing/shoes/roguetown/grenzelhoft
- gloves = /obj/item/clothing/gloves/roguetown/angle/grenzel
- belt = /obj/item/storage/belt/rogue/leather/mercenary
- beltl = /obj/item/rogueweapon/mace/cudgel
- shirt = /obj/item/clothing/suit/roguetown/shirt/grenzelhoft
- head = /obj/item/clothing/head/roguetown/helmet/skullcap/grenzelhoft
- armor = /obj/item/clothing/suit/roguetown/armor/cuirass/grenzelhoft
- backl = /obj/item/storage/backpack/rogue/satchel
- backr = /obj/item/rogueweapon/sword/long/greatsword/zwei
if(!H.has_language(/datum/language/oldpsydonic))
H.grant_language(/datum/language/oldpsydonic)
to_chat(H, "I can speak Old Psydonic with ,m before my speech.")
+ H.set_patron(/datum/patron/forgotten) // SCREAM IF YOU LOVE THE FORGOTTEN GOD
H.change_stat("strength", 2) // They need this to roll at least min STR for the Zwei.
H.change_stat("endurance", 1)
H.change_stat("constitution", 2)
+
ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)
- H.set_patron(/datum/patron/forgotten) // SCREAM IF YOU LOVE THE FORGOTTEN GOD
+
diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/marauder.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/marauder.dm
index aff0ed2dc0..d6de07c6aa 100644
--- a/code/modules/jobs/job_types/roguetown/other/merc_classes/marauder.dm
+++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/marauder.dm
@@ -7,8 +7,24 @@
category_tags = list(CTAG_MERCENARY)
maximum_possible_slots = 4
cmode_music = 'sound/music/combat_old.ogg'//soul
+
/datum/outfit/job/roguetown/mercenary/marauder/pre_equip(mob/living/carbon/human/H)//new skirmisher merc class, 4 weapon skills like other merc classes and dodge expert
..()
+
+ head = /obj/item/clothing/head/roguetown/helmet/ironpot/marauder
+ neck = /obj/item/clothing/neck/roguetown/coif
+ wrists = /obj/item/clothing/wrists/roguetown/bracers/leather//leather armor so they match other roles that get heavy leather gloves
+ armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/sea/marauder
+ shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/red
+ belt = /obj/item/storage/belt/rogue/leather/merc_nokey
+ beltr = /obj/item/storage/belt/rogue/pouch/coins/poor
+ beltl = /obj/item/rogueweapon/shield/tower/buckleriron
+ pants = /obj/item/clothing/under/roguetown/loincloth/brown
+ shoes = /obj/item/clothing/shoes/roguetown/gladiator
+ backl = /obj/item/rogueweapon/polearm/spear
+ backr = /obj/item/storage/backpack/rogue/satchel
+ backpack_contents = list(/obj/item/rogueweapon/knife/hunting = 1)
+
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
@@ -23,21 +39,8 @@
H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE)//so they can heal themselves, after all they didn't survived the mercenary life without know how to sew their wounds
- beltr = /obj/item/storage/belt/rogue/pouch/coins/poor
- pants = /obj/item/clothing/under/roguetown/loincloth/brown
- shoes = /obj/item/clothing/shoes/roguetown/gladiator
- belt = /obj/item/storage/belt/rogue/leather/mercenary
- wrists = /obj/item/clothing/wrists/roguetown/bracers/leather//leather armor so they match other roles that get heavy leather gloves
- head = /obj/item/clothing/head/roguetown/helmet/ironpot/marauder
- armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/sea/marauder
- shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/red
- beltl = /obj/item/rogueweapon/shield/tower/buckleriron
- backl = /obj/item/rogueweapon/polearm/spear
- neck = /obj/item/clothing/neck/roguetown/coif
- backr = /obj/item/storage/backpack/rogue/satchel
- backpack_contents = list(/obj/item/rogueweapon/knife/hunting = 1)
-
H.change_stat("perception", 1)
H.change_stat("endurance", 1)
H.change_stat("speed", 1)
+
ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/steppesman.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/steppesman.dm
index 414172160d..90d4d8e0f5 100644
--- a/code/modules/jobs/job_types/roguetown/other/merc_classes/steppesman.dm
+++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/steppesman.dm
@@ -15,21 +15,20 @@
/datum/outfit/job/roguetown/mercenary/steppesman/pre_equip(mob/living/carbon/human/H)
..()
- shoes = /obj/item/clothing/shoes/roguetown/boots/leather
head = /obj/item/clothing/head/roguetown/papakha
- gloves = /obj/item/clothing/gloves/roguetown/leather
- belt = /obj/item/storage/belt/rogue/leather/mercenary/black
- armor = /obj/item/clothing/suit/roguetown/armor/leather/splint
+ neck = /obj/item/clothing/neck/roguetown/coif
cloak = /obj/item/clothing/cloak/raincloak/furcloak
wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
+ gloves = /obj/item/clothing/gloves/roguetown/leather
+ armor = /obj/item/clothing/suit/roguetown/armor/leather/splint
+ shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt
+ belt = /obj/item/storage/belt/rogue/leather/merc_nokey/black
beltr = /obj/item/rogueweapon/sword/sabre
beltl= /obj/item/quiver/arrows
- shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt
pants = /obj/item/clothing/under/roguetown/tights/red
- neck = /obj/item/clothing/neck/roguetown/coif//some light neck and head armor
+ shoes = /obj/item/clothing/shoes/roguetown/boots/leather
backl = /obj/item/gun/ballistic/revolver/grenadelauncher/bow
- backr = /obj/item/storage/backpack/rogue/satchel
- backpack_contents = list(/obj/item/rogueweapon/knife/hunting = 1, /obj/item/storage/belt/rogue/pouch/coins/poor = 1)
+
if(H.mind)//quick fighter that has Dodge Expert and a bow for ranged attacks, 4 weapon skills
H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE)
@@ -47,7 +46,9 @@
H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
+
H.change_stat("perception", 1)
H.change_stat("constitution", 1)
H.change_stat("speed", 1)
+
ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm
index 58504b60a7..1ebfb14f99 100644
--- a/code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm
+++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm
@@ -12,16 +12,16 @@
/datum/outfit/job/roguetown/mercenary/underdweller/pre_equip(mob/living/carbon/human/H)
..()
- pants = /obj/item/clothing/under/roguetown/trou/leather
- armor = /obj/item/clothing/suit/roguetown/armor/cuirass/iron
+ neck = /obj/item/clothing/neck/roguetown/chaincoif/iron
wrists = /obj/item/clothing/wrists/roguetown/bracers/leather//arm armor since they don't get heavy gloves like other mercs do
+ armor = /obj/item/clothing/suit/roguetown/armor/cuirass/iron
shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/sailor/red
- shoes = /obj/item/clothing/shoes/roguetown/boots/leather//mercenary/fighters should get the boots since they give light protection
- belt = /obj/item/storage/belt/rogue/leather/mercenary
+ belt = /obj/item/storage/belt/rogue/leather/merc_nokey
beltr = /obj/item/rogueweapon/knife/hunting
- neck = /obj/item/clothing/neck/roguetown/chaincoif/iron
+ pants = /obj/item/clothing/under/roguetown/trou/leather
+ shoes = /obj/item/clothing/shoes/roguetown/boots/leather
backl = /obj/item/storage/backpack/rogue/backpack
- backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/poor=1)
+
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/labor/mining, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE)
@@ -36,9 +36,10 @@
H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
- H.change_stat("fortune", 1)
- H.change_stat("endurance", 1)
- H.change_stat("strength", 1)
+
+ H.change_stat("fortune", 1)
+ H.change_stat("endurance", 1)
+ H.change_stat("strength", 1)
if(H.dna.species.id == "dwarf")
H.cmode_music = 'sound/music/combat_dwarf.ogg'
@@ -54,5 +55,4 @@
beltl = /obj/item/rogueweapon/sword/sabre // Dark elves get a sabre as their primary weapon and swords skill, who woulda thought
-
ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)
diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/valorian.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/valorian.dm
index 7ddbefc268..5c20c5779f 100644
--- a/code/modules/jobs/job_types/roguetown/other/merc_classes/valorian.dm
+++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/valorian.dm
@@ -1,6 +1,8 @@
/datum/advclass/mercenary/valoria
name = "Valorian Swordfighter"
- tutorial = "Born of humble origins and driven by desperation, you sought survival in the service of the Gold Courts of the Valorian Coin Lords. There, commoners like you were thrown into brutal duels, mere pawns in the Coin Lords' power struggles—pitted against one another to settle disputes for the wealthy elite. You never sought glory, only the hope of a payday. Fearing the day your luck might run out, you abandoned the bloodshed and signed on as a guard for the Merchant Guild, eventually finding yourself on this remote place, you are an skilled swordsman with a good shield to fend off any threat."
+ tutorial = "Born of humble origins and driven by desperation, you sought survival in the service of the Gold Courts of the Valorian Coin Lords.
\
+ There, commoners like you were thrown into brutal duels, mere pawns in the Coin Lords' power struggles�pitted against one another to settle disputes for the wealthy elite. You never sought glory, only the hope of a payday.
\
+ Fearing the day your luck might run out, you abandoned the bloodshed and signed on as a guard for the Merchant Guild, eventually finding yourself on this remote place, you are an skilled swordsman with a good shield to fend off any threat."
allowed_sexes = list(MALE, FEMALE)
allowed_races = list(
"Humen"
@@ -9,8 +11,22 @@
category_tags = list(CTAG_MERCENARY)
maximum_possible_slots = 4
cmode_music = 'sound/music/combat_weird.ogg'//undead music for undead ruled nation habitant innit?
+
/datum/outfit/job/roguetown/mercenary/valoria/pre_equip(mob/living/carbon/human/H)
..()
+
+ head = /obj/item/clothing/head/roguetown/helmet/bascinet
+ neck = /obj/item/clothing/neck/roguetown/gorget
+ armor = /obj/item/clothing/suit/roguetown/armor/cuirass/iron
+ shirt = /obj/item/clothing/suit/roguetown/armor/gambeson
+ wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
+ belt = /obj/item/storage/belt/rogue/leather/merc_nokey
+ beltr = /obj/item/storage/belt/rogue/pouch/coins/poor
+ beltl = /obj/item/rogueweapon/sword/rapier/iron
+ pants = /obj/item/clothing/under/roguetown/tights/green
+ shoes = /obj/item/clothing/shoes/roguetown/shortboots
+ backl = /obj/item/rogueweapon/shield/tower/buckleriron
+
if(H.mind)//average infantrymen merc class, 4 weapon skills like other merc classes and medium armor training
H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
@@ -25,20 +41,6 @@
H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE)//so they can heal themselves, after all they didn't survived the mercenary life without know how to sew their wounds
-
- beltr = /obj/item/storage/belt/rogue/pouch/coins/poor
- beltl = /obj/item/rogueweapon/sword/rapier/iron
- neck = /obj/item/clothing/neck/roguetown/gorget
- pants = /obj/item/clothing/under/roguetown/tights/green
- shoes = /obj/item/clothing/shoes/roguetown/shortboots
- belt = /obj/item/storage/belt/rogue/leather/mercenary
- shirt = shirt = /obj/item/clothing/suit/roguetown/armor/gambeson
- wrists = /obj/item/clothing/wrists/roguetown/bracers/leather//leather armor so they match other roles that get heavy leather gloves
- head = /obj/item/clothing/head/roguetown/helmet/bascinet
- armor = armor = /obj/item/clothing/suit/roguetown/armor/cuirass/iron
- backl = /obj/item/rogueweapon/shield/tower/buckleriron
- backr = /obj/item/storage/backpack/rogue/satchel
-
H.change_stat("strength", 1)
H.change_stat("endurance", 1)
H.change_stat("speed", 1)
diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/zybantine.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/zybantine.dm
index 382a0aa0e6..aa0ea42d65 100644
--- a/code/modules/jobs/job_types/roguetown/other/merc_classes/zybantine.dm
+++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/zybantine.dm
@@ -19,21 +19,17 @@
/datum/outfit/job/roguetown/mercenary/zybantine/pre_equip(mob/living/carbon/human/H)
..()
- shoes = /obj/item/clothing/shoes/roguetown/shalal
+
head = /obj/item/clothing/head/roguetown/helmet/sallet/zybantine
- gloves = /obj/item/clothing/gloves/roguetown/leather//their best armor is the coat of plates/kalah helmet, no other leg or arm armor
- belt = /obj/item/storage/belt/rogue/leather/mercenary/shalal
+ neck = /obj/item/clothing/neck/roguetown/keffiyeh/red
armor = /obj/item/clothing/suit/roguetown/armor/medium/coatplates
- beltr = /obj/item/rogueweapon/sword/long/rider
shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black
+ belt = /obj/item/storage/belt/rogue/leather/merc_nokey/shalal
+ beltr = /obj/item/rogueweapon/sword/long/rider
pants = /obj/item/clothing/under/roguetown/tights/red
- neck = /obj/item/clothing/neck/roguetown/keffiyeh/red
- backl = /obj/item/storage/backpack/rogue/satchel
+ shoes = /obj/item/clothing/shoes/roguetown/shalal
backr =/obj/item/rogueweapon/shield/tower/rider
- backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/poor)
- if(!H.has_language(/datum/language/zybantine))
- H.grant_language(/datum/language/zybantine)
- to_chat(H, "I can speak Zybean with ,z before my speech.")
+
if(H.mind)//4 weapon skills and 2 steel armor pieces and a nerfed sword, has some weakness on neck and feet like any other but is hard to balance his armor
H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE)
@@ -49,8 +45,12 @@
H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE)//so they can heal themselves, after all they didn't survived the mercenary life without know how to sew their wou
H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE)//the desert riders didn't knew how to ride... until now
+ if(!H.has_language(/datum/language/zybantine))
+ H.grant_language(/datum/language/zybantine)
+ to_chat(H, "I can speak Zybean with ,z before my speech.")
+
+ H.change_stat("strength", 1)
+ H.change_stat("constitution", 1)
+ H.change_stat("endurance", 2)
- H.change_stat("strength", 1)
- H.change_stat("constitution", 1)//so they get 3 stat points like anyone else
- H.change_stat("endurance", 2)
ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)
diff --git a/code/modules/jobs/job_types/roguetown/other/mercenary.dm b/code/modules/jobs/job_types/roguetown/other/mercenary.dm
index c7c0422277..e37af1b485 100644
--- a/code/modules/jobs/job_types/roguetown/other/mercenary.dm
+++ b/code/modules/jobs/job_types/roguetown/other/mercenary.dm
@@ -27,6 +27,7 @@
outfit = null
outfit_female = null
advclass_cat_rolls = list(CTAG_MERCENARY = 20)
+ selection_color = "#9a9a9f"
/datum/job/roguetown/mercenary/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
..()
diff --git a/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm b/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm
index b87068bb87..7c848f648d 100644
--- a/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm
+++ b/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm
@@ -23,9 +23,9 @@
shoes = /obj/item/clothing/shoes/roguetown/shortboots
shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt
armor = /obj/item/clothing/suit/roguetown/shirt/dress/gen/sexy
- neck = /obj/item/storage/belt/rogue/pouch/nitemaiden
belt = /obj/item/storage/belt/rogue/leather/rope
beltr = /obj/item/roguekey/nitemaiden
+ beltl = /obj/item/storage/belt/rogue/pouch/nitemaiden
ADD_TRAIT(H, TRAIT_GOODLOVER, TRAIT_GENERIC)
if(H.mind)
diff --git a/code/modules/jobs/job_types/roguetown/peasants/soilson.dm b/code/modules/jobs/job_types/roguetown/peasants/soilson.dm
index 52ee4d9b3c..ecc73ff218 100644
--- a/code/modules/jobs/job_types/roguetown/peasants/soilson.dm
+++ b/code/modules/jobs/job_types/roguetown/peasants/soilson.dm
@@ -24,7 +24,7 @@
outfit = /datum/outfit/job/roguetown/farmer
give_bank_account = 20
min_pq = -100
- selection_color = "#553e01"
+ selection_color = "#654d0b"
/datum/outfit/job/roguetown/farmer/pre_equip(mob/living/carbon/human/H)
..()
diff --git a/code/modules/jobs/job_types/roguetown/temple/acolyte.dm b/code/modules/jobs/job_types/roguetown/temple/acolyte.dm
index c8fa103e92..d372aabb55 100644
--- a/code/modules/jobs/job_types/roguetown/temple/acolyte.dm
+++ b/code/modules/jobs/job_types/roguetown/temple/acolyte.dm
@@ -62,7 +62,7 @@
shoes = /obj/item/clothing/shoes/roguetown/sandals
armor = /obj/item/clothing/suit/roguetown/shirt/robe/phys
if("Malum")
- head = /obj/item/clothing/head/roguetown/roguehood/black
+ head = /obj/item/clothing/head/roguetown/roguehood/red
neck = /obj/item/clothing/neck/roguetown/psycross/silver/malum
shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/red
pants = /obj/item/clothing/under/roguetown/tights/red
diff --git a/code/modules/jobs/job_types/roguetown/temple/priest.dm b/code/modules/jobs/job_types/roguetown/temple/priest.dm
index dd8ccaa876..d82fca42fd 100644
--- a/code/modules/jobs/job_types/roguetown/temple/priest.dm
+++ b/code/modules/jobs/job_types/roguetown/temple/priest.dm
@@ -24,7 +24,7 @@
display_order = JDO_PRIEST
give_bank_account = 115
min_pq = 4
- selection_color = "#b29c69"
+ selection_color = "#b7a375"
/datum/outfit/job/roguetown/priest/pre_equip(mob/living/carbon/human/H)
..()
diff --git a/code/modules/roguetown/roguecrafting/leather.dm b/code/modules/roguetown/roguecrafting/leather.dm
index ba4561bbf4..97aafbca99 100644
--- a/code/modules/roguetown/roguecrafting/leather.dm
+++ b/code/modules/roguetown/roguecrafting/leather.dm
@@ -132,6 +132,13 @@
reqs = list(/obj/item/natural/hide = 2)
craftdiff = 1
+/datum/crafting_recipe/roguetown/leather/antlerhood
+ name = "antler hood"
+ result = /obj/item/clothing/head/roguetown/antlerhood
+ reqs = list(/obj/item/natural/hide = 1,
+ /obj/item/natural/head/saiga = 1)
+ craftdiff = 1
+
/datum/crafting_recipe/roguetown/leather/armor
name = "leather armor"
result = /obj/item/clothing/suit/roguetown/armor/leather
diff --git a/code/modules/roguetown/roguecrafting/structure.dm b/code/modules/roguetown/roguecrafting/structure.dm
index eaf4899fd1..b670d41cd8 100644
--- a/code/modules/roguetown/roguecrafting/structure.dm
+++ b/code/modules/roguetown/roguecrafting/structure.dm
@@ -41,7 +41,7 @@
name = "composter"
result = /obj/structure/composter
reqs = list(/obj/item/grown/log/tree/small = 1)
- time = 2 SECONDS
+ time = 3 SECONDS
craftdiff = 1
/datum/crafting_recipe/roguetown/roguebin // Bins are easier to craft than barrels for pure convenience.
@@ -332,6 +332,24 @@
skillcraft = /datum/skill/craft/masonry
craftdiff = 2
+/datum/crafting_recipe/roguetown/structure/stonetable
+ name = "stone table (long mid)"
+ result = /obj/structure/table/stone
+ reqs = list(/obj/item/natural/stoneblock = 2)
+ verbage = "build"
+ verbage_tp = "builds"
+ craftsound = 'sound/foley/Building-01.ogg'
+ time = 4 SECONDS
+ skillcraft = /datum/skill/craft/masonry
+ craftdiff = 3
+/datum/crafting_recipe/roguetown/structure/stonetable/end
+ name = "stone table (long end)"
+ result = /obj/structure/table/stone_end
+
+/datum/crafting_recipe/roguetown/structure/stonetable/small
+ name = "stone table (single)"
+ result = /obj/structure/table/stone_small
+
/*========= MISCELLANY/CRAFTING SKILL ==========*/
/* === NO SKILL NEEDED === */
diff --git a/code/modules/roguetown/roguecrafting/weaving.dm b/code/modules/roguetown/roguecrafting/weaving.dm
index c374f61771..5df8057240 100644
--- a/code/modules/roguetown/roguecrafting/weaving.dm
+++ b/code/modules/roguetown/roguecrafting/weaving.dm
@@ -192,7 +192,8 @@
/datum/crafting_recipe/roguetown/weaving/nochood
name = "moon hood"
result = list(/obj/item/clothing/head/roguetown/roguehood/nochood)
- reqs = list(/obj/item/natural/cloth = 2)
+ reqs = list(/obj/item/natural/cloth = 2,
+ /obj/item/ingot/silver = 1,)
craftdiff = 4
sellprice = 25
@@ -220,7 +221,7 @@
/datum/crafting_recipe/roguetown/weaving/eoramask // should not be a weaving recipe, does not follow the rules. TO DO
name = "eora hood"
result = list(/obj/item/clothing/head/roguetown/roguehood/eora)
- reqs = list(/obj/item/ingot/silver,
+ reqs = list(/obj/item/ingot/silver = 1,
/obj/item/natural/cloth = 2)
craftdiff = 4
sellprice = 20
diff --git a/code/modules/roguetown/roguemachine/drugmachine.dm b/code/modules/roguetown/roguemachine/drugmachine.dm
index 365613cd2c..73a239eb1d 100644
--- a/code/modules/roguetown/roguemachine/drugmachine.dm
+++ b/code/modules/roguetown/roguemachine/drugmachine.dm
@@ -138,7 +138,7 @@
/obj/structure/roguemachine/drugmachine/attackby(obj/item/P, mob/user, params)
if(istype(P, /obj/item/roguekey))
var/obj/item/roguekey/K = P
- if(K.lockid == "nightman")
+ if(K.lockid == "niteman")
locked = !locked
playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1)
update_icon()
@@ -150,7 +150,7 @@
if(istype(P, /obj/item/keyring))
var/obj/item/keyring/K = P
for(var/obj/item/roguekey/KE in K.keys)
- if(KE.lockid == "nightman")
+ if(KE.lockid == "niteman")
locked = !locked
playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1)
update_icon()
@@ -173,7 +173,7 @@
var/mob/M = usr
var/path = text2path(href_list["buy"])
if(!ispath(path, /datum/supply_pack))
- message_admins("NITEMAN [usr.key] IS TRYING TO BUY A [path] WITH THE GOLDFACE. THIS IS AN EXPLOIT.")
+ message_admins("NITEMASTER [usr.key] IS TRYING TO BUY A [path] WITH THE GOLDFACE. THIS IS AN EXPLOIT.")
return
var/datum/supply_pack/PA = new path
var/cost = PA.cost
diff --git a/code/modules/roguetown/roguemachine/merchant.dm b/code/modules/roguetown/roguemachine/merchant.dm
index fa4f81a4b7..90c5df762d 100644
--- a/code/modules/roguetown/roguemachine/merchant.dm
+++ b/code/modules/roguetown/roguemachine/merchant.dm
@@ -209,14 +209,6 @@
options += "Enable Paying Taxes"
else
options += "Stop Paying Taxes"
- /*
- if(!(upgrade_flags & UPGRADE_ARMOR))
- options += "Purchase Armors License (50)"
- if(!(upgrade_flags & UPGRADE_WEAPONS))
- options += "Purchase Weapons License (35)"
- if(!(upgrade_flags & UPGRADE_FOOD))
- options += "Purchase Pantry License (10)"
- */
var/select = input(usr, "Please select an option.", "", null) as null|anything in options
if(!select)
return
@@ -229,38 +221,6 @@
if("Stop Paying Taxes")
upgrade_flags |= UPGRADE_NOTAX
playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1)
- /*
- if("Purchase Armors License (50)")
- if(upgrade_flags & UPGRADE_ARMOR)
- return
- if(budget <50)
- say("Ask again when you're serious.")
- playsound(src, 'sound/misc/machinetalk.ogg', 100, FALSE, -1)
- return
- budget -= 50
- upgrade_flags |= UPGRADE_ARMOR
- playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1)
- if("Purchase Weapons License (35)")
- if(upgrade_flags & UPGRADE_WEAPONS)
- return
- if(budget <35)
- say("Ask again when you're serious.")
- playsound(src, 'sound/misc/machinetalk.ogg', 100, FALSE, -1)
- return
- budget -= 35
- upgrade_flags |= UPGRADE_WEAPONS
- playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1)
- if("Purchase Pantry License (10)")
- if(upgrade_flags & UPGRADE_FOOD)
- return
- if(budget <10)
- say("Ask again when you're serious.")
- playsound(src, 'sound/misc/machinetalk.ogg', 100, FALSE, -1)
- return
- budget -= 10
- upgrade_flags |= UPGRADE_FOOD
- playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1)
- */
return attack_hand(usr)
/obj/structure/roguemachine/merchantvend/attack_hand(mob/living/user)
@@ -288,15 +248,7 @@
contents += "
"
- var/list/unlocked_cats = list("Apparel","Armor","Consumable","Jewelry","Tools","Seeds","Weapons")
-/*
- if(upgrade_flags & UPGRADE_ARMOR)
- unlocked_cats+="Armor"
- if(upgrade_flags & UPGRADE_WEAPONS)
- unlocked_cats+="Weapons"
- if(upgrade_flags & UPGRADE_FOOD)
- unlocked_cats+="Consumable"
-*/
+ var/list/unlocked_cats = list("Apparel","Armor","Consumable","Jewelry","Tools","Seeds","Weapons","Medicae","Instruments")
if(current_cat == "1")
contents += "
+D+k*f5;K|L7r^Ws^Z72utc}73 zs_KRH{tz%sjO?u7dCbcE7}(neq&FQqV((u(q`4!q=wfPNHh{}Qq@35U&4c^is7HXZ z$98laDc~E+;g%lo@{$dQbWOpux4K`*@*CH|36HNI>ung;f<;b1T|IIn(AbGaI0!Ka z7GE`oVFAQ*o)KrIG75lQX*x?{j*WhhGx{lB{px{E`FB2U14AxV}F{57tRk;=8 zpvE1#W0}ivY0$C 6=ZV?Nayi>M2Nk|*Oi9t7d!0LPo{@sOkyaoy z-i0CT-W7VRSdP~&X_RHMs=fMr_ 3!N?3Qu_Sdb~*+23z;?l9-_=%Y*d=D+V( zQarYdH$4_&YD|CM|3_6;m93 kI>lvLw#lWO`7Q5_3wM+&rPizkB=Nc% tU& zF%FAVfHV^nkFV;Mv=qAj?ORlO)HQJf6rj~l8VDaCJcJXRH;>BSORHr+d`x&vM;^Gz zO!e5TFbT_uzL0OpxDhmIJ__H&&>BCzOm98*3_JR#w^EzZu|e|AoySmWsf4htS?BLZ z;_ReDYAq=2IXUSX5)PpKhI`km&ylx!Q3e;wN4raj9iKk`7aC@@aSAzuZ)^l$ZnM3# zy;@qiMw*%6<0cY)pt^e9-dvo>82!g>*k|!OxXeyIUhp~3p~aI%;~%G5%8BptlVa`( z4R?66pp1-gg*`fLOtZ(G5ASG+y^;TM*OE+=p6=LZo0snKLq08$^>gHZGsglI-!hLo zny*|`Uv1%Qf6cMSaFv@CKB-v|NQvEgEDpVV|Ni}!$H(f>xv`HvrDLS^@?#RgCaNcL z Bg+M4rFtCcnwDa7^ ziHqVsG|$ktZTr9@ae(4DEI+3_#Tq)&S(S$eJ04KigClBE*S>*SN2mw1$sPNGvhVGy z8fd{`xPyt@pVBqP?Bi1|XV6Z})N=#p9IL`bfjUKg3$^M$tZA^Kb}88RcHH$07OGbC ze1jQdLdFZMn;nWK_V#F?z~`qj^I^u{h1DTdCWCq-rs1SPxSsXiReKP4rknX4=CTSt zw40bA@f_w%zTqI-oJ1T6joGLJ(MS1!9p^fOVn5% m z`;<7#1k|5*2? c{j>*nj<8GMkeFr~8DYK~0 zgY3~LJ{+c5ZGh}XUn&~w6ApFkV9pMCKm}Id5g+`Ur7q|sXOCrQcC=GfG}TKo3DArq z@yr(9gQY<+QW)uHDc~l(` 67dS`v|tMnV*lkduDI-n0K}Y5r=+ed4BvBAlnaMg14(e zX_=-Ys2n5}x+~1HR3_@J)j}E89ZBlh0aXX;)N}yhK$XB5DQ*GR9aY;M%+sX}=6j0M zLvn-G&}(B|FS~4z#VDOVxC&RO^}{Oi$&|OT(S~{NA~kW>61SSj?o<`FOjyEP6U%9& zwg>!m9=H#yG{}JiMy$gD1>qVB18ZbK&O)u9iC9d{?SP8&izt`upEoDZy{lB^=aGm2 z7Z2&}Sf0xFC*3y}3(=8VLcWfGI&OwM53^$*{OKq!iXGTv1ecwvkr@f%vFj0Yr5xEV zU-e7JV;)daPf$%q6&aWM7s?#j*jip3kA1aDi|R(Co}_w`lJ$0lGol(1bgT3O-$JE^ zpdOx|k$mc~oX+L->(`Rwo})y+jrrzniZg9LJ-T!9!LES`R&vX{mVefX|3m)jr-om# zN L;^*eLZPBU(*0vvy*Z3fL3xYS;)5KKS)nvIQ( zXYBhD9fb|v>87xI{ZBsg_tuAs$>uM*tLh3c41;PXN4+IBlIQ&5BMvs6du9ml7=@7; z%`YnlpIO}YO!DV=T%gBDD|mI-IYTBsxnC>GX86X!o7xv3o1}XVyC10ecyaf3D~AE~ zNB8+`36|l_1A{2r$}951utx=t1lvzt+dMcf6?js~edDA_^-`zvTQDeS@7Z^fUV|*c zrho=oP{eI$3%lUC+QsW9qK!%_)40>hUTrxE_pBLbKiV6>iK7v8P%Vi5I_|Ur3KrRC z-@eblb$B+Pq3hcTwQ25QMn@S_Pn`48-vQkwBB|P53JqMG6xXx ;Ru&Q445oYzmKet{LI!Ij_AdO}WHc%f$9WDsK zf?yc^bvp(sr!l>~Cj$_fQ>27=*|0mtyHkR8o;{d5cCC;BqQh5tWEN*=pNHt}nn`W8 zn?cYN=-O2`KP8!p!git-SHv08ach H#xtaSZ%nIIiPmS3iT2k=1 zvhv9pR%Mo3Yf5DXE }Aq R~qDAe!Kv$^(ySf7YPC~Dep(`0SZotu#CkSgSQry`XuzL{SItO1_ zT1`-^sHC&Luq0pm^MZSaHP>Kgm5L|Bje-#1iLnCnk5i@@Xt9+nuoJTuhH}8zqa$Q= z-aD-IHwoW>vq+%{oKIE0*gCv-y-7#29s+|XpSaWD5^i^Q^(`dU?Y(ZmwV6Is7quvA zcVC%VHB)z~h$&9NaI3F&>h11&H~v{DPr*dI8NTl-mr=g&GWQOPTkVQJVCaKEGkLcz z2EJvS2LflzFetITIrGPmj+=|118{4k@NX=?W@hw}%R|C2_=TjSOfRw1{Ph4$pHY&_ z`JOU5s#~q@;z@&JsH0WLEE3b;E1iBuXoY5nHMWe-` ^XW1-#caV8qBG+W z6jhaBTd8lr$B!wcDs-!>KzlY+;%?9tf8fy(Q>UYeIQ;m`)<-xO19p3{Y?=35x#0Pj z7yAvJrFwrW_yL1}q1zx!8m6yNksq5{-v720@E8Ie*E;7&*2}H8?lZXCC1~Lb@QMT6 zy%y;lYFw|pmxI!&1_b2;&_hwF=9OehSlWm8Z5(6*$%h UB*M^P&Ny`fMIh( z;47oZ0L${hSLCIFxDBJL?MjtQYsaSr{**uC*6B^Hq-+06U=tMuAKprCNoiEZlbVB0 zx^@|@i}qgWR{O$%m54V|q0gGnd^_b_Lod;r%$1+0g@s?WEPb5bN2z+8I$Bt8@i&lf zRvy0~(B!)iVotq8_S+ib<}KR&S7ABxCJ*nIkVm 7ZFt)*vOqU^G-0@!E!af^F3}x9rAG zcx8>AE4xLWgt4Vr#kVjIM}x&MNWe7UimlC~LIT&dLfUywIvIO5-mK+= ^q)=-*kwnj>LKo*juW5whg+*9+pM$@=4d&CPrluOjrl3A|$Z8cW7u_h2 zT*{DQp?g{O9GPM)7$7@-mbv!)mRyV(T~otF6K%t+Tss|Sr+>|p`Ys56KW}zxF5TD@ z%n6l6`+Wg51qz;h>3hBYbfaoZH=k;nohb8`O6fk;Tv!ipt>J|i+oc8OQ@bY$C!S%- zZYo?<2d_2fsXQkpp8VoZH$B1sp5{|Cy7JatYb+YnxMt2YJFaLruJQe6X5~-&LAsd6 z_X@$hklvJ~vOKrjdxyE$hhYor0 zC9Q+>->HIX(5fX^>3;Tr`7p;11J0su$q&ET#k|9b+vc(Der(USv2!=q>c}Cg3^;|m zWGfU#wBtKb8lonnN+UWfPj8k9hcn*LG&Dq8Z22@Q^62DTlDzvnTFq3UJ@^yw@k595 z&{aM`+nd6IY^sRtJ)%{Be?9TEC-amnsT{cTQpWsx@7^*HpU}lI?u? =X|E^>!|N{ qx7rhqKnxyw(k;0MBP>+o#ZQU8jyFGkNyjz^# zJMaU!bP6^Jy0aML1if+eky{@bIu{Kl3`yT%_x=Xb% {@j+2WtEIvta) z6&+3gL~9htzgh6_gH#ENwHw HM*z3w1?Tsa3xC^=;tp**Yj-4YTD=<^O5p>(YC Fbg}RJMo9^{(DP zY~xgDLEQSfuhVz7Ji}~h))}+Lca9b)&~!9iflXvO*519jIR6&l)ohQ5gJtLB80 u z1$p;c6ksto86 ~hP*1j_%;g_WErf+irR#sDjisSdP( zqzo>G(;3oyYjLs(TPSDRN%CAzVRw+DNjc1+ckWdryrAzH`wVj4s@SPEjyCrY6AcD! z)B>_BT|jG(sF=p1mYPHay9+2Awtgs-%p@}kj7nUAKSP`pZSv3^Jq(GS_S(wI`AHTq z<~HQE&F#FemKH<5ew|C_2k>VM{p9oS4aH8?0Z0<2jLHHHB5&$b2^T-9kiUljERmV` zq;~S9OP3%u@8EH0!A1Phffi>}`hpe5eDxDBY_f=r$~j7FK+{@}z{zn~DAd(jbN_a; zXT)Y*q_zMpY}8L@&(<(v8>~_-3T4@hfM06sC71K3S%LUC@f-jVhN zTUe>0;~!Wx^W11Y?%ccdEXvY-?bV91jcSdMPWGZ!6HIzDY3#>Gwztj$qx{Muz-b&z zhXsLB#1oa-BCNq=;Lp#w q>-Ph37T@At`m}Fhq|z%cO~r|l&Y4KLQfA+m zOp1=Zf2C!|S<|NVvIoau5~7bxI?c6P e} z_^|o~%AoQ0zj1V&NY>xqe|b{k?d+WyTeW*CUT{S1bY4BtOC!u8Q|}l4U0Pt)?~0LT zhpuPT`kw%3(!5 wo*Swae&8jXKRzF?^(F+ z+Qm-%1Wy? jh$c6nBVwYAlBk73(>d@coZz5!KuxAR5<}dn$QwC zsHwUCX;QTfV_{VB@#AWOOcz3y&icHrTLnFh!H|%`Eqd* @T7;Y%Zs*F^um?cGBEOwu!ga zNTn=H)hp*JREv9TrB|qrvm1}elp8ZHjV6js9)ojTv9_4)P#XrOq21TcPof%2P_iQh zXuE_#V|>JNVEEx&DwyzEoC=2ore6pC)Sn&>nzQurnhv2fIhJ3Aq*C=t1``SaY^P=2 z%kt86N@p7*`s`-6e^S&I9g4yKMtl%-KfT47<*nOPEG~3Sk$J8^j3nomgQVdnvi0jW z|EfK$z7NT{K8|`{Y%4f`aaOOFS`%)k&Pv`bLgmK8--z};@m(%40~SZhQT-g5_%J!n zc99w5ZRs({e)b*cdj0V8^UQM4%vCd=?O{WS?ABxF8O)>4VULm+bkR>$$X_=$b3U7! zj>3O+`HP5!R?0ReUHB>xBk@!+xmuGd!Q%3=5y{7>(=Slo^;XVsVQz*D8+
z=)8HD$ki?uglXFZ%W#mWtH2Knmwy^RIZ1aYt23d|zc+xeX+je4nQxAcB2&rO`Ohtg zV6NK}gewe4eep?@0}Ru)Ud?Q${ Oqjx?T>Q9|6`fr;``izY!3!oP#{JmU4M0#HI&;XdHPUh(Y!)Ht5_Md!*0C zNrSe?$2*4^X$Q@@J(k+FSv}h-$D`-9ggC-XEL{;$$qX%Eo^C28v=*`dPNAP}a-DA4 zlBdT$RHHF~pAMKMy$;PEQurV)Xeb@N4Hz364=+1?_xuWDTz-MB)r#`pR7mKHtA#T? zFBbkt%mHaRjmusTsA5_S*CI(@ch;a-aOtEEhAlB+T_qwd#6UV);9$1^Y+RGBcZ8-Y z2pd1bK(mp&F|WXA#Bcg)g3vrtE}C|?@x ;h1^;lce;{E%|V(gPF!{sfE!{x+vsOzv}MO(bwSnc z3^UpSZl%A@6$PUMs1+P&5yTAQq$`6}t@(jG>;lP|y0-H7%uv|41UN&jzIEdN8n1>T zy$E)_8)(RQ#f6E9#93}f(ZC-VY@shj3E(g}`3DRBqMkkM+`%vck&~2*hX)5y<^uDO zhvv%OJ;D-JK-?`%W>Ose(%;W^tF?VgptMdpmn&IWd1oFU#*r T7fU zu-K~or|dd;r0br2Y}b#=w7eF2!CsJT$?ISM@4D%d%NOVv }`cAB8+xjEg28wB%`HY zq4BHcDP!O+2|U}^AaY$*E*dntgcNR*L=HysUr}D_#W#3StgWB 13A!&Y3uD?9eQ z7{~#()=;hADj5DB8OHb#zdtdNj>A~GuhNH#f`CTyS!^;o@nNm wR6tQ#ZBEHvt1AbV6QK8m T(W^ _yuZsBL{O}&dWM>PwzCYbRjYmhHtV4Mn(B 2g6lN?3EoM2xmo$RT|&?VYiQA)TmEN|VB z)roPCd%1I{tV-uFc`oep_04W@8BB-%dwym4AmV@Oo^`hTp|lZW*fHx3n@$w)bnfl7 z6|IHJfTEgi1pBh)$i*ZLXap%~IGcyXR6eS0ta<(QW1wxe6wK3!MS=Y+aN|D1@ZqAy z_>WJOg>3oUX+`3}P MoS2=O5qTcxLOo5Bp0E=1mt2t;}qVaO|_EQv_VLG zbfg*Z22?ms2F+FH#K^6LTYZm{ Xe zmN`CypSIuGl7$B`3sdK%imok&m8`ItgSG3d{lgORi05JIMZA+e(q><3I*t7EuYYfZ zeN$m}XXpzQJ^CpBZzacDEOi=njxM~S4(FwIMTEF!Ir>c>{S9)~V^2rXpi2$T9F@;& zNWH At*km%y0UN@%XU5hWA!ib@n66z3tiJ zFPqT70WL0wi?rZ2$}DQ3xC6@U-`zbu@u`cIuk|Y=IO|M~?VPk(fg5mMt7txS(ffCm z@>uT-Kh6uKuNdHOz3HsS6YhVHimx!jvy%y>pOZ>&WC_xo#LBh!tgT19KH$PMgM&GY z4B5kgl~zd?6AL5KH=^@+t@mnP6y3iM#yX(YE5(7jMu-6Djjp*}gr3!;sKp-bapJKk zizu%j9ukU>7+e`ZD8viyh)8_=KqU~$zY6)$ckvQ(c*U9;POF?ylqn7y5yzsc-e4i& ztR-aA={l+!KR5`}GLQ546cGFU4kg@xHittEs7BI`X#$R%%bT$++biXHN^Sw5%hWWI zGyf!FD_XcP@=4iAwM&j_mpQ8!FD(0@ohEs37$w{Rxpcs#n3Ip>u>~G!g$v`i4>l>h zGnNls+7O6|>`N>Q0t5LIBB_{C)pvg^O9Rfk6Cp9qrLH6KV{H`g?Pm3_pQxdl&Bk^2 z 1C)m}ey1ytj9qNbI)*rjB9 z+!5%3(2W9*1Wo#=beX_U2+4_DrFlc)CSPdUdRZp7;cZ~Cwg1ZU7m+@_qRvW1eL(+s zVYl!LS>wS+dx$V}6-d}DExpTQk^7wOGbFEAT9b*Ci`!S A2tQ6ifud=h&>Z{Q{3eimx ^ zeMJX&oms8U_vr6)g#FDr^Hh8RN1NLt+{r<=9D$7q%~^7CPoO{{UGFELsu^hvQ&oW_ z3pFU_O?250`Er?Wk@bpUl)mokR|paWnFS-J#a Ol8Qb8dey3pT$MY z9+v76cQFx5UwC{sn}i_Kxu(Wtp&D##3AhTO3em1xc;By$bLKM05yvY6v854_YC@d| z6SY7_#pHC8Q!O a3r z9J0oyCS@?~!)2Mwcj_`{Yn(9!n7)I_L?u;;o7O?656g>;dNMLDzVwpBe&@Np_;Eli zz&c+rb5C6f9E!SGX{ZA?O%#m|Q==5d m!>iR_XZUZLsSep-|nop 9RSw(~njwX3) zbk*cZ3RjirL%tI?fZg+d)Hl{R=05R-S2K~`d{ZRc@K^FDL7k(+RhJqL9mD_^69AoH z5U|{shKlGBh}v3zh=a!Y_kYd}G(?pAH_n%9(Uw9J{*1i6cKW?5VrRSOxzfgl7#b{< zYhPr~UA&|9n}0Il4NG&=hTdq<7mKIJl==@Jpr6|j<+RJ$GJNWr4^Q+b{6{48Sk4JW zAV1A$2a+*I)wK(>V_aELQ<}Sh4)NmbZ|p3%qmdz5T~;ESh<8o~TSj|BF#gmRKgA)j zKS9y7 tXKQ`mYaIat$-2T@)GJ@;H@g!#_F2EbjmN z5VGr`TpnROYL%xPvnlVHgT=hh85|ALOKR-*uKgM9^*6P|ndy%SNZK9=a{TGM^kL`@ zT|Wswi4h|YO*r!}yiZxMm;m{P5X4>O1lFP;9065zK_^hWb;%+R{M1z|Vs0^k66d)w zA#O}s$e?y>(Z&jQXIp};1z;V?L@k*j7WT3xzv03})-=mdXlr25A2OwA*S0_i3Qljv z{Hu2csB&qOpn6~^G}*O9ZA-TM-KeD3G3cti!1ym0XewSXX->YLm!)+G|F2VgS{? ei@m2_cL2+cyajln4q)v+z=d#JWC#l^|mo@aew mqfC7Db0Y%^AX#y0THzRZ{;MjNmGUH99`y$rZntDCdVZiI^~i~^-E{L^K{qT zrO;EAV`8uPq?^a1X$Lh<3en-JbjbC%Ua9v7tt>pZ`nmM+Z+=~n7{bhK92d*7^wb`& zh~!^u4%D558rErMH{D}FhV*wlb@e~_aE~>Up_ EB*W zm6Q&pcVRm-OiTJyI^LP-v#UV7vJc%2cZRLq!p6*6Efwt(!E{Rm4#=cV+dqGs=J$Z& zA%))6`cASjSQ;7Cgpg?bQQn;Hecj0%H$#rL;C!o-iU}1(|HID>#_nc{T~-2byE6cd z_ppgr(D8!HZ(9JVObdLCU&lN~@ZlV5=ymeIej)__Dt%=iHUpw*_e5c;bYe;6?Hs^s zjZ^>dO4mvq}r+Awd;ysnw^#o!&M?;nxuUH2 } BE_*(^V3|@u%2XqAJ)L=WH#7b1hUB1j#6)uN$j)^MXnF(9BL0 zzAWxZ<2ibhZp4>D_VDZRDCa$-O$bow`)}lQdS~7H%)m7MR{@mnpTDXMbqerj%(uE% zCxbfRhnH%>o{*YpR)N%zXHoVv`OxZcs?<)&_b`_&V0kD-X1c> zahTt0bVX>;{j-8jk6RFVkJNpIrnr@hw#xqx`fcd!7EsuooW&^a }vVwtMhbg zX69cQ(ztIdlBe_kiX3hRY6fIU{MpslRpG0j%12jnV>^xtLSGnYo8gt%q-%t@fh7WP z4b}k%)~@F56ZbBf#V L|`Uk{{(ekk3%A`qp zM8cXrfNz5Q2;P|iUx7w=_C41xEHR&vW<{FH?1Cz^uEd%O`7A~H1`|I#uW8IJko>pI zE>_DlU7x#T1uo}yZ9zcsI@i 849gVx{E34REX(|Km;rE<_K$owZ? zRcuA1SoIF642lWZF0Sh%Vn!8-3r{cqIr0?jTG>5P1(xI5l{ir!2f|2;;^3+NQDulT zG12)5iu6hvkz9A7kVt~C1d!}}CcX22F+uB#*eRLy @|) z@lcuhAbUkbwKiWzmcla7yGZkxN{-Ci?R)HXACr5V<_dk3?Pn9pRsX5p1xHsvl#%M; zHaFlzYuzS_#t9ytoic@_x{4<>`Ll)fZv%b9$ccN62~p~vAVZo}CwM_7I@n}&m!4<{ zT!#+&4Y^OZJ7-Y*)YfeQrhK!j4z(O)`k4sl(u2N03A&we6i_1Zt0aIU@l25@P(p#+ zQhEH5GLiyi`=x!D)&Ta^gWF#i`V6tsW>8AvqbzFD0T5T3s0lzY>3oY~AgaG!Lwek^ z$xI9^1?^{q!v;^7jRc$*VaFkriew>_T5l5C&=5*COfSBBSBo{*ynq;P+L|Jpz{PaB z3jyD@fM7x9<3@@36*aVz%Eb7Sssg+QyCeR^13`LYOAFqd9`RmQTUCW@gQ2*0@y2M| z$>{k@=rhmX3D#81=oP>*XRc@HFour*(E@wjRiDvGu(fO#JUyL;C-Y+eQUNFo*t+9x z`pBr5!!C&=0|vU^1&S)6sFZV) j+6ZdusxwF-du&ZS zs6EF(YiJgb#lO!1ttvK47Oc7KeKRpQen;ada~B)4AdTD8T-hEuN$B7RQ}<>Kb}}eP zinhy^RHgI!A=`G6VvZ|SvR;JN(pt9%;8N76o<_VOR %HPXADKFnEwdD#?kkOy9XE8|S}ET7&g zbqhf(Z%#B{W;lcjGaT|q$slBfzeK>OHVzMb`qr(Oi(G}eB+{l~98~k>%X3Hny-hQq z`#*aW$fD~Obn{YwjbO42{rVtohC}BA%8Yhxp{K;d?hYQ57*JJIR_;aw{ DfIy7nM}{{-5xW;QbLVH5dMEZiqhO#c97ZQ`tNJtLbE~f6+VnKx>17 zvb=_Ff#9pG|63}Vk$NZ~Qb*4c12~(={0fa&srUiTAG4H={ybk2iN7>k0r_s(GZ1=Q z`{WoZwY~mEVTY;21<;BHaha|ZXLm#s3rL2*^7Ed9?R7-W8m%E>Z5!>}z^Oe2r+>#A z$cE*k9Q ZCM_-)uRb-&49#%gw&oFQ?&ekk)40%6Q9`0-B8D#QE+;r5) zP$%2trP esnUv=Dng$x28ePe!@*Z(El>6rYAJ%H2;U`FT#aW^wig{yrimbb+r=j&R)2y2;k9hTw2h zj4<2w8B98xU4}SG{|3>MfR}V--BH8`zRC0arxGX%Jq1!Jo7x|bHaEm2eyBo)gOkZ^ z?IHM3&w}^NX1+#@EW0ajc9LsuA5mmB9IqJlIn3NIwbEIB_80P5;lsZ?sQ!P?bPA-H z`3_Ru>J+=5oiE=?WNs^^esDaN-t|n{7S2`iDtk`NzXXJujd@<6(YCrVuOg6z*^0H* zu3*IRtJTfGHuH62?QI$c6Ga(T;Se8-$N^In)_MLsgW8KKKH+ftJGnAu`CfWIMAyvD zBMq6Rt^7kG#G72NSfF1tJ-^Q7hP>O?058CI5w+HQ4@P!HBKLAWC!SI0PK`RW@lsaS zYesLoh#y-D69{Mhcl7xeI+c22F8gdIZEZ{rp0+lb`6GI#oye$^51yD*KS2Ajbc6ed zd=j$0^=WLWq*=hPvgi5h+P5x=MV6Idc#6gwhP^+|g)1>J)B9|4_yu>wNZ+k%WT=8L z@vsoi<72&-DRCix9lF2mg%mZ&MeV*3KYb0DWcq9CUHp6FPJlAn+w0fwC_t1|=`rz? zHYNgne7kw%wj-3y;eVc1cp!gG>w#|q=vvDpI3nNWK9?QGafTEL$(X5Muq}(deh>RI zQ2N^3OYE=IIWKJgG$tXUxn`j=hS?VNyDNrS>V011343(|fv DW6le6?-;4l?hK=E=F%^AZM|RqH#)nP+oUM9fAWw6%aB zrU~_pN@W-rNS@j^peQ><@ XuHuJ-7?ZXqPb%nnUjK?iW2k|I)6?nW zt6>L{oGl%fT)c#^y=~mFbL@(={ZIRZ{hSuj{dvd3{T=x(i6`r}se3| KD@KU zy%~hWZE*go|2t4Z2(M6QLrcw$)|+i#<6w)}cl~QqOF@tX-8|TCh!}tf->9I5-9Xa? z?k|jWcdmEQ*SzbXb7@dqa5(e*k+G%yn|2oa8& Yop7!;%Cu3Or&
_(#-CktxK|6o_}LH+%aq=wo8_vDAkt&8XvJ8Vg8kESyhN zCe`^0|9QY^*8Rl`F7YG8f9DI^o$NcFp3J&j3lTP-ncvDqQK`;uv*x%^u_rF#D_mP2 zdEXZfyUL!{4yA3n{Kg&`&vs8;V$wct!_cX@P^yWDz2>@4{5a5O^66yc2?|wx%pqpo z_E*Pj+=7q*=P6`0->vN1%d;FVQ>=>JUp6)zf4MP_MhX(v+3yzU)?ZrABe9WVB8KNr zYYjzj9=A}ryVsTXamRY(eNH7e+D5MzvWg|ynoQYC^=rBh?PXw9F8oSXirVKy^ uQiG)ef5>sxKsA99}n$KUlJazW+#Ey>B!3T!R@2k7} z>3tsipYRO#omn{;v2*+yE_`@YeyL@V+1BxbKb2g2ClsvvKQw(+K$OweHb^7V-6bUr zQUW8&P!f_#cMF1azH~Q&^himAbazV(h_r+t3?0%8GxN{+&VO#^X5P!a*Iw&cPekIH z1olu^dbvFD&m3@<6KBMO!{JLC8?R4)zwm8rC6OXNvcY3HO8nlmB}XkKCwL3de9bQ; z8A0ZjhfIEi#QfYRkAYc~{0QYW^2!vT-$=(m%{jjB=&43o_Jgj{LCFV)l^GWHL*G|^ z){9v^$}`SP;!(3Sq%YzbUZHyetgiAdEZiOzp;t7O$4trQUoK}3qi tf={fQao3bmDO!ff!e}jL58VJf42$Jw(FMwj#y0quGBO>e3~06U28p|S zcyF5LGx;u8nx(ZTvn+0S1um<@AMI#5J3F_ocnAhbdrk*i+L2dkaLZG`$LBSx&8wS1 zwf948pNTN$TH0@#Zr?mk$;5h##v$q>)9mTQd9fnK^f1nlID2uluayFozzRQTwQTi5 zl;6M@8~HT~sSIL?FnT=^j&W@Rq5caOt^AK;teG{0FweSXT%?IVhs~A#l}^SN(oro< z==U}y(_^OzdMUy+CqCQ)&|u7P*_ydoLYk3f_jilcAl2g8zW)Ax6ZfXk=fqKimiveb z-7@qf_FWi@EEFZw({}ORzv|xzgFS|YYwMq(SPI|msn+x2-di!wj`*GVbhl JLa74QA+%Ad_+cq{v4`THLkEbNvE=H7Rh!}vJ8rCQ5{H=`Y+++*W zU5QeR+c4mU!{lxqi25_KD9m(fVSj-;=}nSTXf4aUdE!bWa8dusiYcMOq4rYvy4AA% z&0c x0x;yHVlM%OEiEE#e;(ckAbYA+TxPGbr>?_;f z-HW512i8Fd@%L$e!byUY&>VJ)j-+#68twpRUwDn=*?x`C%my=>o6URlabwg%I8>Br z``36Qe)LT}C?*y0fL?2Zka7>BEJ*Ia9d(9Q5FEo5u&2r_vOK&n7B-=oG2PpzRL9zK z3|U>}vS`_S&oyGra#|4Z*yqI6+J1C&dU|8?p>v}zb{89RD*EA6{d;dO$>5Ad4P ~J`j9q9VFncJ@c5|ydHnTxObCH|9 znve&8@5aY8fK3YZaKThhp*=5@-02z^--j#?K^^!y2K~Lm;-Py+vVF%wT-JOj)T?!G zqD+2qy5h{%m-UG0At>kHqSW}CI?t{ZO&yoALvKR45)zCNf)E0{@WB*<5S6;RRr7W4 zyT#d0Mx*}@D9*U)n2xAWOzV)9Dg@?N*zywa`$_~~E`qJB;!Zvsw!gQ+EPoVzc1bGV zSU;P4#c{TF>|Nj7jDvA|Ij8l;1-m6Qo2KWPAyq*c4Q!r4QNRA!@LZT&luH&$(M&H3 zeYXEiWVt0#n8 ThxLH+1qIcWAfmHh7OxPHPLsY2lGnXR`4o>$;1>4k>7>u 3_5Y9zjFW zN#6aaBAv zfq3Xg4oQX>5_x3+j?uEs7RzOEPOC8*1>?ilVdzAxN_qJ+xi%(FK~Gtybj3eB?yzLn z{KT11xcxk(QRGuqB;L*G)?{V0rIoep(qJwF1MNM>-Z%zL&;3N3`vulgN0O{$zxWfp zaJj#Zahihz{U^*T+!Df4Z6p(K3-`Dd0L@F`_1^eQ*p_--qR`3lpGyXYw_HBw!_$ H z##3Jq}oN_4$1#jKG@&N%_c6DryZ4C9bxXee~%R5K60wWCyEK0x!cb z>M5O|mA}PcuMM~w2ys$ANxCFYN 5xNC#ICX!BJRs{z>-|?BS&<<#cfwT=AfXcK|?peu1!?L`7<{n;Q=2IN;n^&HKiul z`s;^kZQIBt)HXQKC=ymm8;)E&FIT4Y_njWb{9O$qloMZTbCbi4 l_HfHb)Ic$MYY*G?>UrY! zI+9#g^?qeZ;m&>DzX<}k+;KWVL*hFR(t7%N?K$5jZOGY2*eF06iYGVlv4*_WY4YAd zVY#PcwRC6DgXX^u+)37)&o%hQyujOzULs=(>|rnYRq@>uSg<*DS!qWqio#^{MO4$U z4L_&oQ-Sb*mXva`5xgD>qtrI|&Pn*1{bjb25+o8KjDN<6ryv6e^ EddOn!b%-z)#U`p&;RVMPd6Lfjm}aqe&Chu{j65ids1!Lia( zQfzTkd#hDx0a&svisbIJcMoAd<<6+Ct9&+{_KSQf2buOAn%G-iw*&%>gwj>MUeMFG z6{dY#V{je>Nduld-5-w(FR0}m%T#DKLjUo#(kYmHrX9sl+5E(5hpdn#jFW=GE%4V! z6MuqHMpR+F&YZL>$ P(B}?Akkjs+o&rqdnPH-|;;emU3iY zKXH)JyA6w9Yv6>SB$DK%r4=qWO?Uj6H*Y*wqiF>wRDnz3Dgp6+dsvlLs($+X4s{sk zma^9?R2Fvnj!{BRNV#6Q5i`O&*SmA-ux@SWz3I+1o{vK|pK)E+P(GAoM*Q*X+!+?^ z-^e|z9{BZY){cZv&x*1-XU;PQ*_BiFSZ4R5B0j=6yIE;jMI9T71NPEV4cCpH_>%G_ zdg=zkKY-!@LjWzgXJCe%#`es~+4!lvRYj@CRWr*)E(r?fHBJe&o%9d^`1+dI(A?P_ zc0%*p|CGD>;8AC~oKn5go?jlLT*>Upi0GgA=ww5e=kIIO0^1IC>)w$)%0~15-8? z&66|huf=riEq#2x)N|DLv=8^M3+k`FoKyQ%i3N0c55ZCYK%pTJ#NX&HRId5tjHc__ z%2p%P`vQJ9b`IY3>0yzgAuz{AYUqM|!p@fMJMTOumA8bpkA&j7><_DJo_{(smyI3M zd?Yv#%2Nvh$c0f4%Sf0O*RG@N#i VbuzcFl=JpRN^fJ z3~2Ulrj=1N1&_w!M{N%S+dwan$X_RkqO#0>vdpC+AIR(<&^NOc^{(tssR;@^>%U=+ z_Nl0}M*$E|K8y@Ba4&siO@l=D!wF!*O#$>Z?Efi5Jv~`;Mkl}nXC5oQ0OMKqEEgt$ zS*oAj3&QeJj}(iR;<}KNc0KFAfMC0To=8hy??-5|k2=RdTxHsj$V9U!)+jgr;ActG zO+73 beDg)C_-fuRemh(uNV24Q zh_#Bf3O_ZOW<=3FjGu7dz91jS3@UIikg;FEhVGW1l6SC8 !(oq=D9eDj2soMOy*I+X&2JY3u7F~az0TcpqGIB5}1&ErGv?o2e;F|S#= z^|*;lGQSv?`_qk{hyV?vzYeGkwsB5=BcD)FIXN#%9VDHHXEji7Mb9uK8XEKIer&nD z5<+FO8dTKus0^MtK!|uU#JBo(N?!cUXx%8bZSy2fJ}1YSGE&H(h#JHkWn!qZ*?eIg z)iU^F<#_~WA02by!P6o|C9&tS+=?o)55gl2Xrq%=D{ ^WdBouNC%#M%P60{GiAo}}xCnl~KA82kG_c*PP zC0nXZHFxPT01u&E5%Tl{{$BrwrrtT}H)lbVKV%Pv#b!~gF?8|!u+?Y#ZFhH)l0S7r zE!lU=FcnA}^)hE|MG|qNMUqH5@N42G_c`tMz)*Pa6r#w>@mKFspgCt8HqjepR< G6a}ew1oBF*Y4+Cn)1IH0U$r;^z{Fh3sG2!o?A9ki^e{C z?>}Zk{?li;i|bXXPT}hDu9~qW?QW1Epj{+cjQ50FK2z`;H->~b-`5HGjw4tID4^hN z?Vl(<$xIu~d%-gA`*z11KgA7k4L$u~ueH3Zw5L3swegNQ)wQ*v+3IIOs7XvTySz$A z^$n#nJ@DvzcaPG>IU1VLc*BcTBwX`~8q6>0lz<=|6z4TuXj1RatE%s6Yu6n0*0E($ zeU)m -ch1fKcdvmP;J5q~6GnfdJDQAo^?W3MU7Gu)W|-J_ z2)6GZeyJ~DOtya>c&u0`neTT$9}{U2|LZBj65c1KRmM~x=kUdJ-J5f2jsa(>hi#yj zrpknN#cIW~U)Nl>pB&M>h%0Pt&{N{Ao0In&GnU-=`v)n1?u(HVR-)IwpyQ56QK Tvhurs|Ke+hjSs=j-0?uF@11JI zXcK6O@f5XHfJb$|yHvZ){#@>{h4F|nCzDd8jvUAgYDUkU@IEyK&naSCiI3ZF9ai(3 z4}LI^l9OW9ls#bBusyoPPST)^to{gy)8#SFGA+dv#c^`dX2>|#&_^qeV)rOF7R|~z z74PFl*; d;g@@N6OS%nq04LB^}Sjw;VCgmQfzt* z>m}(Bxjq*8BdeN$p;X$NWXE3uMLdNjh66W@1_qgaXY<_eo2iHfOE%V@rs x8P zrCZUglgz g56DCYi>Lba)+3l%h}ynOz#WcP53-9GI{Gs6bOq8p?kU)6>`YMb8vLE z{&Mrzo4L-d+pWWKPNr6?dbj+;nqQhiDx=Q`_dXHkcp55ZC@QK(@Qfq_e`fn~_sw~$ zZbhKgsCERX8WHRCr(M3IaA(o-RJ?4jkM8W X!UK!y`G<^Co?CW2>iN}_7xP`;^&GKs% zUq|g9II|U-Xs&)xxOiyeBFjrgHhgw60@b{)&h$MjKR@W%dunb2QVNuj_EvxtJw e-EEygRnw}=tJU$v=?~e7e9tB{h^9(5 zSgdEZ@0~%rlD$ZP#z{YYvG+#u;U5YSkcRKt4QIw9>0wuW_3)O9aD DTZBnvVFh8Vja93Ua1Cyu&Ck<3Qf&D&D;-hA+G>Gf z2Wm71DHW_Z_>-)NOyRF6{qWc)HPeny$GFKXEUcRsyN4fvx%WofXEu=JU^s6jt^4+{ z#z}BJ^k5{u3!c`Gy3k^=*5{9U%`j0p;~>D6KEpyJ{2ZT)Bag=_;Lt$r1$m*LSMIn4 zQQAO%f3R97ne9=1xJuZ!eQbr7#gr6rPm_{X-)9hN)BbCOAfEsz03{cN4cs;MZcCn` z=mXp$Yz+Ywsq!Kf7nfW_x18%*$MEq+a0=HOxHbDn#paecv3(J`>wS%%x|wrx#Obl& z 4=Gy)ZS$2S`($CCb+aH7Y y1nYuzp=`$N0~2z@CzPymoU>)y~3qvV+?1C>qWHU^k~(@?}f zs2|L~N$8av^LO+nP&e=0QCFPv7v0IK2Jr?UCrUJZd{#fWG~2EFxOaPZCVx{k$rv>G z!`*53sUSN|%X`X3E =mD{LQ;a%m9@@RED!ev>5dI8a$I z2Xu7qPZ|#ZR}_i!MvG1)v&K8Zru-&bJr@1MRK4^Wk`(=?y)wF`%-{?=dB~}dPI#bs ziAnQ}Cl2(914#DOqOGfG-T893d|}=~-B{bd3vtGYv{|q0IbE8?Cmy`hMm0*k8{9;L zbR8P09_D(7 lB~(T;Fk z?;1zIZ{`lR44E(%z2^Q-N_`W@(E|A&>Ib{S;~NRxwLe!@aylAbov!)EZUo=43N7jU z^;Om$(pvYkwhN}j<_t@rf!rahByZ=};CF#4j`VcNaL`JR^{Q{d7hQ0i7e)baidyYO zfv-`cy-2G =Q-5ga zbyZIcEzxqoZHiir0;#fM>R?q}?`XbO@Zi!pMyj*%YBj&m+ Fk)D@(WvK}@$1e0W`oZu+5{GQeW~cn{`UHh9Jxu4*B*9TZXKcw@xLJuB z#Mj>1l(9;U;JOWak5VQ0U;O#%M*k~Zyca&glcGs-L*m$(5@tKo`C35iK#El6+l&yW znk3F#sckZC#>TFW{@HPYKi?-7>@rFdbAO|@h`)+5dinVUgbx-d^Os8@D2V8W{?V(6 zVl;=cx2b54@t|EnePJ0ix5Ie7wtGXr1FyU^iErH3LJX!hZ%YyxLV5PZ8J-$VymL!B zai4koR)fiktk^_>2saP7W-@wbHlhRf)WX#h$mk!kKVFd_@$sp5iN3mO1R2D8Uc&T) z1a&w3$Z4T@@s}vnuz0p#r(rH0iYD}ro!AZ?jiWeC1%=$y#Z>rRwdrRH?ZEXS-KMej z_C1@gxAKBN9NScWT#7aq-(8JZ-&A-$KuTa}3z`t_d4k)Gbw9uiZxh;XUe!A7elE88 zF;n9a^i471acw9|P_cV9M@r3xk;}im^+A)Ui+=4NSLWDVp^SM#0{bw=5C%zCx6}1* zx}AKYK%p&!{nxd$!QVZHQLsLsQq6N$cFYpgYVL^ gPqkB*qeebN^}agFM!5?V6soJ<9uqXK>N1oj9XbWdod zFt!MVX*sg}^hBT>;Ds KWZ zbi)d$AId=eFy5D;+hm;Qdd>DfK$O<9LL*Ot=o3eDfw@pYEEI+U`%VkxYvsA;>=rJ^ zgj2ipo#v+$$`l<+mTVjUTm28F#KNqy$tBHxTMf^&`P^8~5E(Go2HHd+h&wyY=a|&X z_4u8dWr8_pojyzX2EL-iZp!=;gOeXVXnj;as8ltCES6w%ySjfv6cr?{U)ug_v;Twx zcn~hK;loxKvk?9|CpUa$okYx1Ou&|dy@tdG&uLRd2DeTii{*^;^G|_Ojq4<3&rX+| zMEVZ)vtb(Zv)xWqwpnYmT#MtcXGBpF&tE^~vJ^eA(&IB}zovfyLFFvyJdu=;Ixeu< zBg-(NSWM1NP}UPjpKs>69%IATVMf^ivRfH6nRIaSZEc7_qb4*o@rwF*jyd#D+fi`V zNnjg??Rbt@Np z^I>Ps6M{iil_1AN2=cOSd3m`|N3f7nu;7$k1-FBX{W0dTceE>XM7du}U7`*!gWbB3 zJf$x-*4NZ}A(nRyZc0zM{)8T gE#%c^&H5cLDT&St>X! XcQ&HKwe2RTRG-AN@H$bJ6>+~ z`5B?@g^-asbtFhY^Zo(}a_If=`BMi}cGUc{;uep*&lMv?O6_MlCU3vjt1TV{gVM P)RF#uE0G^x;jDabE7Md>iPi 91g9{JRsRDSHn#Q SAUd~AlkPLO#d?3g4;%j1eks_sOLmS`z( zAIEdE{B##$ulLmoO#y bCqS@Rbw`UynDqt%ac5j& 7IU}2~er>G*osSRc-=?vJ{%whv@7gpX zw&mgm<%?B{mMUdI5rQ40cZy*NrC9D^mB!Ugm05fV?D@$j$K-!FFs-$?3@Wn-9}YH< zWW{ 9af|kHJdCY*e}>3;Z4{ z%&DyG 5%Y{T)TWTpEPJ}3q#QcC~!zme $!{D6}kVSuVBDcHeJ9+)Mt|-RM_bdj5 z+(0qZSCXmn*?CZDL|L{@AuUOwaqD`zLa`NlM$Nn6^ae|Xr7G2~JwGN6r%Z--9m!Q1 zGef7UdsW1;Spc${a#}J-a-RJ~qslG&8F08@VD`7NeB`2pu4_`+)ryuo=;H7RZhG0m9n=#Jx%Su2 z54pQyn~!Co_S|YT_>~H*qmGZXsQh%!>dMLOq)YF4a=cFtmIOmt3M C_lnhFmQezWLT8Nyp5-ja?!jk%nAGp z8sKD8OS5-1pTEj;)%gIuLBZ-#e(;ML{3BR?$QLtzOeqg?al=Uu%!YcQ?#ltR8@`sn zJ=d{ge#i#i1D0>_P }r&%?1ZzWh+J}?R!oiD^D!6;iMdnA_W}_x zzj7V*R!J+-dJ)R(pFg>r8H8AsDX_J -RbxWAOunh9R z$`dTh$Iy={HzZYGkt$|;^RA`7J0d;(bxTW248i#tCOjY+KM3yyW&6d ;BONOddZO&hDns zaAU!)hI&V5IU!>!p15( XZI^c96 +Rp7+1W(-g2S}RjtWiZn&rhpv%1@{&Ild_>zHf@~ zy_oHnn>?g52k#spd6OaAXo^3z--#!#m^hu(vjdz)3$gei8b_%Mi@<{2^eKorswh2@ z{dT(V4s7wl7%-D*QYp($E)n`6-F9Syb*r@5J4ZL!bqZ!gqMwLXz}01HCTF+QfFY5* zv-6nl40Ot9s@KZ8ePqvwILZksxY4S*l|R1v{qT5!1y8$@gyrSOPq^e_UvIlmt7{Pb z!>N@br=Cz25ju@&Okk?~ZH43oyc)y+%=!--%*Ah%g@By13ANCrztcbynhiPZ5G*Sz zYpczD6C}8`UZxKK_6qG!A*umCEI~L3U6^&Vgmaw(FwX8Hv1@$IZ=VsRo15L3F4yR? zYVU=isI6%5xe2);9+#uuzK~7a$*S63&_Oy%+Y!azsiM0)?4VXpYD>pPbp8+`6{j*l zs+h`?l=^KJ#uMjeLZhm!vqP=Qj=QzrDEkavcv>c&+74U?q5x(%q_wx)_A_&TqsMwM z@m?9^bwAnWQLy}hxjH>E$XJz-c6H{PMpZ^wjXN9n<_!)CBf2<7>a4xKTh%aj@0MWx zUUaZqS*2m}WIZGXlk9B7`1HGp?%k#j%lQ?|=MLHVwt|+i)g=bpQfm&oyd^WvT{JZ1 zJ)b>w1vvP)Hrm_A>w>R% &PU5p5$ROTLd6rBnD~B3E6s0ws zJ;%u^K%T<>WxL7lZON3gr1{Wy{t< $X88@~}hvz8$K7#=G>`+&R| {*2!hQ^%Eny)scZjcv-wjw#Ul{RM_dy%kuai=!6uIW$CI98%_1gW7u z**78W&zzL1{@<>}5>epeJ7g~ceT-2hnc$mv^FC=j%&dJOY80OgW$(w%J ls@HI5VYY@u;Ox zX8f7iJ=exdjc}^bEE9XA&8gaV4IZE+8dt9Ts8h=@)S|Jd83T@0p#;vl@aN07v`q9K zN!0PPsgWNS2StSoj#jh2pWtsbDAyCOe2SGF!b%h)LPs1h6grjREJ+K0M3U@(8Q@~T zK*d$4LgX79W=q>v7_*J@J`+8F!einJMe4c5)#$B92T5#gRKYsWi8OYbf+F}HtEA;9 z-E^8V^5?zWEL~g&y8${+6U-kTHhj;UTVuAe#)rNwo7llua1kfGSN@TIzQ4&T@4C9z zpyXwZ4Xi}FnzEIJN0 Xj-BNo1Ip_1 z_4EoPrK89OCpk%8CqyWxd9TDG)d&iPLgdV;>4a(}wZaWOMS(MMf~kvX^;xqPh@TPE zR=gApO;3dQ^iWH`8)mn^ut2fH*yDfF6ki}JrU8*S$kTgy-g`)5E(DmpPtj2j?HIF9 zHjUa&xyqSzxOYB6uPQr1&hbT;;4||I$=QS-k=lrAAov74i{gykr#W-eY|ZX`#4k`9 z_i`9|^j01yJ4(kqVxO6Ic$H~8RgS&iA#V-(T=Rf!rP}(BB82@G>Y$>G5C*wm*zGB0 zyO=K87kn&uWMjCnOc3Ij NIZhMyGNq{5>u%0|4@T-{ z7#wwd3Zx>yQ;)Z0D?vgxhS(R%bCC7 Rcq0b1rV`WSx}KPXw!-073sOyMGfPK7va zCuT2je{32irC&+#nnjYDH^W(R8>`w0r*Yx$oRGJ0HD3eg+XkcGJqX^o9D}9iQC&Yt zuyUFPIaDdl)(VLEmg5^d;I^dz&$@cH$~e)PphWRVsASIly`gaw{=y+)t$XC)I%&XG zV|VkoBRnF&M}8+7bW4`Mz45k6Tv|@ y68Bw2HSs9^_kf6MW^TA~8Rf^sU2MuX#m`EiftChujs-)y=Lu38BKgqqL zLdZMV!zDN9PcLE{bbfHSQCj4A7oE>slcB#dsvLNAmc@`OaB|vgXq>u#l`M6#^Z_tk zEh@>au9Y~KjsCQ3GgB~=&R^^5;`Y5&Yc={b_*Bk-UW55JGUoj`&!RvF0#mZ3)m>BG z24J 5Dr|Vo^n?Z*j~g#K|(?8Do ?(~*xz7!#7>u6|ti+kCS2}VRJ+=u7seJL>F z@-)M3GIJ)65*)MD8;OXGFsyt<&UPzzpOlqJUZ>}f@m!`G)0L;FlCOy8PjbL-|Lx~J z!AlC%fh+lfMJ3-`f~hv>W?X%i-kT45a4lV@BsSxYGC>ND8@qvSwYoX5-g9)7Ojop_ zQVPdBu1$0_;%SJXd8Hb!Jw&_uhT{}{0=dfcKQAsGsHFWEZ9T zBe@6q(E^JszNrP#s?7en(?D>Q?X2(N_-+jU>t$L5^_aMXP=T6MZ|&y~y)tkBs0%3k=J z4G)nrvBKs*NbmzQB>0j{sQV79=V8x0MeR90 _RIhhSHR8D$ zhsT1@uKsNsWwZbJ7(6{xbaO7QQ%<8ADd>;7IR*86Cw}>D5ma|t=Scpp_$==MHsFtG z6bSt3fF5GVwth6$i0alXz?MaKHPAcgC0wYJ`jEh+rPfaG_8`7E@WaSHwCJB!2UIU8 zF0!ow3fb+srR#GNKs=PQ$j>9d&T@%}qW}fUh!UMTj&ac(%MyKE{R~dk+bT)de-qFi z^>ltruyzV(Y@e4ZcIavMwP-Km6L-d2;BP`Flh#v)jSlyGDDx3aG~wUp+CR! &ty6XmYH*FhBESh0_;&=*T6b~tJjK=e*aWAqI;$e;Zp?(5oq z>&c4z%oyU-{-BJrSysH4d=R2OLL8(#%)&BL$&=+28C*9wzqsD_SwHE8=`{-=Z&RvY z>dYPCo&0Id0`Wrvp3EXfckO#|ytw4|tKZ{8)N8!8x9&{Qy@99EftTkWQ->pVcAk5C zdpkVme@j&44*9Z<6fqC}_juhG?t;8CUsu-l P!{k(jp! z4wb5Uah+;fiXs`6uB}vt4mmcPzG0}IlSonpEj`C5M@}YZ5;#>jPDjrBt5ta(@rNSb zmlLo-v3eHutJ6VNpiel#1P^tGM9E&GSB{G}KC=R1bvUfP-bQ#B|8g*1{oRffK^rA= zW5(Lm_w O_zDQD%2gqzy(VSj~r8`j_k5~c|TXR`yAuZD7bYp(hEb-2|V2!kKLi# zY!q}LgL&bF!Pm@H_3RLx11NkRNNH%Xg ^tbGGZ;e3$-|1VvQS z;-@_-eBHYN3|^7{u+6V$C^~pvvShb8@xjb-_9Sl$7p-b}FQ(k}@80}uevl*OYe`%l zGvnFMnp5(4a(MDJeh_*;@pL3O0hC87YUffqoN@Jxk=a{VJbXKy!ocXM!57JWPpw%T zysGy8^FP)$`qrW?cU8TC=_=*lTYI60LZ+~F8uR*gAczTCPe-JzSNVpsFnKaY@uwri z^X-##rS2q^v16^1G_;uJD;qwkqKGA>!lo#`y63X>Q3=jznv_zScvP`S2cNKel;? 0)T9arx7xb!?UvJ^>o9$)N0oY zf43jrh1h~WtCd8_$ICp#A3>fTU03K$X3IP_Hm>oIL8s*91)#t=KZ|a(JvEDXSn+jC zk;>g!#~F>4-QYE3E(3WSjhOn-gZS6-3rHw{x@l3QJbic|dH@mXzPRgxd0`-{;f*pF z+MIcF=gGy`sxrEVbDrTm38^;cKb;NUVYGRgYDn&RbD>SOZ4J>8dXK)>*QYiRsZ-2} zdpJQK %D&pE<=En|S&Li=%XME#nbhjpY;vs$OK^{SvdQ2~rRk^&n& z_py>akp;2g@_kckZXW30X2Lxth_(3Yz%^x;&Z&laLhO%;7>ur-*XP%@wf9LbJpOdi zEJ=HLJ*(z*q`;tBQQzYKq;pP*IEsJq8Dl%S@~BIarsnN^{ou&1*TM66%`zZd oo&h3Hf$08&!QuX(v9sY^v#TZ}wAtv3^J^?qdlX)=K3H%+WBbDsp? z%ycJQ6yysN;igAAy`rgURdIo#OL+W|Pv^GBfo!&-qX;IA9Yr4Om?l5tD2N2N(TjSQ zqNMShW=Dl`126B(E4k4tP#E0$52HP(v!|I*Qf<85Zy822HL;Kn!2?!guAp#~uop&% zM+d^qpqa*E>2One5Rj#@K;~T83*>e>m}c!#Qc7K-Wm|2v6X?zN{tevkl}qmiv{zG0 z%Y#@h&;9 BrfA#YDK+$gKJ^wOBieT^D=k=fvn`iipXR z^qx2Yp!1xPkvg3}opat+D=k78|0k!K!dN_5)rzootD?3GkV@=QvdpS%pe$-YXSSrV zYGGyzBh&Kj+K)p7YgAQBripbDqe*7j@b)lwO&p;@eO`M^e}zoINx ztrqFFv~y|k1sz`U)2MqyEBKQ65m_P4*~l|v-=wLNK~p_4vtW0I0XF!kV6ISClAr?c z_mfu;mO#_~748Rd{lH->AVua&C=0m?6>}@VGH2pSj-f(fw0eq86#$jm;s&Df-x*dC ze$}H*7`_ze)VaOAmb2+E({Y?Rd{Xf|bIGqwtIQ+J(MY9e?46JNE*|LN83uXr_!l4f zzPIE=A1V`ZTU;o>^1)f(e;Ey*zhd9uNC?!EF0pa&9A*AyE9xn`j+kCuYDp~Q-TRaP z97{P=hTvy?n$-4DsafAzamr82IlKK6q&QrpQ^6sskV^H664yHV&rELWw>+)40$fSN zxao|a QIFFQcM+^YUL+O8ISvP-A>#R8!IWeKkK&5dSzvTaTI7L?Q?SXV|Dp<^ z2(SzD15Fj2Sc`a?iV%3lhtSJhT!#NUbTq?2x!!5{HcX?^53o%Z4yL%wSQ~qR5ZjzC z jaVliJ4 +h{C&&|E((sEse~S@mzFItfJ%%46=9ltu(<5Do z__z?N4Kx7UTg|gv#29s#9>VAN8HuL(8_?Xk0oQt)J>0ATZl*6-=6jF)fxPL71z@~3 zJ3sjJ!^3}(UyvD7$We|vI@JmAGYf$c*;4|dZ_xu8$lTl_j%4=$ Y$TGC%m9Vu4Wo_8bH3O%%12^H`nAAmU6z&91S<8P~%bs7}?{ N_m7cXeVh50 zx=(A(SJ9c$n?$ROC!o!}wy81Z|D)W!VUTn$;d__4=rAvUZI!gjgw9SsMIC~Q82Fl3 zaM}2tP5=WQ+|@1WG6?zOo^VHcJ^uK)@?m5@8NAcn;sDL=eGi@!H=3C6?H;Y>BY39v z%GoR952w|V^zKM}E@Of%anfp2GM;0p^&4=SqQOFDdrNa953k}$$~*J-g*u&TWvioT zvdz>b&F!^ae0Vyh&qoyTL?wHQup8%xit+LdFhKcK&v2kJbH6G1y`%m)mN0{HwK %nDWtqd}&E^+0EweV6nBMOsANA(i0 zi-<{j$tEvw4Y1DTXIEO8Y#ufJ)C*awRj_`zU~n(XrM4>uKBX4LtLlgh`9<-zCT ztVDA>$Y}WZz+A`{uYyD^?J@KdmMHk^mhA2J;SA^$wY`Y>c0Oy|A?#%zSOyhUT3r6K zog(x|{y$NsHsaZ;{F-ULN^e-QVu2I;pzMU*z=@_yE!az-p6O~%ZNR&{(daS34t+|P z`-?oL++}|1e?Q2B;`M{jxg7uOPoQ_~nNM}+T%0 y z;bB)JCpg>MmFbSn<(4Y1%)#nHLk>yok2aLEDyM8zzyG%d0bipDSCYBdjCZV6=)6)& z!oYE~dJD~Wa2NG(Li=DpJ9JKXA$RYpVi-I3yv!NoLVhMG@UJvZq=05SN RFgCzie6pL}~)@QTD{*3TSDL$4)yG1RgUaJ#g;HJqALAS9qT)&=# z`fT{dZd2s;`wr-6aGZ}`j kE|Ct$f$6`nHLv~9iRRw ze(mJ-Sb-nCz8k$w$7DDZNZ{Nm2?{HxGcl~3VS%d@g&azGb^vAQ(_{Jh%o^vl?%vh? zdxKb`ZZ&qkz^l8mA=QBznoKF_1L14-OoLWGU*E}+PN?Er?Pus6+#RttIR%*QcseF- z7rjy@ofqwqR3K!cR8@#!55DewV2U1fxkoUkuG%3EaO0|l89OiigIXlsRn&G*a`z%I zOjX+&s$a4<0?h_W)SGQA+Rxs!^(3o=Y)6eLWgjj|q@LeyU6(mTfvsJ#d%mb$cm+rl z*`5D*EYP#Q#!cq+pT$&W=8sEFWuj5$X8&}%sUe@0Cb<0kh)m_4^$QA#kAczQ#mYpu z9PDXjxTxr8)67ghzgPRy(`<`%b<;DNTT K1m7OM=Vvax@IZ!V@a+`IWPrQeLrdp*^{H#2tr8`2|%6y1k{37~HE zznmHk!D&Ok&8~xC$F`@vSs^B#5^)6MPo58XQBdk {d*lu`nc z3ofv9Eh!zl`|R(T_j&(4GiR7t?(>Q3zJj<{nEH;xD}y~ntK%N^o6Z(I+vlrXtgfWb z1)i0X6zY;`ea*~O>6{0{O0i=K-rDRGN>q( V91L;S6A ro2;} ~tuibRGh@YI&*53sQ z{_*kVYv9BS5Ds-16q_BnZ!w-Th!6JnFs!ef<2TkcVS=%)eIoXL`iJeJVTE!0MSE+@ z&-Fn}BKcU~m6HI*`s4A@uvLT6%b3jPlOKs}6BNBb_56%Al4!-N)x)>mTQcVl*dl${ zQp xW&u!%9s<&`(uA;S!B$4 zJd=Iu+B=LL1cze@BebQ%D d1O58$Xth<6%xar*Hc=16_e6bQ%~x1+R76TAflfExPMuzLQAh!uNNRZS(q=vC z>QQ7^pB*(dUg#A$1*K8KuMaZh0W6pf_+^-Ds^_ZWVLTaC(4RB~MW4dYbUe`NSbf|P41~pTFgHqVxd`|4*-LHKScQJOUhNq?e4qjz)PO#xuqZa 5p4hok3%!0a@W4de6)A=>4tGZ2r;}i2=0l&8Rb0PNQix*Txj$2~PJ@g* zbH(^RQZ@uB3*Vf;>?c<*r$mClUuy;UPMs%rC#m4*62&c`5Va#5OL~)xJ_oiuP!M!m z(mQQ#<`ua&883w#xLe)Q%Za%NUO`KqbAA2#p&;l$f>s)(^Y#4RKb5QdbVjoMzCSl0 z>+{hyqqdq0drP9KH%tDVo61m5D%x$$s-<-Vcw)A&>u;PN>2`IIju&3|u%+WNEhtZD zlRmdsep?A#BF^={yP+ZXD-8A931UvB6U?NcA)yc>mT<)0wIoY~ZZW$47~M$T$Iu07 z3Jxesf;gLc-TUSPW;-O6qU6a}&;x>pjYO+wpVlyx=&gMJRi`p|^BKxFdi^7N0I~xc z9m2ywslk6rK)?2|)@M O4=d+*S-jG&MEwEh5>HwCD_ zKr$eGp6fMv(6FdahilE6>xKWT##4~KiJkx#fl{aLT}b{+8%~|wK`re7$+ali6A@-h zk^ITUmHj_37LktZ7tFgC!3yPql&!DDr2EgvZ~sDjwezC8FH6{{lXL=(=TFjh@Yz<- zF>!Gvxcyxo=s2@T_=*isF+91d0Q6d%t>#lyR>$@9Cho&IM^!^Ew>{2h3sJbCgkw5| z!E6c}+l~Ym*AxMAdDMxl2001?ja~^U?k6d7x`7XS&sY@-P7_bi#Pz+NQO(V_ZH1`p zUPtP~!?bPb&2?#w$Bn=RPV$tHM)@xDp>GFrj>FMW)GOrIbmEhTyY-A(AjLf4^>K*j zKvMfwF8ux_tHOi0
8<@=a4p&T zQOdS-mY_xn(bS`n#!uCG>ryPLo0P*>m6e{$LM8E3QApV0)9pi47c p!-K5 zQza>$i2Y~o*V^1O+Z!9q0E|9-^k@^ek+YaqA@DJkPK8~j3g0t~faHf;{F%Tn-=N>z zG(qxg)1s0y)&*gA;bPwbOWMRY6=!0;J1_-FCq=zka2*ahnbqRY$^8>2xwv1&;CmSO zwtnWwRE$H#(4e{eiKHLHn$>g;*b@MYtxcCqM}EP}olm6IR!`mn5Y12L3uqr|Wbhdn znpE;X_w)!k<+Lq;7MrcA$-`&1;U*Mo7tLmKxY^%qw>x;|(f|7tz9Os1l?;a=Fw(vT zKD#)3<9I;B+%PJq6Llb-*d$)9tIx>1yqph}d{_U3azgVHr5#8$%bqloO{E{(q)xm_ zDQR;pJIz4psReKs_I>Cj$y-i^Sg^==V1fRUm0q}NNrL{13e^cGwY&C)G4$6)2NiX` z4ospt0|UcN?-b`4kvR>VL5?v;$|2uzEl#G;kee!rFZP9JmF_c5eZv&h*eWjU*A~Qn z1=dbjpn@oyl- leS;fnYUIsB zx0zGEmEV5*D?FYipbazj>@`Q9An#y@lCbfdRz(4O`OCfD>cg71VeSV}_O_?v!a$iX z9NCi}c!8e9Mpw6R5g`09x+dqZg-8VC6xDSS)$=xs;liJMi8N&L1pbrsZdooYD=qG< zwzSgq7eKWvccDIOcnrDp>9k;&f^o=&Mm_B<>KpQw6Ve$5Uneg?0=0l)HKN>)a$86K zCmXle_k@z)zA%m6P_-o$Zd<`0_zG}k+X~7A _a_cw>Ajl~4Xq#C{>j%G4jYb^ z^9_mGgb7pOu?#RCBkyqSz?y5ahsP|`7q|*CEawXlWcCxaDe3?g5oXrBNycQyfZo@S zG2#&1a^i=Bm3MA?nI0$($7Hr2F!+C)i*GiG?+eyW_dP^%lbEdJcIFjtXv#}`(&Rn> zQX!w*jI~N|+91QIy3f+Gj$%o?M+yb$hV*M4ECpdZPKU*7Un#h)&3x@`G>dsRzyYI2 zu&F <#0<=|L1qu+i7R%k}F^Xra|xECTvX1o2qVmX#vYG|fj}r%CNp zAT;c5RN3&mBh3xrLaBW2IUI&)EtnIVPyL(s$gCdMb0r9C;=ZZ-Y0Uxx%XQ}e|1|oz zEzn6&M@J70M?)&4l-5X-?SF`R1=&f1jhEwEL9*D jX-uT`~nKaaIh* zTJ|79D^&%GBt{1A;VI8>Qbjxm??Tz>M>~QHi>wl>Q2ULAZhn^vD>jwsX)e(=8F+aK zLmQk*ir@5n@U`Dm=DdBAlciFY#Lt)WC460@SJ(d^>mKFLSdZG)wS(Grlpbnxr1aMFO?wgAif5 z2BeWN-&%gjfAxaXs*+1FcdGSLFdu8aqmCfMehDW9c!z1W60v&rvtG=rH%m`0{F6JR zf`=wvM@hX95l~NK1SvCXFTn&wyA=o*6evz0Q3!&BXb5*5Ktj-UpU{-Czm&~ 2z2Ka5CCVEX|_MEZ`XRT!p? z;=iKQdrY1@H5_s||1}^)!r^hDt)b7~BiCOmUH;fN3#45}s|p?u8^d`0 pDDHP@$sr>BlL1#czyQdO rG5tw}g4jOVA z+AASc@6r`}(j>dsA7{H^gz+s%F^+(XcEo6sQ&33DC~zm0{~qwsnk{M!`NS)&DE};h zRO@Be3u-w1lKYHTxcEDrC%YJ0!ReMt8@OR*r*?0u=FHau N2SC52JY~NMu;Bzj}Wj z2X>>pw|l3{wyv~)q`myJPgJ^`@=T;H_!|QywvUdKz^jcU{_M~tbnuE|uT;tArR4K# zBV&zWgs?YW1}0aN`r8gK*O^2Ty48zrUR@X%D7!%iMb-;VRT+LNT9_e}BBmiYPKz{5 z)~`9`-DcrX+w087Wf&lsAhecZuHz)&&ka%tzcYt1#GmP^x<9(IAWlrvy<5h@;Q+l- zYIQTzcZqsj9_uE|MJqU4${VMG*HTPiYebi2|6iQ6VDb1lZ=HP(V|AaQz8;AF7xNqt zSfHj~U`U65YhKcmqxc>~@0FIqMeLNbU=%A* q^(7zO#q&Ndk6{ZwJe-GZDoQ+%c4u`>aSM34yyj =_HM$k9AXcn94T{bidA_6?#HJc;@cEj0Y0s~HPlak3hv~X9^m(P}U9u0kQtO&VW zs_;s>4iHQGbpG@M&t_zL6KU_|7*&a x75!Z9b)bDL)5b`Y`qgMR>7a| zlcVL%e^ZrAXY @5t z|JHtJ)tX`a#m$;28}%-==H3z6$Sfu7_m3!xJ9m;V!?&A+cq`#EShET5;#K$Ae Kst0WmNQs7Cw=lQ7;CTh|8#wI}oB#zYRmr_FhQzH6IuA6Z-7N3qS@014xBnoP z-@?K^rD;h^hYMZfSqHutVtf7M>oZ24o7y{O%=ztyfC$&(m(f$Nr3p8XE#~1nh{@IU zcS+&SAct1(2g#o50h?kfyiaA!6~~l&p`DtPwYXtOI%j#*x=6%Y(ZasRQy({1F2QQk zJL3}ya&n0U_R7Mq?Gf*xPm~sTu!?)FrilN*o)RkQzxia(!3;!`1RPj@jd#kIdM8R~ zc#c^%j73jn%(Wct&i5LnzkW3`Hu1+T1aYVO2>K6-&>KAp-|SHsbb2H8Z7%h%oSGSZ zU;&2V!!pY*sOex6;{+NJc)fTPIcVu1&LeAp3{3K5{wMZ5!j_MZES@(>^mAolQ|;$Z zGj?JdYkPY>ZS_FA13j1OaLudTyb^c4sFNvM^mwreq5eOEAo4zsgL^if+uc@_#Qn9R zOuw&%Lle{P?pN``cT(|ytWWG*^1X2CytkZlGV0+W%~IHG3(MTxJZ;iRGs}J&4zrgl z5cr3qu&)@tSy8C0ISQ7+JV`0%TdA9xD0!c)qQz)z2b^)KwYhH);{LAQINK-WY>L^n zL`ej)dS62w&9Wl2Re2WIy$QT>{zb!Yg(AMakn0&15dU$WH#^FurmGn5lC#`}# VZ0TO0wlRvKy$VPno6tk8ML!V5U@i2$|HIyKr4q~ zQTfkFFp$7w*okBzDVdsr-w-=weqd*scwV4*Y(tN~DBmc+k!Shuy9b(B-zL4B V(ini^x(K|>)`(JVO6IR2D;=*Z~khfi(-rM$V!_Y#vx?v*e= zo@3GX=qIw1wv61;SLaURlp>}4Hiy>Xy^azL>6PdHTl$X=t%M3HSDHvaqt^2 eI9Ip&RT7oXZ z;3v{3xB9027g%3+uO8E>Au)mF-AqVmnQVzG-(b~7b<&5rZsnDeII>|;s(~S~^%BxD zKQkEbt}BuK`)$0+sp`x7&|=riGWmu}iS&FMx)GCxn@*IFEu e-6l?;$zbB4uKEnt6e{WsZR1e)nIP&-~8n T-a`Hg`xm(&^TKc`m zzr$CB`@cEUsaB53o0g=5Bh-xKe-2&)kql&~cWr?O3#RJAijlz{=LiY~cCrtB-vh5O zp5{5H s{ts4vdV(KNeI7tC+&LFQIvQI(~@4J!57((8$g=GLL@al?!N=4P9emp9e0aHPx zUX2t!tU-43uThyzO$lwQJ>!y=a$EgUQLY0`Q_NnF-;|laE9XFV;r74)B1uF#;Y(JZ z`_HC iODtW`I!?2v^OS|QI8 z*x^dKp{>(-oCGv}0(dhRd;yq|7#OZ~@vRG#Qps A${4x7~WCG{6Zc`MEkHfbUp%O_D)LkiZ;%puvl}cLIKFOrEnSelc z_1 YTXb5INaB(n;W&HD6=32Z21x%Ft9Or_Wdmy*086`z_GEiL_i56~_itm52 z-Otz7!q+|91MnAga0_H{Jf*Resm)CVcEGgld7p^YUiE3ThfIn*D*4;x73JuDY)H?Q z^nnHsTauh&U+SEVNV`IQoU~Y~9Ew=)BLCt Sl{0;Exd&!;wW0dL0jTJw zIe_wGoEX8#yRRp*C&+4@tI|4D&Rb%}fP(RDft@0##RaYpMOB}lYq`cR%e4sz-iIYC zTB+6v&e27R5btk>nRK74AG 1y``s!b%jR|jsrJ1le1D&b)9+C%oiylgi6rp| z2_PS3gguHWPRWh#0?TrP^w(v`9V>X4$#ImOyuImXPy87#{7-QUr?+Ef*JB(#C`Mk! zzTaV9ZSU`*nCfU}+zh}Lmbc=8<-FL4R(#;_BJU-gI=m)+E5e^_W3;gZaMgYIcY1*X z^%EgmgnMQGWZJAM6(Ei5;~~PC)YaX?XB7s{2@m}=!)~llS@}KkZwSjvNQIt$g|#J1 z_XhTX#q4Bcb}w89{x^3Gcm_x@zm)G9Hch%eTn O}3edCCp!AEvSIrM_oP))^jJXB=;oIy42#uyh6sd!8H%YmoN$_ia~g zKFP}~pmxM*+tkZe*iAn6K6fZ2Oy*wh4orV9-2Lk|AK(xwVvrhQS~M&DT f+4KCcP~=KuBuKY8@=iFV}#Dm@%6aSx3h!hOQO*E)fIzCW!^JZ^gA0ei?r z{Jjcw#X-B>Lwo{9`^1^Jw#N{<1M}usJvvIcd5(rC!~F;00%6YR(EcU6%gfi_1&|E- zglJL^;B8Ls1`4Q=!DhQQt{48}dVQ?I9}>JaHZ|e$oI=TXJ2Y)dd%h5{=pjpoCG~jj zIzM5nMFE#FU#H@Z6L;^)KTgs=3`i%}wQ}Lz>M7ui0l-$GomV9Cz_2(8)2r=dOha!e z&@eRW+ZB2m{SPv;4_2SO12U}8^XSWOmze&k2ArD$g^0T_7?jPAIjG $$a{p>|b%QtRml7T1 75+XI= zE0{!{1yt&OA=WTBJ@ARjM0pk{(X~g4q%z~J@&qYpS>Q|+K_98x#q$6Di2&16|Dua< zWRC|(rs|=E6;zFtlvzJ!gatkv1u>c)l6P)7eUjgu+I8wdxfLEIO>KW{W&Du)=n^E) zrq+~+a&s~CnH|1*xXVF3fazQR`m@lt&UeoTXb^No9os5Q1X?CJkls5Z?}9^-oh&WC zIHNE^@Q#5k?-%xM@Mo#pwkXp?bimE1PCL-+3b{Y(*e&GA)7jOCtK}5JiAPM7Bl2rv z%AbEKRfKix#$mszAC6`VX|S~t&M8fP={eXEQ>8%ovtw0^L7Wg7lp7kFe-IYRIuWWT zaoJ(f64p|mdnlQ%ntSd(sZ#hFR#0_z(Sbl*%O!uc3S+9oRqk5|H~Pkzea_pyDFwJ( zA3*1V#p@owhoE+HJ=~k|t>0=0;jv`-y#b|Vj>}Jc?prvuS{*>Z=PUu_rOOIKe&Ms7 zpDIo1>Gndr))OVycQVGaQ227q^=h!kndNuGo*bX`bhimzs4>~I#QCDT5* goXG0x^8-P#VUp`9;NrXy{H V~`&?k#JZYC^~Nq9)zHo{uw8)=6U{EwKdh z!P5wa@d8OA&uH8nEeJsBddU z@dSqX|Jn97s)rC~1g``kNr;B0$)-*g*o| fJ4dQ5xqD z d|&5v_F(Pw_UQ9FXgLxv^QhrfJwiy__lG3i zg=Bo+?lr&6U$#61{kdVyK@etZEzr0Kjy>)RTA434YRY-;ALvbiRnbN zO^P47^-#LnD3Fw#j2&>)0zKFj7XBeX>gX8Fsgbq8Y7;|;w-u-(141!ZhMQ9jn-!>4 z07|qfv?}^h$ALgynN1E+y@T_R7nuNQk^|`1?X9$gb%&5XtxYBu%P`0$Y|&r }rM9?^2P}MVWc_t>B1GNlJJP*`2!3y~ R=Z@7G4bBJA8< *yry=)0#gD@J?3(&Efo=A+Z>Y)O;gQ^+OzPHyRclS;wStVQ=LA$ z&JbU~ypVM|j;2Tng>q+rN|@$_@5J`IO8oDjCZTGsV}CQSvzTF@MDQ=%U8 T=?%?&wuusfZ(mfzPi0RUqxHg47xAA|-Y^gN8 zl=I}e(Y3q%(GL`;@=sNjFI4Q{y5gaob%0KqqF)|$Y!Bk6^*V$ZEG!SuYljfbf3f4f zMwU~f@d^`y@bK_56n*vHBdqSq1Kx|Q`U@aOkY+xq>%>;~J8Zx)!lM^m51{=?bA#SL zT6-jEZYn>RC5zB?i|E5lPYsW17ojI?bx8kJ)fykSTv)@l PUmL7MWnRol^Bw`};Y!NMB!`qeg1((u}S%h 2h?0Scq%J}H&5*xGB$V9W`uJ9a6+<6Y| RcclC?2L@ z8sBQSN3aD5;FRcg4}S=o3z0a=b#Gc~?7-42*!2y~AI)wwH2pqxp65*N8h=AgMaCN! zDKOf1ys;?Z2QnD670EO17%k>?Zh`0!!h9L9%%**Ri*dEM$@u(zOJ|wV9{OguM)cF} z26l0^NSDP{GZyJ{C5Lduz7gf2ybfEi45KRHuvhj3;6VCW-mHw9?;XaLpEEGY4McmM z^IB6>6gy9 ?bjc4Ni-ouX2j>MgG=5 z>f)HW)*lQ!%;zTp`MZiF*u82@(Tv8#+vWq^)g!Zb<5=l&%9D_;CPS@RESj<6A&LGR zn8es$fEe2Zfkh;(Tu()Z7inGR^Ejq-fng (%shW5u;ke!=hgw6=7K{;v&*4Z0U z9wn6nx_mW4w1#E!66VZwCcES|{3LDaP+U`Ani*u~#Fw0-`f9=gagcT~3%E+Xt%- zR|7xW*As?UL}Dfp@sTFH@h7p~_eT#BubP8Ql0Wjl)1AfE?=!c0olaj8?n{GNw^LPJ z)~w+1+Re zSA=C*4o6d{@f+l0K9oPUSL2YCoT5U8A G#u^Q@W0k~F#l|Sbfn0>eQ!R4`mAM!IElDU&zna^a5T1+0Eo|=vL z#>4!Gv&0VT_gjv)uPAG0h%Yql-Sh)`I_k!G$)sn#RHE6x8>E1B{WAL4e)~|WK2lU} zt3q^C+mcjQ=RB`0%KHq**O5Doy#t^=I0`kFh}bR=^>=CPEGGdS9N@1MvTrOl;ux>p zPrlwwr;oZD+MNGp0iu*y!ouzStb)y1W{M|JVNdvWUuOQz|K3`2o<7wE7f7(b!wqPa z!9KY4JDnOJ{ul}5OO)PSGDlcSvJ3Ms;-Gv E}>@KZTV+tt*d znj??3Vf3vFcd}jd8A}$an*6e8tTIhX$&y^mOCQ@YIjN%^T T%8oXcl-jm z_u7*=h_FpP?Nb0auE9-!DPlgVICAqn?XF|?qWCFL@pOV~K#aGTan=X3Wn|drLv3W; zj~*(ujWr-Pya@Gfb)wg!(^%|wZ NyCOk^g zH~@yt$0;m16QT2^iSD$n_$uD?Q8&LQT `-$zkOW-)w*P;qoic5G!?vegh0|OcKYxunF>4^#`zPElGr^#vh5eP9Y2%2 zRa;k@_BmfcETdNa8g9IFUV}Zq%WB t!BMdA|X6FBfQVFI|0f zVZBzqihZ&t5L2|EyH|4#_N$(KvBDjBSmkRh3Z1OF DYDl^r>2FE60=`F62~ z1M}oaw=N6Ucpl<9?vS&~Xdky1z-b>Vn!j;!l3vEwBvJ`37^v zVyz_3v>;viIo=JHp`pz6_W3YK9l+>#w6pBZY+_Q&&Ftg$DN;ZYM2a}GpI0n+y-CIg z_O5u@6o2hsi;_hZ^O~f2M*M6MnDTPX1?m6!;Wi`f_DeG1@$dKaFKVn}pT4PA<1$PT zsoiyitx3@ue-=U9(x;1N)0gi)9bg&|;d5yE{9HGUbM4+}T_yCN4M?w@F%ZC?75&1X z)JwLQ;m1%-8yD&9r{T~EW+rq23T@@e#5Ci?euA0faCk|{-u8VYL#{@maM^M68D2<{ zn130><0ELt8F+)e>$x3$_OU@Aq-Ynb(n>vdPa^lDVnj;3;U^_dygKtgDRUH_p>Ooj zX&QEo*)=+n&O0o7#JzXod|Ut_A>nd|PeomVvm8@}#jblOJyLs8#&!3%)jZm17w@6> zyH$iYK8nswEh1p}yKw}VM`;_Uc{&txeR)OLL&sw+VX9s9lbF&t0`ZQ2jm1osNw1l8 zz71zXvHyH?z-qmZAFC?7W~C~k`WTP54@MwoZ1j$>&r8e-h^N7F-2%F2i;!aWLa {oRDeqgEeBOn=mPQZUujx+wyH?2$vorOEp&2wq3yWFlf0oA=(vva6Vi|Wc-ZiSF z53|qwmI#++G5_?RId+aI_JT;p^4*xscNM~NJ={$~+lEw}5?oUZvGP^6vo`y8D-V}f z><2{M5*0fS5-r+1^uRWXtzIP*0m*$kPqs~_E?Tq GC*6U-{xLHzH5k@B`o0$ z9CRw^Ji#ZVO|;Md*HqdskX!tpYf!KBf-kSq9bcM`BdEtQbEmNg{}Coc`(n3E-}AsP zSmm?H*GF<`*-cv@$G06DP#?eA*}P2xlxxumoKt_e>@(_ksKA1@OHw$bc4q#r^x0 zAs0=xU8LKVktLh-qpGot8E{17PV3Zxb0 #ErtEIb z@)=Xkk;wSuO=oo0y5?4I+H4tHFhMUxH<*-fz!WZjf4fS2$l?TJb`}9q5{++Dl;y-p zuRp7J-7$`*08-_#TEj%+#lL+L8vFK7tW7S7RkG}jlm#;4y2A>ekMA{tNn)NR^kY3s z{I6Nm9G72%w My+(c$tTaU z=ZMQ5I(p6gTAxSw>-ovgRQ%62Ddr(~t-26+v|K$)8ekV`QI;{wH#w>BJ019*u6F4Z zX>UV-{rR`Zry??!zghG9b71zCGaj49wKc*Bvv7B_>t5LN0=|7+i$Jw$4