Merge pull request #1852 from comma/master

Custom items, limbs and small fixes.

code/modules/customitems/item_defines.dm

@@ -284,17 +284,8 @@
 	name = "old red flashlight"
 	desc = "A very old, childlike flashlight."
 	icon = 'custom_items.dmi'
-	icon_state = "wolfflight0"
-	w_class = 2
+	icon_state = "wolfflight"
 	item_state = "wolfflight"
-	flags = FPRINT | TABLEPASS | CONDUCT
-	slot_flags = SLOT_BELT
-	m_amt = 50
-	g_amt = 20
-	on = 0
-	brightness_on = 4 //luminosity when on
-	icon_on = "wolfflight1"
-	icon_off = "wolfflight0"
 
 //////////////////////////////////
 //////////// Clothing ////////////

code/modules/customitems/item_spawning.dm

@@ -39,7 +39,6 @@
 						I.registered_name = M.real_name
 						I.access = C.access
 						I.assignment = C.assignment
-						I.over_jumpsuit = C.over_jumpsuit
 						I.blood_type = C.blood_type
 						I.dna_hash = C.dna_hash
 						I.fingerprint_hash = C.fingerprint_hash
@@ -50,13 +49,13 @@
 							I.name = "[M.real_name]'s Lifetime ID Card ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
 						else if(M.ckey == "nerezza" && M.real_name == "Asher Spock") //This is an Odysseus Specialist ID
 							I.name = "[M.real_name]'s Odysseus Specialist ID Card ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
-							I.access += list(ACCESS_ROBOTICS) //Station-based mecha pilots need this to access the recharge bay.
+							I.access += list(access_robotics) //Station-based mecha pilots need this to access the recharge bay.
 						else if(M.ckey == "roaper" && M.real_name == "Ian Colm") //This is a Technician ID
 							I.name = "[M.real_name]'s Technician ID ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
 
 						//replace old ID
 						del(C)
-						ok = M.equip_if_possible(I, M.slot_wear_id, 0)	//if 1, last argument deletes on fail
+						ok = M.equip_if_possible(I, slot_wear_id, 0)	//if 1, last argument deletes on fail
 						break
 				else if(istype(M.back,/obj/item/weapon/storage) && M.back:contents.len < M.back:storage_slots) // Try to place it in something on the mob's back
 					Item.loc = M.back
@@ -64,7 +63,7 @@
 
 				else
 					for(var/obj/item/weapon/storage/S in M.contents) // Try to place it in any item that can store stuff, on the mob.
-						if (S:len < S:storage_slots)
+						if (S.contents.len < S.storage_slots)
 							Item.loc = S
 							ok = 1
 							break

code/modules/mob/inventory.dm

@@ -225,4 +225,93 @@
 			return l_hand
 		else
 			return r_hand
-		return
+		return
+
+/mob/living/carbon/human/proc/equip_if_possible(obj/item/W, slot, del_on_fail = 1) // since byond doesn't seem to have pointers, this seems like the best way to do this :/
+	//warning: icky code
+	var/equipped = 0
+	switch(slot)
+		if(slot_back)
+			if(!src.back)
+				src.back = W
+				equipped = 1
+		if(slot_wear_mask)
+			if(!src.wear_mask)
+				src.wear_mask = W
+				equipped = 1
+		if(slot_handcuffed)
+			if(!src.handcuffed)
+				src.handcuffed = W
+				equipped = 1
+		if(slot_l_hand)
+			if(!src.l_hand)
+				src.l_hand = W
+				equipped = 1
+		if(slot_r_hand)
+			if(!src.r_hand)
+				src.r_hand = W
+				equipped = 1
+		if(slot_belt)
+			if(!src.belt && src.w_uniform)
+				src.belt = W
+				equipped = 1
+		if(slot_wear_id)
+			if(!src.wear_id && src.w_uniform)
+				src.wear_id = W
+				equipped = 1
+		if(slot_ears)
+			if(!src.ears)
+				src.ears = W
+				equipped = 1
+		if(slot_glasses)
+			if(!src.glasses)
+				src.glasses = W
+				equipped = 1
+		if(slot_gloves)
+			if(!src.gloves)
+				src.gloves = W
+				equipped = 1
+		if(slot_head)
+			if(!src.head)
+				src.head = W
+				equipped = 1
+		if(slot_shoes)
+			if(!src.shoes)
+				src.shoes = W
+				equipped = 1
+		if(slot_wear_suit)
+			if(!src.wear_suit)
+				src.wear_suit = W
+				equipped = 1
+		if(slot_w_uniform)
+			if(!src.w_uniform)
+				src.w_uniform = W
+				equipped = 1
+		if(slot_l_store)
+			if(!src.l_store && src.w_uniform)
+				src.l_store = W
+				equipped = 1
+		if(slot_r_store)
+			if(!src.r_store && src.w_uniform)
+				src.r_store = W
+				equipped = 1
+		if(slot_s_store)
+			if(!src.s_store && src.wear_suit)
+				src.s_store = W
+				equipped = 1
+		if(slot_in_backpack)
+			if (src.back && istype(src.back, /obj/item/weapon/storage/backpack))
+				var/obj/item/weapon/storage/backpack/B = src.back
+				if(B.contents.len < B.storage_slots && W.w_class <= B.max_w_class)
+					W.loc = B
+					equipped = 1
+
+	if(equipped)
+		W.layer = 20
+		if(src.back && W.loc != src.back)
+			W.loc = src
+	else
+		if (del_on_fail)
+			del(W)
+	return equipped
+

code/modules/mob/living/carbon/carbon.dm

@@ -50,6 +50,13 @@
 
 /mob/living/carbon/attack_hand(mob/M as mob)
 	if(!istype(M, /mob/living/carbon)) return
+	if (hasorgans(M))
+		var/datum/organ/external/temp = M:organs_by_name["r_hand"]
+		if (M.hand)
+			temp = M:organs_by_name["l_hand"]
+		if(temp && temp.status & ORGAN_DESTROYED)
+			M << "\red Yo- wait a minute."
+			return
 
 	for(var/datum/disease/D in viruses)
 		var/s_spread_type
@@ -88,6 +95,13 @@
 /mob/living/carbon/attack_paw(mob/M as mob)
 	if(!istype(M, /mob/living/carbon)) return
 
+	if (hasorgans(M))
+		var/datum/organ/external/temp = M:organs_by_name["r_hand"]
+		if (M.hand)
+			temp = M:organs_by_name["l_hand"]
+		if(temp && temp.status & ORGAN_DESTROYED)
+			M << "\red Yo- wait a minute."
+			return
 
 	for(var/datum/disease/D in viruses)
 		var/s_spread_type
@@ -211,6 +225,8 @@
 					status += "blistered"
 				else if(burndamage > 0)
 					status += "numb"
+				if(org.status & ORGAN_DESTROYED)
+					status = "MISSING!"
 				if(status == "")
 					status = "OK"
 				src.show_message(text("\t []My [] is [].",status=="OK"?"\blue ":"\red ",org.getDisplayName(),status),1)

code/modules/mob/living/carbon/human/human_defense.dm

@@ -104,6 +104,9 @@ emp_act
 	for(var/obj/O in src)
 		if(!O)	continue
 		O.emp_act(severity)
+	for(var/datum/organ/external/O  in organs)
+		if(O.status & ORGAN_DESTROYED)	continue
+		O.emp_act(severity)
 	..()
 
 
@@ -111,7 +114,11 @@ emp_act
 	if(!I || !user)	return 0
 
 	var/datum/organ/external/affecting = get_organ(ran_zone(user.zone_sel.selecting))
-
+	if (!affecting)
+		return
+	if(affecting.status & ORGAN_DESTROYED)
+		user << "What [affecting.display_name]?"
+		return
 	var/hit_area = affecting.display_name
 
 	if((user != src) && check_shields(I.force, "the [I.name]"))

code/modules/mob/living/carbon/human/life.dm

@@ -290,7 +290,7 @@
 				else if(E.name == "l_leg" || E.name == "l_foot" \
 					|| E.name == "r_leg" || E.name == "r_foot" && !lying)
 					leg_tally--									// let it fail even if just foot&leg
-			if(E.status & ORGAN_BROKEN || E.status & ORGAN_DESTROYED)
+			if(E.status & ORGAN_BROKEN || (E.status & ORGAN_DESTROYED && !E.amputated))
 				if(E.name == "l_hand" || E.name == "l_arm")
 					if(hand && equipped())
 						if(E.status & ORGAN_SPLINTED && prob(10))

code/modules/mob/living/carbon/human/update_icons.dm

@@ -216,7 +216,6 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 //BASE MOB SPRITE
 /mob/living/carbon/human/proc/update_body(var/update_icons=1)
-
 	if(stand_icon)	del(stand_icon)
 	if(lying_icon)	del(lying_icon)
 	if(dna && dna.mutantrace)	return
@@ -229,7 +228,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 	if(gender == FEMALE)	g = "f"
 
 	// whether to draw the individual limbs
-	var/individual_limbs = 1
+	var/individual_limbs = 0
 
 	//Base mob icon
 	if(husk)
@@ -242,9 +241,9 @@ proc/get_damage_icon_part(damage_state, body_part)
 		stand_icon = new /icon('icons/mob/human.dmi', "skeleton_s")
 		lying_icon = new /icon('icons/mob/human.dmi', "skeleton_l")
 	else
-		stand_icon = new /icon('icons/mob/human.dmi', "body_[g]_s")
-		lying_icon = new /icon('icons/mob/human.dmi', "body_[g]_l")
-		individual_limbs = 0
+		stand_icon = new /icon('icons/mob/human.dmi', "torso_[g]_s")
+		lying_icon = new /icon('icons/mob/human.dmi', "torso_[g]_l")
+		individual_limbs = 1
 
 	//remove destroyed limbs from base icon
 	for(var/datum/organ/external/part in organs)

code/modules/mob/new_player/new_player.dm

@@ -370,6 +370,7 @@
 
 		var/mob/living/carbon/human/character = create_character()	//creates the human and transfers vars and mind
 		job_master.EquipRank(character, rank, 1)					//equips the human
+		EquipCustomItems(character)
 		character.loc = pick(latejoin)
 		character.lastarea = get_area(loc)
 

code/modules/mob/new_player/preferences.dm

@@ -1167,7 +1167,7 @@ datum/preferences
 
 		// Destroy/cyborgize organs
 		for(var/name in organ_data)
-			var/datum/organ/external/O = character.organs[name]
+			var/datum/organ/external/O = character.organs_by_name[name]
 			if(!O) continue
 
 			var/status = organ_data[name]

code/modules/projectiles/ammunition/bullets.dm

@@ -28,7 +28,7 @@
 
 /obj/item/ammo_casing/c38
 	desc = "A .38 bullet casing."
-	caliber = "357"
+	caliber = "38"
 	projectile_type = "/obj/item/projectile/bullet/weakbullet"
 
 

code/modules/projectiles/guns/projectile/revolver.dm

@@ -4,7 +4,7 @@
 	icon_state = "detective"
 	caliber = "38"
 	origin_tech = "combat=2;materials=2"
-	ammo_type = "/obj/item/ammo_magazine/c38"
+	ammo_type = "/obj/item/ammo_casing/c38"
 
 /*
 	special_check(var/mob/living/carbon/human/M)