mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
Removes/Refactors /mob/unEquip (#22918)
* Part1 * IT COMPILES!!!! * Fuck wait this was missing from that last * Update handlabeler.dm * Update handlabeler.dm * Fixes n shit * Fix this * Fixes #23310 * Fucking @RemieRichards was right * Fixes devil unEquip * WTF ARE BITFLAGS? * THERES THE FUCKING PROBLEM * Fixes
This commit is contained in:
@@ -419,7 +419,7 @@
|
||||
var/forename = names.len > 1 ? names[2] : names[1]
|
||||
var/newname = "[forename]-[pick(honorifics["[H.gender]"])]"
|
||||
H.fully_replace_character_name(H.real_name,newname)
|
||||
H.unEquip(H.w_uniform)
|
||||
H.temporarilyRemoveItemFromInventory(H.w_uniform, TRUE)
|
||||
H.equip_to_slot_or_del(I, slot_w_uniform)
|
||||
I.flags |= NODROP
|
||||
else
|
||||
|
||||
@@ -1347,12 +1347,7 @@
|
||||
return
|
||||
|
||||
for(var/obj/item/I in M)
|
||||
M.unEquip(I)
|
||||
if(I)
|
||||
I.loc = M.loc
|
||||
I.layer = initial(I.layer)
|
||||
I.plane = initial(I.plane)
|
||||
I.dropped(M)
|
||||
M.dropItemToGround(I, TRUE)
|
||||
|
||||
M.Paralyse(5)
|
||||
sleep(5)
|
||||
@@ -1378,12 +1373,7 @@
|
||||
return
|
||||
|
||||
for(var/obj/item/I in M)
|
||||
M.unEquip(I)
|
||||
if(I)
|
||||
I.loc = M.loc
|
||||
I.layer = initial(I.layer)
|
||||
I.plane = initial(I.plane)
|
||||
I.dropped(M)
|
||||
M.dropItemToGround(I, TRUE)
|
||||
|
||||
M.Paralyse(5)
|
||||
sleep(5)
|
||||
@@ -1432,12 +1422,7 @@
|
||||
return
|
||||
|
||||
for(var/obj/item/I in M)
|
||||
M.unEquip(I)
|
||||
if(I)
|
||||
I.loc = M.loc
|
||||
I.layer = initial(I.layer)
|
||||
I.plane = initial(I.plane)
|
||||
I.dropped(M)
|
||||
M.dropItemToGround(I, TRUE)
|
||||
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/observer = M
|
||||
|
||||
@@ -101,7 +101,7 @@ var/highlander = FALSE
|
||||
var/obj/item/slot_item_ID = H.get_item_by_slot(slot_wear_id)
|
||||
qdel(slot_item_ID)
|
||||
var/obj/item/slot_item_hand = H.get_item_for_held_index(2)
|
||||
H.unEquip(slot_item_hand)
|
||||
H.dropItemToGround(slot_item_hand)
|
||||
|
||||
var /obj/item/weapon/multisword/multi = new(H)
|
||||
H.put_in_hands_or_del(multi)
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
return
|
||||
|
||||
for(var/obj/item/W in M)
|
||||
if(!M.unEquip(W))
|
||||
if(!M.dropItemToGround(W))
|
||||
qdel(W)
|
||||
M.regenerate_icons()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user