Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution

code/modules/awaymissions/corpse.dm

@@ -255,7 +255,7 @@
 /obj/effect/landmark/corpse/commander
 	name = "Commander"
 	corpseuniform = /obj/item/clothing/under/rank/centcom_commander
-	corpsesuit = /obj/item/clothing/suit/armor/bulletproof
+	corpsesuit = /obj/item/clothing/suit/armor
 	corpseradio = /obj/item/device/radio/headset/heads/captain
 	corpseglasses = /obj/item/clothing/glasses/eyepatch
 	corpsemask = /obj/item/clothing/mask/cigarette/cigar/cohiba

code/modules/awaymissions/mission_code/Academy.dm

@@ -22,15 +22,15 @@
 
 //Academy Items
 
-/obj/machinery/singularity/academy
+/obj/singularity/academy
 	dissipate = 0
 	move_self = 0
 	grav_pull = 1
 
-/obj/machinery/singularity/academy/admin_investigate_setup()
+/obj/singularity/academy/admin_investigate_setup()
 	return
 
-/obj/machinery/singularity/academy/process()
+/obj/singularity/academy/process()
 	eat()
 	if(prob(1))
 		mezzer()

code/modules/awaymissions/mission_code/stationCollision.dm

@@ -159,21 +159,21 @@ var/sc_safecode5 = "[rand(0,9)]"
 /*
  * Modified Nar-Sie
  */
-/obj/machinery/singularity/narsie/sc_Narsie
+/obj/singularity/narsie/sc_Narsie
 	desc = "Your body becomes weak and your feel your mind slipping away as you try to comprehend what you know can't be possible."
 	move_self = 0 //Contianed narsie does not move!
 	grav_pull = 0 //Contained narsie does not pull stuff in!
 
 //Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment
-/obj/machinery/singularity/narsie/sc_Narsie/admin_investigate_setup()
+/obj/singularity/narsie/sc_Narsie/admin_investigate_setup()
 	return
 
-/obj/machinery/singularity/narsie/sc_Narsie/process()
+/obj/singularity/narsie/sc_Narsie/process()
 	eat()
 	if(prob(25))
 		mezzer()
 
-/obj/machinery/singularity/narsie/sc_Narsie/consume(var/atom/A)
+/obj/singularity/narsie/sc_Narsie/consume(var/atom/A)
 	if(is_type_in_list(A, uneatable))
 		return 0
 	if (istype(A,/mob/living))
@@ -194,5 +194,5 @@ var/sc_safecode5 = "[rand(0,9)]"
 		T.ChangeTurf(/turf/space)
 	return
 
-/obj/machinery/singularity/narsie/sc_Narsie/ex_act()
+/obj/singularity/narsie/sc_Narsie/ex_act()
 	return