Revert "12/21 modernizations from TG live"

code/modules/awaymissions/mission_code/stationCollision.dm

@@ -7,6 +7,7 @@
  *		for anyone who wants to make their own stuff.
  *
  * Contains:
+ *		Areas
  *		Landmarks
  *		Guns
  *		Safe code hints
@@ -14,6 +15,29 @@
  *		Modified Nar-Sie
  */
 
+/*
+ * Areas
+ */
+ //Gateroom gets its own APC specifically for the gate
+ /area/awaymission/gateroom
+
+ //Library, medbay, storage room
+ /area/awaymission/southblock
+
+ //Arrivals, security, hydroponics, shuttles (since they dont move, they dont need specific areas)
+ /area/awaymission/arrivalblock
+
+ //Crew quarters, cafeteria, chapel
+ /area/awaymission/midblock
+
+ //engineering, bridge (not really north but it doesnt really need its own APC)
+ /area/awaymission/northblock
+
+ //That massive research room
+ /area/awaymission/research
+
+//Syndicate shuttle
+/area/awaymission/syndishuttle
 
 
 /*
@@ -36,7 +60,7 @@
  * Guns - I'm making these specifically so that I dont spawn a pile of fully loaded weapons on the map.
  */
 //Captain's retro laser - Fires practice laser shots instead.
-/obj/item/weapon/gun/energy/laser/retro/sc_retro
+obj/item/weapon/gun/energy/laser/retro/sc_retro
 	name ="retro laser"
 	icon_state = "retro"
 	desc = "An older model of the basic lasergun, no longer used by Nanotrasen's security or military forces."
@@ -44,18 +68,18 @@
 	clumsy_check = 0 //No sense in having a harmless gun blow up in the clowns face
 
 //Syndicate sub-machine guns.
-/obj/item/weapon/gun/ballistic/automatic/c20r/sc_c20r
+/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r
 
-/obj/item/weapon/gun/ballistic/automatic/c20r/sc_c20r/New()
+/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r/New()
 	..()
 	for(var/ammo in magazine.stored_ammo)
 		if(prob(95)) //95% chance
 			magazine.stored_ammo -= ammo
 
 //Barman's shotgun
-/obj/item/weapon/gun/ballistic/shotgun/sc_pump
+/obj/item/weapon/gun/projectile/shotgun/sc_pump
 
-/obj/item/weapon/gun/ballistic/shotgun/sc_pump/New()
+/obj/item/weapon/gun/projectile/shotgun/sc_pump/New()
 	..()
 	for(var/ammo in magazine.stored_ammo)
 		if(prob(95)) //95% chance
@@ -151,7 +175,7 @@ var/sc_safecode5 = "[rand(0,9)]"
 /obj/singularity/narsie/sc_Narsie/consume(atom/A)
 	if(is_type_in_list(A, uneatable))
 		return 0
-	if(isliving(A))
+	if (istype(A,/mob/living))
 		var/mob/living/L = A
 		L.gib()
 	else if(istype(A,/obj/))