Merge branch 'master' of github.com:Kashargul/VOREStation into usr-to-user-up-to-player_effects

code/game/objects/items/antag_spawners.dm

@@ -118,7 +118,6 @@
 	to speak with your team, and learn what their plan is for today."))
 
 	R.key = C.key
-//	R.Namepick() // Apparnetly making someone a merc lets them pick a name, so this isn't needed.
 
 	spawn(1)
 		mercs.add_antagonist(R.mind, FALSE, TRUE, FALSE, FALSE, FALSE)

code/game/objects/items/blueprints.dm

@@ -251,9 +251,9 @@
 			if (!isturf(NT) || (NT in found) || (NT in pending))
 				continue
 			// We ask ZAS to determine if its airtight.  Thats what matters anyway right?
-			if(air_master.air_blocked(T, NT))
+			if(SSair.air_blocked(T, NT))
 				// Okay thats the edge of the room
-				if(get_area_type(NT.loc) == AREA_SPACE && air_master.air_blocked(NT, NT))
+				if(get_area_type(NT.loc) == AREA_SPACE && SSair.air_blocked(NT, NT))
 					found += NT // So we include walls/doors not already in any area
 				continue
 			if (istype(NT, /turf/space))

code/game/objects/items/blueprints_vr.dm

@@ -678,9 +678,9 @@
 			if(!visual && forbiddenAreas[NT.loc.type])
 				return ROOM_ERR_FORBIDDEN
 			// We ask ZAS to determine if its airtight.  Thats what matters anyway right?
-			if(air_master.air_blocked(T, NT))
+			if(SSair.air_blocked(T, NT))
 				// Okay thats the edge of the room
-				if(get_area_type(NT.loc) == AREA_SPACE && air_master.air_blocked(NT, NT))
+				if(get_area_type(NT.loc) == AREA_SPACE && SSair.air_blocked(NT, NT))
 					found += NT // So we include walls/doors not already in any area
 				continue
 			if (istype(NT, /turf/space))
@@ -835,9 +835,9 @@
 				if(!get_new_area_type(NT.loc) == 1) //The contains somewhere that is NOT a buildable area.
 					return 3 //NOT A BUILDABLE AREA
 
-				if(air_master.air_blocked(T, NT)) //Is the room airtight?
+				if(SSair.air_blocked(T, NT)) //Is the room airtight?
 					// Okay thats the edge of the room
-					if(get_new_area_type(NT.loc) == 1 && air_master.air_blocked(NT, NT))
+					if(get_new_area_type(NT.loc) == 1 && SSair.air_blocked(NT, NT))
 						found += NT // So we include walls/doors not already in any area
 					continue
 				if (istype(NT, /turf/space))

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

@@ -102,7 +102,7 @@
 			if(D.visibility_flags & HIDDEN_SCANNER)
 				continue
 			else
-				dat += span_bold("Viral Infection") + " - Inform a Virologist or the Chief Medical Officer and administer antiviral chemicals such as Spaceacilin. Limit exposure to other personnel.<br>"
+				dat += span_bold("Viral Infection") + " - Inform a Virologist or the Chief Medical Officer and administer antiviral chemicals such as Spaceacillin. Limit exposure to other personnel.<br>"
 	if(robotparts)
 		dat += span_bold("Robotic body parts") + " - Should not be repaired by medical personnel, refer to robotics if damaged."
 

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

@@ -225,7 +225,6 @@
 
 			feedback_inc("cyborg_birth",1)
 			callHook("borgify", list(O))
-			O.namepick()
 
 			qdel(src)
 		else

code/game/objects/items/toys/toys_vr.dm

@@ -556,35 +556,6 @@
 /obj/item/toy/AI/proc/cooldownreset()
 	cooldown = 0
 
-/*
- * Hand buzzer
- */
-/obj/item/clothing/gloves/ring/buzzer/toy
-	name = "steel ring"
-	desc = "Torus shaped finger decoration. It has a small piece of metal on the palm-side."
-	icon_state = "seal-signet"
-	drop_sound = 'sound/items/drop/ring.ogg'
-
-/obj/item/clothing/gloves/ring/buzzer/toy/Touch(var/atom/A, var/proximity)
-	if(proximity && istype(usr, /mob/living/carbon/human))
-
-		return zap(usr, A, proximity)
-	return 0
-
-/obj/item/clothing/gloves/ring/buzzer/toy/zap(var/mob/living/carbon/human/user, var/atom/movable/target, var/proximity)
-	. = FALSE
-	if(user.a_intent == I_HELP && battery.percent() >= 50)
-		if(isliving(target))
-			var/mob/living/L = target
-
-			to_chat(L, span_warning("You feel a powerful shock!"))
-			if(!.)
-				playsound(L, 'sound/effects/sparks7.ogg', 40, 1)
-				L.electrocute_act(battery.percent() * 0, src)
-			return .
-
-	return 0
-
 /*
  * Toy cuffs
  */

code/game/objects/items/trash.dm

@@ -115,6 +115,12 @@
 	drop_sound = 'sound/items/drop/food.ogg'
 	pickup_sound = 'sound/items/pickup/food.ogg'
 
+/obj/item/trash/turkeybones
+	name = "turkey bones"
+	icon_state	= "turkeybones"
+	drop_sound = 'sound/items/drop/food.ogg'
+	pickup_sound = 'sound/items/pickup/food.ogg'
+
 /obj/item/trash/pistachios
 	name = "pistachios packet"
 	icon_state = "pistachios_pack"

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

@@ -65,8 +65,7 @@
 	var/light_glove_d = rand(2, 4)
 	var/no_glove_d = rand(4, 6)
 	var/list/forbidden_gloves = list(
-			/obj/item/clothing/gloves/sterile,
-			/obj/item/clothing/gloves/knuckledusters
+			/obj/item/clothing/gloves/sterile
 		)
 
 	if(src == user.l_hand)

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

@@ -141,7 +141,7 @@
 		to_chat(user, span_notice("\the [src] is too full to possibly fit anything else inside of it."))
 		return
 
-	if (istype(W, /obj/item/ore))
+	if (istype(W, /obj/item/ore) && !istype(W, /obj/item/ore/slag))
 		var/obj/item/ore/ore = W
 		stored_ore[ore.material]++
 		current_capacity++
@@ -178,6 +178,8 @@
 		if(current_pickup >= max_pickup)
 			max_pickup_reached = 1
 			break
+		if(istype(O, /obj/item/ore/slag))
+			continue
 		var/obj/item/ore/ore = O
 		stored_ore[ore.material]++
 		current_capacity++

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

@@ -71,6 +71,7 @@
 
 /obj/item/storage/firstaid/surgery
 	can_hold = list(
+		/obj/item/surgical/bone_clamp,
 		/obj/item/surgical/bonesetter,
 		/obj/item/surgical/cautery,
 		/obj/item/surgical/circular_saw,