diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm
index 15dcae7330b..8697662ed09 100644
--- a/code/game/objects/structures/fence.dm
+++ b/code/game/objects/structures/fence.dm
@@ -128,25 +128,14 @@
return TRUE
/obj/structure/fence/door/proc/toggle(mob/user)
- switch(open)
- if(FALSE)
- visible_message("\The [user] opens \the [src].")
- open = TRUE
- if(TRUE)
- visible_message("\The [user] closes \the [src].")
- open = FALSE
-
+ open = !open
+ visible_message("\The [user] [open ? "opens" : "closes"] \the [src].")
update_door_status()
playsound(src, 'sound/machines/click.ogg', 100, TRUE)
/obj/structure/fence/door/proc/update_door_status()
- switch(open)
- if(FALSE)
- density = TRUE
- icon_state = "door_closed"
- if(TRUE)
- density = FALSE
- icon_state = "door_opened"
+ density = !density
+ icon_state = density ? "door_closed" : "door_opened"
/obj/structure/fence/door/proc/can_open(mob/user)
return TRUE
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index b8dc3690005..7d507583397 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -221,7 +221,7 @@
if(check_botched(user))
return
- var/obj/item/bodypart/other_hand = user.has_hand_for_held_index(user.get_inactive_hand_index()) //returns non-disabled inactive hands
+ var/obj/item/bodypart/other_hand = user.has_hand_for_held_index(user.get_inactive_hand_index()) //returns non-disabled inactive hands
if(weapon_weight == WEAPON_HEAVY && (user.get_inactive_held_item() || !other_hand))
to_chat(user, "You need two hands to fire \the [src]!")
return
@@ -593,13 +593,10 @@
if(!user || !user.client)
return
- switch(forced_zoom)
- if(FALSE)
- zoomed = FALSE
- if(TRUE)
- zoomed = TRUE
- else
- zoomed = !zoomed
+ if(isnull(forced_zoom))
+ zoomed = !zoomed
+ else
+ zoomed = forced_zoom
if(zoomed)
var/_x = 0