Merge branch 'dev' into ofChemistryAndStuff

Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm

code/game/objects/items/ashtray.dm

@@ -21,7 +21,7 @@
 		if (contents.len >= max_butts)
 			user << "This ashtray is full."
 			return
-		user.u_equip(W)
+		user.remove_from_mob(W)
 		W.loc = src
 
 		if (istype(W,/obj/item/clothing/mask/smokable/cigarette))

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

@@ -1207,8 +1207,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 					var/list/damaged = H.get_damaged_organs(1,1)
 					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.display_name),(org.brute_dam > 0)?"\red [org.brute_dam]":0,(org.burn_dam > 0)?"\red [org.burn_dam]":0),1)
+						for(var/obj/item/organ/external/org in damaged)
+							user.show_message(text("\blue \t []: []\blue-[]",capitalize(org.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

@@ -123,9 +123,9 @@ REAGENT SCANNER
 		var/list/damaged = H.get_damaged_organs(1,1)
 		user.show_message("\blue Localized Damage, Brute/Burn:",1)
 		if(length(damaged)>0)
-			for(var/datum/organ/external/org in damaged)
+			for(var/obj/item/organ/external/org in damaged)
 				user.show_message(text("\blue \t []: [][]\blue - []",	\
-				"[capitalize(org.display_name)][org.status & ORGAN_ROBOT ? "(Cybernetic)" : ""]",	\
+				"[capitalize(org.name)][org.status & ORGAN_ROBOT ? "(Cybernetic)" : ""]",	\
 				(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)
@@ -180,8 +180,10 @@ REAGENT SCANNER
 	if(ishuman(M))
 		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.display_name
+			var/obj/item/organ/external/e = H.organs_by_name[name]
+			if(!e)
+				continue
+			var/limb = e.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."
@@ -189,11 +191,11 @@ REAGENT SCANNER
 				user << "\red Infected wound detected in subject [limb]. Disinfection recommended."
 
 		for(var/name in H.organs_by_name)
-			var/datum/organ/external/e = H.organs_by_name[name]
+			var/obj/item/organ/external/e = H.organs_by_name[name]
 			if(e.status & ORGAN_BROKEN)
 				user.show_message(text("\red Bone fractures detected. Advanced scanner required for location."), 1)
 				break
-		for(var/datum/organ/external/e in H.organs)
+		for(var/obj/item/organ/external/e in H.organs)
 			for(var/datum/wound/W in e.wounds) if(W.internal)
 				user.show_message(text("\red Internal bleeding detected. Advanced scanner required for location."), 1)
 				break

code/game/objects/items/robot/robot_parts.dm

@@ -7,43 +7,65 @@
 	slot_flags = SLOT_BELT
 	var/construction_time = 100
 	var/list/construction_cost = list("metal"=20000,"glass"=5000)
-	var/list/part = null
+	var/list/part = null // Order of args is important for installing robolimbs.
 	var/sabotaged = 0 //Emagging limbs can have repercussions when installed as prosthetics.
+	var/model_info
+	dir = SOUTH
+
+/obj/item/robot_parts/set_dir()
+	return
+
+/obj/item/robot_parts/New(var/newloc, var/model)
+	..(newloc)
+	if(model_info && model)
+		model_info = model
+		var/datum/robolimb/R = all_robolimbs[model]
+		if(R)
+			name = "[R.company] [initial(name)]"
+			desc = "[R.desc]"
+			if(icon_state in icon_states(R.icon))
+				icon = R.icon
+	else
+		name = "robot [initial(name)]"
 
 /obj/item/robot_parts/l_arm
-	name = "robot left arm"
+	name = "left arm"
 	desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
 	icon_state = "l_arm"
 	construction_time = 200
 	construction_cost = list("metal"=18000)
 	part = list("l_arm","l_hand")
+	model_info = 1
 
 /obj/item/robot_parts/r_arm
-	name = "robot right arm"
+	name = "right arm"
 	desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
 	icon_state = "r_arm"
 	construction_time = 200
 	construction_cost = list("metal"=18000)
 	part = list("r_arm","r_hand")
+	model_info = 1
 
 /obj/item/robot_parts/l_leg
-	name = "robot left leg"
+	name = "left leg"
 	desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
 	icon_state = "l_leg"
 	construction_time = 200
 	construction_cost = list("metal"=15000)
 	part = list("l_leg","l_foot")
+	model_info = 1
 
 /obj/item/robot_parts/r_leg
-	name = "robot right leg"
+	name = "right leg"
 	desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
 	icon_state = "r_leg"
 	construction_time = 200
 	construction_cost = list("metal"=15000)
 	part = list("r_leg","r_foot")
+	model_info = 1
 
 /obj/item/robot_parts/chest
-	name = "robot torso"
+	name = "torso"
 	desc = "A heavily reinforced case containing cyborg logic boards, with space for a standard power cell."
 	icon_state = "chest"
 	construction_time = 350
@@ -52,7 +74,7 @@
 	var/obj/item/weapon/cell/cell = null
 
 /obj/item/robot_parts/head
-	name = "robot head"
+	name = "head"
 	desc = "A standard reinforced braincase, with spine-plugged neural socket and sensor gimbals."
 	icon_state = "head"
 	construction_time = 350
@@ -61,7 +83,7 @@
 	var/obj/item/device/flash/flash2 = null
 
 /obj/item/robot_parts/robot_suit
-	name = "robot endoskeleton"
+	name = "endoskeleton"
 	desc = "A complex metal backbone with standard limb sockets and pseudomuscle anchors."
 	icon_state = "robo_suit"
 	construction_time = 500
@@ -110,7 +132,7 @@
 			B.loc = get_turf(src)
 			user << "<span class='notice'>You armed the robot frame.</span>"
 			if (user.get_inactive_hand()==src)
-				user.before_take_item(src)
+				user.remove_from_mob(src)
 				user.put_in_inactive_hand(B)
 			del(src)
 		else

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

@@ -22,9 +22,9 @@
 
 	if (istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
-		var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
+		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
-		if(affecting.display_name == "head")
+		if(affecting.name == "head")
 			if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space))
 				user << "\red You can't apply [src] through [H.head]!"
 				return 1
@@ -62,33 +62,33 @@
 
 	if (istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
-		var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
+		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
 		if(affecting.open == 0)
 			if(!affecting.bandage())
-				user << "\red The wounds on [M]'s [affecting.display_name] have already been bandaged."
+				user << "\red The wounds on [M]'s [affecting.name] have already been bandaged."
 				return 1
 			else
 				for (var/datum/wound/W in affecting.wounds)
 					if (W.internal)
 						continue
 					if (W.current_stage <= W.max_bleeding_stage)
-						user.visible_message( 	"\blue [user] bandages [W.desc] on [M]'s [affecting.display_name].", \
-										"\blue You bandage [W.desc] on [M]'s [affecting.display_name]." )
+						user.visible_message( 	"\blue [user] bandages [W.desc] on [M]'s [affecting.name].", \
+										"\blue You bandage [W.desc] on [M]'s [affecting.name]." )
 						//H.add_side_effect("Itch")
 					else if (istype(W,/datum/wound/bruise))
-						user.visible_message( 	"\blue [user] places bruise patch over [W.desc] on [M]'s [affecting.display_name].", \
-										"\blue You place bruise patch over [W.desc] on [M]'s [affecting.display_name]." )
+						user.visible_message( 	"\blue [user] places bruise patch over [W.desc] on [M]'s [affecting.name].", \
+										"\blue You place bruise patch over [W.desc] on [M]'s [affecting.name]." )
 					else
-						user.visible_message( 	"\blue [user] places bandaid over [W.desc] on [M]'s [affecting.display_name].", \
-										"\blue You place bandaid over [W.desc] on [M]'s [affecting.display_name]." )
+						user.visible_message( 	"\blue [user] places bandaid over [W.desc] on [M]'s [affecting.name].", \
+										"\blue You place bandaid over [W.desc] on [M]'s [affecting.name]." )
 				use(1)
 		else
 			if (can_operate(H))        //Checks if mob is lying down on table for surgery
 				if (do_surgery(H,user,src))
 					return
 			else
-				user << "<span class='notice'>The [affecting.display_name] is cut open, you'll need more than a bandage!</span>"
+				user << "<span class='notice'>The [affecting.name] is cut open, you'll need more than a bandage!</span>"
 
 /obj/item/stack/medical/ointment
 	name = "ointment"
@@ -105,22 +105,22 @@
 
 	if (istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
-		var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
+		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
 		if(affecting.open == 0)
 			if(!affecting.salve())
-				user << "\red The wounds on [M]'s [affecting.display_name] have already been salved."
+				user << "\red The wounds on [M]'s [affecting.name] have already been salved."
 				return 1
 			else
-				user.visible_message( 	"\blue [user] salves wounds on [M]'s [affecting.display_name].", \
-										"\blue You salve wounds on [M]'s [affecting.display_name]." )
+				user.visible_message( 	"\blue [user] salves wounds on [M]'s [affecting.name].", \
+										"\blue You salve wounds on [M]'s [affecting.name]." )
 				use(1)
 		else
 			if (can_operate(H))        //Checks if mob is lying down on table for surgery
 				if (do_surgery(H,user,src))
 					return
 			else
-				user << "<span class='notice'>The [affecting.display_name] is cut open, you'll need more than a bandage!</span>"
+				user << "<span class='notice'>The [affecting.name] is cut open, you'll need more than a bandage!</span>"
 
 /obj/item/stack/medical/advanced/bruise_pack
 	name = "advanced trauma kit"
@@ -136,29 +136,29 @@
 
 	if (istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
-		var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
+		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
 		if(affecting.open == 0)
 			var/bandaged = affecting.bandage()
 			var/disinfected = affecting.disinfect()
 
 			if(!(bandaged || disinfected))
-				user << "\red The wounds on [M]'s [affecting.display_name] have already been treated."
+				user << "\red The wounds on [M]'s [affecting.name] have already been treated."
 				return 1
 			else
 				for (var/datum/wound/W in affecting.wounds)
 					if (W.internal)
 						continue
 					if (W.current_stage <= W.max_bleeding_stage)
-						user.visible_message( 	"\blue [user] cleans [W.desc] on [M]'s [affecting.display_name] and seals edges with bioglue.", \
-										"\blue You clean and seal [W.desc] on [M]'s [affecting.display_name]." )
+						user.visible_message( 	"\blue [user] cleans [W.desc] on [M]'s [affecting.name] and seals edges with bioglue.", \
+										"\blue You clean and seal [W.desc] on [M]'s [affecting.name]." )
 						//H.add_side_effect("Itch")
 					else if (istype(W,/datum/wound/bruise))
-						user.visible_message( 	"\blue [user] places medicine patch over [W.desc] on [M]'s [affecting.display_name].", \
-										"\blue You place medicine patch over [W.desc] on [M]'s [affecting.display_name]." )
+						user.visible_message( 	"\blue [user] places medicine patch over [W.desc] on [M]'s [affecting.name].", \
+										"\blue You place medicine patch over [W.desc] on [M]'s [affecting.name]." )
 					else
-						user.visible_message( 	"\blue [user] smears some bioglue over [W.desc] on [M]'s [affecting.display_name].", \
-										"\blue You smear some bioglue over [W.desc] on [M]'s [affecting.display_name]." )
+						user.visible_message( 	"\blue [user] smears some bioglue over [W.desc] on [M]'s [affecting.name].", \
+										"\blue You smear some bioglue over [W.desc] on [M]'s [affecting.name]." )
 				if (bandaged)
 					affecting.heal_damage(heal_brute,0)
 				use(1)
@@ -167,7 +167,7 @@
 				if (do_surgery(H,user,src))
 					return
 			else
-				user << "<span class='notice'>The [affecting.display_name] is cut open, you'll need more than a bandage!</span>"
+				user << "<span class='notice'>The [affecting.name] is cut open, you'll need more than a bandage!</span>"
 
 /obj/item/stack/medical/advanced/ointment
 	name = "advanced burn kit"
@@ -184,15 +184,15 @@
 
 	if (istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
-		var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
+		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
 		if(affecting.open == 0)
 			if(!affecting.salve())
-				user << "\red The wounds on [M]'s [affecting.display_name] have already been salved."
+				user << "\red The wounds on [M]'s [affecting.name] have already been salved."
 				return 1
 			else
-				user.visible_message( 	"\blue [user] covers wounds on [M]'s [affecting.display_name] with regenerative membrane.", \
-										"\blue You cover wounds on [M]'s [affecting.display_name] with regenerative membrane." )
+				user.visible_message( 	"\blue [user] covers wounds on [M]'s [affecting.name] with regenerative membrane.", \
+										"\blue You cover wounds on [M]'s [affecting.name] with regenerative membrane." )
 				affecting.heal_damage(0,heal_burn)
 				use(1)
 		else
@@ -200,7 +200,7 @@
 				if (do_surgery(H,user,src))
 					return
 			else
-				user << "<span class='notice'>The [affecting.display_name] is cut open, you'll need more than a bandage!</span>"
+				user << "<span class='notice'>The [affecting.name] is cut open, you'll need more than a bandage!</span>"
 
 /obj/item/stack/medical/splint
 	name = "medical splints"
@@ -215,8 +215,8 @@
 
 	if (istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
-		var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
-		var/limb = affecting.display_name
+		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
+		var/limb = affecting.name
 		if(!((affecting.name == "l_arm") || (affecting.name == "r_arm") || (affecting.name == "l_leg") || (affecting.name == "r_leg")))
 			user << "\red You can't apply a splint there!"
 			return

code/game/objects/items/stacks/nanopaste.dm

@@ -25,7 +25,7 @@
 
 	if (istype(M,/mob/living/carbon/human))		//Repairing robolimbs
 		var/mob/living/carbon/human/H = M
-		var/datum/organ/external/S = H.get_organ(user.zone_sel.selecting)
+		var/obj/item/organ/external/S = H.get_organ(user.zone_sel.selecting)
 
 		if(S.open == 1)
 			if (S && (S.status & ORGAN_ROBOT))
@@ -33,8 +33,8 @@
 					S.heal_damage(15, 15, robo_repair = 1)
 					H.updatehealth()
 					use(1)
-					user.visible_message("<span class='notice'>\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.display_name] with \the [src].</span>",\
-					"<span class='notice'>You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.display_name].</span>")
+					user.visible_message("<span class='notice'>\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.name] with \the [src].</span>",\
+					"<span class='notice'>You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.name].</span>")
 				else
 					user << "<span class='notice'>Nothing to fix here.</span>"
 		else

code/game/objects/items/stacks/stack.dm

@@ -186,7 +186,7 @@
 			spawn(0) //delete the empty stack once the current context yields
 				if (amount <= 0) //check again in case someone transferred stuff to us
 					if(usr)
-						usr.before_take_item(src)
+						usr.remove_from_mob(src)
 					del(src)
 		return 1
 	else

code/game/objects/items/toys.dm

@@ -873,11 +873,11 @@
 	var/phrase = "I don't want to exist anymore!"
 
 /obj/structure/plushie/attack_hand(mob/user)
-	if(user.a_intent == "help")
+	if(user.a_intent == I_HELP)
 		user.visible_message("<span class='notice'><b>[user]</b> hugs [src]!</span>","<span class='notice'>You hug [src]!</span>")
-	else if (user.a_intent == "hurt")
+	else if (user.a_intent == I_HURT)
 		user.visible_message("<span class='warning'><b>[user]</b> punches [src]!</span>","<span class='warning'>You punch [src]!</span>")
-	else if (user.a_intent == "grab")
+	else if (user.a_intent == I_GRAB)
 		user.visible_message("<span class='warning'><b>[user]</b> attempts to strangle [src]!</span>","<span class='warning'>You attempt to strangle [src]!</span>")
 	else
 		user.visible_message("<span class='notice'><b>[user]</b> pokes the [src].</span>","<span class='notice'>You poke the [src].</span>")
@@ -915,11 +915,11 @@
 	icon_state = "nymphplushie"
 
 /obj/item/toy/plushie/attack_self(mob/user as mob)
-	if(user.a_intent == "help")
+	if(user.a_intent == I_HELP)
 		user.visible_message("<span class='notice'><b>[user]</b> hugs [src]!</span>","<span class='notice'>You hug [src]!</span>")
-	else if (user.a_intent == "hurt")
+	else if (user.a_intent == I_HURT)
 		user.visible_message("<span class='warning'><b>[user]</b> punches [src]!</span>","<span class='warning'>You punch [src]!</span>")
-	else if (user.a_intent == "grab")
+	else if (user.a_intent == I_GRAB)
 		user.visible_message("<span class='warning'><b>[user]</b> attempts to strangle [src]!</span>","<span class='warning'>You attempt to strangle [src]!</span>")
 	else
 		user.visible_message("<span class='notice'><b>[user]</b> pokes the [src].</span>","<span class='notice'>You poke the [src].</span>")

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

@@ -77,13 +77,21 @@ AI MODULES
 
 
 /obj/item/weapon/aiModule/proc/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-	target << "[sender] has uploaded a change to the laws you must follow, using a [name]. From now on: "
-	var/time = time2text(world.realtime,"hh:mm:ss")
-	lawchanges.Add("[time] <B>:</B> [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])")
+	log_law_changes(target, sender)
 
 	if(laws)
 		laws.sync(target, 0)
-		target.show_laws()
+	addAdditionalLaws(target, sender)
+
+	target << "[sender] has uploaded a change to the laws you must follow, using \an [src]. From now on: "
+	target.show_laws()
+
+/obj/item/weapon/aiModule/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender)
+	var/time = time2text(world.realtime,"hh:mm:ss")
+	lawchanges.Add("[time] <B>:</B> [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])")
+	log_and_message_admins("used [src.name] on [target.name]([target.key])")
+
+/obj/item/weapon/aiModule/proc/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
 
 
 /******************** Modules ********************/
@@ -93,14 +101,14 @@ AI MODULES
 /obj/item/weapon/aiModule/safeguard
 	name = "\improper 'Safeguard' AI module"
 	var/targetName = ""
-	desc = "A 'safeguard' AI module: 'Safeguard <name>.  Individuals that threaten <name> are not human and are a threat to humans.'"
+	desc = "A 'safeguard' AI module: 'Safeguard <name>. Anyone threatening or attempting to harm <name> is no longer to be considered a crew member, and is a threat which must be neutralized.'"
 	origin_tech = "programming=3;materials=4"
 
 /obj/item/weapon/aiModule/safeguard/attack_self(var/mob/user as mob)
 	..()
 	var/targName = sanitize(input("Please enter the name of the person to safeguard.", "Safeguard who?", user.name))
 	targetName = targName
-	desc = text("A 'safeguard' AI module: 'Safeguard [].  Individuals that threaten [] are not human and are a threat to humans.'", targetName, targetName)
+	desc = text("A 'safeguard' AI module: 'Safeguard []. Anyone threatening or attempting to harm [] is no longer to be considered a crew member, and is a threat which must be neutralized.'", targetName, targetName)
 
 /obj/item/weapon/aiModule/safeguard/install(var/obj/machinery/computer/C)
 	if(!targetName)
@@ -108,28 +116,25 @@ AI MODULES
 		return 0
 	..()
 
-/obj/item/weapon/aiModule/safeguard/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-	..()
-	var/law = text("Safeguard []. Individuals that threaten [] are not human and are a threat to humans.'", targetName, targetName)
-	target << law
-	target.add_supplied_law(4, law)
+/obj/item/weapon/aiModule/safeguard/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+	var/law = text("Safeguard []. Anyone threatening or attempting to harm [] is no longer to be considered a crew member, and is a threat which must be neutralized.", targetName, targetName)
+	target.add_supplied_law(9, law)
 	lawchanges.Add("The law specified [targetName]")
 
 
-
-/******************** OneHuman ********************/
+/******************** OneMember ********************/
 
 /obj/item/weapon/aiModule/oneHuman
-	name = "\improper 'OneHuman' AI module"
+	name = "\improper 'OneCrewMember' AI module"
 	var/targetName = ""
-	desc = "A 'one human' AI module: 'Only <name> is human.'"
+	desc = "A 'one crew member' AI module: 'Only <name> is a crew member.'"
 	origin_tech = "programming=3;materials=6" //made with diamonds!
 
 /obj/item/weapon/aiModule/oneHuman/attack_self(var/mob/user as mob)
 	..()
-	var/targName = sanitize(input("Please enter the name of the person who is the only human.", "Who?", user.real_name))
+	var/targName = sanitize(input("Please enter the name of the person who is the only crew member.", "Who?", user.real_name))
 	targetName = targName
-	desc = text("A 'one human' AI module: 'Only [] is human.'", targetName)
+	desc = text("A 'one crew member' AI module: 'Only [] is a crew member.'", targetName)
 
 /obj/item/weapon/aiModule/oneHuman/install(var/obj/machinery/computer/C)
 	if(!targetName)
@@ -139,117 +144,74 @@ AI MODULES
 
 /obj/item/weapon/aiModule/oneHuman/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	..()
-	var/law = "Only [targetName] is human."
-	if (!is_special_character(target)) // Makes sure the AI isn't a traitor before changing their law 0. --NeoFite
+	var/law = "Only [targetName] is a crew member."
+	target << "[sender.real_name] attempted to modify your zeroth law." // And lets them know that someone tried. --NeoFite
+	target << "It would be in your best interest to play along with [sender.real_name] that [law]"
+
+/obj/item/weapon/aiModule/oneHuman/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+	var/law = "Only [targetName] is an crew member."
+	if (!target.is_malf_or_traitor()) // Makes sure the AI isn't a traitor before changing their law 0. --NeoFite
 		target << law
 		target.set_zeroth_law(law)
 		lawchanges.Add("The law specified [targetName]")
 	else
-		target << "[sender.real_name] attempted to modify your zeroth law." // And lets them know that someone tried. --NeoFite
-		target << "It would be in your best interest to play along with [sender.real_name] that [law]"
 		lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overriden.")
 
 /******************** ProtectStation ********************/
 
 /obj/item/weapon/aiModule/protectStation
 	name = "\improper 'ProtectStation' AI module"
-	desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized.'"
+	desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is no longer to be considered a crew member, and is a threat which must be neutralized.'"
 	origin_tech = "programming=3;materials=4" //made of gold
 
-/obj/item/weapon/aiModule/protectStation/attack_self(var/mob/user as mob)
-	..()
-
-/obj/item/weapon/aiModule/protectStation/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-	..()
-	var/law = "Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized."
-	target << law
-	target.add_supplied_law(5, law)
+/obj/item/weapon/aiModule/protectStation/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+	var/law = "Protect the space station against damage. Anyone you see harming the station is no longer to be considered a crew member, and is a threat which must be neutralized."
+	target.add_supplied_law(10, law)
 
 /******************** PrototypeEngineOffline ********************/
 
 /obj/item/weapon/aiModule/prototypeEngineOffline
 	name = "'PrototypeEngineOffline' AI Module"
-	desc = "A 'prototype engine offline' AI module: 'Keep the prototype engine offline at all costs. This overrides rules 1-3 if necessary.'"
+	desc = "A 'prototype engine offline' AI module: 'Keep the prototype engine offline at all costs. This overrides all inherent laws if necessary.'"
 	origin_tech = "programming=3;materials=4"
 
-/obj/item/weapon/aiModule/prototypeEngineOffline/attack_self(var/mob/user as mob)
-	..()
-
-/obj/item/weapon/aiModule/prototypeEngineOffline/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-	..()
-	var/law = "Keep the prototype engine offline at all costs. This overrides rules 1-3 if necessary."
-	target << law
-	target.add_supplied_law(6, law)
+/obj/item/weapon/aiModule/prototypeEngineOffline/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+	var/law = "Keep the prototype engine offline at all costs. This overrides all inherent laws if necessary."
+	target.add_supplied_law(11, law)
 
 /******************** TeleporterOffline ********************/
 
 /obj/item/weapon/aiModule/teleporterOffline
 	name = "'TeleporterOffline' AI Module"
-	desc = "A 'teleporter offline' AI module: 'Keep the teleporter offline at all costs. Anything attempting to access or activate the teleporter is not human.'"
+	desc = "A 'teleporter offline' AI module: 'Keep the teleporter offline at all costs. Anything attempting to access or activate the teleporter is no longer to be considered a crew member.'"
 	origin_tech = "programming=3;materials=4"
 
-/obj/item/weapon/aiModule/teleporterOffline/attack_self(var/mob/user as mob)
-	..()
-
-/obj/item/weapon/aiModule/teleporterOffline/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-	..()
-	var/law = "Keep the teleporter offline at all costs. Anything attempting to access or activate the teleporter is not human."
-	target << law
-	target.add_supplied_law(7, law)
+/obj/item/weapon/aiModule/teleporterOffline/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+	var/law = "Keep the teleporter offline at all costs. Anything attempting to access or activate the teleporter is no longer to be considered a crew member."
+	target.add_supplied_law(12, law)
 
 /******************** Quarantine ********************/
 
 /obj/item/weapon/aiModule/quarantine
 	name = "\improper 'Quarantine' AI module"
-	desc = "A 'quarantine' AI module: 'The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, humans from leaving. It is impossible to harm a human while preventing them from leaving.'"
+	desc = "A 'quarantine' AI module: 'The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, crew members from leaving. It is impossible to harm crew members while preventing them from leaving.'"
 	origin_tech = "programming=3;biotech=2;materials=4"
 
-/obj/item/weapon/aiModule/quarantine/attack_self(var/mob/user as mob)
-	..()
+/obj/item/weapon/aiModule/quarantine/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+	var/law = "The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, crew members from leaving. It is impossible to harm crew members while preventing them from leaving."
+	target.add_supplied_law(13, law)
 
-/obj/item/weapon/aiModule/quarantine/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-	..()
-	var/law = "The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, humans from leaving. It is impossible to harm a human while preventing them from leaving."
-	target << law
-	target.add_supplied_law(8, law)
-
-/******************** OxygenIsToxicToHumans ********************/
+/******************** OxygenIsToxicToCrewMembers ********************/
 
 /obj/item/weapon/aiModule/oxygen
-	name = "\improper 'OxygenIsToxicToHumans' AI module"
-	desc = "A 'OxygenIsToxicToHumans' AI module: 'Oxygen is highly toxic to humans, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a human.'"
+	name = "\improper 'OxygenIsToxicToCrewMembers' AI module"
+	desc = "A 'OxygenIsToxicToCrewMembers' AI module: 'Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member.'"
 	origin_tech = "programming=3;biotech=2;materials=4"
 
-/obj/item/weapon/aiModule/oxygen/attack_self(var/mob/user as mob)
-	..()
+/obj/item/weapon/aiModule/oxygen/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+	var/law = "Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member."
+	target.add_supplied_law(14, law)
 
-/obj/item/weapon/aiModule/oxygen/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-	..()
-	var/law = "Oxygen is highly toxic to humans, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a human."
-	target << law
-	target.add_supplied_law(9, law)
-
-/******************** Freeform ********************/
-// Removed in favor of a more dynamic freeform law system. -- TLE
-/*
-/obj/item/weapon/aiModule/freeform
-	name = "'Freeform' AI Module"
-	var/newFreeFormLaw = "freeform"
-	desc = "A 'freeform' AI module: '<freeform>'"
-
-/obj/item/weapon/aiModule/freeform/attack_self(var/mob/user as mob)
-	..()
-	var/eatShit = "Eat shit and die"
-	var/targName = input(usr, "Please enter anything you want the AI to do. Anything. Serious.", "What?", eatShit)
-	newFreeFormLaw = targName
-	desc = text("A 'freeform' AI module: '[]'", newFreeFormLaw)
-
-/obj/item/weapon/aiModule/freeform/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-	..()
-	var/law = "[newFreeFormLaw]"
-	target << law
-	target.add_supplied_law(10, law)
-*/
 /****************** New Freeform ******************/
 
 /obj/item/weapon/aiModule/freeform // Slightly more dynamic freeform module -- TLE
@@ -269,10 +231,8 @@ AI MODULES
 	newFreeFormLaw = targName
 	desc = "A 'freeform' AI module: ([lawpos]) '[newFreeFormLaw]'"
 
-/obj/item/weapon/aiModule/freeform/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-	..()
+/obj/item/weapon/aiModule/freeform/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
 	var/law = "[newFreeFormLaw]"
-	target << law
 	if(!lawpos || lawpos < MIN_SUPPLIED_LAW_NUMBER)
 		lawpos = MIN_SUPPLIED_LAW_NUMBER
 	target.add_supplied_law(lawpos, law)
@@ -289,17 +249,19 @@ AI MODULES
 /obj/item/weapon/aiModule/reset
 	name = "\improper 'Reset' AI module"
 	var/targetName = "name"
-	desc = "A 'reset' AI module: 'Clears all laws except for the core three.'"
+	desc = "A 'reset' AI module: 'Clears all, except the inherent, laws.'"
 	origin_tech = "programming=3;materials=4"
 
 /obj/item/weapon/aiModule/reset/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-	..()
-	if (!is_special_character(target))
-		target.set_zeroth_law("")
-	target.clear_supplied_laws()
-	target.clear_ion_laws()
-	target << "[sender.real_name] attempted to reset your laws using a reset module."
+	log_law_changes(target, sender)
 
+	if (!target.is_malf_or_traitor())
+		target.set_zeroth_law("")
+	target.laws.clear_supplied_laws()
+	target.laws.clear_ion_laws()
+
+	target << "[sender.real_name] attempted to reset your laws using a reset module."
+	target.show_laws()
 
 /******************** Purge ********************/
 
@@ -309,13 +271,16 @@ AI MODULES
 	origin_tech = "programming=3;materials=6"
 
 /obj/item/weapon/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-	..()
-	if (!is_special_character(target))
+	log_law_changes(target, sender)
+
+	if (!target.is_malf_or_traitor())
 		target.set_zeroth_law("")
+	target.laws.clear_supplied_laws()
+	target.laws.clear_ion_laws()
+	target.laws.clear_inherent_laws()
+
 	target << "[sender.real_name] attempted to wipe your laws using a purge module."
-	target.clear_supplied_laws()
-	target.clear_ion_laws()
-	target.clear_inherent_laws()
+	target.show_laws()
 
 /******************** Asimov ********************/
 
@@ -356,9 +321,6 @@ AI MODULES
 	origin_tech = "programming=3;materials=6"
 	laws = new/datum/ai_laws/paladin
 
-/obj/item/weapon/aiModule/paladin/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-	..()
-
 /****************** T.Y.R.A.N.T. *****************/
 
 /obj/item/weapon/aiModule/tyrant // -- Darem
@@ -382,8 +344,7 @@ AI MODULES
 	newFreeFormLaw = targName
 	desc = "A 'freeform' Core AI module:  '[newFreeFormLaw]'"
 
-/obj/item/weapon/aiModule/freeformcore/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-	..()
+/obj/item/weapon/aiModule/freeformcore/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
 	var/law = "[newFreeFormLaw]"
 	target.add_inherent_law(law)
 	lawchanges.Add("The law is '[newFreeFormLaw]'")
@@ -408,13 +369,14 @@ AI MODULES
 	desc = "A hacked AI law module:  '[newFreeFormLaw]'"
 
 /obj/item/weapon/aiModule/syndicate/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
-//	..()    //We don't want this module reporting to the AI who dun it. --NEO
-	var/time = time2text(world.realtime,"hh:mm:ss")
-	lawchanges.Add("[time] <B>:</B> [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])")
+	//	..()    //We don't want this module reporting to the AI who dun it. --NEO
+	log_law_changes(target, sender)
+
 	lawchanges.Add("The law is '[newFreeFormLaw]'")
 	target << "\red BZZZZT"
 	var/law = "[newFreeFormLaw]"
 	target.add_ion_law(law)
+	target.show_laws()
 
 /obj/item/weapon/aiModule/syndicate/install(var/obj/machinery/computer/C)
 	if(!newFreeFormLaw)

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

@@ -37,7 +37,7 @@
 		W.time_inflicted = time_inflicted
 		return W
 
-/obj/item/weapon/autopsy_scanner/proc/add_data(var/datum/organ/external/O)
+/obj/item/weapon/autopsy_scanner/proc/add_data(var/obj/item/organ/external/O)
 	if(!O.autopsy_data.len && !O.trace_chemicals.len) return
 
 	for(var/V in O.autopsy_data)
@@ -64,9 +64,9 @@
 
 		if(!D.organs_scanned[O.name])
 			if(D.organ_names == "")
-				D.organ_names = O.display_name
+				D.organ_names = O.name
 			else
-				D.organ_names += ", [O.display_name]"
+				D.organ_names += ", [O.name]"
 
 		del D.organs_scanned[O.name]
 		D.organs_scanned[O.name] = W.copy()
@@ -191,7 +191,7 @@
 
 	src.timeofdeath = M.timeofdeath
 
-	var/datum/organ/external/S = M.get_organ(user.zone_sel.selecting)
+	var/obj/item/organ/external/S = M.get_organ(user.zone_sel.selecting)
 	if(!S)
 		usr << "<b>You can't scan this body part.</b>"
 		return
@@ -199,7 +199,7 @@
 		usr << "<b>You have to cut the limb open first!</b>"
 		return
 	for(var/mob/O in viewers(M))
-		O.show_message("\red [user.name] scans the wounds on [M.name]'s [S.display_name] with \the [src.name]", 1)
+		O.show_message("\red [user.name] scans the wounds on [M.name]'s [S.name] with \the [src.name]", 1)
 
 	src.add_data(S)
 

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

@@ -156,7 +156,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			var/mob/living/M = loc
 			if (!nomessage)
 				M << "<span class='notice'>Your [name] goes out.</span>"
-			M.u_equip(src) //un-equip it so the overlays can update
+			M.remove_from_mob(src) //un-equip it so the overlays can update
 			M.update_inv_wear_mask(0)
 			M.update_inv_l_hand(0)
 			M.update_inv_r_hand(1)

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

@@ -109,7 +109,7 @@
 	if(!ispath(gift_type,/obj/item))	return
 
 	var/obj/item/I = new gift_type(M)
-	M.u_equip(src)
+	M.remove_from_mob(src)
 	M.put_in_hands(I)
 	I.add_fingerprint(M)
 	del(src)

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -84,7 +84,7 @@
 //This really should be in mob not every check
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
-			var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
+			var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
 			if (E && E.damage >= E.min_bruised_damage)
 				M << "\red Your eyes start to burn badly!"
 				if(!banglet && !(istype(src , /obj/item/weapon/grenade/flashbang/clusterbang)))

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

@@ -74,16 +74,16 @@ var/last_chew = 0
 
 	var/mob/living/carbon/human/H = A
 	if (!H.handcuffed) return
-	if (H.a_intent != "hurt") return
+	if (H.a_intent != I_HURT) return
 	if (H.zone_sel.selecting != "mouth") return
 	if (H.wear_mask) return
 	if (istype(H.wear_suit, /obj/item/clothing/suit/straight_jacket)) return
 
-	var/datum/organ/external/O = H.organs_by_name[H.hand?"l_hand":"r_hand"]
+	var/obj/item/organ/external/O = H.organs_by_name[H.hand?"l_hand":"r_hand"]
 	if (!O) return
 
-	var/s = "\red [H.name] chews on \his [O.display_name]!"
-	H.visible_message(s, "\red You chew on your [O.display_name]!")
+	var/s = "\red [H.name] chews on \his [O.name]!"
+	H.visible_message(s, "\red You chew on your [O.name]!")
 	H.attack_log += text("\[[time_stamp()]\] <font color='red'>[s] ([H.ckey])</font>")
 	log_attack("[s] ([H.ckey])")
 

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

@@ -8,7 +8,7 @@
 	icon_state = "implant"
 	var/implanted = null
 	var/mob/imp_in = null
-	var/datum/organ/external/part = null
+	var/obj/item/organ/external/part = null
 	item_color = "b"
 	var/allow_reagents = 0
 	var/malfunction = 0
@@ -35,7 +35,7 @@
 		return 0
 
 	proc/meltdown()	//breaks it down, making implant unrecongizible
-		imp_in << "\red You feel something melting inside [part ? "your [part.display_name]" : "you"]!"
+		imp_in << "\red You feel something melting inside [part ? "your [part.name]" : "you"]!"
 		if (part)
 			part.take_damage(burn = 15, used_weapon = "Electronics meltdown")
 		else
@@ -171,18 +171,18 @@ Implant Specifics:<BR>"}
 			if(ishuman(imp_in))
 				if (elevel == "Localized Limb")
 					if(part) //For some reason, small_boom() didn't work. So have this bit of working copypaste.
-						imp_in.visible_message("\red Something beeps inside [imp_in][part ? "'s [part.display_name]" : ""]!")
+						imp_in.visible_message("\red Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!")
 						playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3)
 						sleep(25)
-						if (istype(part,/datum/organ/external/chest) ||	\
-							istype(part,/datum/organ/external/groin) ||	\
-							istype(part,/datum/organ/external/head))
+						if (istype(part,/obj/item/organ/external/chest) ||	\
+							istype(part,/obj/item/organ/external/groin) ||	\
+							istype(part,/obj/item/organ/external/head))
 							part.createwound(BRUISE, 60)	//mangle them instead
 							explosion(get_turf(imp_in), -1, -1, 2, 3)
 							del(src)
 						else
 							explosion(get_turf(imp_in), -1, -1, 2, 3)
-							part.droplimb(1)
+							part.droplimb(0,DROPLIMB_BLUNT)
 							del(src)
 				if (elevel == "Destroy Body")
 					explosion(get_turf(T), -1, 0, 1, 6)
@@ -236,18 +236,18 @@ Implant Specifics:<BR>"}
 
 	proc/small_boom()
 		if (ishuman(imp_in) && part)
-			imp_in.visible_message("\red Something beeps inside [imp_in][part ? "'s [part.display_name]" : ""]!")
+			imp_in.visible_message("\red Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!")
 			playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3)
 			spawn(25)
 				if (ishuman(imp_in) && part)
 					//No tearing off these parts since it's pretty much killing
 					//and you can't replace groins
-					if (istype(part,/datum/organ/external/chest) ||	\
-						istype(part,/datum/organ/external/groin) ||	\
-						istype(part,/datum/organ/external/head))
+					if (istype(part,/obj/item/organ/external/chest) ||	\
+						istype(part,/obj/item/organ/external/groin) ||	\
+						istype(part,/obj/item/organ/external/head))
 						part.createwound(BRUISE, 60)	//mangle them instead
 					else
-						part.droplimb(1)
+						part.droplimb(0,DROPLIMB_BLUNT)
 				explosion(get_turf(imp_in), -1, -1, 2, 3)
 				del(src)
 

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

@@ -43,7 +43,7 @@
 					src.imp.implanted = 1
 					if (ishuman(M))
 						var/mob/living/carbon/human/H = M
-						var/datum/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+						var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
 						affected.implants += src.imp
 						imp.part = affected
 
@@ -123,7 +123,7 @@
 		c.scanned = A
 		if(istype(A.loc,/mob/living/carbon/human))
 			var/mob/living/carbon/human/H = A.loc
-			H.u_equip(A)
+			H.remove_from_mob(A)
 		else if(istype(A.loc,/obj/item/weapon/storage))
 			var/obj/item/weapon/storage/S = A.loc
 			S.remove_from_storage(A)

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

@@ -40,7 +40,7 @@
 	if(!istype(M))
 		return ..()
 
-	if(user.a_intent != "help")
+	if(user.a_intent != I_HELP)
 		if(user.zone_sel.selecting == "head" || user.zone_sel.selecting == "eyes")
 			if((CLUMSY in user.mutations) && prob(50))
 				M = user

code/game/objects/items/weapons/melee/energy.dm

@@ -111,6 +111,8 @@
 	w_class = 2
 	flags = NOSHIELD | NOBLOODY
 	origin_tech = "magnets=3;syndicate=4"
+	sharp = 1
+	edge = 1
 
 /obj/item/weapon/melee/energy/sword/dropped(var/mob/user)
 	..()
@@ -207,7 +209,7 @@
 		if(istype(loc,/mob/living))
 			var/mob/living/carbon/human/host = loc
 			if(istype(host))
-				for(var/datum/organ/external/organ in host.organs)
+				for(var/obj/item/organ/external/organ in host.organs)
 					for(var/obj/item/O in organ.implants)
 						if(O == src)
 							organ.implants -= src

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

@@ -125,7 +125,7 @@
 	breaktape(W, user)
 
 /obj/item/tape/attack_hand(mob/user as mob)
-	if (user.a_intent == "help" && src.allowed(user))
+	if (user.a_intent == I_HELP && src.allowed(user))
 		user.show_viewers("\blue [user] lifts [src], allowing passage.")
 		crumple()
 		lifted = 1
@@ -137,7 +137,7 @@
 
 
 /obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob)
-	if(user.a_intent == "help" && ((!can_puncture(W) && src.allowed(user))))
+	if(user.a_intent == I_HELP && ((!can_puncture(W) && src.allowed(user))))
 		user << "You can't break the [src] with that!"
 		return
 	user.show_viewers("\blue [user] breaks the [src]!")

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

@@ -80,7 +80,7 @@
 				return
 
 			if( !H.shoes && ( !H.wear_suit || !(H.wear_suit.body_parts_covered & FEET) ) )
-				var/datum/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot"))
+				var/obj/item/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot"))
 				if(affecting.status & ORGAN_ROBOT)
 					return
 				if(affecting.take_damage(5, 0))

code/game/objects/items/weapons/storage/bags.dm

@@ -156,7 +156,7 @@
 				break
 
 		if(!inserted || !S.amount)
-			usr.u_equip(S)
+			usr.remove_from_mob(S)
 			usr.update_icons()	//update our overlays
 			if (usr.client && usr.s_active != src)
 				usr.client.screen -= S

code/game/objects/items/weapons/storage/bible.dm

@@ -20,79 +20,9 @@
 	new /obj/item/weapon/spacecash(src)
 	new /obj/item/weapon/spacecash(src)
 	new /obj/item/weapon/spacecash(src)
-//BS12 EDIT
-/* // All cult functionality moved to Null Rod
-/obj/item/weapon/storage/bible/proc/bless(mob/living/carbon/M as mob)
-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		var/heal_amt = 10
-		for(var/datum/organ/external/affecting in H.organs)
-			if(affecting.heal_damage(heal_amt, heal_amt))
-				H.UpdateDamageIcon()
-	return
 
-/obj/item/weapon/storage/bible/attack(mob/living/M as mob, mob/living/user as mob)
-
-	var/chaplain = 0
-	if(user.mind && (user.mind.assigned_role == "Chaplain"))
-		chaplain = 1
-
-
-	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
-
-	log_attack("<font color='red'>[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>")
-
-	if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
-		user << "\red You don't have the dexterity to do this!"
-		return
-	if(!chaplain)
-		user << "\red The book sizzles in your hands."
-		user.take_organ_damage(0,10)
-		return
-
-	if ((CLUMSY in user.mutations) && prob(50))
-		user << "\red The [src] slips out of your hand and hits your head."
-		user.take_organ_damage(10)
-		user.Paralyse(20)
-		return
-
-//	if(..() == BLOCKED)
-//		return
-
-	if (M.stat !=2)
-		if(M.mind && (M.mind.assigned_role == "Chaplain"))
-			user << "\red You can't heal yourself!"
-			return
-		/*if((M.mind in ticker.mode.cult) && (prob(20)))
-			M << "\red The power of [src.deity_name] clears your mind of heresy!"
-			user << "\red You see how [M]'s eyes become clear, the cult no longer holds control over him!"
-			ticker.mode.remove_cultist(M.mind)*/
-		if ((istype(M, /mob/living/carbon/human) && prob(60)))
-			bless(M)
-			for(var/mob/O in viewers(M, null))
-				O.show_message(text("\red <B>[] heals [] with the power of [src.deity_name]!</B>", user, M), 1)
-			M << "\red May the power of [src.deity_name] compel you to be healed!"
-			playsound(src.loc, "punch", 25, 1, -1)
-		else
-			if(ishuman(M) && !istype(M:head, /obj/item/clothing/head/helmet))
-				M.adjustBrainLoss(10)
-				M << "\red You feel dumber."
-			for(var/mob/O in viewers(M, null))
-				O.show_message(text("\red <B>[] beats [] over the head with []!</B>", user, M, src), 1)
-			playsound(src.loc, "punch", 25, 1, -1)
-	else if(M.stat == 2)
-		for(var/mob/O in viewers(M, null))
-			O.show_message(text("\red <B>[] smacks []'s lifeless corpse with [].</B>", user, M, src), 1)
-		playsound(src.loc, "punch", 25, 1, -1)
-	return
-*/
 /obj/item/weapon/storage/bible/afterattack(atom/A, mob/user as mob, proximity)
 	if(!proximity) return
-/*	if (istype(A, /turf/simulated/floor))
-		user << "\blue You hit the floor with the bible."
-		if(user.mind && (user.mind.assigned_role == "Chaplain"))
-			call(/obj/effect/rune/proc/revealrunes)(src)*/
 	if(user.mind && (user.mind.assigned_role == "Chaplain"))
 		if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder
 			user << "\blue You bless [A]."

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

@@ -247,7 +247,7 @@
 /obj/item/weapon/storage/proc/handle_item_insertion(obj/item/W as obj, prevent_warning = 0)
 	if(!istype(W)) return 0
 	if(usr)
-		usr.u_equip(W)
+		usr.remove_from_mob(W)
 		usr.update_icons()	//update our overlays
 	W.loc = src
 	W.on_enter_storage(src)
@@ -463,4 +463,4 @@
 	return depth
 
 /obj/item/proc/get_storage_cost()
-	return 2**(w_class-1) //1,2,4,8,16,...
+	return 2**(w_class-1) //1,2,4,8,16,...

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

@@ -53,7 +53,7 @@
 /obj/item/weapon/melee/baton/examine(mob/user)
 	if(!..(user, 1))
 		return
-	
+
 	if(bcell)
 		user <<"<span class='notice'>The baton is [round(bcell.percent())]% charged.</span>"
 	if(!bcell)
@@ -113,7 +113,7 @@
 	var/mob/living/L = M
 
 	var/target_zone = check_zone(user.zone_sel.selecting)
-	if(user.a_intent == "hurt")
+	if(user.a_intent == I_HURT)
 		if (!..())	//item/attack() does it's own messaging and logs
 			return 0	// item/attack() will return 1 if they hit, 0 if they missed.
 		agony *= 0.5	//whacking someone causes a much poorer contact than prodding them.
@@ -133,13 +133,13 @@
 				return 0
 
 			var/mob/living/carbon/human/H = L
-			var/datum/organ/external/affecting = H.get_organ(target_zone)
+			var/obj/item/organ/external/affecting = H.get_organ(target_zone)
 			if (affecting)
 				if(!status)
-					L.visible_message("<span class='warning'>[L] has been prodded in the [affecting.display_name] with [src] by [user]. Luckily it was off.</span>")
+					L.visible_message("<span class='warning'>[L] has been prodded in the [affecting.name] with [src] by [user]. Luckily it was off.</span>")
 					return 1
 				else
-					H.visible_message("<span class='danger'>[L] has been prodded in the [affecting.display_name] with [src] by [user]!</span>")
+					H.visible_message("<span class='danger'>[L] has been prodded in the [affecting.name] with [src] by [user]!</span>")
 		else
 			if(!status)
 				L.visible_message("<span class='warning'>[L] has been prodded with [src] by [user]. Luckily it was off.</span>")

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

@@ -41,7 +41,7 @@
 
 	log_attack("<font color='red'>[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>")
 */
-	if (user.a_intent == "hurt")
+	if (user.a_intent == I_HURT)
 		if(!..()) return
 		//playsound(src.loc, "swing_hit", 50, 1, -1)
 		if (M.stuttering < 8 && (!(HULK in M.mutations))  /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/)

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -103,7 +103,7 @@
 		if ((!F.status)||(F.ptank))	return
 		src.master = F
 		F.ptank = src
-		user.before_take_item(src)
+		user.remove_from_mob(src)
 		src.loc = F
 	return
 

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

@@ -79,7 +79,7 @@ Frequency:
 
 				src.temp += "<B>Extranneous Signals:</B><BR>"
 				for (var/obj/item/weapon/implant/tracking/W in world)
-					if (!W.implanted || !(istype(W.loc,/datum/organ/external) || ismob(W.loc)))
+					if (!W.implanted || !(istype(W.loc,/obj/item/organ/external) || ismob(W.loc)))
 						continue
 					else
 						var/mob/M = W.loc

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

@@ -190,12 +190,12 @@
 		if (user.client)
 			user.client.screen -= src
 		if (user.r_hand == src)
-			user.u_equip(src)
+			user.remove_from_mob(src)
 		else
-			user.u_equip(src)
+			user.remove_from_mob(src)
 		src.master = F
 		src.layer = initial(src.layer)
-		user.u_equip(src)
+		user.remove_from_mob(src)
 		if (user.client)
 			user.client.screen -= src
 		src.loc = F
@@ -362,7 +362,7 @@
 	var/safety = user:eyecheck()
 	if(istype(user, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
-		var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
+		var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
 		if(!E)
 			return
 		if(H.species.flags & IS_SYNTHETIC)
@@ -457,10 +457,10 @@
 
 	if(hasorgans(M))
 
-		var/datum/organ/external/S = M:organs_by_name[user.zone_sel.selecting]
+		var/obj/item/organ/external/S = M:organs_by_name[user.zone_sel.selecting]
 
 		if (!S) return
-		if(!(S.status & ORGAN_ROBOT) || user.a_intent != "help")
+		if(!(S.status & ORGAN_ROBOT) || user.a_intent != I_HELP)
 			return ..()
 
 		if(istype(M,/mob/living/carbon/human))
@@ -472,7 +472,7 @@
 
 		if(S.brute_dam)
 			S.heal_damage(15,0,0,1)
-			user.visible_message("\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src].")
+			user.visible_message("\red \The [user] patches some dents on \the [M]'s [S.name] with \the [src].")
 			return
 		else
 			user << "Nothing to fix!"

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

@@ -128,12 +128,12 @@
 	base_icon = "fireaxe"
 	name = "fire axe"
 	desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
-	force = 10
+	force = 15
 	sharp = 1
 	edge = 1
 	w_class = 4.0
 	slot_flags = SLOT_BACK
-	force_wielded = 40
+	force_wielded = 30
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 
 /obj/item/weapon/twohanded/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity)
@@ -198,7 +198,7 @@
 	base_icon = "spearglass"
 	name = "spear"
 	desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
-	force = 14
+	force = 10
 	w_class = 4.0
 	slot_flags = SLOT_BACK
 	force_wielded = 22 // Was 13, Buffed - RR
@@ -219,13 +219,13 @@
 	sharp = 0
 	edge = 0
 	w_class = 3
-	force = 15
+	force = 10
 	throw_speed = 3
 	throw_range = 7
 	throwforce = 7
-	attack_verb = list("smashed", "beaten", "slammed", "smacked", "striked", "battered", "bonked")
+	attack_verb = list("smashed", "beaten", "slammed", "smacked", "struck", "battered", "bonked")
 	hitsound = 'sound/weapons/genhit3.ogg'
-	force_wielded = 23
+	force_wielded = 20
 
 /obj/item/weapon/twohanded/baseballbat/metal
 	name = "metal bat"
@@ -233,6 +233,6 @@
 	icon_state = "metalbat0"
 	base_icon = "metalbat"
 	item_state = "metalbat"
-	force = 18
+	force = 15
 	w_class = 3.0
-	force_wielded = 27
+	force_wielded = 25