Merge branch 'main' into main

code/game/objects/items/candle.dm

@@ -8,6 +8,7 @@
 	w_class = WEIGHT_CLASS_TINY
 	light_color = LIGHT_COLOR_FIRE
 	heat = 1000
+	dropshrink = 0.8
 	var/wax = 1000
 	var/lit = FALSE
 	var/infinite = FALSE

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

@@ -659,6 +659,14 @@ ____________End of Example*/
 	base_icon_state = "book8"
 	bookfile = "Neu_cooking.json"
 
+/obj/item/book/rogue/advice_weaving
+	name = "A hundred kinds of stitches"
+	desc = "Howe to weave, tailor, and sundry tailoring. By Agnea Corazzani."
+	icon_state ="book8_0"
+	base_icon_state = "book8"
+	bookfile = "AdviceWeaving.json"
+
+
 /obj/item/book/rogue/psybibble
 	name = "The Book"
 	icon_state = "psybibble_0"

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

@@ -11,7 +11,7 @@
 	reagent_flags = OPENCONTAINER
 	amount_per_transfer_from_this = 6
 	possible_transfer_amounts = list(6)
-	dropshrink = 0.8
+	dropshrink = 0.7
 	w_class = WEIGHT_CLASS_NORMAL
 	volume = 24
 	obj_flags = CAN_BE_HIT

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

@@ -168,27 +168,35 @@
 	icon_state = "brownkey"
 	lockid = "roomi"
 	color = CLOTHING_CHALK_WHITE
+/obj/item/roguekey/roomi/duchess
+	name = "duchess room key"
 
 /obj/item/roguekey/roomii
 	name = "room II key"
 	desc = "The key to the second room."
 	icon_state = "brownkey"
 	lockid = "roomii"
 	color = CLOTHING_CHALK_WHITE
+/obj/item/roguekey/roomii/wanderer
+	name = "wanderer room key"
 
 /obj/item/roguekey/roomiii
 	name = "room III key"
 	desc = "The key to the third room."
 	icon_state = "brownkey"
 	lockid = "roomiii"
 	color = CLOTHING_CHALK_WHITE
+/obj/item/roguekey/roomiii/yeoman
+	name = "yeoman room key"
 
 /obj/item/roguekey/roomiv
 	name = "room IV key"
 	desc = "The key to the fourth room."
 	icon_state = "brownkey"
 	lockid = "roomiv"
 	color = CLOTHING_CHALK_WHITE
+/obj/item/roguekey/roomiv/castellan
+	name = "castellan room key"
 
 /obj/item/roguekey/roomv
 	name = "room V key"
@@ -287,7 +295,7 @@
 	lockid = "mason"
 
 /obj/item/roguekey/niteman
-	name = "nitemaster's key"
+	name = "nitemans key"
 	desc = "The master key of the bathhouse."
 	icon_state = "greenkey"
 	lockid = "nightman"

code/game/objects/items/rogueweapons/ranged/ammo.dm

@@ -1,6 +1,7 @@
 #define ARROW_DAMAGE		35
 #define BOLT_DAMAGE			45
 #define BULLET_DAMAGE		80
+#define BLOWDART_DAMAGE		20
 #define ARROW_PENETRATION	25
 #define BOLT_PENETRATION	50
 #define BULLET_PENETRATION	100
@@ -406,31 +407,67 @@
 	caliber = "dart"
 	icon = 'icons/roguetown/weapons/ammo.dmi'
 	icon_state = "dart"
-	dropshrink = 0.8
+	dropshrink = 0.9
 	max_integrity = 10
 	force = 10
 
 /obj/projectile/bullet/reusable/dart
 	name = "dart"
 	desc = "A thorn faschioned into a primitive dart."
-	damage = 20
+	damage = BLOWDART_DAMAGE
 	damage_type = BRUTE
 	icon = 'icons/roguetown/weapons/ammo.dmi'
 	icon_state = "dart_proj"
 	ammo_type = /obj/item/ammo_casing/caseless/rogue/dart
-	range = 20
+	range = 6
 	hitsound = 'sound/combat/hits/hi_arrow2.ogg'
-	embedchance = 100
-	armor_penetration = 10
+	embedchance = 0
+	armor_penetration = 0
 	woundclass = BCLASS_STAB
-	flag = "dart"
+	flag = "bullet"
 	speed = 0.3
 	accuracy = 50
 
+//................ Poison Dart ............... //
+/obj/item/ammo_casing/caseless/rogue/dart/poison
+	name = "poison dart"
+	desc = "A dart with it's tip drenched in a weak poison."
+	projectile_type = /obj/projectile/bullet/reusable/dart/poison
+	icon_state = "dart_poison"
+
+/obj/projectile/bullet/reusable/dart/poison
+	name = "poison dart"
+	desc = "A dart with its tip drenched in a powerful poison."
+	var/piercing = FALSE
+
+/obj/projectile/bullet/reusable/dart/poison/Initialize()
+	. = ..()
+	create_reagents(50, NO_REACT)
+	reagents.add_reagent(/datum/reagent/berrypoison, 3)
+
+/obj/projectile/bullet/reusable/dart/poison/on_hit(atom/target, blocked = FALSE)
+	if(iscarbon(target))
+		var/mob/living/carbon/M = target
+		if(blocked != 100) // not completely blocked
+			if(M.can_inject(null, FALSE, def_zone, piercing)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
+				..()
+				reagents.reaction(M, INJECT)
+				reagents.trans_to(M, reagents.total_volume)
+				return BULLET_ACT_HIT
+			else
+				blocked = 100
+				target.visible_message(	span_danger("\The [src] was deflected!"), span_danger("My armor protected me against \the [src]!"))
+
+	..(target, blocked)
+	DISABLE_BITFIELD(reagents.flags, NO_REACT)
+	reagents.handle_reactions()
+	return BULLET_ACT_HIT
+
 
 #undef ARROW_DAMAGE
 #undef BOLT_DAMAGE
 #undef BULLET_DAMAGE
+#undef BLOWDART_DAMAGE
 #undef ARROW_PENETRATION
 #undef BOLT_PENETRATION
 #undef BULLET_PENETRATION

code/game/objects/items/rogueweapons/ranged/blowgun.dm

@@ -1,22 +1,22 @@
 
 /obj/item/gun/ballistic/revolver/grenadelauncher/blowgun
 	name = "blowgun"
-	desc = "A primitive tool used for hunting. Sometimes favored by Rogues for its ease of use and easy obtainability."
+	desc = "A primitive tool used for hunting. To use most accuratly, hold your breath for a moment before releasing."
 	icon = 'icons/roguetown/weapons/bows.dmi'
 	icon_state = "blowgun"
 	possible_item_intents = list(/datum/intent/shoot/blowgun, /datum/intent/arc/blowgun, INTENT_GENERIC)
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/blowgun
 	slot_flags = ITEM_SLOT_HIP
 	w_class = WEIGHT_CLASS_NORMAL
-	randomspread = 1
+	randomspread = 0
 	spread = 0
 	can_parry = FALSE
 	pin = /obj/item/firing_pin
-	force = 10
+	force = 6
 	var/cocked = FALSE
 	cartridge_wording = "dart"
 	fire_sound = 'sound/combat/Ranged/blowgun_shot.ogg'
-	associated_skill = /datum/skill/combat/crossbows
+	associated_skill =  /datum/skill/combat/bows
 
 /obj/item/gun/ballistic/revolver/grenadelauncher/blowgun/getonmobprop(tag)
 	. = ..()
@@ -93,42 +93,30 @@
 	start_empty = TRUE
 
 /datum/intent/shoot/blowgun
-	chargetime = 0.5
+	chargetime = 1
 	chargedrain = 1
 	charging_slowdown = 1
 
 /datum/intent/shoot/blowgun/can_charge()
 	if(mastermob)
-		if(mastermob.get_num_arms(FALSE) < 2)
-			return FALSE
-		if(mastermob.get_inactive_held_item())
+		if(mastermob.get_num_arms(FALSE) < 1)
 			return FALSE
 	return TRUE
 
-/datum/intent/shoot/blowgun/prewarning()
-	if(mastermob)
-		mastermob.visible_message("<span class='warning'>[mastermob] takes a deep breath!</span>")
-
 /datum/intent/shoot/blowgun/get_chargetime()
 	if(mastermob && chargetime)
+		mastermob.visible_message("<span class='warning'>[mastermob] takes a deep breath!</span>")
 		var/newtime = 0
-		//skill block
-		newtime = newtime + 10
-		newtime = newtime - (mastermob.mind.get_skill_level(/datum/skill/combat/bows) * (10/6))
-		//str block //rtd replace 10 with drawdiff on bows that are hard and scale str more (10/20 = 0.5)
-		newtime = newtime + 10
-		newtime = newtime - (mastermob.STASTR * (10/20))
-		//per block
-		newtime = newtime + 20
-		newtime = newtime - (mastermob.STAPER * 1) //20/20 is 1
+		newtime = newtime + 3 SECONDS
+		newtime = newtime - (mastermob.mind.get_skill_level(/datum/skill/combat/bows) * (5))- (mastermob.STAPER * 0.5)
 		if(newtime > 0)
 			return newtime
 		else
 			return 0.1
 	return chargetime
 
 /datum/intent/arc/blowgun
-	chargetime = 0.5
+	chargetime = 1 SECONDS
 	chargedrain = 1
 	charging_slowdown = 1
 
@@ -140,12 +128,9 @@
 			return FALSE
 	return TRUE
 
-/datum/intent/arc/blowgun/prewarning()
-	if(mastermob)
-		mastermob.visible_message("<span class='warning'>[mastermob] takes a deep breath!</span>")
-
 /datum/intent/arc/blowgun/get_chargetime()
 	if(mastermob && chargetime)
+		mastermob.visible_message("<span class='warning'>[mastermob] takes a deep breath!</span>")
 		var/newtime = 0
 		//skill block
 		newtime = newtime + 10

code/game/objects/structures/beds_chairs/roguechair.dm

@@ -390,6 +390,7 @@
 
 /obj/item/sleepingbag
 	name = "roll of sleepcloth"
+	desc = "If placed on the ground it can be unrolled from the middle to provide a resting place."
 	icon = 'icons/roguetown/misc/structure.dmi'
 	icon_state = "sleepingcloth_rolled"
 	w_class = WEIGHT_CLASS_NORMAL

code/game/objects/structures/tables_racks.dm

@@ -342,29 +342,8 @@
 	if(!total_override)
 		..()
 
-/obj/structure/table/wood
-	name = "wooden table"
-	desc = ""
-	icon = 'icons/roguetown/misc/tables.dmi'
-	icon_state = "tablewood"
-	resistance_flags = FLAMMABLE
-	max_integrity = 70
-	smooth = 0
-	debris = list(/obj/item/grown/log/tree/small = 1)
-	climb_offset = 10
 
-/obj/structure/table/church
-	name = "stone table"
-	desc = ""
-	icon = 'icons/roguetown/misc/tables.dmi'
-	icon_state = "churchtable"
-	max_integrity = 300
-	smooth = 0
-	climb_offset = 10
 
-/obj/structure/table/church/m
-	icon = 'icons/roguetown/misc/tables.dmi'
-	icon_state = "churchtable_mid"
 
 /obj/structure/table/vtable
 	name = "ancient wooden table"
@@ -520,6 +499,78 @@
 	buildstack = /obj/item/stack/tile/carpet/royalblue
 	smooth_icon = 'icons/obj/smooth_structures/fancy_table_royalblue.dmi'
 
+/obj/structure/table/church
+	name = "stone table"
+	desc = ""
+	icon = 'icons/roguetown/misc/tables.dmi'
+	icon_state = "churchtable"
+	max_integrity = 300
+	smooth = 0
+	climb_offset = 10
+
+/obj/structure/table/church/m
+	icon = 'icons/roguetown/misc/tables.dmi'
+	icon_state = "churchtable_mid"
+/*/................	Stone tables	............... //
+/obj/structure/table/church
+	name = "stone table"
+	desc = ""
+	icon = 'icons/roguetown/misc/tables.dmi'
+	icon_state = "church_mid"
+	max_integrity = 300
+	smooth = 0
+	climb_offset = 10
+*/
+/obj/structure/table/stone
+	name = "stone table"
+	desc = ""
+	icon = 'icons/roguetown/misc/tables.dmi'
+	icon_state = "stonetable_mid"
+	max_integrity = 200
+	smooth = 0
+	climb_offset = 10
+
+/obj/structure/table/stone/OnCrafted(dirin, user)
+	if(dirin == NORTH)
+		dir = NORTH
+	if(dirin == SOUTH)
+		dir = SOUTH
+	if(dirin == WEST)
+		dir = WEST
+	if(dirin == EAST)
+		dir = EAST
+	. = ..()
+
+/obj/structure/table/stone_end
+	name = "stone table"
+	desc = ""
+	icon = 'icons/roguetown/misc/tables.dmi'
+	icon_state = "stonetable_end"
+	max_integrity = 200
+	smooth = 0
+	climb_offset = 10
+
+/obj/structure/table/stone_end/OnCrafted(dirin, user)
+	if(dirin == NORTH)
+		dir = NORTH
+	if(dirin == SOUTH)
+		dir = SOUTH
+	if(dirin == WEST)
+		dir = WEST
+	if(dirin == EAST)
+		dir = EAST
+	. = ..()
+
+/obj/structure/table/stone_small
+	name = "stone table"
+	desc = ""
+	icon = 'icons/roguetown/misc/tables.dmi'
+	icon_state = "stonetable_small"
+	max_integrity = 200
+	smooth = 0
+	climb_offset = 10
+
+
 /*	..................   More tables   ................... */
 /obj/structure/table/wood/reinf_long
 	icon_state = "tablewood_reinf"