Merge pull request Civ13#2603 from Bierkraan/working-branch

Fix hotkeys being broken
Bierkraan · Jan 31, 2024 · e632596 · e632596
2 parents c006331 + 51a1879
commit e632596
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/code/game/mob/living/carbon/human/human.dm b/code/game/mob/living/carbon/human/human.dm
@@ -1074,7 +1074,7 @@ var/list/coefflist = list()
 		reagents.add_reagent("adrenaline", amount)
 
 /mob/living/human/proc/using_look() //May not be nessecary
-	if(using_object)
+	if(using_object && istype(using_object, /obj/item/weapon/gun/projectile/automatic/stationary))
 		return TRUE
 	if(stat == CONSCIOUS)
 		if (client && actions.len)
@@ -1135,7 +1135,7 @@ var/list/coefflist = list()
 	var/obj/item/weapon/attachment/scope/adjustable/W = null
 	var/obj/item/weapon/gun/G = null
 	var/obj/item/weapon/gun/projectile/automatic/stationary/S = null
-	if(user.using_object)
+	if(user.using_object && istype(user.using_object, /obj/item/weapon/gun/projectile/automatic/stationary))
 		S = user.using_object
 		look_amount = S.zoom_amount
 	else if(istype(get_active_hand(), /obj/item/weapon/attachment/scope/adjustable))

diff --git a/config/host.txt b/config/host.txt
@@ -1 +1 @@
-taislin
+taislin
diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi
diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi