diff --git a/code/datums/components/transforming.dm b/code/datums/components/transforming.dm index 88c0b1431a8..34609fa9bd7 100644 --- a/code/datums/components/transforming.dm +++ b/code/datums/components/transforming.dm @@ -69,6 +69,7 @@ src.hitsound_on = hitsound_on src.w_class_on = w_class_on src.clumsy_check = clumsy_check + src.inhand_icon_change = inhand_icon_change if(attack_verb_continuous_on) src.attack_verb_continuous_on = attack_verb_continuous_on @@ -191,7 +192,7 @@ source.hitsound = hitsound_on source.w_class = w_class_on source.icon_state = "[source.icon_state]_on" - if(inhand_icon_change) + if(inhand_icon_change && source.inhand_icon_state) source.inhand_icon_state = "[source.inhand_icon_state]_on" if(ismob(source.loc)) var/mob/loc_mob = source.loc diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index 095e8f46455..56744de8d51 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -69,7 +69,9 @@ hitsound_on = active_hitsound, \ w_class_on = active_w_class, \ attack_verb_continuous_on = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts"), \ - attack_verb_simple_on = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")) + attack_verb_simple_on = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut"), \ + inhand_icon_change = FALSE, \ + ) RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/melee/energy/suicide_act(mob/living/user) @@ -112,7 +114,7 @@ if(active) if(sword_color_icon) icon_state = "[icon_state]_[sword_color_icon]" - inhand_icon_state = "[inhand_icon_state]_[sword_color_icon]" + inhand_icon_state = "[inhand_icon_state]_on_[sword_color_icon]" if(ismob(loc)) var/mob/loc_mob = loc loc_mob.update_held_items() diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 51ecb2f4070..09402d166d5 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -333,7 +333,9 @@ ovens = typecacheof(list(/obj/singularity, /obj/energy_ball, /obj/machinery/power/supermatter_crystal, /obj/structure/bonfire)) AddComponent(/datum/component/transforming, \ hitsound_on = hitsound, \ - clumsy_check = FALSE) + clumsy_check = FALSE, \ + inhand_icon_change = FALSE, \ + ) RegisterSignal(src, COMSIG_TRANSFORMING_PRE_TRANSFORM, PROC_REF(attempt_transform)) RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) @@ -449,4 +451,3 @@ armour_penetration = 50 attack_verb_continuous = list("smacks", "strikes", "cracks", "beats") attack_verb_simple = list("smack", "strike", "crack", "beat") - diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 0545dc3a3dc..50534f85920 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -111,7 +111,8 @@ hitsound_on = hitsound, \ w_class_on = w_class, \ clumsy_check = FALSE, \ - inhand_icon_change = FALSE,) + inhand_icon_change = FALSE, \ + ) RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index 5f7e170041b..823e8181bd2 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -108,7 +108,9 @@ throwforce_on = throwforce, \ hitsound_on = hitsound, \ w_class_on = w_class, \ - clumsy_check = FALSE) + clumsy_check = FALSE, \ + inhand_icon_change = FALSE, \ + ) RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 5cf11beb7f8..df2b63b55a1 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -400,7 +400,9 @@ AddComponent(/datum/component/transforming, \ throw_speed_on = throw_speed, \ hitsound_on = hitsound, \ - clumsy_check = FALSE) + clumsy_check = FALSE, \ + inhand_icon_change = FALSE, \ + ) RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) AddElement(/datum/element/update_icon_updates_onmob) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 34397c00b55..c2f4c1ee5f9 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -432,7 +432,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 SIGNAL_HANDLER tool_behaviour = (active ? TOOL_KNIFE : NONE) - return COMPONENT_NO_DEFAULT_MESSAGE /obj/item/switchblade/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] is slitting [user.p_their()] own throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 4ac695e9a61..c02fb6ecbdb 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -279,7 +279,9 @@ throwforce_on = 35, \ throw_speed_on = 4, \ sharpness_on = SHARP_EDGED, \ - w_class_on = WEIGHT_CLASS_NORMAL) + w_class_on = WEIGHT_CLASS_NORMAL, \ + inhand_icon_change = FALSE, \ + ) RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) RegisterSignal(src, COMSIG_DETECTIVE_SCANNED, PROC_REF(on_scan)) @@ -366,7 +368,9 @@ AddComponent(/datum/component/transforming, \ throwforce_on = 5, \ w_class_on = WEIGHT_CLASS_SMALL, \ - sharpness_on = TRUE) + sharpness_on = TRUE, \ + inhand_icon_change = FALSE, \ + ) RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(toggle_screwdriver)) AddElement(/datum/element/update_icon_updates_onmob) @@ -385,7 +389,8 @@ SIGNAL_HANDLER extended = active if(user) - balloon_alert(user, "[extended ? "extended" : "retracted"]!") + balloon_alert(user, "[extended ? "extended" : "retracted"]") + playsound(src, 'sound/weapons/batonextend.ogg', 50, TRUE) if(!extended) tool_behaviour = initial(tool_behaviour) diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 33c46982d27..49920f73aee 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -525,14 +525,14 @@ var/selected_reagent = tgui_input_list(usr, "Select reagent to filter", "Whitelist reagent", GLOB.chemical_name_list) if(!selected_reagent) return TRUE - + var/chem_id = get_chem_id(selected_reagent) if(!chem_id) return TRUE - + if(!(chem_id in whitelist)) whitelist[chem_id] = selected_reagent - + if("remove") diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi index 8dfada39e21..b29d6dbcf1e 100644 Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi index 4ca37418be2..862ebbdc8c3 100644 Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ