Merge branch 'master' into upstream-merge-34067

2018-01-08 20:01:59 +00:00
parent 266457c274 aedf5bfdca
commit d4cf5d2eba
745 changed files with 25216 additions and 18453 deletions
@@ -61,7 +61,7 @@
 //DNA - Because fuck you and your magic numbers being all over the codebase.
 #define DNA_BLOCK_SIZE				3

-#define DNA_UNI_IDENTITY_BLOCKS		19
+#define DNA_UNI_IDENTITY_BLOCKS		19 //CIT CHANGE - adds more DNA blocks for cit's mutant bodyparts. Update citadel_defines.dm if this gets changed.
 #define DNA_HAIR_COLOR_BLOCK		1
 #define DNA_FACIAL_HAIR_COLOR_BLOCK	2
 #define DNA_SKIN_TONE_BLOCK			3
@@ -69,19 +69,7 @@
 #define DNA_GENDER_BLOCK			5
 #define DNA_FACIAL_HAIR_STYLE_BLOCK	6
 #define DNA_HAIR_STYLE_BLOCK		7
-#define DNA_EYE_COLOR_TWO_BLOCK		8
-#define DNA_EYE_COLOR_SWITCH_BLOCK	9
-#define DNA_EYE_COLOR_BLOCK			10
-#define DNA_COLOR_ONE_BLOCK			11
-#define DNA_COLOR_TWO_BLOCK			12
-#define DNA_COLOR_THR_BLOCK			13
-#define DNA_COLOR_SWITCH_BLOCK		14
-#define DNA_COLOR_SWITCH_MAX			7 //must be (2^(n+1))-1
-#define DNA_COCK_BLOCK				15
-#define DNA_MUTANTRACE_BLOCK		16
-#define DNA_MUTANTTAIL_BLOCK		17
-#define DNA_MUTANTWING_BLOCK		18
-#define DNA_WINGCOLOR_BLOCK			19
+
 #define DNA_STRUC_ENZYMES_BLOCKS	18
 #define DNA_UNIQUE_ENZYMES_LEN		32

@@ -127,7 +115,7 @@
 #define TOXINLOVER		24
 #define DIGITIGRADE		25	//Uses weird leg sprites. Optional for Lizards, required for ashwalkers. Don't give it to other races unless you make sprites for this (see human_parts_greyscale.dmi)
 #define NO_UNDERWEAR	26
-#define NOLIVER 		27
+#define NOLIVER			27
 #define NOSTOMACH		28
 #define NO_DNA_COPY     29
 #define DRINKSBLOOD		30
@@ -135,11 +123,6 @@
 #define SPECIES_INORGANIC 32
 #define SPECIES_UNDEAD  33
 #define SPECIES_ROBOTIC 34
-//citadel code
-#define MUTCOLORS2		35
-#define MUTCOLORS3		36
-#define NOAROUSAL		37 //Stops all arousal effects
-#define NOGENITALS		38 //Cannot create, use, or otherwise have genitals

 #define ORGAN_SLOT_BRAIN "brain"
 #define ORGAN_SLOT_APPENDIX "appendix"
@@ -1,79 +1,5 @@
 //A set of constants used to determine which type of mute an admin wishes to apply:
 //Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1)
-//Therefore there needs to be a gap between the flags_1 for the automute flags_1
-#define MUTE_IC			1
-#define MUTE_OOC		2
-#define MUTE_PRAY		4
-#define MUTE_ADMINHELP	8
-#define MUTE_DEADCHAT	16
-#define MUTE_ALL		31
-
-//Some constants for DB_Ban
-#define BANTYPE_PERMA		1
-#define BANTYPE_TEMP		2
-#define BANTYPE_JOB_PERMA	3
-#define BANTYPE_JOB_TEMP	4
-#define BANTYPE_ANY_FULLBAN	5 //used to locate stuff to unban.
-
-#define BANTYPE_ADMIN_PERMA	7
-#define BANTYPE_ADMIN_TEMP	8
-#define BANTYPE_ANY_JOB		9 //used to remove jobbans
-
-//Please don't edit these values without speaking to Errorage first	~Carn
-//Admin Permissions
-#define R_BUILDMODE		1
-#define R_ADMIN			2
-#define R_BAN			4
-#define R_FUN			8
-#define R_SERVER		16
-#define R_DEBUG			32
-#define R_POSSESS		64
-#define R_PERMISSIONS	128
-#define R_STEALTH		256
-#define R_POLL			512
-#define R_VAREDIT		1024
-#define R_SOUNDS		2048
-#define R_SPAWN			4096
-
-#if DM_VERSION > 512
-#error Remove the flag below , its been long enough
-#endif
-//legacy , remove post 512, it was replaced by R_POLL
-#define R_REJUVINATE	2
-
-#define R_MAXPERMISSION 4096 //This holds the maximum value for a permission. It is used in iteration, so keep it updated.
-
-#define ADMIN_QUE(user) "(<a href='?_src_=holder;adminmoreinfo=\ref[user]'>?</a>)"
-#define ADMIN_FLW(user) "(<a href='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</a>)"
-#define ADMIN_PP(user) "(<a href='?_src_=holder;adminplayeropts=\ref[user]'>PP</a>)"
-#define ADMIN_VV(atom) "(<a href='?_src_=vars;Vars=\ref[atom]'>VV</a>)"
-#define ADMIN_SM(user) "(<a href='?_src_=holder;subtlemessage=\ref[user]'>SM</a>)"
-#define ADMIN_TP(user) "(<a href='?_src_=holder;traitor=\ref[user]'>TP</a>)"
-#define ADMIN_KICK(user) "(<a href='?_src_=holder;boot2=\ref[user]'>KICK</a>)"
-#define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;CentComReply=\ref[user]'>RPLY</a>)"
-#define ADMIN_SYNDICATE_REPLY(user) "(<a href='?_src_=holder;SyndicateReply=\ref[user]'>RPLY</a>)"
-#define ADMIN_SC(user) "(<a href='?_src_=holder;adminspawncookie=\ref[user]'>SC</a>)"
-#define ADMIN_SMITE(user) "(<a href='?_src_=holder;adminsmite=\ref[user]'>SMITE</a>)"
-#define ADMIN_LOOKUP(user) "[key_name_admin(user)][ADMIN_QUE(user)]"
-#define ADMIN_LOOKUPFLW(user) "[key_name_admin(user)][ADMIN_QUE(user)] [ADMIN_FLW(user)]"
-#define ADMIN_SET_SD_CODE "(<a href='?_src_=holder;set_selfdestruct_code=1'>SETCODE</a>)"
-#define ADMIN_FULLMONTY_NONAME(user) "[ADMIN_QUE(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_FLW(user)] [ADMIN_TP(user)] [ADMIN_INDIVIDUALLOG(user)] [ADMIN_SMITE(user)]"
-#define ADMIN_FULLMONTY(user) "[key_name_admin(user)] [ADMIN_FULLMONTY_NONAME(user)]"
-#define ADMIN_JMP(src) "(<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)"
-#define COORD(src) "[src ? "([src.x],[src.y],[src.z])" : "nonexistent location"]"
-#define ADMIN_COORDJMP(src) "[src ? "[COORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
-#define ADMIN_INDIVIDUALLOG(user) "(<a href='?_src_=holder;individuallog=\ref[user]'>LOGS</a>)"
-
-#define ADMIN_PUNISHMENT_LIGHTNING "Lightning bolt"
-#define ADMIN_PUNISHMENT_BRAINDAMAGE "Brain damage"
-#define ADMIN_PUNISHMENT_GIB "Gib"
-#define ADMIN_PUNISHMENT_BSA "Bluespace Artillery Device"
-
-#define AHELP_ACTIVE 1
-#define AHELP_CLOSED 2
-#define AHELP_RESOLVED 3
-//A set of constants used to determine which type of mute an admin wishes to apply:
-//Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1)
 //Therefore there needs to be a gap between the flags for the automute flags
 #define MUTE_IC			1
 #define MUTE_OOC		2
@@ -9,12 +9,12 @@
 #define ANTAG_DATUM_TRAITOR 			/datum/antagonist/traitor
 #define ANTAG_DATUM_TRAITOR_HUMAN		/datum/antagonist/traitor/human
 #define ANTAG_DATUM_TRAITOR_AI			/datum/antagonist/traitor/AI
-#define ANTAG_DATUM_IAA				/datum/antagonist/traitor/internal_affairs
+#define ANTAG_DATUM_IAA					/datum/antagonist/traitor/internal_affairs
 #define ANTAG_DATUM_IAA_HUMAN	  		/datum/antagonist/traitor/human/internal_affairs
-#define ANTAG_DATUM_IAA_AI	  		/datum/antagonist/traitor/AI/internal_affairs
+#define ANTAG_DATUM_IAA_AI	  			/datum/antagonist/traitor/AI/internal_affairs
 #define ANTAG_DATUM_BROTHER 			/datum/antagonist/brother
 #define ANTAG_DATUM_ABDUCTOR 			/datum/antagonist/abductor
-#define ANTAG_DATUM_ABDUCTOR_SCIENTIST 			/datum/antagonist/abductor/scientist
-#define ANTAG_DATUM_ABDUCTOR_AGENT 			/datum/antagonist/abductor/agent
+#define ANTAG_DATUM_ABDUCTOR_SCIENTIST 	/datum/antagonist/abductor/scientist
+#define ANTAG_DATUM_ABDUCTOR_AGENT 		/datum/antagonist/abductor/agent
 #define ANTAG_DATUM_MONKEY				/datum/antagonist/monkey
-#define ANTAG_DATUM_MONKEY_LEADER		/datum/antagonist/monkey/leader
+#define ANTAG_DATUM_MONKEY_LEADER		/datum/antagonist/monkey/leader
@@ -71,3 +71,31 @@
 #define ADMIN_MARKREAD(client) "(<a href='?_src_=holder;markedread=\ref[client]'>MARK READ</a>)"//marks an adminhelp as read and under investigation
 #define ADMIN_IC(client) "(<a href='?_src_=holder;icissue=\ref[client]'>IC</a>)"//marks and adminhelp as an IC issue
 #define ADMIN_REJECT(client) "(<a href='?_src_=holder;rejectadminhelp=\ref[client]'>REJT</a>)"//Rejects an adminhelp for being unclear or otherwise unhelpful. resets their adminhelp timer
+
+//Damage stuffs
+#define AROUSAL "arousal"
+
+//DNA stuffs. Remember to change this if upstream adds more snowflake options
+#define DNA_EYE_COLOR_TWO_BLOCK		8
+#define DNA_EYE_COLOR_SWITCH_BLOCK	9
+#define DNA_EYE_COLOR_BLOCK			10
+#define DNA_COLOR_ONE_BLOCK			11
+#define DNA_COLOR_TWO_BLOCK			12
+#define DNA_COLOR_THR_BLOCK			13
+#define DNA_COLOR_SWITCH_BLOCK		14
+#define DNA_COLOR_SWITCH_MAX			7 //must be (2^(n+1))-1
+#define DNA_COCK_BLOCK				15
+#define DNA_MUTANTRACE_BLOCK		16
+#define DNA_MUTANTTAIL_BLOCK		17
+#define DNA_MUTANTWING_BLOCK		18
+#define DNA_WINGCOLOR_BLOCK			19
+
+
+//Species stuffs. Remember to change this if upstream updates species flags
+#define MUTCOLORS2		35
+#define MUTCOLORS3		36
+#define NOAROUSAL		37 //Stops all arousal effects
+#define NOGENITALS		38 //Cannot create, use, or otherwise have genitals
+
+//Brainslugs
+#define isborer(A) (istype(A, /mob/living/simple_animal/borer))
@@ -0,0 +1,4 @@
+// This is eventualy for wjohn to add more color standardization stuff like I keep asking him >:(
+
+#define COLOR_INPUT_DISABLED "#F0F0F0"
+#define COLOR_INPUT_ENABLED "#D3B5B5"
@@ -11,9 +11,6 @@
 #define STAMINA 	"stamina"
 #define BRAIN		"brain"

-//Citadel code
-#define AROUSAL		"arousal"
-
 //bitflag damage defines used for suicide_act
 #define BRUTELOSS 1
 #define FIRELOSS 2
@@ -22,9 +19,6 @@
 #define SHAME 16
 #define MANUAL_SUICIDE 32	//suicide_act will do the actual killing.

-//Citadel code
-#define AROUSAL	32
-
 #define STUN		"stun"
 #define KNOCKDOWN		"knockdown"
 #define UNCONSCIOUS	"unconscious"
@@ -75,14 +75,6 @@
 // /obj/item/clothing signals
 #define COMSIG_SHOES_STEP_ACTION "shoes_step_action"			//from base of obj/item/clothing/shoes/proc/step_action(): ()

-// /obj/item signals
-#define COMSIG_ITEM_ATTACK "item_attack"						//from base of obj/item/attack(): (mob/living/target, mob/living/user)
-#define COMSIG_ITEM_ATTACK_SELF "item_attack_self"				//from base of obj/item/attack_self(): (mob)
-#define COMSIG_ITEM_ATTACK_OBJ "item_attack_obj"				//from base of obj/item/attack_obj(): (obj, mob)
-
-// /obj/item/clothing signals
-#define COMSIG_SHOES_STEP_ACTION "shoes_step_action"			//from base of obj/item/clothing/shoes/proc/step_action(): ()
-
 // /obj/machinery signals
 #define COMSIG_MACHINE_PROCESS "machine_process"				//from machinery subsystem fire(): ()
 #define COMSIG_MACHINE_PROCESS_ATMOS "machine_process_atmos"	//from air subsystem process_atmos_machinery(): ()
@@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define ON_BORDER_1			512		// item has priority to check when entering or leaving

 #define NOSLIP_1			1024 		//prevents from slipping on wet floors, in space etc
-#define CLEAN_ON_MOVE_1		2048
+#define _UNUSED_1		2048

 // BLOCK_GAS_SMOKE_EFFECT_1 only used in masks at the moment.
 #define BLOCK_GAS_SMOKE_EFFECT_1 4096	// blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
@@ -86,7 +86,7 @@
 			. = SLOT_POCKET


-//Bit flags_1 for the flags_inv variable, which determine when a piece of clothing hides another. IE a helmet hiding glasses.
+//Bit flags for the flags_inv variable, which determine when a piece of clothing hides another. IE a helmet hiding glasses.
 #define HIDEGLOVES		1
 #define HIDESUITSTORAGE	2
 #define HIDEJUMPSUIT	4	//these first four are only used in exterior suits
@@ -134,17 +134,17 @@
 #define THERMAL_PROTECTION_HAND_LEFT	0.025
 #define THERMAL_PROTECTION_HAND_RIGHT	0.025

-//flags_1 for female outfits: How much the game can safely "take off" the uniform without it looking weird
+//flags for female outfits: How much the game can safely "take off" the uniform without it looking weird
 #define NO_FEMALE_UNIFORM			0
 #define FEMALE_UNIFORM_FULL			1
 #define FEMALE_UNIFORM_TOP			2

-//flags_1 for alternate styles: These are hard sprited so don't set this if you didn't put the effort in
+//flags for alternate styles: These are hard sprited so don't set this if you didn't put the effort in
 #define NORMAL_STYLE		0
 #define ALT_STYLE			1
 #define DIGITIGRADE_STYLE 	2

-//flags_1 for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts
+//flags for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts
 #define NO_MUTANTRACE_VARIATION		0
 #define MUTANTRACE_VARIATION		1

@@ -152,9 +152,9 @@
 #define FULL_DIGITIGRADE			1
 #define SQUISHED_DIGITIGRADE		2

-//flags_1 for covering body parts
+//flags for covering body parts
 #define GLASSESCOVERSEYES	1
-#define MASKCOVERSEYES		2		// get rid of some of the other retardation in these flags_1
+#define MASKCOVERSEYES		2		// get rid of some of the other retardation in these flags
 #define HEADCOVERSEYES		4		// feel free to realloc these numbers for other purposes
 #define MASKCOVERSMOUTH		8		// on other items, these are just for mask/head
 #define HEADCOVERSMOUTH		16
@@ -199,7 +199,8 @@ GLOBAL_LIST_INIT(detective_vest_allowed, typecacheof(list(
 	/obj/item/reagent_containers/spray/pepper,
 	/obj/item/restraints/handcuffs,
 	/obj/item/storage/fancy/cigarettes,
-	/obj/item/tank/internals/emergency_oxygen)))
+	/obj/item/tank/internals/emergency_oxygen,
+	/obj/item/tank/internals/plasmaman)))

 GLOBAL_LIST_INIT(security_vest_allowed, typecacheof(list(
 	/obj/item/ammo_box,
@@ -212,7 +213,8 @@ GLOBAL_LIST_INIT(security_vest_allowed, typecacheof(list(
 	/obj/item/melee/classic_baton/telescopic,
 	/obj/item/reagent_containers/spray/pepper,
 	/obj/item/restraints/handcuffs,
-	/obj/item/tank/internals/emergency_oxygen)))
+	/obj/item/tank/internals/emergency_oxygen,
+	/obj/item/tank/internals/plasmaman)))

 GLOBAL_LIST_INIT(security_wintercoat_allowed, typecacheof(list(
 	/obj/item/ammo_box,
@@ -227,4 +229,5 @@ GLOBAL_LIST_INIT(security_wintercoat_allowed, typecacheof(list(
 	/obj/item/reagent_containers/spray/pepper,
 	/obj/item/restraints/handcuffs,
 	/obj/item/tank/internals/emergency_oxygen,
+	/obj/item/tank/internals/plasmaman,
 	/obj/item/toy)))
@@ -102,8 +102,6 @@

 #define isrevenant(A) (istype(A, /mob/living/simple_animal/revenant))

-#define isborer(A) (istype(A, /mob/living/simple_animal/borer))
-
 #define isbot(A) (istype(A, /mob/living/simple_animal/bot))

 #define iscrab(A) (istype(A, /mob/living/simple_animal/crab))
@@ -49,7 +49,7 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
 #define FRIDAY_13TH				"Friday the 13th"

 //Human Overlays Indexes/////////
-//citadel code
+//LOTS OF CIT CHANGES HERE. BE CAREFUL WHEN UPSTREAM ADDS MORE LAYERS
 #define MUTATIONS_LAYER			30		//mutations. Tk headglows, cold resistance glow, etc
 #define GENITALS_BEHIND_LAYER	29		//Some genitalia needs to be behind everything, such as with taurs (Taurs use body_behind_layer
 #define BODY_BEHIND_LAYER		28		//certain mutantrace features (tail when looking south) that must appear behind the body parts
@@ -1,52 +1,52 @@
-
-//Preference toggles
-#define SOUND_ADMINHELP	1
-#define SOUND_MIDI		2
-#define SOUND_AMBIENCE	4
-#define SOUND_LOBBY		8
-#define MEMBER_PUBLIC	16
-#define INTENT_STYLE	32
-#define MIDROUND_ANTAG	64
-#define SOUND_INSTRUMENTS	128
-#define SOUND_SHIP_AMBIENCE 256
-#define SOUND_PRAYERS 512
-#define ANNOUNCE_LOGIN 1024
-#define SOUND_ANNOUNCEMENTS 2048
-#define DISABLE_DEATHRATTLE 4096
-#define DISABLE_ARRIVALRATTLE 8192
-
-#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS)
-
-//Chat toggles
-#define CHAT_OOC		1
-#define CHAT_DEAD		2
-#define CHAT_GHOSTEARS	4
-#define CHAT_GHOSTSIGHT	8
-#define CHAT_PRAYER		16
-#define CHAT_RADIO		32
-#define CHAT_PULLR		64
-#define CHAT_GHOSTWHISPER 128
-#define CHAT_GHOSTPDA	256
-#define CHAT_GHOSTRADIO 512
-#define CHAT_LOOC		1024
-
-#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_LOOC)
-
-#define PARALLAX_INSANE -1 //for show offs
-#define PARALLAX_HIGH    0 //default.
-#define PARALLAX_MED     1
-#define PARALLAX_LOW     2
-#define PARALLAX_DISABLE 3 //this option must be the highest number
-
-#define PARALLAX_DELAY_DEFAULT world.tick_lag
-#define PARALLAX_DELAY_MED     1
-#define PARALLAX_DELAY_LOW     2
-
-#define SEC_DEPT_NONE "None"
-#define SEC_DEPT_RANDOM "Random"
-#define SEC_DEPT_ENGINEERING "Engineering"
-#define SEC_DEPT_MEDICAL "Medical"
-#define SEC_DEPT_SCIENCE "Science"
+
+//Preference toggles
+#define SOUND_ADMINHELP	1
+#define SOUND_MIDI		2
+#define SOUND_AMBIENCE	4
+#define SOUND_LOBBY		8
+#define MEMBER_PUBLIC	16
+#define INTENT_STYLE	32
+#define MIDROUND_ANTAG	64
+#define SOUND_INSTRUMENTS	128
+#define SOUND_SHIP_AMBIENCE 256
+#define SOUND_PRAYERS 512
+#define ANNOUNCE_LOGIN 1024
+#define SOUND_ANNOUNCEMENTS 2048
+#define DISABLE_DEATHRATTLE 4096
+#define DISABLE_ARRIVALRATTLE 8192
+
+#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS)
+
+//Chat toggles
+#define CHAT_OOC		1
+#define CHAT_DEAD		2
+#define CHAT_GHOSTEARS	4
+#define CHAT_GHOSTSIGHT	8
+#define CHAT_PRAYER		16
+#define CHAT_RADIO		32
+#define CHAT_PULLR		64
+#define CHAT_GHOSTWHISPER 128
+#define CHAT_GHOSTPDA	256
+#define CHAT_GHOSTRADIO 512
+#define CHAT_LOOC		1024
+
+#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_LOOC)
+
+#define PARALLAX_INSANE -1 //for show offs
+#define PARALLAX_HIGH    0 //default.
+#define PARALLAX_MED     1
+#define PARALLAX_LOW     2
+#define PARALLAX_DISABLE 3 //this option must be the highest number
+
+#define PARALLAX_DELAY_DEFAULT world.tick_lag
+#define PARALLAX_DELAY_MED     1
+#define PARALLAX_DELAY_LOW     2
+
+#define SEC_DEPT_NONE "None"
+#define SEC_DEPT_RANDOM "Random"
+#define SEC_DEPT_ENGINEERING "Engineering"
+#define SEC_DEPT_MEDICAL "Medical"
+#define SEC_DEPT_SCIENCE "Science"
 #define SEC_DEPT_SUPPLY "Supply"

 // Playtime tracking system, see jobs_exp.dm
@@ -1,5 +1,56 @@
-#define MIN_FREE_FREQ 1201
-#define MAX_FREE_FREQ 1599
+// Radios use a large variety of predefined frequencies.

-#define MIN_FREQ 1441
-#define MAX_FREQ 1489
+#define MIN_FREE_FREQ 1201 // -------------------------------------------------
+// Frequencies are always odd numbers and range from 1201 to 1599.
+
+#define FREQ_SYNDICATE 1213  // Nuke op comms frequency, dark brown
+#define FREQ_CTF_RED 1215  // CTF red team comms frequency, red
+#define FREQ_CTF_BLUE 1217  // CTF blue team comms frequency, blue
+#define FREQ_CENTCOM 1337  // CentCom comms frequency, gray
+#define FREQ_SUPPLY 1347  // Supply comms frequency, light brown
+#define FREQ_SERVICE 1349  // Service comms frequency, green
+#define FREQ_SCIENCE 1351  // Science comms frequency, plum
+#define FREQ_COMMAND 1353  // Command comms frequency, gold
+#define FREQ_MEDICAL 1355  // Medical comms frequency, soft blue
+#define FREQ_ENGINEERING 1357  // Engineering comms frequency, orange
+#define FREQ_SECURITY 1359  // Security comms frequency, red
+
+#define FREQ_STATUS_DISPLAYS 1435
+#define FREQ_ATMOS_ALARMS 1437  // air alarms <-> alert computers
+#define FREQ_ATMOS_CONTROL 1439  // air alarms <-> vents and scrubbers
+
+#define MIN_FREQ 1441 // ------------------------------------------------------
+// Only the 1441 to 1489 range is freely available for general conversation.
+// This represents 1/8th of the available spectrum.
+
+#define FREQ_ATMOS_STORAGE 1441
+#define FREQ_NAV_BEACON 1445
+#define FREQ_AI_PRIVATE 1447  // AI private comms frequency, magenta
+#define FREQ_PRESSURE_PLATE 1447
+#define FREQ_AIRLOCK_CONTROL 1449
+#define FREQ_ELECTROPACK 1449
+#define FREQ_MAGNETS 1449
+#define FREQ_LOCATOR_IMPLANT 1451
+#define FREQ_SIGNALER 1457  // the default for new signalers
+#define FREQ_COMMON 1459  // Common comms frequency, dark green
+
+#define MAX_FREQ 1489 // ------------------------------------------------------
+
+#define MAX_FREE_FREQ 1599 // -------------------------------------------------
+
+// Transmission types.
+#define TRANSMISSION_WIRE 0  // some sort of wired connection, not used
+#define TRANSMISSION_RADIO 1  // electromagnetic radiation (default)
+#define TRANSMISSION_SUBSPACE 2  // subspace transmission (headsets only)
+#define TRANSMISSION_SUPERSPACE 3  // reaches independent (CentCom) radios only
+
+// Filter types, used as an optimization to avoid unnecessary proc calls.
+#define RADIO_TO_AIRALARM "to_airalarm"
+#define RADIO_FROM_AIRALARM "from_airalarm"
+#define RADIO_SIGNALER "signaler"
+#define RADIO_ATMOSIA "atmosia"
+#define RADIO_NAVBEACONS "navbeacons"
+#define RADIO_AIRLOCK "airlock"
+#define RADIO_MAGNETS "magnets"
+
+#define DEFAULT_SIGNALER_CODE 30
@@ -17,6 +17,7 @@
 #define MODE_HOLOPAD "holopad"
 #define MODE_CHANGELING "changeling"
 #define MODE_VOCALCORDS "cords"
+#define MODE_MONKEY "monkeyhive"

 //Spans. Robot speech, italics, etc. Applied in compose_message().
 #define SPAN_ROBOT "robot"
@@ -5,7 +5,7 @@
 //use this define if you want to do configuration outside of this file
 #ifndef SERVER_TOOLS_EXTERNAL_CONFIGURATION
 //Comment this out once you've filled in the below
-//#error /tg/station server tools interface unconfigured
+#error /tg/station server tools interface unconfigured

 //Required interfaces (fill in with your codebase equivalent):

@@ -61,7 +61,6 @@
 #define DOCKING_NULL_DESTINATION 8
 #define DOCKING_NULL_SOURCE 16

-
 //Docking turf movements
 #define MOVE_TURF 1
 #define MOVE_AREA 2
@@ -25,6 +25,6 @@
 //for clothing visor toggles, these determine which vars to toggle
 #define VISOR_FLASHPROTECT 1
 #define VISOR_TINT 2
-#define VISOR_VISIONFLAGS 4 //all following flags_1 only matter for glasses
+#define VISOR_VISIONFLAGS 4 //all following flags only matter for glasses
 #define VISOR_DARKNESSVIEW 8
 #define VISOR_INVISVIEW 16
@@ -9,14 +9,14 @@
 #define CHANNEL_BUZZ 1017
 #define CHANNEL_BICYCLE 1016

-//Citadel code
+//CIT CHANNELS - TRY NOT TO REGRESS
 #define CHANNEL_PRED 1015
 #define CHANNEL_PREYLOOP 1014

 //THIS SHOULD ALWAYS BE THE LOWEST ONE!
 //KEEP IT UPDATED

-#define CHANNEL_HIGHEST_AVAILABLE 1013
+#define CHANNEL_HIGHEST_AVAILABLE 1013 //CIT CHANGE - COMPENSATES FOR VORESOUND CHANNELS


 #define SOUND_MINIMUM_PRESSURE 10
@@ -46,16 +46,17 @@
 #define INIT_ORDER_DBCORE 18
 #define INIT_ORDER_BLACKBOX 17
 #define INIT_ORDER_SERVER_MAINT 16
-#define INIT_ORDER_RESEARCH 15
-#define INIT_ORDER_EVENTS 14
-#define INIT_ORDER_JOBS 13
-#define INIT_ORDER_TICKER 12
-#define INIT_ORDER_MAPPING 11
-#define INIT_ORDER_ATOMS 10
-#define INIT_ORDER_NETWORKS 9
-#define INIT_ORDER_LANGUAGE 8
-#define INIT_ORDER_MACHINES 7
-#define INIT_ORDER_CIRCUIT 6
+#define INIT_ORDER_INPUT 15
+#define INIT_ORDER_RESEARCH 14
+#define INIT_ORDER_EVENTS 13
+#define INIT_ORDER_JOBS 12
+#define INIT_ORDER_TICKER 11
+#define INIT_ORDER_MAPPING 10
+#define INIT_ORDER_ATOMS 9
+#define INIT_ORDER_NETWORKS 8
+#define INIT_ORDER_LANGUAGE 7
+#define INIT_ORDER_MACHINES 6
+#define INIT_ORDER_CIRCUIT 5
 #define INIT_ORDER_TIMER 1
 #define INIT_ORDER_DEFAULT 0
 #define INIT_ORDER_AIR -1
@@ -136,4 +137,4 @@
 			A.overlays.Cut();\
 		}\
 		A.flags_1 &= ~OVERLAY_QUEUED_1;\
-	}
+	}
@@ -30,7 +30,7 @@ GLOBAL_VAR_INIT(cmp_field, "name")
 	return sorttext(a.ckey, b.ckey)

 /proc/cmp_subsystem_init(datum/controller/subsystem/a, datum/controller/subsystem/b)
-	return b.init_order - a.init_order
+	return initial(b.init_order) - initial(a.init_order)	//uses initial() so it can be used on types

 /proc/cmp_subsystem_display(datum/controller/subsystem/a, datum/controller/subsystem/b)
 	return sorttext(b.name, a.name)
@@ -72,4 +72,3 @@ GLOBAL_VAR_INIT(cmp_field, "name")

 /proc/cmp_profile_count_dsc(list/A, list/B)
 	return B[PROFILE_ITEM_COUNT] - A[PROFILE_ITEM_COUNT]
-
@@ -30,7 +30,7 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/legs, GLOB.legs_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, GLOB.r_wings_list,roundstart = TRUE)
 	
-	//citadel code
+//CIT CHANGES START HERE, ADDS SNOWFLAKE BODYPARTS AND MORE
 	//mammal bodyparts (fucking furries)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/mam_body_markings, GLOB.mam_body_markings_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/mam_tails, GLOB.mam_tails_list)
@@ -56,7 +56,7 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list)
 	GLOB.breasts_size_list = list("a","b","c","d","e") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing.
-
+//END OF CIT CHANGES

 	//Species
 	for(var/spath in subtypesof(/datum/species))
@@ -69,6 +69,7 @@
 	if(!GLOB.wings_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, GLOB.wings_list)

+	//CIT CHANGES - genitals and such
 	if(!GLOB.cock_shapes_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/penis, GLOB.cock_shapes_list)
 	if(!GLOB.vagina_shapes_list.len)
@@ -90,6 +91,7 @@
 			womb = 1
 			breasts = 1 */

+	//CIT CHANGE - changes this entire return to support cit's snowflake parts
 	return(list(
 		"mcolor" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
 		"mcolor2" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
@@ -473,7 +475,7 @@ Proc for attack log creation, because really why not
 	if(extra_args)
 		new_args += extra_args

- 	for(var/j in 1 to amount)
+	for(var/j in 1 to amount)
 		var/atom/X = new spawn_type(arglist(new_args))
 		X.admin_spawned = admin_spawn

@@ -121,7 +121,6 @@ GLOBAL_VAR(command_name)
 	return new_station_name

 /proc/syndicate_name()
-
 	var/name = ""

 	// Prefix
@@ -143,7 +142,7 @@ GLOBAL_VAR(command_name)
 	else
 		name += pick("-", "*", "")
 		name += pick("Tech", "Sun", "Co", "Tek", "X", "Inc", "Gen", "Star", "Dyne", "Code", "Hive")
-		
+
 	return name


@@ -55,7 +55,7 @@

 	for(var/mob/M in GLOB.player_list)
 		if(!isnewplayer(M) && M.can_hear())
-			to_chat(M, "<b><font size = 3><font color = red>[title]</font color><BR>[message]</font size></b><BR>")
+			to_chat(M, "<span class='big bold'><font color = red>[title]</font color><BR>[message]</span><BR>")
 			if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
 				if(alert)
 					SEND_SOUND(M, sound('sound/misc/notice1.ogg'))
@@ -103,10 +103,10 @@
 	if(LAZYLEN(GLOB.round_end_notifiees))
 		send2irc("Notice", "[GLOB.round_end_notifiees.Join(", ")] the round has ended.")

-	/*for(var/client/C in GLOB.clients)
+	for(var/client/C in GLOB.clients)
 		if(!C.credits)
 			C.RollCredits()
-		C.playtitlemusic(40)*/
+		C.playtitlemusic(40)

 	display_report()

@@ -434,7 +434,10 @@


 /proc/printplayer(datum/mind/ply, fleecheck)
-	var/text = "<b>[ply.key]</b> was <b>[ply.name]</b> the <b>[ply.assigned_role]</b> and"
+	var/jobtext = ""
+	if(ply.assigned_role)
+		jobtext = " the <b>[ply.assigned_role]</b>"
+	var/text = "<b>[ply.key]</b> was <b>[ply.name]</b>[jobtext] and"
 	if(ply.current)
 		if(ply.current.stat == DEAD)
 			text += " <span class='redtext'>died</span>"
@@ -139,7 +139,6 @@
 			return NORTH

 //returns the north-zero clockwise angle in degrees, given a direction
-
 /proc/dir2angle(D)
 	switch(D)
 		if(NORTH)
@@ -199,6 +199,8 @@ Turf and target are separate in case you want to teleport some distance from a t
 			newname = C.prefs.custom_names[role]
 		else
 			switch(role)
+				if("human")
+					newname = random_unique_name(gender)
 				if("clown")
 					newname = pick(GLOB.clown_names)
 				if("mime")
@@ -524,7 +526,7 @@ Turf and target are separate in case you want to teleport some distance from a t
 		processing_list.Cut(1, 2)
 		//Byond does not allow things to be in multiple contents, or double parent-child hierarchies, so only += is needed
 		//This is also why we don't need to check against assembled as we go along
-		processing_list += A.contents 
+		processing_list += A.contents
 		assembled += A
 	return assembled

@@ -1487,6 +1489,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 	var/time_low = num2hex(world.time, 3)

 	var/time_clock = num2hex(TICK_DELTA_TO_MS(world.tick_usage), 3)
+
 	return "{[time_high]-[time_mid]-[GUID_VERSION][time_low]-[GUID_VARIANT][time_clock]-[node_id]}"

 // \ref behaviour got changed in 512 so this is necesary to replicate old behaviour.
@@ -104,6 +104,6 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/storage/secure/briefcase = 3,
 	/obj/item/storage/toolbox/artistic = 2,
 	/obj/item/toy/eightball = 1,
-	/obj/item/storage/daki = 3,
+	/obj/item/storage/daki = 3, //VERY IMPORTANT CIT CHANGE - adds bodypillows to maint
 	"" = 3
 	))
@@ -29,4 +29,4 @@ GLOBAL_LIST_EMPTY(bots_list)
 GLOBAL_LIST_EMPTY(language_datum_instances)
 GLOBAL_LIST_EMPTY(all_languages)

-GLOBAL_LIST_EMPTY(latejoiners) //All latejoining people, for traitor-target purposes.
+GLOBAL_LIST_EMPTY(latejoiners) //CIT CHANGE - All latejoining people, for traitor-target purposes.
@@ -45,3 +45,4 @@ Be sure to include required js functions in your page, or it'll raise an excepti

 		receiver << output(argums,"[control_id]:replaceContent")
 	return
+
@@ -104,7 +104,7 @@
 #define ui_health "EAST-1:28,CENTER-1:15"
 #define ui_internal "EAST-1:28,CENTER:17"

-//borgs 
+//borgs
 #define ui_borg_health "EAST-1:28,CENTER-1:15"		//borgs have the health display where humans have the pressure damage indicator.

 //aliens
@@ -0,0 +1,69 @@
+#define CREDIT_ROLL_SPEED 125
+#define CREDIT_SPAWN_SPEED 10
+#define CREDIT_ANIMATE_HEIGHT (14 * world.icon_size)
+#define CREDIT_EASE_DURATION 22
+#define CREDITS_PATH "[GLOB.config_dir]contributors.dmi"
+
+/client/proc/RollCredits()
+	set waitfor = FALSE
+	if(!fexists(CREDITS_PATH))
+		return
+	var/icon/credits_icon = new(CREDITS_PATH)
+	LAZYINITLIST(credits)
+	var/list/_credits = credits
+	verbs += /client/proc/ClearCredits
+	var/static/list/credit_order_for_this_round
+	if(isnull(credit_order_for_this_round))
+		credit_order_for_this_round = list("Thanks for playing!") + (shuffle(icon_states(credits_icon)) - "Thanks for playing!")
+	for(var/I in credit_order_for_this_round)
+		if(!credits)
+			return
+		_credits += new /obj/screen/credit(null, I, src, credits_icon)
+		sleep(CREDIT_SPAWN_SPEED)
+	sleep(CREDIT_ROLL_SPEED - CREDIT_SPAWN_SPEED)
+	verbs -= /client/proc/ClearCredits
+	qdel(credits_icon)
+
+/client/proc/ClearCredits()
+	set name = "Hide Credits"
+	set category = "OOC"
+	verbs -= /client/proc/ClearCredits
+	QDEL_LIST(credits)
+	credits = null
+
+/obj/screen/credit
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	alpha = 0
+	screen_loc = "12,1"
+	layer = SPLASHSCREEN_LAYER
+	var/client/parent
+	var/matrix/target
+
+/obj/screen/credit/Initialize(mapload, credited, client/P, icon/I)
+	. = ..()
+	icon = I
+	parent = P
+	icon_state = credited
+	maptext = credited
+	maptext_x = world.icon_size + 8
+	maptext_y = (world.icon_size / 2) - 4
+	maptext_width = world.icon_size * 3
+	var/matrix/M = matrix(transform)
+	M.Translate(0, CREDIT_ANIMATE_HEIGHT)
+	animate(src, transform = M, time = CREDIT_ROLL_SPEED)
+	target = M
+	animate(src, alpha = 255, time = CREDIT_EASE_DURATION, flags = ANIMATION_PARALLEL)
+	addtimer(CALLBACK(src, .proc/FadeOut), CREDIT_ROLL_SPEED - CREDIT_EASE_DURATION)
+	QDEL_IN(src, CREDIT_ROLL_SPEED)
+	P.screen += src
+
+/obj/screen/credit/Destroy()
+	var/client/P = parent
+	P.screen -= src
+	icon = null
+	LAZYREMOVE(P.credits, src)
+	parent = null
+	return ..()
+
+/obj/screen/credit/proc/FadeOut()
+	animate(src, alpha = 0, transform = target, time = CREDIT_EASE_DURATION)
@@ -1,3 +1,4 @@
+
 /mob
 	var/list/screens = list()

@@ -174,4 +175,3 @@
 	layer = LIGHTING_LAYER
 	blend_mode = BLEND_ADD
 	show_when_dead = TRUE
-	
@@ -280,10 +280,11 @@
 	healths = new /obj/screen/healths()
 	infodisplay += healths

-	//citadel code
+	//CIT CHANGE - adds arousal to hud
 	arousal = new /obj/screen/arousal()
 	arousal.icon_state = (owner.canbearoused == 1 ? "arousal0" : "")
 	infodisplay += arousal
+	//END OF CIT CHANGES

 	healthdoll = new /obj/screen/healthdoll()
 	infodisplay += healthdoll
@@ -60,8 +60,6 @@
 		var/pref = C.prefs.parallax
 		if (isnull(pref))
 			pref = PARALLAX_HIGH
-			if (C.byond_version < 511)
-				pref = PARALLAX_DISABLE
 		switch(C.prefs.parallax)
 			if (PARALLAX_INSANE)
 				C.parallax_throttle = FALSE
@@ -58,7 +58,7 @@
 	SendSignal(COMSIG_ITEM_ATTACK, M, user)
 	if(flags_1 & NOBLUDGEON_1)
 		return
-    
+
 	if(force && user.has_disability(DISABILITY_PACIFISM))
 		to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
 		return
@@ -78,7 +78,7 @@
 	var/mob/living/carbon/tk_user = null

 /obj/item/tk_grab/Initialize()
-	..()
+	. = ..()
 	START_PROCESSING(SSfastprocess, src)

 /obj/item/tk_grab/Destroy()
@@ -53,8 +53,9 @@
 	. = !(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "ValidateAndSet" && GLOB.LastAdminCalledTargetRef == "[REF(src)]")
 	if(!.)
 		log_admin_private("Config set of [type] to [str_val] attempted by [key_name(usr)]")
-		
+
 /datum/config_entry/proc/ValidateAndSet(str_val)
+	VASProcCallGuard(str_val)
 	CRASH("Invalid config entry type!")

 /datum/config_entry/proc/ValidateKeyedList(str_val, list_mode, splitter)
@@ -78,12 +79,12 @@
 			if(LIST_MODE_TEXT)
 				temp = key_value
 				continue_check = temp
-		if(continue_check && ValidateKeyName(key_name))
+		if(continue_check && ValidateListEntry(key_name, temp))
 			value[key_name] = temp
 			return TRUE
 	return FALSE

-/datum/config_entry/proc/ValidateKeyName(key_name)
+/datum/config_entry/proc/ValidateListEntry(key_name, key_value)
 	return TRUE

 /datum/config_entry/string
@@ -95,6 +96,8 @@
 	return var_name != "auto_trim" && ..()

 /datum/config_entry/string/ValidateAndSet(str_val)
+	if(!VASProcCallGuard(str_val))
+		return FALSE
 	value = auto_trim ? trim(str_val) : str_val
 	return TRUE

@@ -106,6 +109,8 @@
 	var/min_val = -INFINITY

 /datum/config_entry/number/ValidateAndSet(str_val)
+	if(!VASProcCallGuard(str_val))
+		return FALSE
 	var/temp = text2num(trim(str_val))
 	if(!isnull(temp))
 		value = CLAMP(integer ? round(temp) : temp, min_val, max_val)
@@ -123,6 +128,8 @@
 	abstract_type = /datum/config_entry/flag

 /datum/config_entry/flag/ValidateAndSet(str_val)
+	if(!VASProcCallGuard(str_val))
+		return FALSE
 	value = text2num(trim(str_val)) != 0
 	return TRUE

@@ -131,6 +138,8 @@
 	value = list()

 /datum/config_entry/number_list/ValidateAndSet(str_val)
+	if(!VASProcCallGuard(str_val))
+		return FALSE
 	str_val = trim(str_val)
 	var/list/new_list = list()
 	var/list/values = splittext(str_val," ")
@@ -150,6 +159,8 @@
 	dupes_allowed = TRUE

 /datum/config_entry/keyed_flag_list/ValidateAndSet(str_val)
+	if(!VASProcCallGuard(str_val))
+		return FALSE
 	return ValidateKeyedList(str_val, LIST_MODE_FLAG, " ")

 /datum/config_entry/keyed_number_list
@@ -162,6 +173,8 @@
 	return var_name != "splitter" && ..()

 /datum/config_entry/keyed_number_list/ValidateAndSet(str_val)
+	if(!VASProcCallGuard(str_val))
+		return FALSE
 	return ValidateKeyedList(str_val, LIST_MODE_NUM, splitter)

 /datum/config_entry/keyed_string_list
@@ -174,6 +187,8 @@
 	return var_name != "splitter" && ..()

 /datum/config_entry/keyed_string_list/ValidateAndSet(str_val)
+	if(!VASProcCallGuard(str_val))
+		return FALSE
 	return ValidateKeyedList(str_val, LIST_MODE_TEXT, splitter)

 #undef LIST_MODE_NUM
@@ -97,19 +97,13 @@ GLOBAL_PROTECT(config_dir)

 		if(!entry)
 			continue
-		if(entry == "$include")
-			if(!value)
-				log_config("Warning: Invalid $include directive: [value]")
-			else
-				LoadEntries(value, stack)
-				++.
-			continue
 		
 		if(entry == "$include")
 			if(!value)
 				log_config("Warning: Invalid $include directive: [value]")
 			else
 				LoadEntries(value, stack)
+				++.
 			continue
 		
 		var/datum/config_entry/E = _entries[entry]
@@ -2,13 +2,21 @@
 	protection = CONFIG_ENTRY_HIDDEN

 /datum/config_entry/string/comms_key/ValidateAndSet(str_val)
-    return str_val != "default_pwd" && length(str_val) > 6 && ..()
+	return str_val != "default_pwd" && length(str_val) > 6 && ..()

 /datum/config_entry/keyed_string_list/cross_server
 	protection = CONFIG_ENTRY_LOCKED

-/datum/config_entry/string/cross_server_address/ValidateAndSet(str_val)
-    return str_val != "byond:\\address:port" && ..()
+/datum/config_entry/keyed_string_list/cross_server/ValidateAndSet(str_val)
+	. = ..()
+	if(.)
+		var/list/newv = list()
+		for(var/I in value)
+			newv[replacetext(I, "+", " ")] = value[I]
+		value = newv
+
+/datum/config_entry/keyed_string_list/cross_server/ValidateListEntry(key_name, key_value)
+	return key_value != "byond:\\address:port" && ..()

 /datum/config_entry/string/cross_comms_name

@@ -17,4 +25,4 @@ GLOBAL_VAR_INIT(medals_enabled, TRUE)	//will be auto set to false if the game fa
 /datum/config_entry/string/medal_hub_address

 /datum/config_entry/string/medal_hub_password
-	protection = CONFIG_ENTRY_HIDDEN
+	protection = CONFIG_ENTRY_HIDDEN
@@ -2,27 +2,27 @@

 /datum/config_entry/keyed_number_list/probability

-/datum/config_entry/keyed_number_list/probability/ValidateKeyName(key_name)
+/datum/config_entry/keyed_number_list/probability/ValidateListEntry(key_name)
 	return key_name in config.modes

 /datum/config_entry/keyed_number_list/max_pop

-/datum/config_entry/keyed_number_list/max_pop/ValidateKeyName(key_name)
+/datum/config_entry/keyed_number_list/max_pop/ValidateListEntry(key_name)
 	return key_name in config.modes

 /datum/config_entry/keyed_number_list/min_pop

-/datum/config_entry/keyed_number_list/min_pop/ValidateKeyName(key_name)
+/datum/config_entry/keyed_number_list/min_pop/ValidateListEntry(key_name, key_value)
 	return key_name in config.modes

 /datum/config_entry/keyed_flag_list/continuous	// which roundtypes continue if all antagonists die

-/datum/config_entry/keyed_flag_list/continuous/ValidateKeyName(key_name)
+/datum/config_entry/keyed_flag_list/continuous/ValidateListEntry(key_name, key_value)
 	return key_name in config.modes

 /datum/config_entry/keyed_flag_list/midround_antag	// which roundtypes use the midround antagonist system

-/datum/config_entry/keyed_flag_list/midround_antag/ValidateKeyName(key_name)
+/datum/config_entry/keyed_flag_list/midround_antag/ValidateListEntry(key_name, key_value)
 	return key_name in config.modes

 /datum/config_entry/keyed_string_list/policy
@@ -394,4 +394,4 @@ SUBSYSTEM_DEF(air)
 #undef SSAIR_EXCITEDGROUPS
 #undef SSAIR_HIGHPRESSURE
 #undef SSAIR_HOTSPOT
-#undef SSAIR_SUPERCONDUCTIVITY
+#undef SSAIR_SUPERCONDUCTIVITY
@@ -8,11 +8,10 @@ SUBSYSTEM_DEF(blackbox)
 	var/list/feedback = list()	//list of datum/feedback_variable
 	var/triggertime = 0
 	var/sealed = FALSE	//time to stop tracking stats?
-	var/list/research_levels = list() //list of highest tech levels attained that isn't lost lost by destruction of RD computers
-	var/list/versions = list("time_dilation_current" = 2,
-							"science_techweb_unlock" = 2,
-							"antagonists" = 3) //associative list of any feedback variables that have had their format changed since creation and their current version, remember to update this
-
+	var/list/versions = list("antagonists" = 3,
+							"admin_secrets_fun_used" = 2,
+							"time_dilation_current" = 3,
+							"science_techweb_unlock" = 2) //associative list of any feedback variables that have had their format changed since creation and their current version, remember to update this

 /datum/controller/subsystem/blackbox/Initialize()
 	triggertime = world.time
@@ -59,13 +58,11 @@ SUBSYSTEM_DEF(blackbox)
 /datum/controller/subsystem/blackbox/Shutdown()
 	sealed = FALSE
 	record_feedback("tally", "ahelp_stats", GLOB.ahelp_tickets.active_tickets.len, "unresolved")
-	for (var/obj/machinery/message_server/MS in GLOB.message_servers)
+	for (var/obj/machinery/telecomms/message_server/MS in GLOB.telecomms_list)
 		if (MS.pda_msgs.len)
 			record_feedback("tally", "radio_usage", MS.pda_msgs.len, "PDA")
 		if (MS.rc_msgs.len)
 			record_feedback("tally", "radio_usage", MS.rc_msgs.len, "request console")
-	if(research_levels.len)
-		SSblackbox.record_feedback("associative", "high_research_level", 1, research_levels)

 	if (!SSdbcore.Connect())
 		return
@@ -92,39 +89,35 @@ SUBSYSTEM_DEF(blackbox)
 	sealed = TRUE
 	return TRUE

-/datum/controller/subsystem/blackbox/proc/log_research(tech, level)
-	if(!(tech in research_levels) || research_levels[tech] < level)
-		research_levels[tech] = level
-
 /datum/controller/subsystem/blackbox/proc/LogBroadcast(freq)
 	if(sealed)
 		return
 	switch(freq)
-		if(1459)
+		if(FREQ_COMMON)
 			record_feedback("tally", "radio_usage", 1, "common")
-		if(GLOB.SCI_FREQ)
+		if(FREQ_SCIENCE)
 			record_feedback("tally", "radio_usage", 1, "science")
-		if(GLOB.COMM_FREQ)
+		if(FREQ_COMMAND)
 			record_feedback("tally", "radio_usage", 1, "command")
-		if(GLOB.MED_FREQ)
+		if(FREQ_MEDICAL)
 			record_feedback("tally", "radio_usage", 1, "medical")
-		if(GLOB.ENG_FREQ)
+		if(FREQ_ENGINEERING)
 			record_feedback("tally", "radio_usage", 1, "engineering")
-		if(GLOB.SEC_FREQ)
+		if(FREQ_SECURITY)
 			record_feedback("tally", "radio_usage", 1, "security")
-		if(GLOB.SYND_FREQ)
+		if(FREQ_SYNDICATE)
 			record_feedback("tally", "radio_usage", 1, "syndicate")
-		if(GLOB.SERV_FREQ)
+		if(FREQ_SERVICE)
 			record_feedback("tally", "radio_usage", 1, "service")
-		if(GLOB.SUPP_FREQ)
+		if(FREQ_SUPPLY)
 			record_feedback("tally", "radio_usage", 1, "supply")
-		if(GLOB.CENTCOM_FREQ)
+		if(FREQ_CENTCOM)
 			record_feedback("tally", "radio_usage", 1, "centcom")
-		if(GLOB.AIPRIV_FREQ)
+		if(FREQ_AI_PRIVATE)
 			record_feedback("tally", "radio_usage", 1, "ai private")
-		if(GLOB.REDTEAM_FREQ)
+		if(FREQ_CTF_RED)
 			record_feedback("tally", "radio_usage", 1, "CTF red team")
-		if(GLOB.BLUETEAM_FREQ)
+		if(FREQ_CTF_BLUE)
 			record_feedback("tally", "radio_usage", 1, "CTF blue team")
 		else
 			record_feedback("tally", "radio_usage", 1, "other")
@@ -194,7 +187,7 @@ Versioning
 						"gun_fired" = 2)
 */
 /datum/controller/subsystem/blackbox/proc/record_feedback(key_type, key, increment, data, overwrite)
-	if(sealed || !key_type || !istext(key) || !isnum(increment || !data))
+	if(sealed || !key_type || !istext(key) || !isnum(increment) || !data)
 		return
 	var/datum/feedback_variable/FV = find_feedback_datum(key, key_type)
 	switch(key_type)
@@ -41,4 +41,3 @@ SUBSYSTEM_DEF(idlenpcpool)
 				SA.consider_wakeup()
 		if (MC_TICK_CHECK)
 			return
-
@@ -1,10 +1,101 @@
 SUBSYSTEM_DEF(input)
 	name = "Input"
 	wait = 1 //SS_TICKER means this runs every tick
-	flags = SS_TICKER | SS_NO_INIT
+	init_order = INIT_ORDER_INPUT
+	flags = SS_TICKER
 	priority = FIRE_PRIORITY_INPUT
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY

+	var/list/macro_sets
+
+/datum/controller/subsystem/input/Initialize()
+	setup_default_macro_sets()
+
+	initialized = TRUE
+
+	refresh_client_macro_sets()
+
+	return ..()
+
+// This is for when macro sets are eventualy datumized
+/datum/controller/subsystem/input/proc/setup_default_macro_sets()
+	var/list/static/default_macro_sets
+	
+	if(default_macro_sets)
+		macro_sets = default_macro_sets
+		return
+
+	default_macro_sets = list(
+		"default" = list(
+			"Tab" = "\".winset \\\"input.focus=true?map.focus=true input.background-color=[COLOR_INPUT_DISABLED]:input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"",
+			"O" = "ooc",
+			"T" = "say",
+			"M" = "me",
+			"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs
+			"Any" = "\"KeyDown \[\[*\]\]\"",
+			"Any+UP" = "\"KeyUp \[\[*\]\]\"",
+			),
+		"old_default" = list(
+			"Tab" = "\".winset \\\"mainwindow.macro=old_hotkeys map.focus=true input.background-color=[COLOR_INPUT_DISABLED]\\\"\"",
+			"Ctrl+T" = "say",
+			"Ctrl+O" = "ooc",
+			),
+		"old_hotkeys" = list(
+			"Tab" = "\".winset \\\"mainwindow.macro=old_default input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"",
+			"O" = "ooc",
+			"T" = "say",
+			"M" = "me",
+			"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs
+			"Any" = "\"KeyDown \[\[*\]\]\"",
+			"Any+UP" = "\"KeyUp \[\[*\]\]\"",
+			),
+		)
+
+	// Because i'm lazy and don't want to type all these out twice
+	var/list/old_default = default_macro_sets["old_default"]
+
+	var/list/static/oldmode_keys = list(
+		"North", "East", "South", "West",
+		"Northeast", "Southeast", "Northwest", "Southwest",
+		"Insert", "Delete", "Ctrl", "Alt",
+		"F1", "F2", "F5", "F6", "F7", "F8", "F12",
+		)
+
+	for(var/i in 1 to oldmode_keys.len)
+		var/key = oldmode_keys[i]
+		old_default[key] = "\"KeyDown [key]\""
+		old_default["[key]+UP"] = "\"KeyUp [key]\""
+
+	var/list/static/oldmode_ctrl_override_keys = list(
+		"W" = "W", "A" = "A", "S" = "S", "D" = "D", // movement
+		"1" = "1", "2" = "2", "3" = "3", "4" = "4", // intent
+		"B" = "B", // resist
+		"E" = "E", // quick equip
+		"F" = "F", // intent left
+		"G" = "G", // intent right
+		"H" = "H", // stop pulling
+		"Q" = "Q", // drop
+		"R" = "R", // throw
+		"X" = "X", // switch hands
+		"Y" = "Y", // activate item
+		"Z" = "Z", // activate item
+		)
+
+	for(var/i in 1 to oldmode_ctrl_override_keys.len)
+		var/key = oldmode_ctrl_override_keys[i]
+		var/override = oldmode_ctrl_override_keys[key]
+		old_default["Ctrl+[key]"] = "\"KeyDown [override]\""
+		old_default["Ctrl+[key]+UP"] = "\"KeyUp [override]\""
+
+	macro_sets = default_macro_sets
+
+// Badmins just wanna have fun ♪
+/datum/controller/subsystem/input/proc/refresh_client_macro_sets()
+	var/list/clients = GLOB.clients
+	for(var/i in 1 to clients.len)
+		var/client/user = clients[i]
+		user.set_macros()
+
 /datum/controller/subsystem/input/fire()
 	var/list/clients = GLOB.clients // Let's sing the list cache song
 	for(var/i in 1 to clients.len)
@@ -107,9 +107,6 @@ SUBSYSTEM_DEF(job)
 		if(player.mind && job.title in player.mind.restricted_roles)
 			Debug("FOC incompatible with antagonist role, Player: [player]")
 			continue
-		if(CONFIG_GET(flag/enforce_human_authority) && !player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features))
-			Debug("FOC non-human failed, Player: [player]")
-			continue
 		if(player.client.prefs.GetJobDepartment(job, level) & job.flag)
 			Debug("FOC pass, Player: [player], Level:[level]")
 			candidates += player
@@ -144,11 +141,6 @@ SUBSYSTEM_DEF(job)
 			Debug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]")
 			continue

-		if(CONFIG_GET(flag/enforce_human_authority) && !player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features))
-			Debug("GRJ non-human failed, Player: [player]")
-			continue
-
-
 		if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1)
 			Debug("GRJ Random job given, Player: [player], Job: [job]")
 			if(AssignRole(player, job.title))
@@ -319,10 +311,6 @@ SUBSYSTEM_DEF(job)
 					Debug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
 					continue

-				if(CONFIG_GET(flag/enforce_human_authority) && !player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features))
-					Debug("DO non-human failed, Player: [player], Job:[job.title]")
-					continue
-
 				// If the player wants that job on this level, then try give it to him.
 				if(player.client.prefs.GetJobDepartment(job, level) & job.flag)

@@ -424,7 +412,8 @@ SUBSYSTEM_DEF(job)

 	if(job && H)
 		job.after_spawn(H, M)
-	handle_roundstart_items(H, M.ckey, H.mind.assigned_role, H.mind.special_role)
+	handle_roundstart_items(H, M.ckey, H.mind.assigned_role, H.mind.special_role) //CIT CHANGE - makes donators spawn with their items
+
 	return H


@@ -22,7 +22,7 @@ SUBSYSTEM_DEF(lighting)

 		create_all_lighting_objects()
 		initialized = TRUE
-
+	
 	fire(FALSE, TRUE)

 	..()
@@ -62,4 +62,4 @@ SUBSYSTEM_DEF(machines)
 	if (istype(SSmachines.processing))
 		processing = SSmachines.processing
 	if (istype(SSmachines.powernets))
-		powernets = SSmachines.powernets
+		powernets = SSmachines.powernets
@@ -135,12 +135,12 @@ SUBSYSTEM_DEF(npcpool)

 		if(facCount == 1 && helpProb)
 			helpProb = 100
-
+	
 		if(prob(helpProb) && candidate.takeDelegate(check,FALSE))
 			--canBeUsed.len
 			candidate.eye_color = "yellow"
 			candidate.update_icons()
-
+			
 		if(!currentrun.len || MC_TICK_CHECK)	//don't change SS state if it isn't necessary
 			return

@@ -40,3 +40,5 @@ SUBSYSTEM_DEF(orbit)
 			O.Check(targetloc)
 		if (MC_TICK_CHECK)
 			return
+
+
@@ -250,4 +250,4 @@ SUBSYSTEM_DEF(persistence)
 	var/list/file_data = list()
 	file_data["data"] = saved_modes
 	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(file_data))
+	WRITE_FILE(json_file, json_encode(file_data))
@@ -14,35 +14,22 @@ SUBSYSTEM_DEF(radio)
 /datum/controller/subsystem/radio/proc/add_object(obj/device, new_frequency as num, filter = null as text|null)
 	var/f_text = num2text(new_frequency)
 	var/datum/radio_frequency/frequency = frequencies[f_text]
-
 	if(!frequency)
-		frequency = new
-		frequency.frequency = new_frequency
-		frequencies[f_text] = frequency
-
+		frequencies[f_text] = frequency = new(new_frequency)
 	frequency.add_listener(device, filter)
 	return frequency

 /datum/controller/subsystem/radio/proc/remove_object(obj/device, old_frequency)
 	var/f_text = num2text(old_frequency)
 	var/datum/radio_frequency/frequency = frequencies[f_text]
-
 	if(frequency)
 		frequency.remove_listener(device)
-
-		if(frequency.devices.len == 0)
-			qdel(frequency)
-			frequencies -= f_text
-
+		// let's don't delete frequencies in case a non-listener keeps a reference
 	return 1

 /datum/controller/subsystem/radio/proc/return_frequency(new_frequency as num)
 	var/f_text = num2text(new_frequency)
 	var/datum/radio_frequency/frequency = frequencies[f_text]
-
 	if(!frequency)
-		frequency = new
-		frequency.frequency = new_frequency
-		frequencies[f_text] = frequency
-
+		frequencies[f_text] = frequency = new(new_frequency)
 	return frequency
@@ -54,6 +54,7 @@ SUBSYSTEM_DEF(research)
 				bitcoins = single_server_income
 				break			//Just need one to work.
 	var/income_time_difference = world.time - last_income
+	science_tech.last_bitcoins = bitcoins  // Doesn't take tick drift into account
 	bitcoins *= income_time_difference / 10
 	science_tech.research_points += bitcoins
 	last_income = world.time
@@ -54,7 +54,7 @@ SUBSYSTEM_DEF(shuttle)

 	var/lockdown = FALSE	//disallow transit after nuke goes off

-	var/auto_call = 99000 //time before in deciseconds in which the shuttle is auto called. Default is 2½ hours plus 15 for the shuttle. So total is 3.
+	var/auto_call = 99000 //CIT CHANGE - time before in deciseconds in which the shuttle is auto called. Default is 2½ hours plus 15 for the shuttle. So total is 3.

 /datum/controller/subsystem/shuttle/Initialize(timeofday)
 	if(!arrivals)
@@ -158,7 +158,7 @@ SUBSYSTEM_DEF(shuttle)
 			break

 /datum/controller/subsystem/shuttle/proc/CheckAutoEvac()
-	if(emergencyNoEscape || emergencyNoRecall || !emergency)
+	if(emergencyNoEscape || emergencyNoRecall || !emergency || !SSticker.HasRoundStarted())
 		return

 	var/threshold = CONFIG_GET(number/emergency_shuttle_autocall_threshold)
@@ -262,7 +262,7 @@ SUBSYSTEM_DEF(shuttle)

 	if(!admiral_message)
 		admiral_message = pick(GLOB.admiral_messages)
-	var/intercepttext = "<font size = 3><b>NanoTrasen Update</b>: Request For Shuttle.</font><hr>\
+	var/intercepttext = "<font size = 3><b>Nanotrasen Update</b>: Request For Shuttle.</font><hr>\
 						To whom it may concern:<br><br>\
 						We have taken note of the situation upon [station_name()] and have come to the \
 						conclusion that it does not warrant the abandonment of the station.<br>\
@@ -387,7 +387,7 @@ SUBSYSTEM_DEF(shuttle)
 		emergency.setTimer(emergencyDockTime)
 		priority_announce("Hostile environment resolved. \
 			You have 3 minutes to board the Emergency Shuttle.",
-			null, 'sound/AI/shuttledock.ogg', "Priority")
+			null, 'sound/ai/shuttledock.ogg', "Priority")

 //try to move/request to dockHome if possible, otherwise dockAway. Mainly used for admin buttons
 /datum/controller/subsystem/shuttle/proc/toggleShuttle(shuttleId, dockHome, dockAway, timed)
@@ -431,7 +431,8 @@ SUBSYSTEM_DEF(shuttle)
 		if(!(M in transit_requesters))
 			transit_requesters += M

-/datum/controller/subsystem/shuttle/proc/autoEnd()
+
+/datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end after 3 hours has passed.
 	if(world.time > auto_call && EMERGENCY_IDLE_OR_RECALLED) //3 hours
 		SSshuttle.emergency.request(null, 1.5)
 		priority_announce("The shift has come to an end and the shuttle called.")
@@ -1,6 +1,6 @@
 // The Squeak
 // because this is about placement of mice mobs, and nothing to do with
-// mice - the computer peripheral 
+// mice - the computer peripheral

 SUBSYSTEM_DEF(squeak)
 	name = "Squeak"
@@ -27,6 +27,6 @@ SUBSYSTEM_DEF(stickyban)
 		ban["existing_user_matches_this_round"] = list()
 		ban["admin_matches_this_round"] = list()
 		cache[ckey] = ban
-
+	
 	for (var/bannedckey in cache)
 		world.SetConfig("ban", bannedckey, list2stickyban(cache[bannedckey]))
@@ -631,6 +631,7 @@ SUBSYSTEM_DEF(ticker)
 	world.Reboot()

 /datum/controller/subsystem/ticker/Shutdown()
+	gather_newscaster() //called here so we ensure the log is created even upon admin reboot
 	if(!round_end_sound)
 		round_end_sound = pick(\
 		'sound/roundend/newroundsexy.ogg',
@@ -35,4 +35,4 @@ SUBSYSTEM_DEF(time_track)
 	last_tick_realtime = current_realtime
 	last_tick_byond_time = current_byondtime
 	last_tick_tickcount = current_tickcount
-	SSblackbox.record_feedback("associative", "time_dilation_current", 1, list("[time_dilation_current]" = "[SQLtime()]"))
+	SSblackbox.record_feedback("associative", "time_dilation_current", 1, list("[SQLtime()]" = list("current" = "[time_dilation_current]", "avg_fast" = "[time_dilation_avg_fast]", "avg" = "[time_dilation_avg]", "avg_slow" = "[time_dilation_avg_slow]")))
@@ -411,4 +411,4 @@ SUBSYSTEM_DEF(timer)


 #undef BUCKET_LEN
-#undef BUCKET_POS
+#undef BUCKET_POS
@@ -170,14 +170,15 @@
 		..(current_button)
 	else if(target && current_button.appearance_cache != target.appearance) //replace with /ref comparison if this is not valid.
 		var/obj/item/I = target
-		current_button.appearance_cache = I.appearance
 		var/old_layer = I.layer
 		var/old_plane = I.plane
 		I.layer = FLOAT_LAYER //AAAH
 		I.plane = FLOAT_PLANE //^ what that guy said
-		current_button.overlays = list(I)
+		current_button.cut_overlays()
+		current_button.add_overlay(I)
 		I.layer = old_layer
 		I.plane = old_plane
+		current_button.appearance_cache = I.appearance

 /datum/action/item_action/toggle_light
 	name = "Toggle Light"
@@ -344,6 +345,19 @@
 /datum/action/item_action/change
 	name = "Change"

+/datum/action/item_action/nano_picket_sign
+	name = "Retext Nano Picket Sign"
+	var/obj/item/picket_sign/S
+
+/datum/action/item_action/nano_picket_sign/New(Target)
+	..()
+	if(istype(Target, /obj/item/picket_sign))
+		S = Target
+
+/datum/action/item_action/nano_picket_sign/Trigger()
+	if(istype(S))
+		S.retext(owner)
+
 /datum/action/item_action/adjust

 /datum/action/item_action/adjust/New(Target)
@@ -1,5 +1,3 @@
-
-
 /datum/action/item_action/flightsuit
 	icon_icon = 'icons/mob/actions/actions_flightsuit.dmi'

@@ -78,7 +78,7 @@
 	. = ..()

 /datum/antagonist/changeling/on_removal()
-	remove_changeling_powers(FALSE)
+	remove_changeling_powers()
 	owner.objectives -= objectives
 	. = ..()

@@ -100,11 +100,11 @@
 	chem_recharge_slowdown = initial(chem_recharge_slowdown)
 	mimicing = ""

-/datum/antagonist/changeling/proc/remove_changeling_powers(keep_free_powers=0)
+/datum/antagonist/changeling/proc/remove_changeling_powers()
 	if(ishuman(owner.current) || ismonkey(owner.current))
 		reset_properties()
 		for(var/obj/effect/proc_holder/changeling/p in purchasedpowers)
-			if((p.dna_cost == 0 && keep_free_powers) || p.always_keep)
+			if(p.always_keep)
 				continue
 			purchasedpowers -= p
 			p.on_refund(owner.current)
@@ -116,13 +116,13 @@

 /datum/antagonist/changeling/proc/reset_powers()
 	if(purchasedpowers)
-		remove_changeling_powers(TRUE)
-	//Purchase free powers.
+		remove_changeling_powers()
+	//Repurchase free powers.
 	for(var/path in all_powers)
 		var/obj/effect/proc_holder/changeling/S = new path()
 		if(!S.dna_cost)
 			if(!has_sting(S))
-				purchasedpowers+=S
+				purchasedpowers += S
 				S.on_purchase(owner.current,TRUE)

 /datum/antagonist/changeling/proc/has_sting(obj/effect/proc_holder/changeling/power)
@@ -223,7 +223,6 @@
 		if(verbose)
 			to_chat(user, "<span class='warning'>[target] is not compatible with our biology.</span>")
 		return
-
 	if((target.has_disability(DISABILITY_NOCLONE)) || (target.has_disability(DISABILITY_NOCLONE)))
 		if(verbose)
 			to_chat(user, "<span class='warning'>DNA of [target] is ruined beyond usability!</span>")
@@ -131,7 +131,7 @@
 	SSticker.mode.cult -= owner
 	SSticker.mode.update_cult_icons_removed(owner)
 	if(!silent)
-		owner.current.visible_message("<span class='big'>[owner.current] looks like [owner.current.p_they()] just reverted to their old faith!</span>", ignored_mob = owner.current)
+		owner.current.visible_message("<span class='deconversion_message'>[owner.current] looks like [owner.current.p_they()] just reverted to their old faith!</span>", ignored_mob = owner.current)
 		to_chat(owner.current, "<span class='userdanger'>An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.</span>")
 		owner.current.log_message("<font color=#960000>Has renounced the cult of Nar'Sie!</font>", INDIVIDUAL_ATTACK_LOG)
 	if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client)
@@ -243,7 +243,7 @@
 	return sacced || completed

 /datum/objective/sacrifice/update_explanation_text()
-	if(target && !sacced)
+	if(target)
 		explanation_text = "Sacrifice [target], the [target.assigned_role] via invoking a Sacrifice rune with them on it and three acolytes around it."
 	else
 		explanation_text = "The veil has already been weakened here, proceed to the final objective."
@@ -127,6 +127,7 @@

 	if(prob(30))
 		objective_count += forge_single_objective()
+
 	for(var/i = objective_count, i < CONFIG_GET(number/traitor_objectives_amount), i++)
 		var/datum/objective/assassinate/kill_objective = new
 		kill_objective.owner = owner
@@ -152,11 +153,6 @@
 			maroon_objective.owner = owner
 			maroon_objective.find_target()
 			add_objective(maroon_objective)
-		else if(prob(50))
-			var/datum/objective/assassinate/late/late_objective = new
-			late_objective.owner = owner
-			late_objective.find_target()
-			add_objective(late_objective)
 		else
 			var/datum/objective/assassinate/kill_objective = new
 			kill_objective.owner = owner
@@ -343,4 +339,4 @@

 /datum/antagonist/traitor/roundend_report_footer()
 	return "<br><b>The code phrases were:</b> <span class='codephrase'>[GLOB.syndicate_code_phrase]</span><br>\
-		<b>The code responses were:</b> <span class='codephrase'>[GLOB.syndicate_code_response]</span><br>"
+		<b>The code responses were:</b> <span class='codephrase'>[GLOB.syndicate_code_response]</span><br>"
@@ -50,17 +50,11 @@
 	lose_text = "<span class='notice'>Your vision returns.</span>"

 /datum/brain_trauma/severe/blindness/on_gain()
-	owner.become_blind()
-	..()
-
-//no fiddling with genetics to get out of this one
-/datum/brain_trauma/severe/blindness/on_life()
-	if(!(owner.disabilities & BLIND))
-		on_gain()
+	owner.become_blind(TRAUMA_DISABILITY)
 	..()

 /datum/brain_trauma/severe/blindness/on_lose()
-	owner.cure_blind()
+	owner.cure_blind(TRAUMA_DISABILITY)
 	..()

 /datum/brain_trauma/severe/paralysis
@@ -62,4 +62,4 @@
 		qdel(src)

 /datum/component/decal/proc/examine(mob/user)
-	to_chat(user, description)
+	to_chat(user, description)
@@ -1,4 +1,5 @@
 /datum/component/forensics
+	dupe_mode = COMPONENT_DUPE_UNIQUE
 	var/list/fingerprints		//assoc print = print
 	var/list/hiddenprints		//assoc ckey = realname/gloves/ckey
 	var/list/blood_DNA			//assoc dna = bloodtype
@@ -138,7 +139,7 @@
 		if(laststamppos)
 			LAZYSET(hiddenprints, M.key, copytext(hiddenprints[M.key], 1, laststamppos))
 		hiddenprints[M.key] += " Last: [M.real_name]\[[current_time]\][hasgloves]. Ckey: [M.ckey]"	//made sure to be existing by if(!LAZYACCESS);else
-	fingerprintslast = M.ckey
+	parent.fingerprintslast = M.ckey
 	return TRUE

 /datum/component/forensics/proc/add_blood_DNA(list/dna)		//list(dna_enzymes = type)
@@ -57,4 +57,4 @@
 	var/t = stripped_input(H, "Enter your new skeleton name", H.real_name, null, MAX_NAME_LEN)
 	if(!t)
 		t = "spooky skeleton"
-	H.fully_replace_character_name(H.real_name, t)
+	H.fully_replace_character_name(null, t)
@@ -1,3 +1,4 @@
+
 /datum/datacore
 	var/medical[] = list()
 	var/medicalPrintCount = 0
@@ -17,6 +17,7 @@
 /datum/proc/Destroy(force=FALSE, ...)
 	tag = null
 	weak_reference = null	//ensure prompt GCing of weakref.
+
 	var/list/timers = active_timers
 	active_timers = null
 	for(var/thing in timers)
@@ -24,6 +25,7 @@
 		if (timer.spent)
 			continue
 		qdel(timer)
+
 	var/list/dc = datum_components
 	if(dc)
 		var/all_components = dc[/datum/component]
@@ -35,4 +37,11 @@
 			var/datum/component/C = all_components
 			qdel(C, FALSE, TRUE)
 		dc.Cut()
+
+	var/list/focusers = src.focusers
+	if(focusers)
+		for(var/i in 1 to focusers.len)
+			var/mob/M = focusers[i]
+			M.set_focus(M)
+
 	return QDEL_HINT_QUEUE
@@ -1,59 +1,59 @@
-// Cold
-
+// Cold
+
 /datum/disease/advance/cold/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
-	if(!D)
-		name = "Cold"
-		symptoms = list(new/datum/symptom/sneeze)
-	..(process, D, copy)
-
-
-// Flu
-
+	if(!D)
+		name = "Cold"
+		symptoms = list(new/datum/symptom/sneeze)
+	..(process, D, copy)
+
+
+// Flu
+
 /datum/disease/advance/flu/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
-	if(!D)
-		name = "Flu"
-		symptoms = list(new/datum/symptom/cough)
-	..(process, D, copy)
-
-
-// Voice Changing
-
+	if(!D)
+		name = "Flu"
+		symptoms = list(new/datum/symptom/cough)
+	..(process, D, copy)
+
+
+// Voice Changing
+
 /datum/disease/advance/voice_change/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
-	if(!D)
-		name = "Epiglottis Mutation"
-		symptoms = list(new/datum/symptom/voice_change)
-	..(process, D, copy)
-
-
-// Toxin Filter
-
+	if(!D)
+		name = "Epiglottis Mutation"
+		symptoms = list(new/datum/symptom/voice_change)
+	..(process, D, copy)
+
+
+// Toxin Filter
+
 /datum/disease/advance/heal/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
-	if(!D)
-		name = "Liver Enhancer"
-		symptoms = list(new/datum/symptom/heal)
-	..(process, D, copy)
-
-
+	if(!D)
+		name = "Liver Enhancer"
+		symptoms = list(new/datum/symptom/heal)
+	..(process, D, copy)
+
+
 // Hallucigen
-
+
 /datum/disease/advance/hallucigen/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
-	if(!D)
+	if(!D)
 		name = "Second Sight"
-		symptoms = list(new/datum/symptom/hallucigen)
-	..(process, D, copy)
-
-// Sensory Restoration
-
+		symptoms = list(new/datum/symptom/hallucigen)
+	..(process, D, copy)
+
+// Sensory Restoration
+
 /datum/disease/advance/mind_restoration/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
-	if(!D)
+	if(!D)
 		name = "Intelligence Booster"
 		symptoms = list(new/datum/symptom/mind_restoration)
-	..(process, D, copy)
-
-// Sensory Destruction
-
+	..(process, D, copy)
+
+// Sensory Destruction
+
 /datum/disease/advance/narcolepsy/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
-	if(!D)
+	if(!D)
 		name = "Experimental Insomnia Cure"
 		symptoms = list(new/datum/symptom/narcolepsy)
 	..(process, D, copy)
@@ -1,33 +1,33 @@
-/*
-//////////////////////////////////////
-Facial Hypertrichosis
-
-	Very very Noticable.
-	Decreases resistance slightly.
-	Decreases stage speed.
-	Reduced transmittability
-	Intense Level.
-
-BONUS
-	Makes the mob grow a massive beard, regardless of gender.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/beard
-
-	name = "Facial Hypertrichosis"
+/*
+//////////////////////////////////////
+Facial Hypertrichosis
+
+	Very very Noticable.
+	Decreases resistance slightly.
+	Decreases stage speed.
+	Reduced transmittability
+	Intense Level.
+
+BONUS
+	Makes the mob grow a massive beard, regardless of gender.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/beard
+
+	name = "Facial Hypertrichosis"
 	desc = "The virus increases hair production significantly, causing rapid beard growth."
-	stealth = -3
-	resistance = -1
-	stage_speed = -3
-	transmittable = -1
-	level = 4
-	severity = 1
+	stealth = -3
+	resistance = -1
+	stage_speed = -3
+	transmittable = -1
+	level = 4
+	severity = 1
 	symptom_delay_min = 18
 	symptom_delay_max = 36
-
-/datum/symptom/beard/Activate(datum/disease/advance/A)
+
+/datum/symptom/beard/Activate(datum/disease/advance/A)
 	if(!..())
 		return
 	var/mob/living/M = A.affected_mob
@@ -1,30 +1,30 @@
-/*
-//////////////////////////////////////
-
-Confusion
-
-	Little bit hidden.
-	Lowers resistance.
-	Decreases stage speed.
-	Not very transmittable.
-	Intense Level.
-
-Bonus
-	Makes the affected mob be confused for short periods of time.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/confusion
-
-	name = "Confusion"
+/*
+//////////////////////////////////////
+
+Confusion
+
+	Little bit hidden.
+	Lowers resistance.
+	Decreases stage speed.
+	Not very transmittable.
+	Intense Level.
+
+Bonus
+	Makes the affected mob be confused for short periods of time.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/confusion
+
+	name = "Confusion"
 	desc = "The virus interferes with the proper function of the neural system, leading to bouts of confusion and erratic movement."
-	stealth = 1
-	resistance = -1
-	stage_speed = -3
-	transmittable = 0
-	level = 4
-	severity = 2
+	stealth = 1
+	resistance = -1
+	stage_speed = -3
+	transmittable = 0
+	level = 4
+	severity = 2
 	base_message_chance = 25
 	symptom_delay_min = 10
 	symptom_delay_max = 30
@@ -32,7 +32,7 @@ Bonus
 	threshold_desc = "<b>Resistance 6:</b> Causes brain damage over time.<br>\
 					  <b>Transmission 6:</b> Increases confusion duration.<br>\
 					  <b>Stealth 4:</b> The symptom remains hidden until active."
-
+
 /datum/symptom/confusion/Start(datum/disease/advance/A)
 	if(!..())
 		return
@@ -42,20 +42,20 @@ Bonus
 		power = 1.5
 	if(A.properties["stealth"] >= 4)
 		suppress_warning = TRUE
-
-/datum/symptom/confusion/Activate(datum/disease/advance/A)
+
+/datum/symptom/confusion/Activate(datum/disease/advance/A)
 	if(!..())
 		return
 	var/mob/living/carbon/M = A.affected_mob
 	switch(A.stage)
 		if(1, 2, 3, 4)
 			if(prob(base_message_chance) && !suppress_warning)
-				to_chat(M, "<span class='warning'>[pick("Your head hurts.", "Your mind blanks for a moment.")]</span>")
+				to_chat(M, "<span class='warning'>[pick("Your head hurts.", "Your mind blanks for a moment.")]</span>")
 		else
 			to_chat(M, "<span class='userdanger'>You can't think straight!</span>")
 			M.confused = min(100 * power, M.confused + 8)
 			if(brain_damage)
 				M.adjustBrainLoss(3 * power, 80)
 				M.updatehealth()
-
-	return
+
+	return
@@ -50,4 +50,4 @@ Bonus
 			to_chat(M, "<span class='userdanger'>A wave of dizziness washes over you!</span>")
 			M.Dizzy(5)
 			if(power >= 2)
-				M.set_drugginess(5)
+				M.set_drugginess(5)
@@ -127,4 +127,4 @@ Bonus
 		M.reagents.add_reagent_list(list("heparin" = 2, "lipolicide" = 2))
 	if(zombie)
 		M.reagents.add_reagent("romerol", 1)
-	return 1
+	return 1
@@ -57,4 +57,4 @@ BONUS
 		M.adjustStaminaLoss(25)
 	if(power >= 3 && A.stage >= 5)
 		to_chat(M, "<span class='userdanger'>[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]</span>")
-		M.Stun(35)
+		M.Stun(35)
@@ -1,10 +1,10 @@
 /datum/symptom/heal
 	name = "Basic Healing (does nothing)" //warning for adminspawn viruses
 	desc = "You should not be seeing this."
-	stealth = 1
-	resistance = -4
-	stage_speed = -4
-	transmittable = -4
+	stealth = 0
+	resistance = 0
+	stage_speed = 0
+	transmittable = 0
 	level = 0 //not obtainable
 	base_message_chance = 20 //here used for the overlays
 	symptom_delay_min = 1
@@ -22,7 +22,6 @@
 /datum/symptom/heal/Activate(datum/disease/advance/A)
 	if(!..())
 		return
-	 //100% chance to activate for slow but consistent healing
 	var/mob/living/M = A.affected_mob
 	switch(A.stage)
 		if(4, 5)
@@ -45,20 +44,20 @@
 	return TRUE


-/datum/symptom/heal/toxin
+/datum/symptom/heal/starlight
 	name = "Starlight Condensation"
-	desc = "The virus reacts to direct starlight, producing regenerative chemicals that can cure toxin damage."
-	stealth = 1
-	resistance = -3
-	stage_speed = -3
-	transmittable = -3
+	desc = "The virus reacts to direct starlight, producing regenerative chemicals. Works best against toxin-based damage."
+	stealth = -1
+	resistance = -2
+	stage_speed = 0
+	transmittable = 1
 	level = 6
 	passive_message = "<span class='notice'>You miss the feeling of starlight on your skin.</span>"
 	var/nearspace_penalty = 0.3
 	threshold_desc = "<b>Stage Speed 6:</b> Increases healing speed.<br>\
 					  <b>Transmission 6:</b> Removes penalty for only being close to space."

-/datum/symptom/heal/toxin/Start(datum/disease/advance/A)
+/datum/symptom/heal/starlight/Start(datum/disease/advance/A)
 	if(!..())
 		return
 	if(A.properties["transmission"] >= 6)
@@ -66,7 +65,7 @@
 	if(A.properties["stage_rate"] >= 6)
 		power = 2

-/datum/symptom/heal/toxin/CanHeal(datum/disease/advance/A)
+/datum/symptom/heal/starlight/CanHeal(datum/disease/advance/A)
 	var/mob/living/M = A.affected_mob
 	if(istype(get_turf(M), /turf/open/space))
 		return power
@@ -75,15 +74,25 @@
 			if(istype(T, /turf/open/space))
 				return power * nearspace_penalty

-/datum/symptom/heal/toxin/Heal(mob/living/M, datum/disease/advance/A, actual_power)
+/datum/symptom/heal/starlight/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
 	var/heal_amt = actual_power
 	if(M.getToxLoss() && prob(5))
-		to_chat(M, "<span class='notice'>Your skin tingles as the starlight purges toxins from your bloodstream.</span>")
-	M.adjustToxLoss(-heal_amt)
+		to_chat(M, "<span class='notice'>Your skin tingles as the starlight seems to heal you.</span>")
+
+	M.adjustToxLoss(-(4 * heal_amt)) //most effective on toxins
+
+	var/list/parts = M.get_damaged_bodyparts(1,1)
+
+	if(!parts.len)
+		return
+
+	for(var/obj/item/bodypart/L in parts)
+		if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len))
+			M.update_damage_overlays()
 	return 1

-/datum/symptom/heal/toxin/passive_message_condition(mob/living/M)
-	if(M.getToxLoss())
+/datum/symptom/heal/starlight/passive_message_condition(mob/living/M)
+	if(M.getBruteLoss() || M.getFireLoss() || M.getToxLoss())
 		return TRUE
 	return FALSE

@@ -91,7 +100,7 @@
 	name = "Toxolysis"
 	stealth = 0
 	resistance = -2
-	stage_speed = -2
+	stage_speed = 2
 	transmittable = -2
 	level = 7
 	var/food_conversion = FALSE
@@ -153,58 +162,50 @@
 		to_chat(C, "<span class='notice'>You feel an odd gurgle in your stomach, as if it was working much faster than normal.</span>")
 	return 1

-/datum/symptom/heal/brute
-	name = "Cellular Molding"
-	desc = "The virus is able to shift cells around when in conditions of high heat, repairing existing physical damage."
-	stealth = 1
-	resistance = -3
-	stage_speed = -3
-	transmittable = -3
+/datum/symptom/heal/darkness
+	name = "Nocturnal Regeneration"
+	desc = "The virus is able to mend the host's flesh when in conditions of low light, repairing physical damage. More effective against brute damage."
+	stealth = 2
+	resistance = -1
+	stage_speed = -2
+	transmittable = -1
 	level = 6
-	passive_message = "<span class='notice'>You feel the flesh pulsing under your skin for a moment, but it's too cold to move.</span>"
+	passive_message = "<span class='notice'>You feel tingling on your skin as light passes over it.</span>"
 	threshold_desc = "<b>Stage Speed 8:</b> Doubles healing speed."

-/datum/symptom/heal/brute/Start(datum/disease/advance/A)
+/datum/symptom/heal/darkness/Start(datum/disease/advance/A)
 	if(!..())
 		return
 	if(A.properties["stage_rate"] >= 8)
 		power = 2

-/datum/symptom/heal/brute/CanHeal(datum/disease/advance/A)
+/datum/symptom/heal/darkness/CanHeal(datum/disease/advance/A)
 	var/mob/living/M = A.affected_mob
-	switch(M.bodytemperature)
-		if(0 to 340)
-			return FALSE
-		if(340 to BODYTEMP_HEAT_DAMAGE_LIMIT)
-			. = 0.3 * power
-		if(BODYTEMP_HEAT_DAMAGE_LIMIT to 400)
-			. = 0.75 * power
-		if(400 to 460)
-			. = power
-		else
-			. = 1.5 * power
+	var/light_amount = 0
+	if(isturf(M.loc)) //else, there's considered to be no light
+		var/turf/T = M.loc
+		light_amount = min(1,T.get_lumcount()) - 0.5
+		if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD)
+			return power

-	if(M.on_fire)
-		. *= 2
-
-/datum/symptom/heal/brute/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
+/datum/symptom/heal/darkness/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
 	var/heal_amt = 2 * actual_power

-	var/list/parts = M.get_damaged_bodyparts(1,0) //brute only
+	var/list/parts = M.get_damaged_bodyparts(1,1)

 	if(!parts.len)
 		return

 	if(prob(5))
-		to_chat(M, "<span class='notice'>You feel your flesh moving beneath your heated skin, mending your wounds.</span>")
+		to_chat(M, "<span class='notice'>The darkness soothes and mends your wounds.</span>")

 	for(var/obj/item/bodypart/L in parts)
-		if(L.heal_damage(heal_amt/parts.len, 0))
+		if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len * 0.5)) //more effective on brute
 			M.update_damage_overlays()
 	return 1

-/datum/symptom/heal/brute/passive_message_condition(mob/living/M)
-	if(M.getBruteLoss())
+/datum/symptom/heal/darkness/passive_message_condition(mob/living/M)
+	if(M.getBruteLoss() || M.getFireLoss())
 		return TRUE
 	return FALSE

@@ -212,8 +213,8 @@
 	name = "Regenerative Coma"
 	desc = "The virus causes the host to fall into a death-like coma when severely damaged, then rapidly fixes the damage."
 	stealth = 0
-	resistance = 0
-	stage_speed = -2
+	resistance = 2
+	stage_speed = -3
 	transmittable = -2
 	level = 8
 	passive_message = "<span class='notice'>The pain from your wounds makes you feel oddly sleepy...</span>"
@@ -283,20 +284,20 @@
 		return TRUE
 	return FALSE

-/datum/symptom/heal/burn
+/datum/symptom/heal/water
 	name = "Tissue Hydration"
-	desc = "The virus uses excess water inside and outside the body to repair burned tisue cells."
-	stealth = 1
-	resistance = -3
-	stage_speed = -3
-	transmittable = -3
+	desc = "The virus uses excess water inside and outside the body to repair damaged tissue cells. More effective against burns."
+	stealth = 0
+	resistance = -1
+	stage_speed = 0
+	transmittable = 1
 	level = 6
-	passive_message = "<span class='notice'>Your burned skin feels oddly dry...</span>"
+	passive_message = "<span class='notice'>Your skin feels oddly dry...</span>"
 	var/absorption_coeff = 1
 	threshold_desc = "<b>Resistance 5:</b> Water is consumed at a much slower rate.<br>\
 					  <b>Stage Speed 7:</b> Increases healing speed."

-/datum/symptom/heal/burn/Start(datum/disease/advance/A)
+/datum/symptom/heal/water/Start(datum/disease/advance/A)
 	if(!..())
 		return
 	if(A.properties["stage_rate"] >= 7)
@@ -304,7 +305,7 @@
 	if(A.properties["stealth"] >= 2)
 		absorption_coeff = 0.25

-/datum/symptom/heal/burn/CanHeal(datum/disease/advance/A)
+/datum/symptom/heal/water/CanHeal(datum/disease/advance/A)
 	. = 0
 	var/mob/living/M = A.affected_mob
 	if(M.fire_stacks < 0)
@@ -317,33 +318,33 @@
 		M.reagents.remove_reagent("water", 0.5 * absorption_coeff)
 		. += power * 0.5

-/datum/symptom/heal/burn/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
+/datum/symptom/heal/water/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
 	var/heal_amt = 2 * actual_power

-	var/list/parts = M.get_damaged_bodyparts(0,1) //burn only
+	var/list/parts = M.get_damaged_bodyparts(1,1) //more effective on burns

 	if(!parts.len)
 		return

 	if(prob(5))
-		to_chat(M, "<span class='notice'>You feel yourself absorbing the water around you to soothe your burned skin.</span>")
+		to_chat(M, "<span class='notice'>You feel yourself absorbing the water around you to soothe your damaged skin.</span>")

 	for(var/obj/item/bodypart/L in parts)
-		if(L.heal_damage(0, heal_amt/parts.len))
+		if(L.heal_damage(heal_amt/parts.len * 0.5, heal_amt/parts.len))
 			M.update_damage_overlays()

 	return 1

-/datum/symptom/heal/burn/passive_message_condition(mob/living/M)
-	if(M.getFireLoss())
+/datum/symptom/heal/water/passive_message_condition(mob/living/M)
+	if(M.getBruteLoss() || M.getFireLoss())
 		return TRUE
 	return FALSE

 /datum/symptom/heal/plasma
 	name = "Plasma Fixation"
-	desc = "The virus draws plasma from the atmosphere and from inside the body to stabilize body temperature and heal burns."
+	desc = "The virus draws plasma from the atmosphere and from inside the body to heal and stabilize body temperature."
 	stealth = 0
-	resistance = 0
+	resistance = 3
 	stage_speed = -2
 	transmittable = -2
 	level = 8
@@ -379,8 +380,6 @@
 /datum/symptom/heal/plasma/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
 	var/heal_amt = 4 * actual_power

-	var/list/parts = M.get_damaged_bodyparts(0,1) //burn only
-
 	if(prob(5))
 		to_chat(M, "<span class='notice'>You feel yourself absorbing plasma inside and around you...</span>")

@@ -393,24 +392,25 @@
 		if(prob(5))
 			to_chat(M, "<span class='notice'>You feel warmer.</span>")

+	M.adjustToxLoss(-heal_amt)
+
+	var/list/parts = M.get_damaged_bodyparts(1,1)
 	if(!parts.len)
 		return
 	if(prob(5))
-		to_chat(M, "<span class='notice'>The pain from your burns fades rapidly.</span>")
-
+		to_chat(M, "<span class='notice'>The pain from your wounds fades rapidly.</span>")
 	for(var/obj/item/bodypart/L in parts)
-		if(L.heal_damage(0, heal_amt/parts.len))
+		if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len))
 			M.update_damage_overlays()
 	return 1


-
 /datum/symptom/heal/radiation
 	name = "Radioactive Resonance"
 	desc = "The virus uses radiation to fix damage through dna mutations."
 	stealth = -1
 	resistance = -2
-	stage_speed = 0
+	stage_speed = 2
 	transmittable = -3
 	level = 6
 	symptom_delay_min = 1
@@ -450,6 +450,8 @@
 	if(cellular_damage)
 		M.adjustCloneLoss(-heal_amt * 0.5)

+	M.adjustToxLoss(-(2 * heal_amt))
+
 	var/list/parts = M.get_damaged_bodyparts(1,1)

 	if(!parts.len)
@@ -51,4 +51,4 @@ BONUS
 		var/can_scratch = scratch && !M.incapacitated() && get_location_accessible(M, picked_bodypart)
 		M.visible_message("[can_scratch ? "<span class='warning'>[M] scratches [M.p_their()] [bodypart.name].</span>" : ""]", "<span class='warning'>Your [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]</span>")
 		if(can_scratch)
-			bodypart.receive_damage(0.5)
+			bodypart.receive_damage(0.5)
@@ -105,4 +105,4 @@
 					M.adjust_eye_damage(-1)
 		else
 			if(prob(base_message_chance))
-				to_chat(M, "<span class='notice'>[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your healing feels more acute.")]</span>")
+				to_chat(M, "<span class='notice'>[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your healing feels more acute.")]</span>")
@@ -1,39 +1,39 @@
-/*
-//////////////////////////////////////
-Alopecia
-
+/*
+//////////////////////////////////////
+Alopecia
+
 	Not Noticeable.
 	Increases resistance slightly.
-	Reduces stage speed slightly.
-	Transmittable.
-	Intense Level.
-
-BONUS
-	Makes the mob lose hair.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/shedding
-	name = "Alopecia"
+	Reduces stage speed slightly.
+	Transmittable.
+	Intense Level.
+
+BONUS
+	Makes the mob lose hair.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/shedding
+	name = "Alopecia"
 	desc = "The virus causes rapid shedding of head and body hair."
 	stealth = 0
 	resistance = 1
-	stage_speed = -1
+	stage_speed = -1
 	transmittable = 3
-	level = 4
-	severity = 1
+	level = 4
+	severity = 1
 	base_message_chance = 50
 	symptom_delay_min = 45
 	symptom_delay_max = 90
-
-/datum/symptom/shedding/Activate(datum/disease/advance/A)
+
+/datum/symptom/shedding/Activate(datum/disease/advance/A)
 	if(!..())
 		return

 	var/mob/living/M = A.affected_mob
 	if(prob(base_message_chance))
-		to_chat(M, "<span class='warning'>[pick("Your scalp itches.", "Your skin feels flakey.")]</span>")
+		to_chat(M, "<span class='warning'>[pick("Your scalp itches.", "Your skin feels flakey.")]</span>")
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		switch(A.stage)
@@ -45,11 +45,11 @@ BONUS
 				if(!(H.facial_hair_style == "Shaved") || !(H.hair_style == "Bald"))
 					to_chat(H, "<span class='warning'>Your hair starts to fall out in clumps...</span>")
 					addtimer(CALLBACK(src, .proc/Shed, H, TRUE), 50)
-
-/datum/symptom/shedding/proc/Shed(mob/living/carbon/human/H, fullbald)
-	if(fullbald)
-		H.facial_hair_style = "Shaved"
-		H.hair_style = "Bald"
-	else
-		H.hair_style = "Balding Hair"
+
+/datum/symptom/shedding/proc/Shed(mob/living/carbon/human/H, fullbald)
+	if(fullbald)
+		H.facial_hair_style = "Shaved"
+		H.hair_style = "Bald"
+	else
+		H.hair_style = "Balding Hair"
 	H.update_hair()
@@ -56,4 +56,4 @@ Bonus
 		M.bodytemperature = min(M.bodytemperature - (get_cold * A.stage), BODYTEMP_COLD_DAMAGE_LIMIT + 1)
 	else
 		M.bodytemperature -= (get_cold * A.stage)
-	return 1
+	return 1
@@ -46,7 +46,6 @@ Bonus
 		if(1, 2, 3)
 			if(!suppress_warning)
 				M.emote("sniff")
-			else
-				M.emote("sneeze")
-				A.spread(5)
-	return
+		else
+			M.emote("sneeze")
+			A.spread(4 + power)
@@ -58,14 +58,15 @@ Bonus
 				M.blur_eyes(20)
 				M.adjust_eye_damage(5)
 				if(eyes.eye_damage >= 10)
-					M.become_nearsighted()
+					M.become_nearsighted(EYE_DAMAGE)
 				if(prob(eyes.eye_damage - 10 + 1))
 					if(!remove_eyes)
 						if(!M.has_disability(DISABILITY_BLIND))
 							to_chat(M, "<span class='userdanger'>You go blind!</span>")
+						M.become_blind(EYE_DAMAGE)
 					else
 						M.visible_message("<span class='warning'>[M]'s eyes fall off their sockets!</span>", "<span class='userdanger'>Your eyes fall off their sockets!</span>")
 						eyes.Remove(M)
 						eyes.forceMove(get_turf(M))
 				else
-					to_chat(M, "<span class='userdanger'>Your eyes burn horrifically!</span>")
+					to_chat(M, "<span class='userdanger'>Your eyes burn horrifically!</span>")
@@ -48,4 +48,4 @@ Bonus
 		else
 			to_chat(M, "<span class='warning'><i>[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]</i></span>")
 			M.overeatduration = max(M.overeatduration - 100, 0)
-			M.nutrition = max(M.nutrition - 100, 0)
+			M.nutrition = max(M.nutrition - 100, 0)
@@ -1,35 +1,35 @@
-/*
-//////////////////////////////////////
-Eternal Youth
-
-	Moderate stealth boost.
-	Increases resistance tremendously.
-	Increases stage speed tremendously.
-	Reduces transmission tremendously.
-	Critical Level.
-
-BONUS
-	Gives you immortality and eternal youth!!!
-	Can be used to buff your virus
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/youth
-
-	name = "Eternal Youth"
+/*
+//////////////////////////////////////
+Eternal Youth
+
+	Moderate stealth boost.
+	Increases resistance tremendously.
+	Increases stage speed tremendously.
+	Reduces transmission tremendously.
+	Critical Level.
+
+BONUS
+	Gives you immortality and eternal youth!!!
+	Can be used to buff your virus
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/youth
+
+	name = "Eternal Youth"
 	desc = "The virus becomes symbiotically connected to the cells in the host's body, preventing and reversing aging. \
 	The virus, in turn, becomes more resistant, spreads faster, and is harder to spot, although it doesn't thrive as well without a host."
-	stealth = 3
-	resistance = 4
-	stage_speed = 4
-	transmittable = -4
-	level = 5
+	stealth = 3
+	resistance = 4
+	stage_speed = 4
+	transmittable = -4
+	level = 5
 	base_message_chance = 100
 	symptom_delay_min = 25
 	symptom_delay_max = 50
-
-/datum/symptom/youth/Activate(datum/disease/advance/A)
+
+/datum/symptom/youth/Activate(datum/disease/advance/A)
 	if(!..())
 		return
 	var/mob/living/M = A.affected_mob
@@ -36,4 +36,4 @@
 				affected_mob.visible_message("<span class='danger'>[affected_mob] coughs up a swarm of bees!</span>", \
 													"<span class='userdanger'>You cough up a swarm of bees!</span>")
 				new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc)
-	return
+	return
@@ -50,4 +50,4 @@
 				if(!affected_mob.resistances.Find(/datum/disease/flu))
 					var/datum/disease/Flu = new /datum/disease/flu(0)
 					affected_mob.ForceContractDisease(Flu)
-					cure()
+					cure()
@@ -36,4 +36,4 @@
 			if(prob(1))
 				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
 			if(prob(10))
-				to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")
+				to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")
@@ -1,6 +1,6 @@
 /datum/disease/gbs
 	name = "GBS"
-	max_stages = 5
+	max_stages = 4
 	spread_text = "On contact"
 	spread_flags = VIRUS_SPREAD_BLOOD | VIRUS_SPREAD_CONTACT_SKIN | VIRUS_SPREAD_CONTACT_FLUIDS
 	cure_text = "Synaptizine & Sulfur"
@@ -16,25 +16,15 @@
 	..()
 	switch(stage)
 		if(2)
-			if(prob(45))
-				affected_mob.adjustToxLoss(5)
-				affected_mob.updatehealth()
-			if(prob(1))
-				affected_mob.emote("sneeze")
-		if(3)
 			if(prob(5))
 				affected_mob.emote("cough")
-			else if(prob(5))
+		if(3)
+			if(prob(5))
 				affected_mob.emote("gasp")
 			if(prob(10))
-				to_chat(affected_mob, "<span class='danger'>You're starting to feel very weak...</span>")
+				to_chat(affected_mob, "<span class='danger'>Your body hurts all over!</span>")
 		if(4)
-			if(prob(10))
-				affected_mob.emote("cough")
-			affected_mob.adjustToxLoss(5)
-			affected_mob.updatehealth()
-		if(5)
-			to_chat(affected_mob, "<span class='danger'>Your body feels as if it's trying to rip itself open...</span>")
+			to_chat(affected_mob, "<span class='userdanger'>Your body feels as if it's trying to rip itself apart!</span>")
 			if(prob(50))
 				affected_mob.gib()
 		else
@@ -65,4 +65,4 @@
 					var/iter = rand(1,3)
 					for(i=0,i<iter,i++)
 						step_towards(S,affected_mob)
-	return
+	return
@@ -80,4 +80,4 @@
 				if(prob(50))
 					scramble_dna(affected_mob, 1, 0, rand(50,75))
 				else
-					scramble_dna(affected_mob, 0, 1, rand(50,75))
+					scramble_dna(affected_mob, 0, 1, rand(50,75))
@@ -198,6 +198,15 @@ GLOBAL_LIST_EMPTY(explosions)

 		//------- EX_ACT AND TURF FIRES -------

+		if(T == epicenter) // Ensures explosives detonating from bags trigger other explosives in that bag
+			var/list/items = list() 
+			for(var/I in T)
+				var/atom/A = I
+				items += A.GetAllContents()
+			for(var/O in items)
+				var/atom/A = O
+				A.ex_act(dist)
+
 		if(flame_dist && prob(40) && !isspaceturf(T) && !T.density)
 			new /obj/effect/hotspot(T) //Mostly for ambience!

@@ -28,7 +28,6 @@
 	else
 		log_world(originmastercommit)

-
 /datum/getrev/proc/GetTestMergeInfo(header = TRUE)
 	if(!testmerge.len)
 		return ""
@@ -45,6 +44,8 @@
 	set name = "Show Server Revision"
 	set desc = "Check the current server code revision"

+	if(GLOB.round_id)
+		to_chat(src, "<b>Round ID:</b> [GLOB.round_id]")
 	if(GLOB.revdata.originmastercommit)
 		to_chat(src, "<b>Server revision compiled on:</b> [GLOB.revdata.date]")
 		var/prefix = ""
@@ -1,62 +1,62 @@
-/datum/topic_input
-	var/href
-	var/list/href_list
-
-/datum/topic_input/New(thref,list/thref_list)
-	href = thref
-	href_list = thref_list.Copy()
-	return
-
-/datum/topic_input/proc/get(i)
-	return listgetindex(href_list,i)
-
-/datum/topic_input/proc/getAndLocate(i)
-	var/t = get(i)
-	if(t)
-		t = locate(t)
-	if (istext(t))
-		t = null
-	return t || null
-
-/datum/topic_input/proc/getNum(i)
-	var/t = get(i)
-	if(t)
-		t = text2num(t)
-	return isnum(t) ? t : null
-
-/datum/topic_input/proc/getObj(i)
-	var/t = getAndLocate(i)
-	return isobj(t) ? t : null
-
-/datum/topic_input/proc/getMob(i)
-	var/t = getAndLocate(i)
-	return ismob(t) ? t : null
-
-/datum/topic_input/proc/getTurf(i)
-	var/t = getAndLocate(i)
-	return isturf(t) ? t : null
-
-/datum/topic_input/proc/getAtom(i)
+/datum/topic_input
+	var/href
+	var/list/href_list
+
+/datum/topic_input/New(thref,list/thref_list)
+	href = thref
+	href_list = thref_list.Copy()
+	return
+
+/datum/topic_input/proc/get(i)
+	return listgetindex(href_list,i)
+
+/datum/topic_input/proc/getAndLocate(i)
+	var/t = get(i)
+	if(t)
+		t = locate(t)
+	if (istext(t))
+		t = null
+	return t || null
+
+/datum/topic_input/proc/getNum(i)
+	var/t = get(i)
+	if(t)
+		t = text2num(t)
+	return isnum(t) ? t : null
+
+/datum/topic_input/proc/getObj(i)
+	var/t = getAndLocate(i)
+	return isobj(t) ? t : null
+
+/datum/topic_input/proc/getMob(i)
+	var/t = getAndLocate(i)
+	return ismob(t) ? t : null
+
+/datum/topic_input/proc/getTurf(i)
+	var/t = getAndLocate(i)
+	return isturf(t) ? t : null
+
+/datum/topic_input/proc/getAtom(i)
 	return getType(i, /atom)
-
-/datum/topic_input/proc/getArea(i)
-	var/t = getAndLocate(i)
-	return isarea(t) ? t : null
-
-/datum/topic_input/proc/getStr(i)//params should always be text, but...
-	var/t = get(i)
-	return istext(t) ? t : null
-
-/datum/topic_input/proc/getType(i,type)
-	var/t = getAndLocate(i)
-	return istype(t,type) ? t : null
-
-/datum/topic_input/proc/getPath(i)
-	var/t = get(i)
-	if(t)
-		t = text2path(t)
-	return ispath(t) ? t : null
-
-/datum/topic_input/proc/getList(i)
-	var/t = getAndLocate(i)
-	return islist(t) ? t : null
+
+/datum/topic_input/proc/getArea(i)
+	var/t = getAndLocate(i)
+	return isarea(t) ? t : null
+
+/datum/topic_input/proc/getStr(i)//params should always be text, but...
+	var/t = get(i)
+	return istext(t) ? t : null
+
+/datum/topic_input/proc/getType(i,type)
+	var/t = getAndLocate(i)
+	return istype(t,type) ? t : null
+
+/datum/topic_input/proc/getPath(i)
+	var/t = get(i)
+	if(t)
+		t = text2path(t)
+	return ispath(t) ? t : null
+
+/datum/topic_input/proc/getList(i)
+	var/t = getAndLocate(i)
+	return islist(t) ? t : null
@@ -122,6 +122,8 @@
 	transfer_martial_arts(new_character)
 	if(active || force_key_move)
 		new_character.key = key		//now transfer the key to link the client to our new body
+
+//CIT CHANGE - makes arousal update when transfering bodies
 	if(isliving(new_character)) //New humans and such are by default enabled arousal. Let's always use the new mind's prefs.
 		var/mob/living/L = new_character
 		if(L.client && L.client.prefs)
@@ -202,7 +204,6 @@
 		remove_antag_datum(ANTAG_DATUM_BROTHER)
 	SSticker.mode.update_brother_icons_removed(src)

-
 /datum/mind/proc/remove_nukeop()
 	var/datum/antagonist/nukeop/nuke = has_antag_datum(/datum/antagonist/nukeop,TRUE)
 	if(nuke)
@@ -225,6 +226,7 @@
 		remove_antag_datum(rev.type)
 		special_role = null

+
 /datum/mind/proc/remove_antag_equip()
 	var/list/Mob_Contents = current.get_contents()
 	for(var/obj/item/I in Mob_Contents)
@@ -462,20 +464,27 @@
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
 		if (ishuman(current))
-			text += "<a href='?src=[REF(src)];monkey=healthy'>healthy</a> | <a href='?src=[REF(src)];monkey=infected'>infected</a> | <b>HUMAN</b> | other"
+			if(is_monkey_leader(src))
+				text += "<a href='?src=[REF(src)];monkey=healthy'>healthy</a> | <a href='?src=[REF(src)];monkey=infected'>infected</a> <b>LEADER</b> | <a href='?src=[REF(src)];monkey=human'>human</a> | other"
+			else
+				text += "<a href='?src=[REF(src)];monkey=healthy'>healthy</a> | <a href='?src=[REF(src)];monkey=infected'>infected</a> | <a href='?src=[REF(src)];monkey=leader'>leader</a> | <b>HUMAN</b> | other"
 		else if(ismonkey(current))
 			var/found = FALSE
 			for(var/datum/disease/transformation/jungle_fever/JF in current.viruses)
 				found = TRUE
 				break

-			if(found)
-				text += "<a href='?src=[REF(src)];monkey=healthy'>healthy</a> | <b>INFECTED</b> | <a href='?src=[REF(src)];monkey=human'>human</a> | other"
+			var/isLeader = is_monkey_leader(src)
+
+			if(isLeader)
+				text += "<a href='?src=[REF(src)];monkey=healthy'>healthy</a> | <a href='?src=[REF(src)];monkey=infected'>infected</a> <b>LEADER</b> | <a href='?src=[REF(src)];monkey=human'>human</a> | other"
+			else if(found)
+				text += "<a href='?src=[REF(src)];monkey=healthy'>healthy</a> | <b>INFECTED</b> | <a href='?src=[REF(src)];monkey=leader'>leader</a> | <a href='?src=[REF(src)];monkey=human'>human</a> | other"
 			else
-				text += "<b>HEALTHY</b> | <a href='?src=[REF(src)];monkey=infected'>infected</a> | <a href='?src=[REF(src)];monkey=human'>human</a> | other"
+				text += "<b>HEALTHY</b> | <a href='?src=[REF(src)];monkey=infected'>infected</a> | <a href='?src=[REF(src)];monkey=leader'>leader</a> | <a href='?src=[REF(src)];monkey=human'>human</a> | other"

 		else
-			text += "healthy | infected | human | <b>OTHER</b>"
+			text += "healthy | infected | leader | human | <b>OTHER</b>"

 		if(current && current.client && (ROLE_MONKEY in current.client.prefs.be_special))
 			text += " | Enabled in Prefs"
@@ -579,8 +588,8 @@

 		sections["revolution"] = text

-		/** Abductors **/
-		text = "Abductor"
+		/** ABDUCTION **/
+		text = "abductor"
 		if(SSticker.mode.config_tag == "abductor")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
@@ -807,7 +816,7 @@
 					else
 						target_antag = target

-		var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "late-assassinate", "maroon", "debrain", "protect", "destroy", "prevent", "hijack", "escape", "survive", "martyr", "steal", "download", "nuclear", "capture", "absorb", "custom")
+		var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "maroon", "debrain", "protect", "destroy", "prevent", "hijack", "escape", "survive", "martyr", "steal", "download", "nuclear", "capture", "absorb", "custom")
 		if (!new_obj_type)
 			return

@@ -842,12 +851,6 @@
 					//Will display as special role if the target is set as MODE. Ninjas/commandos/nuke ops.
 					new_objective.update_explanation_text()

-			if ("late-assassinate")
-				new_objective = new /datum/objective/assassinate/late
-				new_objective.owner = src
-				new_objective.target = null
-				new_objective.find_target() //This will begin the "find-target" loop and update their explanation text
-
 			if ("destroy")
 				var/list/possible_targets = active_ais(1)
 				if(possible_targets.len)
@@ -905,7 +908,7 @@
 				switch(new_obj_type)
 					if("download")
 						new_objective = new /datum/objective/download
-						new_objective.explanation_text = "Download [target_number] research levels."
+						new_objective.explanation_text = "Download [target_number] research node\s."
 					if("capture")
 						new_objective = new /datum/objective/capture
 						new_objective.explanation_text = "Capture [target_number] lifeforms with an energy net. Live, rare specimens are worth more."
@@ -1256,11 +1259,17 @@
 					else if (istype(M) && length(M.viruses))
 						for(var/thing in M.viruses)
 							var/datum/disease/D = thing
-							D.cure(0)
+							D.cure(FALSE)
+			if("leader")
+				if(check_rights(R_ADMIN, 0))
+					add_monkey_leader(src)
+					log_admin("[key_name(usr)] made [key_name(current)] a monkey leader!")
+					message_admins("[key_name_admin(usr)] made [key_name_admin(current)] a monkey leader!")
 			if("infected")
-				if (check_rights(R_ADMIN, 0))
+				if(check_rights(R_ADMIN, 0))
 					var/mob/living/carbon/human/H = current
 					var/mob/living/carbon/monkey/M = current
+					add_monkey(src)
 					if (istype(H))
 						log_admin("[key_name(usr)] attempting to monkeyize and infect [key_name(current)]")
 						message_admins("<span class='notice'>[key_name_admin(usr)] attempting to monkeyize and infect [key_name_admin(current)]</span>")
@@ -1278,6 +1287,7 @@
 						for(var/datum/disease/transformation/jungle_fever/JF in M.viruses)
 							JF.cure(0)
 							stoplag() //because deleting of virus is doing throught spawn(0) //What
+						remove_monkey(src)
 						log_admin("[key_name(usr)] attempting to humanize [key_name(current)]")
 						message_admins("<span class='notice'>[key_name_admin(usr)] attempting to humanize [key_name_admin(current)]</span>")
 						H = M.humanize(TR_KEEPITEMS  |  TR_KEEPIMPLANTS  |  TR_KEEPORGANS  |  TR_KEEPDAMAGE  |  TR_KEEPVIRUS  |  TR_DEFAULTMSG)
@@ -8,7 +8,6 @@ GLOBAL_LIST_EMPTY(mutations_list)
 	GLOB.mutations_list[name] = src

 /datum/mutation/human
-
 	var/dna_block
 	var/quality
 	var/get_chance = 100
@@ -5,7 +5,7 @@
 	get_chance = 15
 	lowest_value = 256 * 12
 	text_gain_indication = "<span class='notice'>Your muscles hurt!</span>"
-	species_allowed = list("fly") //no skeleton/lizard hulk
+	species_allowed = list("human") //no skeleton/lizard hulk
 	health_req = 25

 /datum/mutation/human/hulk/on_acquiring(mob/living/carbon/human/owner)
@@ -7,12 +7,12 @@
 /datum/mutation/human/nearsight/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
 		return
-	owner.become_nearsighted()
+	owner.become_nearsighted(GENETIC_MUTATION)

 /datum/mutation/human/nearsight/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
-	owner.cure_nearsighted()
+	owner.cure_nearsighted(GENETIC_MUTATION)


 //Blind makes you blind. Who knew?
@@ -24,12 +24,12 @@
 /datum/mutation/human/blind/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
 		return
-	owner.become_blind()
+	owner.become_blind(GENETIC_MUTATION)

 /datum/mutation/human/blind/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
-	owner.cure_blind()
+	owner.cure_blind(GENETIC_MUTATION)


 //X-Ray Vision lets you see through walls.
@@ -33,7 +33,7 @@
 		if(LINGHIVE_LING)
 			var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
 			var/msg = "<i><font color=#800080><b>[changeling.changelingID]:</b> [message]</font></i>"
-			log_talk(src,"[changeling.changelingID]/[user.key] : [message]",LOGSAY)
+			log_talk(user,"[changeling.changelingID]/[user.key] : [message]",LOGSAY)
 			for(var/_M in GLOB.mob_list)
 				var/mob/M = _M
 				if(M in GLOB.dead_mob_list)
@@ -110,3 +110,25 @@
 		AI.holopad_talk(message, language)
 		return FALSE
 	return TRUE
+
+/datum/saymode/monkey
+	key = "k"
+	mode = MODE_MONKEY
+
+/datum/saymode/monkey/handle_message(mob/living/user, message, datum/language/language)
+	var/datum/mind = user.mind
+	if(!mind)
+		return TRUE
+	if(is_monkey_leader(mind) || (ismonkey(user) && is_monkey(mind)))
+		log_talk(user, "(MONKEY) [user]/[user.key]: [message]",LOGSAY)
+		if(prob(75) && ismonkey(user))
+			user.visible_message("<span class='notice'>\The [user] chimpers.</span>")
+		var/msg = "<span class='[is_monkey_leader(mind) ? "monkeylead" : "monkeyhive"]'><b><font size=2>\[[is_monkey_leader(mind) ? "Monkey Leader" : "Monkey"]\]</font> [user]</b>: [message]</span>"
+		for(var/_M in GLOB.mob_list)
+			var/mob/M = _M
+			if(M in GLOB.dead_mob_list)
+				var/link = FOLLOW_LINK(M, user)
+				to_chat(M, "[link] [msg]")
+			if((is_monkey_leader(M.mind) || ismonkey(M)) && (M.mind in SSticker.mode.ape_infectees))
+				to_chat(M, msg)
+		return FALSE
@@ -16,3 +16,4 @@
 /datum/weakref/proc/resolve()
 	var/datum/D = locate(reference)
 	return (!QDELETED(D) && D.weak_reference == src) ? D : null
+
--- a/Show More
+++ b/Show More