Bugfixes: wrist computers, candy reagent, pAI double cards and borg icon (#8719)

-fixes being unable to remove wrist computers by click and dragging
-fixes tajara candy not replacing reagents
-fixes pai being carded/killed creating extra cards
-fixes a borg icon having a wrong direction
This commit is contained in:
Alberyk
2020-04-22 05:36:34 -03:00
committed by GitHub
parent a9514e19ed
commit cbca45cb93
5 changed files with 39 additions and 16 deletions

View File

@@ -594,6 +594,7 @@
appliance = OVEN appliance = OVEN
fruit = list("sugartree" = 2) fruit = list("sugartree" = 2)
reagents = list("fatshouter_milk" = 5, "egg" = 3) reagents = list("fatshouter_milk" = 5, "egg" = 3)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list( items = list(
/obj/item/reagent_containers/food/snacks/dough /obj/item/reagent_containers/food/snacks/dough
) )

View File

@@ -198,12 +198,7 @@
return 0 return 0
/mob/living/silicon/pai/restrained() /mob/living/silicon/pai/restrained()
if(istype(src.loc,/obj/item/device/paicard)) return !istype(loc, /obj/item/device/paicard) && ..()
return 0
..()
/mob/living/silicon/pai/MouseDrop(atom/over_object)
return
/mob/living/silicon/pai/emp_act(severity) /mob/living/silicon/pai/emp_act(severity)
// Silence for 2 minutes // Silence for 2 minutes
@@ -477,11 +472,12 @@
src.forceMove(get_turf(H)) src.forceMove(get_turf(H))
// Move us into the card and move the card to the ground. // Move us into the card and move the card to the ground.
src.forceMove(card)
card.forceMove(get_turf(card)) card.forceMove(get_turf(card))
canmove = 1 canmove = 1
resting = 0 resting = 0
icon_state = "[chassis]" icon_state = "[chassis]"
src.forceMove(card)
// No binary for pAIs. // No binary for pAIs.
/mob/living/silicon/pai/binarycheck() /mob/living/silicon/pai/binarycheck()

View File

@@ -26,16 +26,33 @@
..() ..()
/obj/item/modular_computer/wristbound/MouseDrop(obj/over_object) /obj/item/modular_computer/wristbound/MouseDrop(obj/over_object)
var/mob/living/carbon/user = usr if(!canremove)
if(!ishuman(user) || !issmall(user))
return return
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) switch(over_object.name)
if(BP_R_HAND) if(BP_R_HAND)
user.u_equip(src) usr.u_equip(src)
user.put_in_r_hand(src, FALSE) usr.put_in_r_hand(src,FALSE)
if(BP_L_HAND) if(BP_L_HAND)
user.u_equip(src) usr.u_equip(src)
user.put_in_l_hand(src, FALSE) usr.put_in_l_hand(src,FALSE)
add_fingerprint(usr)
/obj/item/modular_computer/wristbound/AltClick(mob/user) /obj/item/modular_computer/wristbound/AltClick(mob/user)
if(ishuman(user)) if(ishuman(user))

View File

@@ -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."

Binary file not shown.

Before

Width:  |  Height:  |  Size: 506 KiB

After

Width:  |  Height:  |  Size: 506 KiB