From 7cebed9a4503a6f681da827556584427a5f1993b Mon Sep 17 00:00:00 2001 From: cornercube <81207946+cornercube@users.noreply.github.com> Date: Mon, 16 Aug 2021 15:05:38 +0800 Subject: [PATCH 1/2] Update negative.dm --- code/datums/traits/negative.dm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index bcc807d858..ebb137a1c2 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -45,16 +45,16 @@ GLOBAL_LIST_EMPTY(family_heirlooms) var/mob/living/carbon/human/H = quirk_holder var/obj/item/heirloom_type switch(quirk_holder.mind.assigned_role) - if("Cook") - heirloom_type = /obj/item/kitchen/knife/butcher - if("Botanist") - heirloom_type = pick(/obj/item/cultivator, /obj/item/reagent_containers/glass/bucket, /obj/item/storage/bag/plants, /obj/item/toy/plush/beeplushie) - if("Medical Doctor") - heirloom_type = /obj/item/healthanalyzer - if("Paramedic") - heirloom_type = /obj/item/lighter - if("Station Engineer") - heirloom_type = /obj/item/wirecutters/brass + if("Scribe") + heirloom_type = pick(/obj/item/trash/f13/electronic/toaster, /obj/item/screwdriver/crude + if("Sheriff") + heirloom_type = /obj/item/clothing/accessory/medal + if("Shopkeeper") + heirloom_type = /obj/item/coin/plasma + if("Followers Doctor") + heirloom_type = /obj/item/clothing/neck/stethoscope + if("Prime Legionnaire") + heirloom_type = pick(/obj/item/melee/onehanded/machete, /obj/item/melee/onehanded/club/warclub, /obj/item/toy/plush/mr_buckety) if("Atmospheric Technician") heirloom_type = /obj/item/extinguisher/mini/family if("Lawyer") @@ -74,8 +74,9 @@ GLOBAL_LIST_EMPTY(family_heirlooms) if(!heirloom_type) heirloom_type = pick( /obj/item/toy/cards/deck, + /obj/item/card/id/rusted, /obj/item/lighter, - /obj/item/dice/d20) + /obj/item/card/id/rusted/fadedvaultid,) heirloom = new heirloom_type(get_turf(quirk_holder)) GLOB.family_heirlooms += heirloom var/list/slots = list( From 333abcc657d1682a87317eabf12cff93e46e2652 Mon Sep 17 00:00:00 2001 From: cornercube <81207946+cornercube@users.noreply.github.com> Date: Mon, 16 Aug 2021 15:10:36 +0800 Subject: [PATCH 2/2] Update negative.dm --- code/datums/traits/negative.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index ebb137a1c2..bb4243423f 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -46,7 +46,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms) var/obj/item/heirloom_type switch(quirk_holder.mind.assigned_role) if("Scribe") - heirloom_type = pick(/obj/item/trash/f13/electronic/toaster, /obj/item/screwdriver/crude + heirloom_type = pick(/obj/item/trash/f13/electronic/toaster, /obj/item/screwdriver/crude) if("Sheriff") heirloom_type = /obj/item/clothing/accessory/medal if("Shopkeeper")