Final commit of the examine/damage overhaul.

code/game/gamemodes/cult/cult_items.dm

@@ -27,6 +27,7 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade)
 	armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
+	flags_inv = HIDEJUMPSUIT
 
 /obj/item/clothing/head/magus
 	name = "magus helm"
@@ -45,4 +46,5 @@
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade)
-	armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
+	armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT

code/game/jobs/jobs.dm

@@ -120,15 +120,16 @@ var/list/nonhuman_positions = list(
 
 /proc/GetRank(var/job)
 	switch(job)
-		if("Bartender","Chef","Lawyer","Librarian","Janitor","Assistant","Unassigned", "Counselor")
+		if("Bartender","Chef","Lawyer","Librarian","Janitor","Assistant","Unassigned")
 			return 0
-		if("Chaplain","Botanist","Hydroponicist","Medical Doctor","Atmospheric Technician","Geneticist", "Virologist", "Surgeon", "Emergency Medical Technician")
+		if("Chaplain","Botanist","Hydroponicist","Medical Doctor","Atmospheric Technician","Geneticist", "Virologist", "Surgeon", "Emergency Medical Technician", "Counselor")
 			return 1
-		if("Quartermaster","Cargo Technician","Chemist", "Station Engineer","Roboticist", "Security Officer", "Forensic Technician","Detective", "Scientist","Shaft Miner", "Xenobiologist", "Plasma Researcher")
+		if("Quartermaster","Cargo Technician","Chemist", "Station Engineer","Roboticist", "Security Officer", "Forensic Technician","Detective", "Scientist","Shaft Miner", "Xenobiologist", "Plasma Researcher","Chief Medical Officer")
 			return 2
-		if("Research Director","Chief Medical Officer","Head of Security","Chief Engineer","Warden")
+		if("Research Director","Head of Security","Chief Engineer","Warden")
 			return 3
 		if("Captain","Head of Personnel","Wizard","MODE")
 			return 4
 		else
-			world << "\"[job]\" NOT GIVEN RANK, REPORT JOBS.DM ERROR TO A CODER"
+			message_admins("\"[job]\" NOT GIVEN RANK, REPORT JOBS.DM ERROR TO A CODER")
+			return 2

code/game/machinery/turrets.dm

@@ -221,7 +221,7 @@
 	A.yo = U.y - T.y
 	A.xo = U.x - T.x
 	spawn( 0 )
-		A.process()
+		A.fired()
 	return
 
 
@@ -591,6 +591,6 @@
 			A.current = curloc
 			A.yo = targloc.y - curloc.y
 			A.xo = targloc.x - curloc.x
-			A.process()
+			A.fired()
 			sleep(2)
 		return

code/game/objects/items.dm

@@ -474,7 +474,8 @@
 		istype(W, /obj/item/weapon/kitchen/utensil/knife)         || \
 		istype(W, /obj/item/weapon/shard)                         || \
 		istype(W, /obj/item/weapon/reagent_containers/syringe)    || \
-		istype(W, /obj/item/weapon/kitchen/utensil/fork) && W.icon_state != "forkloaded" \
+		istype(W, /obj/item/weapon/kitchen/utensil/fork) && W.icon_state != "forkloaded" || \
+		istype(W,/obj/item/projectile)\
 	)
 
 /proc/is_cut(obj/item/W as obj)
@@ -488,7 +489,8 @@
 		istype(W, /obj/item/weapon/butch)						  || \
 		istype(W, /obj/item/weapon/scalpel)                       || \
 		istype(W, /obj/item/weapon/kitchen/utensil/knife)         || \
-		istype(W, /obj/item/weapon/shard)	\
+		istype(W, /obj/item/weapon/shard)	|| \
+		istype(W,/obj/item/projectile)	\
 	)
 
 /proc/is_burn(obj/item/W as obj)
@@ -496,7 +498,8 @@
 		istype(W, /obj/item/weapon/weldingtool)      && W:welding || \
 		istype(W, /obj/item/weapon/zippo)            && W:lit     || \
 		istype(W, /obj/item/weapon/match)            && W:lit     || \
-		istype(W, /obj/item/clothing/mask/cigarette) && W:lit	\
+		istype(W, /obj/item/clothing/mask/cigarette) && W:lit	|| \
+		istype(W,/obj/item/projectile/beam)\
 	)
 
 /obj/item/weapon/paper/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)

code/game/objects/items/clothing.dm

@@ -258,12 +258,14 @@ THERMAL GLASSES
 		src.up = !src.up
 		src.see_face = !src.see_face
 		src.flags |= HEADCOVERSEYES
+		flags_inv |= HIDEMASK|HIDEEARS|HIDEEYES
 		icon_state = "welding"
 		usr << "You flip the mask down to protect your eyes."
 	else
 		src.up = !src.up
 		src.see_face = !src.see_face
 		src.flags &= ~HEADCOVERSEYES
+		flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES)
 		icon_state = "weldingup"
 		usr << "You push the mask up out of your face."
 	usr.update_clothing()
@@ -416,4 +418,4 @@ THERMAL GLASSES
 		src.flags &= ~HEADCOVERSEYES
 		icon_state = "engspace_helmet_clear"
 		usr << "You toggle the reflective tint off."
-	usr.update_clothing()
+	usr.update_clothing()

code/game/objects/items/helper_procs.dm

@@ -1,4 +1,4 @@
-/proc/parse_zone(zone)
+/*/proc/parse_zone(zone)
 	if(zone == "r_hand") return "right hand"
 	else if (zone == "l_hand") return "left hand"
 	else if (zone == "l_arm") return "left arm"
@@ -7,7 +7,7 @@
 	else if (zone == "r_leg") return "right leg"
 	else if (zone == "l_foot") return "left foot"
 	else if (zone == "r_foot") return "right foot"
-	else return zone
+	else return zone*/
 
 /proc/text2dir(direction)
 	switch(uppertext(direction))

code/game/objects/items/weapons/implants/implant.dm

@@ -246,6 +246,8 @@ the implant may become unstable and either pre-maturely inject the subject or si
 		return
 
 	hear(var/msg)
+		var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "")
+		msg = sanitize_simple(msg, replacechars)
 		if(findtext(msg,phrase))
 			if(istype(loc, /mob/))
 				var/mob/T = loc
@@ -258,6 +260,8 @@ the implant may become unstable and either pre-maturely inject the subject or si
 
 	implanted(mob/source as mob)
 		phrase = input("Choose activation phrase:") as text
+		var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "")
+		phrase = sanitize_simple(phrase, replacechars)
 		usr.mind.store_memory("Explosive implant in [source] can be activated by saying something containing the phrase ''[src.phrase]'', <B>say [src.phrase]</B> to attempt to activate.", 0, 0)
 		usr << "The implanted explosive implant in [source] can be activated by saying something containing the phrase ''[src.phrase]'', <B>say [src.phrase]</B> to attempt to activate."
 

code/game/objects/items/weapons/medical.dm

@@ -16,6 +16,16 @@ MEDICAL
 		user << "\red \The [M] is dead, you cannot help [t_him]!"
 		return
 
+	if (!istype(M))
+		user << "\red \The [src] cannot be applied to [M]!"
+		return 1
+
+	if ( ! (istype(user, /mob/living/carbon/human) || \
+			istype(user, /mob/living/silicon) || \
+			istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") )
+		user << "\red You don't have the dexterity to do this!"
+		return 1
+
 	var/stoppedblood = 0
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
@@ -28,78 +38,75 @@ MEDICAL
 			if(!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0)
 				affecting = H.get_organ("head")
 
-		if(H.bloodloss > 0 && heal_brute > 0)		// fix wounds too if bruise pack
-			for(var/datum/organ/wound/W in affecting.wounds)
-				if(W.bleeding)
-					if(stoppedblood)
-						stoppedblood = 2
-						break
+		for(var/datum/organ/wound/W in affecting.wounds)
+			if(W.bleeding || !W.healing_state)
+				if(heal_brute && W.wound_type == 2)
+					continue
+				if(heal_burn && W.wound_type < 2)
+					continue
+				if(W.wound_size > 3)
+					W.bleeding = 0
+				else
 					W.stopbleeding()
-					stoppedblood = 1
+				stoppedblood = 1
+				break
 
-		if (user)
+		if (user && stoppedblood)
 			if (M != user)
-				H.visible_message("\red [user] patches [stoppedblood - 1 ? "some of" : "the last of"] [H]'s wounds with [src]", "\red You patch up [stoppedblood - 1 ? "some of" : "the last of"] [H]'s wounds", "\red You hear something like gauze being ripped.")
+				H.visible_message("\red You bandage up [stoppedblood - 1 ? "some of" : "the last of"] [H]'s cuts", "\red [user] bandages [stoppedblood - 1 ? "some of" : "the last of"] [H]'s cuts with [src]", "\red You hear something like gauze being ripped.")
 			else
-				H.visible_message("\red [user] patches [stoppedblood - 1 ? "some of" : "the last of"] their own wounds with [src]", "\red You patch up [stoppedblood - 1 ? "some of" : "the last of"] your wounds", "\red You hear something like gauze being ripped.")
-
-	if (M.health < 50 && !stoppedblood)
-		var/t_him = "it"
-		if (M.gender == MALE)
-			t_him = "him"
-		else if (M.gender == FEMALE)
-			t_him = "her"
-		user << "\red \The [M] is wounded badly, this item cannot help [t_him]!"
-		return
-
-
-	if (!istype(M))
-		user << "\red \The [src] cannot be applied to [M]!"
-		return 1
-
-	if ( ! (istype(user, /mob/living/carbon/human) || \
-			istype(user, /mob/living/silicon) || \
-			istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") )
-		user << "\red You don't have the dexterity to do this!"
-		return 1
-
-	if (user)
-		if (M != user)
-			user.visible_message( \
-				"\blue [M] has been applied with [src] by [user].", \
-				"\blue You apply \the [src] to [M]." \
-			)
-		else
-			var/t_himself = "itself"
-			if (user.gender == MALE)
-				t_himself = "himself"
-			else if (user.gender == FEMALE)
-				t_himself = "herself"
-
-			user.visible_message( \
-				"\blue [M] applied [src] on [t_himself].", \
-				"\blue You apply \the [src] on yourself." \
-			)
-
-	if (istype(M, /mob/living/carbon/human))
-		var/mob/living/carbon/human/H = M
-		var/datum/organ/external/affecting = H.get_organ("chest")
-
-		if(istype(user, /mob/living/carbon/human))
-			var/mob/living/carbon/human/user2 = user
-			affecting = H.get_organ(check_zone(user2.zone_sel.selecting))
-		else
-			if(!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0)
-				affecting = H.get_organ("head")
-
-		if (affecting.heal_damage(src.heal_brute, src.heal_burn))
-			H.UpdateDamageIcon()
-		M.updatehealth()
+				H.visible_message("\red You bandage up [stoppedblood - 1 ? "some of" : "the last of"] your cuts", "\red [user] bandages [stoppedblood - 1 ? "some of" : "the last of"] their own cuts with [src]", "\red You hear something like gauze being ripped.")
+		else if(user)
+			user << "\red Nothing to patch up!"
+			return
 	else
 		M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))
 
 	use(1)
 
+//	if (M.health < 50 && !stoppedblood)
+//		var/t_him = "it"
+//		if (M.gender == MALE)
+//			t_him = "him"
+//		else if (M.gender == FEMALE)
+//			t_him = "her"
+//		user << "\red \The [M] is wounded badly, this item cannot help [t_him]!"
+//		return
+
+//	if (user)
+//		if (M != user)
+//			user.visible_message( \
+//				"\blue [M] has been applied with [src] by [user].", \
+//				"\blue You apply \the [src] to [M]." \
+//			)
+//		else
+//			var/t_himself = "itself"
+//			if (user.gender == MALE)
+//				t_himself = "himself"
+//			else if (user.gender == FEMALE)
+//				t_himself = "herself"
+
+//			user.visible_message( \
+//				"\blue [M] applied [src] on [t_himself].", \
+//				"\blue You apply \the [src] on yourself." \
+//			)
+
+//	if (istype(M, /mob/living/carbon/human))
+//		var/mob/living/carbon/human/H = M
+//		var/datum/organ/external/affecting = H.get_organ("chest")
+
+//		if(istype(user, /mob/living/carbon/human))
+//			var/mob/living/carbon/human/user2 = user
+//			affecting = H.get_organ(check_zone(user2.zone_sel.selecting))
+//		else
+//			if(!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0)
+//				affecting = H.get_organ("head")
+//
+//		if (affecting.heal_damage(src.heal_brute, src.heal_burn))
+//			H.UpdateDamageIcon()
+//		M.updatehealth()
+
+
 
 
 /obj/item/stack/medical/advanced/attack(mob/living/carbon/M as mob, mob/user as mob)
@@ -112,6 +119,16 @@ MEDICAL
 		user << "\red \The [M] is dead, you cannot help [t_him]!"
 		return
 
+	if (!istype(M))
+		user << "\red \The [src] cannot be applied to [M]!"
+		return 1
+
+	if ( ! (istype(user, /mob/living/carbon/human) || \
+			istype(user, /mob/living/silicon) || \
+			istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") )
+		user << "\red You don't have the dexterity to do this!"
+		return 1
+
 	var/stoppedblood = 0
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
@@ -124,73 +141,24 @@ MEDICAL
 			if(!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0)
 				affecting = H.get_organ("head")
 
-		if(H.bloodloss > 0 && heal_brute > 0)		// fix wounds too if bruise pack
-			for(var/datum/organ/wound/W in affecting.wounds)
-				if(W.bleeding)
-					if(stoppedblood)
-						stoppedblood = 2
-						break
-					W.stopbleeding()
-					stoppedblood = 1
+		for(var/datum/organ/wound/W in affecting.wounds)
+			if(W.bleeding || !W.healing_state)
+				if(heal_brute && W.wound_type == 2)
+					continue
+				if(heal_burn && W.wound_type < 2)
+					continue
+				W.stopbleeding()
+				stoppedblood = 1
+				break
 
-		if (user)
+		if (user && stoppedblood)
 			if (M != user)
-				H.visible_message("\red [user] patches [stoppedblood - 1 ? "some of" : "the last of"] [H]'s wounds with [src]", "\red You patch up [stoppedblood - 1 ? "some of" : "the last of"] [H]'s wounds", "\red You hear something like gauze being ripped.")
+				H.visible_message("\red You bandage up [stoppedblood - 1 ? "some of" : "the last of"] [H]'s cuts", "\red [user] bandages [stoppedblood - 1 ? "some of" : "the last of"] [H]'s cuts with [src]", "\red You hear something like gauze being ripped.")
 			else
-				H.visible_message("\red [user] patches [stoppedblood - 1 ? "some of" : "the last of"] their own wounds with [src]", "\red You patch up [stoppedblood - 1 ? "some of" : "the last of"] your wounds", "\red You hear something like gauze being ripped.")
-
-	if (M.health < 0 && !stoppedblood)
-		var/t_him = "it"
-		if (M.gender == MALE)
-			t_him = "him"
-		else if (M.gender == FEMALE)
-			t_him = "her"
-		user << "\red \The [M] is wounded badly, this item cannot help [t_him]!"
-		return
-
-
-	if (!istype(M))
-		user << "\red \The [src] cannot be applied to [M]!"
-		return 1
-
-	if ( ! (istype(user, /mob/living/carbon/human) || \
-			istype(user, /mob/living/silicon) || \
-			istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") )
-		user << "\red You don't have the dexterity to do this!"
-		return 1
-
-	if (user)
-		if (M != user)
-			user.visible_message( \
-				"\blue [M] has been applied with [src] by [user].", \
-				"\blue You apply \the [src] to [M]." \
-			)
-		else
-			var/t_himself = "itself"
-			if (user.gender == MALE)
-				t_himself = "himself"
-			else if (user.gender == FEMALE)
-				t_himself = "herself"
-
-			user.visible_message( \
-				"\blue [M] applied [src] on [t_himself].", \
-				"\blue You apply \the [src] on yourself." \
-			)
-
-	if (istype(M, /mob/living/carbon/human))
-		var/mob/living/carbon/human/H = M
-		var/datum/organ/external/affecting = H.get_organ("chest")
-
-		if(istype(user, /mob/living/carbon/human))
-			var/mob/living/carbon/human/user2 = user
-			affecting = H.get_organ(check_zone(user2.zone_sel.selecting))
-		else
-			if(!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0)
-				affecting = H.get_organ("head")
-
-		if (affecting.heal_damage(src.heal_brute, src.heal_burn))
-			H.UpdateDamageIcon()
-		M.updatehealth()
+				H.visible_message("\red You bandage up [stoppedblood - 1 ? "some of" : "the last of"] your cuts", "\red [user] bandages [stoppedblood - 1 ? "some of" : "the last of"] their own cuts with [src]", "\red You hear something like gauze being ripped.")
+		else if(user)
+			user << "\red Nothing to patch up!"
+			return
 	else
 		M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))