diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index 4f2ffc4399..7836735d3d 100755
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -75,8 +75,6 @@ AI MODULES
 	target << "[sender] has uploaded a change to the laws you must follow, using a [name]. From now on: "
 	var/time = time2text(world.realtime,"hh:mm:ss")
 	lawchanges.Add("[time] <B>:</B> [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])")
-	message_admins("[sender.name]([sender.key]) uploaded a new AI/Cyborg law.")
-	log_game("[sender.name]([sender.key]) uploaded a new AI/Cyborg law.")
 
 
 /******************** Modules ********************/
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index b4187524e9..67006beabe 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -88,7 +88,7 @@ KNIFE
 
 
 // ROLLING PIN
-/* //Honestly this doesn't even work and is very silly. -- Erthilo
+
 /obj/item/weapon/kitchen/rollingpin/attack(mob/M as mob, mob/living/user as mob)
 	if ((user.mutations & CLUMSY) && prob(50))
 		user << "\red The [src] slips out of your hand and hits your head."
@@ -121,7 +121,6 @@ KNIFE
 		M.eye_blurry += 3
 
 	return
-*/
 
 
 
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 94bd6098f5..3d94e108b2 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -47,7 +47,7 @@
 
 	//get message text, limit it's length.and clean/escape html
 	if(!msg)
-		msg = input(src,"Message:", "Private message") as text|null // This is to stop identification of stealthmins for now -- Erthilo
+		msg = input(src,"Message:", "Private message to [C.key]") as text|null
 		if(!msg)	return
 		if(!C)
 			if(holder)	src << "<font color='red'>Error: Admin-PM: Client not found.</font>"
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index 36f7acde4c..3c8f5f5f5c 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -54,12 +54,12 @@
 					src.cell.use(1)
 				else
 					if(src.module_state_1)
-						src.cell.use(5)
+						src.cell.use(5.5)
 					if(src.module_state_2)
-						src.cell.use(5)
+						src.cell.use(5.5)
 					if(src.module_state_3)
-						src.cell.use(5)
-					src.cell.use(1)
+						src.cell.use(5.5)
+					src.cell.use(0.1)
 					src.blinded = 0
 					src.stat = 0
 			else
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index fdf59c8e49..c3e2623607 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -26,7 +26,7 @@
 				src << "<b>Unit slaved to [connected_ai.name], downloading laws.</b>"
 				lawupdate = 1
 			else
-				laws = new /datum/ai_laws/nanotrasen/New
+				laws = new /datum/ai_laws/nanotrasen
 				lawupdate = 0
 				src << "<b>Unable to locate an AI, reverting to standard NanoTrasen laws.</b>"
 		else
diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm
index faf7ba923b..a2c6bf863a 100755
--- a/maps/tgstation.2.0.8.dmm
+++ b/maps/tgstation.2.0.8.dmm
@@ -3609,7 +3609,7 @@
 "bru" = (/obj/structure/kitchenspike,/obj/machinery/light/small{dir = 8},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/kitchen)
 "brv" = (/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/kitchen)
 "brw" = (/obj/structure/closet/wardrobe/chef_white,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/kitchen)
-"brx" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/table/reinforced,/obj/item/weapon/gun/projectile/shotgun/doublebarrel,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
+"brx" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/table/reinforced,/obj/item/weapon/gun/projectile/shotgun/doublebarrel,/obj/item/weapon/paper{info = "Remeber, due to NanoTrasen firearm regulations, illegal modifications of, or possession of, the shotgun outside the bar area is considered a Contraband offence. <br><br>--CentCom Regulatory Body"; name = "Firearm Regulations"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
 "bry" = (/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/disposal,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
 "brz" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/crew_quarters/cafeteria)
 "brA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/disposalpipe/sortjunction{sortType = list("Diner")},/turf/simulated/wall,/area/maintenance/maintcentral)