initial

cmss13-devs · Apr 7, 2024 · 712543f · 712543f
1 parent 75a1a15
commit 712543f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,7 +9,7 @@
 		"**/.pnp.*": true
 	},
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	},
 	"files.eol": "\n",
 	"files.insertFinalNewline": true,

diff --git a/code/datums/medal_awards.dm b/code/datums/medal_awards.dm
@@ -47,6 +47,10 @@ GLOBAL_LIST_EMPTY(jelly_awards)
 		var/recipient_name = record.fields["name"]
 		recipient_ranks[recipient_name] = record.fields["rank"]
 		possible_recipients += recipient_name
+
+	if(!as_admin)
+		possible_recipients -= usr.real_name
+
 	var/chosen_recipient = tgui_input_list(usr, "Who do you want to award a medal to?", "Medal Recipient", possible_recipients)
 	if(!chosen_recipient)
 		return FALSE
@@ -179,6 +183,10 @@ GLOBAL_LIST_EMPTY(jelly_awards)
 		user.visible_message("ERROR: ID card not registered for [user.real_name] in USCM registry. Potential medal fraud detected.")
 		return
 
+	if(!(FACTION_USCM in user.faction_group))
+		to_chat(user, SPAN_WARNING("Medals only available for USCM personnel."))
+		return
+
 	if(give_medal_award(get_turf(printer)))
 		user.visible_message(SPAN_NOTICE("[printer] prints a medal."))
 

diff --git a/code/datums/paygrades/paygrade.dm b/code/datums/paygrades/paygrade.dm
@@ -51,7 +51,10 @@ GLOBAL_LIST_INIT(co_paygrades, list(
 	"MO6E",
 	"MO6C",
 	"MO5",
-	"MO4"
+	"MO4",
+	"MO3",
+	"MO2",
+	"MO1",
 ))
 
 GLOBAL_LIST_INIT(wy_paygrades, list(

diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm
@@ -464,10 +464,17 @@
 				return
 			change_lead(user, params["ref"])
 
+		if("award_medal")
+			print_medal(user, src)
+			return
+
 		if("insubordination")
 			mark_insubordination()
+			return
+
 		if("transfer_marine")
 			transfer_squad()
+			return
 
 		if("change_locations_ignored")
 			switch(z_hidden)

diff --git a/tgui/packages/tgui/interfaces/OverwatchConsole.js b/tgui/packages/tgui/interfaces/OverwatchConsole.js
@@ -418,11 +418,8 @@ const SquadMonitor = (props, context) => {
             onClick={() => act('transfer_marine')}>
             Transfer Marine
           </Button>
-          <Button
-            color="red"
-            icon="running"
-            onClick={() => act('insubordination')}>
-            Insubordination
+          <Button color="blue" icon="medal" onClick={() => act('award_medal')}>
+            Award Medal
           </Button>
         </>
       }>