Accents & skintones (#1247)

* accents

* Update dwarfm.dm

* beret

* misc

* dress

_maps/map_files/stonehamlet/stonehamlet.dmm

@@ -2452,6 +2452,9 @@
 /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" = (
@@ -5608,7 +5611,7 @@
 "fvn" = (
 /obj/structure/mineral_door/bars{
 	locked = 1;
-	lockid = "lord"
+	lockid = "manor"
 	},
 /obj/effect/decal/shadow_floor{
 	dir = 1
@@ -5767,6 +5770,7 @@
 /obj/effect/decal/shadow_floor{
 	dir = 1
 	},
+/obj/machinery/light/rogue/wallfire/candle,
 /turf/open/floor/rogue/ruinedwood/chevron,
 /area/rogue/indoors/town/bath/redhouse)
 "fGl" = (
@@ -6794,9 +6798,12 @@
 "gHu" = (
 /obj/structure/table/wood/plain_alt,
 /obj/item/rogueweapon/shovel{
-	pixel_x = 6;
+	pixel_x = 11;
 	pixel_y = 1
 	},
+/obj/item/rogueweapon/axe/iron{
+	pixel_x = -12
+	},
 /turf/open/floor/rogue/cobblerock_alt,
 /area/rogue/indoors/town)
 "gHE" = (
@@ -7348,6 +7355,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,
 /area/rogue/indoors/town/bath/redhouse)
 "hsL" = (
@@ -7788,10 +7796,6 @@
 /area/rogue/indoors/town/manor{
 	first_time_text = "STONEHILL CASTLE"
 	})
-"hOu" = (
-/obj/machinery/light/rogue/wallfire/candle/weak/l,
-/turf/open/floor/rogue/tile/bath,
-/area/rogue/indoors/town/bath/redhouse)
 "hOx" = (
 /obj/effect/decal/shadow_floor{
 	dir = 8
@@ -7879,6 +7883,7 @@
 /obj/effect/decal/shadow_floor{
 	dir = 6
 	},
+/obj/machinery/light/rogue/wallfire/candle/l,
 /turf/open/floor/rogue/blocks/stonered/tiny,
 /area/rogue/indoors/town/bath/redhouse)
 "hQV" = (
@@ -8072,6 +8077,7 @@
 /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)
 "icG" = (
@@ -12760,6 +12766,7 @@
 /area/rogue/outdoors/rtfield/plague_district)
 "mNM" = (
 /obj/structure/mineral_door/wood{
+	lockid = "manor";
 	name = "servants quarters"
 	},
 /turf/open/floor/rogue/cobble,
@@ -12808,7 +12815,6 @@
 /obj/item/reagent_containers/food/snacks/produce/dry_westleach,
 /obj/item/reagent_containers/food/snacks/produce/dry_westleach,
 /obj/item/reagent_containers/food/snacks/produce/dry_westleach,
-/obj/machinery/light/rogue/wallfire/candle/weak/r,
 /turf/open/floor/rogue/ruinedwood/chevron,
 /area/rogue/indoors/town/bath/redhouse)
 "mPQ" = (
@@ -15597,7 +15603,6 @@
 /turf/open/floor/rogue/ruinedwood/spiral,
 /area/rogue/indoors/town/church)
 "pov" = (
-/obj/machinery/light/rogue/wallfire/candle/weak,
 /obj/effect/decal/shadow_floor{
 	dir = 1
 	},
@@ -20594,6 +20599,7 @@
 /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)
 "uoh" = (
@@ -22040,6 +22046,10 @@
 /obj/structure/table/wood/large/corner_blue{
 	dir = 10
 	},
+/obj/item/candle/yellow/lit/infinite{
+	pixel_x = 17;
+	pixel_y = 11
+	},
 /turf/open/floor/rogue/herringbone,
 /area/rogue/indoors/town/bath/redhouse)
 "vCr" = (
@@ -23162,6 +23172,9 @@
 /obj/item/reagent_containers/powder/ozium,
 /obj/item/reagent_containers/powder/spice,
 /obj/effect/decal/shadow_floor,
+/obj/machinery/light/rogue/wallfire/candle{
+	pixel_y = -30
+	},
 /turf/open/floor/rogue/ruinedwood/chevron,
 /area/rogue/indoors/town/bath/redhouse)
 "wLo" = (
@@ -65805,7 +65818,7 @@ tsI
 kuA
 sFL
 dDV
-hOu
+sFL
 cya
 tcZ
 fIp

code/__DEFINES/mobs.dm

@@ -391,15 +391,16 @@
 //skin tones defines
 
 //DWARF SKIN TONES
-#define SKIN_COLOR_PLATINUM "ffe0d1"
-#define SKIN_COLOR_AURUM "fcccb3"
-#define SKIN_COLOR_QUICKSILVER "edc6b3"
-#define SKIN_COLOR_BRASS "e2b9a3"
-#define SKIN_COLOR_IRON "d9a284"
-#define SKIN_COLOR_MALACHITE "c69b83"
-#define SKIN_COLOR_OBSIDIAN "3b2e27"
-#define SKIN_COLOR_BRIMSTONE "271f1a"
-#define SKIN_COLOR_CERARGYRITE "74708b"
+#define SKIN_COLOR_ARGENT "f9d5c3"
+#define SKIN_COLOR_AURUM "fcdab3"
+#define SKIN_COLOR_MERCUR "edc6b3"
+#define SKIN_COLOR_BRASS "dfb798"
+#define SKIN_COLOR_FERRO "d9a284"
+#define SKIN_COLOR_PHOSPHORITE "967e70"
+#define SKIN_COLOR_OBSIDIAN "59403b"
+#define SKIN_COLOR_PYRITE "54545d"
+#define SKIN_COLOR_QUARTZ "8b7e70"
+#define SKIN_COLOR_GRENZDWARF "ffe0d1"
 
 //DARK ELF SKIN TONES
 #define SKIN_COLOR_MAGGOT "9796a9"
@@ -421,17 +422,16 @@
 #define SKIN_COLOR_SAND_ELF "5d4c41"
 
 //HUMEN SKIN TONES
-#define SKIN_COLOR_ICECAP "fff0e9"
-#define SKIN_COLOR_ARCTIC "ffe0d1"
-#define SKIN_COLOR_TUNDRA "fcccb3"
-#define SKIN_COLOR_CONTINENTAL "edc6b3"
-#define SKIN_COLOR_TEMPERATE "e2b9a3"
-#define SKIN_COLOR_COASTAL "d9a284"
-#define SKIN_COLOR_SUBTROPICAL "c9a893"
-#define SKIN_COLOR_TROPICALDRY "ba9882"
-#define SKIN_COLOR_TROPICALWET "ac8369"
-#define SKIN_COLOR_DESERT "9c6f52"
-#define SKIN_COLOR_CRIMSONLANDS "4e3729"
+#define SKIN_COLOR_GRENZELHOFT "ffe0d1"
+#define SKIN_COLOR_LOWLANDER "fcccb3"
+#define SKIN_COLOR_MAINLANDER "edc6b3"
+#define SKIN_COLOR_HEARTFELT "e2b9a3"
+#define SKIN_COLOR_VALORIAN "d9a284"
+#define SKIN_COLOR_STEPPE "c9a893"
+#define SKIN_COLOR_ISLANDER "ba9882"
+#define SKIN_COLOR_SOUTHLANDER "ac8369"
+#define SKIN_COLOR_ZYBANTU "9c6f52"
+#define SKIN_COLOR_CRIMSONLANDS "684e3d"
 
 //AASIMAR SKIN TONES
 #define SKIN_COLOR_PLANETAR "ffd859"

code/modules/clothing/head/misc.dm

@@ -387,7 +387,7 @@
 	var/message = speech_args[SPEECH_MESSAGE]
 	if(message[1] != "*")
 		message = " [message]"
-		var/list/french_words = strings("french_replacement.json", "french")
+		var/list/french_words = strings("darkelf_replacement.json", "darkelf")
 
 		for(var/key in french_words)
 			var/value = french_words[key]

code/modules/clothing/rogueclothes/hats.dm

@@ -77,6 +77,9 @@
 /obj/item/clothing/head/roguetown/headband/red
 	color = CLOTHING_BLOOD_RED
 
+/obj/item/clothing/head/roguetown/headband/blue
+	color = CLOTHING_MAGE_BLUE
+
 /obj/item/clothing/head/roguetown/softcap
 	name = "soft cap"
 	desc = "A white cap worn by most manual laborers to protect from sunburn."

code/modules/jobs/job_types/roguetown/other/merc_classes/grenzelhoft.dm

@@ -34,6 +34,11 @@
 		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

code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm

@@ -45,7 +45,7 @@
 		H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE)
 		head = /obj/item/clothing/head/roguetown/helmet/leather/minershelm
-		beltl = /obj/item/rogueweapon/pick/paxe // Dorfs get a pick as their primary weapon and axes/maces to use it
+		beltl = /obj/item/rogueweapon/pick/paxe/neu // Dorfs get a pick as their primary weapon and axes/maces to use it
 		backr = /obj/item/rogueweapon/shield/wood
 	else // No miner's helm for Delves as they haven nitevision now.
 		H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE)

code/modules/jobs/job_types/roguetown/peasants/stevedore.dm

@@ -34,7 +34,7 @@
 		H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
 
-	head = /obj/item/clothing/head/roguetown/headband/red
+	head = /obj/item/clothing/head/roguetown/headband/blue
 	neck = /obj/item/roguekey/shop
 	armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/sea
 	shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/sailor/red

code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm

@@ -150,7 +150,13 @@
 	total_positions = 2
 	spawn_positions = 2
 
-	allowed_races = ALL_PLAYER_RACES_BY_NAME
+	allowed_races = list(
+		"Humen",
+		"Elf",
+		"Half-Elf",
+		"Dwarf",
+		"Aasimar"
+	)
 
 	tutorial = "You can smith armor and weapons alike with ease, but do not forget your apprentices. If nothing else, they can be used for errands or thrown out if bumbling fools. The masons next door are also part of the Makers Guild."
 

code/modules/mob/living/carbon/human/species_types/roguetown/dwarf/dwarfm.dm

@@ -13,19 +13,12 @@
 	name = "Dwarf"
 	id = "dwarf"
 	desc = "<b>Dwarf</b><br>\
-	A proud and robust race of stunted folk, \
-	the dwarves are known for their pride in martial strength \
-	and their tenacity towards their ancient customs. \
-	A Dwarf, much like the rock that they carve their fortress out of \
-	is stubborn and ancient, much like their Patron founder the Saint Malum \
-	during the time of the weeping god. They, like stone: also rarely change \
-	and are stubborn to a fault. \
-	A Dwarf tends to his ancestorial heritage for posterity and guidance on \
-	the various challenges their people will face. Even if, in some irony: this behaviour \
-	leads the race towards technological innovation as they continue \
-	to improve their craft through powerful mechanization and forging. \
-	While also impeding their civilizational growth beyond Grimorias mountain ranges due to \
-	constant infighting regarding 'true' doctrines, traditions, customs. \
+	A stubborn and curious-minded race of stunted folk, \
+	the dwarves are known for inventing many mechanical contraptions.  \
+	Tradition and customs such as respect for Malum are pillars of their society, \
+	but is often also the cause of endless bickering and infighting over minute details. \
+	The metal clans originate from old fortresses and have developed distinct accents. \
+	The stone clans live in smaller groups, often underground, commonly employed as miners by other peoples, \
 	Dwarves are hearty, stout and prone to severe mood swings, but are not known for their speed or eyesight..."
 
 	skin_tone_wording = "Ore Attunement"
@@ -87,15 +80,15 @@
 
 /datum/species/dwarf/mountain/get_skin_list()
 	return sortList(list(
-		"Platinum" = SKIN_COLOR_PLATINUM,
+		"Argent" = SKIN_COLOR_ARGENT,
 		"Aurum" = SKIN_COLOR_AURUM,
-		"Quicksilver" = SKIN_COLOR_QUICKSILVER,
+		"Mercur" = SKIN_COLOR_MERCUR,
 		"Brass" = SKIN_COLOR_BRASS,
-		"Iron" = SKIN_COLOR_IRON,
-		"Malachite" = SKIN_COLOR_MALACHITE,
+		"Ferro" = SKIN_COLOR_FERRO,
+		"Phosphorite" = SKIN_COLOR_PHOSPHORITE,
 		"Obsidian" = SKIN_COLOR_OBSIDIAN,
-		"Brimstone" = SKIN_COLOR_BRIMSTONE,
-		"Cerargyrite" =	SKIN_COLOR_CERARGYRITE,
+		"Pyrite" = SKIN_COLOR_PYRITE,
+		"Quartz" =	SKIN_COLOR_QUARTZ,
 	))
 
 /datum/species/dwarf/mountain/get_hairc_list()
@@ -105,10 +98,10 @@
 	"black - rogue" = "2b201b",
 	"black - midnight" = "1d1b2b",
 
-	"blond - pale" = "9d8d6e",
-	"blond - dirty" = "88754f",
-	"blond - drywheat" = "d5ba7b",
-	"blond - strawberry" = "c69b71",
+	"gray - faint" = "958a75",
+	"gray - dusty" = "706755",
+	"gray - pebbles" = "656158",
+	"gray - granite" = "57514c",
 
 	"brown - mud" = "362e25",
 	"brown - oats" = "7a4e1e",
@@ -149,6 +142,21 @@
 /datum/species/dwarf/mountain/random_surname()
 	return " [pick(world.file2list("strings/rt/names/dwarf/dwarmlast.txt"))]"
 
+/datum/species/dwarf/mountain/get_accent(mob/living/carbon/human/H)
+	switch(H.skin_tone)
+		if(SKIN_COLOR_ARGENT)
+			return strings("dwarf_replacement.json", "dwarf")
+		if(SKIN_COLOR_AURUM)
+			return strings("dwarf_replacement.json", "dwarf")
+		if(SKIN_COLOR_MERCUR)
+			return strings("dwarf_replacement.json", "dwarf")
+		if(SKIN_COLOR_BRASS)
+			return strings("dwarf_replacement.json", "dwarf")
+		if(SKIN_COLOR_FERRO)
+			return strings("dwarf_replacement.json", "dwarf")
+		if(SKIN_COLOR_GRENZDWARF)
+			return strings("grenzelhoft_replacement.json", "grenzelhoft")
+	return null
 
 
 /*------------------\

code/modules/mob/living/carbon/human/species_types/roguetown/elf/elfd.dm

@@ -134,5 +134,5 @@
 /datum/species/elf/dark/random_surname()
 	return " [pick(world.file2list("strings/rt/names/elf/elfsnf.txt"))]"
 
-/datum/species/elf/dark/get_accent_list()
-	return strings("french_replacement.json", "french")
+/datum/species/elf/dark/get_accent(mob/living/carbon/human/H)
+	return strings("darkelf_replacement.json", "darkelf")

code/modules/mob/living/carbon/human/species_types/roguetown/elf/elfs.dm

@@ -151,5 +151,5 @@
 /datum/species/elf/snow/random_surname()
 	return " [pick(world.file2list("strings/rt/names/elf/elfwlast.txt"))]"
 
-//datum/species/elf/snow/get_accent_list()
+//datum/species/elf/snow/get_accent(mob/living/carbon/human/H)
 //	return strings("russian_replacement.json", "russian")

code/modules/mob/living/carbon/human/species_types/roguetown/human/humen.dm

@@ -68,16 +68,15 @@
 
 /datum/species/human/northern/get_skin_list()
 	return sortList(list(
-		"Ice Cap" = SKIN_COLOR_ICECAP,
-		"Arctic" = SKIN_COLOR_ARCTIC,
-		"Tundra" = SKIN_COLOR_TUNDRA,
-		"Continental" = SKIN_COLOR_CONTINENTAL,
-		"Temperate" = SKIN_COLOR_TEMPERATE,
-		"Coastal" = SKIN_COLOR_COASTAL,
-		"Subtropical" = SKIN_COLOR_SUBTROPICAL,
-		"Tropical Dry" = SKIN_COLOR_TROPICALDRY,
-		"Tropical Wet" = SKIN_COLOR_TROPICALWET,
-		"Desert" = SKIN_COLOR_DESERT,
+		"Grenzelhoft" = SKIN_COLOR_GRENZELHOFT,
+		"Lowlander" = SKIN_COLOR_LOWLANDER,
+		"Mainlander" = SKIN_COLOR_MAINLANDER,
+		"Steppe" = SKIN_COLOR_STEPPE,
+		"Valorian" = SKIN_COLOR_VALORIAN,
+		"Heartfelt" = SKIN_COLOR_HEARTFELT,
+		"Islander" = SKIN_COLOR_ISLANDER,
+		"Southlander" = SKIN_COLOR_SOUTHLANDER,
+		"Zybantu" = SKIN_COLOR_ZYBANTU,
 		"Crimson Lands" = SKIN_COLOR_CRIMSONLANDS,
 	))
 
@@ -129,3 +128,11 @@
 
 /datum/species/human/northern/random_surname()
 	return " [pick(world.file2list("strings/rt/names/human/humnorlast.txt"))]"
+
+/datum/species/human/northern/get_accent(mob/living/carbon/human/H)
+	switch(H.skin_tone)
+		if(SKIN_COLOR_GRENZELHOFT)
+			return strings("grenzelhoft_replacement.json", "grenzelhoft")
+		if(SKIN_COLOR_HEARTFELT)
+			return strings("steppe_replacement.json", "steppe")
+	return null