Merge remote-tracking branch 'upstream/dev' into PCAILaws

code/game/objects/effects/landmarks.dm

@@ -27,14 +27,11 @@
 		if("monkey")
 			monkeystart += loc
 			del(src)
+
 		if("start")
 			newplayer_start += loc
 			del(src)
 
-		if("wizard")
-			wizardstart += loc
-			del(src)
-
 		if("JoinLate")
 			latejoin += loc
 			del(src)
@@ -51,23 +48,25 @@
 			latejoin_cyborg += loc
 			del(src)
 
-		//prisoners
 		if("prisonwarp")
 			prisonwarp += loc
 			del(src)
-	//	if("mazewarp")
-	//		mazewarp += loc
+
 		if("Holding Facility")
 			holdingfacility += loc
+
 		if("tdome1")
-			tdome1	+= loc
+			tdome1 += loc
+
 		if("tdome2")
 			tdome2 += loc
+
 		if("tdomeadmin")
-			tdomeadmin	+= loc
+			tdomeadmin += loc
+
 		if("tdomeobserve")
 			tdomeobserve += loc
-		//not prisoners
+
 		if("prisonsecuritywarp")
 			prisonsecuritywarp += loc
 			del(src)
@@ -80,18 +79,6 @@
 			xeno_spawn += loc
 			del(src)
 
-		if("ninjastart")
-			ninjastart += loc
-			del(src)
-
-		if("voxstart")
-			raider_spawn += loc
-			del(src)
-
-		if("Syndicate-Spawn")
-			synd_spawn += loc
-			del(src)
-
 	landmarks_list += src
 	return 1
 

code/game/objects/items/devices/flash.dm

@@ -70,7 +70,7 @@
 			flick("e_flash", M.flash)
 
 			if(ishuman(M) && ishuman(user) && M.stat!=DEAD)
-				if(user.mind && user.mind in ticker.mode.head_revolutionaries && ticker.mode.name == "revolution")
+				if(user.mind && user.mind in revs.head_revolutionaries)
 					var/revsafe = 0
 					for(var/obj/item/weapon/implant/loyalty/L in M)
 						if(L && L.implanted)
@@ -81,7 +81,7 @@
 						revsafe = 2
 					if(!revsafe)
 						M.mind.has_been_rev = 1
-						ticker.mode.add_revolutionary(M.mind)
+						revs.add_antagonist(M.mind)
 					else if(revsafe == 1)
 						user << "<span class='warning'>Something seems to be blocking the flash!</span>"
 					else

code/game/objects/items/robot/robot_parts.dm

@@ -189,7 +189,7 @@
 				user << "\red Sticking a dead [W] into the frame would sort of defeat the purpose."
 				return
 
-			if(M.brainmob.mind in ticker.mode.head_revolutionaries)
+			if(M.brainmob.mind in revs.head_revolutionaries)
 				user << "\red The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept the [W]."
 				return
 

code/game/objects/items/weapons/implants/implant.dm

@@ -336,12 +336,13 @@ the implant may become unstable and either pre-maturely inject the subject or si
 	implanted(mob/M)
 		if(!istype(M, /mob/living/carbon/human))	return 0
 		var/mob/living/carbon/human/H = M
-		if(H.mind in ticker.mode.head_revolutionaries)
+		var/datum/antagonist/antag_data = get_antag_data(H.mind.special_role)
+		if(antag_data && (antag_data.flags & ANTAG_IMPLANT_IMMUNE))
 			H.visible_message("[H] seems to resist the implant!", "You feel the corporate tendrils of Nanotrasen try to invade your mind!")
 			return 0
-		else if(H.mind in ticker.mode:revolutionaries)
-			ticker.mode:remove_revolutionary(H.mind)
-		H << "\blue You feel a surge of loyalty towards Nanotrasen."
+		else
+			clear_antag_roles(H.mind, 1)
+			H << "<span class='notice'>You feel a surge of loyalty towards Nanotrasen.</span>"
 		return 1
 
 

code/game/objects/items/weapons/weaponry.dm

@@ -11,7 +11,7 @@
 	attack_verb = list("banned")
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life.</b>"
+		viewers(user) << "<span class='danger'>[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life.</span>"
 		return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS)
 
 /obj/item/weapon/nullrod
@@ -27,7 +27,7 @@
 	w_class = 2
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
+		viewers(user) << "<span class='danger'>[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.</span>"
 		return (BRUTELOSS|FIRELOSS)
 
 /obj/item/weapon/nullrod/attack(mob/M as mob, mob/living/user as mob) //Paste from old-code to decult with a null rod.
@@ -38,36 +38,34 @@
 	msg_admin_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 
 	if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
-		user << "\red You don't have the dexterity to do this!"
+		user << "<span class='danger'>You don't have the dexterity to do this!</span>"
 		return
 
 	if ((CLUMSY in user.mutations) && prob(50))
-		user << "\red The rod slips out of your hand and hits your head."
+		user << "<span class='danger'>The rod slips out of your hand and hits your head.</span>"
 		user.take_organ_damage(10)
 		user.Paralyse(20)
 		return
 
 	if (M.stat !=2)
-		if((M.mind in ticker.mode.cult) && prob(33))
-			M << "\red The power of [src] clears your mind of the cult's influence!"
-			user << "\red You wave [src] over [M]'s head and see their eyes become clear, their mind returning to normal."
-			ticker.mode.remove_cultist(M.mind)
-			for(var/mob/O in viewers(M, null))
-				O.show_message(text("\red [] waves [] over []'s head.", user, src, M), 1)
+		if(cult && (M.mind in cult.current_antagonists) && prob(33))
+			M << "<span class='danger'>The power of [src] clears your mind of the cult's influence!</span>"
+			user << "<span class='danger'>You wave [src] over [M]'s head and see their eyes become clear, their mind returning to normal.</span>"
+			cult.remove_antagonist(M.mind)
+			M.visible_message("<span class='danger'>\The [user] waves \the [src] over \the [M]'s head.</span>")
 		else if(prob(10))
-			user << "\red The rod slips in your hand."
+			user << "<span class='danger'>The rod slips in your hand.</span>"
 			..()
 		else
-			user << "\red The rod appears to do nothing."
-			for(var/mob/O in viewers(M, null))
-				O.show_message(text("\red [] waves [] over []'s head.", user, src, M), 1)
+			user << "<span class='danger'>The rod appears to do nothing.</span>"
+			M.visible_message("<span class='danger'>\The [user] waves \the [src] over \the [M]'s head.</span>")
 			return
 
 /obj/item/weapon/nullrod/afterattack(atom/A, mob/user as mob, proximity)
 	if(!proximity)
 		return
 	if (istype(A, /turf/simulated/floor))
-		user << "\blue You hit the floor with the [src]."
+		user << "<span class='notice'>You hit the floor with the [src].</span>"
 		call(/obj/effect/rune/proc/revealrunes)(src)
 
 /obj/item/weapon/sord
@@ -84,7 +82,7 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
+		viewers(user) << "<span class='danger'>[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.</span>"
 		return(BRUTELOSS)
 
 /obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
@@ -109,7 +107,7 @@
 		return 1
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.</b>"
+		viewers(user) << "<span class='danger'>[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.</span>"
 		return(BRUTELOSS)
 
 /obj/item/weapon/claymore/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
@@ -131,7 +129,7 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</b>"
+		viewers(user) << "<span class='danger'>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</span>"
 		return(BRUTELOSS)
 
 /obj/item/weapon/katana/IsShield()

code/game/objects/structures/mirror.dm

@@ -64,3 +64,32 @@
 	else
 		user.visible_message("<span class='danger'>[user] hits [src] and bounces off!</span>")
 	return 1
+
+// The following mirror is ~special~.
+/obj/structure/mirror/raider
+	name = "cracked mirror"
+	desc = "Something seems strange about this old, dirty mirror. Your reflection doesn't look like you remember it."
+	icon_state = "mirror_broke"
+	shattered = 1
+
+/obj/structure/mirror/raider/attack_hand(var/mob/living/carbon/human/user)
+	if(istype(get_area(src),/area/syndicate_mothership))
+		if(istype(user) && user.mind && user.mind.special_role == "Raider" && user.species != "Vox" && is_alien_whitelisted(user, "Vox"))
+			var/choice = input("Do you wish to become a Vox? This is not reversible.") as null|anything in list("No","Yes")
+			if(choice && choice == "Yes")
+				var/mob/living/carbon/human/vox/vox = new(get_turf(src),"Vox")
+				vox.gender = user.gender
+				raiders.equip(vox)
+				if(user.mind)
+					user.mind.transfer_to(vox)
+				spawn(1)
+					var/newname = input(vox,"Enter a name, or leave blank for the default name.", "Name change","") as text
+					newname = sanitize(newname)
+					if(!newname || newname == "")
+						var/datum/language/L = all_languages[vox.species.default_language]
+						newname = L.get_random_name()
+					vox.real_name = newname
+					vox.name = vox.real_name
+					raiders.update_access(vox)
+				del(user)
+	..()