Added Chinese Restaurant and barber shop updates, plus some bugfixes

code/game/machinery/vending.dm

@@ -673,7 +673,15 @@
 					/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 30,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 20,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 30,
 					/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 25)
 
-
+/obj/machinery/vending/chinese
+	name = "Mr. Chang"
+	desc = "A self-serving chinese food machine, for all your chinese food needs."
+	product_slogans = "Taste 5000 years of culture!"
+	icon_state = "snack"
+	products = list(/obj/item/weapon/reagent_containers/food/snacks/chinese/chowmein = 5, /obj/item/weapon/reagent_containers/food/snacks/chinese/tao = 5, /obj/item/weapon/reagent_containers/food/snacks/chinese/newdles = 5,
+					/obj/item/weapon/reagent_containers/food/snacks/chinese/rice = 5, /obj/item/weapon/reagent_containers/food/snacks/wingfangchu = 5)
+	prices = list(/obj/item/weapon/reagent_containers/food/snacks/chinese/chowmein = 50, /obj/item/weapon/reagent_containers/food/snacks/chinese/tao = 50, /obj/item/weapon/reagent_containers/food/snacks/chinese/newdles = 50,
+					/obj/item/weapon/reagent_containers/food/snacks/chinese/rice = 50, /obj/item/weapon/reagent_containers/food/snacks/wingfangchu = 50)
 
 /obj/machinery/vending/cola
 	name = "Robust Softdrinks"

code/game/objects/structures/signs.dm

@@ -193,4 +193,14 @@
 /obj/structure/sign/singulo
 	name = "\improper singulo painting"
 	desc = "A mesmerizing painting of a singularity. It seems to suck you in..."
-	icon_state = "singulo"
+	icon_state = "singulo"
+
+/obj/structure/sign/barber
+	name = "\improper barber shop sign"
+	desc = "A spinning sign indicating a barbershop is near."
+	icon_state = "barber"
+
+/obj/structure/sign/chinese
+	name = "\improper chinese restaurant sign"
+	desc = "A glowing dragon invites you in"
+	icon_state = "chinese"

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -127,4 +127,16 @@
 	icon_state = "officechair_dark"
 
 /obj/structure/stool/bed/chair/barber
-	icon_state = "barber_chair"
+	icon_state = "barber_chair"
+
+/obj/structure/stool/bed/chair/sofa
+	name = "old ratty sofa"
+	icon_state = "sofamiddle"
+	anchored = 1
+	density = 1
+/obj/structure/stool/bed/chair/sofa/left
+	icon_state = "sofaend_left"
+/obj/structure/stool/bed/chair/sofa/right
+	icon_state = "sofaend_right"
+/obj/structure/stool/bed/chair/sofa/corner
+	icon_state = "sofacorner"

code/modules/admin/verbs/debug.dm

@@ -603,7 +603,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 			M.equip_to_slot_or_del(new /obj/item/weapon/cloaking_device(M), slot_r_store)
 
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile(M), slot_r_hand)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic(M), slot_r_hand)
 			M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_l_store)
 
 		if ("tournament chef") //Steven Seagal FTW

code/modules/reagents/Chemistry-Machinery.dm

@@ -322,7 +322,7 @@
 
 /obj/machinery/chem_master/attackby(var/obj/item/weapon/B as obj, var/mob/user as mob)
 
-	if(istype(B, /obj/item/weapon/reagent_containers/glass))
+	if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass))
 
 		if(src.beaker)
 			user << "A beaker is already loaded into the machine."

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

@@ -1030,6 +1030,42 @@
 		reagents.add_reagent("nutriment", 4)
 		bitesize = 2
 
+/obj/item/weapon/reagent_containers/food/snacks/chinese/chowmein
+	name = "chow mein"
+	desc = "What is in this anyways?"
+	icon_state = "chinese1"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 6)
+		bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/chinese/tao
+	name = "Admiral Yamamoto carp"
+	desc = "Tastes like chicken."
+	icon_state = "chinese2"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 6)
+		bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/chinese/newdles
+	name = "chinese newdles"
+	desc = "Made fresh, weekly!"
+	icon_state = "chinese3"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 6)
+		bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/chinese/rice
+	name = "fried rice"
+	desc = "A timeless classic."
+	icon_state = "chinese4"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 6)
+		bitesize = 2
+
 /obj/item/weapon/reagent_containers/food/snacks/syndicake
 	name = "Syndi-Cakes"
 	icon_state = "syndi_cakes"