diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index 50405b22942..17a122e94b2 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -594,6 +594,7 @@ appliance = OVEN fruit = list("sugartree" = 2) reagents = list("fatshouter_milk" = 5, "egg" = 3) + reagent_mix = RECIPE_REAGENT_REPLACE items = list( /obj/item/reagent_containers/food/snacks/dough ) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index aa5a623ff01..6260893c9ba 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -198,12 +198,7 @@ return 0 /mob/living/silicon/pai/restrained() - if(istype(src.loc,/obj/item/device/paicard)) - return 0 - ..() - -/mob/living/silicon/pai/MouseDrop(atom/over_object) - return + return !istype(loc, /obj/item/device/paicard) && ..() /mob/living/silicon/pai/emp_act(severity) // Silence for 2 minutes @@ -477,11 +472,12 @@ src.forceMove(get_turf(H)) // Move us into the card and move the card to the ground. - src.forceMove(card) + card.forceMove(get_turf(card)) canmove = 1 resting = 0 icon_state = "[chassis]" + src.forceMove(card) // No binary for pAIs. /mob/living/silicon/pai/binarycheck() diff --git a/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm b/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm index e9c192ddcd2..85284a594db 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm @@ -26,16 +26,33 @@ ..() /obj/item/modular_computer/wristbound/MouseDrop(obj/over_object) - var/mob/living/carbon/user = usr - if(!ishuman(user) || !issmall(user)) + if(!canremove) return - switch(over_object.name) - if(BP_R_HAND) - user.u_equip(src) - user.put_in_r_hand(src, FALSE) - if(BP_L_HAND) - user.u_equip(src) - user.put_in_l_hand(src, FALSE) + if(!over_object || over_object == src) + return + if(istype(over_object, /obj/screen/inventory)) + var/obj/screen/inventory/S = over_object + if(S.slot_id == equip_slot) + return + if(ishuman(usr)) + if(!(istype(over_object, /obj/screen))) + return ..() + + if(!(loc == usr) || (loc && loc.loc == usr)) + return + if(use_check_and_message(usr)) + return + if((loc == usr) && !usr.unEquip(src)) + return + + switch(over_object.name) + if(BP_R_HAND) + usr.u_equip(src) + usr.put_in_r_hand(src,FALSE) + if(BP_L_HAND) + usr.u_equip(src) + usr.put_in_l_hand(src,FALSE) + add_fingerprint(usr) /obj/item/modular_computer/wristbound/AltClick(mob/user) if(ishuman(user)) diff --git a/html/changelogs/alberyk-morefixes.yml b/html/changelogs/alberyk-morefixes.yml new file mode 100644 index 00000000000..f11513ed25e --- /dev/null +++ b/html/changelogs/alberyk-morefixes.yml @@ -0,0 +1,9 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed pAI creating a ghost card when folded." + - bugfix: "Fixed the tajaran candy not replacing the reagents after being cooked." + - bugfix: "Fixed a a medical borg icon facing the wrong direction." + - bugfix: "Fixed not being able to remove wrist computers by dragging them to a hand slot." diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index d152f9750cf..dc6b95e675a 100644 Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ