Merge with upstream/master

Fixes conflicts
2026-08-25 13:07:46 +01:00 · 2015-02-18 13:41:32 -05:00
parent fbd9c367c0 87ed05c146
commit 4bcdb94a99
325 changed files with 5353 additions and 3917 deletions
@@ -37,18 +37,10 @@
 				if(!src.makeWizard())
 					usr << "\red Unfortunately there weren't enough candidates available."
 			if("7")
-				log_admin("[key_name(usr)] has spawned a nuke team.")
-				if(!src.makeNukeTeam())
+				log_admin("[key_name(usr)] has spawned vampires.")
+				if(!src.makeVampires())
 					usr << "\red Unfortunately there weren't enough candidates available."
 			if("8")
-				log_admin("[key_name(usr)] has spawned a ninja.")
-				src.makeSpaceNinja()
-			if("9")
-				log_admin("[key_name(usr)] has spawned aliens.")
-				src.makeAliens()
-			if("10")
-				log_admin("[key_name(usr)] has spawned a death squad.")
-			if("11")
 				log_admin("[key_name(usr)] has spawned vox raiders.")
 				if(!src.makeVoxRaiders())
 					usr << "\red Unfortunately there weren't enough candidates available."
@@ -294,7 +286,7 @@
 			if("sentinel")			M.change_mob_type( /mob/living/carbon/alien/humanoid/sentinel , null, null, delmob )
 			if("larva")				M.change_mob_type( /mob/living/carbon/alien/larva , null, null, delmob )
 			if("human")				M.change_mob_type( /mob/living/carbon/human/human , null, null, delmob )
-			if("slime")			M.change_mob_type( /mob/living/carbon/slime , null, null, delmob )
+			if("slime")				M.change_mob_type( /mob/living/carbon/slime , null, null, delmob )
 			if("monkey")			M.change_mob_type( /mob/living/carbon/monkey , null, null, delmob )
 			if("robot")				M.change_mob_type( /mob/living/silicon/robot , null, null, delmob )
 			if("cat")				M.change_mob_type( /mob/living/simple_animal/cat , null, null, delmob )
@@ -1100,6 +1092,7 @@
 		message_admins("\blue [key_name_admin(usr)] attempting to monkeyize [key_name_admin(H)]", 1)
 		H.monkeyize()

+
 	else if(href_list["corgione"])
 		if(!check_rights(R_SPAWN))	return

@@ -1437,7 +1430,7 @@
 						foo += text("<B>Is an AI</B> | ")
 					else
 						foo += text("<A HREF='?src=\ref[];makeai=\ref[]'>Make AI</A> | ", src, M)
-					if(M.z != 2)
+					if(!(M.z in config.admin_levels))
 						foo += text("<A HREF='?src=\ref[];sendtoprison=\ref[]'>Prison</A> | ", src, M)
 						foo += text("<A HREF='?src=\ref[];sendtomaze=\ref[]'>Maze</A> | ", src, M)
 					else
@@ -1569,11 +1562,11 @@
 			usr << "This can only be used on instances of type /mob/living"
 			return

-		if(alert(src.owner, "Are you sure you wish to hit [key_name(M)] with Blue Space Artillery?",  "Confirm Firing?" , "Yes" , "No") != "Yes")
+		if(alert(src.owner, "Are you sure you wish to hit [key_name(M)] with Bluespace Artillery?",  "Confirm Firing?" , "Yes" , "No") != "Yes")
 			return

 		if(BSACooldown)
-			src.owner << "Standby!  Reload cycle in progress!  Gunnary crews ready in five seconds!"
+			src.owner << "Standby. Reload cycle in progress. Gunnery crews ready in five seconds!"
 			return

 		BSACooldown = 1
@@ -1605,6 +1598,9 @@
 			M.stuttering = 20

 	else if(href_list["CentcommReply"])
+		if(!check_rights(R_ADMIN))
+			return
+
 		var/mob/living/carbon/human/H = locate(href_list["CentcommReply"])
 		if(!istype(H))
 			usr << "This can only be used on instances of type /mob/living/carbon/human"
@@ -1622,10 +1618,16 @@
 		H << "You hear something crackle in your headset for a moment before a voice speaks.  \"Please stand by for a message from Central Command.  Message as follows. [input].  Message ends.\""

 	else if(href_list["SyndicateReply"])
+		if(!check_rights(R_ADMIN))
+			return
+
 		var/mob/living/carbon/human/H = locate(href_list["SyndicateReply"])
 		if(!istype(H))
 			usr << "This can only be used on instances of type /mob/living/carbon/human"
 			return
+		if(H.stat != 0)
+			usr << "The person you are trying to contact is not conscious."
+			return
 		if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset))
 			usr << "The person you are trying to contact is not wearing a headset"
 			return
@@ -1654,6 +1656,9 @@
 		H << "You hear something crackle in your headset for a moment before a voice speaks.  \"Please stand by for a message from your HONKbrothers.  Message as follows, HONK. [input].  Message ends, HONK.\""

 	else if(href_list["AdminFaxView"])
+		if(!check_rights(R_ADMIN))
+			return
+
 		var/obj/item/fax = locate(href_list["AdminFaxView"])
 		if (istype(fax, /obj/item/weapon/paper))
 			var/obj/item/weapon/paper/P = fax
@@ -1676,6 +1681,9 @@
 			usr << "\red The faxed item is not viewable. This is probably a bug, and should be reported on the tracker: [fax.type]"

 	else if (href_list["AdminFaxViewPage"])
+		if(!check_rights(R_ADMIN))
+			return
+
 		var/page = text2num(href_list["AdminFaxViewPage"])
 		var/obj/item/weapon/paper_bundle/bundle = locate(href_list["paper_bundle"])

@@ -1689,51 +1697,155 @@
 			H.show(src.owner)
 		return

-	else if(href_list["CentcommFaxReply"])
-		var/mob/sender = locate(href_list["CentcommFaxReply"])
+	else if(href_list["AdminFaxCreate"])
+		if(!check_rights(R_ADMIN))
+			return
+
+		var/mob/sender = locate(href_list["AdminFaxCreate"])
 		var/obj/machinery/photocopier/faxmachine/fax = locate(href_list["originfax"])
+		var/faxtype = href_list["faxtype"]
+		var/reply_to = locate(href_list["replyto"])
+		var/destination
+		var/notify

-		var/input = input(src.owner, "Please enter a message to reply to [key_name(sender)] via secure connection. NOTE: BBCode does not work, but HTML tags do! Use <br> for line breaks.", "Outgoing message from Centcomm", "") as message|null
-		if(!input)	return
+		var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(null) //hopefully the null loc won't cause trouble for us

-		var/customname = input(src.owner, "Pick a title for the report", "Title") as text|null
+		if(!fax)
+			var/list/departmentoptions = alldepartments + "All Departments"
+			destination = input(usr, "To which department?", "Choose a department", "") as null|anything in departmentoptions
+			if(!destination)
+				del(P)
+				return
+
+			for(var/obj/machinery/photocopier/faxmachine/F in allfaxes)
+				if(destination != "All Departments" && F.department == destination)
+					fax = F
+
+
+		var/input = input(src.owner, "Please enter a message to send a fax via secure connection. Use <br> for line breaks. Both pencode and HTML work.", "Outgoing message from Centcomm", "") as message|null
+		if(!input)
+			del(P)
+			return
+		input = P.parsepencode(input) // Encode everything from pencode to html
+
+		var/customname = input(src.owner, "Pick a title for the fax.", "Fax Title") as text|null
+		if(!customname)
+			customname = "paper"
+
+		var/stampname
+		var/stamptype
+		var/stampvalue
+		var/sendername
+		switch(faxtype)
+			if("Central Command")
+				stamptype = "icon"
+				stampvalue = "cent"
+				sendername = command_name()
+			if("Syndicate")
+				sendername = "UNKNOWN"
+			if("Administrator")
+				stamptype = input(src.owner, "Pick a stamp type.", "Stamp Type") as null|anything in list("icon","text","none")
+				if(stamptype == "icon")
+					stampname = input(src.owner, "Pick a stamp icon.", "Stamp Icon") as null|anything in list("centcom","granted","denied","clown")
+					switch(stampname)
+						if("centcom")
+							stampvalue = "cent"
+						if("granted")
+							stampvalue = "ok"
+						if("denied")
+							stampvalue = "deny"
+						if("clown")
+							stampvalue = "clown"
+				else if(stamptype == "text")
+					stampvalue = input(src.owner, "What should the stamp say?", "Stamp Text") as text|null
+				else if(stamptype == "none")
+					stamptype = ""
+				else
+					del(P)
+					return
+
+				sendername = input(src.owner, "What organization does the fax come from? This determines the prefix of the paper (i.e. Central Command- Title). This is optional.", "Organization") as text|null
+
+		if(sender)
+			notify = alert(src.owner, "Would you like to inform the original sender that a fax has arrived?","Notify Sender","Yes","No")

 		// Create the reply message
-		var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( null ) //hopefully the null loc won't cause trouble for us
-		P.name = "[command_name()]- [customname]"
+		if(sendername)
+			P.name = "[sendername]- [customname]"
+		else
+			P.name = "[customname]"
 		P.info = input
 		P.update_icon()
-		P.stamps += "<HR><img src=large_stamp-cent.png>"
-		var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
 		P.x = rand(-2, 0)
 		P.y = rand(-1, 2)
 		P.offset_x += P.x
 		P.offset_y += P.y
-		stampoverlay.pixel_x = P.x
-		stampoverlay.pixel_y = P.y
+		if(stamptype)
+			var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
+			stampoverlay.pixel_x = P.x
+			stampoverlay.pixel_y = P.y

-		if(!P.ico)
-			P.ico = new
-		P.ico += "paper_stamp-cent"
-		stampoverlay.icon_state = "paper_stamp-cent"
+			if(!P.ico)
+				P.ico = new
+			P.ico += "paper_stamp-[stampvalue]"
+			stampoverlay.icon_state = "paper_stamp-[stampvalue]"

-		// Stamps
-		if(!P.stamped)
-			P.stamped = new
-		P.stamped += /obj/item/weapon/stamp/centcom
-		P.overlays += stampoverlay
+			if(stamptype == "icon")
+				if(!P.stamped)
+					P.stamped = new
+				P.stamped += /obj/item/weapon/stamp/centcom
+				P.overlays += stampoverlay
+				P.stamps += "<HR><img src=large_stamp-[stampvalue].png>"

-		if(fax.recievefax(P))
-			src.owner << "\blue Message reply to transmitted successfully."
-			log_admin("[key_name(src.owner)] replied to a fax message from [key_name(sender)]: [input]")
-			message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(sender)]", 1)
+			else if(stamptype == "text")
+				if(!P.stamped)
+					P.stamped = new
+				P.stamped += /obj/item/weapon/stamp
+				P.overlays += stampoverlay
+				P.stamps += "<HR><i>[stampvalue]</i>"
+
+		if(destination != "All Departments")
+			if(!fax.receivefax(P))
+				src.owner << "\red Message transmission failed."
+				return
 		else
-			src.owner << "\red Message reply failed."
+			for(var/obj/machinery/photocopier/faxmachine/F in allfaxes)
+				if((F.z in config.station_levels))
+					if(!F.receivefax(P))
+						src.owner << "\red Message transmission to [F.department] failed."

-		spawn(100)
-			del(P)
+		var/datum/fax/admin/A = new /datum/fax/admin()
+		A.name = P.name
+		A.from_department = faxtype
+		if(destination != "All Departments")
+			A.to_department = fax.department
+		else
+			A.to_department = "All Departments"
+		A.origin = "Administrator"
+		A.message = P
+		A.reply_to = reply_to
+		A.sent_by = usr
+		A.sent_at = world.time
+
+		src.owner << "\blue Message transmitted successfully."
+		if(notify == "Yes")
+			var/mob/living/carbon/human/H = sender
+			if(istype(H) && H.stat == 1 && (istype(H.l_ear, /obj/item/device/radio/headset) || istype(H.r_ear, /obj/item/device/radio/headset)))
+				sender << "Your headset pings, notifying you that a reply to your fax has arrived."
+		if(sender)
+			log_admin("[key_name(src.owner)] replied to a fax message from [key_name(sender)]: [input]")
+			message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(sender)] (<a href='?_src_=holder;AdminFaxView=\ref[P]'>VIEW</a>).", 1)
+		else
+			log_admin("[key_name(src.owner)] sent a fax message to [destination]: [input]")
+			message_admins("[key_name_admin(src.owner)] sent a fax message to [destination] (<a href='?_src_=holder;AdminFaxView=\ref[P]'>VIEW</a>).", 1)
 		return

+	else if(href_list["refreshfaxpanel"])
+		if(!check_rights(R_ADMIN))
+			return
+
+		fax_panel(usr)
+
 	else if(href_list["jumpto"])
 		if(!check_rights(R_ADMIN))	return

@@ -1992,11 +2104,11 @@
 				if(gravity_is_on)
 					log_admin("[key_name(usr)] toggled gravity on.", 1)
 					message_admins("\blue [key_name_admin(usr)] toggled gravity on.", 1)
-					command_alert("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.")
+					command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.")
 				else
 					log_admin("[key_name(usr)] toggled gravity off.", 1)
 					message_admins("\blue [key_name_admin(usr)] toggled gravity off.", 1)
-					command_alert("Feedback surge detected in mass-distributions systems. Artifical gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes. Have a nice day.")
+					command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artifical gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes. Have a nice day.")
 			if("wave")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","Meteor")
@@ -2095,7 +2207,7 @@
 				for(var/mob/living/carbon/human/H in mob_list)
 					var/turf/loc = find_loc(H)
 					var/security = 0
-					if(loc.z > 1 || prisonwarped.Find(H))
+					if(!(loc.z in config.station_levels) || prisonwarped.Find(H))

 //don't warp them if they aren't ready or are already there
 						continue
@@ -2408,7 +2520,7 @@
 				message_admins("[key_name_admin(usr)] made the floor LAVA! It'll last [length] seconds and it will deal [damage] damage to everyone.", 1)

 				for(var/turf/simulated/floor/F in world)
-					if(F.z == 1)
+					if((F.z in config.station_levels))
 						F.name = "lava"
 						F.desc = "The floor is LAVA!"
 						F.overlays += "lava"
@@ -2433,7 +2545,7 @@
 						sleep(10)

 					for(var/turf/simulated/floor/F in world) // Reset everything.
-						if(F.z == 1)
+						if((F.z in config.station_levels))
 							F.name = initial(F.name)
 							F.desc = initial(F.desc)
 							F.overlays.Cut()
@@ -2481,11 +2593,10 @@
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","EgL")
 				for(var/obj/machinery/door/airlock/W in world)
-					if(W.z == 1 && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison))
+					if((W.z in config.station_levels) && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison))
 						W.req_access = list()
 				message_admins("[key_name_admin(usr)] activated Egalitarian Station mode")
-				command_alert("Centcomm airlock control override activated. Please take this time to get acquainted with your coworkers.")
-				world << sound('sound/AI/commandreport.ogg')
+				command_announcement.Announce("Centcomm airlock control override activated. Please take this time to get acquainted with your coworkers.", new_sound = 'sound/AI/commandreport.ogg')
 			if("dorf")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","DF")
@@ -2500,8 +2611,7 @@
 				message_admins("[key_name_admin(usr)] triggered an ion storm")
 				var/show_log = alert(usr, "Show ion message?", "Message", "Yes", "No")
 				if(show_log == "Yes")
-					command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
-					world << sound('sound/AI/ionstorm.ogg')
+					command_announcement.Announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", new_sound = 'sound/AI/ionstorm.ogg')
 			if("carp")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","Crp")