Merge branch 'GeneralPantsuIsBadAtCoding:main' into Inquisitor-Rework

_maps/map_files/dun_manor/dun_manor.dmm

@@ -10124,9 +10124,9 @@
 /area/rogue/under/town/sewer)
 "jiL" = (
 /obj/structure/closet/crate/roguecloset,
-/obj/item/clothing/shoes/roguetown/psydonboots,
-/obj/item/clothing/shoes/roguetown/psydonboots,
-/obj/item/clothing/shoes/roguetown/psydonboots,
+/obj/item/clothing/shoes/roguetown/boots/psydonboots,
+/obj/item/clothing/shoes/roguetown/boots/psydonboots,
+/obj/item/clothing/shoes/roguetown/boots/psydonboots,
 /obj/item/clothing/head/roguetown/helmet/heavy/psydonhelm,
 /obj/item/clothing/head/roguetown/helmet/heavy/psydonhelm,
 /obj/item/clothing/head/roguetown/roguehood/psydon,
@@ -11117,7 +11117,7 @@
 /obj/structure/table/wood{
 	icon_state = "longtable"
 	},
-/obj/item/clothing/head/roguetown/helmet/psydonbarbute,
+/obj/item/clothing/head/roguetown/helmet/heavy/psydonbarbute,
 /turf/open/floor/rogue/tile,
 /area/rogue/under/town/basement)
 "khi" = (
@@ -18403,7 +18403,9 @@
 	dir = 1;
 	locked = 1;
 	lockid = "manor";
-	name = "keep entrance"
+	name = "keep entrance";
+	ridethrough = 1;
+	desc = "a large door. It seems big enough to fit a mount."
 	},
 /turf/open/floor/rogue/cobblerock,
 /area/rogue/indoors/town/garrison)
@@ -20576,7 +20578,7 @@
 	dir = 1;
 	icon_state = "longtable"
 	},
-/obj/item/clothing/head/roguetown/helmet/psydonbarbute,
+/obj/item/clothing/head/roguetown/helmet/heavy/psydonbarbute,
 /turf/open/floor/rogue/tile,
 /area/rogue/under/town/basement)
 "swd" = (

_maps/templates/smalldungeons.dm

@@ -143,7 +143,7 @@
 		/obj/item/clothing/suit/roguetown/armor/plate/bikini = 1,
 		/obj/item/clothing/suit/roguetown/armor/plate = 1,
 		/obj/item/clothing/suit/roguetown/armor/longcoat = 2,
-		/obj/item/clothing/suit/roguetown/armor/blacksteel/cuirass = 1,
+		/obj/item/clothing/suit/roguetown/armor/plate/blacksteel_half_plate = 1,
 
 
 		//food
@@ -322,8 +322,7 @@
 		/obj/item/clothing/suit/roguetown/armor/plate/bikini = 1,
 		/obj/item/clothing/suit/roguetown/armor/plate = 1,
 		/obj/item/clothing/suit/roguetown/armor/longcoat = 2,
-		/obj/item/clothing/suit/roguetown/armor/blacksteel/cuirass = 1,
-
+		/obj/item/clothing/suit/roguetown/armor/plate/blacksteel_half_plate = 1,
 	)
 	lootcount = 1
 

code/__DEFINES/flags.dm

@@ -135,8 +135,10 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define MOBILITY_STORAGE		(1<<5)
 /// can pull things
 #define MOBILITY_PULL			(1<<6)
+/// can stand, can be on floor or not. Mostly used for AI. Revisit this bitflag
+#define MOBILITY_CANSTAND		(1<<7)
 
-#define MOBILITY_FLAGS_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND | MOBILITY_PICKUP | MOBILITY_USE | MOBILITY_UI | MOBILITY_STORAGE | MOBILITY_PULL)
+#define MOBILITY_FLAGS_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND | MOBILITY_PICKUP | MOBILITY_USE | MOBILITY_UI | MOBILITY_STORAGE | MOBILITY_PULL | MOBILITY_CANSTAND)
 #define MOBILITY_FLAGS_INTERACTION (MOBILITY_USE | MOBILITY_PICKUP | MOBILITY_UI | MOBILITY_STORAGE)
 
 // radiation

code/__DEFINES/roguetown.dm

@@ -138,7 +138,7 @@
 
 #define ALL_PALADIN_PATRONS list(/datum/patron/divine/astrata, /datum/patron/divine/noc, /datum/patron/divine/abyssor, /datum/patron/divine/dendor, /datum/patron/divine/necra, /datum/patron/divine/pestra, /datum/patron/divine/ravox, /datum/patron/divine/malum, /datum/patron/divine/eora, /datum/patron/old_god)
 
-#define ALL_ACOLYTE_PATRONS list(/datum/patron/divine/astrata, /datum/patron/divine/noc, /datum/patron/divine/dendor, /datum/patron/divine/pestra, /datum/patron/divine/eora, /datum/patron/divine/necra, /datum/patron/divine/abyssor)
+#define ALL_ACOLYTE_PATRONS list(/datum/patron/divine/astrata, /datum/patron/divine/noc, /datum/patron/divine/dendor, /datum/patron/divine/pestra, /datum/patron/divine/eora, /datum/patron/divine/necra, /datum/patron/divine/abyssor, /datum/patron/divine/malum)
 
 #define ALL_DIVINE_PATRONS list(/datum/patron/divine/astrata, /datum/patron/divine/noc, /datum/patron/divine/dendor, /datum/patron/divine/abyssor, /datum/patron/divine/ravox, /datum/patron/divine/necra, /datum/patron/divine/xylix, /datum/patron/divine/pestra, /datum/patron/divine/malum, /datum/patron/divine/eora)
 

code/__DEFINES/sound.dm

@@ -182,6 +182,10 @@
 						'sound/ambience/noises/birds (6).ogg',\
 						'sound/ambience/noises/birds (7).ogg')
 
+#define SFX_CHAIN_STEP "chain_step"
+#define SFX_PLATE_STEP	"plate_step"
+#define SFX_PLATE_COAT_STEP "plate_coat_step"
+#define SFX_JINGLE_BELLS "jingle_bells"
 
 #define INTERACTION_SOUND_RANGE_MODIFIER 0
 #define EQUIP_SOUND_VOLUME 100

code/__DEFINES/traits.dm

@@ -70,6 +70,7 @@
 #define TRAIT_CHOSEN "Astrata's Chosen"
 #define TRAIT_ABYSSOR_SWIM "Blessing of Abyssor" //less base fatigue drain when swimming
 #define TRAIT_XYLIX "Blessing of Xylix" //secret thieves cant language
+#define TRAIT_FORGEBLESSED "Blessing of Malum" //Reduces the fatigue cost of smithing a bit.
 
 // ASCENDANT CULTIST TRAITS (all of them recognize each other)
 #define TRAIT_COMMIE "Blessing of Matthios" //recognized by bandits as an ally
@@ -169,6 +170,7 @@ GLOBAL_LIST_INIT(roguetraits, list(
 	TRAIT_LONGSTRIDER = "Each of my steps finds it's footing no matter how treacherous the terrain is.",
 	TRAIT_TRAINED_SMITH = span_info("I've spent long training, and with some more, I will be able to smith legendary items."),
 	TRAIT_DEATHSIGHT = span_info("I can feel when someone nearby draws the Undermaiden's attention."),
+	TRAIT_FORGEBLESSED = span_info("Countless long nights spent forging metal have honed my endurance, allowing me to work an anvil far longer than most without tiring."),
 	TRAIT_XYLIX = span_info("I know how to speak in code that only fellow tricksters can understand."),
 	TRAIT_CABAL = span_info("In secret, I have studied the ways of Her ascension, and know of others of the Cabal."),
 	TRAIT_HORDE = span_info("BY BLOOD AND BONE, I AM OF GRAGGAR'S ANOINTED! I FEEL THE STRENGTH IN OTHERS WHO ARE THE SAME."),

code/datums/gods/patrons/divine_pantheon.dm

@@ -131,7 +131,11 @@
 	domain = "God of Fire, Destruction and Rebirth"
 	desc = "Opinionless god of the crafts. He teaches that great works for killing or saving are great works, either way. The well-oiled guillotine and the well-sharpened axe are tools, and there is no good and evil to their craft."
 	worshippers = "Smiths, Miners, Engineers"
-	t1 = /obj/effect/proc_holder/spell/invoked/sacred_flame_rogue
+	mob_traits = list(TRAIT_FORGEBLESSED)
+	t1 = /obj/effect/proc_holder/spell/invoked/vigorousexchange
+	t2 = /obj/effect/proc_holder/spell/invoked/heatmetal
+	t3 = /obj/effect/proc_holder/spell/invoked/hammerfall
+	t4 = /obj/effect/proc_holder/spell/invoked/craftercovenant
 	confess_lines = list(
 		"MALUM IS MY MUSE!",
 		"TRUE VALUE IS IN THE TOIL!",

code/game/objects/items/rogueitems/bells.dm

@@ -93,3 +93,16 @@
 	else
 
 		return ..()
+
+/obj/item/jingle_bells
+	name = "jingling bells"
+	desc = "A set of little bells that make a satifying ring when jostled."
+	icon = 'icons/roguetown/items/misc.dmi'
+	icon_state = "bells"
+	throwforce = 5
+	dropshrink = 0.5
+	drop_sound = SFX_JINGLE_BELLS
+
+/obj/item/jingle_bells/Initialize()
+	. = ..()
+	AddComponent(/datum/component/item_equipped_movement_rustle, SFX_JINGLE_BELLS)

code/game/objects/items/rogueweapons/melee/flail.dm

@@ -44,10 +44,10 @@
 /datum/intent/flail/strike/smash
 	name = "smash"
 	chargetime = 5
+	chargedrain = 2
 	no_early_release = TRUE
 	penfactor = 80
 	recovery = 10
-	swingdelay = 7
 	damfactor = 1.2
 	chargedloop = /datum/looping_sound/flailswing
 	keep_looping = TRUE
@@ -60,12 +60,12 @@
 /datum/intent/flail/strike/smashrange
 	name = "ranged smash"
 	chargetime = 25
+	chargedrain = 2
 	no_early_release = TRUE
 	penfactor = 50
 	recovery = 30
-	damfactor = 1.5
+	damfactor = 1.2
 	reach = 2
-	swingdelay = 8
 	chargedloop = /datum/looping_sound/flailswing
 	keep_looping = TRUE
 	icon_state = "insmash"

code/game/objects/lighting/rogue_fires.dm

@@ -2,6 +2,8 @@
 	name = "brazier"
 	icon = 'icons/roguetown/misc/lighting.dmi'
 	icon_state = "stonefire1"
+	bulb_colour = "#ffa35c"
+	brightness = 12
 	density = TRUE
 //	pixel_y = 10
 	base_state = "stonefire"
@@ -100,7 +102,8 @@
 	name = "fireplace"
 	icon_state = "wallfire1"
 	base_state = "wallfire"
-	bulb_colour = "#ff9648"
+	brightness = 10
+	bulb_colour = "#ffa35c"
 	density = FALSE
 	fueluse = 0
 	crossfire = FALSE
@@ -169,7 +172,6 @@
 	name = "sconce"
 	icon_state = "torchwall1"
 	base_state = "torchwall"
-	brightness = 5
 	density = FALSE
 	var/obj/item/flashlight/flare/torch/torchy
 	fueluse = FALSE //we use the torch's fuel

code/game/sound.dm

@@ -380,9 +380,29 @@
 				soundin = pick('sound/combat/wooshes/blunt/wooshlarge (1).ogg','sound/combat/wooshes/blunt/wooshlarge (2).ogg','sound/combat/wooshes/blunt/wooshlarge (3).ogg')
 			if("punchwoosh")
 				soundin = pick('sound/combat/wooshes/punch/punchwoosh (1).ogg','sound/combat/wooshes/punch/punchwoosh (2).ogg','sound/combat/wooshes/punch/punchwoosh (3).ogg')
-
-
-
-
-
+			if(SFX_CHAIN_STEP)
+				soundin = pick(
+							'sound/foley/footsteps/armor/chain (1).ogg',
+							'sound/foley/footsteps/armor/chain (2).ogg',
+							'sound/foley/footsteps/armor/chain (3).ogg',
+							)
+			if(SFX_PLATE_STEP)
+				soundin = pick(
+							'sound/foley/footsteps/armor/plate (1).ogg',
+							'sound/foley/footsteps/armor/plate (2).ogg',
+							'sound/foley/footsteps/armor/plate (3).ogg',
+							)
+			if(SFX_PLATE_COAT_STEP)
+				soundin = pick(
+							'sound/foley/footsteps/armor/coatplates (1).ogg',
+							'sound/foley/footsteps/armor/coatplates (2).ogg',
+							'sound/foley/footsteps/armor/coatplates (3).ogg',
+							)
+			if(SFX_JINGLE_BELLS)
+				soundin = pick(
+							'sound/items/jinglebell1.ogg',
+							'sound/items/jinglebell2.ogg',
+							'sound/items/jinglebell3.ogg',
+							'sound/items/jinglebell4.ogg',
+							)
 	return soundin