shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8003 from Trilbyspaceclone/morefamstuff

Browse Source 
More heirloom stuff for Lawyer, Cap and Chap
This commit is contained in:
kevinz000
2019-02-27 16:18:25 -08:00
committed by GitHub
parent 1504054457 70b2619bba
commit bdffc9e10c
4 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/accessories.dm
+15 -11
View File
@@ -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//
////////////
code/modules/photography/camera/other.dm
+7
View File
@@ -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