Skip to content

Commit

Permalink
fleet colours and ckey unrestrict (#761)
Browse files Browse the repository at this point in the history
fleet colours and dono unrestrict
  • Loading branch information
tf-4 authored and FFMirrorBot committed Feb 4, 2024
1 parent bacd07f commit fd2d0a7
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 22 deletions.
Binary file modified modular_nova/master_files/icons/donator/mob/clothing/head.dmi
Binary file not shown.
Binary file modified modular_nova/master_files/icons/donator/mob/clothing/suit.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified modular_nova/master_files/icons/donator/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified modular_nova/master_files/icons/donator/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified modular_nova/master_files/icons/donator/obj/clothing/uniform.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -316,43 +316,59 @@
tint = 0

// Donation reward for Raxraus
/obj/item/clothing/head/caligram_cap_tan
name = "\improper Caligram tan softcap"
desc = "A Caligram's Fleet-branded hat in a '/surprisingly/' tasteful shade of brown."
/obj/item/clothing/head/caligram_cap
name = "\improper Caligram softcap"
desc = "A Caligram's Fleet-branded hat."
icon = 'modular_nova/master_files/icons/donator/obj/clothing/hats.dmi'
worn_icon = 'modular_nova/master_files/icons/donator/mob/clothing/head.dmi'
icon_state = "caligram_cap_tan"
unique_reskin = list(
"Tan" = "caligram_cap_tan",
"Navy" = "caligram_cap_navy",
)

// Donation reward for Raxraus
/obj/item/clothing/under/jumpsuit/caligram_fatigues_tan
name = "\improper Caligram tan fatigues"
desc = "A set of tan and brown work fatigues bearing a Caligram's Fleet insigna on an armband. Lacks the typical Tajaran extravagance."
/obj/item/clothing/under/jumpsuit/caligram_fatigues
name = "\improper Caligram fatigues"
desc = "A set of work fatigues bearing a Caligram's Fleet insigna on an armband. Lacks the typical Tajaran extravagance."
icon = 'modular_nova/master_files/icons/donator/obj/clothing/uniform.dmi'
worn_icon = 'modular_nova/master_files/icons/donator/mob/clothing/uniform.dmi'
worn_icon_digi = 'modular_nova/master_files/icons/donator/mob/clothing/uniform_digi.dmi'
icon_state = "caligram_fatigues_tan"
worn_icon_state = "caligram_fatigues_tan"
unique_reskin = list(
"Tan" = "caligram_fatigues_tan",
"Navy" = "caligram_fatigues_navy",
)

// Donation reward for Raxraus
/obj/item/clothing/suit/jacket/caligram_parka_tan
name = "\improper Caligram tan parka"
desc = "A tan parka with a fancy black belt and '/Caligram's Fleet/' stitched onto its armband."
/obj/item/clothing/suit/jacket/caligram_parka
name = "\improper Caligram parka"
desc = "A parka with a fancy belt and '/Caligram's Fleet/' stitched onto its armband."
icon = 'modular_nova/master_files/icons/donator/obj/clothing/suits.dmi'
worn_icon = 'modular_nova/master_files/icons/donator/mob/clothing/suit.dmi'
icon_state = "caligram_parka_tan"
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|LEGS|ARMS|HANDS
unique_reskin = list(
"Tan" = "caligram_parka_tan",
"Navy" = "caligram_parka_navy",
)

// Donation reward for Raxraus
/obj/item/clothing/suit/armor/vest/caligram_parka_vest_tan
name = "\improper Caligram armored tan parka"
desc = "A tan parka with a fancy black belt, a lightly armored vest and '/Caligram's Fleet/' stitched onto its armband."
/obj/item/clothing/suit/armor/vest/caligram_parka_vest
name = "\improper Caligram armored parka"
desc = "A parka with a fancy belt, a lightly armored vest and '/Caligram's Fleet/' stitched onto its armband."
icon = 'modular_nova/master_files/icons/donator/obj/clothing/suits.dmi'
worn_icon = 'modular_nova/master_files/icons/donator/mob/clothing/suit.dmi'
icon_state = "caligram_parka_vest_tan"
inhand_icon_state = "armor"
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|LEGS|ARMS|HANDS
unique_reskin = list(
"Tan" = "caligram_parka_vest_tan",
"Navy" = "caligram_parka_vest_navy",
)


// Donation reward for ChillyLobster
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,10 @@
/datum/loadout_item/mask/nightlight_mask
name = "FIR-36 Rebreather"
item_path = /obj/item/clothing/mask/gas/nightlight
ckeywhitelist = list("farsightednightlight", "raxraus", "1ceres", "marcoalbaredaa", "itzshift_yt", "drifter7371", "AvianAviator", "Katty Kat", "Investigator77", "Dalao Azure", "Socialistion", "ChillyLobster", "Sylvara", "AmZee", "Tf4", "rb303", "Kay_Nite", "whataboutism", "taac", "Halkyon", "Lupo_di_rosa", "Merek2", "lowpowermia", "RyeanBread", "Jesterz7", "Saund_Minah", "Ruediger4")

/datum/loadout_item/mask/fir22
name = "FIR-22 Full-Face Rebreather"
item_path = /obj/item/clothing/mask/gas/nightlight/fir22
ckeywhitelist = list("farsightednightlight", "raxraus", "1ceres", "marcoalbaredaa", "itzshift_yt", "drifter7371", "AvianAviator", "Katty Kat", "Investigator77", "Dalao Azure", "Socialistion", "ChillyLobster", "Sylvara", "AmZee", "Tf4", "rb303", "Kay_Nite", "whataboutism", "taac", "Halkyon", "Lupo_di_rosa", "Merek2", "lowpowermia", "RyeanBread", "Jesterz7", "Saund_Minah", "Ruediger4")

/datum/loadout_item/mask/caligram_visage_mask
name = "Caligram Visage Mask"
Expand All @@ -143,23 +141,19 @@

/datum/loadout_item/head/caligram_cap_tan
name = "Caligram Tan Softcap"
item_path = /obj/item/clothing/head/caligram_cap_tan
ckeywhitelist = list("farsightednightlight", "raxraus", "1ceres", "marcoalbaredaa", "itzshift_yt", "drifter7371", "AvianAviator", "Katty Kat", "Investigator77", "Dalao Azure", "Socialistion", "ChillyLobster", "Sylvara", "AmZee", "Tf4", "rb303", "Kay_Nite", "whataboutism", "taac", "Halkyon", "Lupo_di_rosa", "Merek2", "lowpowermia", "RyeanBread", "Jesterz7", "Saund_Minah", "Ruediger4")
item_path = /obj/item/clothing/head/caligram_cap

/datum/loadout_item/under/jumpsuit/caligram_fatigues_tan
name = "Caligram Tan Fatigues"
item_path = /obj/item/clothing/under/jumpsuit/caligram_fatigues_tan
ckeywhitelist = list("farsightednightlight", "raxraus", "1ceres", "marcoalbaredaa", "itzshift_yt", "drifter7371", "AvianAviator", "Katty Kat", "Investigator77", "Dalao Azure", "Socialistion", "ChillyLobster", "Sylvara", "AmZee", "Tf4", "rb303", "Kay_Nite", "whataboutism", "taac", "Halkyon", "Lupo_di_rosa", "Merek2", "lowpowermia", "RyeanBread", "Jesterz7", "Saund_Minah", "Ruediger4")
item_path = /obj/item/clothing/under/jumpsuit/caligram_fatigues

/datum/loadout_item/suit/caligram_parka_tan
name = "Caligram Tan Parka"
item_path = /obj/item/clothing/suit/jacket/caligram_parka_tan
ckeywhitelist = list("farsightednightlight", "raxraus", "1ceres", "marcoalbaredaa", "itzshift_yt", "drifter7371", "AvianAviator", "Katty Kat", "Investigator77", "Dalao Azure", "Socialistion", "ChillyLobster", "Sylvara", "AmZee", "Tf4", "rb303", "Kay_Nite", "whataboutism", "taac", "Halkyon", "Lupo_di_rosa", "Merek2", "lowpowermia", "RyeanBread", "Jesterz7", "Saund_Minah", "Ruediger4")
item_path = /obj/item/clothing/suit/jacket/caligram_parka

/datum/loadout_item/suit/caligram_parka_vest_tan
name = "Caligram Armored Tan Parka"
item_path = /obj/item/clothing/suit/armor/vest/caligram_parka_vest_tan
ckeywhitelist = list("farsightednightlight", "raxraus", "1ceres", "marcoalbaredaa", "itzshift_yt", "drifter7371", "AvianAviator", "Katty Kat", "Investigator77", "Dalao Azure", "Socialistion", "ChillyLobster", "Sylvara", "AmZee", "Tf4", "rb303", "Kay_Nite", "whataboutism", "taac", "Halkyon", "Lupo_di_rosa", "Merek2", "lowpowermia", "RyeanBread", "Jesterz7", "Saund_Minah", "Ruediger4")
item_path = /obj/item/clothing/suit/armor/vest/caligram_parka_vest
restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER)

/datum/loadout_item/suit/brasspriest
Expand Down

0 comments on commit fd2d0a7

Please sign in to comment.