diff --git a/maplestation_modules/story_content/noble_equipment/code/nobleclothing.dm b/maplestation_modules/story_content/noble_equipment/code/nobleclothing.dm index b77cb3c5dbe3..12bb4decabeb 100644 --- a/maplestation_modules/story_content/noble_equipment/code/nobleclothing.dm +++ b/maplestation_modules/story_content/noble_equipment/code/nobleclothing.dm @@ -481,3 +481,13 @@ righthand_file = 'maplestation_modules/story_content/noble_equipment/icons/noble_rhand.dmi' icon_state = "" inhand_icon_state = "" + +/obj/item/storage/backpack/satchel/leather/plague + name = "remedial satchel" + desc = "A finely-crafted leather bag adorned with subtle shadowlace accents, designed to complement the attire of the vigilant doctor. It embodies both practicality and style for the most dedicated healer." + icon = 'maplestation_modules/story_content/noble_equipment/icons/noble_item.dmi' + worn_icon = 'maplestation_modules/story_content/noble_equipment/icons/noble_worn.dmi' + lefthand_file = 'maplestation_modules/story_content/noble_equipment/icons/noble_lhand.dmi' + righthand_file = 'maplestation_modules/story_content/noble_equipment/icons/noble_rhand.dmi' + icon_state = "" + inhand_icon_state = "" diff --git a/maplestation_modules/story_content/randall_equipment/code/randallclothing.dm b/maplestation_modules/story_content/randall_equipment/code/randallclothing.dm index be9f7234fa0e..3784714d5666 100644 --- a/maplestation_modules/story_content/randall_equipment/code/randallclothing.dm +++ b/maplestation_modules/story_content/randall_equipment/code/randallclothing.dm @@ -40,6 +40,25 @@ can_be_bloody = FALSE resistance_flags = INDESTRUCTIBLE + /obj/item/clothing/gloves/randallgloves/pre_attack(atom/A, mob/living/user, params) + . = ..() + if(.) + return + + if(!isliving(A)) + return + + if(deprecise_zone(user.zone_selected) != BODY_ZONE_HEAD) + return + + var/mob/living/slapped = A + user.visible_message(span_warning("[user] slaps [slapped] with [src]!"), span_warning("You slap [slapped] with [src]!"), span_hear("You hear a slap.")) + playsound(slapped, 'sound/weapons/slap.ogg', get_clamped_volume(), TRUE) + slapped.Knockdown(1 SECONDS) + user.do_attack_animation(slapped, used_item = src) + user.changeNext_move(CLICK_CD_MELEE) + return TRUE + /datum/outfit/randall name = "The United Amateur"