Merge branch 'master' into zefix

code/modules/surgery/organs/augments_internal.dm

@@ -8,17 +8,17 @@
 	var/implant_overlay
 	tough = 1 //not easyly broken by combat damage
 	sterile = 1 //not very germy
+	robotic = 2 // these are cybernetic after all
 
 /obj/item/organ/internal/cyberimp/New(var/mob/M = null)
-	if(iscarbon(M))
-		src.insert(M)
+	. = ..()
 	if(implant_overlay)
 		var/image/overlay = new /image(icon, implant_overlay)
 		overlay.color = implant_color
 		overlays |= overlay
-	return ..()
-
 
+/obj/item/organ/internal/cyberimp/emp_act()
+	return // These shouldn't be hurt by EMPs in the standard way
 
 //[[[[BRAIN]]]]
 
@@ -270,9 +270,15 @@
 	var/lasthand = null
 
 /obj/item/organ/internal/cyberimp/chest/arm_mod/ui_action_click()
+	toggle_item()
+
+/obj/item/organ/internal/cyberimp/chest/arm_mod/proc/toggle_item()
 	if(overloaded)//ensure the implant isn't broken
 		to_chat(owner, "<span class='warning'>The implant doesn't respond. It seems to be broken...</span>")
 		return
+	owner.changeNext_move(CLICK_CD_MELEE)
+	if(owner.next_move < world.time)
+		return // No spam
 	if(out)//check if the owner has the item out already
 		owner.unEquip(holder, 1)//if he does, take it away. then,
 		holder.loc = null//stash it in nullspace
@@ -297,6 +303,9 @@
 		holder.loc = null
 		out = 0
 		owner.visible_message("<span class='notice'>[holder] forcibly retracts into [owner]'s arm.</span>")
+	overload() // Make sure this doesn't happen again
+
+/obj/item/organ/internal/cyberimp/chest/arm_mod/proc/overload()
 	owner.visible_message("<span class='danger'>A loud bang comes from [owner]...</span>")
 	playsound(get_turf(owner), 'sound/effects/bang.ogg', 100, 1)
 	to_chat(owner, "<span class='warning'>You feel an explosion erupt inside you as your chest implant breaks. Is it hot in here?</span>")
@@ -312,7 +321,7 @@
 			limb.droplimb(0, DROPLIMB_EDGE)
 		owner.say("I HAVE BEEN DISARMED!!!")
 	owner.adjustFireLoss(25)//severely injure him!
-	overloaded = 1//then make sure this can't happen again by breaking the implant.
+	overloaded = TRUE
 
 /obj/item/organ/internal/cyberimp/chest/arm_mod/tase//mounted, self-charging taser!
 	name = "Arm-cannon taser implant"
@@ -322,6 +331,7 @@
 	actions_types = list(/datum/action/item_action/organ_action/toggle)
 
 /obj/item/organ/internal/cyberimp/chest/arm_mod/tase/New()//when the implant is created...
+	..()
 	holder = new /obj/item/weapon/gun/energy/gun/advtaser/mounted(src)//assign a brand new item to it. (in this case, a gun)
 
 /obj/item/organ/internal/cyberimp/chest/arm_mod/lase//mounted, self-charging laser!
@@ -332,8 +342,88 @@
 	actions_types = list(/datum/action/item_action/organ_action/toggle)
 
 /obj/item/organ/internal/cyberimp/chest/arm_mod/lase/New()
+	..()
 	holder = new /obj/item/weapon/gun/energy/laser/mounted(src)
 
+// lets make IPCs even *more* vulnerable to EMPs!
+/obj/item/organ/internal/cyberimp/chest/arm_mod/power_cord
+	name = "APC-compatible power adapter implant"
+	desc = "An implant commonly installed inside IPCs in order to allow them to easily collect energy from their environment"
+	origin_tech = "materials=3;biotech=2;powerstorage=3"
+	slot = "shoulders2"
+	actions_types = list(/datum/action/item_action/organ_action/toggle)
+
+
+/obj/item/organ/internal/cyberimp/chest/arm_mod/power_cord/New()
+	..()
+	holder = new /obj/item/apc_powercord(src)
+
+/obj/item/organ/internal/cyberimp/chest/arm_mod/power_cord/overload()
+	// To allow repair via nanopaste/screwdriver
+	// also so IPCs don't also catch on fire and fall even more apart upon EMP
+	damage = 1
+	overloaded = TRUE
+
+/obj/item/organ/internal/cyberimp/chest/arm_mod/power_cord/surgeryize()
+	if(overloaded && owner)
+		to_chat(owner, "<span class='notice'>Your [src] feels functional again.</span>")
+	overloaded = FALSE
+
+
+/obj/item/apc_powercord
+	name = "power cable"
+	desc = "Insert into a nearby APC to draw power from it."
+	icon = 'icons/obj/power.dmi'
+	icon_state = "wire1"
+	flags = NODROP | NOBLUDGEON
+
+/obj/item/apc_powercord/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+	if(!istype(target, /obj/machinery/power/apc) || !ishuman(user) || !proximity_flag)
+		return ..()
+	user.changeNext_move(CLICK_CD_MELEE)
+	var/obj/machinery/power/apc/A = target
+	var/mob/living/carbon/human/H = user
+	if(H.get_int_organ(/obj/item/organ/internal/cell))
+		if(A.emagged || A.stat & BROKEN)
+			var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+			s.set_up(3, 1, A)
+			s.start()
+			to_chat(H, "<span class='warning'>The APC power currents surge erratically, damaging your chassis!</span>")
+			H.adjustFireLoss(10,0)
+		else if(A.cell && A.cell.charge > 0)
+			if(H.nutrition >= NUTRITION_LEVEL_WELL_FED)
+				to_chat(user, "<span class='warning'>You are already fully charged!</span>")
+			else
+				addtimer(src, "powerdraw_loop", 0, TRUE, A, H)
+		else
+			to_chat(user, "<span class='warning'>There is no charge to draw from that APC.</span>")
+	else
+		to_chat(user, "<span class='warning'>You lack a cell in which to store charge!</span>")
+
+/obj/item/apc_powercord/proc/powerdraw_loop(obj/machinery/power/apc/A, mob/living/carbon/human/H)
+	H.visible_message("<span class='notice'>[H] inserts a power connector into \the [A].</span>", "<span class='notice'>You begin to draw power from \the [A].</span>")
+	while(do_after(H, 10, target = A))
+		if(loc != H)
+			to_chat(H, "<span class='warning'>You must keep your connector out while charging!</span>")
+			break
+		if(A.cell.charge == 0)
+			to_chat(H, "<span class='warning'>\The [A] has no more charge.</span>")
+			break
+		A.charging = 1
+		if(A.cell.charge >= 500)
+			H.nutrition += 50
+			A.cell.charge -= 500
+			to_chat(H, "<span class='notice'>You siphon off some of the stored charge for your own use.</span>")
+		else
+			H.nutrition += A.cell.charge/10
+			A.cell.charge = 0
+			to_chat(H, "<span class='notice'>You siphon off the last of \the [A]'s charge.</span>")
+			break
+		if(H.nutrition > NUTRITION_LEVEL_WELL_FED)
+			to_chat(H, "<span class='notice'>You are now fully charged.</span>")
+			break
+	H.visible_message("<span class='notice'>[H] unplugs from \the [A].</span>", "<span class='notice'>You unplug from \the [A].</span>")
+
 //BOX O' IMPLANTS
 
 /obj/item/weapon/storage/box/cyber_implants

code/modules/surgery/organs/autoimplanter.dm

@@ -4,6 +4,7 @@
 	icon_state = "autoimplanter"
 	item_state = "walkietalkie"//left as this so as to intentionally not have inhands
 	w_class = 2
+	usesound = 'sound/weapons/circsawhit.ogg'
 	var/obj/item/organ/internal/cyberimp/storedorgan
 
 /obj/item/device/autoimplanter/attack_self(mob/user)//when the object it used...
@@ -12,7 +13,7 @@
 		return
 	storedorgan.insert(user)//insert stored organ into the user
 	user.visible_message("<span class='notice'>[user] presses a button on [src], and you hear a short mechanical noise.</span>", "<span class='notice'>You feel a sharp sting as [src] plunges into your body.</span>")
-	playsound(get_turf(user), 'sound/weapons/circsawhit.ogg', 50, 1)
+	playsound(get_turf(user), usesound, 50, 1)
 	storedorgan = null
 
 /obj/item/device/autoimplanter/attackby(obj/item/I, mob/user, params)
@@ -32,4 +33,4 @@
 			storedorgan.forceMove(get_turf(user))
 			storedorgan = null
 			to_chat(user, "<span class='notice'>You remove the [storedorgan] from [src].</span>")
-			playsound(get_turf(user), 'sound/items/Screwdriver.ogg', 50, 1)
+			playsound(get_turf(user), I.usesound, 50, 1)

code/modules/surgery/organs/organ_internal.dm

@@ -11,9 +11,9 @@
 	var/non_primary = 0
 
 /obj/item/organ/internal/New(var/mob/living/carbon/holder)
+	..()
 	if(istype(holder))
 		insert(holder)
-	..()
 
 /obj/item/organ/internal/Destroy()
 	if(owner)
@@ -412,7 +412,8 @@
 	colourmatrix = null
 	dark_view = 2
 	..() //Make sure the organ's got the robotic status indicators before updating the client colour.
-	owner.update_client_colour(0) //Since both mechassisted and mechanical eyes give dark_view of 2 and full colour vision atm, just having this here is fine as mechassist() will call it anyway.
+	if(owner)
+		owner.update_client_colour(0) //Since both mechassisted and mechanical eyes give dark_view of 2 and full colour vision atm, just having this here is fine as mechassist() will call it anyway.
 
 /obj/item/organ/internal/mechassist()
 	..() //Go back, call robotize(), adjust the robotic status indicators and the organ damage parameters.

code/modules/surgery/robotics.dm

@@ -398,11 +398,16 @@
 			return
 		var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
+		var/found_damaged_organ = FALSE
 		for(var/obj/item/organ/internal/I in affected.internal_organs)
-			if(I && I.damage > 0)
-				if(I.robotic >= 2)
-					user.visible_message("[user] starts mending the damage to [target]'s [I.name]'s mechanisms.", \
-					"You start mending the damage to [target]'s [I.name]'s mechanisms." )
+			if(I && I.damage > 0 && I.robotic >= 2)
+				user.visible_message("[user] starts mending the damage to [target]'s [I.name]'s mechanisms.", \
+				"You start mending the damage to [target]'s [I.name]'s mechanisms.")
+				found_damaged_organ = TRUE
+
+		if(!found_damaged_organ)
+			to_chat(user, "There are no damaged components in [affected].")
+			return -1
 
 		target.custom_pain("The pain in your [affected.name] is living hell!",1)
 
@@ -425,6 +430,7 @@
 					user.visible_message("<span class='notice'> [user] repairs [target]'s [I.name] with [tool].</span>", \
 					"<span class='notice'> You repair [target]'s [I.name] with [tool].</span>" )
 					I.damage = 0
+					I.surgeryize()
 	else if(current_type == "insert")
 		var/obj/item/organ/internal/I = tool
 

code/modules/surgery/surgery.dm

@@ -109,13 +109,8 @@
 	if(implement_type)	//this means it isn't a require nd or any item step.
 		prob_chance = min(allowed_tools[implement_type], 100)
 	prob_chance *= get_location_modifier(target)
-
-	if(prob_chance > 100)//if we are using a super tool
-		time = time/prob_chance //PLACEHOLDER VALUES
 	
-	if(do_after(user, time, target = target))
-
-
+	if(do_after(user, time * tool.toolspeed, target = target))
 		if(prob(prob_chance) || isrobot(user))
 			if(end_step(user, target, target_zone, tool, surgery))
 				advance = 1

code/modules/surgery/tools.dm

@@ -89,6 +89,7 @@
 	item_state = "scalpel"
 	damtype = "fire"
 	hitsound = 'sound/weapons/sear.ogg'
+	toolspeed = 0.8
 
 /obj/item/weapon/scalpel/laser2
 	name = "laser scalpel"
@@ -97,6 +98,7 @@
 	item_state = "scalpel"
 	damtype = "fire"
 	hitsound = 'sound/weapons/sear.ogg'
+	toolspeed = 0.6
 
 /obj/item/weapon/scalpel/laser3
 	name = "laser scalpel"
@@ -105,6 +107,7 @@
 	item_state = "scalpel"
 	damtype = "fire"
 	hitsound = 'sound/weapons/sear.ogg'
+	toolspeed = 0.4
 
 /obj/item/weapon/scalpel/manager //super tool! Retractor/hemostat
 	name = "incision management system"
@@ -113,6 +116,7 @@
 	item_state = "scalpel"
 	damtype = "fire"
 	hitsound = 'sound/weapons/sear.ogg'
+	toolspeed = 0.2
 
 /obj/item/weapon/circular_saw
 	name = "circular saw"