Merge remote-tracking branch 'upstream/dev' into power-net

Conflicts:
	code/game/machinery/recharger.dm

code/game/objects/effects/glowshroom.dm

@@ -8,6 +8,8 @@
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "glowshroomf"
 	layer = 2.1
+	l_color = "#003300"
+
 	var/endurance = 30
 	var/potency = 30
 	var/delay = 1200
@@ -44,7 +46,7 @@
 
 	processing_objects += src
 
-	SetLuminosity(round(potency/10))
+	SetLuminosity(round(potency/15))
 	lastTick = world.timeofday
 
 /obj/effect/glowshroom/Del()

code/game/objects/items.dm

@@ -49,6 +49,18 @@
 	var/list/sprite_sheets = null
 	var/icon_override = null  //Used to override hardcoded clothing dmis in human clothing proc.
 
+	/* Species-specific sprite sheets for object and inhand sprites
+	Works similarly to worn sprite_sheets, except the alternate sprites are used when the clothing/refit_for_species() proc is called.
+	*/
+	var/list/sprite_sheets_obj = null
+	
+	//Inhand is not as big a deal as the object sprites, so I'm not sure if these are worth the extra vars.
+	//Maybe in the future:
+	//var/list/sprite_sheets_inhand_l = null
+	//var/list/sprite_sheets_inhand_r = null
+	//var/icon_l_hand = 'icons/mob/items_lefthand.dmi'
+	//var/icon_r_hand = 'icons/mob/items_righthand.dmi'
+	
 /obj/item/device
 	icon = 'icons/obj/device.dmi'
 

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

@@ -7,7 +7,7 @@
 	desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user."
 	icon_state = "modkit"
 	var/parts = MODKIT_FULL
-	var/list/target_species = list("Human","Skrell")
+	var/target_species = "Human"
 
 	var/list/permitted_types = list(
 		/obj/item/clothing/head/helmet/space/rig,
@@ -15,6 +15,8 @@
 		)
 
 /obj/item/device/modkit/afterattack(obj/O, mob/user as mob)
+	if (!target_species)
+		return	//it shouldn't be null, okay?
 
 	if(!parts)
 		user << "<span class='warning'>This kit has no parts for this modification left.</span>"
@@ -22,11 +24,20 @@
 		del(src)
 		return
 
-	/* TODO: list comparison
-	if(istype(O,to_type))
-		user << "<span class='notice'>[O] is already modified.</span>"
+	var/allowed = 0
+	for (var/permitted_type in permitted_types)
+		if(istype(O, permitted_type))
+			allowed = 1
+	
+	var/obj/item/clothing/I = O
+	if (!istype(I) || !allowed)
+		user << "<span class='notice'>[src] is unable to modify that.</span>"
 		return
-	*/
+	
+	var/excluding = ("exclude" in I.species_restricted)
+	var/in_list = (target_species in I.species_restricted)
+	if (excluding ^ in_list)
+		user << "<span class='notice'>[I] is already modified.</span>"
 
 	if(!isturf(O.loc))
 		user << "<span class='warning'>[O] must be safely placed on the ground for modification.</span>"
@@ -36,22 +47,22 @@
 
 	user.visible_message("\red [user] opens \the [src] and modifies \the [O].","\red You open \the [src] and modify \the [O].")
 
-	var/obj/item/clothing/I = O
-	if(istype(I))
-		I.species_restricted = target_species.Copy()
+	I.refit_for_species(target_species)
 
-	parts--
+	if (istype(I, /obj/item/clothing/head/helmet))
+		parts &= ~MODKIT_HELMET
+	if (istype(I, /obj/item/clothing/suit))
+		parts &= ~MODKIT_SUIT
+	
 	if(!parts)
 		user.drop_from_inventory(src)
 		del(src)
 
-/obj/item/device/modkit/tajaran
-	name = "tajaran hardsuit modification kit"
-	desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user. This one looks like it's meant for Tajara."
-	target_species = list("Tajaran")
-
 /obj/item/device/modkit/examine()
 	..()
-	usr << "It looks as though it modifies hardsuits to fit the following users:"
-	for(var/species in target_species)
-		usr << "- [species]"
+	usr << "It looks as though it modifies hardsuits to fit [target_species] users."
+
+/obj/item/device/modkit/tajaran
+	name = "tajaran hardsuit modification kit"
+	desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user. This one looks like it's meant for Tajaran."
+	target_species = "Tajaran"

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

@@ -32,7 +32,7 @@
 /obj/item/weapon/kitchen/utensil/New()
 	if (prob(60))
 		src.pixel_y = rand(0, 4)
-		
+
 	create_reagents(5)
 	return
 
@@ -58,7 +58,7 @@
 			for(var/mob/O in viewers(M, null))
 				O.show_message(text("\blue [] feeds [] some [] from \the []", user, M, loaded, src), 1)
 				M.reagents.add_reagent("nutriment", 1)
-
+		playsound(M.loc,'sound/items/eatfood.ogg', rand(10,40), 1)
 		overlays.Cut()
 		return