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

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 == "")