Skip to content

Commit

Permalink
[MIRROR] Fixes vote extend text and fleet medical fatigues
Browse files Browse the repository at this point in the history
  • Loading branch information
Sbotkin authored and SuhEugene committed Feb 2, 2024
1 parent 0762d3a commit 23da65a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions code/datums/vote/transfer.dm
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand All @@ -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(..())
Expand Down
2 changes: 1 addition & 1 deletion maps/torch/items/clothing/solgov-under.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 23da65a

Please sign in to comment.