Skip to content

Commit

Permalink
Revert "Обновление званий КМП" (#314)
Browse files Browse the repository at this point in the history
Revert "Обновление званий КМП (#313)"

This reverts commit 1a7a440.
  • Loading branch information
Exapsters authored Jul 7, 2023
1 parent 1a7a440 commit e157fa4
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 10 deletions.
22 changes: 17 additions & 5 deletions maps/torch/items/clothing/solgov-accessory.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1055,8 +1055,8 @@ ranks - marines
overlay_state = "device_silver"

/obj/item/clothing/accessory/solgov/rank/army/officer/o3
name = "ranks (O-3 captain major)"
desc = "Collar pin denoting the rank of Captain Major."
name = "ranks (O-3 marine captain)"
desc = "Collar pin denoting the rank of Marine Captain."
icon_state = "o3_device"
overlay_state = "device_silver"

Expand All @@ -1078,10 +1078,22 @@ ranks - marines
overlay_state = "device_silver"

/obj/item/clothing/accessory/solgov/rank/army/flag
name = "ranks (O-7 colonel general)"
desc = "Collar pin denoting the rank of Colonel General."
name = "ranks (O-7 brigadier general)"
desc = "Collar pin denoting the rank of Brigadier General."
icon_state = "armyrank_command"

/obj/item/clothing/accessory/solgov/rank/army/flag/o8
name = "ranks (O-8 general of the corps)"
name = "ranks (O-8 major general)"
desc = "Collar pin denoting the rank of Major General."

/obj/item/clothing/accessory/solgov/rank/army/flag/o9
name = "ranks (O-9 lieutenant general)"
desc = "Collar pin denoting the rank of Lieutenant general."

/obj/item/clothing/accessory/solgov/rank/army/flag/o10
name = "ranks (O-10 general)"
desc = "Collar pin denoting the rank of General."

/obj/item/clothing/accessory/solgov/rank/army/flag/o10_alt
name = "ranks (O-10 general of the corps)"
desc = "Collar pin denoting the rank of General of the Corps."
28 changes: 23 additions & 5 deletions maps/torch/torch_ranks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@
sort_order = 12

/datum/mil_rank/army/o3
name = "Captain Major"
name = "Marine Captain"
name_short = "MCPT"
accessory = list(/obj/item/clothing/accessory/solgov/rank/army/officer/o3)
sort_order = 13
Expand All @@ -723,17 +723,35 @@
sort_order = 16

/datum/mil_rank/army/o7
name = "Colonel General"
name_short = "ColGen"
name = "Brigadier General"
name_short = "BGen"
accessory = list(/obj/item/clothing/accessory/solgov/rank/army/flag)
sort_order = 17

/datum/mil_rank/army/o8
name = "General of the Marine Corps"
name_short = "GenMarCor"
name = "Major General"
name_short = "MajGen"
accessory = list(/obj/item/clothing/accessory/solgov/rank/army/flag/o8)
sort_order = 18

/datum/mil_rank/army/o9
name = "Lieutenant General"
name_short = "LTG"
accessory = list(/obj/item/clothing/accessory/solgov/rank/army/flag/o9)
sort_order = 19

/datum/mil_rank/army/o10
name = "General"
name_short = "GEN"
accessory = list(/obj/item/clothing/accessory/solgov/rank/army/flag/o10)
sort_order = 20

/datum/mil_rank/army/o10_alt
name = "General of the Marine Corps"
name_short = "GenMarCor"
accessory = list(/obj/item/clothing/accessory/solgov/rank/army/flag/o10_alt)
sort_order = 20

/*
* Civilians
* =========
Expand Down

0 comments on commit e157fa4

Please sign in to comment.