Merge branch 'master' of https://github.com/Civ13/Civ13

Bierkraan · Jan 31, 2024 · e12e0dc · e12e0dc
2 parents ba4c2ed + 1a09fdf
commit e12e0dc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
@@ -152,14 +152,14 @@
 		return
 
 	if(using_object)
-		if(istype(using_object, /obj/item/weapon/gun/projectile/automatic/stationary) || using_object != A)
-			var/obj/item/weapon/gun/projectile/automatic/stationary/M = using_object
-			if (M.full_auto)
-				var/datum/firemode/F = M.firemodes[M.sel_mode]
+		if(istype(using_object, /obj/item/weapon/gun/projectile/automatic/stationary))
+			var/obj/item/weapon/gun/projectile/automatic/stationary/HMG = using_object
+			if (HMG.full_auto)
+				var/datum/firemode/F = HMG.firemodes[HMG.sel_mode]
 				spawn(F.burst_delay)
-					M.afterattack(A, src, FALSE, params)
+					HMG.afterattack(A, src, FALSE, params)
 			else
-				M.afterattack(A, src, FALSE, params)
+				HMG.afterattack(A, src, FALSE, params)
 			return TRUE
 
 	if (istype(A, /obj/structure/multiz/ladder/ww2)) // stop looking down a ladder 
@@ -549,9 +549,10 @@
 		if (!object.IsAutoclickable())
 			return
 	if (using_object)
-		var/obj/item/weapon/gun/projectile/automatic/stationary/HMG = using_object
-		if (HMG.used_by_mob == src)
-			return HMG.CanItemAutoclick(object, location, params)
+		if (istype(using_object, /obj/item/weapon/gun/projectile/automatic/stationary))
+			var/obj/item/weapon/gun/projectile/automatic/stationary/HMG = using_object
+			if (HMG.used_by_mob == src)
+				return HMG.CanItemAutoclick(object, location, params)
 	else
 		var/obj/item/H = get_active_hand()
 		if (H)

diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -63,7 +63,7 @@
 	set src in oview(1)
 
 	if (config.ghost_interaction)
-		set_dir(turn(dir, 90))
+		set_dir(turn(dir, -90))
 
 		return
 
@@ -75,7 +75,7 @@
 		if (usr.stat || usr.restrained())
 			return
 
-		set_dir(turn(dir, 90))
+		set_dir(turn(dir, -90))
 
 		return
 
@@ -85,7 +85,7 @@
 	set src in oview(1)
 
 	if (config.ghost_interaction)
-		set_dir(turn(dir, -90))
+		set_dir(turn(dir, 90))
 
 		return
 
@@ -97,7 +97,7 @@
 		if (usr.stat || usr.restrained())
 			return
 
-		set_dir(turn(dir, -90))
+		set_dir(turn(dir, 90))
 
 		return
 

diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
@@ -486,13 +486,13 @@
 	var/passthrough = TRUE //if the projectile should continue flying
 	var/passthrough_message = null
 
-	if (ismob(firer) && (istype(get_turf(firer), /turf/floor/trench) && firer.prone))
+	if (ismob(firer) && (istype(get_turf(firer), /turf/floor/trench) && firer.prone)) // If the firer is inside a trench and prone
 		if (!istype(T, /turf/floor/trench) && get_dist(T, firer) >= 3) // If the target is 3 tiles or more away block the shot
 			T.visible_message(SPAN_WARNING("The [name] hits the trench wall!"))
 			qdel(src)
 			return
-	if (ismob(firer) && !(istype(get_turf(firer), /turf/floor/trench)))
-		if (istype(T, /turf/floor/trench) &&  (firer.prone ? (get_dist(T, firer) >= 3) : (get_dist(T, firer) >= 6))) // If the shooter is lying down 
+	if (ismob(firer) && !(istype(get_turf(firer), /turf/floor/trench))) // If the firer is inside a trench
+		if (istype(T, /turf/floor/trench) && get_dist(T, firer) > 10) // If the shooter is more than 10 tiles away block the shot
 			T.visible_message(SPAN_WARNING("The [name] hits the trench wall!"))
 			qdel(src)
 			return