Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

code/game/objects/effects/misc.dm

@@ -55,13 +55,6 @@
 	anchored = 1.0
 	unacidable = 1
 
-/obj/effect/stop
-	var/victim = null
-	icon_state = "empty"
-	name = "Geas"
-	desc = "You can't resist."
-	// name = ""
-
 /obj/effect/projection
 	name = "Projection"
 	desc = "This looks like a projection of something."

code/game/objects/items/devices/camera_bug.dm

@@ -55,7 +55,7 @@
 	interact(user)
 
 /obj/item/device/camera_bug/check_eye(var/mob/user as mob)
-	if(user.stat || loc != user || !user.canmove || !user.can_see() || !current)
+	if(user.stat || loc != user || !user.canmove || !user.has_vision() || !current)
 		user.reset_view(null)
 		user.unset_machine()
 		return null

code/game/objects/items/weapons/defib.dm

@@ -408,8 +408,9 @@
 							H.adjustBruteLoss(tobehealed)
 							user.visible_message("<span class='boldnotice'>[defib] pings: Resuscitation successful.</span>")
 							playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0)
-							H.stat = 1
-							H.update_revive()
+							H.update_revive(FALSE)
+							H.KnockOut(FALSE)
+							H.Paralyse(5)
 							H.emote("gasp")
 							if(tplus > tloss)
 								H.setBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100))))
@@ -527,8 +528,9 @@
 							H.adjustBruteLoss(tobehealed)
 							user.visible_message("<span class='notice'>[user] pings: Resuscitation successful.</span>")
 							playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0)
-							H.stat = UNCONSCIOUS
-							H.update_revive()
+							H.update_revive(FALSE)
+							H.KnockOut(FALSE)
+							H.Paralyse(5)
 							H.emote("gasp")
 							if(tplus > tloss)
 								H.setBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100))))

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -47,7 +47,6 @@
 
 	New()
 		..()
-		new /obj/item/weapon/book/manual/faxes(src)
 		new /obj/item/clothing/glasses/sunglasses(src)
 		new /obj/item/clothing/head/hopcap(src)
 		new /obj/item/weapon/cartridge/hop(src)
@@ -103,7 +102,6 @@
 			new /obj/item/weapon/storage/backpack/security(src)
 		else
 			new /obj/item/weapon/storage/backpack/satchel_sec(src)
-		new /obj/item/weapon/book/manual/faxes(src)
 		new /obj/item/weapon/cartridge/hos(src)
 		new /obj/item/device/radio/headset/heads/hos/alt(src)
 		new /obj/item/clothing/under/rank/head_of_security(src)

code/game/objects/structures/morgue.dm

@@ -12,7 +12,7 @@
 
 /obj/structure/morgue
 	name = "morgue"
-	desc = "Used to keep bodies in untill someone fetches them."
+	desc = "Used to keep bodies in until someone fetches them."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "morgue1"
 	density = 1