Merge branch 'master' into development

# Conflicts:
#	code/modules/mob/living/silicon/pai/pai.dm

code/modules/customitems/item_defines.dm

@@ -580,7 +580,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	if(isnull(F))
 		return
 
-	F.damage += 5
+	F.take_damage(5)
 	src << "<span class='warning'>You feel a stabbing pain in your chest!</span>"
 	playsound(user, 'sound/effects/Heart Beat.ogg', 20, 1)
 
@@ -1037,7 +1037,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	item_state = "azaroz_staff"
 	contained_sprite = 1
 	slot_flags = SLOT_BACK
-	w_class = 4
+	w_class = 3
 
 
 /obj/item/clothing/suit/fluff/eul_robe //Well Made Robe - Uelak Eul - lordraven001
@@ -1057,3 +1057,24 @@ All custom items with worn sprites must follow the contained sprite system: http
 	icon_state = "eul_glasses"
 	item_state = "eul_glasses"
 	contained_sprite = 1
+
+
+/obj/item/clothing/suit/poncho/fluff/flaming_poncho //Stitched Heart White Poncho - Flaming Hearts Love Stars - sleepywolf
+	name = "stitched heart white poncho"
+	desc = "A white poncho stitched together shoddily, with a pink heart made of flame patterned on the front. The fabric is rough, like chainmail."
+	icon = 'icons/obj/custom_items/flaming_poncho.dmi'
+	icon_state = "flaming_poncho"
+	item_state = "flaming_poncho"
+	contained_sprite = 1
+
+
+/obj/item/clothing/accessory/badge/fluff/jane_badge //Tarnished Badge - Jane Pyre - somethingvile
+	name = "tarnished badge"
+	desc = "A worn, tarnished brass badge with ash and soot set deep in the grooves of its surface. The word, though faded and barely discernible, \"Pyre\" can be traced out lining its bottom edge."
+	icon = 'icons/obj/custom_items/jane_badge.dmi'
+	icon_state = "jane_badge"
+	item_state = "jane_badge"
+	slot_flags = SLOT_BELT | SLOT_TIE
+	contained_sprite = 1
+	stored_name = "Francis Pyre"
+	badge_string = "CPD"

code/modules/mob/living/silicon/pai/pai.dm

@@ -45,7 +45,7 @@
 		)
 
 	var/obj/item/weapon/pai_cable/cable		// The cable we produce and use when door or camera jacking
-	var/obj/item/weapon/card/id/ID = null	//Internal ID used to store copied owner access, and to check access for airlocks
+	idcard_type = /obj/item/weapon/card/id	//Internal ID used to store copied owner access, and to check access for airlocks
 
 	var/master				// Name of the one who commands us
 	var/master_dna			// DNA string for owner verification
@@ -138,8 +138,6 @@
 
 	//PDA
 	pda = new(src)
-	ID = new(src)
-	ID.registered_name = ""
 	addtimer(CALLBACK(src, .proc/set_pda), 5)
 	. = ..()
 
@@ -149,6 +147,11 @@
 	pda.name = "[pda.owner] ([pda.ownjob])"
 	pda.toff = TRUE
 
+/mob/living/silicon/pai/init_id()
+	. = ..()
+	idcard.registered_name = ""
+
+
 /mob/living/silicon/pai/Login()
 	greet()
 	..()