mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 06:40:08 +01:00
[MIRROR] some dropped sanity (#9856)
Co-authored-by: Cameron Lennox <killer65311@gmail.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Cameron Lennox
Kashargul
parent
6ba6be650c
commit
2d0719a4d4
@@ -49,6 +49,7 @@
|
||||
|
||||
/obj/item/oldtwohanded/dropped(mob/user as mob)
|
||||
//handles unwielding a twohanded weapon when dropped as well as clearing up the offhand
|
||||
..()
|
||||
if(user)
|
||||
var/obj/item/oldtwohanded/O = user.get_inactive_hand()
|
||||
if(istype(O))
|
||||
|
||||
@@ -2281,7 +2281,8 @@ Departamental Swimsuits, for general use
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
update_clothing_icon()
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/dropped()
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/dropped(mob/user)
|
||||
..()
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/proc/colorswap(mob/user)
|
||||
|
||||
@@ -941,8 +941,9 @@
|
||||
H.update_inv_wear_suit()
|
||||
hood.forceMove(src)
|
||||
|
||||
/obj/item/clothing/suit/storage/toggle/hoodiebuttoned/dropped()
|
||||
/obj/item/clothing/suit/storage/toggle/hoodiebuttoned/dropped(mob/living/user)
|
||||
RemoveHood()
|
||||
..()
|
||||
|
||||
/obj/item/clothing/suit/storage/toggle/hoodiebuttoned/proc/ToggleHood()
|
||||
if(!suittoggled)
|
||||
|
||||
@@ -960,7 +960,7 @@
|
||||
else
|
||||
set_light(0)
|
||||
|
||||
/obj/item/melee/baton/fluff/stunstaff/dropped()
|
||||
/obj/item/melee/baton/fluff/stunstaff/dropped(mob/user)
|
||||
..()
|
||||
if(wielded)
|
||||
wielded = 0
|
||||
@@ -1074,7 +1074,7 @@
|
||||
allowed = list(/obj/item/shield/fluff/wolfgirlshield)
|
||||
damtype = HALLOSS
|
||||
|
||||
/obj/item/melee/fluffstuff/wolfgirlsword/dropped(var/mob/user)
|
||||
/obj/item/melee/fluffstuff/wolfgirlsword/dropped(mob/user)
|
||||
..()
|
||||
if(!istype(loc,/mob))
|
||||
deactivate(user)
|
||||
|
||||
Reference in New Issue
Block a user