Refactor /mob/unEquip. (#27720)

* Refactor /mob/unEquip.

* fix things found in testing

* more fixes from testing

* fix removal of hooded suits

* fix flayers inability to deploy swarmprod

* fix changeling blade activation

* unnecessary parens

* pass default unequip args to proc overrides

* fix belts being able to forceMove into full hands
This commit is contained in:
warriorstar-orion
2025-01-10 01:58:35 +00:00
committed by GitHub
parent 17602326bc
commit 0eafad8475
213 changed files with 587 additions and 585 deletions
@@ -150,7 +150,7 @@
if(istype(I, /obj/item/honey_frame))
var/obj/item/honey_frame/HF = I
if(length(honey_frames) < BEEBOX_MAX_FRAMES)
if(!user.unEquip(HF))
if(!user.unequip(HF))
return
visible_message("<span class='notice'>[user] adds a frame to the apiary.</span>")
HF.forceMove(src)
@@ -165,7 +165,7 @@
return
var/obj/item/queen_bee/qb = I
if(!user.unEquip(qb))
if(!user.drop_item_to_ground(qb))
return
qb.queen.forceMove(src)
bees += qb.queen
+1 -1
View File
@@ -157,7 +157,7 @@
if(length(stored_plants) >= max_storable_plants)
to_chat(user, "<span class='warning'>[src] can't hold any more plants!</span>")
return
if(!user.unEquip(O))
if(!user.drop_item_to_ground(O))
return
O.forceMove(src)
+1 -1
View File
@@ -103,7 +103,7 @@
if(biomass >= biomass_capacity && potassium >= potassium_capacity)
to_chat(user, "<span class='warning'>[src] can't hold any more biomass, and its contents are saturated with potassium!</span>")
return
if(!user.unEquip(O))
if(!user.drop_item_to_ground(O))
return
O.forceMove(src)
+1 -1
View File
@@ -175,7 +175,7 @@
/obj/item/food/grown/shell/attack_self__legacy__attackchain(mob/user)
if(!do_after(user, 1.5 SECONDS, target = user))
return
user.unEquip(src)
user.unequip(src)
if(trash)
var/obj/item/T = generate_trash()
user.put_in_hands(T)
+1 -1
View File
@@ -134,7 +134,7 @@
/obj/item/food/grown/firelemon/proc/update_mob()
if(ismob(loc))
var/mob/M = loc
M.unEquip(src)
M.drop_item_to_ground(src)
/obj/item/food/grown/firelemon/ex_act(severity)
qdel(src) //Ensuring that it's deleted by its own explosion
-1
View File
@@ -42,7 +42,6 @@
if(W.sharp)
to_chat(user, "<span class='notice'>You use [W] to fashion a pipe out of the corn cob!</span>")
new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc)
user.unEquip(src)
qdel(src)
return
else
@@ -244,7 +244,6 @@
force -= rand(1, (force / 3) + 1)
else
to_chat(usr, "<span class='warning'>All the petals have fallen off [src] from violent whacking!</span>")
usr.unEquip(src)
qdel(src)
/obj/item/grown/novaflower/pickup(mob/living/carbon/human/user)
+1 -1
View File
@@ -76,7 +76,7 @@
force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off
else
to_chat(usr, "All the leaves have fallen off the nettle from violent whacking.")
usr.unEquip(src)
usr.unequip(src)
qdel(src)
/obj/item/grown/nettle/basic
+1 -1
View File
@@ -43,7 +43,7 @@
to_chat(user, "<span class='notice'>You cut the potato into wedges with [W].</span>")
var/obj/item/food/grown/potato/wedges/Wedges = new /obj/item/food/grown/potato/wedges
if(!remove_item_from_storage(user))
user.unEquip(src)
user.unequip(src)
user.put_in_hands(Wedges)
qdel(src)
else
+1 -1
View File
@@ -36,7 +36,7 @@
to_chat(user, "<span class='notice'>You sharpen the carrot into a shiv with [I].</span>")
var/obj/item/kitchen/knife/shiv/carrot/Shiv = new ()
if(!remove_item_from_storage(user))
user.unEquip(src)
user.unequip(src)
user.put_in_hands(Shiv)
qdel(src)
else
+1 -1
View File
@@ -152,7 +152,7 @@
K.health = K.maxHealth
K.visible_message("<span class='notice'>The Killer Tomato growls as it suddenly awakens.</span>")
if(user)
user.unEquip(src)
user.unequip(src)
message_admins("[key_name_admin(user)] released a killer tomato at [ADMIN_COORDJMP(T)]")
log_game("[key_name(user)] released a killer tomato at [COORD(T)]")
qdel(src)
+1 -1
View File
@@ -70,7 +70,7 @@
if(leaf.dry)
user.show_message("<span class='notice'>You wrap \the [W] around the log, turning it into a torch!</span>")
var/obj/item/flashlight/flare/torch/T = new /obj/item/flashlight/flare/torch(user.loc)
usr.unEquip(W)
user.unequip(leaf)
usr.put_in_active_hand(T)
qdel(leaf)
qdel(src)
+1 -1
View File
@@ -831,7 +831,7 @@
if(!myseed)
if(istype(O, /obj/item/seeds/kudzu))
investigate_log("had Kudzu planted in it by [key_name(user)] at ([x],[y],[z])","kudzu")
user.unEquip(O)
user.unequip(O)
to_chat(user, "<span class='notice'>You plant [O].</span>")
dead = FALSE
myseed = O
+1 -1
View File
@@ -20,7 +20,7 @@
if(!original_seed)
return FALSE
if(user && !user.unEquip(source_item, silent = TRUE)) //couldn't drop the item
if(user && !user.drop_item_to_ground(source_item, silent = TRUE)) //couldn't drop the item
return FALSE
if(seed_count == -1)