diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm
index cbea8c1f..b6e56186 100644
--- a/code/modules/client/preferences_gear.dm
+++ b/code/modules/client/preferences_gear.dm
@@ -25,7 +25,7 @@ proc/populate_gear_list()
 	path = /obj/item/weapon/dice/d20
 	cost = 1
 
-/datum/gear/dice
+/datum/gear/wallet
 	display_name = "wallet"
 	path = /obj/item/weapon/storage/wallet
 	cost = 2
@@ -41,6 +41,22 @@ proc/populate_gear_list()
 	path = /obj/item/weapon/cane
 	cost = 2
 
+/datum/gear/recorder
+	display_name = "universal recorder"
+	path = /obj/item/device/taperecorder
+	cost = 1
+
+/datum/gear/camera
+	display_name = "camera"
+	path = /obj/item/device/camera
+	cost = 1
+
+/datum/gear/clipboard
+	display_name = "clipboard"
+	path = /obj/item/weapon/clipboard
+	cost = 1
+
+
 /datum/gear/tie_horrible
 	display_name = "horrible tie"
 	path = /obj/item/clothing/tie/horrible
@@ -395,12 +411,6 @@ proc/populate_gear_list()
 //	slot = slot_w_uniform
 	cost = 3
 
-/datum/gear/exec_suit
-	display_name = "executive suit"
-	path = /obj/item/clothing/under/suit_jacket/really_black
-//	slot = slot_w_uniform
-	cost = 3
-
 /datum/gear/oldmansuit
 	display_name = "old man suit"
 	path = /obj/item/clothing/under/lawyer/oldman
@@ -423,10 +433,16 @@ proc/populate_gear_list()
 
 /datum/gear/armpit
 	display_name = "shoulder holster"
-//	path = /obj/item/clothing/tie/holster/armpit
+	path = /obj/item/clothing/tie/holster/armpit
 	cost = 3
 	allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Head of Security")
 
+
+/datum/gear/normal_beret
+	display_name = "beret"
+	path = /obj/item/clothing/head/beret
+	cost = 3
+
 /datum/gear/sec_beret
 	display_name = "security beret"
 	path = /obj/item/clothing/head/beret/sec
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 80a01ba5..49554154 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -76,7 +76,9 @@
 	if(hard_to_hear)
 		message = stars(message)
 
-	var/speaker_name = speaker.name
+	var/speaker_name
+	if(speaker)
+		speaker_name = speaker.name
 
 	if(vname)
 		speaker_name = vname
diff --git a/code/modules/projectiles/guns/energy/modular.dm b/code/modules/projectiles/guns/energy/modular.dm
index 6807b113..bc4b5b14 100644
--- a/code/modules/projectiles/guns/energy/modular.dm
+++ b/code/modules/projectiles/guns/energy/modular.dm
@@ -58,8 +58,8 @@
 	desc = "A basic, modular laser pistol."
 	icon_state = "modpistolopen"
 	open = 1
-	w_class = 2
-	upgradepointtotal = 16
+	w_class = 3 // leave it at three until protorifle is implemented.  then severely nerf pistol points.
+	upgradepointtotal = 16 //current protopistol is at protorifle point totals.
 
 /obj/item/weapon/gun/energy/laser/modular/pistol/advanced //better version of the pistol
 	name = "advanced protopistol"
diff --git a/data/investigate/gravity.html b/data/investigate/gravity.html
index 510be218..5c7ddcdb 100644
--- a/data/investigate/gravity.html
+++ b/data/investigate/gravity.html
@@ -1,2 +1,2 @@
-<small>20:24 [0x20077ee] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>20:24 [0x20077ee] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>01:55 [0x20077bc] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>01:55 [0x20077bc] (92,152,1)</small> || the gravitational generator is now charging.<br>