Merge Conflict thingy

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

@@ -363,7 +363,7 @@ REAGENT SCANNER
 	return
 
 /obj/item/device/mass_spectrometer
-	desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."
+	desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample. Inject sample with syringe."
 	name = "mass-spectrometer"
 	icon_state = "spectrometer"
 	item_state = "analyzer"
@@ -377,7 +377,7 @@ REAGENT SCANNER
 	origin_tech = "magnets=2;biotech=1;plasmatech=2"
 	var/details = 0
 	var/datatoprint = ""
-	var/scanning = 1
+	var/scanning = TRUE
 	actions_types = list(/datum/action/item_action/print_report)
 
 /obj/item/device/mass_spectrometer/New()
@@ -400,8 +400,8 @@ REAGENT SCANNER
 		var/list/blood_traces = list()
 		for(var/datum/reagent/R in reagents.reagent_list)
 			if(R.id != "blood")
-				reagents.clear_reagents()
 				to_chat(user, "<span class='warning'>The sample was contaminated! Please insert another sample.</span>")
+				reagents.clear_reagents()
 				return
 			else
 				blood_traces = params2list(R.data["trace_chem"])
@@ -412,7 +412,9 @@ REAGENT SCANNER
 				dat += "[R] ([blood_traces[R]] units) "
 			else
 				dat += "[R] "
-		to_chat(user, "[dat]")
+		to_chat(user, "Analysis completed. Chemicals found: [dat]")
+		scanning = FALSE
+		datatoprint = dat
 		reagents.clear_reagents()
 	return
 
@@ -424,6 +426,7 @@ REAGENT SCANNER
 
 /obj/item/device/mass_spectrometer/proc/print_report()
 	if(!scanning)
+		scanning = TRUE
 		usr.visible_message("<span class='warning'>[src] rattles and prints out a sheet of paper.</span>")
 		playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
 		sleep(50)
@@ -437,7 +440,6 @@ REAGENT SCANNER
 			M.put_in_hands(P)
 			to_chat(M, "<span class='notice'>Report printed. Log cleared.<span>")
 			datatoprint = ""
-			scanning = 1
 	else
 		to_chat(usr, "<span class='notice'>[src] has no logs or is already in use.</span>")
 

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

@@ -1,10 +1,11 @@
 /**********************************************************************
 						Cyborg Spec Items
 ***********************************************************************/
-//Might want to move this into several files later but for now it works here
+/obj/item/borg
+	icon = 'icons/mob/robot_items.dmi'
+
 /obj/item/borg/stun
-	name = "electrified arm"
-	icon = 'icons/obj/items.dmi'
+	name = "electrically-charged arm"
 	icon_state = "elecarm"
 	var/charge_cost = 30
 
@@ -15,8 +16,9 @@
 			playsound(M, 'sound/weapons/Genhit.ogg', 50, 1)
 			return 0
 
-	if(!user.cell.use(charge_cost))
-		return
+	if(isrobot(user))
+		if(!user.cell.use(charge_cost))
+			return
 
 	user.do_attack_animation(M)
 	M.Weaken(5)
@@ -34,3 +36,198 @@
 	name = "Overdrive"
 	icon = 'icons/obj/decals.dmi'
 	icon_state = "shock"
+
+#define BORG_HUG 0
+#define BORG_HUG_SUPER 1
+#define BORG_HUG_SHOCK 2
+#define BORG_HUG_CRUSH 3
+
+/obj/item/borg/cyborghug
+	name = "Hugging Module"
+	icon_state = "hugmodule"
+	desc = "For when a someone really needs a hug."
+	var/mode = BORG_HUG //0 = Hugs 1 = "Hug" 2 = Shock 3 = CRUSH
+	var/ccooldown = 0
+	var/scooldown = 0
+	var/shockallowed = FALSE//Can it be a stunarm when emagged. Only PK borgs get this by default.
+	var/boop = FALSE
+
+/obj/item/borg/cyborghug/attack_self(mob/living/user)
+	if(isrobot(user))
+		var/mob/living/silicon/robot/P = user
+		if(P.emagged && shockallowed)
+			if(mode < BORG_HUG_CRUSH)
+				mode++
+			else
+				mode = BORG_HUG
+		else if(mode < BORG_HUG_SUPER)
+			mode++
+		else
+			mode = BORG_HUG
+	switch(mode)
+		if(BORG_HUG)
+			to_chat(user, "<span class='notice'>Power reset. Hugs!</span>")
+		if(BORG_HUG_SUPER)
+			to_chat(user, "<span class='notice'>Power increased!</span>")
+		if(BORG_HUG_SHOCK)
+			to_chat(user, "<span class='warning'>BZZT. Electrifying arms...</span>")
+		if(BORG_HUG_CRUSH)
+			to_chat(user, "<span class='warning'>ERROR: ARM ACTUATORS OVERLOADED.</span>")
+
+/obj/item/borg/cyborghug/attack(mob/living/M, mob/living/silicon/robot/user)
+	if(M == user)
+		return
+	switch(mode)
+		if(BORG_HUG)
+			if(M.health >= config.health_threshold_crit)
+				if(user.zone_sel.selecting == "head")
+					user.visible_message("<span class='notice'>[user] playfully boops [M] on the head!</span>", \
+									"<span class='notice'>You playfully boop [M] on the head!</span>")
+					user.do_attack_animation(M)
+					playsound(loc, 'sound/weapons/tap.ogg', 50, 1, -1)
+				else if(ishuman(M))
+					if(M.lying)
+						user.visible_message("<span class='notice'>[user] shakes [M] trying to get \him up!</span>", \
+										"<span class='notice'>You shake [M] trying to get \him up!</span>")
+					else
+						user.visible_message("<span class='notice'>[user] hugs [M] to make \him feel better!</span>", \
+								"<span class='notice'>You hug [M] to make \him feel better!</span>")
+					if(M.resting)
+						M.resting = FALSE
+						M.update_canmove()
+				else
+					user.visible_message("<span class='notice'>[user] pets [M]!</span>", \
+							"<span class='notice'>You pet [M]!</span>")
+				playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+		if(BORG_HUG_SUPER)
+			if(M.health >= config.health_threshold_crit)
+				if(ishuman(M))
+					if(M.lying)
+						user.visible_message("<span class='notice'>[user] shakes [M] trying to get \him up!</span>", \
+										"<span class='notice'>You shake [M] trying to get \him up!</span>")
+					else if(user.zone_sel.selecting == "head")
+						user.visible_message("<span class='warning'>[user] bops [M] on the head!</span>", \
+										"<span class='warning'>You bop [M] on the head!</span>")
+						user.do_attack_animation(M)
+					else
+						user.visible_message("<span class='warning'>[user] hugs [M] in a firm bear-hug! [M] looks uncomfortable...</span>", \
+								"<span class='warning'>You hug [M] firmly to make \him feel better! [M] looks uncomfortable...</span>")
+					if(M.resting)
+						M.resting = FALSE
+						M.update_canmove()
+				else
+					user.visible_message("<span class='warning'>[user] bops [M] on the head!</span>", \
+							"<span class='warning'>You bop [M] on the head!</span>")
+				playsound(loc, 'sound/weapons/tap.ogg', 50, 1, -1)
+		if(BORG_HUG_SHOCK)
+			if(!scooldown)
+				if(M.health >= config.health_threshold_crit)
+					if(ishuman(M))
+						M.electrocute_act(5, "[user]", safety = 1)
+						user.visible_message("<span class='userdanger'>[user] electrocutes [M] with their touch!</span>", \
+							"<span class='danger'>You electrocute [M] with your touch!</span>")
+						M.update_canmove()
+					else
+						if(!isrobot(M))
+							M.adjustFireLoss(10)
+							user.visible_message("<span class='userdanger'>[user] shocks [M]!</span>", \
+								"<span class='danger'>You shock [M]!</span>")
+						else
+							user.visible_message("<span class='userdanger'>[user] shocks [M]. It does not seem to have an effect</span>", \
+								"<span class='danger'>You shock [M] to no effect.</span>")
+					playsound(loc, 'sound/effects/sparks2.ogg', 50, 1, -1)
+					user.cell.charge -= 500
+					scooldown = TRUE
+					spawn(20)
+						scooldown = FALSE
+		if(BORG_HUG_CRUSH)
+			if(!ccooldown)
+				if(M.health >= config.health_threshold_crit)
+					if(ishuman(M))
+						user.visible_message("<span class='userdanger'>[user] crushes [M] in their grip!</span>", \
+							"<span class='danger'>You crush [M] in your grip!</span>")
+					else
+						user.visible_message("<span class='userdanger'>[user] crushes [M]!</span>", \
+								"<span class='danger'>You crush [M]!</span>")
+					playsound(loc, 'sound/weapons/smash.ogg', 50, 1, -1)
+					M.adjustBruteLoss(15)
+					user.cell.charge -= 300
+					ccooldown = TRUE
+					spawn(10)
+						ccooldown = FALSE
+
+#undef BORG_HUG
+#undef BORG_HUG_SUPER
+#undef BORG_HUG_SHOCK
+#undef BORG_HUG_CRUSH
+
+/obj/item/borg/cyborghug/peacekeeper
+	shockallowed = TRUE
+
+/obj/item/device/harmalarm
+	name = "Sonic Harm Prevention Tool"
+	desc = "Releases a harmless blast that confuses most organics. For when the harm is JUST TOO MUCH"
+	icon_state = "megaphone"
+	var/cooldown = 0
+	var/emagged = FALSE
+
+/obj/item/device/harmalarm/emag_act(mob/user)
+	emagged = !emagged
+	if(emagged)
+		to_chat(user, "<span class='warning'>You short out the safeties on the [src]!</span>")
+	else
+		to_chat(user, "<span class='warning'>You reset the safeties on the [src]!</span>")
+
+/obj/item/device/harmalarm/attack_self(mob/user)
+	var/safety = !emagged
+	if(cooldown > world.time)
+		to_chat(user, "<span class='warning'>The device is still recharging!</span>")
+		return
+
+	if(isrobot(user))
+		var/mob/living/silicon/robot/R = user
+		if(R.cell.charge < 1200)
+			to_chat(user, "<span class='warning'>You don't have enough charge to do this!</span>")
+			return
+		R.cell.charge -= 1000
+		if(R.emagged)
+			safety = FALSE
+
+	if(safety)
+		user.visible_message("<span class='danger'>[user] blares out a near-deafening siren from its speakers!</span>")
+		for(var/mob/living/carbon/M in get_mobs_in_view(9, user))
+			if(!M.check_ear_prot())
+				M.AdjustConfused(6)
+				to_chat(M, "<span class='userdanger'>The siren pierces your hearing!</span>")
+		audible_message("<span class='biggerdanger'>HUMAN HARM</span>")
+		playsound(get_turf(src), 'sound/AI/harmalarm.ogg', 70, 3)
+		cooldown = world.time + 200
+		log_game("[key_name(user)] used a Cyborg Harm Alarm in ([user.x],[user.y],[user.z])")
+		if(isrobot(user))
+			var/mob/living/silicon/robot/R = user
+			if(R.connected_ai)
+				to_chat(R.connected_ai, "<br><span class='notice'>NOTICE - Peacekeeping 'HARM ALARM' used by: [user]</span><br>")
+
+		return
+
+	user.audible_message("<span class='biggerdanger'>BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZT</span>")
+	for(var/mob/living/carbon/human/H in get_mobs_in_view(9, user))
+		if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs) || H.ear_deaf)
+			continue
+		var/earsafety = FALSE
+		if(H.check_ear_prot())
+			earsafety = TRUE
+
+		if(earsafety)
+			H.AdjustConfused(5)
+			H.AdjustStuttering(10)
+			H.Jitter(10)
+		else
+			H.Weaken(2)
+			H.AdjustConfused(10)
+			H.AdjustStuttering(15)
+			H.Jitter(25)
+
+	playsound(get_turf(src), 'sound/machines/warning-buzzer.ogg', 130, 3)
+	cooldown = world.time + 600
+	log_game("[key_name(user)] used an emagged Cyborg Harm Alarm in ([user.x],[user.y],[user.z])")

code/game/objects/items/toys.dm

@@ -1397,7 +1397,7 @@ obj/item/toy/cards/deck/syndicate/black
 			is_empty = 1
 			playsound(src, 'sound/weapons/Gunshot.ogg', 50, 1)
 			user.visible_message("<span class='danger'>The [src] goes off!</span>")
-			M.apply_damage(200, BRUTE, "head", sharp =1, used_weapon = "Self-inflicted gunshot would to the head.")
+			M.apply_damage(200, BRUTE, "head", sharp =1, used_weapon = "Self-inflicted gunshot wound to the head.")
 			M.death()
 	else
 		user.visible_message("<span class='danger'>[user] lowers the [src] from their head.</span>")

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

@@ -232,3 +232,76 @@ RSF
 				to_chat(user, "The RSF now holds [matter]/30 fabrication-units.")
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
+
+/obj/item/weapon/cookiesynth
+	name = "\improper Cookie Synthesizer"
+	desc = "A self-recharging device used to rapidly deploy cookies."
+	icon = 'icons/obj/tools.dmi'
+	icon_state = "rcd"
+	var/matter = 10
+	var/toxin = FALSE
+	var/cooldown = 0
+	var/cooldowndelay = 10
+	var/emagged = FALSE
+	w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/weapon/cookiesynth/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>It currently holds [matter]/10 cookie-units.</span>")
+
+/obj/item/weapon/cookiesynth/attackby()
+	return
+
+/obj/item/weapon/cookiesynth/emag_act(mob/user)
+	emagged = !emagged
+	if(emagged)
+		to_chat(user, "<span class='warning'>You short out [src]'s reagent safety checker!</span>")
+	else
+		to_chat(user, "<span class='warning'>You reset [src]'s reagent safety checker!</span>")
+		toxin = FALSE
+
+/obj/item/weapon/cookiesynth/attack_self(mob/user)
+	var/mob/living/silicon/robot/P = null
+	if(isrobot(user))
+		P = user
+	if(emagged && !toxin)
+		toxin = TRUE
+		to_chat(user, "<span class='warning'>Cookie Synthesizer Hacked.</span>")
+	else if(P.emagged && !toxin)
+		toxin = TRUE
+		to_chat(user, "<span class='warning'>Cookie Synthesizer Hacked.</span>")
+	else
+		toxin = FALSE
+		to_chat(user, "<span class='notice'>Cookie Synthesizer Reset.</span>")
+
+/obj/item/weapon/cookiesynth/process()
+	if(matter < 10)
+		matter++
+
+/obj/item/weapon/cookiesynth/afterattack(atom/A, mob/user, proximity)
+	if(cooldown > world.time)
+		return
+	if(!proximity)
+		return
+	if(!(istype(A, /obj/structure/table) || isfloorturf(A)))
+		return
+	if(matter < 1)
+		to_chat(user, "<span class='warning'>[src] doesn't have enough matter left. Wait for it to recharge!</span>")
+		return
+	if(isrobot(user))
+		var/mob/living/silicon/robot/R = user
+		if(!R.cell || R.cell.charge < 400)
+			to_chat(user, "<span class='warning'>You do not have enough power to use [src].</span>")
+			return
+	var/turf/T = get_turf(A)
+	playsound(loc, 'sound/machines/click.ogg', 10, 1)
+	to_chat(user, "Fabricating Cookie..")
+	var/obj/item/weapon/reagent_containers/food/snacks/cookie/S = new /obj/item/weapon/reagent_containers/food/snacks/cookie(T)
+	if(toxin)
+		S.reagents.add_reagent("pancuronium", 2.4)
+	if(isrobot(user))
+		var/mob/living/silicon/robot/R = user
+		R.cell.charge -= 100
+	else
+		matter--
+	cooldown = world.time + cooldowndelay

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

@@ -77,6 +77,10 @@
 /obj/item/weapon/defibrillator/ui_action_click()
 	toggle_paddles()
 
+/obj/item/weapon/defibrillator/CtrlClick()
+	if(ishuman(usr) && Adjacent(usr))
+		toggle_paddles()
+
 /obj/item/weapon/defibrillator/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/stock_parts/cell))
 		var/obj/item/weapon/stock_parts/cell/C = W

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

@@ -28,13 +28,14 @@
 	processing_objects.Remove(src)
 	return ..()
 
-/obj/item/weapon/stock_parts/cell/on_varedit(modified_var)
-	if(modified_var == "self_recharge")
-		if(self_recharge)
-			processing_objects.Add(src)
-		else
-			processing_objects.Remove(src)
-	..()
+/obj/item/weapon/stock_parts/cell/vv_edit_var(var_name, var_value)
+	switch(var_name)
+		if("self_recharge")
+			if(var_value)
+				processing_objects.Add(src)
+			else
+				processing_objects.Remove(src)
+	. = ..()
 
 /obj/item/weapon/stock_parts/cell/suicide_act(mob/user)
 	to_chat(viewers(user), "<span class='suicide'>[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.</span>")

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

@@ -39,7 +39,7 @@
 	throw_speed = 3
 	throw_range = 5
 	w_class = WEIGHT_CLASS_NORMAL
-	materials = list(MAT_METAL = 30000, MAT_GLASS = 5000)
+	materials = list(MAT_METAL = 75000, MAT_GLASS = 37500)
 	origin_tech = "engineering=4;materials=2"
 	var/datum/effect/system/spark_spread/spark_system
 	var/lastused

code/game/objects/objs.dm

@@ -310,4 +310,8 @@ a {
 			Item.fire_act() //Set them on fire, too
 
 /obj/proc/on_mob_move(dir, mob/user)
-	return
+	return
+
+/obj/vv_get_dropdown()
+	. = ..()
+	.["Delete all of type"] = "?_src_=vars;delall=[UID()]"

code/game/objects/structures/crates_lockers/closets.dm

@@ -8,6 +8,8 @@
 	var/icon_opened = "open"
 	var/opened = 0
 	var/welded = 0
+	var/locked = 0
+	var/broken = 0
 	var/wall_mounted = 0 //never solid (You can always pass over it)
 	var/health = 100
 	var/lastbang

code/game/objects/structures/crates_lockers/closets/fireaxe.dm

@@ -11,7 +11,7 @@
 	var/localopened = 0 //Setting this to keep it from behaviouring like a normal closet and obstructing movement in the map. -Agouri
 	opened = 1
 	var/hitstaken = 0
-	var/locked = 1
+	locked = 1
 	var/smashed = 0
 
 	attackby(var/obj/item/O as obj, var/mob/living/user as mob)  //Marker -Agouri

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -22,6 +22,28 @@
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/shoes/sandal/white(src)
 
+/obj/structure/closet/secure_closet/roboticist
+	name = "roboticist's locker"
+	req_access = list(access_robotics)
+	icon_state = "secureres1"
+	icon_closed = "secureres"
+	icon_locked = "secureres1"
+	icon_opened = "secureresopen"
+	icon_broken = "secureresbroken"
+	icon_off = "secureresoff"
+
+/obj/structure/closet/secure_closet/roboticist/New()
+	..()
+	new /obj/item/weapon/storage/backpack(src)
+	new /obj/item/weapon/storage/backpack(src)
+	new /obj/item/weapon/storage/backpack/satchel_norm(src)
+	new /obj/item/weapon/storage/backpack/satchel_norm(src)
+	new /obj/item/weapon/storage/backpack/duffel(src)
+	new /obj/item/weapon/storage/backpack/duffel(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/device/radio/headset/headset_sci(src)
+	new /obj/item/device/radio/headset/headset_sci(src)
 
 /obj/structure/closet/secure_closet/RD
 	name = "research director's locker"

code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm

@@ -5,8 +5,8 @@
 	icon_state = "secure1"
 	density = 1
 	opened = 0
-	var/locked = 1
-	var/broken = 0
+	locked = 1
+	broken = 0
 	var/large = 1
 	icon_closed = "secure"
 	var/icon_locked = "secure1"

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -310,14 +310,10 @@
 
 /obj/structure/closet/wardrobe/robotics_black/New()
 	..()
-	new /obj/item/clothing/glasses/hud/diagnostic(src)
-	new /obj/item/clothing/glasses/hud/diagnostic(src)
 	new /obj/item/clothing/under/rank/roboticist(src)
 	new /obj/item/clothing/under/rank/roboticist(src)
 	new /obj/item/clothing/under/rank/roboticist/skirt(src)
 	new /obj/item/clothing/under/rank/roboticist/skirt(src)
-	new /obj/item/clothing/suit/storage/labcoat(src)
-	new /obj/item/clothing/suit/storage/labcoat(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/gloves/fingerless(src)

code/game/objects/structures/crates_lockers/crates.dm

@@ -44,8 +44,10 @@
 				return 2
 
 	playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
-	for(var/obj/O in src)
-		O.forceMove(loc)
+	for(var/obj/O in src) //Objects
+		O.forceMove(loc)
+	for(var/mob/M in src) //Mobs
+		M.forceMove(loc)
 	icon_state = icon_opened
 	src.opened = 1
 
@@ -240,8 +242,8 @@
 	var/greenlight = "securecrateg"
 	var/sparks = "securecratesparks"
 	var/emag = "securecrateemag"
-	var/broken = 0
-	var/locked = 1
+	broken = 0
+	locked = 1
 	health = 1000
 
 /obj/structure/closet/crate/secure/update_icon()