Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add solgov insignia + beret #2770

Merged
merged 9 commits into from
Nov 5, 2024
Merged

add solgov insignia + beret #2770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dbd2634
^ )
ddorou Oct 28, 2024
8d83d71
повязка
ddorou Oct 28, 2024
9a395a7
забыли спросить
ddorou Oct 28, 2024
5db2949
Merge branch 'dev-sierra' into add-solgov
ddorou Oct 28, 2024
8e118e8
Merge branch 'dev-sierra' into add-solgov
ddorou Nov 3, 2024
eb32feb
1
ddorou Nov 3, 2024
eb442c5
Merge branch 'dev-sierra' into add-solgov
ddorou Nov 3, 2024
91c5b1a
Merge branch 'add-solgov' of https://github.com/ddorou/SierraBay12 in…
ddorou Nov 3, 2024
f6a2b2e
Merge branch 'dev-sierra' into add-solgov
ddorou Nov 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions maps/sierra/loadout/loadout_accessories.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,64 @@
display_name = "investigator holobadge (IAA)"
path = /obj/item/clothing/accessory/badge/holo/investigator
allowed_roles = list(/datum/job/iaa)

/datum/gear/accessory/solgov
display_name = "Solgov command insignia"
path = /obj/item/clothing/accessory/solgov/department/command
allowed_roles = list(/datum/job/captain, /datum/job/hop, /datum/job/rd, /datum/job/cmo, /datum/job/chief_engineer, /datum/job/hos, /datum/job/iaa, /datum/job/adjutant)
allowed_branches = list(/datum/mil_branch/contractor)
allowed_factions = list(FACTION_EXPEDITIONARY, FACTION_CORPORATE)
flags = GEAR_HAS_NO_CUSTOMIZATION
cost = 0

/datum/gear/accessory/solgov/engineering
display_name = "Solgov engineering insignia"
path = /obj/item/clothing/accessory/solgov/department/engineering
allowed_roles = list(/datum/job/chief_engineer, /datum/job/senior_engineer, /datum/job/engineer, /datum/job/infsys, /datum/job/roboticist, /datum/job/engineer_trainee, /datum/job/explorer_engineer)
allowed_branches = list(/datum/mil_branch/contractor)
allowed_factions = list(FACTION_EXPEDITIONARY, FACTION_CORPORATE)
flags = GEAR_HAS_NO_CUSTOMIZATION
cost = 0

/datum/gear/accessory/solgov/exploration
display_name = "Solgov exploration insignia"
path = /obj/item/clothing/accessory/solgov/department/exploration
allowed_roles = list(/datum/job/explorer, /datum/job/explorer_medic, /datum/job/explorer_engineer, /datum/job/explorer_pilot, /datum/job/exploration_leader)
allowed_branches = list(/datum/mil_branch/contractor)
allowed_factions = list(FACTION_EXPEDITIONARY, FACTION_CORPORATE)
flags = GEAR_HAS_NO_CUSTOMIZATION
cost = 0

/datum/gear/accessory/solgov/medical
display_name = "Solgov medical insignia"
path = /obj/item/clothing/accessory/solgov/department/medical
allowed_roles = list(/datum/job/cmo, /datum/job/senior_doctor, /datum/job/doctor, /datum/job/doctor_trainee, /datum/job/explorer_medic, /datum/job/psychiatrist, /datum/job/chemist, /datum/job/roboticist)
allowed_branches = list(/datum/mil_branch/contractor)
allowed_factions = list(FACTION_EXPEDITIONARY, FACTION_CORPORATE)
flags = GEAR_HAS_NO_CUSTOMIZATION
cost = 0

/datum/gear/accessory/solgov/security
display_name = "Solgov security insignia"
path = /obj/item/clothing/accessory/solgov/department/security
allowed_roles = list(/datum/job/hos, /datum/job/warden, /datum/job/detective, /datum/job/officer, /datum/job/security_assistant)
allowed_branches = list(/datum/mil_branch/contractor)
allowed_factions = list(FACTION_EXPEDITIONARY, FACTION_CORPORATE)
flags = GEAR_HAS_NO_CUSTOMIZATION
cost = 0

/datum/gear/accessory/solgov/supply
display_name = "Solgov supply insignia"
path = /obj/item/clothing/accessory/solgov/department/supply
allowed_roles = list(/datum/job/qm,/datum/job/cargo_tech,/datum/job/cargo_assistant)
allowed_branches = list(/datum/mil_branch/contractor)
allowed_factions = list(FACTION_EXPEDITIONARY, FACTION_CORPORATE)
flags = GEAR_HAS_NO_CUSTOMIZATION
cost = 0

/datum/gear/accessory/armband_corpsman
display_name = "medical armband"
path = /obj/item/clothing/accessory/armband/medblue
allowed_roles = list(/datum/job/cmo, /datum/job/senior_doctor, /datum/job/doctor, /datum/job/doctor_trainee, /datum/job/explorer_medic, /datum/job/psychiatrist, /datum/job/chemist)
flags = GEAR_HAS_NO_CUSTOMIZATION
cost = 0
16 changes: 16 additions & 0 deletions maps/sierra/loadout/loadout_head.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,19 @@

/datum/gear/suit/unathi/security_cap
allowed_roles = SECURITY_ROLES

/datum/gear/head/beret/solgov/observatory
display_name = "Observatory beret"
description = "An SCG Expeditionary Corps beret carrying the insignia of the Observatory section. For personnel that are more inclined towards style than safety."
path = /obj/item/clothing/head/beret/solgov/expedition/branch/observatory
allowed_branches = list(/datum/mil_branch/contractor)
allowed_factions = list(FACTION_EXPEDITIONARY, FACTION_CORPORATE)
flags = GEAR_HAS_NO_CUSTOMIZATION

/datum/gear/head/beret/solgov/branch
display_name = "EC sections beret selection"
description = "A beret denoting service in one of the branches within the SCG EC."
path = /obj/item/clothing/head/beret/solgov/expedition/branch
allowed_branches = list(/datum/mil_branch/contractor)
allowed_factions = list(FACTION_EXPEDITIONARY, FACTION_CORPORATE)
flags = GEAR_HAS_NO_CUSTOMIZATION