Merge branch 'master' into master

code/_globalvars/bitfields.dm

@@ -140,6 +140,8 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"MASKINTERNALS" = MASKINTERNALS,
 		"NOSLIP" = NOSLIP,
 		"THICKMATERIAL" = THICKMATERIAL,
+		"VOICEBOX_TOGGLABLE" = VOICEBOX_TOGGLABLE,
+		"VOICEBOX_DISABLED" = VOICEBOX_DISABLED,
 		),
 	"tesla_flags" = list(
 		"TESLA_MOB_DAMAGE" = TESLA_MOB_DAMAGE,
@@ -171,4 +173,9 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"RAD_PROTECT_CONTENTS" = RAD_PROTECT_CONTENTS,
 		"RAD_NO_CONTAMINATE" = RAD_NO_CONTAMINATE,
 	),
-	))
+	"disease_flags" = list(
+		"CURABLE" = CURABLE,
+		"CAN_CARRY"	= CAN_CARRY,
+		"CAN_RESIST" = CAN_RESIST
+	),
+	))

code/_globalvars/lists/maintenance_loot.dm

@@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/assembly/timer = 3,
 	/obj/item/flashlight = 4,
 	/obj/item/flashlight/pen = 1,
-	/obj/item/flashlight/glowstick/random = 4,
+	/obj/effect/spawner/lootdrop/glowstick = 4,
 	/obj/effect/spawner/lootdrop/mre = 3,
 	/obj/item/multitool = 2,
 	/obj/item/radio/off = 2,
@@ -69,7 +69,6 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/crowbar = 1,
 	/obj/item/crowbar/red = 1,
 	/obj/item/extinguisher = 11,
-	//obj/item/gun/ballistic/revolver/russian = 1, //disabled until lootdrop is a proper world proc.
 	/obj/item/hand_labeler = 1,
 	/obj/item/paper/crumpled = 1,
 	/obj/item/pen = 1,
@@ -102,7 +101,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/assembly/signaler = 2,
 	/obj/item/assembly/mousetrap = 2,
 	/obj/item/reagent_containers/syringe = 2,
-	/obj/item/clothing/gloves/color/random = 8,
+	/obj/effect/spawner/lootdrop/gloves = 8,
 	/obj/item/clothing/shoes/laceup = 1,
 	/obj/item/storage/secure/briefcase = 3,
 	/obj/item/storage/toolbox/artistic = 2,