cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-24 13:16:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Armband change.

Browse Source 
Hold.
This commit is contained in:
Meowykins
2015-02-16 21:11:22 -06:00
parent 18e67fbd2d
commit 48a5ed8627
4 changed files with 57 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences_gear.dm
+7 -7
View File
@@ -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
code/modules/clothing/under/armbands.dm
+42 -7
View File
@@ -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 << "<span class='notice'>You attach [src] to [has_suit].</span>"
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"