Skip to content

Commit

Permalink
Tribal origin quirks now work (#89)
Browse files Browse the repository at this point in the history
  • Loading branch information
@biotear
biotear authored Apr 17, 2024
1 parent 7675cb1 commit 56a9d55
Show file tree
Hide file tree
Showing 2 changed files with 143 additions and 1 deletion.
22 changes: 21 additions & 1 deletion code/datums/components/crafting/recipes/recipes_tribal.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,6 @@ datum/crafting_recipe/tribalwar/bone
time = 30
reqs = list(/obj/item/stack/sheet/cloth = 3)


/datum/crafting_recipe/tribalwar/bone/helmet
name = "Bone Dancer helmet"
result = /obj/item/clothing/head/helmet/skull/bone
Expand All @@ -472,6 +471,27 @@ datum/crafting_recipe/tribalwar/bone
/obj/item/stack/sheet/leather = 1,
/obj/item/clothing/head/helmet/skull = 1)

// Western' Wayfarers

/datum/crafting_recipe/tribalwar/wayfarers
always_available = FALSE

/datum/crafting_recipe/tribalwar/wayfarers/lightarmour
name = "Wayfarers Light Armour"
result = /obj/item/clothing/suit/armor/light/tribal/westernwayfarer
time = 60
reqs = list(/obj/item/stack/crafting/metalparts = 5,
/obj/item/stack/sheet/leather = 5,
/obj/item/stack/crafting/goodparts = 5)

/datum/crafting_recipe/tribalwar/wayfarers/heavyarmor
name = "Wayfarers Heavy Armour"
result = /obj/item/clothing/suit/armor/heavy/tribal/westernwayfarer
time = 60
reqs = list(/obj/item/stack/crafting/metalparts = 10,
/obj/item/stack/sheet/leather = 5,
/obj/item/stack/crafting/goodparts = 10)

//Cloth Eyepatch
/datum/crafting_recipe/tribal/eyepatch
name = "Bandage Eyepatch"
Expand Down
122 changes: 122 additions & 0 deletions code/datums/traits/good.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,51 @@ GLOBAL_LIST_INIT(pa_repair, list(
/datum/crafting_recipe/repair_t45_helm,
/datum/crafting_recipe/scrap_pa,
/datum/crafting_recipe/scrap_pa_helm))

GLOBAL_LIST_INIT(white_legs_recipes, list(
/datum/crafting_recipe/tribalwar/whitelegs/lightarmour,
/datum/crafting_recipe/tribalwar/whitelegs/armour,
/datum/crafting_recipe/tribalwar/whitelegs/heavyarmour,
/datum/crafting_recipe/tribalwar/whitelegs/garb,
/datum/crafting_recipe/tribalwar/whitelegs/femalegarb))

GLOBAL_LIST_INIT(dead_horses_recipes, list(
/datum/crafting_recipe/tribalwar/deadhorses/lightarmour,
/datum/crafting_recipe/tribalwar/deadhorses/armour,
/datum/crafting_recipe/tribalwar/deadhorses/heavyarmour,
/datum/crafting_recipe/tribalwar/deadhorses/garb,
/datum/crafting_recipe/tribalwar/deadhorses/femalegarb))

GLOBAL_LIST_INIT(rustwalkers_recipes, list(
/datum/crafting_recipe/tribalwar/rustwalkers/lightarmour,
/datum/crafting_recipe/tribalwar/rustwalkers/armour,
/datum/crafting_recipe/tribalwar/rustwalkers/heavyarmour,
/datum/crafting_recipe/tribalwar/rustwalkers/garb,
/datum/crafting_recipe/tribalwar/rustwalkers/femalegarb))

GLOBAL_LIST_INIT(eighties_recipes, list(
/datum/crafting_recipe/tribalwar/eighties/lightarmour,
/datum/crafting_recipe/tribalwar/eighties/armour,
/datum/crafting_recipe/tribalwar/eighties/heavyarmour,
/datum/crafting_recipe/tribalwar/eighties/garb,
/datum/crafting_recipe/tribalwar/eighties/femalegarb))

GLOBAL_LIST_INIT(sorrows_recipes, list(
/datum/crafting_recipe/tribalwar/sorrows/armour,
/datum/crafting_recipe/tribalwar/sorrows/garb,
/datum/crafting_recipe/tribalwar/sorrows/femalegarb,
/datum/crafting_recipe/tribalwar/sorrows/yaoguaigauntlet))

GLOBAL_LIST_INIT(wayfarer_recipes, list(
/datum/crafting_recipe/tribalwar/wayfarers/lightarmour,
/datum/crafting_recipe/tribalwar/wayfarers/heavyarmor))

GLOBAL_LIST_INIT(bone_dancer_recipes, list(
/datum/crafting_recipe/tribalwar/bone/lightarmour,
/datum/crafting_recipe/tribalwar/bone/armour,
/datum/crafting_recipe/tribalwar/bone/heavyarmour,
/datum/crafting_recipe/tribalwar/bone/garb,
/datum/crafting_recipe/tribalwar/bone/helmet))

//predominantly positive traits
//this file is named weirdly so that positive traits are listed above negative ones
Expand Down Expand Up @@ -681,6 +726,17 @@ GLOBAL_LIST_INIT(pa_repair, list(
lose_text = span_danger("You forget how your ancestors have created their garments.")
locked = FALSE

/datum/quirk/whitelegstraditions/add()
var/mob/living/carbon/human/H = quirk_holder
if(!H.mind.learned_recipes)
H.mind.learned_recipes = list()
H.mind.learned_recipes |= GLOB.white_legs_recipes

/datum/quirk/whitelegstraditions/remove()
var/mob/living/carbon/human/H = quirk_holder
if(H)
H.mind.learned_recipes -= GLOB.white_legs_recipes

/datum/quirk/deadhorsestraditions
name = "Dead Horses traditions"
desc = "You remember how to make your peoples ancient garments after all this time."
Expand All @@ -690,6 +746,17 @@ GLOBAL_LIST_INIT(pa_repair, list(
lose_text = span_danger("You forget how your ancestors have created their garments.")
locked = FALSE

/datum/quirk/deadhorsestraditions/add()
var/mob/living/carbon/human/H = quirk_holder
if(!H.mind.learned_recipes)
H.mind.learned_recipes = list()
H.mind.learned_recipes |= GLOB.dead_horses_recipes

/datum/quirk/deadhorsestraditions/remove()
var/mob/living/carbon/human/H = quirk_holder
if(H)
H.mind.learned_recipes -= GLOB.dead_horses_recipes

/datum/quirk/rustwalkerstraditions
name = "Rust Walkers traditions"
desc = "You remember how to make your peoples ancient garments after all this time."
Expand All @@ -699,6 +766,17 @@ GLOBAL_LIST_INIT(pa_repair, list(
lose_text = span_danger("You forget how your ancestors have created their garments.")
locked = FALSE

/datum/quirk/rustwalkerstraditions/add()
var/mob/living/carbon/human/H = quirk_holder
if(!H.mind.learned_recipes)
H.mind.learned_recipes = list()
H.mind.learned_recipes |= GLOB.rustwalkers_recipes

/datum/quirk/rustwalkerstraditions/remove()
var/mob/living/carbon/human/H = quirk_holder
if(H)
H.mind.learned_recipes -= GLOB.rustwalkers_recipes

/datum/quirk/eightiestraditions
name = "Eighties traditions"
desc = "You remember how to make your peoples ancient garments after all this time."
Expand All @@ -708,6 +786,17 @@ GLOBAL_LIST_INIT(pa_repair, list(
lose_text = span_danger("You forget how your ancestors have created their garments.")
locked = FALSE

/datum/quirk/eightiestraditions/add()
var/mob/living/carbon/human/H = quirk_holder
if(!H.mind.learned_recipes)
H.mind.learned_recipes = list()
H.mind.learned_recipes |= GLOB.eighties_recipes

/datum/quirk/eightiestraditions/remove()
var/mob/living/carbon/human/H = quirk_holder
if(H)
H.mind.learned_recipes -= GLOB.eighties_recipes

/datum/quirk/sorrowstraditions
name = "Sorrows traditions"
desc = "You remember how to make your peoples ancient garments after all this time."
Expand All @@ -717,6 +806,17 @@ GLOBAL_LIST_INIT(pa_repair, list(
lose_text = span_danger("You forget how your ancestors have created their garments.")
locked = FALSE

/datum/quirk/sorrowstraditions/add()
var/mob/living/carbon/human/H = quirk_holder
if(!H.mind.learned_recipes)
H.mind.learned_recipes = list()
H.mind.learned_recipes |= GLOB.sorrows_recipes

/datum/quirk/sorrowstraditions/remove()
var/mob/living/carbon/human/H = quirk_holder
if(H)
H.mind.learned_recipes -= GLOB.sorrows_recipes

/datum/quirk/wayfarertraditions
name = "Wayfarer traditions"
desc = "You remember how to make your peoples ancient garments after all this time."
Expand All @@ -726,6 +826,17 @@ GLOBAL_LIST_INIT(pa_repair, list(
lose_text = span_danger("You forget how your ancestors have created their garments.")
locked = FALSE

/datum/quirk/wayfarertraditions/add()
var/mob/living/carbon/human/H = quirk_holder
if(!H.mind.learned_recipes)
H.mind.learned_recipes = list()
H.mind.learned_recipes |= GLOB.wayfarer_recipes

/datum/quirk/wayfarertraditions/remove()
var/mob/living/carbon/human/H = quirk_holder
if(H)
H.mind.learned_recipes -= GLOB.wayfarer_recipes

/datum/quirk/bonedancertraditions
name = "Bone Dancer traditions"
desc = "You remember how to make your peoples ancient garments after all this time."
Expand All @@ -735,6 +846,17 @@ GLOBAL_LIST_INIT(pa_repair, list(
lose_text = span_danger("You forget how your ancestors have created their garments.")
locked = FALSE

/datum/quirk/bonedancertraditions/add()
var/mob/living/carbon/human/H = quirk_holder
if(!H.mind.learned_recipes)
H.mind.learned_recipes = list()
H.mind.learned_recipes |= GLOB.bone_dancer_recipes

/datum/quirk/bonedancertraditions/remove()
var/mob/living/carbon/human/H = quirk_holder
if(H)
H.mind.learned_recipes -= GLOB.bone_dancer_recipes

/datum/quirk/brickwall
name = "Brick wall"
desc = "You just don't move when people try to push you out of the way, for whatever reason."
Expand Down

0 comments on commit 56a9d55

Please sign in to comment.