Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

code/modules/clothing/under/color.dm

@@ -72,85 +72,85 @@
 	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/psyche
-	name = "psychedelic"
+	name = "psychedelic jumpsuit"
 	desc = "Groovy!"
 	icon_state = "psyche"
 	item_color = "psyche"
 
 /obj/item/clothing/under/lightblue
-	name = "lightblue"
+	name = "lightblue jumpsuit"
 	desc = "lightblue"
 	icon_state = "lightblue"
 	item_color = "lightblue"
 
 /obj/item/clothing/under/aqua
-	name = "aqua"
+	name = "aqua jumpsuit"
 	desc = "aqua"
 	icon_state = "aqua"
 	item_color = "aqua"
 	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/purple
-	name = "purple"
+	name = "purple jumpsuit"
 	desc = "purple"
 	icon_state = "purple"
 	item_state = "p_suit"
 	item_color = "purple"
 
 /obj/item/clothing/under/lightpurple
-	name = "lightpurple"
+	name = "lightpurple jumpsuit"
 	desc = "lightpurple"
 	icon_state = "lightpurple"
 	item_color = "lightpurple"
 
 /obj/item/clothing/under/lightgreen
-	name = "lightgreen"
+	name = "lightgreen jumpsuit"
 	desc = "lightgreen"
 	icon_state = "lightgreen"
 	item_color = "lightgreen"
 
 /obj/item/clothing/under/lightblue
-	name = "lightblue"
+	name = "lightblue jumpsuit"
 	desc = "lightblue"
 	icon_state = "lightblue"
 	item_color = "lightblue"
 
 /obj/item/clothing/under/lightbrown
-	name = "lightbrown"
+	name = "lightbrown jumpsuit"
 	desc = "lightbrown"
 	icon_state = "lightbrown"
 	item_color = "lightbrown"
 	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/brown
-	name = "brown"
+	name = "brown jumpsuit"
 	desc = "brown"
 	icon_state = "brown"
 	item_color = "brown"
 	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/yellowgreen
-	name = "yellowgreen"
+	name = "yellowgreen jumpsuit"
 	desc = "yellowgreen"
 	icon_state = "yellowgreen"
 	item_color = "yellowgreen"
 
 /obj/item/clothing/under/darkblue
-	name = "darkblue"
+	name = "darkblue jumpsuit"
 	desc = "darkblue"
 	icon_state = "darkblue"
 	item_color = "darkblue"
 	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/lightred
-	name = "lightred"
+	name = "lightred jumpsuit"
 	desc = "lightred"
 	icon_state = "lightred"
 	item_color = "lightred"
 
 /obj/item/clothing/under/darkred
-	name = "darkred"
+	name = "darkred jumpsuit"
 	desc = "darkred"
 	icon_state = "darkred"
 	item_color = "darkred"
-	flags = FPRINT | TABLEPASS
+	flags = FPRINT | TABLEPASS

code/modules/clothing/under/jobs/civilian.dm

@@ -113,24 +113,28 @@
 
 
 /obj/item/clothing/under/lawyer/black
+	name = "black Lawyer suit"
 	icon_state = "lawyer_black"
 	item_state = "lawyer_black"
 	item_color = "lawyer_black"
 
 
 /obj/item/clothing/under/lawyer/female
+	name = "black Lawyer suit"
 	icon_state = "black_suit_fem"
 	item_state = "black_suit_fem"
 	item_color = "black_suit_fem"
 
 
 /obj/item/clothing/under/lawyer/red
+	name = "red Lawyer suit"
 	icon_state = "lawyer_red"
 	item_state = "lawyer_red"
 	item_color = "lawyer_red"
 
 
 /obj/item/clothing/under/lawyer/blue
+	name = "blue Lawyer suit"
 	icon_state = "lawyer_blue"
 	item_state = "lawyer_blue"
 	item_color = "lawyer_blue"
@@ -178,4 +182,4 @@
 	name = "shaft miner's jumpsuit"
 	icon_state = "miner"
 	item_state = "miner"
-	item_color = "miner"
+	item_color = "miner"

code/modules/clothing/under/shorts.dm

@@ -6,21 +6,26 @@
 	body_parts_covered = LOWER_TORSO
 
 /obj/item/clothing/under/shorts/red
+	name = "red athletic shorts"
 	icon_state = "redshorts"
 	item_color = "redshorts"
 
 /obj/item/clothing/under/shorts/green
+	name = "green athletic shorts"
 	icon_state = "greenshorts"
 	item_color = "greenshorts"
 
 /obj/item/clothing/under/shorts/blue
+	name = "blue athletic shorts"
 	icon_state = "blueshorts"
 	item_color = "blueshorts"
 
 /obj/item/clothing/under/shorts/black
+	name = "black athletic shorts"
 	icon_state = "blackshorts"
 	item_color = "blackshorts"
 
 /obj/item/clothing/under/shorts/grey
+	name = "grey athletic shorts"
 	icon_state = "greyshorts"
-	item_color = "greyshorts"
+	item_color = "greyshorts"

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

@@ -318,7 +318,7 @@
 
 	var/list/items = list()
 	for(var/obj/item/I in view(1,src))
-		if(I.loc != src && I.w_class <= 2)
+		if(I.loc != src && I.w_class <= 2 && I.Adjacent(src) )
 			items.Add(I)
 
 	var/obj/selection = input("Select an item.", "Pickup") in items