Merge branch 'master' into w_class

code/modules/paperwork/carbonpaper.dm

@@ -12,7 +12,7 @@
 			icon_state = "cpaper_words"
 			return
 		icon_state = "cpaper"
-	else if (copied)
+	else if(copied)
 		if(info)
 			icon_state = "paper_words"
 			return
@@ -30,7 +30,7 @@
 	set category = "Object"
 	set src in usr
 
-	if (copied == 0)
+	if(copied == 0)
 		var/obj/item/weapon/paper/carbon/c = src
 		var/copycontents = html_decode(c.info)
 		var/obj/item/weapon/paper/carbon/copy = new /obj/item/weapon/paper/carbon (usr.loc)

code/modules/paperwork/faxmachine.dm

@@ -75,7 +75,7 @@ var/list/alldepartments = list()
 		data["respectcooldown"] = 0
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
+	if(!ui)
 		ui = new(user, src, ui_key, "faxmachine.tmpl", "Fax Machine UI", 540, 450)
 		ui.set_initial_data(data)
 		ui.open()
@@ -86,12 +86,12 @@ var/list/alldepartments = list()
 
 	if(href_list["send"])
 		if(copyitem && authenticated)
-			if ((destination in admin_departments) || (destination in hidden_admin_departments))
+			if((destination in admin_departments) || (destination in hidden_admin_departments))
 				send_admin_fax(usr, destination)
 			else
 				sendfax(destination,usr)
 
-			if (sendcooldown)
+			if(sendcooldown)
 				spawn(sendcooldown) // cooldown time
 					sendcooldown = 0
 					nanomanager.update_uis(src)
@@ -104,7 +104,7 @@ var/list/alldepartments = list()
 			copyitem = null
 		else
 			var/obj/item/I = usr.get_active_hand()
-			if (istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/paper_bundle))
+			if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/paper_bundle))
 				usr.drop_item()
 				copyitem = I
 				I.loc = src
@@ -135,7 +135,7 @@ var/list/alldepartments = list()
 		if(copyitem)
 			var/n_name = sanitize(copytext(input(usr, "What would you like to label the fax?", "Fax Labelling", copyitem.name)  as text, 1, MAX_MESSAGE_LEN))
 			if((copyitem && copyitem.loc == src && usr.stat == 0))
-				if (istype(copyitem, /obj/item/weapon/paper))
+				if(istype(copyitem, /obj/item/weapon/paper))
 					copyitem.name = "[(n_name ? text("[n_name]") : initial(copyitem.name))]"
 					copyitem.desc = "This is a paper titled '" + copyitem.name + "'."
 				else if(istype(copyitem, /obj/item/weapon/photo))
@@ -158,7 +158,7 @@ var/list/alldepartments = list()
 	else
 		if(!card)
 			var/obj/item/I = usr.get_active_hand()
-			if (istype(I, /obj/item/weapon/card/id))
+			if(istype(I, /obj/item/weapon/card/id))
 				usr.drop_item()
 				I.loc = src
 				scan = I
@@ -180,7 +180,7 @@ var/list/alldepartments = list()
 		if( F.department == destination )
 			success = F.receivefax(copyitem)
 
-	if (success)
+	if(success)
 		var/datum/fax/F = new /datum/fax()
 		F.name = copyitem.name
 		F.from_department = department
@@ -209,11 +209,11 @@ var/list/alldepartments = list()
 	// give the sprite some time to flick
 	sleep(20)
 
-	if (istype(incoming, /obj/item/weapon/paper))
+	if(istype(incoming, /obj/item/weapon/paper))
 		copy(incoming)
-	else if (istype(incoming, /obj/item/weapon/photo))
+	else if(istype(incoming, /obj/item/weapon/photo))
 		photocopy(incoming)
-	else if (istype(incoming, /obj/item/weapon/paper_bundle))
+	else if(istype(incoming, /obj/item/weapon/paper_bundle))
 		bundlecopy(incoming)
 	else
 		return 0
@@ -228,11 +228,11 @@ var/list/alldepartments = list()
 	use_power(200)
 
 	var/obj/item/rcvdcopy
-	if (istype(copyitem, /obj/item/weapon/paper))
+	if(istype(copyitem, /obj/item/weapon/paper))
 		rcvdcopy = copy(copyitem)
-	else if (istype(copyitem, /obj/item/weapon/photo))
+	else if(istype(copyitem, /obj/item/weapon/photo))
 		rcvdcopy = photocopy(copyitem)
-	else if (istype(copyitem, /obj/item/weapon/paper_bundle))
+	else if(istype(copyitem, /obj/item/weapon/paper_bundle))
 		rcvdcopy = bundlecopy(copyitem)
 	else
 		visible_message("[src] beeps, \"Error transmitting message.\"")
@@ -251,9 +251,9 @@ var/list/alldepartments = list()
 
 	//message badmins that a fax has arrived
 	switch(destination)
-		if ("Central Command")
+		if("Central Command")
 			message_admins(sender, "CENTCOM FAX", destination, rcvdcopy, "#006100")
-		if ("Syndicate")
+		if("Syndicate")
 			message_admins(sender, "SYNDICATE FAX", destination, rcvdcopy, "#DC143C")
 	sendcooldown = 1800
 	sleep(50)

code/modules/paperwork/paper.dm

@@ -374,44 +374,44 @@
 		return
 
 	if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/photo))
-		if (istype(P, /obj/item/weapon/paper/carbon))
+		if(istype(P, /obj/item/weapon/paper/carbon))
 			var/obj/item/weapon/paper/carbon/C = P
-			if (!C.iscopy && !C.copied)
+			if(!C.iscopy && !C.copied)
 				to_chat(user, "<span class='notice'>Take off the carbon copy first.</span>")
 				add_fingerprint(user)
 				return
 		var/obj/item/weapon/paper_bundle/B = new(src.loc)
-		if (name != "paper")
+		if(name != "paper")
 			B.name = name
-		else if (P.name != "paper" && P.name != "photo")
+		else if(P.name != "paper" && P.name != "photo")
 			B.name = P.name
 		user.unEquip(P)
-		if (istype(user, /mob/living/carbon/human))
+		if(istype(user, /mob/living/carbon/human))
 			var/mob/living/carbon/human/h_user = user
-			if (h_user.r_hand == src)
+			if(h_user.r_hand == src)
 				h_user.unEquip(src)
 				h_user.put_in_r_hand(B)
-			else if (h_user.l_hand == src)
+			else if(h_user.l_hand == src)
 				h_user.unEquip(src)
 				h_user.put_in_l_hand(B)
-			else if (h_user.l_store == src)
+			else if(h_user.l_store == src)
 				h_user.unEquip(src)
 				B.loc = h_user
 				B.layer = 20
 				B.plane = HUD_PLANE
 				h_user.l_store = B
 				h_user.update_inv_pockets()
-			else if (h_user.r_store == src)
+			else if(h_user.r_store == src)
 				h_user.unEquip(src)
 				B.loc = h_user
 				B.layer = 20
 				B.plane = HUD_PLANE
 				h_user.r_store = B
 				h_user.update_inv_pockets()
-			else if (h_user.head == src)
+			else if(h_user.head == src)
 				h_user.unEquip(src)
 				h_user.put_in_hands(B)
-			else if (!istype(src.loc, /turf))
+			else if(!istype(src.loc, /turf))
 				src.loc = get_turf(h_user)
 				if(h_user.client)	h_user.client.screen -= src
 				h_user.put_in_hands(B)
@@ -676,23 +676,27 @@
 /obj/item/weapon/paper/evilfax/proc/evilpaper_specialaction(var/mob/living/carbon/target)
 	spawn(30)
 		if(istype(target,/mob/living/carbon))
-			if(myeffect == "borging")
+			if(myeffect == "Borgification")
+				to_chat(target,"<span class='userdanger'>You seem to comprehend the AI a little better. Why are your muscles so stiff?</span>")
 				target.ForceContractDisease(new /datum/disease/transformation/robot(0))
-			else if(myeffect == "corgifying")
+			else if(myeffect == "Corgification")
+				to_chat(target,"<span class='userdanger'>You hear distant howling as the world seems to grow bigger around you. Boy, that itch sure is getting worse!</span>")
 				target.ForceContractDisease(new /datum/disease/transformation/corgi(0))
-			else if(myeffect == "firedeath")
+			else if(myeffect == "Death By Fire")
+				to_chat(target,"<span class='userdanger'>You feel hotter than usual. Maybe you should lowe-wait, is that your hand melting?</span>")
 				var/turf/simulated/T = get_turf(target)
 				new /obj/effect/hotspot(T)
 				target.adjustFireLoss(150) // hard crit, the burning takes care of the rest.
-			else if(myeffect == "braindeath")
-				to_chat(target,"<span class='userdanger'>A series of bright lights flash across your vision: COGNITOHAZARD YHWH-3 ACTIVATED</span>")
+			else if(myeffect == "Total Brain Death")
+				to_chat(target,"<span class='userdanger'>You see a message appear in front of you in bright red letters: <b>YHWH-3 ACTIVATED. TERMINATION IN 3 SECONDS</b></span>")
 				target.mutations.Add(NOCLONE)
 				target.adjustBrainLoss(125)
-			else if(myeffect == "honktumor")
+			else if(myeffect == "Honk Tumor")
 				if(!target.get_int_organ(/obj/item/organ/internal/honktumor))
 					var/obj/item/organ/internal/organ = new /obj/item/organ/internal/honktumor
+					to_chat(target,"<span class='userdanger'>Life seems funnier, somehow.</span>")
 					organ.insert(target)
-			else if(myeffect == "demotion")
+			else if(myeffect == "Demotion Notice")
 				command_announcement.Announce("[mytarget] is hereby demoted to the rank of Civilian. Process this demotion immediately. Failure to comply with these orders is grounds for termination.","CC Demotion Order")
 			else
 				message_admins("Evil paper [src] was activated without a proper effect set! This is a bug.")

code/modules/paperwork/paper_bundle.dm

@@ -21,9 +21,9 @@
 	var/obj/item/weapon/paper/P
 	if(istype(W, /obj/item/weapon/paper))
 		P = W
-		if (istype(P, /obj/item/weapon/paper/carbon))
+		if(istype(P, /obj/item/weapon/paper/carbon))
 			var/obj/item/weapon/paper/carbon/C = P
-			if (!C.iscopy && !C.copied)
+			if(!C.iscopy && !C.copied)
 				to_chat(user, "<span class='notice'>Take off the carbon copy first.</span>")
 				add_fingerprint(user)
 				return
@@ -177,7 +177,7 @@
 			update_icon()
 	else
 		to_chat(usr, "<span class='notice'>You need to hold it in your hands to change pages.</span>")
-	if (istype(src.loc, /mob))
+	if(istype(src.loc, /mob))
 		src.attack_self(src.loc)
 		updateUsrDialog()
 

code/modules/paperwork/paperbin.dm

@@ -48,10 +48,10 @@
 
 
 /obj/item/weapon/paper_bin/attack_hand(mob/user as mob)
-	if (ishuman(user))
+	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
 		var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]
-		if (H.hand)
+		if(H.hand)
 			temp = H.organs_by_name["l_hand"]
 		if(temp && !temp.is_usable())
 			to_chat(H, "<span class='notice'>You try to move your [temp.name], but cannot!")

code/modules/paperwork/photocopier.dm

@@ -50,16 +50,16 @@
 			if(toner <= 0)
 				break
 
-			if (istype(copyitem, /obj/item/weapon/paper))
+			if(istype(copyitem, /obj/item/weapon/paper))
 				copy(copyitem)
 				sleep(15)
-			else if (istype(copyitem, /obj/item/weapon/photo))
+			else if(istype(copyitem, /obj/item/weapon/photo))
 				photocopy(copyitem)
 				sleep(15)
-			else if (istype(copyitem, /obj/item/weapon/paper_bundle))
+			else if(istype(copyitem, /obj/item/weapon/paper_bundle))
 				var/obj/item/weapon/paper_bundle/B = bundlecopy(copyitem)
 				sleep(15*B.amount)
-			else if (ass && ass.loc == src.loc)
+			else if(ass && ass.loc == src.loc)
 				copyass()
 				sleep(15)
 			else
@@ -97,13 +97,13 @@
 			if(!camera)
 				return
 			var/datum/picture/selection = camera.selectpicture()
-			if (!selection)
+			if(!selection)
 				return
 
 			playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1)
 			var/obj/item/weapon/photo/p = new /obj/item/weapon/photo (src.loc)
 			p.construct(selection)
-			if (p.desc == "")
+			if(p.desc == "")
 				p.desc += "Copied by [tempAI.name]"
 			else
 				p.desc += " - Copied by [tempAI.name]"
@@ -188,11 +188,11 @@
 	c.offset_y = copy.offset_y
 	var/list/temp_overlays = copy.overlays       //Iterates through stamps
 	var/image/img                                //and puts a matching
-	for (var/j = 1, j <= temp_overlays.len, j++) //gray overlay onto the copy
+	for(var/j = 1, j <= temp_overlays.len, j++) //gray overlay onto the copy
 		if(copy.ico.len)
-			if (findtext(copy.ico[j], "cap") || findtext(copy.ico[j], "cent"))
+			if(findtext(copy.ico[j], "cap") || findtext(copy.ico[j], "cent"))
 				img = image('icons/obj/bureaucracy.dmi', "paper_stamp-circle")
-			else if (findtext(copy.ico[j], "deny"))
+			else if(findtext(copy.ico[j], "deny"))
 				img = image('icons/obj/bureaucracy.dmi', "paper_stamp-x")
 			else
 				img = image('icons/obj/bureaucracy.dmi', "paper_stamp-dots")
@@ -228,7 +228,17 @@
 	var/icon/temp_img
 	if(!check_ass()) //You have to be sitting on the copier and either be a xeno or a human without clothes on.
 		return
-
+	if(emagged)
+		if(ishuman(ass))
+			var/mob/living/carbon/human/H = ass
+			to_chat(H, "<span class='notice'>Something smells toasty...</span>")
+			var/obj/item/organ/external/G = H.get_organ("groin")
+			G.take_damage(0, 30)
+			spawn(20)
+				H.emote("scream")
+		else
+			to_chat(ass, "<span class='notice'>Something smells toasty...</span>")
+			ass.apply_damage(30, BURN)
 	if(ishuman(ass)) //Suit checks are in check_ass
 		var/mob/living/carbon/human/H = ass
 		temp_img = icon('icons/obj/butts.dmi', H.species.butt_sprite)
@@ -283,7 +293,7 @@
 
 /obj/machinery/photocopier/MouseDrop_T(mob/target, mob/user)
 	check_ass() //Just to make sure that you can re-drag somebody onto it after they moved off.
-	if (!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.stat || istype(user, /mob/living/silicon/ai) || target == ass)
+	if(!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.stat || istype(user, /mob/living/silicon/ai) || target == ass)
 		return
 	src.add_fingerprint(user)
 	if(target == user && !user.incapacitated())
@@ -310,6 +320,13 @@
 	else
 		return 1
 
+/obj/machinery/photocopier/emag_act(user as mob)
+	if(!emagged)
+		emagged = 1
+		to_chat(user, "<span class='notice'>You overload the photocopier's laser printing mechanism.</span>")
+	else
+		to_chat(user, "<span class='notice'>The photocopier's laser printing mechanism is already overloaded!</span>")
+
 /obj/item/device/toner
 	name = "toner cartridge"
 	icon_state = "tonercartridge"

code/modules/paperwork/photography.dm

@@ -249,7 +249,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
 				// Calculate where we are relative to the center of the photo
 				var/xoff = (A.x - center.x) * 32 + center_offset
 				var/yoff = (A.y - center.y) * 32 + center_offset
-				if (istype(A,/atom/movable))
+				if(istype(A,/atom/movable))
 					xoff+=A:step_x
 					yoff+=A:step_y
 				res.Blend(img, blendMode2iconMode(A.blend_mode),  A.pixel_x + xoff, A.pixel_y + yoff)
@@ -523,7 +523,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
 		to_chat(user, "This video camera can send live feeds to the entertainment network. It's [camera ? "" : "in"]active.")
 
 /obj/item/device/videocam/hear_talk(mob/M as mob, msg)
-	if (camera && on)
+	if(camera && on)
 		if(get_dist(src, M) <= canhear_range)
 			talk_into(M, msg)
 		for(var/obj/machinery/computer/security/telescreen/T in machines)
@@ -531,7 +531,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
 				T.audible_message("<span class='game radio'><span class='name'>(Newscaster) [M]</span> says, '[msg]'", hearing_distance = 2)
 
 /obj/item/device/videocam/hear_message(mob/M as mob, msg)
-	if (camera && on)
+	if(camera && on)
 		for(var/obj/machinery/computer/security/telescreen/T in machines)
 			if(T.current == camera)
 				T.audible_message("<span class='game radio'><span class='name'>(Newscaster) [M]</span> [msg]", hearing_distance = 2)