Merge pull request #29 from Lhars/Big-Update

Big Azure Update

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

@@ -56,16 +56,18 @@
 
 /obj/item/needle/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/natural/fibers))
-		if(maxstring - stringamt < 5)
-			to_chat(user, span_warning("Not enough room for more thread!"))
-			return
-		else
-			to_chat(user, "I begin threading the needle with additional fibers...")
-			if(do_after(user, 6 SECONDS - user.mind.get_skill_level(/datum/skill/misc/sewing), target = I))
-				stringamt += 5
-				to_chat(user, "I replenish the needle's thread!")
-				qdel(I)
+		if(infinite || maxstring - stringamt <= 0) //is the needle infinite OR does it have all of its uses left
+			to_chat(user, span_warning("The needle has no need to be refilled."))
 			return
+
+		to_chat(user, "I begin threading the needle with additional fibers...")
+		if(do_after(user, 6 SECONDS - user.mind.get_skill_level(/datum/skill/misc/sewing), target = I))
+			var/refill_amount
+			refill_amount = min(5, (maxstring - stringamt))
+			stringamt += refill_amount
+			to_chat(user, "I replenish the needle's thread by [refill_amount] uses!")
+			qdel(I)
+		return
 	return ..()
 
 
@@ -76,7 +78,7 @@
 		if(stringamt < 1)
 			to_chat(user, span_warning("The needle has no thread left!"))
 			return
-		if(I.sewrepair && I.max_integrity && !I.obj_broken)
+		if(I.sewrepair && I.max_integrity)
 			if(I.obj_integrity == I.max_integrity)
 				to_chat(user, span_warning("This is not broken."))
 				return
@@ -95,6 +97,9 @@
 				playsound(loc, 'sound/foley/sewflesh.ogg', 100, TRUE, -2)
 				user.visible_message(span_info("[user] repairs [I]!"))
 				I.obj_integrity = I.max_integrity
+				if(I.obj_broken && istype(I, /obj/item/clothing))
+					var/obj/item/clothing/cloth = I
+					cloth.obj_fix()
 				//Vrell - Part of storage item repair fix
 				if(target_storage)
 					target_storage.being_repaired = FALSE

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

@@ -258,7 +258,7 @@
 	possible_item_intents = list(/datum/intent/spear/thrust/eaglebeak, SPEAR_BASH) //bash is for nonlethal takedowns, only targets limbs
 	gripped_intents = list(/datum/intent/spear/thrust/eaglebeak, /datum/intent/mace/smash/eaglebeak, SPEAR_BASH)
 	name = "eagle's beak"
-	desc = ""
+	desc = "A reinforced pole affixed with an ornate steel eagle's head, of which it's beak is intended to pierce with great harm."
 	icon_state = "eaglebeak"
 	icon = 'icons/roguetown/weapons/64.dmi'
 	pixel_y = -16
@@ -272,9 +272,13 @@
 	minstr = 11
 	smeltresult = /obj/item/ingot/steel
 	associated_skill = /datum/skill/combat/polearms
+	max_blade_int = 300
+	max_integrity = 500
 	blade_dulling = DULLING_BASHCHOP
 	walking_stick = TRUE
-	wdefense = 6
+	wdefense = 5
+	wbalance = -1
+	sellprice = 60
 
 /obj/item/rogueweapon/eaglebeak/getonmobprop(tag)
 	. = ..()
@@ -290,10 +294,14 @@
 
 /obj/item/rogueweapon/eaglebeak/lucerne
 	name = "lucerne"
-	desc = "A polehammer with a sharp pointy end."
+	desc = "A polehammer of simple iron. Fracture bone and dissent with simple brute force."
+	force = 12
+	force_wielded = 25
 	icon_state = "polehammer"
 	smeltresult = /obj/item/ingot/iron
-	max_blade_int = 200
+	max_blade_int = 300
+	max_integrity = 300
+	sellprice = 40
 
 /datum/intent/spear/thrust/eaglebeak
 	penfactor = 20
@@ -352,3 +360,7 @@
 
 /datum/intent/sword/thrust/zwei
 	reach = 2
+
+/obj/item/rogueweapon/greatsword/grenz
+	name = "steel zweihander"
+	icon_state = "steelzwei"

code/modules/clothing/clothing.dm

@@ -68,6 +68,7 @@
 	var/detail_color
 	var/boobed_detail = TRUE
 	var/sleeved_detail = TRUE
+	var/list/original_armor //For restoring broken armor
 
 /obj/item/clothing/New()
 	..()
@@ -319,6 +320,7 @@
 /obj/item/clothing/obj_break(damage_flag)
 	if(!damaged_clothes)
 		update_clothes_damaged_state(TRUE)
+	original_armor = armor
 	var/brokemessage = FALSE
 	for(var/x in armor)
 		if(armor[x] > 0)
@@ -329,6 +331,11 @@
 		to_chat(M, "ARMOR BROKEN..!")
 	..()
 
+/obj/item/clothing/proc/obj_fix(damage_flag)
+	obj_broken = FALSE
+	if(damaged_clothes)
+		update_clothes_damaged_state(FALSE)
+	armor = original_armor
 /obj/item/clothing/proc/update_clothes_damaged_state(damaging = TRUE)
 	var/index = "[REF(initial(icon))]-[initial(icon_state)]"
 	var/static/list/damaged_clothes_icons = list()

code/modules/clothing/rogueclothes/gloves.dm

@@ -1,5 +1,4 @@
 
-
 /obj/item/clothing/gloves/roguetown
 	slot_flags = ITEM_SLOT_GLOVES
 	body_parts_covered = HANDS
@@ -107,3 +106,6 @@
 	drop_sound = 'sound/foley/dropsound/cloth_drop.ogg'
 	anvilrepair = null
 	sewrepair = TRUE
+
+/obj/item/clothing/gloves/roguetown/grenzelgloves/blacksmith
+	name = "forge gauntlets"

code/modules/clothing/rogueclothes/hats.dm

@@ -231,6 +231,11 @@
 	icon_state = "bardhat"
 	sewrepair = TRUE
 
+/obj/item/clothing/head/roguetown/smokingcap
+	name = "smoking cap"
+	icon_state = "smokingc"
+	sewrepair = TRUE
+
 /obj/item/clothing/head/roguetown/fancyhat
 	name = "fancy hat"
 	desc = "A fancy looking hat with colorful feathers sticking out of it."
@@ -240,8 +245,8 @@
 
 /obj/item/clothing/head/roguetown/hatfur
 	name = "fur hat"
-	icon_state = "hatfur"
 	desc = "A comfortable warm hat lined with fur."
+	icon_state = "hatfur"
 	sewrepair = TRUE
 
 /obj/item/clothing/head/roguetown/papakha
@@ -331,8 +336,8 @@
 
 /obj/item/clothing/head/roguetown/knitcap
 	name = "knit cap"
-	icon_state = "knitcap"
 	desc = "A simple knitted cap."
+	icon_state = "knitcap"
 	sewrepair = TRUE
 	//dropshrink = 0.75
 
@@ -352,7 +357,7 @@
 	color = CLOTHING_RED
 
 /obj/item/clothing/head/roguetown/crown/serpcrown
-	name = "crown of caustic cove"
+	name = "crown of azure peak"
 	desc = ""
 	icon_state = "serpcrown"
 	//dropshrink = 0
@@ -366,7 +371,7 @@
 	SSroguemachine.crown = src
 
 /obj/item/clothing/head/roguetown/crown/serpcrown/proc/anti_stall()
-	src.visible_message(span_warning("The Crown of Caustic Cove crumbles to dust, the ashes spiriting away in the direction of the Keep."))
+	src.visible_message(span_warning("The Crown of Azure Peak crumbles to dust, the ashes spiriting away in the direction of the Keep."))
 	SSroguemachine.crown = null //Do not harddel.
 	qdel(src) //Anti-stall
 
@@ -438,8 +443,8 @@
 
 /obj/item/clothing/head/roguetown/paddedcap
 	name = "padded cap"
-	icon_state = "armingcap"
 	desc = "A modest arming cap."
+	icon_state = "armingcap"
 	item_state = "armingcap"
 	sleevetype = null
 	sleeved = null
@@ -480,14 +485,14 @@
 
 /obj/item/clothing/head/roguetown/helmet/horned
 	name = "horned cap"
-	icon_state = "hornedcap"
 	desc = "A helmet with two horns poking out of the sides."
+	icon_state = "hornedcap"
 	body_parts_covered = HEAD|HAIR
 
 /obj/item/clothing/head/roguetown/helmet/winged
 	name = "winged cap"
-	icon_state = "wingedcap"
 	desc = "A helmet with two wings on its sides."
+	icon_state = "wingedcap"
 	mob_overlay_icon = 'icons/roguetown/clothing/onmob/64x64/head.dmi'
 	worn_x_dimension = 64
 	worn_y_dimension = 64
@@ -684,8 +689,6 @@
 	icon_state = "nochelm"
 	item_state = "nochelm"
 	emote_environment = 3
-	flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR
-	block2add = FOV_RIGHT|FOV_LEFT
 	body_parts_covered = HEAD|HAIR|EARS
 	flags_inv = HIDEEARS|HIDEHAIR
 	block2add = FOV_BEHIND
@@ -703,6 +706,7 @@
 
 /obj/item/clothing/head/roguetown/helmet/heavy/dendorhelm
 	name = "dendor helmet"
+	desc = "Headwear commonly worn by Templars in service to Dendor. Its protrusions almost resemble branches. Take root in the earth, and you will never be moved."
 	icon_state = "dendorhelm"
 	item_state = "dendorhelm"
 	emote_environment = 3
@@ -801,7 +805,7 @@
 
 /obj/item/clothing/head/roguetown/helmet/heavy/frogmouth
 	name = "froggemund helmet"
-	desc = "A tall and imposing frogmouth-style helm popular in the highest plateaus of the Caustic Cove. Covers not just the head, but the neck as well. Add a cloth to show the colors of your family or allegiance."
+	desc = "A tall and imposing frogmouth-style helm popular in the highest plateaus of the Azure Peak. Covers not just the head, but the neck as well. Add a cloth to show the colors of your family or allegiance."
 	icon_state = "frogmouth"
 	item_state = "frogmouth"
 	emote_environment = 3
@@ -976,6 +980,12 @@
 		wise.change_stat("intelligence", -2, "wisehat")
 		to_chat(wise, span_red("I lose wisdom."))
 
+/obj/item/clothing/head/roguetown/witchhat
+	name = "witch hat"
+	desc = ""
+	icon_state = "witch"
+	sewrepair = TRUE
+
 /obj/item/clothing/head/roguetown/physician
 	name = "doctor's hat"
 	desc = "My cure is most effective."
@@ -1003,6 +1013,7 @@
 	dynamic_hair_suffix = ""
 	max_integrity = 150
 	armor = list("blunt" = 15, "slash" = 20, "stab" = 15, "bullet" = 1, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	sewrepair = TRUE
 	var/picked = FALSE
 
 /obj/item/clothing/head/roguetown/grenzelhofthat/attack_right(mob/user)