Merge remote-tracking branch 'upstream/master' into cash

code/modules/admin/admin.dm

@@ -1333,7 +1333,7 @@ proc/admin_notice(var/message, var/rights)
 
 	var/msg
 
-	if(check_rights(R_ADMIN))
+	if(check_rights(R_ADMIN|R_MOD))
 		if (H.paralysis == 0)
 			H.paralysis = 8000
 			msg = "has paralyzed [key_name(H)]."

code/modules/client/preference_setup/loadout/loadout.dm

@@ -123,7 +123,7 @@ var/list/gear_datums = list()
 		var/datum/gear/G = LC.gear[gear_name]
 		var/ticked = (G.display_name in pref.gear)
 		var/obj/item/temp = G.path
-		. += "<tr><td width=25%><a href='?src=\ref[src];toggle_gear=[G.display_name]'><font color='[ticked ? "#E67300" : "#3366CC"]'>[initial(temp.name)]</font></a></td>"
+		. += "<tr><td width=25%><a href='?src=\ref[src];toggle_gear=[G.display_name]'><font color='[ticked ? "#E67300" : "#3366CC"]'>[G.display_name]</font></a></td>"
 		. += "<td width = 10%>[G.cost]</td>"
 		. += "<td><font size=2><i>[initial(temp.desc)]</i></font></td></tr>"
 	. += "</table>"

code/modules/clothing/spacesuits/rig/modules/combat.dm

@@ -21,7 +21,7 @@
 	name = "mounted grenade launcher"
 	desc = "A shoulder-mounted micro-explosive dispenser."
 	selectable = 1
-	icon_state = "grenade"
+	icon_state = "grenadelauncher"
 
 	interface_name = "integrated grenade launcher"
 	interface_desc = "Discharges loaded grenades against the wearer's location."
@@ -117,7 +117,7 @@
 
 	if(!target)
 		gun.attack_self(holder.wearer)
-		return 1
+		return
 
 	gun.Fire(target,holder.wearer)
 	return 1

code/modules/detectivework/tools/storage.dm

@@ -24,7 +24,6 @@
 /obj/item/weapon/storage/box/evidence
 	name = "evidence bag box"
 	desc = "A box claiming to contain evidence bags."
-	storage_slots = 6
 
 /obj/item/weapon/storage/box/evidence/New()
 	..()

code/modules/mob/living/silicon/pai/pai.dm

@@ -7,6 +7,9 @@
 	pass_flags = 1
 	mob_size = MOB_SMALL
 
+	idcard_type = /obj/item/weapon/card/id
+	var/idaccessible = 0
+
 	var/network = "SS13"
 	var/obj/machinery/camera/current = null
 
@@ -406,3 +409,35 @@
 	grabber.update_inv_l_hand()
 	grabber.update_inv_r_hand()
 	return H
+
+/mob/living/silicon/pai/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	var/obj/item/weapon/card/id/ID = W.GetID()
+	if(ID)
+		if (idaccessible == 1)
+			switch(alert(user, "Do you wish to add access to [src] or remove access from [src]?",,"Add Access","Remove Access", "Cancel"))
+				if("Add Access")
+					idcard.access |= ID.access
+					user << "<span class='notice'>You add the access from the [W] to [src].</span>"
+					return
+				if("Remove Access")
+					idcard.access = null
+					user << "<span class='notice'>You remove the access from [src].</span>"
+					return
+				if("Cancel")
+					return
+		else if (istype(W, /obj/item/weapon/card/id) && idaccessible == 0)
+			user << "<span class='notice'>[src] is not accepting access modifcations at this time.</span>"
+			return
+
+/mob/living/silicon/pai/verb/allowmodification()
+	set name = "Change Access Modifcation Permission"
+	set category = "pAI Commands"
+	desc = "Allows people to modify your access or block people from modifying your access."
+
+	if(idaccessible == 0)
+		idaccessible = 1
+		src << "<span class='notice'>You allow access modifications.</span>"
+
+	else
+		idaccessible = 0
+		src << "<span class='notice'>You block access modfications.</span>"

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -55,12 +55,8 @@
 			audible_emote("snuffles.")
 
 /mob/living/simple_animal/mouse/lay_down() //Simply turns sprite into sleeping and back upon using "Rest".
-	set name = "Rest"
-	set category = "IC"
-
-	resting = !resting
+	..()
 	icon_state = resting ? "mouse_[body_color]_sleep" : "mouse_[body_color]"
-	src << "<span class='notice'>You are now [resting ? "resting" : "getting up"]</span>"
 
 /mob/living/simple_animal/mouse/New()
 	..()

code/modules/reagents/reagent_containers/food.dm

@@ -13,12 +13,12 @@
 
 /obj/item/weapon/reagent_containers/food/New()
 	..()
-	if (isnull(center_of_mass) && !pixel_x && !pixel_y)
+	if (center_of_mass.len && !pixel_x && !pixel_y)
 		src.pixel_x = rand(-6.0, 6) //Randomizes postion
 		src.pixel_y = rand(-6.0, 6)
 
 /obj/item/weapon/reagent_containers/food/afterattack(atom/A, mob/user, proximity, params)
-	if(proximity && params && istype(A, /obj/structure/table) && center_of_mass.len)
+	if(center_of_mass.len && proximity && params && istype(A, /obj/structure/table))
 		//Places the item on a grid
 		var/list/mouse_control = params2list(params)
 

code/modules/reagents/reagent_containers/food/condiment.dm

@@ -42,6 +42,7 @@
 
 			var/trans = reagents.trans_to_obj(target, amount_per_transfer_from_this)
 			user << "<span class='notice'>You add [trans] units of the condiment to \the [target].</span>"
+		else(..())
 
 	feed_sound(var/mob/user)
 		playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1)