Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme

code/modules/paperwork/filingcabinet.dm

@@ -25,7 +25,7 @@
 	icon_state = "tallcabinet"
 
 
-/obj/structure/filingcabinet/initialize()
+/obj/structure/filingcabinet/Initialize()
 	for(var/obj/item/I in loc)
 		if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/folder) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/paper_bundle))
 			I.loc = src

code/modules/paperwork/paperbin.dm

@@ -19,7 +19,7 @@
 
 /obj/item/weapon/paper_bin/MouseDrop(mob/user as mob)
 	if((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr))))))
-		if(!istype(usr, /mob/living/simple_animal))
+		if(!istype(usr, /mob/living/simple_mob))
 			if( !usr.get_active_hand() )		//if active hand is empty
 				var/mob/living/carbon/human/H = user
 				var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]

code/modules/paperwork/papershredder.dm

@@ -137,7 +137,7 @@
 	else
 		icon_state = "shredder-off"
 	// Fullness overlay
-	overlays += "shredder-[max(0,min(5,Floor(paperamount/max_paper*5)))]"
+	overlays += "shredder-[max(0,min(5,FLOOR(paperamount/max_paper*5, 1)))]"
 	if (panel_open)
 		overlays += "panel_open"
 

code/modules/paperwork/photography.dm

@@ -33,7 +33,6 @@ 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()
@@ -125,7 +124,6 @@ var/global/photo_count = 0
 	icon_state = "camera"
 	item_state = "camera"
 	w_class = ITEMSIZE_SMALL
-	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
 	var/pictures_max = 10
@@ -237,10 +235,6 @@ var/global/photo_count = 0
 		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)
@@ -282,20 +276,7 @@ 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)
 
@@ -339,16 +320,6 @@ 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