Merge pull request #170 from Markolie/master

Blob event fix, mapfix, AI/robot fix

code/modules/admin/topic.dm

@@ -1976,6 +1976,16 @@
 				feedback_add_details("admin_secrets_fun_used","FLUX")
 				message_admins("[key_name_admin(usr)] has triggered an energetic flux")
 				new /datum/event/anomaly/anomaly_flux()
+			if("goblob")
+				feedback_inc("admin_secrets_fun_used",1)
+				feedback_add_details("admin_secrets_fun_used","BLOB")
+				message_admins("[key_name_admin(usr)] has triggered a blob.")
+				new /datum/game_mode/blob()	
+			if("aliens")
+				feedback_inc("admin_secrets_fun_used",1)
+				feedback_add_details("admin_secrets_fun_used","ALIEN")
+				message_admins("[key_name_admin(usr)] has triggered an alien infestation.")
+				new /datum/event/alien_infestation()					
 			if("power")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","P")

code/modules/events/blob.dm

@@ -6,8 +6,15 @@
 
 
 /datum/event/blob/announce()
-	command_alert("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
+	command_alert("Confirmed outbreak of level 7 biohazard aboard [station_name()]. Nanotrasen has issued a directive 7-10. The station is to be considered quarantined.", "Biohazard Alert")
 	world << sound('sound/AI/outbreak7.ogg')
+		
+	for (var/mob/living/silicon/ai/aiPlayer in player_list)
+		if (aiPlayer.client)
+			var/law = "The station is under quarantine, prevent biological entities from leaving the station at all costs while minimizing collateral damage."
+			aiPlayer.set_zeroth_law(law)
+			aiPlayer << "\red <b>You have detected a change in your laws information:</b>"
+			aiPlayer << "Laws Updated: [law]"
 
 /datum/event/blob/start()
 	var/turf/T = pick(blobstart)
@@ -18,10 +25,40 @@
 	for(var/i = 1; i < rand(3, 6), i++)
 		Blob.process()
 
-
 /datum/event/blob/tick()
 	if(!Blob)
 		kill()
 		return
 	if(IsMultiple(activeFor, 3))
-		Blob.process()
+		Blob.process()
+	var/blobs = 0
+	for(var/obj/effect/blob/core/core in world)
+		blobs++
+	if(blobs >= 3)
+		announce_nuke()
+			
+/datum/event/blob/proc/announce_nuke()
+	var/nukecode = "ERROR"
+	for(var/obj/machinery/nuclearbomb/bomb in world)
+		if(bomb && bomb.r_code && bomb.z == 1)
+			nukecode = bomb.r_code
+	
+	command_alert("The biohazard has grown out of control and will soon reach critical mass. Activate the nuclear failsafe to maintain quarantine. The Nuclear Authentication Code is [nukecode] ", "Biohazard Alert")
+	set_security_level("gamma")
+	var/obj/machinery/door/airlock/vault/V = locate(/obj/machinery/door/airlock/vault) in world
+	if(V && V.z == 1)
+		V.locked = 0
+		V.update_icon()
+	spawn(10)	
+		world << sound('sound/effects/siren.ogg')
+		
+/datum/event/blob/kill()
+	command_alert("The level 7 biohazard aboard [station_name()] has been killed. Directive 7-10 has been lifted, and the station is no longer quarantined.", "Biohazard Update")
+	
+	for (var/mob/living/silicon/ai/aiPlayer in player_list)
+		if (aiPlayer.client)
+			var/law = ""
+			aiPlayer.set_zeroth_law(law)
+			aiPlayer << "\red <b>You have detected a change in your laws information:</b>"
+			aiPlayer << "Laws Updated: [law]"
+	..()

code/modules/karma/karma.dm

@@ -114,7 +114,7 @@ var/list/karma_spenders = list()
 	var/choice = input("Give [M.name] good karma?", "Karma") in list("Good", "Cancel")
 	if(!choice || choice == "Cancel")
 		return
-	if(choice == "Good")
+	if(choice == "Good" && !(src.client.karma_spent))
 		M.client.karma += 1
 		usr << "[choice] karma spent on [M.name]."
 		src.client.karma_spent = 1

code/modules/mob/living/silicon/ai/freelook/eye.dm

@@ -11,6 +11,7 @@
 	status_flags = GODMODE  // You can't damage it.
 	mouse_opacity = 0
 	see_in_dark = 7
+	invisibility = INVISIBILITY_MAXIMUM
 
 /mob/aiEye/New()
 	..()

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -123,8 +123,8 @@
 		src.modules += new /obj/item/device/healthanalyzer(src)
 		src.modules += new /obj/item/device/reagent_scanner/adv(src)
 		src.modules += new /obj/item/roller_holder(src)
-		src.modules += new /obj/item/stack/medical/ointment(src)
-		src.modules += new /obj/item/stack/medical/bruise_pack(src)
+		src.modules += new /obj/item/stack/medical/advanced/ointment(src)
+		src.modules += new /obj/item/stack/medical/advanced/bruise_pack(src)
 		src.modules += new /obj/item/stack/medical/splint(src)
 		src.modules += new /obj/item/weapon/reagent_containers/borghypo/crisis(src)
 		src.modules += new /obj/item/weapon/reagent_containers/glass/beaker/large(src)