mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-16 17:44:25 +01:00
Magboot and glove fix (#19415)
* Magboot and glove fix * Update armblade.dm * Update leash.dm
This commit is contained in:
@@ -18,7 +18,9 @@
|
||||
pickup_sound = 'sound/items/pickup/device.ogg'
|
||||
drop_sound = 'sound/items/drop/device.ogg'
|
||||
|
||||
/obj/item/chameleon/dropped(mob/user)
|
||||
/obj/item/chameleon/dropped(mob/user, equipping, slot)
|
||||
if(equipping)
|
||||
return ..()
|
||||
disrupt()
|
||||
..()
|
||||
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
|
||||
RegisterSignal(user, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation))
|
||||
|
||||
/obj/item/geiger/dropped(mob/user)
|
||||
/obj/item/geiger/dropped(mob/user, equipping, slot)
|
||||
. = ..()
|
||||
|
||||
UnregisterSignal(user, COMSIG_IN_RANGE_OF_IRRADIATION)
|
||||
|
||||
@@ -81,7 +81,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
|
||||
. = ..()
|
||||
update_holder()
|
||||
|
||||
/obj/item/gps/dropped(mob/user)
|
||||
/obj/item/gps/dropped(mob/user, equipping, slot)
|
||||
. = ..()
|
||||
update_holder()
|
||||
|
||||
|
||||
@@ -360,7 +360,7 @@
|
||||
|
||||
return 0
|
||||
|
||||
/obj/item/personal_shield_generator/dropped(mob/user)
|
||||
/obj/item/personal_shield_generator/dropped(mob/user, equipping, slot)
|
||||
..()
|
||||
reattach_gun(user) //A gun attached to a base unit should never exist outside of their base unit or the mob equipping the base unit
|
||||
|
||||
@@ -432,7 +432,7 @@
|
||||
return 0
|
||||
return 1
|
||||
|
||||
/obj/item/gun/energy/gun/generator/dropped(mob/user)
|
||||
/obj/item/gun/energy/gun/generator/dropped(mob/user, equipping, slot)
|
||||
..() //update twohanding
|
||||
if(shield_generator)
|
||||
shield_generator.reattach_gun(user)
|
||||
|
||||
@@ -133,7 +133,9 @@
|
||||
|
||||
user_client = new_client
|
||||
|
||||
/obj/item/t_scanner/dropped(mob/user)
|
||||
/obj/item/t_scanner/dropped(mob/user, equipping, slot)
|
||||
if(equipping)
|
||||
return ..()
|
||||
set_user_client(null)
|
||||
..()
|
||||
|
||||
|
||||
@@ -333,8 +333,8 @@
|
||||
.=..()
|
||||
icon_state = "sucker-[vac_power]"
|
||||
|
||||
/obj/item/vac_attachment/dropped(mob/user as mob)
|
||||
.=..()
|
||||
/obj/item/vac_attachment/dropped(mob/user, equipping, slot)
|
||||
. = ..()
|
||||
icon_state = "sucker_drop"
|
||||
|
||||
/obj/item/vac_attachment/verb/hide_pack()
|
||||
|
||||
Reference in New Issue
Block a user