diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm
index 24ce0beb68b..4442d3a2eca 100644
--- a/code/datums/diseases/wizarditis.dm
+++ b/code/datums/diseases/wizarditis.dm
@@ -60,21 +60,21 @@ STI KALY - blind
var/mob/living/carbon/human/H = affected_mob
if(prob(chance))
if(!istype(H.head, /obj/item/clothing/head/wizard))
- if(!H.u_equip(H.head))
+ if(!H.unEquip(H.head))
del H.head
H.head = new /obj/item/clothing/head/wizard(H)
H.head.layer = 20
return
if(prob(chance))
if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe))
- if(!H.u_equip(H.wear_suit))
+ if(!H.unEquip(H.wear_suit))
del H.wear_suit
H.wear_suit = new /obj/item/clothing/suit/wizrobe(H)
H.wear_suit.layer = 20
return
if(prob(chance))
if(!istype(H.shoes, /obj/item/clothing/shoes/sandal))
- if(!H.u_equip(H.shoes))
+ if(!H.unEquip(H.shoes))
del H.shoes
H.shoes = new /obj/item/clothing/shoes/sandal(H)
H.shoes.layer = 20
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 36c5653f130..7f70eac12f3 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -877,7 +877,7 @@ datum/mind
switch(href_list["common"])
if("undress")
for(var/obj/item/W in current)
- current.u_equip(W, 1) //The 1 forces all items to drop, since this is an admin undress.
+ current.unEquip(W, 1) //The 1 forces all items to drop, since this is an admin undress.
if("takeuplink")
take_uplink()
memory = null//Remove any memory they may have had.
diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm
index a9dcdc7b674..783340e2c9b 100644
--- a/code/datums/spells/horsemask.dm
+++ b/code/datums/spells/horsemask.dm
@@ -35,7 +35,7 @@
magichead.voicechange = 1 //NEEEEIIGHH
target.visible_message( "[target]'s face lights up in fire, and after the event a horse's head takes its place!", \
"Your face burns up, and shortly after the fire you realise you have the face of a horse!")
- if(!target.u_equip(target.wear_mask))
+ if(!target.unEquip(target.wear_mask))
del target.wear_mask
target.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1)
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index bd50deb227b..5f0403d3583 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -811,7 +811,7 @@ var/list/sacrificed = list()
cultist.legcuffed = null
cultist.update_inv_legcuffed(0)
if (istype(cultist.wear_mask, /obj/item/clothing/mask/muzzle))
- cultist.u_equip(cultist.wear_mask)
+ cultist.unEquip(cultist.wear_mask)
if(istype(cultist.loc, /obj/structure/closet)&&cultist.loc:welded)
cultist.loc:welded = 0
if(istype(cultist.loc, /obj/structure/closet/secure_closet)&&cultist.loc:locked)
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index 51f3e43e8a2..1de83394304 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -107,7 +107,7 @@
U << "\red Capture failed!: \black The soul stone is full! Use or free an existing soul to make room."
else
for(var/obj/item/W in T)
- T.u_equip(W)
+ T.unEquip(W)
new /obj/effect/decal/remains/human(T.loc) //Spawns a skeleton
T.invisibility = 101
var/atom/movable/overlay/animation = new /atom/movable/overlay( T.loc )
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index 62bd485e004..15eb3d7fc43 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -475,7 +475,7 @@
magichead.flags |= NODROP //curses!
magichead.flags_inv = null //so you can still see their face
magichead.voicechange = 1 //NEEEEIIGHH
- if(!user.u_equip(user.wear_mask))
+ if(!user.unEquip(user.wear_mask))
del user.wear_mask
user.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1)
del src
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index eb072a7aeb5..415b59d27f3 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -232,7 +232,7 @@ var/global/list/autolathe_recipes_hidden = list( \
flick("autolathe_r",src)//plays glass insertion animation
stack.use(amount)
else
- if(!user.u_equip(O))
+ if(!user.unEquip(O))
user << "/the [O] is stuck to your hand, you put it in \the [src]!"
O.loc = src
icon_state = "autolathe"
diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm
index c6f29a0b8ad..28701bf2f29 100644
--- a/code/game/machinery/bots/cleanbot.dm
+++ b/code/game/machinery/bots/cleanbot.dm
@@ -336,7 +336,7 @@ text("[src.oddbutton ? "Yes" : "No"
var/obj/machinery/bot/cleanbot/A = new /obj/machinery/bot/cleanbot(T)
A.name = src.created_name
user << "You add the robot arm to the bucket and sensor assembly. Beep boop!"
- user.u_equip(src)
+ user.unEquip(src)
del(src)
else if (istype(W, /obj/item/weapon/pen))
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index cf753348b64..16d493a0738 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -1015,7 +1015,7 @@ Auto Patrol: []"},
new /obj/machinery/bot/ed209(T,created_name,lasercolor)
user.drop_item()
del(W)
- user.u_equip(src)
+ user.unEquip(src)
del(src)
diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm
index 51fcd8c9c52..d444c935c75 100644
--- a/code/game/machinery/bots/floorbot.dm
+++ b/code/game/machinery/bots/floorbot.dm
@@ -404,7 +404,7 @@
var/obj/item/weapon/toolbox_tiles/B = new /obj/item/weapon/toolbox_tiles
user.put_in_hands(B)
user << "You add the tiles into the empty toolbox. They protrude from the top."
- user.u_equip(src)
+ user.unEquip(src)
del(src)
/obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob)
@@ -415,7 +415,7 @@
B.created_name = src.created_name
user.put_in_hands(B)
user << "You add the sensor to the toolbox and tiles!"
- user.u_equip(src)
+ user.unEquip(src)
del(src)
else if (istype(W, /obj/item/weapon/pen))
@@ -435,7 +435,7 @@
var/obj/machinery/bot/floorbot/A = new /obj/machinery/bot/floorbot(T)
A.name = src.created_name
user << "You add the robot arm to the odd looking toolbox assembly! Boop beep!"
- user.u_equip(src)
+ user.unEquip(src)
del(src)
else if (istype(W, /obj/item/weapon/pen))
var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name)
diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm
index a58583e8968..edad537fb88 100644
--- a/code/game/machinery/bots/medbot.dm
+++ b/code/game/machinery/bots/medbot.dm
@@ -554,7 +554,7 @@
del(S)
user.put_in_hands(A)
user << "You add the robot arm to the first aid kit."
- user.u_equip(src)
+ user.unEquip(src)
del(src)
@@ -588,6 +588,6 @@
var/obj/machinery/bot/medbot/S = new /obj/machinery/bot/medbot(T)
S.skin = src.skin
S.name = src.created_name
- user.u_equip(src)
+ user.unEquip(src)
del(src)
diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index 38a982850a0..4e51474db1b 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -706,7 +706,7 @@ Auto Patrol: []"},
var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly
user.put_in_hands(A)
user << "You add the signaler to the helmet."
- user.u_equip(src)
+ user.unEquip(src)
del(src)
else
return
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index 19ba118f1e2..20388525a1b 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -200,7 +200,7 @@
if(isobj(obj))
var/mob/M = obj.loc
if(ismob(M))
- M.u_equip(obj, 1) //Holoweapons should always drop.
+ M.unEquip(obj, 1) //Holoweapons should always drop.
if(!silent)
var/obj/oldobj = obj
diff --git a/code/game/machinery/drying_rack.dm b/code/game/machinery/drying_rack.dm
index f3c8f86f32d..5aca81bae35 100644
--- a/code/game/machinery/drying_rack.dm
+++ b/code/game/machinery/drying_rack.dm
@@ -36,7 +36,7 @@
if(ispath(T,/obj/item/weapon/reagent_containers/food/snacks/grown))
if(P.dry == 0)
P.reagents.trans_to(src, P.reagents.total_volume)
- if(!user.u_equip(I))
+ if(!user.unEquip(I))
user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
user << "You add the [I] to the drying rack."
del(I)
@@ -57,7 +57,7 @@
else
user << "That has already been dried."
else
- if(!user.u_equip(I))
+ if(!user.unEquip(I))
user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
user << "You add the [I] to the drying rack."
del(I)
@@ -71,7 +71,7 @@
src.running = 0
else
var/N = S.dried_type
- if(!user.u_equip(I))
+ if(!user.unEquip(I))
user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
user << "You add the [I] to the drying rack."
del(I)
diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm
index 107141d40b2..c2b3fbbc0dc 100644
--- a/code/game/machinery/kitchen/juicer.dm
+++ b/code/game/machinery/kitchen/juicer.dm
@@ -40,7 +40,7 @@
if (beaker)
return 1
else
- if(!user.u_equip(O))
+ if(!user.unEquip(O))
user << "\the [O] is stuck to your hand, you cannot put it in \the [src]"
return 0
O.loc = src
@@ -52,7 +52,7 @@
if (!is_type_in_list(O, allowed_items))
user << "It looks as not containing any juice."
return 1
- if(!user.u_equip(O))
+ if(!user.unEquip(O))
user << "\the [O] is stuck to your hand, you cannot put it in \the [src]"
return 0
O.loc = src
diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm
index 33e5a981e56..ee94da729d7 100644
--- a/code/game/machinery/kitchen/microwave.dm
+++ b/code/game/machinery/kitchen/microwave.dm
@@ -146,7 +146,7 @@
"\blue [user] has added one of [O] to \the [src].", \
"\blue You add one of [O] to \the [src].")
else
- // user.u_equip(O) //This just causes problems so far as I can tell. -Pete
+ // user.unEquip(O) //This just causes problems so far as I can tell. -Pete
if(!user.drop_item())
user << "\the [O] is stuck to your hand, you cannot put it in \the [src]"
return 0
diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm
index 49abaa9ea65..38417931b24 100644
--- a/code/game/machinery/kitchen/smartfridge.dm
+++ b/code/game/machinery/kitchen/smartfridge.dm
@@ -101,7 +101,7 @@
/obj/machinery/smartfridge/proc/load(var/obj/item/O as obj)
if(istype(O.loc,/mob))
var/mob/M = O.loc
- if(!M.u_equip(O))
+ if(!M.unEquip(O))
usr << "\the [O] is stuck to your hand, you cannot put it in \the [src]"
return
else if(istype(O.loc,/obj/item/weapon/storage))
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 5d92870b94a..60f45f09553 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -657,7 +657,7 @@
M:amount -= 2
icon_state = "turret_frame2"
if(M.amount <= 0)
- user.u_equip(M, 1) //We're deleting it anyway, so no point in having NODROP fuck shit up.
+ user.unEquip(M, 1) //We're deleting it anyway, so no point in having NODROP fuck shit up.
del(M)
else
user << "You need two sheets of metal for that."
@@ -705,7 +705,7 @@
gun_charge = E.power_supply.charge //the gun's charge is stored in gun_charge
user << "You add [I] to the turret."
build_step = 4
- if(!user.u_equip(I))
+ if(!user.unEquip(I))
user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
return
del(I) //delete the gun :(
@@ -721,7 +721,7 @@
if(isprox(I))
build_step = 5
user << "You add the prox sensor to the turret."
- if(!user.u_equip(I))
+ if(!user.unEquip(I))
user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
return
del(I)
@@ -746,7 +746,7 @@
build_step = 7
M.amount -= 2
if(M.amount <= 0)
- user.u_equip(M)
+ user.unEquip(M)
del(M)
else
user << "You need two sheets of metal for that."
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index 02cee3517cc..e20f4641efb 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -138,7 +138,7 @@ var/const/SAFETY_COOLDOWN = 100
// Remove and recycle the equipped items.
for(var/obj/item/I in L.get_equipped_items())
- L.u_equip(I)
+ L.unEquip(I)
recycle(I, 0)
// Instantly lie down, also go unconscious from the pain, before you die.
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index d177169e773..cf2bb2cfb18 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -28,7 +28,7 @@
if(istype(I, /obj/item/device/gps))
var/obj/item/device/gps/L = I
if(L.locked_location && !(stat & (NOPOWER|BROKEN)))
- user.u_equip(L)
+ user.unEquip(L)
L.loc = src
locked = L
user << "You insert the GPS device into the [name]'s slot."
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 62140bcdbc2..64f07efe74b 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -140,7 +140,7 @@
var/mob/living/carbon/human/H = M
if(isobj(H.shoes))
var/thingy = H.shoes
- H.u_equip(H.shoes)
+ H.unEquip(H.shoes)
walk_away(thingy,chassis,15,2)
spawn(20)
if(thingy)
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index d5e76014f0a..d5cf6410c43 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -755,7 +755,7 @@
return
else if(istype(W, /obj/item/mecha_parts/mecha_tracking))
- user.u_equip(W)
+ user.unEquip(W)
W.forceMove(src)
user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src]")
return
@@ -1038,7 +1038,7 @@
else if(mmi_as_oc.brainmob.stat)
user << "Beta-rhythm below acceptable level."
return 0
- user.u_equip(mmi_as_oc)
+ user.unEquip(mmi_as_oc)
var/mob/brainmob = mmi_as_oc.brainmob
brainmob.reset_view(src)
/*
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 2266cedcbf3..37b41146477 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -127,7 +127,7 @@
src.throwing = 0
if (loc == user)
- if(!user.u_equip(src))
+ if(!user.unEquip(src))
return
else
if(isliving(loc))
@@ -148,7 +148,7 @@
M.client.screen -= src
src.throwing = 0
if (src.loc == user)
- if(!user.u_equip(src))
+ if(!user.unEquip(src))
return
else
if(istype(src.loc, /mob/living))
@@ -165,7 +165,7 @@
if(!A.has_fine_manipulation || w_class >= 4)
if(src in A.contents) // To stop Aliens having items stuck in their pockets
- A.u_equip(src)
+ A.unEquip(src)
user << "Your claws aren't capable of such fine manipulation."
return
attack_paw(A)
diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm
index c29bcf69d7e..66d9bbb03f6 100644
--- a/code/game/objects/items/candle.dm
+++ b/code/game/objects/items/candle.dm
@@ -65,7 +65,7 @@
new/obj/item/trash/candle(src.loc)
if(istype(src.loc, /mob))
var/mob/M = src.loc
- M.u_equip(src)
+ M.unEquip(src)
del(src)
update_icon()
if(istype(loc, /turf)) //start a fire if possible
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index f5a534e5fcd..ba51811a6c4 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -28,12 +28,12 @@
var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user )
A.icon = 'icons/obj/assemblies.dmi'
- user.u_equip(W)
+ user.unEquip(W)
W.loc = A
W.master = A
A.part1 = W
- user.u_equip(src)
+ user.unEquip(src)
loc = A
master = A
A.part2 = src
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index d9524d76e29..f739b443630 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -103,7 +103,7 @@
user << "You armed the robot frame"
W:use(1)
if (user.get_inactive_hand()==src)
- user.u_equip(src)
+ user.unEquip(src)
user.put_in_inactive_hand(B)
del(src)
if(istype(W, /obj/item/robot_parts/l_leg))
diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm
index a01cebe4dab..ca76833dfc9 100644
--- a/code/game/objects/items/stacks/sheets/light.dm
+++ b/code/game/objects/items/stacks/sheets/light.dm
@@ -21,18 +21,18 @@
var/obj/item/stack/sheet/glass/G = new (user.loc)
G.add_fingerprint(user)
if(amount <= 0)
- user.u_equip(src)
+ user.unEquip(src)
del(src)
if(istype(O,/obj/item/stack/sheet/metal))
var/obj/item/stack/sheet/metal/M = O
M.amount--
if(M.amount <= 0)
- user.u_equip(M)
+ user.unEquip(M)
del(M)
amount--
var/obj/item/stack/tile/light/L = new (user.loc)
L.add_fingerprint(user)
if(amount <= 0)
- user.u_equip(src)
+ user.unEquip(src)
del(src)
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index faebc3f2fdd..3681b701915 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -122,7 +122,7 @@
if (src.amount<=0)
var/oldsrc = src
src = null //dont kill proc after del()
- usr.u_equip(oldsrc)
+ usr.unEquip(oldsrc)
del(oldsrc)
if (istype(O,/obj/item))
usr.put_in_hands(O)
@@ -144,7 +144,7 @@
var/oldsrc = src
src = null //dont kill proc after del()
if(usr)
- usr.u_equip(oldsrc)
+ usr.unEquip(oldsrc)
del(oldsrc)
return
diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm
index 716956fca9a..d9b413a2309 100644
--- a/code/game/objects/items/stacks/tiles/light.dm
+++ b/code/game/objects/items/stacks/tiles/light.dm
@@ -32,5 +32,5 @@
amount--
new/obj/item/stack/light_w(user.loc)
if(amount <= 0)
- user.u_equip(src)
+ user.unEquip(src)
del(src)
\ No newline at end of file
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index cdb5c126666..fa258c95d69 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -345,8 +345,8 @@
if(hacked) // That's right, we'll only check the "original" "sword".
newSaber.hacked = 1
newSaber.item_color = "rainbow"
- user.u_equip(W)
- user.u_equip(src)
+ user.unEquip(W)
+ user.unEquip(src)
del(W)
del(src)
else if(istype(W, /obj/item/device/multitool))
@@ -654,7 +654,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/use
if(istype(C))
if(C.parentdeck == src)
src.cards += C.cardname
- user.u_equip(C)
+ user.unEquip(C)
user.visible_message("[user] adds a card to the bottom of the deck.","You add the card to the bottom of the deck.")
del(C)
else
@@ -672,7 +672,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user)
if(istype(C))
if(C.parentdeck == src)
src.cards += C.currenthand
- user.u_equip(C)
+ user.unEquip(C)
user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.")
del(C)
else
@@ -696,11 +696,11 @@ obj/item/toy/cards/deck/MouseDrop(atom/over_object)
else if(istype(over_object, /obj/screen))
switch(over_object.name)
if("r_hand")
- M.u_equip(src)
+ M.unEquip(src)
M.put_in_r_hand(src)
usr << "You pick up the deck."
if("l_hand")
- M.u_equip(src)
+ M.unEquip(src)
M.put_in_l_hand(src)
usr << "You pick up the deck."
else
@@ -764,7 +764,7 @@ obj/item/toy/cards/cardhand/Topic(href, href_list)
N.parentdeck = src.parentdeck
N.cardname = src.currenthand[1]
N.apply_card_vars(N,O)
- cardUser.u_equip(src)
+ cardUser.unEquip(src)
N.pickup(cardUser)
cardUser.put_in_any_hand_if_possible(N)
cardUser << "You also take [currenthand[1]] and hold it."
@@ -776,7 +776,7 @@ obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living
if(istype(C))
if(C.parentdeck == src.parentdeck)
src.currenthand += C.cardname
- user.u_equip(C)
+ user.unEquip(C)
user.visible_message("[user] adds a card to their hand.", "You add the [C.cardname] to your hand.")
interact(user)
if(currenthand.len > 4)
@@ -852,7 +852,7 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user)
H.currenthand += src.cardname
H.parentdeck = C.parentdeck
H.apply_card_vars(H,C)
- user.u_equip(C)
+ user.unEquip(C)
H.pickup(user)
user.put_in_active_hand(H)
user << "You combine the [C.cardname] and the [src.cardname] into a hand."
@@ -865,7 +865,7 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user)
var/obj/item/toy/cards/cardhand/H = I
if(H.parentdeck == parentdeck)
H.currenthand += cardname
- user.u_equip(src)
+ user.unEquip(src)
user.visible_message("[user] adds a card to \his hand.", "You add the [cardname] to your hand.")
H.interact(user)
if(H.currenthand.len > 4)
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 3f41470daf5..f860a97ad22 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -153,7 +153,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
e.start()
if(ismob(loc))
var/mob/M = loc
- M.u_equip(src)
+ M.unEquip(src)
del(src)
return
if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently
@@ -162,7 +162,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
e.start()
if(ismob(loc))
var/mob/M = loc
- M.u_equip(src)
+ M.unEquip(src)
del(src)
return
flags &= ~NOREACT // allowing reagents to react after being lit
@@ -203,7 +203,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
processing_objects.Remove(src)
if(ismob(loc))
M << "Your [name] goes out."
- M.u_equip(src) //un-equip it so the overlays can update
+ M.unEquip(src) //un-equip it so the overlays can update
M.update_inv_wear_mask(0)
del(src)
return
@@ -527,8 +527,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(istype(target, /obj/item/weapon/reagent_containers/food/snacks/grown))
var/obj/item/weapon/reagent_containers/food/snacks/grown/O = target
if(O.dry)
- user.u_equip(target)
- user.u_equip(src)
+ user.unEquip(target)
+ user.unEquip(src)
var/obj/item/clothing/mask/cigarette/rollie/R = new /obj/item/clothing/mask/cigarette/rollie(user.loc)
R.chem_volume = target.reagents.total_volume
target.reagents.trans_to(R, R.chem_volume)
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index 96cfa0098f5..5f4248fb607 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -69,7 +69,7 @@
if(!ispath(gift_type,/obj/item)) return
var/obj/item/I = new gift_type(M)
- M.u_equip(src)
+ M.unEquip(src)
M.put_in_hands(I)
I.add_fingerprint(M)
del(src)
diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm
index 24cc00270d2..4e91980da02 100644
--- a/code/game/objects/items/weapons/grenades/ghettobomb.dm
+++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm
@@ -5,8 +5,8 @@
if(istype(I, /obj/item/device/assembly/igniter))
var/obj/item/device/assembly/igniter/G = I
var/obj/item/weapon/grenade/iedcasing/W = new /obj/item/weapon/grenade/iedcasing
- user.u_equip(G)
- user.u_equip(src)
+ user.unEquip(G)
+ user.unEquip(src)
user.put_in_hands(W)
user << "You stuff the [I] in the [src], emptying the contents beforehand."
W.underlays += image(src.icon, icon_state = src.icon_state)
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 2857d6fdc6b..97a5cc64269 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -78,7 +78,7 @@
/obj/item/weapon/grenade/proc/update_mob()
if(ismob(loc))
var/mob/M = loc
- M.u_equip(src)
+ M.unEquip(src)
/obj/item/weapon/grenade/attackby(obj/item/weapon/W as obj, mob/user as mob)
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index d7a82c0fc11..a9c6b1a0e95 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -94,7 +94,7 @@
var/obj/item/weapon/wirerod/W = new /obj/item/weapon/wirerod
R.use(1)
- user.u_equip(src)
+ user.unEquip(src)
user.put_in_hands(W)
user << "You wrap the cable restraint around the top of the rod."
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index a53c49f5705..e2b18860086 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -111,8 +111,8 @@
if(src.hacked) // That's right, we'll only check the "original" esword.
newSaber.hacked = 1
newSaber.item_color = "rainbow"
- user.u_equip(W)
- user.u_equip(src)
+ user.unEquip(W)
+ user.unEquip(src)
del(W)
del(src)
else if(istype(W, /obj/item/device/multitool))
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 5bf51c920a0..744d8df3677 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -164,7 +164,7 @@
break
if(!inserted || !S.amount)
- usr.u_equip(S)
+ usr.unEquip(S)
if (usr.client && usr.s_active != src)
usr.client.screen -= S
S.dropped(usr)
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 7f7be3d94af..d273b395398 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -25,10 +25,10 @@
if (!M.restrained() && !M.stat && can_use())
switch(over_object.name)
if("r_hand")
- M.u_equip(src)
+ M.unEquip(src)
M.put_in_r_hand(src)
if("l_hand")
- M.u_equip(src)
+ M.unEquip(src)
M.put_in_l_hand(src)
src.add_fingerprint(usr)
return
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index a6db233494b..892d1bb37e5 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -135,10 +135,10 @@
if ((!( M.restrained() ) && !( M.stat ) /*&& M.pocket == src*/))
switch(over_object.name)
if("r_hand")
- M.u_equip(src)
+ M.unEquip(src)
M.put_in_r_hand(src)
if("l_hand")
- M.u_equip(src)
+ M.unEquip(src)
M.put_in_l_hand(src)
src.add_fingerprint(usr)
return
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 6e8301ceeeb..e9a53f9f5bf 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -46,11 +46,11 @@
if(!( M.restrained() ) && !( M.stat ))
switch(over_object.name)
if("r_hand")
- if(!M.u_equip(src))
+ if(!M.unEquip(src))
return
M.put_in_r_hand(src)
if("l_hand")
- if(!M.u_equip(src))
+ if(!M.unEquip(src))
return
M.put_in_l_hand(src)
add_fingerprint(usr)
@@ -236,7 +236,7 @@
usr << "[src] cannot hold [W] as it's a storage item of the same size."
return 0 //To prevent the stacking of same sized storage items.
- if(W.flags & NODROP) //SHOULD be handled in u_equip, but better safe than sorry.
+ if(W.flags & NODROP) //SHOULD be handled in unEquip, but better safe than sorry.
usr << "\the [W] is stuck to your hand, you can't put it in \the [src]"
return 0
@@ -249,7 +249,7 @@
/obj/item/weapon/storage/proc/handle_item_insertion(obj/item/W, prevent_warning = 0)
if(!istype(W)) return 0
if(usr)
- if(!usr.u_equip(W))
+ if(!usr.unEquip(W))
return 0
W.loc = src
W.on_enter_storage(src)
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 82499e765a8..cab866cfe3c 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -109,7 +109,7 @@
if ((!F.status)||(F.ptank)) return
src.master = F
F.ptank = src
- user.u_equip(src)
+ user.unEquip(src)
src.loc = F
return
diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index 7147a300f4b..724960a58e2 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -50,7 +50,7 @@
/obj/item/weapon/watertank/proc/remove_noz(mob/user)
if (noz != null)
var/mob/living/carbon/human/M = user
- M.u_equip(noz)
+ M.unEquip(noz)
return
/obj/item/weapon/watertank/Del()
@@ -82,7 +82,7 @@
..()
if (!parent_tank || !istype(parent_tank, /obj/item/weapon/watertank)) //To avoid weird issues from admin spawns
var/mob/living/carbon/human/M = usr
- M.u_equip(src)
+ M.unEquip(src)
Del()
else
tank = parent_tank
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 4d661b37702..8c85e09f32f 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -362,7 +362,7 @@
var/obj/item/stack/rods/R = I
R.use(1)
var/obj/item/weapon/flamethrower/F = new /obj/item/weapon/flamethrower(user.loc)
- user.u_equip(src)
+ user.unEquip(src)
loc = F
F.weldtool = src
add_fingerprint(user)
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 7d1dacfdaa0..f917a7c5cb1 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -109,8 +109,8 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob)
if(istype(I, /obj/item/weapon/shard))
var/obj/item/weapon/twohanded/spear/S = new /obj/item/weapon/twohanded/spear
- user.u_equip(I)
- user.u_equip(src)
+ user.unEquip(I)
+ user.unEquip(src)
user.put_in_hands(S)
user << "You fasten the glass shard to the top of the rod with the cable."
@@ -120,8 +120,8 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob)
else if(istype(I, /obj/item/weapon/wirecutters))
var/obj/item/weapon/melee/baton/cattleprod/P = new /obj/item/weapon/melee/baton/cattleprod
- user.u_equip(I)
- user.u_equip(src)
+ user.unEquip(I)
+ user.unEquip(src)
user.put_in_hands(P)
user << "You fasten the wirecutters to the top of the rod with the cable, prongs outward."
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 2f586563eb3..245d91bf5be 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -295,7 +295,7 @@
if(istype(M) && M.head)
var/obj/item/clothing/head/H = M.head
if(!istype(H) || prob(M.hat_fall_prob()))
- M.u_equip(H)
+ M.unEquip(H)
if(prob(60))
step_rand(H)
if(!M.stat)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index b8ac503a295..07f354b8941 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -987,7 +987,7 @@
return
for(var/obj/item/I in M)
- M.u_equip(I)
+ M.unEquip(I)
if(I)
I.loc = M.loc
I.layer = initial(I.layer)
@@ -1016,7 +1016,7 @@
return
for(var/obj/item/I in M)
- M.u_equip(I)
+ M.unEquip(I)
if(I)
I.loc = M.loc
I.layer = initial(I.layer)
@@ -1067,7 +1067,7 @@
return
for(var/obj/item/I in M)
- M.u_equip(I)
+ M.unEquip(I)
if(I)
I.loc = M.loc
I.layer = initial(I.layer)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 4ce30262e23..cb3cb0a90b8 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -10,7 +10,7 @@
return
for(var/obj/item/W in M)
- M.u_equip(W)
+ M.unEquip(W)
log_admin("[key_name(usr)] made [key_name(M)] drop everything!")
message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!", 1)
diff --git a/code/modules/events/ninja.dm b/code/modules/events/ninja.dm
index 84a6b48bf82..c891f0f804d 100644
--- a/code/modules/events/ninja.dm
+++ b/code/modules/events/ninja.dm
@@ -2690,7 +2690,7 @@ It is possible to destroy the net by the occupant or someone else.
if(istype(M,/mob/living/carbon/human))
if(W==M:w_uniform) continue//So all they're left with are shoes and uniform.
if(W==M:shoes) continue
- M.u_equip(W)
+ M.unEquip(W)
spawn(0)
playsound(M.loc, 'sound/effects/sparks4.ogg', 50, 1)
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index 2d6661b7ce6..6fd4d108b00 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -54,7 +54,7 @@
if(beaker)
user << "\red The biogenerator already occuped."
else
- user.u_equip(O)
+ user.unEquip(O)
O.loc = src
beaker = O
updateUsrDialog()
@@ -86,7 +86,7 @@
if(i >= 10)
user << "\red The biogenerator is full! Activate it."
else
- user.u_equip(O)
+ user.unEquip(O)
O.loc = src
user << "\blue You put [O.name] in [src.name]"
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index 5397697e4e9..c60efeb637f 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -75,7 +75,7 @@
if(leaf.dry)
user.show_message("You wrap the [W] around the log, turning it into a torch!")
var/obj/item/device/flashlight/flare/torch/T = new /obj/item/device/flashlight/flare/torch(user.loc)
- usr.u_equip(W)
+ usr.unEquip(W)
usr.put_in_active_hand(T)
del(leaf)
del(src)
diff --git a/code/modules/hydroponics/hydroitemcode.dm b/code/modules/hydroponics/hydroitemcode.dm
index 245618d6e63..938778ee691 100644
--- a/code/modules/hydroponics/hydroitemcode.dm
+++ b/code/modules/hydroponics/hydroitemcode.dm
@@ -20,7 +20,7 @@
endurance -= rand(1,(endurance/3)+1)
else
usr << "All the petals have fallen off the [name] from violent whacking."
- usr.u_equip(src)
+ usr.unEquip(src)
del(src)
/obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user as mob)
@@ -46,7 +46,7 @@
force -= rand(1,(force/3)+1) // When you whack someone with it, leaves fall off
else
usr << "All the leaves have fallen off the nettle from violent whacking."
- usr.u_equip(src)
+ usr.unEquip(src)
del(src)
/obj/item/weapon/grown/nettle/changePotency(newValue) //-QualityVan
@@ -86,7 +86,7 @@
else
usr << "All the leaves have fallen off the deathnettle from violent whacking."
- usr.u_equip(src)
+ usr.unEquip(src)
del(src)
/obj/item/weapon/grown/deathnettle/changePotency(newValue) //-QualityVan
@@ -100,7 +100,7 @@
if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/kitchen/utensil/knife))
user << "You use [W] to fashion a pipe out of the corn cob!"
new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc)
- usr.u_equip(src)
+ usr.unEquip(src)
del(src)
return
@@ -115,7 +115,7 @@
if(inner_teleport_radius < 1) //Wasn't potent enough, it just splats.
new/obj/effect/decal/cleanable/oil(src.loc)
src.visible_message("The [src.name] has been squashed.","You hear a smack.")
- usr.u_equip(src)
+ usr.unEquip(src)
del(src)
return
for(var/turf/T in orange(M,outer_teleport_radius))
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index a46e7aaec88..6c4fc87cc79 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -351,7 +351,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
//Called when mob user "attacks" it with object O
if(istype(O, /obj/item/nutrient))
var/obj/item/nutrient/myNut = O
- user.u_equip(O)
+ user.unEquip(O)
adjustNutri(10)
yieldmod = myNut.yieldmod
mutmod = myNut.mutmod
@@ -579,7 +579,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
else if( istype(O, /obj/item/seeds/) )
if(!planted)
- user.u_equip(O)
+ user.unEquip(O)
user << "You plant [O]."
dead = 0
myseed = O
@@ -632,7 +632,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
else if( istype(O, /obj/item/weapon/weedspray) )
var/obj/item/weedkiller/myWKiller = O
- user.u_equip(O)
+ user.unEquip(O)
adjustToxic(myWKiller.toxicity)
adjustWeeds(-myWKiller.WeedKillStr)
user << "You apply the weedkiller solution into [src]."
@@ -650,7 +650,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
else if( istype(O, /obj/item/weapon/pestspray) )
var/obj/item/pestkiller/myPKiller = O
- user.u_equip(O)
+ user.unEquip(O)
adjustToxic(myPKiller.toxicity)
adjustPests(-myPKiller.PestKillStr)
user << "You apply the pestkiller solution into [src]."
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 19aa2eb94f5..6caa1b10a69 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -81,12 +81,12 @@
//Drops the item in our left hand
/mob/proc/drop_l_hand() //I really fucking wonder why this proc had an argument holy shit.
- return u_equip(l_hand) //All needed checks are in u_equip
+ return unEquip(l_hand) //All needed checks are in unEquip
//Drops the item in our right hand
/mob/proc/drop_r_hand()
- return u_equip(r_hand) //Why was this not calling u_equip in the first place jesus fuck.
+ return unEquip(r_hand) //Why was this not calling unEquip in the first place jesus fuck.
//Drops the item in our active hand.
@@ -97,8 +97,8 @@
//Here lie drop_from_inventory and before_item_take, already forgotten and not missed.
-/mob/proc/u_equip(obj/item/I, force) //Force overrides NODROP for things like wizarditis and admin undress.
- if(!I) //If there's nothing to drop, the drop is automatically succesfull. If(u_equip) should generally be used to check for NODROP.
+/mob/proc/unEquip(obj/item/I, force) //Force overrides NODROP for things like wizarditis and admin undress.
+ if(!I) //If there's nothing to drop, the drop is automatically succesfull. If(unEquip) should generally be used to check for NODROP.
return 1
if((I.flags & NODROP) && !force)
@@ -123,7 +123,7 @@
//Attemps to remove an object on a mob. Will not move it to another area or such, just removes from the mob.
/mob/proc/remove_from_mob(var/obj/O)
- u_equip(O)
+ unEquip(O)
O.screen_loc = null
return 1
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 9a5d9114972..1d797d720f0 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -379,5 +379,5 @@ In all, this is a lot like the monkey code. /N
visible_message("[usr] tries to empty [src]'s pouches.", \
"[usr] tries to empty [src]'s pouches.")
if(do_mob(usr, src, STRIP_DELAY * 0.5))
- u_equip(r_store)
- u_equip(l_store)
+ unEquip(r_store)
+ unEquip(l_store)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/inventory.dm b/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
index acf583608c9..2460c9c54d8 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/alien/humanoid/u_equip(obj/item/I)
+/mob/living/carbon/alien/humanoid/unEquip(obj/item/I)
. = ..()
if(!.)
return
diff --git a/code/modules/mob/living/carbon/alien/larva/inventory.dm b/code/modules/mob/living/carbon/alien/larva/inventory.dm
index 076053b2530..99298e50bbe 100644
--- a/code/modules/mob/living/carbon/alien/larva/inventory.dm
+++ b/code/modules/mob/living/carbon/alien/larva/inventory.dm
@@ -1,3 +1,3 @@
//can't unequip since it can't equip anything
-/mob/living/carbon/alien/larva/u_equip(obj/item/W as obj)
+/mob/living/carbon/alien/larva/unEquip(obj/item/W as obj)
return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index ac0648510b8..14879b31209 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -40,7 +40,7 @@ var/const/MAX_ACTIVE_TIME = 400
/obj/item/clothing/mask/facehugger/attack(mob/living/M as mob, mob/user as mob)
..()
- user.u_equip(src)
+ user.unEquip(src)
Attach(M)
/obj/item/clothing/mask/facehugger/examine()
@@ -130,7 +130,7 @@ var/const/MAX_ACTIVE_TIME = 400
if(prob(20)) return 0
var/obj/item/clothing/W = target.wear_mask
if(W.flags & NODROP) return 0
- target.u_equip(W)
+ target.unEquip(W)
target.visible_message("\red \b [src] tears [W] off of [target]'s face!")
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index bc5ecde4864..118418b6f2f 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -375,7 +375,7 @@
if(!item) return //Grab processing has a chance of returning null
- u_equip(item)
+ unEquip(item)
if(src.client)
src.client.screen -= item
@@ -414,7 +414,7 @@
return
-/mob/living/carbon/u_equip(obj/item/I) //THIS PROC DID NOT CALL ..() AND THAT COST ME AN ENTIRE DAY OF DEBUGGING.
+/mob/living/carbon/unEquip(obj/item/I) //THIS PROC DID NOT CALL ..() AND THAT COST ME AN ENTIRE DAY OF DEBUGGING.
. = ..() //Sets the default return value to what the parent returns.
if(!.) //We don't want to set anything to null if the parent returned 0.
return
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 8178a566c7f..b8e7c5ef085 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -388,10 +388,10 @@
if(do_mob(usr, src, STRIP_DELAY))
if(pocket_item)
- u_equip(pocket_item)
+ unEquip(pocket_item)
else
if(place_item)
- usr.u_equip(place_item)
+ usr.unEquip(place_item)
equip_to_slot_if_possible(place_item, pocket_id, 0, 1)
// Update strip window
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 473d8884288..14b38f2f6f4 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -125,7 +125,7 @@
if(head)
var/obj/item/clothing/head/H = head
if(!istype(H) || prob(hat_fall_prob()))
- if(u_equip(H))
+ if(unEquip(H))
if(prob(60))
step_away(H,M)
visible_message("[M] has knocked [H] off [src]'s head!",
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index baefc1abbed..8a55a247208 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -81,7 +81,7 @@
return null
-/mob/living/carbon/human/u_equip(obj/item/I)
+/mob/living/carbon/human/unEquip(obj/item/I)
. = ..() //See mob.dm for an explanation on this and some rage about people copypasting instead of calling ..() like they should.
if(!.)
return
@@ -89,18 +89,18 @@
if(I == wear_suit)
if(s_store)
- u_equip(s_store)
+ unEquip(s_store)
wear_suit = null
update_inv_wear_suit(0)
else if(I == w_uniform)
if(r_store)
- u_equip(r_store)
+ unEquip(r_store)
if(l_store)
- u_equip(l_store)
+ unEquip(l_store)
if(wear_id)
- u_equip(wear_id)
+ unEquip(wear_id)
if(belt)
- u_equip(belt)
+ unEquip(belt)
w_uniform = null
update_inv_w_uniform(0)
else if(I == gloves)
@@ -221,7 +221,7 @@
update_inv_s_store(redraw_mob)
if(slot_in_backpack)
if(get_active_hand() == I)
- u_equip(I)
+ unEquip(I)
I.loc = back
return
else
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 1dcd9570ad4..492be046117 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -342,7 +342,7 @@ Please contact me on #coderbus IRC. ~Carnie x
else
// Automatically drop anything in store / id / belt if you're not wearing a uniform. //CHECK IF NECESARRY
for(var/obj/item/thing in list(r_store, l_store, wear_id, belt)) //
- u_equip(thing)
+ unEquip(thing)
apply_overlay(UNIFORM_LAYER)
@@ -486,7 +486,7 @@ Please contact me on #coderbus IRC. ~Carnie x
overlays_standing[SUIT_LAYER] = standing
if(istype(wear_suit, /obj/item/clothing/suit/straight_jacket))
- u_equip(handcuffed)
+ unEquip(handcuffed)
drop_l_hand()
drop_r_hand()
diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm
index f03736edfa8..d7f5e892b5d 100644
--- a/code/modules/mob/living/carbon/metroid/metroid.dm
+++ b/code/modules/mob/living/carbon/metroid/metroid.dm
@@ -240,7 +240,7 @@
return
-/mob/living/carbon/slime/u_equip(obj/item/W as obj)
+/mob/living/carbon/slime/unEquip(obj/item/W as obj)
return
diff --git a/code/modules/mob/living/carbon/monkey/inventory.dm b/code/modules/mob/living/carbon/monkey/inventory.dm
index 33619e9991d..41388c6050d 100644
--- a/code/modules/mob/living/carbon/monkey/inventory.dm
+++ b/code/modules/mob/living/carbon/monkey/inventory.dm
@@ -35,7 +35,7 @@
update_inv_r_hand(redraw_mob)
if(slot_in_backpack)
if(I == get_active_hand())
- u_equip(I)
+ unEquip(I)
I.loc = back
return
else
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index facb2b76248..597a3c49e8b 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -667,7 +667,7 @@ lines 294-301 in living/say.dm (speech buffer)
stolen_item = C.r_hand
if(stolen_item)
- C.u_equip(stolen_item)
+ C.unEquip(stolen_item)
held_item = stolen_item
stolen_item.loc = src
visible_message("[src] grabs [held_item] out of [C]'s hand!", "\blue You snag [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.")
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 1bd6cbe5d42..d7d2937fe1f 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -491,14 +491,14 @@ var/list/slot_equipment_priority = list( \
what.add_fingerprint(usr)
if(do_mob(usr, src, STRIP_DELAY))
if(what && Adjacent(usr))
- u_equip(what)
+ unEquip(what)
else
what = usr.get_active_hand()
if(what && what.mob_can_equip(src, slot, 1))
visible_message("[usr] tries to put [what] on [src].")
if(do_mob(usr, src, STRIP_DELAY * 0.5))
if(what && Adjacent(usr))
- usr.u_equip(what)
+ usr.unEquip(what)
equip_to_slot_if_possible(what, slot, 0, 1)
if(usr.machine == src)
@@ -702,7 +702,7 @@ note dizziness decrements automatically in the mob's Life() proc.
if(ko || resting || buckled)
canmove = 0
drop_r_hand() //makes mobs drop items in hands when incapacitated
- drop_l_hand() //NODROP is handled in u_equip which is called by drop_l/r_hand()
+ drop_l_hand() //NODROP is handled in unEquip which is called by drop_l/r_hand()
if(!lying)
if(resting) //Presuming that you're resting on a bed, which would look goofy lying the wrong way
lying = 90
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 4e2ab2d245b..708197a73d5 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -11,7 +11,7 @@
if(tr_flags & TR_KEEPITEMS)
for(var/obj/item/W in (src.contents-implants))
- u_equip(W)
+ unEquip(W)
//Make mob invisible and spawn animation
regenerate_icons()
@@ -99,7 +99,7 @@
//now the rest
if (tr_flags & TR_KEEPITEMS)
for(var/obj/item/W in (src.contents-implants))
- u_equip(W)
+ unEquip(W)
if (client)
client.screen -= W
if (W)
@@ -108,7 +108,7 @@
W.layer = initial(W.layer)
// for(var/obj/item/W in src)
- // u_equip(W)
+ // unEquip(W)
//Make mob invisible and spawn animation
regenerate_icons()
@@ -195,7 +195,7 @@
if (notransform)
return
for(var/obj/item/W in src)
- u_equip(W)
+ unEquip(W)
regenerate_icons()
notransform = 1
canmove = 0
@@ -271,7 +271,7 @@
if(delete_items)
del(W)
else
- u_equip(W)
+ unEquip(W)
regenerate_icons()
notransform = 1
canmove = 0
@@ -313,7 +313,7 @@
if (notransform)
return
for(var/obj/item/W in src)
- u_equip(W)
+ unEquip(W)
regenerate_icons()
notransform = 1
canmove = 0
@@ -343,7 +343,7 @@
if (notransform)
return
for(var/obj/item/W in src)
- u_equip(W)
+ unEquip(W)
regenerate_icons()
notransform = 1
canmove = 0
@@ -384,7 +384,7 @@
if (notransform)
return
for(var/obj/item/W in src)
- u_equip(W)
+ unEquip(W)
regenerate_icons()
notransform = 1
canmove = 0
@@ -413,7 +413,7 @@
if(notransform)
return
for(var/obj/item/W in src)
- u_equip(W)
+ unEquip(W)
regenerate_icons()
notransform = 1
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index 2f17789e9ef..9db23744ef1 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -23,10 +23,10 @@
else if(istype(over_object, /obj/screen))
switch(over_object.name)
if("r_hand")
- M.u_equip(src)
+ M.unEquip(src)
M.put_in_r_hand(src)
if("l_hand")
- M.u_equip(src)
+ M.unEquip(src)
M.put_in_l_hand(src)
add_fingerprint(M)
diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm
index 88c73bef02e..77a834fd8d1 100644
--- a/code/modules/power/antimatter/control.dm
+++ b/code/modules/power/antimatter/control.dm
@@ -174,7 +174,7 @@
W.loc = src
if(user.client)
user.client.screen -= W
- user.u_equip(W)
+ user.unEquip(W)
user.update_icons()
user.visible_message("[user.name] loads an [W.name] into the [src.name].", \
"You load an [W.name].", \
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index e3c5ff707e5..8dbf171fb1f 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -316,7 +316,7 @@
.=1 //Because del(src) stops the proc, set the default return value to 1
if(ismob(loc)) //handle mob icon update
var/mob/M = loc
- M.u_equip(src)
+ M.unEquip(src)
del(src)
else
amount -= used
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 880013ba44b..27039321ff1 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -948,7 +948,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
user << "Cannot refine into a reagent."
return 1
- user.u_equip(O)
+ user.unEquip(O)
O.loc = src
holdingitems += O
src.updateUsrDialog()
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 8b86fcb07c4..475a202a082 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -17,7 +17,7 @@
/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume()
if(!usr) return
if(!reagents.total_volume)
- usr.u_equip(src) //so icons update :[
+ usr.unEquip(src) //so icons update :[
if(trash)
if(ispath(trash,/obj/item/weapon/grown))
@@ -41,7 +41,7 @@
eatverb = pick("bite","chew","nibble","gnaw","gobble","chomp")
if(!reagents.total_volume) //Shouldn't be needed but it checks to see if it has anything left in it.
user << "None of [src] left, oh no!"
- M.u_equip(src) //so icons update :[
+ M.unEquip(src) //so icons update :[
del(src)
return 0
if(istype(M, /mob/living/carbon))
@@ -143,7 +143,7 @@
if(!iscarbon(user))
return 0
user << "You slip [W] inside [src]."
- user.u_equip(W)
+ user.unEquip(W)
if ((user.client && user.s_active != src))
user.client.screen -= W
W.dropped(user)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index b50f74a784a..d5f1bf22dff 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -205,7 +205,7 @@
user << "You add [D] to [src]."
del(D)
user.put_in_hands(new /obj/item/weapon/bucket_sensor)
- user.u_equip(src)
+ user.unEquip(src)
del(src)
/*
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 7813995456f..70d5aaf0fcd 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -21,7 +21,7 @@
attack(mob/M, mob/user, def_zone)
if(M == user)
M << "You swallow [src]."
- M.u_equip(src) //icon update
+ M.unEquip(src) //icon update
if(reagents.total_volume)
reagents.reaction(M, INGEST)
spawn(5)
@@ -37,7 +37,7 @@
if(!do_mob(user, M)) return
- user.u_equip(src) //icon update
+ user.unEquip(src) //icon update
M.visible_message("[user] forces [M] to swallow [src].", \
"[user] forces [M] to swallow [src].")
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index 34cec2e6613..d5cf9caab3b 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -76,7 +76,7 @@
else if(istype(W, /obj/item/device/gps))
if(!inserted_gps)
inserted_gps = W
- user.u_equip(W)
+ user.unEquip(W)
W.loc = src
user.visible_message("[user] inserts [W] into \the [src]'s GPS device slot.")
else if(istype(W, /obj/item/device/multitool))
diff --git a/code/unused/Agouri_stuff.dm b/code/unused/Agouri_stuff.dm
index b567de3b53e..c81e7f7c0eb 100644
--- a/code/unused/Agouri_stuff.dm
+++ b/code/unused/Agouri_stuff.dm
@@ -1570,7 +1570,7 @@ turf/simulated/floor/return_siding_icon_state()
if(is_light_floor())
var/obj/item/stack/tile/light/T = floor_tile
if(T.state)
- user.u_equip(C)
+ user.unEquip(C)
del(C)
T.state = C //fixing it by bashing it with a light bulb, fun eh?
update_icon()
diff --git a/code/unused/assemblies.dm b/code/unused/assemblies.dm
index fcfdf88d58f..2cf30f50fb4 100644
--- a/code/unused/assemblies.dm
+++ b/code/unused/assemblies.dm
@@ -211,7 +211,7 @@
part2 = null
user.put_in_hand(R)
- user.u_equip(W)
+ user.unEquip(W)
R.part3 = W
R.part3.master = R
del(src)
@@ -224,15 +224,15 @@
if (user.client)
user.client.screen -= W
if (user.r_hand == W)
- user.u_equip(W)
+ user.unEquip(W)
user.r_hand = R
else
- user.u_equip(W)
+ user.unEquip(W)
user.l_hand = R
W.master = R
src.master = R
src.layer = initial(src.layer)
- user.u_equip(src)
+ user.unEquip(src)
if (user.client)
user.client.screen -= src
src.loc = R
@@ -251,15 +251,15 @@
if (user.client)
user.client.screen -= W
if (user.r_hand == W)
- user.u_equip(W)
+ user.unEquip(W)
user.r_hand = R
else
- user.u_equip(W)
+ user.unEquip(W)
user.l_hand = R
W.master = R
src.master = R
src.layer = initial(src.layer)
- user.u_equip(src)
+ user.unEquip(src)
if (user.client)
user.client.screen -= src
src.loc = R
diff --git a/code/unused/beast/death.dm b/code/unused/beast/death.dm
index 271f72beb27..a5ff611cb54 100644
--- a/code/unused/beast/death.dm
+++ b/code/unused/beast/death.dm
@@ -2,7 +2,7 @@
var/mob/dead/phantasm/P = new (src.loc)
for(var/obj/O in src.contents) // Where src is a mob
if(istype(O, /obj/item)) // Only remember carried items (sanity checking, mostly)
- src.u_equip(O) // Unequip the item if we're wearing it
+ src.unEquip(O) // Unequip the item if we're wearing it
if (src.client)
src.client.screen -= O // Clear out any overlays the item added, notably in the equip windows
O.loc = src.loc // Honestly not sure if these two steps are necessary
diff --git a/code/unused/brewing.dm b/code/unused/brewing.dm
index 1ce22ef909b..ab0e5fb2158 100644
--- a/code/unused/brewing.dm
+++ b/code/unused/brewing.dm
@@ -58,7 +58,7 @@
/obj/machinery/mill/attackby(var/obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/reagent_containers/food))
- user.u_equip(W)
+ user.unEquip(W)
W.loc = src
input += W
else
@@ -128,7 +128,7 @@
/obj/machinery/fermenter/attackby(var/obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/reagent_containers/food))
- user.u_equip(W)
+ user.unEquip(W)
W.loc = src
input += W
else
@@ -189,7 +189,7 @@
/obj/machinery/still/attackby(var/obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/reagent_containers/food))
- user.u_equip(W)
+ user.unEquip(W)
W.loc = src
input += W
else
@@ -274,7 +274,7 @@
/obj/machinery/centrifuge/attackby(var/obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/reagent_containers/food))
- user.u_equip(W)
+ user.unEquip(W)
W.loc = src
input += W
else
diff --git a/code/unused/gamemodes/deathmatch.dm b/code/unused/gamemodes/deathmatch.dm
index e748eb4f20d..8b6925c2a64 100644
--- a/code/unused/gamemodes/deathmatch.dm
+++ b/code/unused/gamemodes/deathmatch.dm
@@ -25,7 +25,7 @@
for(var/obj/item/weapon/W in list(M.wear_suit, M.w_uniform, M.r_store, M.l_store, M.wear_id, M.belt,
M.gloves, M.glasses, M.head, M.ears, M.shoes, M.wear_mask, M.back,
M.handcuffed, M.r_hand, M.l_hand))
- M.u_equip(W)
+ M.unEquip(W)
del(W)
var/randomname = "Killiam Shakespeare"
diff --git a/code/unused/new_year.dm b/code/unused/new_year.dm
index 6ff0357686b..f2d79c9e16e 100644
--- a/code/unused/new_year.dm
+++ b/code/unused/new_year.dm
@@ -17,7 +17,7 @@
W.loc = src
if (user.client)
user.client.screen -= W
- user.u_equip(W)
+ user.unEquip(W)
var/const/bottom_right_x = 115.0
var/const/bottom_right_y = 150.0
var/const/top_left_x = 15.0