From 48a5ed86275c92f1aecf79ff7ab0f79d98af7a06 Mon Sep 17 00:00:00 2001 From: Meowykins Date: Mon, 16 Feb 2015 21:11:22 -0600 Subject: [PATCH] Armband change. Hold. --- .../Sigyn/Department Sec/jobs.dm | 8 +-- .../crates_lockers/closets/secure/security.dm | 8 +-- code/modules/client/preferences_gear.dm | 14 +++--- code/modules/clothing/under/armbands.dm | 49 ++++++++++++++++--- 4 files changed, 57 insertions(+), 22 deletions(-) diff --git a/code/WorkInProgress/Sigyn/Department Sec/jobs.dm b/code/WorkInProgress/Sigyn/Department Sec/jobs.dm index d658c51c..94f51f70 100644 --- a/code/WorkInProgress/Sigyn/Department Sec/jobs.dm +++ b/code/WorkInProgress/Sigyn/Department Sec/jobs.dm @@ -110,17 +110,17 @@ proc/assign_sec_to_department(var/mob/living/carbon/human/H) keyslot2 = new /obj/item/device/encryptionkey/headset_sci /obj/item/clothing/under/rank/security/cargo/New() - var/obj/item/clothing/tie/armband/cargo/A = new /obj/item/clothing/tie/armband/cargo + var/obj/item/clothing/armband/cargo/A = new /obj/item/clothing/armband/cargo hastie = A /obj/item/clothing/under/rank/security/engine/New() - var/obj/item/clothing/tie/armband/engine/A = new /obj/item/clothing/tie/armband/engine + var/obj/item/clothing/armband/engine/A = new /obj/item/clothing/armband/engine hastie = A /obj/item/clothing/under/rank/security/science/New() - var/obj/item/clothing/tie/armband/science/A = new /obj/item/clothing/tie/armband/science + var/obj/item/clothing/armband/science/A = new /obj/item/clothing/armband/science hastie = A /obj/item/clothing/under/rank/security/med/New() - var/obj/item/clothing/tie/armband/medgreen/A = new /obj/item/clothing/tie/armband/medgreen + var/obj/item/clothing/armband/medgreen/A = new /obj/item/clothing/armband/medgreen hastie = A \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index be8ffaa3..f13bc175 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -204,7 +204,7 @@ New() ..() - new /obj/item/clothing/tie/armband/cargo(src) + new /obj/item/clothing/armband/cargo(src) new /obj/item/device/encryptionkey/headset_cargo(src) return @@ -212,7 +212,7 @@ New() ..() - new /obj/item/clothing/tie/armband/engine(src) + new /obj/item/clothing/armband/engine(src) new /obj/item/device/encryptionkey/headset_eng(src) return @@ -220,7 +220,7 @@ New() ..() - new /obj/item/clothing/tie/armband/science(src) + new /obj/item/clothing/armband/science(src) new /obj/item/device/encryptionkey/headset_sci(src) return @@ -228,7 +228,7 @@ New() ..() - new /obj/item/clothing/tie/armband/medgreen(src) + new /obj/item/clothing/armband/medgreen(src) new /obj/item/device/encryptionkey/headset_med(src) return diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 2461e068..77c6139b 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -348,37 +348,37 @@ proc/populate_gear_list() /datum/gear/armband display_name = "red armband" - path = /obj/item/clothing/tie/armband + path = /obj/item/clothing/armband cost = 1 /datum/gear/armband_cargo display_name = "cargo armband" - path = /obj/item/clothing/tie/armband/cargo + path = /obj/item/clothing/armband/cargo cost = 1 /datum/gear/armband_engineering display_name = "engineering armband" - path = /obj/item/clothing/tie/armband/engine + path = /obj/item/clothing/armband/engine cost = 1 /datum/gear/armband_science display_name = "science armband" - path = /obj/item/clothing/tie/armband/science + path = /obj/item/clothing/armband/science cost = 1 /datum/gear/armband_hydroponics display_name = "hydroponics armband" - path = /obj/item/clothing/tie/armband/hydro + path = /obj/item/clothing/armband/hydro cost = 1 /datum/gear/armband_medical display_name = "medical armband" - path = /obj/item/clothing/tie/armband/med + path = /obj/item/clothing/armband/med cost = 1 /datum/gear/armband_emt display_name = "EMT armband" - path = /obj/item/clothing/tie/armband/medgreen + path = /obj/item/clothing/armband/medgreen cost = 1 /datum/gear/skirt_blue diff --git a/code/modules/clothing/under/armbands.dm b/code/modules/clothing/under/armbands.dm index 692b18d9..76395f1f 100644 --- a/code/modules/clothing/under/armbands.dm +++ b/code/modules/clothing/under/armbands.dm @@ -1,41 +1,76 @@ //Armbands -/obj/item/clothing/tie/armband +/obj/item/clothing/armband name = "red armband" desc = "A fancy red armband!" + icon = 'icons/obj/clothing/ties.dmi' icon_state = "red" item_color = "red" + var/obj/item/clothing/under/has_suit = null //the suit the tie may be attached to + var/image/inv_overlay = null //overlay used when attached to clothing. -/obj/item/clothing/tie/armband/cargo +/obj/item/clothing/armband/New() + ..() + inv_overlay = image("icon" = 'icons/obj/clothing/ties_overlay.dmi', "icon_state" = "[item_color? "[item_color]" : "[icon_state]"]") + +/obj/item/clothing/armband/proc/on_attached(obj/item/clothing/under/S, mob/user as mob) + if(!istype(S)) + return + has_suit = S + loc = has_suit + has_suit.overlays += inv_overlay + has_suit.update_clothing_icon() + + user << "You attach [src] to [has_suit]." + src.add_fingerprint(user) + +/obj/item/clothing/armband/proc/on_removed(mob/user as mob) + if(!has_suit) + return + has_suit.overlays -= inv_overlay + has_suit = null + usr.put_in_hands(src) + src.add_fingerprint(user) + has_suit.update_clothing_icon() + +/obj/item/clothing/armband/attackby(obj/item/I, mob/user) + ..() + +/obj/item/clothing/armband/attack_hand(mob/user as mob) + if(has_suit) + has_suit.remove_accessory(user) + return + ..() +/obj/item/clothing/armband/cargo name = "cargo bay guard armband" desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is brown." icon_state = "cargo" item_color = "cargo" -/obj/item/clothing/tie/armband/engine +/obj/item/clothing/armband/engine name = "engineering guard armband" desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is orange with a reflective strip!" icon_state = "engie" item_color = "engie" -/obj/item/clothing/tie/armband/science +/obj/item/clothing/armband/science name = "science guard armband" desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is purple." icon_state = "rnd" item_color = "rnd" -/obj/item/clothing/tie/armband/hydro +/obj/item/clothing/armband/hydro name = "hydroponics guard armband" desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is green and blue." icon_state = "hydro" item_color = "hydro" -/obj/item/clothing/tie/armband/med +/obj/item/clothing/armband/med name = "medical guard armband" desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is white." icon_state = "med" item_color = "med" -/obj/item/clothing/tie/armband/medgreen +/obj/item/clothing/armband/medgreen name = "medical guard armband" desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is white and green." icon_state = "medgreen"