From 00921387e73e9544995fe82bed31581ff773c2da Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Sun, 30 Sep 2012 17:42:11 +0000 Subject: [PATCH] Added mob-examine code for ties Added medals as a type of tie. Awaiting sprites. Need a bronze, silver and gold on-mob sprite. And icons for the items themselves. Don't bother with in-hands git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4783 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/clothing/under/ties.dm | 48 +++++++++++++++++++ .../mob/living/carbon/human/examine.dm | 11 ++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index a0cf975243b..ea0eab9e88b 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -63,3 +63,51 @@ user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound].") return return ..(M,user) + + +//Medals +/obj/item/clothing/tie/medal + name = "bronze medal" + desc = "A bronze medal." + icon_state = "bronze" + color = "bronze" + +/obj/item/clothing/tie/medal/conduct + name = "distinguished conduct medal" + desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is most basic award given by Nanotrasen. It is often awarded by a captain to a member of his crew." + +/obj/item/clothing/tie/medal/bronze_heart + name = "bronze heart medal" + desc = "A bronze heart-shaped medal awarded for sacrifice. It is often awarded posthumously or for severe injury in the line of duty." + +/obj/item/clothing/tie/medal/nobel_science + name = "nobel sciences award" + desc = "A bronze medal which represents significant contributions to the field of science or engineering." + +/obj/item/clothing/tie/medal/silver + name = "silver medal" + desc = "A silver medal." + icon_state = "silver" + color = "silver" + +/obj/item/clothing/tie/medal/silver/valor + name = "medal of valor" + desc = "A silver medal awarded for acts of exceptional valor." + +/obj/item/clothing/tie/medal/silver/security + name = "robust security award" + desc = "An award for distinguished combat and sacrifice in defence of Nanotrasen's commercial interests. Often awarded to security staff." + +/obj/item/clothing/tie/medal/gold + name = "gold medal" + desc = "A prestigious golden medal." + icon_state = "gold" + color = "gold" + +/obj/item/clothing/tie/medal/gold/captain + name = "medal of captaincy" + 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." + +/obj/item/clothing/tie/medal/gold/heroism + name = "medal of exceptional heroism" + desc = "An extremely rare golden medal awarded only by CentComm. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders." \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index c1a12fd29d0..cd6c09a20eb 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -63,10 +63,17 @@ //uniform if(w_uniform && !skipjumpsuit) + //Ties + var/tie_msg + if(istype(w_uniform,/obj/item/clothing/under)) + var/obj/item/clothing/under/U = w_uniform + if(U.hastie) + tie_msg += " with \icon[U.hastie] \a [U.hastie]" + if(w_uniform.blood_DNA) - msg += "[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] blood-stained [w_uniform.name]!\n" + msg += "[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] blood-stained [w_uniform.name][tie_msg]!\n" else - msg += "[t_He] [t_is] wearing \icon[w_uniform] \a [w_uniform].\n" + msg += "[t_He] [t_is] wearing \icon[w_uniform] \a [w_uniform][tie_msg].\n" //head if(head)