diff --git a/citadel.dme b/citadel.dme index f2fa8475ae1d..08643fd36569 100644 --- a/citadel.dme +++ b/citadel.dme @@ -1331,7 +1331,6 @@ #include "code\game\machinery\CableLayer.dm" #include "code\game\machinery\cell_charger.dm" #include "code\game\machinery\cloning.dm" -#include "code\game\machinery\colormate.dm" #include "code\game\machinery\cryo.dm" #include "code\game\machinery\cryopod.dm" #include "code\game\machinery\deployable.dm" @@ -1347,6 +1346,7 @@ #include "code\game\machinery\floor_light.dm" #include "code\game\machinery\floorlayer.dm" #include "code\game\machinery\fossilrevive.dm" +#include "code\game\machinery\gear_painter.dm" #include "code\game\machinery\holopad.dm" #include "code\game\machinery\holoposter.dm" #include "code\game\machinery\holosign.dm" diff --git a/code/__DEFINES/matrices.dm b/code/__DEFINES/matrices.dm index 26ff5a7232a2..15f73b7ca85d 100644 --- a/code/__DEFINES/matrices.dm +++ b/code/__DEFINES/matrices.dm @@ -5,11 +5,11 @@ #define COLOR_MATRIX_IDENTITY list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 0,0,0,0) /// Color inversion #define COLOR_MATRIX_INVERT list(-1,0,0,0, 0,-1,0,0, 0,0,-1,0, 0,0,0,1, 1,1,1,0) -///Sepiatone +/// Sepiatone #define COLOR_MATRIX_SEPIATONE list(0.393,0.349,0.272,0, 0.769,0.686,0.534,0, 0.189,0.168,0.131,0, 0,0,0,1, 0,0,0,0) -///Grayscale +/// Grayscale #define COLOR_MATRIX_GRAYSCALE list(0.33,0.33,0.33,0, 0.59,0.59,0.59,0, 0.11,0.11,0.11,0, 0,0,0,1, 0,0,0,0) -///Polaroid colors +/// Polaroid colors #define COLOR_MATRIX_POLAROID list(1.438,-0.062,-0.062,0, -0.122,1.378,-0.122,0, -0.016,-0.016,1.483,0, 0,0,0,1, 0,0,0,0) /// Converts reds to blue, green to red and blue to green. #define COLOR_MATRIX_BRG list(0,0,1,0, 0,1,0,0, 1,0,0,0, 0,0,0,1, 0,0,0,0) diff --git a/code/game/machinery/colormate.dm b/code/game/machinery/gear_painter.dm similarity index 100% rename from code/game/machinery/colormate.dm rename to code/game/machinery/gear_painter.dm diff --git a/code/game/objects/items-interaction.dm b/code/game/objects/items-interaction.dm index f5a298b4ed1e..e9fa3c3ea3ed 100644 --- a/code/game/objects/items-interaction.dm +++ b/code/game/objects/items-interaction.dm @@ -89,7 +89,7 @@ if(isnull(actually_picked_up)) to_chat(user, SPAN_WARNING("[src] somehow slips through your grasp. What just happened?")) return - if(!user.put_in_hands(actually_picked_up, user.active_hand)) + if(!user.put_in_hands(actually_picked_up, INV_OP_NO_MERGE_STACKS, user.active_hand)) if(has_to_drop_to_ground_on_fail) actually_picked_up.forceMove(user.drop_location()) return diff --git a/code/game/rendering/actor_huds/huds/inventory-screen_object.dm b/code/game/rendering/actor_huds/huds/inventory-screen_object.dm index 9e49286cff76..341e64053a97 100644 --- a/code/game/rendering/actor_huds/huds/inventory-screen_object.dm +++ b/code/game/rendering/actor_huds/huds/inventory-screen_object.dm @@ -139,7 +139,7 @@ ..() /atom/movable/screen/actor_hud/inventory/plate/hand/handle_inventory_click(mob/user, obj/item/with_item) - hud.owner.swap_hand(hand_index) + hud.owner.mob.swap_hand(hand_index) /atom/movable/screen/actor_hud/inventory/plate/hand/proc/sync_index(index = hand_index) screen_loc = SCREEN_LOC_MOB_HUD_INVENTORY_HAND(index) diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm index 4667527d1384..8ff46e36b00b 100644 --- a/code/modules/clothing/clothing_accessories.dm +++ b/code/modules/clothing/clothing_accessories.dm @@ -273,7 +273,7 @@ var/list/choices = list() for(var/i in accessories) choices[i] = i - A = show_radial_menu(usr, src, choices) + A = show_radial_menu(usr, usr.is_in_inventory(src) ? usr : src, choices) if(!usr || usr.stat || !(src in usr)) return if(A) diff --git a/code/modules/mob/inventory/inventory-hands-put.dm b/code/modules/mob/inventory/inventory-hands-put.dm index b5799ca1698f..2aabea67031d 100644 --- a/code/modules/mob/inventory/inventory-hands-put.dm +++ b/code/modules/mob/inventory/inventory-hands-put.dm @@ -33,8 +33,9 @@ var/obj/item/stack/S = I for(var/obj/item/stack/held_stack in get_held_items()) if(S.can_merge(held_stack) && S.merge(held_stack)) - to_chat(src, SPAN_NOTICE("Your [held_stack] stack now contains [held_stack.get_amount()] [held_stack.singular_name]\s.")) - return INV_RETURN_SUCCESS + to_chat(owner, SPAN_NOTICE("The [held_stack.name] in your hands now contains [held_stack.get_amount()] [held_stack.singular_name]\s.")) + if(QDELETED(S)) + return INV_RETURN_SUCCESS if(prioritize_index) var/priority_result = put_in_hand(I, prioritize_index, inv_op_flags) diff --git a/code/modules/mob/mob-inventory.dm b/code/modules/mob/mob-inventory.dm index a5c6fc71c5bc..1cf64daf0880 100644 --- a/code/modules/mob/mob-inventory.dm +++ b/code/modules/mob/mob-inventory.dm @@ -50,7 +50,7 @@ * SLOT_ID_HANDS if in hands */ /mob/proc/is_in_inventory(obj/item/I) - return (I?.worn_mob() == src) && I.worn_slot + return (I?.worn_mob() == src) ? I.worn_slot : null // we use entirely cached vars for speed. // if this returns bad data well fuck you, don't break equipped()/unequipped(). diff --git a/code/modules/mob/movement.dm b/code/modules/mob/movement.dm index 2a083fe284fc..94a139bb449d 100644 --- a/code/modules/mob/movement.dm +++ b/code/modules/mob/movement.dm @@ -13,16 +13,6 @@ /client/proc/client_dir(input, direction=-1) return turn(input, direction*dir2angle(dir)) -/client/verb/swap_hand() - set hidden = 1 - if(istype(mob, /mob/living)) - var/mob/living/L = mob - L.swap_hand() - if(istype(mob,/mob/living/silicon/robot)) - var/mob/living/silicon/robot/R = mob - R.cycle_modules() - return - /client/verb/drop_item() set hidden = 1