diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 89be98f2f8a..bf66310d975 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -43,9 +43,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/obj/item/device/paicard/pai = null // A slot for a personal AI device
-/obj/item/device/pda/New()
- new /obj/item/weapon/pen(src)
-
/obj/item/device/pda/medical
default_cartridge = /obj/item/weapon/cartridge/medical
icon_state = "pda-m"
@@ -210,6 +207,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
PDAs += src
if(default_cartridge)
cartridge = new default_cartridge(src)
+ new /obj/item/weapon/pen(src)
/obj/item/device/pda/proc/can_use()
diff --git a/code/modules/mob/living/simple_animal/syndicate.dm b/code/modules/mob/living/simple_animal/syndicate.dm
index b6846ae3808..dfa1ba9d3fd 100644
--- a/code/modules/mob/living/simple_animal/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/syndicate.dm
@@ -112,8 +112,7 @@
/mob/living/simple_animal/syndicate/proc/OpenFire(target_mob)
src.target = target_mob
- for(var/mob/O in viewers(src, null))
- O.show_message("\red [src] fires at [src.target]!", 1)
+ visible_message("\red [src] fires at [src.target]!", 1)
var/tturf = get_turf(target)
if(rapid)
@@ -169,18 +168,12 @@
if(O.force)
if(prob(35))
health -= O.force
- for(var/mob/M in viewers(src, null))
- if ((M.client && !( M.blinded )))
- M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
+ visible_message("\red \b [src] has been attacked with the [O] by [user]. ")
else
- for(var/mob/M in viewers(src, null))
- if ((M.client && !( M.blinded )))
- M.show_message("\red \b [src] blocks the [O] with its shield! ")
+ visible_message("\red \b [src] blocks the [O] with its shield! ")
else
usr << "\red This weapon is ineffective, it does no damage."
- for(var/mob/M in viewers(src, null))
- if ((M.client && !( M.blinded )))
- M.show_message("\red [user] gently taps [src] with the [O]. ")
+ visible_message("\red [user] gently taps [src] with the [O]. ")
/mob/living/simple_animal/syndicate/melee/bullet_act(var/obj/item/projectile/Proj)