Merge branch 'master' of https://github.com/PolarisSS13/Polaris into rings

code/game/machinery/biogenerator.dm

@@ -1,5 +1,5 @@
 /obj/machinery/biogenerator
-	name = "Biogenerator"
+	name = "biogenerator"
 	desc = ""
 	icon = 'icons/obj/biogenerator.dmi'
 	icon_state = "biogen-stand"
@@ -115,6 +115,7 @@
 					dat += "<A href='?src=\ref[src];action=create;item=tbelt;cost=300'>Utility belt</A> <FONT COLOR=blue>([round(300/build_eff)])</FONT><BR>"
 					dat += "<A href='?src=\ref[src];action=create;item=satchel;cost=400'>Leather Satchel</A> <FONT COLOR=blue>([round(400/build_eff)])</FONT><BR>"
 					dat += "<A href='?src=\ref[src];action=create;item=cashbag;cost=400'>Cash Bag</A> <FONT COLOR=blue>([round(400/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=chembag;cost=400'>Chemistry Bag</A> <FONT COLOR=blue>([round(400/build_eff)])</FONT><BR>"
 					dat += "<A href='?src=\ref[src];action=create;item=workboots;cost=400'>Workboots</A> <FONT COLOR=blue>([round(400/build_eff)])</FONT><BR>"
 					dat += "<A href='?src=\ref[src];action=create;item=leathershoes;cost=400'>Leather Shoes</A> <FONT COLOR=blue>([round(400/build_eff)])</FONT><BR>"
 
@@ -219,6 +220,8 @@
 			new/obj/item/weapon/storage/backpack/satchel(loc)
 		if("cashbag")
 			new/obj/item/weapon/storage/bag/cash(loc)
+		if("chembag")
+			new/obj/item/weapon/storage/bag/chemistry(loc)
 		if("monkey")
 			new/mob/living/carbon/human/monkey(loc)
 		if("workboots")
@@ -271,4 +274,4 @@
 			man_rating += P.rating
 
 	build_eff = man_rating
-	eat_eff = bin_rating
+	eat_eff = bin_rating

code/game/objects/items/weapons/storage/bags.dm

@@ -248,3 +248,16 @@
 	max_w_class = ITEMSIZE_NORMAL
 	w_class = ITEMSIZE_SMALL
 	can_hold = list(/obj/item/weapon/coin,/obj/item/weapon/spacecash)
+
+	// -----------------------------
+	//           Chemistry Bag
+	// -----------------------------
+/obj/item/weapon/storage/bag/chemistry
+	name = "chemistry bag"
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "chembag"
+	desc = "A bag for storing pills, patches, and bottles."
+	max_storage_space = 200
+	w_class = ITEMSIZE_LARGE
+	slowdown = 1
+	can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/glass/bottle)

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -425,6 +425,8 @@
 	new /obj/item/weapon/storage/backpack/chemistry(src)
 	new /obj/item/weapon/storage/backpack/satchel/chem(src)
 	new /obj/item/weapon/storage/backpack/satchel/chem(src)
+	new /obj/item/weapon/storage/bag/chemistry(src)
+	new /obj/item/weapon/storage/bag/chemistry(src)
 	return
 
 
@@ -682,4 +684,4 @@
 	new /obj/item/clothing/under/gimmick/rank/captain/suit(src)
 	new /obj/item/clothing/under/gimmick/rank/captain/suit/skirt(src)
 	new /obj/item/clothing/glasses/sunglasses(src)
-	return
+	return

code/modules/busy_space/organizations.dm

@@ -81,7 +81,17 @@
 		"Sagan",
 		"Tyson",
 		"Galilei",
+		"Jans",
+		"Fhriede",
+		"Franklin",
 		"Tesla",
+		"Curie",
+		"Darwin",
+		"Newton",
+		"Pasteur",
+		"Bell",
+		"Mendel",
+		"Kepler",
 		"Edision",
 		"Cavendish",
 		"Nye",

code/modules/mob/living/simple_animal/constructs/soulstone.dm

@@ -212,7 +212,7 @@
 			Z << "<B>You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.</B>"
 			Z.cancel_camera()
 			qdel(src)
-/obj/item/device/soulstone/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob).
+/obj/item/device/soulstone/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob)
 	switch(choice)
 		if("VICTIM")
 			transfer_human(target,U)

code/modules/reagents/reagent_containers/glass.dm

@@ -112,6 +112,8 @@
 			user << "<span class='notice'>You set the label to \"[tmp_label]\".</span>"
 			label_text = tmp_label
 			update_name_label()
+	if(istype(W,/obj/item/weapon/storage/bag))
+		..()
 
 /obj/item/weapon/reagent_containers/glass/proc/update_name_label()
 	if(label_text == "")