From 23da65a1f25c48f81f8bcc44df1628f6184cd59a Mon Sep 17 00:00:00 2001 From: Sbotkin <5092934+Sbotkin@users.noreply.github.com> Date: Fri, 2 Feb 2024 14:55:25 +0300 Subject: [PATCH] [MIRROR] Fixes vote extend text and fleet medical fatigues --- code/datums/vote/transfer.dm | 10 +++++----- maps/torch/items/clothing/solgov-under.dm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/datums/vote/transfer.dm b/code/datums/vote/transfer.dm index 7acc75d71a914..79f8041713078 100644 --- a/code/datums/vote/transfer.dm +++ b/code/datums/vote/transfer.dm @@ -1,5 +1,5 @@ -#define CHOICE_TRANSFER "Initiate crew transfer" -#define CHOICE_EXTEND "Extend the round ([config.vote_autotransfer_interval / 600] minutes)" +#define CHOICE_TRANSFER "Initiate bluespace jump" +#define CHOICE_EXTEND "Extend the round ([config.vote_autotransfer_interval] minutes)" #define CHOICE_ADD_ANTAG "Add antagonist" /datum/vote/transfer @@ -17,10 +17,10 @@ return //Mods bypass further checks. var/singleton/security_state/security_state = GET_SINGLETON(GLOB.using_map.security_state) if (!automatic && security_state.current_security_level_is_same_or_higher_than(security_state.high_security_level)) - to_chat(creator, "The current alert status is too high to call for a crew transfer!") + to_chat(creator, "The current alert status is too high to call for a bluespace jump!") return FALSE if(GAME_STATE <= RUNLEVEL_SETUP) - to_chat(creator, "The crew transfer button has been disabled!") + to_chat(creator, "The bluespace jump button has been disabled!") return FALSE /datum/vote/transfer/setup_vote(mob/creator, automatic) @@ -45,7 +45,7 @@ else factor = 1.4 choices[CHOICE_TRANSFER] = round(choices[CHOICE_TRANSFER] * factor) - to_world(SPAN_COLOR("purple", "Crew Transfer Factor: [factor]")) + to_world(SPAN_COLOR("purple", "Bluespace Jump Factor: [factor]")) /datum/vote/transfer/report_result() if(..()) diff --git a/maps/torch/items/clothing/solgov-under.dm b/maps/torch/items/clothing/solgov-under.dm index 63fe70c46c870..c90c759d8b051 100644 --- a/maps/torch/items/clothing/solgov-under.dm +++ b/maps/torch/items/clothing/solgov-under.dm @@ -205,7 +205,7 @@ item_flags = ITEM_FLAG_WASHER_ALLOWED | ITEM_FLAG_INVALID_FOR_CHAMELEON /obj/item/clothing/under/solgov/utility/fleet/combat/medical - accessories = list(/obj/item/clothing/accessory/solgov/department/medical/fleet, /obj/item/clothing/accessory/armband/medblue) + accessories = list(/obj/item/clothing/accessory/solgov/department/medical/fleet) item_flags = ITEM_FLAG_WASHER_ALLOWED | ITEM_FLAG_INVALID_FOR_CHAMELEON /obj/item/clothing/under/solgov/utility/fleet/combat/command