Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard

code/game/gamemodes/changeling/powers/fake_death.dm

@@ -29,6 +29,9 @@
 	C.update_canmove()
 	C.remove_changeling_powers()
 
+	if(C.suiciding)
+		C.suiciding = 0
+
 	if(C.stat != DEAD)
 		C.emote("deathgasp")
 		C.tod = worldtime2text()

code/game/gamemodes/changeling/powers/shriek.dm

@@ -22,8 +22,18 @@
 
 	var/datum/changeling/changeling = changeling_power(20,0,100,CONSCIOUS)
 	if(!changeling)	return 0
-	changeling.chem_charges -= 20
 
+	if(is_muzzled())
+		src << "<span class='danger'>Mmmf mrrfff!</span>"
+		return 0
+
+	if(ishuman(src))
+		var/mob/living/carbon/human/H = src
+		if(H.silent)
+			src << "<span class='danger'>You can't speak!</span>"
+			return 0
+
+	changeling.chem_charges -= 20
 	var/range = 4
 	if(src.mind.changeling.recursive_enhancement)
 		range = range * 2
@@ -33,13 +43,21 @@
 	for(var/mob/living/M in range(range, src))
 		if(iscarbon(M))
 			if(!M.mind || !M.mind.changeling)
+				if(M.get_ear_protection() >= 2)
+					continue
+				M << "<span class='danger'>You hear an extremely loud screeching sound!  It \
+				[pick("confuses","confounds","perturbs","befuddles","dazes","unsettles","disorients")] you.</span>"
 				M.adjustEarDamage(0,30)
 				M.confused += 20
+				M << sound('sound/effects/screech.ogg')
 			else
+				if(M != src)
+					M << "<span class='notice'>You hear a familiar screech from nearby.  It has no effect on you.</span>"
 				M << sound('sound/effects/screech.ogg')
 
 		if(issilicon(M))
 			M << sound('sound/weapons/flash.ogg')
+			M << "<span class='notice'>Auditory input overloaded.  Reinitializing...</span>"
 			M.Weaken(rand(5,10))
 
 	for(var/obj/machinery/light/L in range(range, src))
@@ -57,6 +75,17 @@
 
 	var/datum/changeling/changeling = changeling_power(20,0,100,CONSCIOUS)
 	if(!changeling)	return 0
+
+	if(is_muzzled())
+		src << "<span class='danger'>Mmmf mrrfff!</span>"
+		return 0
+
+	if(ishuman(src))
+		var/mob/living/carbon/human/H = src
+		if(H.silent)
+			src << "<span class='danger'>You can't speak!</span>"
+			return 0
+
 	changeling.chem_charges -= 20
 
 	var/range_heavy = 2

code/game/gamemodes/changeling/powers/visible_camouflage.dm

@@ -26,7 +26,7 @@
 
 		if(!changeling)
 			return 0
-
+		changeling.chem_charges -= 10
 		var/old_regen_rate = H.mind.changeling.chem_recharge_rate
 
 		H << "<span class='notice'>We vanish from sight, and will remain hidden, so long as we move carefully.</span>"
@@ -40,7 +40,7 @@
 			src << "<span class='notice'>We are now truly invisible.</span>"
 			src.mind.changeling.recursive_enhancement = 0
 
-		while(H.m_intent == "walk" && H.mind.changeling.cloaked) //This loop will keep going until the player uncloaks.
+		while(H.m_intent == "walk" && H.mind.changeling.cloaked && !H.stat) //This loop will keep going until the player uncloaks.
 			if(mind.changeling.chem_recharge_rate != 0) //Without this, there is an exploit that can be done, if one buys engorged chem sacks while cloaked.
 				old_regen_rate += mind.changeling.chem_recharge_rate //Unfortunately, it has to occupy this part of the proc.  This fixes it while at the same time
 				mind.changeling.chem_recharge_rate = 0 //making sure nobody loses out on their bonus regeneration after they're done hiding.

code/game/gamemodes/cult/runes.dm

@@ -468,7 +468,8 @@ var/list/sacrificed = list()
 			D.r_eyes = 200
 			D.g_eyes = 200
 			D.update_eyes()
-			D.underwear = 0
+			D.underwear_top = 0
+			D.underwear_bottom = 0
 			D.key = ghost.key
 			cult.add_antagonist(D.mind)
 

code/game/gamemodes/events.dm

@@ -350,11 +350,6 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
 					M << "<br>"
 					M.add_ion_law("THE STATION IS [who2pref] [who2]")
 
-	if(botEmagChance)
-		for(var/obj/machinery/bot/bot in machines)
-			if(prob(botEmagChance))
-				bot.emag_act(1)
-
 	/*
 
 	var/apcnum = 0

code/game/gamemodes/game_mode.dm

@@ -254,13 +254,13 @@ var/global/list/additional_antag_types = list()
 		"suspected criminal operatives",
 		"malfunctioning von Neumann probe swarms",
 		"shadowy interlopers",
-		"a stranded Vox arkship",
+		"a stranded alien arkship",
 		"haywire IPC constructs",
 		"rogue Unathi exiles",
 		"artifacts of eldritch horror",
 		"a brain slug infestation",
 		"killer bugs that lay eggs in the husks of the living",
-		"a deserted transport carrying xenomorph specimens",
+		"a deserted transport carrying alien specimens",
 		"an emissary for the gestalt requesting a security detail",
 		"a Tajaran slave rebellion",
 		"radical Skrellian transevolutionaries",

code/game/gamemodes/gameticker.dm

@@ -418,9 +418,9 @@ var/global/datum/controller/gameticker/ticker
 
 		if (!robo.connected_ai)
 			if (robo.stat != 2)
-				world << "<b>[robo.name] (Played by: [robo.key]) survived as an AI-less borg! Its laws were:</b>"
+				world << "<b>[robo.name] (Played by: [robo.key]) survived as an AI-less synthetic! Its laws were:</b>"
 			else
-				world << "<b>[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:</b>"
+				world << "<b>[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a synthetic without an AI. Its laws were:</b>"
 
 			if(robo) //How the hell do we lose robo between here and the world messages directly above this?
 				robo.laws.show_laws(world)

code/game/gamemodes/mixed/bughunt.dm

@@ -1,14 +0,0 @@
-/datum/game_mode/bughunt
-	name = "Bughunt"
-	round_description = "A mercenary strike force is approaching the station to eradicate a xenomorph infestation!"
-	extended_round_description = "Mercenaries and xenomorphs spawn in this game mode."
-	config_tag = "bughunt"
-	required_players = 15
-	required_players_secret = 25
-	required_enemies = 1
-	end_on_antag_death = 1
-	antag_tags = list(MODE_XENOMORPH, MODE_DEATHSQUAD)
-	auto_recall_shuttle = 1
-	ert_disabled = 1
-	require_all_templates = 1
-	votable = 0

code/game/gamemodes/mixed/infestation.dm

@@ -1,12 +1,12 @@
 /datum/game_mode/infestation
 	name = "infestation"
 	round_description = "There's something in the walls!"
-	extended_round_description = "Two alien antagonists (Xenomorphs, Cortical Borers or Changelings) may spawn during this round."
+	extended_round_description = "Two alien antagonists (Cortical Borers or Changelings) spawn during this round."
 	config_tag = "infestation"
 	required_players = 15
 	required_enemies = 5
 	end_on_antag_death = 1
-	antag_tags = list(MODE_BORER, MODE_XENOMORPH, MODE_CHANGELING)
+	antag_tags = list(MODE_BORER, MODE_CHANGELING)
 	require_all_templates = 1
 	votable = 0
 

code/game/gamemodes/nuclear/nuclear.dm

@@ -34,6 +34,7 @@ var/list/nuke_disks = list()
 
 /datum/game_mode/nuclear/declare_completion()
 	if(config.objectives_disabled)
+		..()
 		return
 	var/disk_rescued = 1
 	for(var/obj/item/weapon/disk/nuclear/D in world)

code/game/gamemodes/revolution/revolution.dm

@@ -3,7 +3,7 @@
 	config_tag = "revolution"
 	round_description = "Some crewmembers are attempting to start a revolution!"
 	extended_round_description = "Revolutionaries - Remove the heads of staff from power. Convert other crewmembers to your cause using the 'Convert Bourgeoise' verb. Protect your leaders."
-	required_players = 4
+	required_players = 15
 	required_players_secret = 15
 	required_enemies = 3
 	auto_recall_shuttle = 0 //NO THANKS

code/game/gamemodes/sandbox/h_sandbox.dm

@@ -138,8 +138,6 @@ datum/hSB
 							continue
 						if(istype(O, /obj/item/device/camera))
 							continue
-						if(istype(O, /obj/item/weapon/cloaking_device))
-							continue
 						if(istype(O, /obj/item/weapon/dummy))
 							continue
 						if(istype(O, /obj/item/weapon/melee/energy/sword))