mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-14 00:26:02 +01:00
Magboot and glove fix (#19415)
* Magboot and glove fix * Update armblade.dm * Update leash.dm
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
..(user, slot)
|
||||
|
||||
/*
|
||||
/obj/item/storage/backpack/dropped(mob/user)
|
||||
/obj/item/storage/backpack/dropped(mob/user, equipping, slot)
|
||||
if (loc == user && src.use_sound)
|
||||
if(isbelly(user.loc))
|
||||
var/obj/belly/B = user.loc
|
||||
@@ -560,7 +560,7 @@
|
||||
var/taurtype = /datum/sprite_accessory/tail/taur/horse //Acceptable taur type to be wearing this
|
||||
var/no_message = "You aren't the appropriate taur type to wear this!"
|
||||
|
||||
/obj/item/storage/backpack/saddlebag/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
|
||||
/obj/item/storage/backpack/saddlebag/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
|
||||
if(..())
|
||||
if(istype(H) && istype(H.tail_style, taurtype))
|
||||
return 1
|
||||
@@ -586,7 +586,7 @@
|
||||
slowdown = 0.5 //And are slower, too...
|
||||
var/no_message = "You aren't the appropriate taur type to wear this!"
|
||||
|
||||
/obj/item/storage/backpack/saddlebag_common/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
|
||||
/obj/item/storage/backpack/saddlebag_common/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
|
||||
if(..())
|
||||
if(!istype(H))//Error, non HUMAN.
|
||||
log_runtime("[H] was not a valid human!")
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
/obj/item/storage/internal/attack_hand()
|
||||
return //make sure this is never picked up
|
||||
|
||||
/obj/item/storage/internal/mob_can_equip(M as mob, slot, disable_warning = FALSE)
|
||||
/obj/item/storage/internal/mob_can_equip(mob/M, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
|
||||
return 0 //make sure this is never picked up
|
||||
|
||||
//Helper procs to cleanly implement internal storages - storage items that provide inventory slots for other items.
|
||||
@@ -32,7 +32,7 @@
|
||||
//items that use internal storage have the option of calling this to emulate default storage MouseDrop behaviour.
|
||||
//returns 1 if the master item's parent's MouseDrop() should be called, 0 otherwise. It's strange, but no other way of
|
||||
//doing it without the ability to call another proc's parent, really.
|
||||
/obj/item/storage/internal/proc/handle_mousedrop(mob/user as mob, obj/over_object as obj)
|
||||
/obj/item/storage/internal/proc/handle_mousedrop(mob/user, obj/over_object)
|
||||
if (ishuman(user) || issmall(user)) //so monkeys can take off their backpacks -- Urist
|
||||
|
||||
if (istype(user.loc,/obj/mecha)) // stops inventory actions in a mech
|
||||
@@ -65,7 +65,7 @@
|
||||
//items that use internal storage have the option of calling this to emulate default storage attack_hand behaviour.
|
||||
//returns 1 if the master item's parent's attack_hand() should be called, 0 otherwise.
|
||||
//It's strange, but no other way of doing it without the ability to call another proc's parent, really.
|
||||
/obj/item/storage/internal/proc/handle_attack_hand(mob/user as mob)
|
||||
/obj/item/storage/internal/proc/handle_attack_hand(mob/user)
|
||||
|
||||
if(ishuman(user))
|
||||
var/mob/living/carbon/human/H = user
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/item/storage/laundry_basket/dropped(mob/user)
|
||||
/obj/item/storage/laundry_basket/dropped(mob/user, equipping, slot)
|
||||
if(linked)
|
||||
QDEL_NULL(linked)
|
||||
return ..()
|
||||
@@ -78,7 +78,7 @@
|
||||
name = "second hand"
|
||||
use_to_pickup = FALSE
|
||||
|
||||
/obj/item/storage/laundry_basket/offhand/dropped(mob/user)
|
||||
/obj/item/storage/laundry_basket/offhand/dropped(mob/user, equipping, slot)
|
||||
SHOULD_CALL_PARENT(FALSE)
|
||||
if(user.isEquipped(linked))
|
||||
user.drop_from_inventory(linked)
|
||||
|
||||
@@ -147,7 +147,7 @@
|
||||
user.AddComponent(/datum/component/recursive_move)
|
||||
RegisterSignal(user, COMSIG_MOVABLE_ATTEMPTED_MOVE, /obj/item/ore_bag/proc/autoload)
|
||||
|
||||
/obj/item/ore_bag/dropped(mob/user)
|
||||
/obj/item/ore_bag/dropped(mob/user, equipping, slot)
|
||||
..()
|
||||
UnregisterSignal(user, COMSIG_MOVABLE_ATTEMPTED_MOVE)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user