Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme

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

@@ -1,59 +0,0 @@
-/obj/item/weapon/dice
-	name = "d6"
-	desc = "A dice with six sides."
-	icon = 'icons/obj/dice.dmi'
-	icon_state = "d66"
-	w_class = ITEMSIZE_TINY
-	var/sides = 6
-	attack_verb = list("diced")
-
-/obj/item/weapon/dice/New()
-	icon_state = "[name][rand(1,sides)]"
-
-/obj/item/weapon/dice/d4
-	name = "d4"
-	desc = "A dice with four sides."
-	icon_state = "d44"
-	sides = 4
-
-/obj/item/weapon/dice/d8
-	name = "d8"
-	desc = "A dice with eight sides."
-	icon_state = "d88"
-	sides = 8
-
-/obj/item/weapon/dice/d10
-	name = "d10"
-	desc = "A dice with ten sides."
-	icon_state = "d1010"
-	sides = 10
-
-/obj/item/weapon/dice/d12
-	name = "d12"
-	desc = "A dice with twelve sides."
-	icon_state = "d1212"
-	sides = 12
-
-/obj/item/weapon/dice/d20
-	name = "d20"
-	desc = "A dice with twenty sides."
-	icon_state = "d2020"
-	sides = 20
-
-/obj/item/weapon/dice/d100
-	name = "d100"
-	desc = "A dice with ten sides. This one is for the tens digit."
-	icon_state = "d10010"
-	sides = 10
-
-/obj/item/weapon/dice/attack_self(mob/user as mob)
-	var/result = rand(1, sides)
-	var/comment = ""
-	if(sides == 20 && result == 20)
-		comment = "Nat 20!"
-	else if(sides == 20 && result == 1)
-		comment = "Ouch, bad luck."
-	icon_state = "[name][result]"
-	user.visible_message("<span class='notice'>[user] has thrown [src]. It lands on [result]. [comment]</span>", \
-						 "<span class='notice'>You throw [src]. It lands on a [result]. [comment]</span>", \
-						 "<span class='notice'>You hear [src] landing on a [result]. [comment]</span>")

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

@@ -107,7 +107,7 @@
 			spawn(0)
 				if(!src || !reagents.total_volume) return
 
-				var/obj/effect/effect/water/W = PoolOrNew(/obj/effect/effect/water, get_turf(src))
+				var/obj/effect/effect/water/W = new /obj/effect/effect/water(get_turf(src))
 				var/turf/my_target
 				if(a <= the_targets.len)
 					my_target = the_targets[a]

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

@@ -86,7 +86,7 @@
 		if(ptank)
 			ptank.loc = T
 			ptank = null
-		PoolOrNew(/obj/item/stack/rods, T)
+		new /obj/item/stack/rods(T)
 		qdel(src)
 		return
 

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

@@ -12,7 +12,7 @@
 
 /obj/item/weapon/grenade/smokebomb/New()
 	..()
-	src.smoke = PoolOrNew(/datum/effect/effect/system/smoke_spread/bad)
+	src.smoke = new /datum/effect/effect/system/smoke_spread/bad()
 	src.smoke.attach(src)
 
 /obj/item/weapon/grenade/smokebomb/Destroy()

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

@@ -41,6 +41,8 @@
 			user << "<span class='danger'>You need to have a firm grip on [C] before you can put \the [src] on!</span>"
 
 /obj/item/weapon/handcuffs/proc/can_place(var/mob/target, var/mob/user)
+	if(user == target)
+		return 1
 	if(istype(user, /mob/living/silicon/robot))
 		if(user.Adjacent(target))
 			return 1

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

@@ -130,7 +130,7 @@
 	. = ..()
 
 	if(.)
-		var/datum/effect/effect/system/spark_spread/spark_system = PoolOrNew(/datum/effect/effect/system/spark_spread)
+		var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
 		spark_system.set_up(5, 0, user.loc)
 		spark_system.start()
 		playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)

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

@@ -126,7 +126,7 @@
 	new /obj/item/weapon/storage/pill_bottle/dylovene(src)
 	new /obj/item/weapon/storage/pill_bottle/tramadol(src)
 	new /obj/item/weapon/storage/pill_bottle/spaceacillin(src)
-	new /obj/item/weapon/reagent_containers/hypospray/autoinjector/clotting(src)
+	new /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting(src)
 	new /obj/item/stack/medical/splint(src)
 	return
 
@@ -161,7 +161,7 @@
 	if (empty)
 		return
 	for(var/i = 1 to 8)
-		new /obj/item/weapon/reagent_containers/hypospray/autoinjector/clotting(src)
+		new /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting(src)
 	return
 
 /*

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

@@ -1,30 +1,3 @@
-/obj/item/weapon/storage/pill_bottle/dice	//7d6
-	name = "bag of dice"
-	desc = "It's a small bag with dice inside."
-	icon = 'icons/obj/dice.dmi'
-	icon_state = "dicebag"
-
-/obj/item/weapon/storage/pill_bottle/dice/New()
-	..()
-	for(var/i = 1 to 7)
-		new /obj/item/weapon/dice( src )
-
-/obj/item/weapon/storage/pill_bottle/dice_nerd	//DnD dice
-	name = "bag of gaming dice"
-	desc = "It's a small bag with gaming dice inside."
-	icon = 'icons/obj/dice.dmi'
-	icon_state = "magicdicebag"
-
-/obj/item/weapon/storage/pill_bottle/dice_nerd/New()
-	..()
-	new /obj/item/weapon/dice/d4( src )
-	new /obj/item/weapon/dice( src )
-	new /obj/item/weapon/dice/d8( src )
-	new /obj/item/weapon/dice/d10( src )
-	new /obj/item/weapon/dice/d12( src )
-	new /obj/item/weapon/dice/d20( src )
-	new /obj/item/weapon/dice/d100( src )
-
 /*
  * Donut Box
  */