TG Sync 12/15/17

s

s

code/modules/awaymissions/mission_code/Academy.dm

@@ -139,7 +139,7 @@
 /obj/structure/academy_wizard_spawner/proc/summon_wizard()
 	var/turf/T = src.loc
 	var/mob/living/carbon/human/wizbody = new(T)
-	wizbody.fully_replace_character_name("Academy Teacher")
+	wizbody.fully_replace_character_name(wizbody.real_name, "Academy Teacher")
 	wizbody.mind_initialize()
 	var/datum/mind/wizmind = wizbody.mind
 	wizmind.special_role = "Academy Defender"

code/modules/awaymissions/mission_code/caves.dm

@@ -42,7 +42,7 @@
 
 /obj/item/paper/fluff/awaymissions/caves/work_notice
 	name = "work notice"
-	info = "<center><b>Survival Info For Miners</b></center><br><br><center>The caves are an unforgiving place, the only thing you'll have to traverse is the supplies in your locker and your own wit. Travel in packs when mining and try to shut down the monster dens before they overwhelm you. The job is dangerous but the haul is good, so remember this infomation and hopefully we'll all go home alive.</center>"
+	info = "<center><b>Survival Info For Miners</b></center><br><br><center>The caves are an unforgiving place, the only thing you'll have to traverse is the supplies in your locker and your own wit. Travel in packs when mining and try to shut down the monster dens before they overwhelm you. The job is dangerous but the haul is good, so remember this information and hopefully we'll all go home alive.</center>"
 
 /obj/item/paper/fluff/awaymissions/caves/shipment_notice
 	name = "shipment notice"

code/modules/awaymissions/mission_code/centcomAway.dm

@@ -60,4 +60,4 @@
 	teams never did figure out what happened that last time... and I can't wrap my head \
 	around it myself. Why would a shuttle full of evacuees all snap and beat each other \
 	to death the moment they reached safety?<br>\
-	- D. Cereza"
+	- D. Cereza"

code/modules/awaymissions/mission_code/stationCollision.dm

@@ -136,41 +136,18 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
 /*
  * Modified Nar-Sie
  */
-/obj/singularity/narsie/sc_Narsie
+/obj/singularity/narsie/mini
 	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!
-	var/uneatable = list(/turf/open/space, /obj/effect/overlay, /mob/living/simple_animal/hostile/construct)
 //Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment
-/obj/singularity/narsie/sc_Narsie/admin_investigate_setup()
+/obj/singularity/narsie/mini/admin_investigate_setup()
 	return
 
-/obj/singularity/narsie/sc_Narsie/process()
+/obj/singularity/narsie/mini/process()
 	eat()
 	if(prob(25))
 		mezzer()
 
-/obj/singularity/narsie/sc_Narsie/consume(atom/A)
-	if(is_type_in_list(A, uneatable))
-		return 0
-	if(isliving(A))
-		var/mob/living/L = A
-		L.gib()
-	else if(istype(A, /obj/))
-		var/obj/O = A
-		O.ex_act(EXPLODE_DEVASTATE)
-		if(O)
-			qdel(O)
-	else if(isturf(A))
-		var/turf/T = A
-		if(T.intact)
-			for(var/obj/O in T.contents)
-				if(O.level != 1)
-					continue
-				if(O.invisibility == INVISIBILITY_MAXIMUM)
-					src.consume(O)
-		T.ChangeTurf(/turf/open/space)
-	return
-
-/obj/singularity/narsie/sc_Narsie/ex_act()
+/obj/singularity/narsie/mini/ex_act()
 	return

code/modules/awaymissions/mission_code/wildwest.dm

@@ -115,9 +115,11 @@
 				to_chat(user, "The Wish Granter punishes you for your wickedness, claiming your soul and warping your body to match the darkness in your heart.")
 				SSticker.mode.traitors += user.mind
 				user.mind.special_role = "traitor"
+				
 				var/datum/objective/hijack/hijack = new
 				hijack.owner = user.mind
 				user.mind.objectives += hijack
+				user.mind.add_antag_datum(/datum/antagonist/auto_custom)
 				to_chat(user, "<B>Your inhibitions are swept away, the bonds of loyalty broken, you are free to murder as you please!</B>")
 				user.mind.announce_objectives()
 				user.set_species(/datum/species/shadow)