cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes slot number defines from lowercase to all uppercase (#22297)

Browse Source 
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
This commit is contained in:
Contrabang
2023-10-03 13:27:51 -04:00
committed by GitHub
parent a6a34c2592
commit f3f9bd442a
219 changed files with 1114 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/parry.dm
+1 -1
View File
@@ -61,7 +61,7 @@
/datum/component/parry/proc/equipped(datum/source, mob/user, slot)
SIGNAL_HANDLER
if(slot in list(slot_l_hand, slot_r_hand))
if(slot in list(SLOT_HUD_LEFT_HAND, SLOT_HUD_RIGHT_HAND))
RegisterSignal(user, COMSIG_HUMAN_PARRY, PROC_REF(start_parry))
else
UnregisterSignal(user, COMSIG_HUMAN_PARRY)
code/datums/components/two_handed.dm
+2 -2
View File
@@ -126,7 +126,7 @@
/datum/component/two_handed/proc/on_equip(datum/source, mob/user, slot)
SIGNAL_HANDLER // COMSIG_ITEM_EQUIPPED
if(require_twohands && (slot == slot_l_hand || slot == slot_r_hand)) // force equip the item
if(require_twohands && (slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND)) // force equip the item
INVOKE_ASYNC(src, PROC_REF(wield), user)
if(!user.is_holding(parent) && wielded && !require_twohands)
INVOKE_ASYNC(src, PROC_REF(unwield), user)
@@ -277,7 +277,7 @@
parent_item.update_appearance()
if(istype(user)) // tk showed that we might not have a mob here
if(user.get_item_by_slot(slot_back) == parent)
if(user.get_item_by_slot(SLOT_HUD_BACK) == parent)
user.update_inv_back()
else
user.update_inv_l_hand()
code/datums/diseases/_MobProcs.dm
+2 -2
View File
@@ -101,8 +101,8 @@
if(isobj(H.wear_suit))
Cl = H.wear_suit
passed = prob((Cl.permeability_coefficient*100) - 1)
if(passed && isobj(slot_w_uniform))
Cl = slot_w_uniform
if(passed && isobj(SLOT_HUD_JUMPSUIT))
Cl = SLOT_HUD_JUMPSUIT
passed = prob((Cl.permeability_coefficient*100) - 1)
if(3)
if(isobj(H.wear_suit) && H.wear_suit.body_parts_covered&HANDS)
code/datums/diseases/pierrot_throat.dm
+1 -1
View File
@@ -63,4 +63,4 @@
if(!istype(affected_mob.wear_mask, /obj/item/clothing/mask/gas/clown_hat/nodrop))
affected_mob.unEquip(affected_mob.wear_mask, TRUE)
affected_mob.equip_to_slot(new /obj/item/clothing/mask/gas/clown_hat/nodrop(src), slot_wear_mask)
affected_mob.equip_to_slot(new /obj/item/clothing/mask/gas/clown_hat/nodrop(src), SLOT_HUD_WEAR_MASK)
code/datums/diseases/wizarditis.dm
+3 -3
View File
@@ -62,19 +62,19 @@ STI KALY - blind
if(!istype(H.head, /obj/item/clothing/head/wizard))
if(!H.unEquip(H.head))
qdel(H.head)
H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(H), SLOT_HUD_HEAD)
return
if(prob(chance))
if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe))
if(!H.unEquip(H.wear_suit))
qdel(H.wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(H), SLOT_HUD_OUTER_SUIT)
return
if(prob(chance))
if(!istype(H.shoes, /obj/item/clothing/shoes/sandal))
if(!H.unEquip(H.shoes))
qdel(H.shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), SLOT_HUD_SHOES)
return
else
var/mob/living/carbon/H = affected_mob
code/datums/elements/earhealing.dm
+1 -1
View File
@@ -20,7 +20,7 @@
/datum/element/earhealing/proc/equippedChanged(datum/source, mob/living/carbon/user, slot)
SIGNAL_HANDLER
if(((slot == slot_l_ear) || (slot == slot_r_ear)) && istype(user))
if(((slot == SLOT_HUD_LEFT_EAR) || (slot == SLOT_HUD_RIGHT_EAR)) && istype(user))
user_by_item[source] = user
else
user_by_item -= source
code/datums/keybindings/human_keybinds.dm
+3 -3
View File
@@ -11,7 +11,7 @@
/datum/keybinding/human/bag_equip/down(client/C)
. = ..()
var/mob/living/carbon/human/M = C.mob
M.quick_equip_item(slot_back)
M.quick_equip_item(SLOT_HUD_BACK)
/datum/keybinding/human/belt_equip
name = "Equip Held Object To Belt"
@@ -20,7 +20,7 @@
/datum/keybinding/human/belt_equip/down(client/C)
. = ..()
var/mob/living/carbon/human/M = C.mob
M.quick_equip_item(slot_belt)
M.quick_equip_item(SLOT_HUD_BELT)
/datum/keybinding/human/suit_equip
name = "Equip Held Object To Suit Storage"
@@ -29,7 +29,7 @@
/datum/keybinding/human/suit_equip/down(client/C)
. = ..()
var/mob/living/carbon/human/M = C.mob
M.quick_equip_item(slot_s_store)
M.quick_equip_item(SLOT_HUD_SUIT_STORE)
/datum/keybinding/human/toggle_holster
name = "Toggle Holster"
code/datums/outfits/outfit.dm
+17 -17
View File
@@ -57,29 +57,29 @@
//Start with uniform,suit,backpack for additional slots
if(uniform)
equip_item(H, uniform, slot_w_uniform)
equip_item(H, uniform, SLOT_HUD_JUMPSUIT)
if(suit)
equip_item(H, suit, slot_wear_suit)
equip_item(H, suit, SLOT_HUD_OUTER_SUIT)
if(back)
equip_item(H, back, slot_back)
equip_item(H, back, SLOT_HUD_BACK)
if(belt)
equip_item(H, belt, slot_belt)
equip_item(H, belt, SLOT_HUD_BELT)
if(gloves)
equip_item(H, gloves, slot_gloves)
equip_item(H, gloves, SLOT_HUD_GLOVES)
if(shoes)
equip_item(H, shoes, slot_shoes)
equip_item(H, shoes, SLOT_HUD_SHOES)
if(head)
equip_item(H, head, slot_head)
equip_item(H, head, SLOT_HUD_HEAD)
if(mask)
equip_item(H, mask, slot_wear_mask)
equip_item(H, mask, SLOT_HUD_WEAR_MASK)
if(l_ear)
equip_item(H, l_ear, slot_l_ear)
equip_item(H, l_ear, SLOT_HUD_LEFT_EAR)
if(r_ear)
equip_item(H, r_ear, slot_r_ear)
equip_item(H, r_ear, SLOT_HUD_RIGHT_EAR)
if(glasses)
equip_item(H, glasses, slot_glasses)
equip_item(H, glasses, SLOT_HUD_GLASSES)
if(id)
equip_item(H, id, slot_wear_id)
equip_item(H, id, SLOT_HUD_WEAR_ID)
if(!H.head && toggle_helmet && istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit))
var/obj/item/clothing/suit/space/hardsuit/HS = H.wear_suit
@@ -89,7 +89,7 @@
C.quick_activation()
if(suit_store)
equip_item(H, suit_store, slot_s_store)
equip_item(H, suit_store, SLOT_HUD_SUIT_STORE)
if(l_hand)
H.put_in_l_hand(new l_hand(H))
@@ -97,7 +97,7 @@
H.put_in_r_hand(new r_hand(H))
if(pda)
equip_item(H, pda, slot_wear_pda)
equip_item(H, pda, SLOT_HUD_WEAR_PDA)
if(uniform)
for(var/path in accessories)
@@ -107,9 +107,9 @@
if(!visualsOnly) // Items in pockets or backpack don't show up on mob's icon.
if(l_pocket)
equip_item(H, l_pocket, slot_l_store)
equip_item(H, l_pocket, SLOT_HUD_LEFT_STORE)
if(r_pocket)
equip_item(H, r_pocket, slot_r_store)
equip_item(H, r_pocket, SLOT_HUD_RIGHT_STORE)
if(box)
if(!backpack_contents)
@@ -122,7 +122,7 @@
if(!number)
number = 1
for(var/i in 1 to number)
H.equip_or_collect(new path(H), slot_in_backpack)
H.equip_or_collect(new path(H), SLOT_HUD_IN_BACKPACK)
for(var/path in cybernetic_implants)
var/obj/item/organ/internal/O = new path
code/datums/outfits/outfit_admin.dm
+2 -2
View File
@@ -9,7 +9,7 @@
/datum/outfit/admin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
@@ -1173,7 +1173,7 @@
if(istype(C))
C.name = "ancient robes"
C.hood.name = "ancient hood"
H.equip_to_slot_or_del(C, slot_in_backpack)
H.equip_to_slot_or_del(C, SLOT_HUD_IN_BACKPACK)
var/obj/item/card/id/I = H.wear_id
if(istype(I))
code/datums/outfits/outfit_debug.dm
+1 -1
View File
@@ -22,7 +22,7 @@
id = /obj/item/card/id/admin
pda = /obj/item/pda/centcom
internals_slot = slot_s_store
internals_slot = SLOT_HUD_SUIT_STORE
toggle_helmet = TRUE
cybernetic_implants = list(
code/datums/outfits/vv_outfit.dm
+21 -21
View File
@@ -11,37 +11,37 @@
/datum/outfit/varedit/proc/set_equipment_by_slot(slot, item_path)
switch(slot)
if(slot_w_uniform)
if(SLOT_HUD_JUMPSUIT)
uniform = item_path
if(slot_back)
if(SLOT_HUD_BACK)
back = item_path
if(slot_wear_suit)
if(SLOT_HUD_OUTER_SUIT)
suit = item_path
if(slot_belt)
if(SLOT_HUD_BELT)
belt = item_path
if(slot_gloves)
if(SLOT_HUD_GLOVES)
gloves = item_path
if(slot_shoes)
if(SLOT_HUD_SHOES)
shoes = item_path
if(slot_head)
if(SLOT_HUD_HEAD)
head = item_path
if(slot_wear_mask)
if(SLOT_HUD_WEAR_MASK)
mask = item_path
if(slot_l_ear)
if(SLOT_HUD_LEFT_EAR)
l_ear = item_path
if(slot_r_ear)
if(SLOT_HUD_RIGHT_EAR)
r_ear = item_path
if(slot_glasses)
if(SLOT_HUD_GLASSES)
glasses = item_path
if(slot_wear_id)
if(SLOT_HUD_WEAR_ID)
id = item_path
if(slot_wear_pda)
if(SLOT_HUD_WEAR_PDA)
pda = item_path
if(slot_s_store)
if(SLOT_HUD_SUIT_STORE)
suit_store = item_path
if(slot_l_store)
if(SLOT_HUD_LEFT_STORE)
l_pocket = item_path
if(slot_r_store)
if(SLOT_HUD_RIGHT_STORE)
r_pocket = item_path
@@ -68,7 +68,7 @@
//Copy equipment
var/list/result = list()
var/list/slots_to_check = list(slot_w_uniform, slot_back, slot_wear_suit, slot_belt, slot_gloves, slot_shoes, slot_head, slot_wear_mask, slot_l_ear, slot_r_ear, slot_glasses, slot_wear_id, slot_wear_pda, slot_s_store, slot_l_store, slot_r_store)
var/list/slots_to_check = list(SLOT_HUD_JUMPSUIT, SLOT_HUD_BACK, SLOT_HUD_OUTER_SUIT, SLOT_HUD_BELT, SLOT_HUD_GLOVES, SLOT_HUD_SHOES, SLOT_HUD_HEAD, SLOT_HUD_WEAR_MASK, SLOT_HUD_LEFT_EAR, SLOT_HUD_RIGHT_EAR, SLOT_HUD_GLASSES, SLOT_HUD_WEAR_ID, SLOT_HUD_WEAR_PDA, SLOT_HUD_SUIT_STORE, SLOT_HUD_LEFT_STORE, SLOT_HUD_RIGHT_STORE)
for(var/s in slots_to_check)
var/obj/item/I = get_item_by_slot(s)
var/vedits = collect_vv(I)
@@ -79,7 +79,7 @@
//Copy access
O.stored_access = list()
var/obj/item/id_slot = get_item_by_slot(slot_wear_id)
var/obj/item/id_slot = get_item_by_slot(SLOT_HUD_WEAR_ID)
if(id_slot)
O.stored_access |= id_slot.GetAccess()
var/obj/item/card/id/ID = id_slot.GetID()
@@ -103,7 +103,7 @@
O.vv_values = result
//Copy backpack contents if exist.
var/obj/item/backpack = get_item_by_slot(slot_back)
var/obj/item/backpack = get_item_by_slot(SLOT_HUD_BACK)
if(istype(backpack) && LAZYLEN(backpack.contents) > 0)
var/list/typecounts = list()
for(var/obj/item/I in backpack)
@@ -127,7 +127,7 @@
O.cybernetic_implants |= aug.type
// Copy accessories
var/obj/item/clothing/under/uniform_slot = get_item_by_slot(slot_w_uniform)
var/obj/item/clothing/under/uniform_slot = get_item_by_slot(SLOT_HUD_JUMPSUIT)
if(uniform_slot)
O.accessories = list()
for(var/obj/item/clothing/accessory/A in uniform_slot.accessories)
@@ -156,7 +156,7 @@
for(var/vname in edits)
I.vv_edit_var(vname,edits[vname])
//Apply access
var/obj/item/id_slot = H.get_item_by_slot(slot_wear_id)
var/obj/item/id_slot = H.get_item_by_slot(SLOT_HUD_WEAR_ID)
if(id_slot)
var/obj/item/card/id/card = id_slot.GetID()
if(istype(card))
code/datums/spells/banana_touch.dm
+7 -7
View File
@@ -43,17 +43,17 @@
unEquip(wear_mask, TRUE)
unEquip(head, TRUE)
unEquip(wear_suit, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/head/wizard/clown, slot_head, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/wizrobe/clown, slot_wear_suit, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/magical, slot_shoes, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clownwiz, slot_wear_mask, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/head/wizard/clown, SLOT_HUD_HEAD, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/wizrobe/clown, SLOT_HUD_OUTER_SUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/magical, SLOT_HUD_SHOES, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clownwiz, SLOT_HUD_WEAR_MASK, TRUE, TRUE)
else
qdel(shoes)
qdel(wear_mask)
qdel(w_uniform)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/clown/nodrop, slot_w_uniform, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/nodrop, slot_shoes, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/nodrop, slot_wear_mask, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/clown/nodrop, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/nodrop, SLOT_HUD_SHOES, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/nodrop, SLOT_HUD_WEAR_MASK, TRUE, TRUE)
dna.SetSEState(GLOB.clumsyblock, TRUE, TRUE)
dna.SetSEState(GLOB.comicblock, TRUE, TRUE)
singlemutcheck(src, GLOB.clumsyblock, MUTCHK_FORCED)
code/datums/spells/cluwne.dm
+6 -6
View File
@@ -36,10 +36,10 @@
tumor.insert(src)
if(!istype(wear_mask, /obj/item/clothing/mask/cursedclown)) //Infinite loops otherwise
unEquip(wear_mask, 1)
equip_to_slot_if_possible(new /obj/item/clothing/under/cursedclown, slot_w_uniform, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/gloves/cursedclown, slot_gloves, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/cursedclown, slot_wear_mask, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/cursedclown, slot_shoes, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/cursedclown, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/gloves/cursedclown, SLOT_HUD_GLOVES, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/cursedclown, SLOT_HUD_WEAR_MASK, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/cursedclown, SLOT_HUD_SHOES, TRUE, TRUE)
/mob/living/carbon/human/proc/makeAntiCluwne()
to_chat(src, "<span class='danger'>You don't feel very funny.</span>")
@@ -80,5 +80,5 @@
unEquip(gloves, 1)
qdel(G)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/lawyer/black, slot_w_uniform, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, slot_shoes, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/lawyer/black, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, SLOT_HUD_SHOES, TRUE, TRUE)
code/datums/spells/horsemask.dm
+1 -1
View File
@@ -36,6 +36,6 @@
"<span class='danger'>Your face burns up, and shortly after the fire you realise you have the face of a horse!</span>")
if(!target.unEquip(target.wear_mask))
qdel(target.wear_mask)
target.equip_to_slot_if_possible(magichead, slot_wear_mask, TRUE, TRUE)
target.equip_to_slot_if_possible(magichead, SLOT_HUD_WEAR_MASK, TRUE, TRUE)
target.flash_eyes()
code/datums/spells/lichdom.dm
+4 -4
View File
@@ -129,7 +129,7 @@
equip_lich(H)
/obj/effect/proc_holder/spell/lichdom/proc/equip_lich(mob/living/carbon/human/H)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), SLOT_HUD_OUTER_SUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), SLOT_HUD_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), SLOT_HUD_SHOES)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), SLOT_HUD_JUMPSUIT)
code/datums/spells/mime_malaise.dm
+6 -6
View File
@@ -37,17 +37,17 @@
unEquip(wear_mask, TRUE)
unEquip(w_uniform, TRUE)
unEquip(wear_suit, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime, slot_wear_mask, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime, slot_w_uniform, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders, slot_wear_suit, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime, SLOT_HUD_WEAR_MASK, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders, SLOT_HUD_OUTER_SUIT, TRUE, TRUE)
Silence(14 SECONDS)
else
qdel(wear_mask)
qdel(w_uniform)
qdel(wear_suit)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime/nodrop, slot_wear_mask, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime/nodrop, slot_w_uniform, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders/nodrop, slot_wear_suit, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime/nodrop, SLOT_HUD_WEAR_MASK, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime/nodrop, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders/nodrop, SLOT_HUD_OUTER_SUIT, TRUE, TRUE)
dna.SetSEState(GLOB.muteblock , TRUE, TRUE)
singlemutcheck(src, GLOB.muteblock, MUTCHK_FORCED)
dna.default_blocks.Add(GLOB.muteblock)
code/datums/spells/summonitem.dm
+4 -4
View File
@@ -105,12 +105,12 @@
if(target.hand) //left active hand
if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_l_hand, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_r_hand, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_LEFT_HAND, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_RIGHT_HAND, FALSE, TRUE))
butterfingers = TRUE
else //right active hand
if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_r_hand, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_l_hand, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_RIGHT_HAND, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_LEFT_HAND, FALSE, TRUE))
butterfingers = TRUE
if(butterfingers)
item_to_retrieve.loc = target.loc
code/datums/spells/touch_attacks.dm
+4 -4
View File
@@ -21,12 +21,12 @@
user.put_in_hands(attached_hand)
return
if(user.hand) //left active hand
if(!user.equip_to_slot_if_possible(attached_hand, slot_l_hand, FALSE, TRUE))
if(!user.equip_to_slot_if_possible(attached_hand, slot_r_hand, FALSE, TRUE))
if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_LEFT_HAND, FALSE, TRUE))
if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_RIGHT_HAND, FALSE, TRUE))
hand_handled = 0
else //right active hand
if(!user.equip_to_slot_if_possible(attached_hand, slot_r_hand, FALSE, TRUE))
if(!user.equip_to_slot_if_possible(attached_hand, slot_l_hand, FALSE, TRUE))
if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_RIGHT_HAND, FALSE, TRUE))
if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_LEFT_HAND, FALSE, TRUE))
hand_handled = 0
if(!hand_handled)
qdel(attached_hand)