Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into Robot

code/modules/client/preference_setup/loadout/loadout_accessories.dm

@@ -316,3 +316,16 @@
 	shirts["red hawaii shirt"] = /obj/item/clothing/accessory/hawaii/red
 	shirts["random colored hawaii shirt"] = /obj/item/clothing/accessory/hawaii/random
 	gear_tweaks += new/datum/gear_tweak/path(shirts)
+
+
+/datum/gear/accessory/sweater
+	display_name = "Sweater Selection"
+	path = /obj/item/clothing/accessory/sweater
+
+/datum/gear/accessory/sweater/New()
+	..()
+	var/list/sweaters = list()
+	for(var/sweater in typesof(/obj/item/clothing/accessory/sweater))
+		var/obj/item/clothing/suit/sweater_type = sweater
+		sweaters[initial(sweater_type.name)] = sweater_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sweaters))

code/modules/client/preference_setup/loadout/loadout_utility.dm

@@ -87,3 +87,7 @@
 	display_name = "universal translator"
 	path = /obj/item/device/universal_translator
 	cost = 8
+
+/datum/gear/utility/pen
+	display_name = "Fountain Pen"
+	path = /obj/item/weapon/pen/fountain

code/modules/clothing/under/accessories/clothing.dm

@@ -119,6 +119,11 @@
 	name = "flower-pattern shirt"
 	desc = "You probably need some welder googles to look at this."
 	icon_state = "hawaii"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	slot_flags = SLOT_OCLOTHING | SLOT_TIE
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+	siemens_coefficient = 0.9
+	w_class = ITEMSIZE_NORMAL
 
 /obj/item/clothing/accessory/hawaii/red
 	icon_state = "hawaii2"
@@ -172,4 +177,54 @@
 
 /obj/item/clothing/accessory/wcoat/swvest/red
 	name = "red sweatervest"
-	icon_state = "sweatervest_red"
+	icon_state = "sweatervest_red"
+
+/obj/item/clothing/accessory/sweater
+	name = "sweater"
+	desc = "A warm knit sweater."
+	icon_override = 'icons/mob/ties.dmi'
+	icon_state = "sweater"
+	slot_flags = SLOT_OCLOTHING | SLOT_TIE
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	siemens_coefficient = 0.9
+	w_class = ITEMSIZE_NORMAL
+
+/obj/item/clothing/accessory/sweater/pink
+	name = "pink sweater"
+	desc = "A warm knit sweater. This one's pink in color."
+	icon_state = "sweater_pink"
+
+/obj/item/clothing/accessory/sweater/mint
+	name = "mint sweater"
+	desc = "A warm knit sweater. This one has a minty tint to it."
+	icon_state = "mint_sweater"
+
+/obj/item/clothing/accessory/sweater/blue
+	name = "blue sweater"
+	desc = "A warm knit sweater. This one's colored in a lighter blue."
+	icon_state = "sweater_blue"
+
+/obj/item/clothing/accessory/sweater/heart
+	name = "heart sweater"
+	desc = "A warm knit sweater. This one's colored in a lighter blue, and has a big pink heart right in the center!"
+	icon_state = "sweater_blueheart"
+
+/obj/item/clothing/accessory/sweater/nt
+	name = "dark blue sweater"
+	desc = "A warm knit sweater. This one's a darker blue."
+	icon_state = "sweater_nt"
+
+/obj/item/clothing/accessory/sweater/keyhole
+	name = "keyhole sweater"
+	desc = "A lavender sweater with an open chest."
+	icon_state = "keyholesweater"
+
+/obj/item/clothing/accessory/sweater/blackneck
+	name = "black turtleneck"
+	desc = "A tight turtleneck, entirely black in coloration."
+	icon_state = "turtleneck_black"
+
+/obj/item/clothing/accessory/sweater/winterneck
+	name = "Christmas turtleneck"
+	desc = "A really cheesy holiday sweater, it actually kinda itches."
+	icon_state = "turtleneck_winterred"

code/modules/clothing/under/miscellaneous.dm

@@ -769,3 +769,10 @@
 	name = "sweater"
 	icon_state = "turtleneck"
 	worn_state = "turtleneck"
+
+/obj/item/clothing/under/medigown
+	name = "medical gown"
+	desc = "A flimsy examination gown, the back ties never close."
+	icon_state = "medicalgown"
+	worn_state = "medicalgown"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -105,6 +105,7 @@
 	var/friendly = "nuzzles"		// What mobs do to people when they aren't really hostile
 	var/attack_sound = null			// Sound to play when I attack
 	var/environment_smash = 0		// How much environment damage do I do when I hit stuff?
+	var/melee_miss_chance = 25		// percent chance to miss a melee attack.
 
 	//Special attacks
 	var/spattack_prob = 0			// Chance of the mob doing a special attack (0 for never)
@@ -1117,9 +1118,18 @@
 /mob/living/simple_animal/proc/PunchTarget()
 	if(!Adjacent(target_mob))
 		return
+	sleep(rand(8) + 8)
 	if(isliving(target_mob))
 		var/mob/living/L = target_mob
-		L.attack_generic(src,rand(melee_damage_lower,melee_damage_upper),attacktext)
+
+		if(prob(melee_miss_chance))
+			src.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [L.name] ([L.ckey])</font>")
+			L.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [src.name] ([src.ckey])</font>")
+			src.visible_message("<span class='danger'>[src] misses [L]!</span>")
+			src.do_attack_animation(src)
+			return L
+		else
+			L.attack_generic(src,rand(melee_damage_lower,melee_damage_upper),attacktext)
 		return L
 	if(istype(target_mob,/obj/mecha))
 		var/obj/mecha/M = target_mob

code/modules/paperwork/pen.dm

@@ -35,6 +35,10 @@
 	icon_state = "pen_red"
 	colour = "red"
 
+/obj/item/weapon/pen/fountain
+	desc = "A well made fountain pen."
+	icon_state = "pen_fountain"
+
 /obj/item/weapon/pen/multi
 	desc = "It's a pen with multiple colors of ink!"
 	var/selectedColor = 1