diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm index f60d1822403..b0068c61908 100644 --- a/code/modules/clothing/clothing_accessories.dm +++ b/code/modules/clothing/clothing_accessories.dm @@ -18,15 +18,12 @@ if(!valid_accessory_slots || !valid_accessory_slots.len) usr << "You cannot attach accessories of any kind to \the [src]." - world << "clothing/attackby !valid" - user.drop_item() return var/obj/item/clothing/accessory/A = I if(can_attach_accessory(A)) user.drop_item() attach_accessory(user, A) - world << "clothing/attackby success" return else user << "You cannot attach more accessories of this type to [src]." diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index a215bdca9ab..071283507ac 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -130,6 +130,7 @@ desc = "You're not quite sure how you manage to take it on and off, but it implants nicely in your head." icon_state = "dermal" item_state_slots = list(slot_r_hand_str = "", slot_l_hand_str = "") + show_examine = FALSE /obj/item/clothing/head/det name = "fedora" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 94f49a2b1a2..fcb3040f811 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -498,28 +498,28 @@ blood_overlay_type = "armor" /obj/item/clothing/suit/armor/pcarrier/light - starting_accessories = list(/obj/item/clothing/accessory/armorplate) + starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate) /obj/item/clothing/suit/armor/pcarrier/light/sol - starting_accessories = list(/obj/item/clothing/accessory/armorplate, /obj/item/clothing/accessory/armor/tag) + starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate, /obj/item/clothing/accessory/armor/tag) /obj/item/clothing/suit/armor/pcarrier/light/nt - starting_accessories = list(/obj/item/clothing/accessory/armorplate, /obj/item/clothing/accessory/armor/tag/nt) + starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate, /obj/item/clothing/accessory/armor/tag/nt) /obj/item/clothing/suit/armor/pcarrier/medium - starting_accessories = list(/obj/item/clothing/accessory/armorplate/medium, /obj/item/clothing/accessory/storage/pouches) + starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/medium, /obj/item/clothing/accessory/storage/pouches) /obj/item/clothing/suit/armor/pcarrier/medium/sol - starting_accessories = list(/obj/item/clothing/accessory/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag) + starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag) /obj/item/clothing/suit/armor/pcarrier/medium/security - starting_accessories = list(/obj/item/clothing/accessory/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag/sec) + starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag/sec) /obj/item/clothing/suit/armor/pcarrier/medium/command - starting_accessories = list(/obj/item/clothing/accessory/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag/com) + starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag/com) /obj/item/clothing/suit/armor/pcarrier/medium/nt - starting_accessories = list(/obj/item/clothing/accessory/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag/nt) + starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag/nt) /obj/item/clothing/suit/armor/pcarrier/blue name = "blue plate carrier" @@ -529,7 +529,7 @@ /obj/item/clothing/suit/armor/pcarrier/blue/sol name = "peacekeeper plate carrier" desc = "A lightweight plate carrier vest in SCG Peacekeeper colors. It can be equipped with armor plates, but provides no protection of its own." - starting_accessories = list(/obj/item/clothing/accessory/armorplate/medium, /obj/item/clothing/accessory/storage/pouches/blue, /obj/item/clothing/accessory/armguards/blue, /obj/item/clothing/accessory/armor/tag) + starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/medium, /obj/item/clothing/accessory/storage/pouches/blue, /obj/item/clothing/accessory/armor/armguards/blue, /obj/item/clothing/accessory/armor/tag) /obj/item/clothing/suit/armor/pcarrier/green name = "green plate carrier" @@ -548,8 +548,8 @@ /obj/item/clothing/suit/armor/pcarrier/tan/tactical name = "tactical plate carrier" - starting_accessories = list(/obj/item/clothing/accessory/armorplate/tactical, /obj/item/clothing/accessory/storage/pouches/large/tan) + starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/tactical, /obj/item/clothing/accessory/storage/pouches/large/tan) /obj/item/clothing/suit/armor/pcarrier/merc - starting_accessories = list(/obj/item/clothing/accessory/armorplate/merc, /obj/item/clothing/accessory/armguards/merc, /obj/item/clothing/accessory/legguards/merc, /obj/item/clothing/accessory/storage/pouches/large) + starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/merc, /obj/item/clothing/accessory/armor/armguards/merc, /obj/item/clothing/accessory/armor/legguards/merc, /obj/item/clothing/accessory/storage/pouches/large) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 0e50beff993..5d18858cc35 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -59,7 +59,6 @@ //when user attached an accessory to S /obj/item/clothing/accessory/proc/on_attached(var/obj/item/clothing/S, var/mob/user) - world << "on_attached" if(!istype(S)) return has_suit = S diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 4b2d0e08584..df9e3b7c173 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -2,6 +2,14 @@ // This file holds all of the accessories used as part of the modular armor system. At some point it might be wise to split this into multiple files. */ +/obj/item/clothing/accessory/armor + name = "armor accessory" + desc = "You should never see this description. Ahelp this, please." + icon_override = 'icons/mob/modular_armor.dmi' + icon = 'icons/obj/clothing/modular_armor.dmi' + icon_state = "pouches" + w_class = ITEMSIZE_NORMAL + /////////// //Pouches /////////// @@ -10,8 +18,8 @@ desc = "A collection of black pouches that can be attached to a plate carrier. Carries up to two items." icon_override = 'icons/mob/modular_armor.dmi' icon = 'icons/obj/clothing/modular_armor.dmi' -// accessory_icons = list(slot_tie_str = 'icons/mob/modular_armor.dmi', slot_wear_suit_str = 'icons/mob/modular_armor.dmi') icon_state = "pouches" + w_class = ITEMSIZE_NORMAL gender = PLURAL slot = ACCESSORY_SLOT_ARMOR_S slots = 2 @@ -58,28 +66,27 @@ //////////////// //Armor plates //////////////// -/obj/item/clothing/accessory/armorplate +/obj/item/clothing/accessory/armor/armorplate name = "light armor plate" desc = "A basic armor plate made of steel-reinforced synthetic fibers. Attaches to a plate carrier." - icon = 'icons/obj/clothing/modular_armor.dmi' icon_state = "armor_light" body_parts_covered = UPPER_TORSO|LOWER_TORSO armor = list(melee = 30, bullet = 15, laser = 40, energy = 10, bomb = 25, bio = 0, rad = 0) slot = ACCESSORY_SLOT_ARMOR_C -/obj/item/clothing/accessory/armorplate/medium +/obj/item/clothing/accessory/armor/armorplate/medium name = "medium armor plate" desc = "A plasteel-reinforced synthetic armor plate, providing good protection. Attaches to a plate carrier." icon_state = "armor_medium" armor = list(melee = 40, bullet = 40, laser = 40, energy = 25, bomb = 30, bio = 0, rad = 0) -/obj/item/clothing/accessory/armorplate/tactical +/obj/item/clothing/accessory/armor/armorplate/tactical name = "tactical armor plate" desc = "A medium armor plate with additional ablative coating. Attaches to a plate carrier." icon_state = "armor_tactical" armor = list(melee = 40, bullet = 40, laser = 60, energy = 35, bomb = 30, bio = 0, rad = 0) -/obj/item/clothing/accessory/armorplate/merc +/obj/item/clothing/accessory/armor/armorplate/merc name = "heavy armor plate" desc = "A ceramics-reinforced synthetic armor plate, providing state of of the art protection. Attaches to a plate carrier." icon_state = "armor_heavy" @@ -88,11 +95,9 @@ ////////////// //Arm guards ////////////// -/obj/item/clothing/accessory/armguards +/obj/item/clothing/accessory/armor/armguards name = "arm guards" desc = "A pair of black arm pads reinforced with armor plating. Attaches to a plate carrier." - icon_override = 'icons/mob/modular_armor.dmi' - icon = 'icons/obj/clothing/modular_armor.dmi' // accessory_icons = list(slot_tie_str = 'icons/mob/modular_armor.dmi', slot_wear_suit_str = 'icons/mob/modular_armor.dmi') icon_state = "armguards" gender = PLURAL @@ -100,29 +105,29 @@ armor = list(melee = 40, bullet = 40, laser = 40, energy = 25, bomb = 30, bio = 0, rad = 0) slot = ACCESSORY_SLOT_ARMOR_A -/obj/item/clothing/accessory/armguards/blue +/obj/item/clothing/accessory/armor/armguards/blue desc = "A pair of blue arm pads reinforced with armor plating. Attaches to a plate carrier." icon_state = "armguards_blue" -/obj/item/clothing/accessory/armguards/navy +/obj/item/clothing/accessory/armor/armguards/navy desc = "A pair of navy blue arm pads reinforced with armor plating. Attaches to a plate carrier." icon_state = "armguards_navy" -/obj/item/clothing/accessory/armguards/green +/obj/item/clothing/accessory/armor/armguards/green desc = "A pair of green arm pads reinforced with armor plating. Attaches to a plate carrier." icon_state = "armguards_green" -/obj/item/clothing/accessory/armguards/tan +/obj/item/clothing/accessory/armor/armguards/tan desc = "A pair of tan arm pads reinforced with armor plating. Attaches to a plate carrier." icon_state = "armguards_tan" -/obj/item/clothing/accessory/armguards/merc +/obj/item/clothing/accessory/armor/armguards/merc name = "heavy arm guards" desc = "A pair of red-trimmed black arm pads reinforced with heavy armor plating. Attaches to a plate carrier." icon_state = "armguards_merc" armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) -/obj/item/clothing/accessory/armguards/laserproof +/obj/item/clothing/accessory/armor/armguards/laserproof name = "ablative arm guards" desc = "These arm guards will protect your arms from energy weapons." icon_state = "armguards_laser" @@ -130,7 +135,7 @@ siemens_coefficient = 0.4 //This is worse than the other ablative pieces, to avoid this from becoming the poor warden's insulated gloves. armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0) -/obj/item/clothing/accessory/armguards/bulletproof +/obj/item/clothing/accessory/armor/armguards/bulletproof name = "bullet resistant arm guards" desc = "These arm guards will protect your arms from ballistic weapons." icon_state = "armguards_bullet" @@ -138,7 +143,7 @@ siemens_coefficient = 0.7 armor = list(melee = 10, bullet = 80, laser = 10, energy = 50, bomb = 0, bio = 0, rad = 0) -/obj/item/clothing/accessory/armguards/riot +/obj/item/clothing/accessory/armor/armguards/riot name = "riot arm guards" desc = "These arm guards will protect your arms from close combat weapons." icon_state = "armguards_riot" @@ -149,11 +154,9 @@ ////////////// //Leg guards ////////////// -/obj/item/clothing/accessory/legguards +/obj/item/clothing/accessory/armor/legguards name = "leg guards" desc = "A pair of armored leg pads in black. Attaches to a plate carrier." - icon_override = 'icons/mob/modular_armor.dmi' - icon = 'icons/obj/clothing/modular_armor.dmi' // accessory_icons = list(slot_tie_str = 'icons/mob/modular_armor.dmi', slot_wear_suit_str = 'icons/mob/modular_armor.dmi') icon_state = "legguards" gender = PLURAL @@ -161,29 +164,29 @@ armor = list(melee = 40, bullet = 40, laser = 40, energy = 25, bomb = 30, bio = 0, rad = 0) slot = ACCESSORY_SLOT_ARMOR_L -/obj/item/clothing/accessory/legguards/blue +/obj/item/clothing/accessory/armor/legguards/blue desc = "A pair of armored leg pads in blue. Attaches to a plate carrier." icon_state = "legguards_blue" -/obj/item/clothing/accessory/legguards/navy +/obj/item/clothing/accessory/armor/legguards/navy desc = "A pair of armored leg pads in navy blue. Attaches to a plate carrier." icon_state = "legguards_navy" -/obj/item/clothing/accessory/legguards/green +/obj/item/clothing/accessory/armor/legguards/green desc = "A pair of armored leg pads in green. Attaches to a plate carrier." icon_state = "legguards_green" -/obj/item/clothing/accessory/legguards/tan +/obj/item/clothing/accessory/armor/legguards/tan desc = "A pair of armored leg pads in tan. Attaches to a plate carrier." icon_state = "legguards_tan" -/obj/item/clothing/accessory/legguards/merc +/obj/item/clothing/accessory/armor/legguards/merc name = "heavy leg guards" desc = "A pair of heavily armored leg pads in red-trimmed black. Attaches to a plate carrier." icon_state = "legguards_merc" armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) -/obj/item/clothing/shoes/legguard/laserproof +/obj/item/clothing/accessory/armor/legguards/laserproof name = "ablative leg guards" desc = "These will protect your legs from energy weapons." icon_state = "legguards_laser" @@ -191,7 +194,7 @@ siemens_coefficient = 0.1 armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0) -/obj/item/clothing/shoes/legguard/bulletproof +/obj/item/clothing/accessory/armor/legguards/bulletproof name = "bullet resistant leg guards" desc = "These will protect your legs from ballistic weapons." icon_state = "legguards_bullet" @@ -199,7 +202,7 @@ siemens_coefficient = 0.7 armor = list(melee = 10, bullet = 80, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0) -/obj/item/clothing/shoes/legguard/riot +/obj/item/clothing/accessory/armor/legguards/riot name = "riot leg guards" desc = "These will protect your legs from close combat weapons." icon_state = "legguards_riot" @@ -213,11 +216,10 @@ /obj/item/clothing/accessory/armor/tag name = "\improper SCG Flag" desc = "An emblem depicting the Solar Confederate Government's flag." - icon_override = 'icons/mob/modular_armor.dmi' - icon = 'icons/obj/clothing/modular_armor.dmi' // accessory_icons = list(slot_tie_str = 'icons/mob/modular_armor.dmi', slot_wear_suit_str = 'icons/mob/modular_armor.dmi') icon_state = "solflag" slot = ACCESSORY_SLOT_ARMOR_M + w_class = ITEMSIZE_SMALL /obj/item/clothing/accessory/armor/tag/sifguard name = "\improper Sif Defense Force crest" diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index b7682669a8b..b82da139915 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -155,7 +155,6 @@ //head if(head && head.show_examine) - world << "[head.show_examine]" if(head.blood_DNA) msg += "[T.He] [T.is] wearing \icon[head] [head.gender==PLURAL?"some":"a"] [(head.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [head.name] on [T.his] head!\n" else