Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13hassomanybugsitcountsasanecosystem

Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi

code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm

@@ -16,7 +16,7 @@
 	new /obj/item/device/analyzer/plant_analyzer(src)
 	new /obj/item/device/radio/headset/headset_srv(src)
 	new /obj/item/clothing/mask/bandana(src)
-	new /obj/item/weapon/minihoe(src)
+	new /obj/item/weapon/cultivator(src)
 	new /obj/item/weapon/hatchet(src)
 	new /obj/item/weapon/storage/backpack/botany(src)
 	new /obj/item/weapon/storage/backpack/botany(src)

code/game/objects/structures/crates_lockers/crates.dm

@@ -11,11 +11,11 @@
 	var/sound_effect_open = 'sound/machines/click.ogg'
 	var/sound_effect_close = 'sound/machines/click.ogg'
 	var/obj/item/weapon/paper/manifest/manifest
-	
+
 /obj/structure/closet/crate/New()
 	..()
 	update_icon()
-	
+
 
 /obj/structure/closet/crate/update_icon()
 	overlays.Cut()
@@ -111,7 +111,7 @@
 	..()
 	new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
 	new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
-	new /obj/item/weapon/minihoe(src)
+	new /obj/item/weapon/cultivator(src)
 
 /obj/structure/closet/crate/secure
 	desc = "A secure crate."
@@ -148,7 +148,7 @@
 	name = "secure hydroponics crate"
 	icon_crate = "hydrosecurecrate"
 	icon_state = "hydrosecurecrate"
-	
+
 /obj/structure/closet/crate/secure/update_icon()
 	..()
 	if(locked)
@@ -202,7 +202,7 @@
 		user.put_in_hands(manifest)
 	manifest = null
 	overlays-="manifest"
-	
+
 /obj/structure/closet/crate/attack_hand(mob/user as mob)
 	if(manifest)
 		tear_manifest(user)

code/game/objects/structures/girders.dm

@@ -30,7 +30,7 @@
 
 	else if(istype(W, /obj/item/weapon/wrench) && state == GIRDER_DISPLACED)
 		if (!istype(src.loc, /turf/simulated/floor))
-			usr << "<span class='warning'>A floor must be present to secure the girder!</span>"
+			user << "<span class='warning'>A floor must be present to secure the girder!</span>"
 			return
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
 		user << "<span class='notice'>You start securing the girder...</span>"
@@ -82,8 +82,14 @@
 			qdel(src)
 
 	else if(istype(W, /obj/item/stack/sheet))
+		if (istype(src.loc, /turf/simulated/wall))
+			user << "<span class='warning'>There is already a wall present!</span>"
+			return
 		if (!istype(src.loc, /turf/simulated/floor))
-			usr << "<span class='warning'>A floor must be present to build a false wall!</span>"
+			user << "<span class='warning'>A floor must be present to build a false wall!</span>"
+			return
+		if (locate(/obj/structure/falsewall) in src.loc.contents)
+			user << "<span class='warning'>There is already a false wall present!</span>"
 			return
 
 		var/obj/item/stack/sheet/S = W
@@ -190,7 +196,7 @@
 					qdel(src)
 				return
 
-		add_hiddenprint(usr)
+		add_hiddenprint(user)
 
 	else if(istype(W, /obj/item/pipe))
 		var/obj/item/pipe/P = W