Merge branch 'dev' of https://github.com/ChaoticOnyx/OnyxBay into dev

ChaoticOnyx · Apr 18, 2020 · 0bb8161 · 0bb8161
2 parents 57d981c + a97ed61
commit 0bb8161
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/code/modules/VR/vr_gamepad.dm b/code/modules/VR/vr_gamepad.dm
@@ -177,9 +177,9 @@
 	..()
 
 /obj/machinery/gamepod/power_change()
-	if(powered())
-		return
-	move_outside()
+	. = ..()
+	if(occupant && (stat & NOPOWER))
+		move_outside()
 
 /obj/machinery/gamepod/Destroy()
 	if(occupant)

diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -144,7 +144,7 @@
 	return ..()
 
 /mob/living/simple_animal/mouse/Crossed(AM as mob|obj)
-	if(client && ishuman(AM) && !stat)
+	if(!client && ishuman(AM) && !stat)
 		var/mob/M = AM
 		to_chat(M, "<span class='warning'>\icon[src] Squeek!</span>")
 		playsound(loc, 'sound/effects/mousesqueek.ogg', 40)