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

le-donate via config changes #2816

Merged
merged 3 commits into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
4 changes: 2 additions & 2 deletions config/game_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ ROUNDSTART_RACES vox
ROUNDSTART_RACES aquatic
ROUNDSTART_RACES insect
ROUNDSTART_RACES ghoul
#ROUNDSTART_RACES teshari #FF EDIT - Teshari QOL
ROUNDSTART_RACES teshari
ROUNDSTART_RACES hemophage
ROUNDSTART_RACES vox_primalis

Expand Down Expand Up @@ -566,4 +566,4 @@ MAX_POSITIVE_QUIRKS 6

## FF CONFIGS
ROUNDSTART_RACES nabber
ROUNDSTART_RACES teshari_alt
#ROUNDSTART_RACES teshari_alt неАКТУАЛочка
Binary file modified tff_modular/master_files/icons/donator/mob/clothing/neck.dmi
Binary file not shown.
Binary file modified tff_modular/master_files/icons/donator/mob/clothing/suit.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
149 changes: 149 additions & 0 deletions tff_modular/modules/~donator/clothes/donator_clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,152 @@

/obj/item/clothing/head/hooded/winterhood/specialops/winter
worn_icon_state = "mercreaperhood_winter"

/obj/item/clothing/suit/teshari
name = "teshari base"
desc = "HOW YOU GET THIS?"

/obj/item/clothing/suit/teshari/mob_can_equip(mob/living/equipper, slot, disable_warning, bypass_equip_delay_self, ignore_equipped, indirect_action)
if(!is_species(equipper, /datum/species/teshari))
to_chat(equipper, span_warning("[src] is far too small for you!"))
return FALSE
return ..()

/obj/item/clothing/under/teshari
name = "teshari base"
desc = "HOW YOU GET THIS?"

/obj/item/clothing/under/teshari/mob_can_equip(mob/living/equipper, slot, disable_warning, bypass_equip_delay_self, ignore_equipped, indirect_action)
if(!is_species(equipper, /datum/species/teshari))
to_chat(equipper, span_warning("[src] is far too small for you!"))
return FALSE
return ..()

/obj/item/clothing/suit/teshari/furcoat
name = "tenka fabric coat"
desc = "This is a small tenka fabric coat, with slits for wings. It’s visible that it was sewn for a small creature."
icon = 'tff_modular/master_files/icons/donator/mob/clothing/suit.dmi'
icon_state = "zanozkin_furcoat"
worn_icon_teshari = 'tff_modular/master_files/icons/donator/mob/clothing/suit.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/suit/teshari/labcoat
name = "lab coat"
desc = "This is a very long laboratory coat and it has slits for wings."
icon = 'tff_modular/master_files/icons/donator/mob/clothing/suit.dmi'
icon_state = "zanozkin_labcoat"
worn_icon_teshari = 'tff_modular/master_files/icons/donator/mob/clothing/suit.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/suit/teshari/labcoat/Initialize(mapload)
. = ..()
AddComponent(/datum/component/toggle_icon)

/obj/item/clothing/suit/teshari/AltClick(mob/user)
. = ..()

/obj/item/clothing/suit/teshari/graycoat
name = "grey coat"
desc = "This is a grey coat, it has hidden slits for wings, the material seems expensive and from a certain angle the bottom part seems transparent."
icon = 'tff_modular/master_files/icons/donator/mob/clothing/suit.dmi'
icon_state = "zanozkin_strangeshirt"
worn_icon_teshari = 'tff_modular/master_files/icons/donator/mob/clothing/suit.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/suit/teshari/jacket
name = "black jacket FZ"
desc = "This is a black jacket from an unknown company with hidden slits for wings."
icon = 'tff_modular/master_files/icons/donator/mob/clothing/suit.dmi'
icon_state = "zanozkin_coldcoat"
worn_icon_teshari = 'tff_modular/master_files/icons/donator/mob/clothing/suit.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/suit/teshari/jacket/noblue
icon_state = "zanozkin_coldcoat_noblue"


/obj/item/clothing/suit/teshari/russian_jacket
name = "russian raptor coat"
desc = "This is a fucking Russian jacket for raptors."
icon = 'tff_modular/master_files/icons/donator/mob/clothing/suit.dmi'
icon_state = "zanozkin_coat_korea"
worn_icon_teshari = 'tff_modular/master_files/icons/donator/mob/clothing/suit.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/suit/teshari/aqua_cloak // тут действительно в виде suit.
name = "short shirt FZ"
desc = "This is a short shirt from an unknown company for small winged creatures"
icon = 'tff_modular/master_files/icons/donator/mob/clothing/suit.dmi'
icon_state = "zanozkin_aquacloak"
worn_icon_teshari = 'tff_modular/master_files/icons/donator/mob/clothing/suit.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/suit/teshari/aqua_cloak/Initialize(mapload)
. = ..()
AddComponent(/datum/component/toggle_icon)

/obj/item/clothing/under/teshari/consultant
name = "crocs suit"
desc = "Crocs clothes for little winged creatures!"
icon = 'tff_modular/master_files/icons/donator/mob/clothing/under.dmi'
icon_state = "zanozkin_consultant"
worn_icon_teshari = 'tff_modular/master_files/icons/donator/mob/clothing/under.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/teshari/consultant/female
name = "crocs skirt"
icon_state = "zanozkin_consultant_skirt"
worn_icon_teshari = "zanozkin_consultant_skirt"

/obj/item/clothing/under/teshari/nt_combineso
name = "combeniso NT"
desc = "This jumpsuit was custom-made for workers of the Avali race near their homeland."
icon = 'tff_modular/master_files/icons/donator/mob/clothing/under.dmi'
icon_state = "zanozkin_nt"
worn_icon_teshari = 'tff_modular/master_files/icons/donator/mob/clothing/under.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/teshari/meme
name = "shirt and shorts"
desc = "It's just a shirt and shorts, but it reminds me of something."
icon = 'tff_modular/master_files/icons/donator/mob/clothing/under.dmi'
icon_state = "zanozkin_meme"
worn_icon_teshari = 'tff_modular/master_files/icons/donator/mob/clothing/under.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/teshari/elite_suit
name = "elite feathered"
desc = "White shirt, black bow tie and beige pants. This suit doesn't look bad."
icon = 'tff_modular/master_files/icons/donator/mob/clothing/under.dmi'
icon_state = "zanozkin_elite"
worn_icon_teshari = 'tff_modular/master_files/icons/donator/mob/clothing/under.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/teshari/elite_suit/plus
name = "elite feathered deluxe"
desc = "White shirt, black bow tie, beige jacket and beige pants. This suit doesn't look bad"
icon_state = "zanozkin_eliteplus"

/obj/item/clothing/under/teshari/waistcoat
name = "delicate suit"
desc = "Costume for winged pick-up artist."
icon = 'tff_modular/master_files/icons/donator/mob/clothing/under.dmi'
icon_state = "zanozkin_waistcoat"
worn_icon_teshari = 'tff_modular/master_files/icons/donator/mob/clothing/under.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/teshari/mechsuit
name = "rivka"
desc = "Personalized suit, it seems it was made to order and given as a gift"
icon = 'tff_modular/master_files/icons/donator/mob/clothing/under.dmi'
icon_state = "zanozkin_mechsuit"
worn_icon_teshari = 'tff_modular/master_files/icons/donator/mob/clothing/under.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/neck/cloak/teshari/tenkacoat
name = "small cloak"
desc = "Just a small cloak... for avali?"
icon = 'tff_modular/master_files/icons/donator/mob/clothing/neck.dmi'
icon_state = "zanozkin_tenkacoat"
worn_icon_teshari = 'tff_modular/master_files/icons/donator/mob/clothing/neck.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
1 change: 1 addition & 0 deletions tff_modular/modules/~donator/items/README.MD
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ну тут типа.. зажигалка, игрушки плюшевые, все вот это.
7 changes: 7 additions & 0 deletions tff_modular/modules/~donator/items/donator_items.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/obj/item/toy/plush/oktavia
name = "\improper Oktavia"
desc = "A plush toy of a certain character from the ancient animated series \"BOSS HELL\""
icon = 'tff_modular/master_files/icons/donator/obj/toys/plushie.dmi'
icon_state = "zanozkin_plushie"
gender = FEMALE
squeak_override = list('modular_nova/modules/emotes/sound/voice/trills.ogg' = 1)
85 changes: 85 additions & 0 deletions tff_modular/modules/~donator/loadout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,88 @@
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")

/datum/loadout_item/suit/teshari_furcoat
name = "Tenka Fabric Coat"
item_path= /obj/item/clothing/suit/teshari/furcoat
ckeywhitelist = list("zanozkin")

/datum/loadout_item/suit/teshari_labcoat
name = "Lab Coat"
item_path= /obj/item/clothing/suit/teshari/labcoat
ckeywhitelist = list("zanozkin")

/datum/loadout_item/suit/teshari_graycoat
name = "Grey Coat"
item_path= /obj/item/clothing/suit/teshari/graycoat
ckeywhitelist = list("zanozkin")

/datum/loadout_item/suit/teshari_jacket
name = "Black Jacket FZ"
item_path= /obj/item/clothing/suit/teshari/jacket
ckeywhitelist = list("zanozkin")

/datum/loadout_item/suit/teshari_jacket/noblue
name = "Black Jacket FZ"
item_path = /obj/item/clothing/suit/teshari/jacket/noblue
ckeywhitelist = list("zanozkin")

/datum/loadout_item/suit/teshari_russian_jacket
name = "Russian Raptor Coat"
item_path= /obj/item/clothing/suit/teshari/russian_jacket
ckeywhitelist = list("zanozkin")

/datum/loadout_item/suit/teshari_aqua_cloak // тут действительно в виде suit.
name = "Short Shirt FZ"
item_path= /obj/item/clothing/suit/teshari/aqua_cloak // тут действительно в виде suit.
ckeywhitelist = list("zanozkin")

/datum/loadout_item/under/miscellaneous/teshari_consultant
name = "Crocs Suit"
item_path= /obj/item/clothing/under/teshari/consultant
ckeywhitelist = list("zanozkin")

/datum/loadout_item/under/miscellaneous/teshari_consultant/female
name = "Crocs Skirt"
item_path= /obj/item/clothing/under/teshari/consultant/female
ckeywhitelist = list("zanozkin")

/datum/loadout_item/under/miscellaneous/teshari_nt_combineso
name = "Combeniso NT"
item_path= /obj/item/clothing/under/teshari/nt_combineso
ckeywhitelist = list("zanozkin")

/datum/loadout_item/under/miscellaneous/teshari_meme
name = "Shirt and Shorts"
item_path= /obj/item/clothing/under/teshari/meme
ckeywhitelist = list("zanozkin")

/datum/loadout_item/under/miscellaneous/teshari_elite_suit
name = "Elite Feathered"
item_path= /obj/item/clothing/under/teshari/elite_suit
ckeywhitelist = list("zanozkin")

/datum/loadout_item/under/miscellaneous/teshari_elite_suit/plus
name = "Elite Feathered+"
item_path= /obj/item/clothing/under/teshari/elite_suit/plus
ckeywhitelist = list("zanozkin")

/datum/loadout_item/under/miscellaneous/teshari_waistcoat
name = "Delicate Suit"
item_path= /obj/item/clothing/under/teshari/waistcoat
ckeywhitelist = list("zanozkin")

/datum/loadout_item/under/miscellaneous/teshari_mechsuit
name = "Rivka"
item_path= /obj/item/clothing/under/teshari/mechsuit
ckeywhitelist = list("zanozkin")

/datum/loadout_item/neck/teshari_tenkacoat
name = "Small cloak"
item_path= /obj/item/clothing/neck/cloak/teshari/tenkacoat
ckeywhitelist = list("zanozkin")

/datum/loadout_item/toys/oktavia
name = "Oktavia"
item_path= /obj/item/toy/plush/oktavia
ckeywhitelist = list("zanozkin")
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -8348,4 +8348,5 @@
#include "tff_modular\modules\uplink_item\code\categories\stealthy_weapons.dm"
#include "tff_modular\modules\~donator\loadout.dm"
#include "tff_modular\modules\~donator\clothes\donator_clothing.dm"
#include "tff_modular\modules\~donator\items\donator_items.dm"
// END_INCLUDE
Loading