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/bodybag.dm

@@ -77,14 +77,14 @@
 /obj/structure/closet/body_bag/MouseDrop(over_object, src_location, over_location)
 	..()
 	if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))
-		if(!ishuman(usr))	return
+		if(!ishuman(usr))	return 0
 		if(opened)	return 0
 		if(contents.len)	return 0
 		visible_message("[usr] folds up the [src.name]")
-		new item_path(get_turf(src))
+		var/folded = new item_path(get_turf(src))
 		spawn(0)
 			qdel(src)
-		return
+		return folded
 
 /obj/structure/closet/body_bag/relaymove(mob/user,direction)
 	if(src.loc != get_turf(src))
@@ -115,34 +115,43 @@
 
 /obj/item/bodybag/cryobag
 	name = "stasis bag"
-	desc = "A folded, non-reusable bag designed to prevent additional damage to an occupant, especially useful if short on time or in \
-	a hostile enviroment."
+	desc = "A non-reusable plastic bag designed to slow down bodily functions such as circulation and breathing, \
+	especially useful if short on time or in a hostile enviroment."
 	icon = 'icons/obj/cryobag.dmi'
 	icon_state = "bodybag_folded"
 	item_state = "bodybag_cryo_folded"
 	origin_tech = list(TECH_BIO = 4)
+	var/obj/item/weapon/reagent_containers/syringe/syringe
 
 /obj/item/bodybag/cryobag/attack_self(mob/user)
 	var/obj/structure/closet/body_bag/cryobag/R = new /obj/structure/closet/body_bag/cryobag(user.loc)
 	R.add_fingerprint(user)
+	if(syringe)
+		R.syringe = syringe
+		syringe = null
 	qdel(src)
 
 /obj/structure/closet/body_bag/cryobag
 	name = "stasis bag"
-	desc = "A non-reusable plastic bag designed to prevent additional damage to an occupant, especially useful if short on time or in \
-	a hostile enviroment."
+	desc = "A non-reusable plastic bag designed to slow down bodily functions such as circulation and breathing, \
+	especially useful if short on time or in a hostile enviroment."
 	icon = 'icons/obj/cryobag.dmi'
 	item_path = /obj/item/bodybag/cryobag
 	store_misc = 0
 	store_items = 0
 	var/used = 0
 	var/obj/item/weapon/tank/tank = null
+	var/stasis_level = 3 //Every 'this' life ticks are applied to the mob (when life_ticks%stasis_level == 1)
+	var/obj/item/weapon/reagent_containers/syringe/syringe
 
 /obj/structure/closet/body_bag/cryobag/New()
 	tank = new /obj/item/weapon/tank/emergency/oxygen(null) //It's in nullspace to prevent ejection when the bag is opened.
 	..()
 
 /obj/structure/closet/body_bag/cryobag/Destroy()
+	if(syringe)
+		qdel(syringe)
+		syringe = null
 	qdel(tank)
 	tank = null
 	..()
@@ -157,11 +166,19 @@
 		O.desc = "Pretty useless now.."
 		qdel(src)
 
+/obj/structure/closet/body_bag/cryobag/MouseDrop(over_object, src_location, over_location)
+	. = ..()
+	if(. && syringe)
+		var/obj/item/bodybag/cryobag/folded = .
+		folded.syringe = syringe
+		syringe = null
+
 /obj/structure/closet/body_bag/cryobag/Entered(atom/movable/AM)
 	if(ishuman(AM))
 		var/mob/living/carbon/human/H = AM
-		H.in_stasis = 1
+		H.Stasis(stasis_level)
 		src.used = 1
+		inject_occupant(H)
 
 	if(istype(AM, /obj/item/organ))
 		var/obj/item/organ/O = AM
@@ -173,7 +190,7 @@
 /obj/structure/closet/body_bag/cryobag/Exited(atom/movable/AM)
 	if(ishuman(AM))
 		var/mob/living/carbon/human/H = AM
-		H.in_stasis = 0
+		H.Stasis(0)
 
 	if(istype(AM, /obj/item/organ))
 		var/obj/item/organ/O = AM
@@ -187,10 +204,19 @@
 		return tank.air_contents
 	..()
 
+/obj/structure/closet/body_bag/cryobag/proc/inject_occupant(var/mob/living/carbon/human/H)
+	if(!syringe)
+		return
+
+	if(H.reagents)
+		syringe.reagents.trans_to_mob(H, 30, CHEM_BLOOD)
+
 /obj/structure/closet/body_bag/cryobag/examine(mob/user)
 	..()
 	if(Adjacent(user)) //The bag's rather thick and opaque from a distance.
 		user << "<span class='info'>You peer into \the [src].</span>"
+		if(syringe)
+			user << "<span class='info'>It has a syringe added to it.</span>"
 		for(var/mob/living/L in contents)
 			L.examine(user)
 
@@ -202,5 +228,28 @@
 			var/obj/item/device/healthanalyzer/analyzer = W
 			for(var/mob/living/L in contents)
 				analyzer.attack(L,user)
+
+		else if(istype(W,/obj/item/weapon/reagent_containers/syringe))
+			if(syringe)
+				to_chat(user,"<span class='warning'>\The [src] already has an injector! Remove it first.</span>")
+			else
+				var/obj/item/weapon/reagent_containers/syringe/syringe = W
+				to_chat(user,"<span class='info'>You insert \the [syringe] into \the [src], and it locks into place.</span>")
+				user.unEquip(syringe)
+				src.syringe = syringe
+				syringe.loc = null
+				for(var/mob/living/carbon/human/H in contents)
+					inject_occupant(H)
+					break
+
+		else if(istype(W,/obj/item/weapon/screwdriver))
+			if(syringe)
+				if(used)
+					to_chat(user,"<span class='warning'>The injector cannot be removed now that the stasis bag has been used!</span>")
+				else
+					syringe.forceMove(src.loc)
+					to_chat(user,"<span class='info'>You pry \the [syringe] out of \the [src].</span>")
+					syringe = null
+
 		else
 			..()

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

@@ -1105,6 +1105,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			if(M.stat == DEAD && M.client && (M.is_preference_enabled(/datum/client_preference/ghost_ears))) // src.client is so that ghosts don't have to listen to mice
 				if(istype(M, /mob/new_player))
 					continue
+				if(M.forbid_seeing_deadchat)
+					continue
 				M.show_message("<span class='game say'>PDA Message - <span class='name'>[owner]</span> -> <span class='name'>[P.owner]</span>: <span class='message'>[t]</span></span>")
 
 		if(!conversations.Find("\ref[P]"))

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

@@ -47,7 +47,7 @@
 		qdel(active_dummy)
 		active_dummy = null
 		usr << "<span class='notice'>You deactivate the [src].</span>"
-		var/obj/effect/overlay/T = PoolOrNew(/obj/effect/overlay, get_turf(src))
+		var/obj/effect/overlay/T = new /obj/effect/overlay(get_turf(src))
 		T.icon = 'icons/effects/effects.dmi'
 		flick("emppulse",T)
 		spawn(8) qdel(T)
@@ -55,7 +55,7 @@
 		playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
 		var/obj/O = new saved_item(src)
 		if(!O) return
-		var/obj/effect/dummy/chameleon/C = PoolOrNew(/obj/effect/dummy/chameleon, usr.loc)
+		var/obj/effect/dummy/chameleon/C = new /obj/effect/dummy/chameleon(usr.loc)
 		C.activate(O, usr, saved_icon, saved_icon_state, saved_overlays, src)
 		qdel(O)
 		usr << "<span class='notice'>You activate the [src].</span>"

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

@@ -212,6 +212,8 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	alert_called = 0
 	update_icon()
 	ui_interact(user)
+	if(video_source)
+		watch_video(user)
 
 // Proc: MouseDrop()
 //Same thing PDAs do
@@ -1041,7 +1043,8 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	if(!Adjacent(user) || !video_source) return
 	user.set_machine(video_source)
 	user.reset_view(video_source)
-	user << "<span class='notice'>Now viewing video session. To leave camera view: OOC -> Cancel Camera View</span>"
+	to_chat(user,"<span class='notice'>Now viewing video session. To leave camera view, close the communicator window OR: OOC -> Cancel Camera View</span>")
+	to_chat(user,"<span class='notice'>To return to an active video session, use the communicator in your hand.</span>")
 	spawn(0)
 		while(user.machine == video_source && (Adjacent(user) || loc == user))
 			var/turf/T = get_turf(video_source)

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

@@ -155,7 +155,7 @@
 	singular_name = "advanced trauma kit"
 	desc = "An advanced trauma kit for severe injuries."
 	icon_state = "traumakit"
-	heal_brute = 0
+	heal_brute = 5
 	origin_tech = list(TECH_BIO = 1)
 
 /obj/item/stack/medical/advanced/bruise_pack/attack(mob/living/carbon/M as mob, mob/user as mob)
@@ -213,7 +213,7 @@
 	singular_name = "advanced burn kit"
 	desc = "An advanced treatment kit for severe burns."
 	icon_state = "burnkit"
-	heal_burn = 0
+	heal_burn = 5
 	origin_tech = list(TECH_BIO = 1)
 
 

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
  */