Skip to content

Update negative.dm #3

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.

Sign up for GitHub

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

Open
cornercube wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update negative.dm #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cebed9
Update negative.dm
cornercube Aug 16, 2021
333abcc
Update negative.dm
cornercube Aug 16, 2021
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
23 changes: 12 additions & 11 deletions code/datums/traits/negative.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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(
Expand Down