Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme

code/modules/paperwork/photography.dm

@@ -33,11 +33,14 @@ var/global/photo_count = 0
 	var/icon/img	//Big photo image
 	var/scribble	//Scribble on the back.
 	var/icon/tiny
+	var/cursed = 0
 	var/photo_size = 3
 
 /obj/item/weapon/photo/New()
 	id = photo_count++
 
+
+
 /obj/item/weapon/photo/attack_self(mob/user as mob)
 	user.examinate(src)
 
@@ -233,6 +236,11 @@ var/global/photo_count = 0
 			mob_detail = "You can see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]. "
 		else
 			mob_detail += "You can also see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]."
+
+	for(var/mob/living/simple_animal/hostile/statue/S in the_turf)
+		if(S)
+		 mob_detail +=	"You can see \a [S] on the photo. Its stare makes you feel uneasy." //"That which holds the image of an angel, becomes itself an angel."
+
 	return mob_detail
 
 /obj/item/device/camera/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
@@ -274,7 +282,21 @@ var/global/photo_count = 0
 		y_c--
 		x_c = x_c - size
 
+
+
+
 	var/obj/item/weapon/photo/p = createpicture(target, user, turfs, mobs, flag)
+	if(findtext(mobs, "Its stare makes you feel uneasy"))
+		p.cursed = 1
+		user.visible_message("<span class='userdanger'>Something starts to slowly manifest from the picture!</span>")
+		spawn(150)
+			var/turf/T = get_turf(p)
+			var/mob/living/simple_animal/hostile/statue/S = new /mob/living/simple_animal/hostile/statue/(T)
+			S.banishable = 1//At least you can get rid of those bastards
+			T.visible_message("<span class='userdanger'>The photo turns into \a [S]!</span>")
+			qdel(p)
+
+
 	printpicture(user, p)
 
 /obj/item/device/camera/proc/createpicture(atom/target, mob/user, list/turfs, mobs, flag)
@@ -298,7 +320,6 @@ var/global/photo_count = 0
 	p.pixel_x = rand(-10, 10)
 	p.pixel_y = rand(-10, 10)
 	p.photo_size = size
-
 	return p
 
 /obj/item/device/camera/proc/printpicture(mob/user, obj/item/weapon/photo/p)
@@ -318,6 +339,16 @@ var/global/photo_count = 0
 	p.pixel_y = pixel_y
 	p.photo_size = photo_size
 	p.scribble = scribble
+	p.cursed = cursed
+	if(p.cursed)
+		var/turf/T = get_turf(p)
+		T.visible_message("<span class='userdanger'>Something starts to slowly manifest from the picture!</span>")
+		spawn(150)
+			T = get_turf(p) //second time, because the photo could've moved
+			var/mob/living/simple_animal/hostile/statue/S = new /mob/living/simple_animal/hostile/statue/(T)
+			S.banishable = 1//At least you can get rid of those bastards
+			T.visible_message("<span class='userdanger'>The photo turns into \a [S]!</span>")
+			qdel(p)
 
 	if(copy_id)
 		p.id = id