diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 2d9bd926c3..9db9941f8c 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -55,28 +55,7 @@ /obj/item/clothing/tie/proc/on_uniform_dropped(obj/item/clothing/under/U, user) return -/* -/obj/item/clothing/tie/blue - name = "blue tie" - icon_state = "bluetie" - item_color = "bluetie" -/obj/item/clothing/tie/red - name = "red tie" - icon_state = "redtie" - item_color = "redtie" - -/obj/item/clothing/tie/black - name = "black tie" - icon_state = "blacktie" - item_color = "blacktie" - -/obj/item/clothing/tie/horrible - name = "horrible tie" - desc = "A neosilk clip-on tie. This one is disgusting." - icon_state = "horribletie" - item_color = "horribletie" -*/ /obj/item/clothing/tie/waistcoat name = "waistcoat" desc = "For some classy, murderous fun." @@ -84,48 +63,7 @@ item_state = "waistcoat" item_color = "waistcoat" minimize_when_attached = FALSE -/* -/obj/item/clothing/tie/stethoscope - name = "stethoscope" - desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing." - icon_state = "stethoscope" - item_color = "stethoscope" - -/obj/item/clothing/tie/stethoscope/attack(mob/living/carbon/human/M, mob/living/user) - if(ishuman(M) && isliving(user)) - if(user.a_intent == INTENT_HELP) - var/body_part = parse_zone(user.zone_selected) - if(body_part) - var/their = "their" - switch(M.gender) - if(MALE) - their = "his" - if(FEMALE) - their = "her" - - var/sound = "pulse" - var/sound_strength - - if(M.stat == DEAD || (M.status_flags&FAKEDEATH)) - sound_strength = "cannot hear" - sound = "anything" - else - sound_strength = "hear a weak" - switch(body_part) - if("chest") - if(M.oxyloss < 50) - sound_strength = "hear a healthy" - sound = "pulse and respiration" - if("eyes","mouth") - sound_strength = "cannot hear" - sound = "anything" - else - sound_strength = "hear a weak" - - 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// ////////// @@ -259,122 +197,7 @@ desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is white and blue." icon_state = "medblueband" item_color = "medblueband" -/* -/////////// -//SCARVES// -/////////// -/obj/item/clothing/tie/scarf //Default white color, same functionality as beanies. - name = "white scarf" - icon_state = "scarf" - desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks." - item_color = "scarf" - dog_fashion = /datum/dog_fashion/head - -/obj/item/clothing/tie/scarf/black - name = "black scarf" - icon_state = "scarf" - color = "#4A4A4B" //Grey but it looks black - -/obj/item/clothing/tie/scarf/red - name = "red scarf" - icon_state = "scarf" - color = "#D91414" //Red - -/obj/item/clothing/tie/scarf/green - name = "green scarf" - icon_state = "scarf" - color = "#5C9E54" //Green - -/obj/item/clothing/tie/scarf/darkblue - name = "dark blue scarf" - icon_state = "scarf" - color = "#1E85BC" //Blue - -/obj/item/clothing/tie/scarf/purple - name = "purple scarf" - icon_state = "scarf" - color = "#9557C5" //purple - -/obj/item/clothing/tie/scarf/yellow - name = "yellow scarf" - icon_state = "scarf" - color = "#E0C14F" //Yellow - -/obj/item/clothing/tie/scarf/orange - name = "orange scarf" - icon_state = "scarf" - color = "#C67A4B" //orange - -/obj/item/clothing/tie/scarf/cyan - name = "cyan scarf" - icon_state = "scarf" - color = "#54A3CE" //Cyan - - -//Striped scarves get their own icons - -/obj/item/clothing/tie/scarf/zebra - name = "zebra scarf" - icon_state = "zebrascarf" - item_color = "zebrascarf" - -/obj/item/clothing/tie/scarf/christmas - name = "christmas scarf" - icon_state = "christmasscarf" - item_color = "christmasscarf" - -//The three following scarves don't have the scarf subtype -//This is because Ian can equip anything from that subtype -//However, these 3 don't have corgi versions of their sprites -/obj/item/clothing/tie/stripedredscarf - name = "striped red scarf" - icon_state = "stripedredscarf" - item_color = "stripedredscarf" - -/obj/item/clothing/tie/stripedgreenscarf - name = "striped green scarf" - icon_state = "stripedgreenscarf" - item_color = "stripedgreenscarf" - -/obj/item/clothing/tie/stripedbluescarf - name = "striped blue scarf" - icon_state = "stripedbluescarf" - item_color = "stripedbluescarf" - -/obj/item/clothing/tie/petcollar //don't really wear this though please c'mon seriously guys - name = "pet collar" - desc = "It's for pets. Though you probably could wear it yourself, you'd doubtless be the subject of ridicule." - icon_state = "petcollar" - item_color = "petcollar" - var/tagname = null - -/obj/item/clothing/tie/petcollar/attack_self(mob/user) - tagname = copytext(sanitize(input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot") as null|text),1,MAX_NAME_LEN) - name = "[initial(name)] - [tagname]" - -////////////// -//DOPE BLING// -////////////// - -/obj/item/clothing/tie/dope_necklace - name = "gold necklace" - desc = "Damn, it feels good to be a gangster." - icon = 'icons/obj/clothing/ties.dmi' - icon_state = "bling" - item_color = "bling" - -//////////////// -//OONGA BOONGA// -//////////////// - -/obj/item/clothing/tie/talisman - name = "bone talisman" - desc = "A hunter's talisman, some say the old gods smile on those who wear it." - icon_state = "talisman" - item_color = "talisman" - armor = list(melee = 5, bullet = 5, laser = 5, energy = 5, bomb = 20, bio = 20, rad = 5, fire = 0, acid = 25) -*/ ////////////// //OBJECTION!// //////////////