Merge pull request #2786 from thehighwayman/Donoritems

Adds in donor items

code/__DEFINES/radio.dm

@@ -8,9 +8,9 @@
 #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, dark green // yogs - Changes colour to right name
+#define FREQ_SERVICE 1349  // Service comms frequency, green
 #define FREQ_SCIENCE 1351  // Science comms frequency, plum
-#define FREQ_COMMAND 1353  // Command comms frequency, dark blue // yogs - Changes colour to right name
+#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

code/modules/client/preferences.dm

@@ -609,11 +609,17 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			if(is_donator(user.client))
 				dat += "<b>Quiet round:</b> <a href='?_src_=prefs;preference=donor;task=quiet_round'>[(src.toggles & QUIET_ROUND) ? "Yes" : "No"]</a><br>"
 				dat += "<b>Fancy Hat:</b> "
-				var/type = donor_hat ? donor_start_items[donor_hat] : null
-				var/temp_hat = donor_hat ? (new type()) : "None selected"
+				var/typehat = donor_hat ? donor_start_items[donor_hat] : null
+				var/temp_hat = donor_hat ? (new typehat()) : "None selected"
 				dat += "<a href='?_src_=prefs;preference=donor;task=hat'>Pick</a> [temp_hat]<BR>"
 				if(donor_hat)
 					qdel(temp_hat)
+				dat += "<b>Fancy Item:</b> "
+				var/typeitem = donor_item ? donor_start_tools[donor_item] : null
+				var/temp_item = donor_item ? (new typeitem()) : "None selected"
+				dat += "<a href='?_src_=prefs;preference=donor;task=item'>Pick</a> [temp_item]<BR>"
+				if(donor_item)
+					qdel(temp_item)
 				dat += "<b>Fancy PDA:</b> "
 				dat += "<a href='?_src_=prefs;preference=donor;task=pda'>[donor_pdas[donor_pda]]</a><BR>"
 				dat += "<b>Purrbation (Humans only)</b> "
@@ -1069,6 +1075,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						donor_hat = donor_start_items.Find(item)
 					else
 						donor_hat = 0
+				if("item")
+					var/item = input(usr, "What would you like to start with?","Donator fun","Nothing") as null|anything in donor_start_tools
+					if(item)
+						donor_item = donor_start_tools.Find(item)
+					else
+						donor_item = 0
 				if("quiet_round")
 					toggles ^= QUIET_ROUND
 				if("pda")

code/modules/client/preferences_savefile.dm

@@ -107,6 +107,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	// yogs start - Donor features
 	S["donor_pda"]			>> donor_pda
 	S["donor_hat"]          >> donor_hat
+	S["donor_item"]          >> donor_item
 	S["purrbation"]			>> purrbation
 	// yogs end
 
@@ -141,6 +142,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	// yogs start - Donor features
 	donor_pda		= sanitize_integer(donor_pda, 1, donor_pdas.len, 1)
 	donor_hat       = sanitize_integer(donor_hat, 0, donor_start_items.len, 0)
+	donor_item      = sanitize_integer(donor_item, 0, donor_start_tools.len, 0)
 	purrbation      = sanitize_integer(purrbation, 0, 1, initial(purrbation))
 	// yogs end
 	
@@ -193,6 +195,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	// yogs start - Donor features
 	WRITE_FILE(S["donor_pda"], donor_pda)
 	WRITE_FILE(S["donor_hat"], donor_hat)
+	WRITE_FILE(S["donor_item"], donor_item)
 	WRITE_FILE(S["purrbation"], purrbation)
 	// yogs end
 	

code/modules/goonchat/browserassets/css/browserOutput.css

@@ -278,12 +278,12 @@ em						{font-style: normal;	font-weight: bold;}
 .binarysay a:active, .binarysay a:visited {color: #88ff88;}
 .radio					{color: #008000;}
 .sciradio				{color: #993399;}
-.comradio				{color: #0011BF;} /* yogs - Colour change */
+.comradio				{color: #948f02;}
 .secradio				{color: #a30000;}
 .medradio				{color: #337296;}
 .engradio				{color: #fb5613;}
 .suppradio				{color: #a8732b;}
-.servradio				{color: #105000;} /* yogs - Colour change */
+.servradio				{color: #6eaa2c;}
 .syndradio				{color: #6d3f40;}
 .centcomradio			{color: #686868;}
 .aiprivradio			{color: #ff00ff;}

interface/stylesheet.dm

@@ -43,12 +43,12 @@ em						{font-style: normal;	font-weight: bold;}
 .binarysay a:active, .binarysay a:visited {color: #88ff88;}
 .radio					{color: #008000;}
 .sciradio				{color: #993399;}
-.comradio				{color: #0011BF;} /* yogs - Colour change */
+.comradio				{color: #948f02;}
 .secradio				{color: #a30000;}
 .medradio				{color: #337296;}
 .engradio				{color: #fb5613;}
 .suppradio				{color: #a8732b;}
-.servradio				{color: #105000;} /* yogs - Colour change */
+.servradio				{color: #6eaa2c;}
 .syndradio				{color: #6d3f40;}
 .centcomradio			{color: #686868;}
 .aiprivradio			{color: #ff00ff;}
@@ -178,7 +178,7 @@ h1.alert, h2.alert		{color: #000000;}
 .monkeyhive				{color: #774704;}
 .monkeylead				{color: #774704;	font-size: 2;}
 
-/* yogs start - Yog Tickets */
+// yogs start - Yog Tickets
 .ticket-status {
 	color: #000099;
 	font-weight: bold;
@@ -205,5 +205,5 @@ h1.alert, h2.alert		{color: #000000;}
 	font-weight: bold;
 	font-style: italic;
 }
-/* yogs end */
+// yogs end
 </style>"}

yogstation/code/modules/client/preferences.dm

@@ -1,5 +1,6 @@
 /datum/preferences
 	var/donor_hat = 0
+	var/donor_item = 0
 	var/donor_pda = 1
 	var/quiet_round = FALSE
 	var/purrbation = null

yogstation/code/modules/donor/donor_items.dm

@@ -70,3 +70,39 @@ var/list/donor_start_items = list(\
 						)
 
 var/list/donor_pdas = list("Normal", "Transparent", "Pip Boy", "Rainbow")
+
+var/list/donor_start_tools = list(\
+						/obj/item/banhammer, \
+						/obj/item/bedsheet/wiz, \
+						/obj/item/bedsheet/nanotrasen, \
+						/obj/item/bedsheet/syndie, \
+						/obj/item/bikehorn/airhorn, \
+						/obj/item/camera, \
+						/obj/item/cane, \
+						/obj/item/clothing/shoes/sneakers/rainbow, \
+						/obj/item/clothing/gloves/color/rainbow, \
+						/obj/item/clothing/under/color/rainbow, \
+						/obj/item/grown/sunflower, \
+						/obj/item/hot_potato/harmless/toy, \
+						/obj/item/instrument/accordion, \
+						/obj/item/instrument/glockenspiel, \
+						/obj/item/instrument/harmonica, \
+						/obj/item/instrument/recorder, \
+						/obj/item/instrument/saxophone, \
+						/obj/item/latexballon, \
+						/obj/item/lighter, \
+						/obj/item/lipstick/random, \
+						/obj/item/poster/random_contraband, \
+						/obj/item/poster/random_official, \
+						/obj/item/razor, \
+						/obj/item/toy/balloon, \
+						/obj/item/toy/beach_ball, \
+						/obj/item/toy/clockwork_watch, \
+						/obj/item/toy/dummy, \
+						/obj/item/toy/eightball, \
+						/obj/item/toy/katana, \
+						/obj/item/toy/gun, \
+						/obj/item/toy/plush/plushvar, \
+						/obj/item/toy/plush/narplush, \
+						/obj/item/toy/sword
+						)

yogstation/code/modules/jobs/job_types/job.dm

@@ -18,6 +18,13 @@
 			var/obj/hat = new type()
 			hat.forceMove(BP)
 			
+	if(C.prefs.donor_item)
+		var/obj/item/storage/backpack/BP = locate(/obj/item/storage/backpack) in H.GetAllContents()
+		if(BP)
+			var/type = donor_start_tools[C.prefs.donor_item]
+			var/obj/item = new type()
+			item.forceMove(BP)
+
 	switch(C.prefs.donor_pda)
 		if(2)//transparent
 			var/obj/item/pda/PDA = locate(/obj/item/pda) in H.GetAllContents()