Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298

code/modules/holodeck/HolodeckControl.dm

@@ -344,6 +344,7 @@
 
 	spawn(30)
 		for(var/obj/effect/landmark/L in linkedholodeck)
+			L.delete_me = 1
 			if(L.name=="Atmospheric Test Start")
 				spawn(20)
 					var/turf/T = get_turf(L)

code/modules/holodeck/HolodeckObjects.dm

@@ -278,6 +278,7 @@
 /obj/item/weapon/holo
 	damtype = HALLOSS
 	no_attack_log = 1
+	no_random_knockdown = TRUE
 
 /obj/item/weapon/holo/esword
 	desc = "May the force be within you. Sorta."