Binary file merge conflict.

code/datums/organs/wound.dm

@@ -131,31 +131,31 @@
 		return (!(bandaged||clamped) && (damage_type == BRUISE && damage >= 20 || damage_type == CUT) && current_stage <= max_bleeding_stage && !src.internal)
 
 /** CUTS **/
-/datum/wound/cut
+/datum/wound/cut/small
 	// link wound descriptions to amounts of damage
 	max_bleeding_stage = 2
 	stages = list("ugly ripped cut" = 20, "ripped cut" = 10, "cut" = 5, "healing cut" = 2, "small scab" = 0)
 
-/datum/wound/deep_cut
+/datum/wound/cut/deep
 	max_bleeding_stage = 3
 	stages = list("ugly deep ripped cut" = 25, "deep ripped cut" = 20, "deep cut" = 15, "clotted cut" = 8, "scab" = 2, "fresh skin" = 0)
 
-/datum/wound/flesh_wound
+/datum/wound/cut/flesh
 	max_bleeding_stage = 3
 	stages = list("ugly ripped flesh wound" = 35, "ugly flesh wound" = 30, "flesh wound" = 25, "blood soaked clot" = 15, "large scab" = 5, "fresh skin" = 0)
 
-/datum/wound/gaping_wound
+/datum/wound/cut/gaping
 	max_bleeding_stage = 2
 	stages = list("gaping wound" = 50, "large blood soaked clot" = 25, "large clot" = 15, "small angry scar" = 5, \
 				   "small straight scar" = 0)
 
-/datum/wound/big_gaping_wound
+/datum/wound/cut/gaping_big
 	max_bleeding_stage = 2
 	stages = list("big gaping wound" = 60, "healing gaping wound" = 40, "large angry scar" = 10, "large straight scar" = 0)
 
 	needs_treatment = 1 // this only heals when bandaged
 
-/datum/wound/massive_wound
+datum/wound/cut/massive
 	max_bleeding_stage = 2
 	stages = list("massive wound" = 70, "massive healing wound" = 50, "massive angry scar" = 10,  "massive jagged scar" = 0)
 
@@ -169,50 +169,50 @@
 	needs_treatment = 1 // this only heals when bandaged
 	damage_type = BRUISE
 
-/datum/wound/bruise/monumental_bruise
+/datum/wound/bruise/monumental
 
 // implement sub-paths by starting at a later stage
-/datum/wound/bruise/huge_bruise
+/datum/wound/bruise/huge
 	current_stage = 1
 
-/datum/wound/bruise/large_bruise
+/datum/wound/bruise/large
 	current_stage = 2
 
-/datum/wound/bruise/moderate_bruise
+/datum/wound/bruise/moderate
 	current_stage = 3
 	needs_treatment = 0
 
-/datum/wound/bruise/small_bruise
+/datum/wound/bruise/small
 	current_stage = 4
 	needs_treatment = 0
 
-/datum/wound/bruise/tiny_bruise
+/datum/wound/bruise/tiny
 	current_stage = 5
 	needs_treatment = 0
 
 /** BURNS **/
-/datum/wound/moderate_burn
+/datum/wound/burn/moderate
 	stages = list("ripped burn" = 10, "moderate burn" = 5, "moderate salved burn" = 2, "fresh skin" = 0)
 
 	needs_treatment = 1 // this only heals when bandaged
 
 	damage_type = BURN
 
-/datum/wound/large_burn
+/datum/wound/burn/large
 	stages = list("ripped large burn" = 20, "large burn" = 15, "large salved burn" = 5, "fresh skin" = 0)
 
 	needs_treatment = 1 // this only heals when bandaged
 
 	damage_type = BURN
 
-/datum/wound/severe_burn
+/datum/wound/burn/severe
 	stages = list("ripped severe burn" = 35, "severe burn" = 30, "severe salved burn" = 10, "burn scar" = 0)
 
 	needs_treatment = 1 // this only heals when bandaged
 
 	damage_type = BURN
 
-/datum/wound/deep_burn
+/datum/wound/burn/deep
 	stages = list("ripped deep burn" = 45, "deep burn" = 40, "deep salved burn" = 15,  "large burn scar" = 0)
 
 	needs_treatment = 1 // this only heals when bandaged
@@ -220,7 +220,7 @@
 	damage_type = BURN
 
 
-/datum/wound/carbonised_area
+/datum/wound/burn/carbonised
 	stages = list("carbonised area" = 50, "treated carbonised area" = 20, "massive burn scar" = 0)
 
 	needs_treatment = 1 // this only heals when bandaged

code/game/objects/items/devices/PDA/PDA.dm

@@ -914,7 +914,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 					user.show_message("\blue Localized Damage, Brute/Burn:",1)
 					if(length(damaged)>0)
 						for(var/datum/organ/external/org in damaged)
-							user.show_message(text("\blue \t []: []\blue-[]",capitalize(org.getDisplayName()),(org.brute_dam > 0)?"\red [org.brute_dam]":0,(org.burn_dam > 0)?"\red [org.burn_dam]":0),1)
+							user.show_message(text("\blue \t []: []\blue-[]",capitalize(org.display_name),(org.brute_dam > 0)?"\red [org.brute_dam]":0,(org.burn_dam > 0)?"\red [org.burn_dam]":0),1)
 					else
 						user.show_message("\blue \t Limbs are OK.",1)
 

code/game/objects/items/devices/scanners.dm

@@ -112,7 +112,7 @@ MASS SPECTROMETER
 		if(length(damaged)>0)
 			for(var/datum/organ/external/org in damaged)
 				user.show_message(text("\blue \t []: [][]\blue - []",	\
-				capitalize(org.getDisplayName()),					\
+				capitalize(org.display_name),					\
 				(org.brute_dam > 0)	?	"\red [org.brute_dam]"							:0,		\
 				(org.status & ORGAN_BLEEDING)?"\red <b>\[Bleeding\]</b>":"\t", 		\
 				(org.burn_dam > 0)	?	"<font color='#FFA500'>[org.burn_dam]</font>"	:0),1)
@@ -146,7 +146,7 @@ MASS SPECTROMETER
 		var/mob/living/carbon/human/H = M
 		for(var/name in H.organs_by_name)
 			var/datum/organ/external/e = H.organs_by_name[name]
-			var/limb = e.getDisplayName()
+			var/limb = e.display_name
 			if(e.status & ORGAN_BROKEN)
 				if(((e.name == "l_arm") || (e.name == "r_arm") || (e.name == "l_leg") || (e.name == "r_leg")) && (!(e.status & ORGAN_SPLINTED)))
 					user << "\red Unsecured fracture in subject [limb]. Splinting recommended for transport."
@@ -328,4 +328,4 @@ MASS SPECTROMETER
 	name = "advanced mass-spectrometer"
 	icon_state = "adv_spectrometer"
 	details = 1
-	origin_tech = "magnets=4;biotech=2"
+	origin_tech = "magnets=4;biotech=2"

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

@@ -188,7 +188,7 @@
 					status = "MISSING!"
 				if(status == "")
 					status = "OK"
-				src.show_message(text("\t []My [] is [].",status=="OK"?"\blue ":"\red ",org.getDisplayName(),status),1)
+				src.show_message(text("\t []My [] is [].",status=="OK"?"\blue ":"\red ",org.display_name,status),1)
 			if((SKELETON in H.mutations) && (!H.w_uniform) && (!H.wear_suit))
 				H.play_xylophone()
 		else

code/modules/surgery/other.dm

@@ -80,15 +80,23 @@
 				find_prob +=40
 			if (isright(tool))
 				find_prob +=20
-
-		if (prob(find_prob))
+			if (prob(find_prob))
+				user.visible_message("\blue [user] takes something out of incision on [target]'s [affected.display_name] with \the [tool].", \
+				"\blue You take something out of incision on [target]'s [affected.display_name]s with \the [tool]." )
+				affected.implants -= imp
+				imp.loc = get_turf(target)
+				imp.imp_in = null
+				imp.implanted = 0
+		else if (affected.hidden)
 			user.visible_message("\blue [user] takes something out of incision on [target]'s [affected.display_name] with \the [tool].", \
 			"\blue You take something out of incision on [target]'s [affected.display_name]s with \the [tool]." )
-			var/obj/item/weapon/implant/imp = affected.implants[1]
-			affected.implants -= imp
-			imp.loc = get_turf(target)
-			imp.imp_in = null
-			imp.implanted = 0
+			affected.hidden.loc = get_turf(target)
+			if(!affected.hidden.blood_DNA)
+				affected.hidden.blood_DNA = list()
+			affected.hidden.blood_DNA[target.dna.unique_enzymes] = target.dna.b_type
+			affected.hidden.update_icon()
+			affected.hidden = null
+
 		else
 			user.visible_message("\blue [user] could not find anything inside [target]'s [affected.display_name], and pulls \the [tool] out.", \
 			"\blue You could not find anything inside [target]'s [affected.display_name]." )
@@ -107,4 +115,48 @@
 				user.visible_message("\red Something beeps inside [target]'s [affected.display_name]!")
 				playsound(imp.loc, 'sound/items/countdown.ogg', 75, 1, -3)
 				spawn(25)
-					imp.activate()
+					imp.activate()
+
+//////////////////////////////////////////////////////////////////
+//					ITEM PLACEMENT SURGERY						//
+//////////////////////////////////////////////////////////////////
+
+/datum/surgery_step/item_place
+	required_tool = /obj/item
+
+	min_duration = 80
+	max_duration = 100
+	var/max_size = 2	//maximum w_class of item that fits.
+
+	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/external/affected = target.get_organ(target_zone)
+		if (affected.name in list("chest","groin","head"))
+			max_size = 3
+		return affected.open == 2 && !(affected.status & ORGAN_BLEEDING) && tool.w_class <= max_size && !affected.hidden
+
+	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/external/affected = target.get_organ(target_zone)
+		user.visible_message("[user] starts putting [tool] inside the incision on [target]'s [affected.display_name].", \
+		"You start putting [tool] inside the incision on [target]'s [affected.display_name]." )
+		target.custom_pain("The pain in your chest is living hell!",1)
+		..()
+
+	end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/external/chest/affected = target.get_organ(target_zone)
+
+		user.visible_message("\blue [user] puts [tool] inside [target]'s [affected.display_name].", \
+		"\blue You put [tool] inside [target]'s [affected.display_name]." )
+		if (tool.w_class > max_size/2 && prob(50))
+			user << "\red You tear some vessels trying to fit such big object in this cavity."
+			var/datum/wound/internal_bleeding/I = new (15)
+			affected.wounds += I
+			affected.owner.custom_pain("You feel something rip in your [affected.display_name]!", 1)
+		user.drop_item()
+		affected.hidden = tool
+		tool.loc = target
+
+	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/external/chest/affected = target.get_organ(target_zone)
+		user.visible_message("\red [user]'s hand slips, scraping tissue inside [target]'s [affected.display_name] with \the [tool]!", \
+		"\red Your hand slips, scraping tissue inside [target]'s [affected.display_name] with \the [tool]!")
+		affected.createwound(CUT, 20)

html/changelog.html

@@ -58,6 +58,13 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
+<div class="commit sansserif">
+	<h2 class="date">18.02.13</h2>
+	<h3 class="author">Chinsky updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">Added new surgery: putting items inside people. After you use retractor to keep incision open, just click with any item to put it inside. But be wary, if you try to fit something too big, you might rip the veins. To remove items, use implant removal surgery.</li>		
+	</ul>
+</div>
 
 <div class="commit sansserif">
 	<h2 class="date">February 18th 2013</h2>