diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 45f4a32c50..614cc65cbb 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -41,8 +41,8 @@ heirloom_type = /obj/item/paint/anycolor heirloom_type = /obj/item/bikehorn/golden if("Mime") - heirloom_type = /obj/item/toy/dummy heirloom_type = /obj/item/paint/anycolor + heirloom_type = /obj/item/toy/dummy if("Cook") heirloom_type = /obj/item/kitchen/knife/scimitar if("Medical Doctor") @@ -52,7 +52,7 @@ if("Atmospheric Technician") heirloom_type = /obj/item/extinguisher/mini/family if("Lawyer") - heirloom_type = /obj/item/gavelhammer + heirloom_type = /obj/item/storage/briefcase/lawyer/family if("Janitor") heirloom_type = /obj/item/mop if("Security Officer") @@ -61,6 +61,10 @@ heirloom_type = /obj/item/toy/plush/slimeplushie if("Assistant") heirloom_type = /obj/item/storage/toolbox/mechanical/old/heirloom + if("Chaplain") + heirloom_type = /obj/item/camera/spooky/family + if("Captain") + heirloom_type = /obj/item/clothing/accessory/medal/gold/captain/family if(!heirloom_type) heirloom_type = pick( /obj/item/toy/cards/deck, diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index 5fdf94c1f3..cc1c07aa02 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -30,6 +30,30 @@ /obj/item/storage/briefcase/lawyer folder_path = /obj/item/folder/blue +/obj/item/storage/briefcase/lawyer/family + name = "battered briefcase" + desc = "An old briefcase, this one has seen better days in its time. It's clear they don't make them nowadays as good as they used to. The corners are modified with metal trim adding in weight!" + +/obj/item/storage/briefcase/lawyer/family/PopulateContents() + new /obj/item/stamp/law(src) + new /obj/item/pen/fountain(src) + new /obj/item/paper_bin(src) + new /obj/item/storage/box/evidence(src) + new /obj/item/storage/box/lawyer(src) + +/obj/item/storage/box/lawyer + name = "Box of lawyer tools" + desc = "A custom made box, full of items used by a Lawyer, all packed into one box!" + +/obj/item/storage/box/lawyer/PopulateContents() + new /obj/item/clothing/gloves/color/white(src) + new /obj/item/folder/white(src) + new /obj/item/clothing/glasses/regular(src) + new /obj/item/folder/red(src) + new /obj/item/gavelhammer(src) + new /obj/item/stack/sheet/cloth(src) + new /obj/item/reagent_containers/glass/beaker/waterbottle(src) + /obj/item/storage/briefcase/lawyer/PopulateContents() new /obj/item/stamp/law(src) ..() diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 6bf96429b9..396bcb4766 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -158,14 +158,14 @@ icon_state = "bronze_heart" /obj/item/clothing/accessory/medal/engineer - name = "\"Shift's Best Electrician\" award" - desc = "An award bestowed upon engineers who have excelled at keeping the station running in the best possible condition against all odds." - icon_state = "engineer" + name = "\"Shift's Best Electrician\" award" + desc = "An award bestowed upon engineers who have excelled at keeping the station running in the best possible condition against all odds." + icon_state = "engineer" /obj/item/clothing/accessory/medal/greytide - name = "\"Greytider of the shift\" award" - desc = "An award for only the most annoying of assistants. Locked doors mean nothing to you and behaving is not in your vocabulary" - icon_state = "greytide" + name = "\"Greytider of the shift\" award" + desc = "An award for only the most annoying of assistants. Locked doors mean nothing to you and behaving is not in your vocabulary" + icon_state = "greytide" /obj/item/clothing/accessory/medal/ribbon name = "ribbon" @@ -178,9 +178,9 @@ desc = "An award bestowed only upon those cargotechs who have exhibited devotion to their duty in keeping with the highest traditions of Cargonia." /obj/item/clothing/accessory/medal/ribbon/medical_doctor - name = "\"doctor of the shift\" award" - desc = "An award bestowed only upon the most capable doctors who have upheld the Hippocratic Oath to the best of their ability" - icon_state = "medical_doctor" + name = "\"doctor of the shift\" award" + desc = "An award bestowed only upon the most capable doctors who have upheld the Hippocratic Oath to the best of their ability" + icon_state = "medical_doctor" /obj/item/clothing/accessory/medal/silver name = "silver medal" @@ -211,6 +211,12 @@ desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain to Nanotrasen, and their undisputable authority over their crew." resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF +/obj/item/clothing/accessory/medal/gold/captain/family + name = "old medal of captaincy" + desc = "A rustic badge pure gold, has been through hell and back by the looks, the syndcate have been after these by the looks of it for generations..." + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 10) //Pure gold + materials = list(MAT_GOLD=2000) + /obj/item/clothing/accessory/medal/gold/heroism name = "medal of exceptional heroism" desc = "An extremely rare golden medal awarded only by CentCom. To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders." @@ -234,8 +240,6 @@ name = "nobel sciences award" desc = "A plasma medal which represents significant contributions to the field of science or engineering." - - //////////// //Armbands// //////////// diff --git a/code/modules/photography/camera/other.dm b/code/modules/photography/camera/other.dm index ce2572db36..3695559e97 100644 --- a/code/modules/photography/camera/other.dm +++ b/code/modules/photography/camera/other.dm @@ -12,3 +12,10 @@ desc = "A polaroid camera with extra capacity for crime investigations." pictures_max = 30 pictures_left = 30 + +/obj/item/camera/spooky/family + name = "fancy camera" + desc = "A fancy camera that has the latest magnifier mods and double the film load! With a complex double lens set with holy water to be able to see the dead, at laest to the Chaplain..." + see_ghosts = CAMERA_SEE_GHOSTS_ORBIT + pictures_max = 30 + pictures_left = 30