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.

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

MercReaper's commission #2196

Merged
merged 6 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
Binary file not shown.
Binary file not shown.
30 changes: 30 additions & 0 deletions tff_modular/modules/~donator/clothes/donator_clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,33 @@
. = ..()
if(icon_state == "mercreaper_cloak_syndie")
desc = alternate_desc

/obj/item/clothing/suit/hooded/wintercoat/specialops
name = "security long jacket"
desc = "Long jacket developed by \"Armadyne\" for security officers. There is a blue Armadyne logo on the back. Made from materials to retain heat and can be used down to -20 Celsius."

icon = 'tff_modular/master_files/icons/donator/obj/clothing/suit.dmi'
icon_state = "mercreapercoat_summer"
worn_icon = 'tff_modular/master_files/icons/donator/mob/clothing/suit.dmi'
worn_icon_state = "mercreapercoat_summer"

supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
slot_flags = ITEM_SLOT_OCLOTHING|ITEM_SLOT_NECK

hoodtype = /obj/item/clothing/head/hooded/winterhood/specialops

/obj/item/clothing/suit/hooded/wintercoat/specialops/winter
name = "security winter long jacket"
desc = "Long jacket developed by \"Armadyne\" for security personnel working in harsh, low temperature conditions. There is a blue Armadyne logo on the back. Made from materials to retain heat and can be used down to -40 Celsius."

icon_state = "mercreapercoat_winter"
worn_icon_state = "mercreapercoat_winter"

hoodtype = /obj/item/clothing/head/hooded/winterhood/specialops/winter

/obj/item/clothing/head/hooded/winterhood/specialops
worn_icon = 'tff_modular/master_files/icons/donator/mob/clothing/head.dmi'
worn_icon_state = "mercreaperhood_summer"

/obj/item/clothing/head/hooded/winterhood/specialops/winter
worn_icon_state = "mercreaperhood_winter"
10 changes: 10 additions & 0 deletions tff_modular/modules/~donator/loadout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,13 @@
name = "Officer's coat"
item_path = /obj/item/clothing/neck/cloak/officer
ckeywhitelist = list("mercreaper")

/datum/loadout_item/suit/officer_jacket_mr
name = "Security Long Jacket"
item_path = /obj/item/clothing/suit/hooded/wintercoat/specialops
ckeywhitelist = list("mercreaper", "skadi999", "iajret", "yaqapi", "discord980", "siamant", "napaslavandos", "low3", "oni3288", "byratishka")

/datum/loadout_item/suit/officer_jacket_mr_winter
name = "Security Winter Long Jacket"
item_path = /obj/item/clothing/suit/hooded/wintercoat/specialops/winter
ckeywhitelist = list("mercreaper", "skadi999", "iajret", "yaqapi", "discord980", "siamant", "napaslavandos", "low3", "oni3288", "byratishka")
Loading