From 9b443d47bd8165c6af71fb68f57d2a60becc81f5 Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Tue, 5 Dec 2023 10:23:04 +0300 Subject: [PATCH 1/8] rrrrrr --- code/datums/medal_awards.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/medal_awards.dm b/code/datums/medal_awards.dm index 54af48fd3345..aee740f6833d 100644 --- a/code/datums/medal_awards.dm +++ b/code/datums/medal_awards.dm @@ -165,7 +165,7 @@ GLOBAL_LIST_EMPTY(jelly_awards) to_chat(user, SPAN_WARNING("You must have an authenticated ID Card to award medals.")) return - if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.highcom_paygrades))) + if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.highcom_paygrades) || (card.paygrade == "MO3"))) to_chat(user, SPAN_WARNING("Only a Senior Officer can award medals!")) return From 302a563d76f1991f20f106269e7f71028c4b1e0c Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Wed, 6 Dec 2023 14:32:25 +0300 Subject: [PATCH 2/8] Update medal_awards.dm --- code/datums/medal_awards.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/medal_awards.dm b/code/datums/medal_awards.dm index aee740f6833d..315206490962 100644 --- a/code/datums/medal_awards.dm +++ b/code/datums/medal_awards.dm @@ -165,7 +165,7 @@ GLOBAL_LIST_EMPTY(jelly_awards) to_chat(user, SPAN_WARNING("You must have an authenticated ID Card to award medals.")) return - if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.highcom_paygrades) || (card.paygrade == "MO3"))) + if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.highcom_paygrades) || (card.paygrade == PAY_SHORT_MO3))) to_chat(user, SPAN_WARNING("Only a Senior Officer can award medals!")) return From d1bd6fe865920be97dd27e38e8b599116ee8643b Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Wed, 6 Dec 2023 15:14:22 +0300 Subject: [PATCH 3/8] d --- BUILD.cmd | 2 +- node_modules/.yarn-integrity | 10 ++++++++++ yarn.lock | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 node_modules/.yarn-integrity create mode 100644 yarn.lock diff --git a/BUILD.cmd b/BUILD.cmd index dc791f60c9b7..16cb8821518c 100644 --- a/BUILD.cmd +++ b/BUILD.cmd @@ -1,2 +1,2 @@ -@echo off +aca@echo off call "%~dp0\tools\build\build.bat" --wait-on-error build %* diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity new file mode 100644 index 000000000000..94cbf03835b6 --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,10 @@ +{ + "systemParams": "win32-x64-115", + "modulesFolders": [], + "flags": [], + "linkedModules": [], + "topLevelPatterns": [], + "lockfileEntries": {}, + "files": [], + "artifacts": {} +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 000000000000..fb57ccd13afb --- /dev/null +++ b/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + From 5f419daf64a22c2e397dd5b745535bfa0a22b096 Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Tue, 5 Dec 2023 10:23:04 +0300 Subject: [PATCH 4/8] rrrrrr --- code/datums/medal_awards.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/medal_awards.dm b/code/datums/medal_awards.dm index 54af48fd3345..aee740f6833d 100644 --- a/code/datums/medal_awards.dm +++ b/code/datums/medal_awards.dm @@ -165,7 +165,7 @@ GLOBAL_LIST_EMPTY(jelly_awards) to_chat(user, SPAN_WARNING("You must have an authenticated ID Card to award medals.")) return - if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.highcom_paygrades))) + if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.highcom_paygrades) || (card.paygrade == "MO3"))) to_chat(user, SPAN_WARNING("Only a Senior Officer can award medals!")) return From b2276bf2cf9c63c42b2ba3984622ee53dbdccb2c Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Wed, 6 Dec 2023 14:32:25 +0300 Subject: [PATCH 5/8] Update medal_awards.dm --- code/datums/medal_awards.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/medal_awards.dm b/code/datums/medal_awards.dm index aee740f6833d..315206490962 100644 --- a/code/datums/medal_awards.dm +++ b/code/datums/medal_awards.dm @@ -165,7 +165,7 @@ GLOBAL_LIST_EMPTY(jelly_awards) to_chat(user, SPAN_WARNING("You must have an authenticated ID Card to award medals.")) return - if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.highcom_paygrades) || (card.paygrade == "MO3"))) + if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.highcom_paygrades) || (card.paygrade == PAY_SHORT_MO3))) to_chat(user, SPAN_WARNING("Only a Senior Officer can award medals!")) return From 81120ac5c3dd742207d1a83b8c0421534e649f8b Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Wed, 6 Dec 2023 15:17:52 +0300 Subject: [PATCH 6/8] Revert "d" This reverts commit d1bd6fe865920be97dd27e38e8b599116ee8643b. --- BUILD.cmd | 2 +- node_modules/.yarn-integrity | 10 ---------- yarn.lock | 4 ---- 3 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 node_modules/.yarn-integrity delete mode 100644 yarn.lock diff --git a/BUILD.cmd b/BUILD.cmd index 16cb8821518c..dc791f60c9b7 100644 --- a/BUILD.cmd +++ b/BUILD.cmd @@ -1,2 +1,2 @@ -aca@echo off +@echo off call "%~dp0\tools\build\build.bat" --wait-on-error build %* diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity deleted file mode 100644 index 94cbf03835b6..000000000000 --- a/node_modules/.yarn-integrity +++ /dev/null @@ -1,10 +0,0 @@ -{ - "systemParams": "win32-x64-115", - "modulesFolders": [], - "flags": [], - "linkedModules": [], - "topLevelPatterns": [], - "lockfileEntries": {}, - "files": [], - "artifacts": {} -} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock deleted file mode 100644 index fb57ccd13afb..000000000000 --- a/yarn.lock +++ /dev/null @@ -1,4 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - From d55757a6283e74345423cb61d81437f4937be588 Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Fri, 8 Dec 2023 11:41:12 +0300 Subject: [PATCH 7/8] :) --- code/datums/medal_awards.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/datums/medal_awards.dm b/code/datums/medal_awards.dm index 315206490962..da5dd4659bb5 100644 --- a/code/datums/medal_awards.dm +++ b/code/datums/medal_awards.dm @@ -36,7 +36,7 @@ GLOBAL_LIST_EMPTY(jelly_awards) giver_ckey = list() -/proc/give_medal_award(medal_location, as_admin = FALSE) +/proc/give_medal_award(medal_location, as_admin = FALSE, as_xo = FALSE) if(as_admin && !check_rights(R_ADMIN)) as_admin = FALSE @@ -51,8 +51,12 @@ GLOBAL_LIST_EMPTY(jelly_awards) if(!chosen_recipient) return FALSE + var/list/medals_list = list(MARINE_CONDUCT_MEDAL, MARINE_BRONZE_HEART_MEDAL, MARINE_VALOR_MEDAL, MARINE_HEROISM_MEDAL) + if(as_xo) + medals_list = list(MARINE_CONDUCT_MEDAL) + // Pick a medal - var/medal_type = tgui_input_list(usr, "What type of medal do you want to award?", "Medal Type", list(MARINE_CONDUCT_MEDAL, MARINE_BRONZE_HEART_MEDAL, MARINE_VALOR_MEDAL, MARINE_HEROISM_MEDAL)) + var/medal_type = tgui_input_list(usr, "What type of medal do you want to award?", "Medal Type", medals_list) if(!medal_type) return FALSE @@ -179,7 +183,7 @@ 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(give_medal_award(get_turf(printer))) + if(give_medal_award(get_turf(printer), as_xo = card.paygrade == PAY_SHORT_MO3)) user.visible_message(SPAN_NOTICE("[printer] prints a medal.")) /proc/give_jelly_award(datum/hive_status/hive, as_admin = FALSE) From 67ce032271330297837854aeeda3ab9c4d70a8d2 Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Sat, 16 Dec 2023 16:38:06 +0300 Subject: [PATCH 8/8] Update medal_awards.dm --- code/datums/medal_awards.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/datums/medal_awards.dm b/code/datums/medal_awards.dm index 86ca6153a386..5dfb764883d6 100644 --- a/code/datums/medal_awards.dm +++ b/code/datums/medal_awards.dm @@ -57,11 +57,8 @@ GLOBAL_LIST_INIT(human_medals, list(MARINE_CONDUCT_MEDAL, MARINE_BRONZE_HEART_ME medals_list = list(MARINE_CONDUCT_MEDAL) // Pick a medal - var/medal_type = tgui_input_list(usr, "What type of medal do you want to award?", "Medal Type", medals_list) - - if(!medal_type) return FALSE