From 191c9c4e34fa472b8e9dbedf8dc12315a236b525 Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Sat, 8 May 2021 11:39:14 -0700 Subject: [PATCH 1/4] Update mushrooms.dm --- code/modules/hydroponics/grown/mushrooms.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 61865d973542..f1794367721c 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -330,6 +330,7 @@ yield = 6 potency = 20 growthstages = 2 + genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) reagents_add = list(/datum/reagent/medicine/charcoal = 0.25, /datum/reagent/medicine/mutadone = 0.04, /datum/reagent/consumable/nutriment = 0.02) /obj/item/reagent_containers/food/snacks/grown/fungus From 25a5484a550828343a30a33ae40fec33738776c2 Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Fri, 20 Aug 2021 12:52:12 -0700 Subject: [PATCH 2/4] Fixed my own mistake --- code/game/objects/items/stacks/sheets/sheet_types.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index a2078de5fa15..eb371ae472ed 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -219,10 +219,10 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ new/datum/stack_recipe("winged wooden chair", /obj/structure/chair/wood/wings, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \ new/datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \ - new/datum/stack_recipe("wooden chair", /obj/structure/chair/wood/, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wooden, 3, time = 10),\ new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \ + new/datum/stack_recipe("wooden chair", /obj/structure/chair/wood/, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, time = 50, one_per_turf = TRUE, on_floor = TRUE),\ new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \ From 7a7172ec75300081a84cc9774a34c4ad5509d4e7 Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Tue, 31 Aug 2021 00:42:01 -0700 Subject: [PATCH 3/4] Update traits.dm --- code/__DEFINES/traits.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 7a14f4c6b430..ec2d8d214a15 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -147,7 +147,6 @@ #define TRAIT_UNINTELLIGIBLE_SPEECH "unintelligible-speech" #define TRAIT_UNSTABLE "unstable" #define TRAIT_OIL_FRIED "oil_fried" -#define TRAIT_SHELTERED "sheltered" #define TRAIT_RANDOM_ACCENT "random_accent" #define TRAIT_MEDICALIGNORE "medical_ignore" #define TRAIT_PASSTABLE "passtable" From 084814c34875cf959059f754afedc22ab943a37a Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Tue, 31 Aug 2021 00:43:05 -0700 Subject: [PATCH 4/4] Update negative.dm --- code/datums/traits/negative.dm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 7344e3013950..5ff353569175 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -594,21 +594,6 @@ lose_text = "Your mind finally feels calm." medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events." -/datum/quirk/sheltered - name = "Sheltered" - desc = "You never learned galactic common." - value = -3 - mob_trait = TRAIT_SHELTERED - gain_text = "You do not understand galactic common." - lose_text = "You start to put together what people are saying in galactic common." - medical_record_text = "Patient looks perplexed when questioned in galactic common." - - -/datum/quirk/sheltered/on_spawn() - var/mob/living/carbon/human/H = quirk_holder - H.remove_language(/datum/language/common, FALSE, TRUE) - if(!H.get_selected_language()) - H.grant_language(/datum/language/japanese) /datum/quirk/allergic name = "Allergic Reaction"