cleanup

code/controllers/subsystem/ticker.dm

@@ -583,6 +583,14 @@ SUBSYSTEM_DEF(ticker)
 
 	mode.declare_station_goal_completion()
 
+	//medals, placed far down so that people can actually see the commendations.
+	if(GLOB.commendations)
+		to_chat(world, "<b><font size=3>Medal Commendations:</font></b>")
+		for (var/com in GLOB.commendations)
+			to_chat(world, com)
+
+	CHECK_TICK
+
 	CHECK_TICK
 
 	//Adds the del() log to world.log in a format condensable by the runtime condenser found in tools

code/controllers/subsystem/ticker.dm.rej

@@ -1,15 +0,0 @@
-diff a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm	(rejected hunks)
-@@ -613,6 +615,13 @@ SUBSYSTEM_DEF(ticker)
- 	mode.declare_station_goal_completion()
- 
- 	CHECK_TICK
-+	//medals, placed far down so that people can actually see the commendations.
-+	if(GLOB.commendations)
-+		to_chat(world, "<b><font size=3>Medal Commendations:</font></b>")
-+		for (var/com in GLOB.commendations)
-+			to_chat(world, com)
-+
-+	CHECK_TICK
- 
- 	//Collects persistence features
- 	SSpersistence.CollectData()

code/modules/clothing/under/accessories.dm

@@ -85,6 +85,7 @@
 	item_color = "bronze"
 	materials = list(MAT_METAL=1000)
 	resistance_flags = FIRE_PROOF
+	var/commended = FALSE
 
 //Pinning medals on people
 /obj/item/clothing/accessory/medal/attack(mob/living/carbon/human/M, mob/living/user)
@@ -103,6 +104,9 @@
 			else
 				user.visible_message("[user] is trying to pin [src] on [M]'s chest.", \
 									 "<span class='notice'>You try to pin [src] on [M]'s chest.</span>")
+			var/input
+			if(!commended && user != M)
+				input = stripped_input(user,"Please input a reason for this commendation, it will be recorded by Nanotrasen.", ,"", 140)
 			if(do_after(user, delay, target = M))
 				if(U.attach_accessory(src, user, 0)) //Attach it, do not notify the user of the attachment
 					if(user == M)
@@ -110,6 +114,12 @@
 					else
 						user.visible_message("[user] pins \the [src] on [M]'s chest.", \
 											 "<span class='notice'>You pin \the [src] on [M]'s chest.</span>")
+						if(input)
+							SSblackbox.add_details("commendation", json_encode(list("commender" = "[user.real_name]", "commendee" = "[M.real_name]", "medal" = "[src]", "reason" = input)))
+							GLOB.commendations += "[user.real_name] awarded <b>[M.real_name]</b> the <font color='blue'>[name]</font>! \n- [input]"
+							commended = TRUE
+							log_game("<b>[key_name(M)]</b> was given the following commendation by <b>[key_name(user)]</b>: [input]")
+							message_admins("<b>[key_name(M)]</b> was given the following commendation by <b>[key_name(user)]</b>: [input]")
 
 		else to_chat(user, "<span class='warning'>Medals can only be pinned on jumpsuits!</span>")
 	else ..()

code/modules/jobs/job_types/captain.dm

@@ -46,8 +46,9 @@ Captain
 	dufflebag = /obj/item/weapon/storage/backpack/dufflebag/captain
 
 	implants = list(/obj/item/weapon/implant/mindshield)
-	accessory = /obj/item/clothing/accessory/medal/gold/captain
-
+
+	accessory = /obj/item/clothing/accessory/medal/gold/captain
+
 /*
 Head of Personnel
 */

tgstation.dme.rej

@@ -1,10 +0,0 @@
-diff a/tgstation.dme b/tgstation.dme	(rejected hunks)
-@@ -1169,7 +1169,7 @@
- #include "code\modules\clothing\masks\gasmask.dm"
- #include "code\modules\clothing\masks\hailer.dm"
- #include "code\modules\clothing\masks\miscellaneous.dm"
--#include "code\modules\clothing\neck\ties.dm"
-+#include "code\modules\clothing\neck\neck.dm"
- #include "code\modules\clothing\outfits\ert.dm"
- #include "code\modules\clothing\outfits\standard.dm"
- #include "code\modules\clothing\shoes\bananashoes.dm"