cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 11:07:12 +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 18:27:51 +01: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/modules/mob/inventory_procs.dm
+9 -9
View File
@@ -61,7 +61,7 @@
l_hand = W
W.layer = ABOVE_HUD_LAYER //TODO: move to equipped?
W.plane = ABOVE_HUD_PLANE //TODO: move to equipped?
W.equipped(src,slot_l_hand)
W.equipped(src,SLOT_HUD_LEFT_HAND)
if(pulling == W)
stop_pulling()
update_inv_l_hand()
@@ -77,7 +77,7 @@
r_hand = W
W.layer = ABOVE_HUD_LAYER
W.plane = ABOVE_HUD_PLANE
W.equipped(src,slot_r_hand)
W.equipped(src,SLOT_HUD_RIGHT_HAND)
if(pulling == W)
stop_pulling()
update_inv_r_hand()
@@ -259,17 +259,17 @@
S.handle_item_insertion(src)
return 1
S = M.get_item_by_slot(slot_wear_id)
S = M.get_item_by_slot(SLOT_HUD_WEAR_ID)
if(istype(S) && S.can_be_inserted(src, 1)) //else we put in a wallet
S.handle_item_insertion(src)
return 1
S = M.get_item_by_slot(slot_belt)
S = M.get_item_by_slot(SLOT_HUD_BELT)
if(istype(S) && S.can_be_inserted(src, 1)) //else we put in belt
S.handle_item_insertion(src)
return 1
var/obj/item/O = M.get_item_by_slot(slot_back) //else we put in backpack
var/obj/item/O = M.get_item_by_slot(SLOT_HUD_BACK) //else we put in backpack
if(istype(O, /obj/item/storage))
S = O
if(S.can_be_inserted(src, 1))
@@ -297,13 +297,13 @@
/mob/proc/get_item_by_slot(slot_id)
switch(slot_id)
if(slot_wear_mask)
if(SLOT_HUD_WEAR_MASK)
return wear_mask
if(slot_back)
if(SLOT_HUD_BACK)
return back
if(slot_l_hand)
if(SLOT_HUD_LEFT_HAND)
return l_hand
if(slot_r_hand)
if(SLOT_HUD_RIGHT_HAND)
return r_hand
return null
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+4 -4
View File
@@ -83,15 +83,15 @@
user.set_machine(src)
var/dat = {"<table>
<tr><td><B>Left Hand:</B></td><td><A href='?src=[UID()];item=[slot_l_hand]'>[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td><B>Right Hand:</B></td><td><A href='?src=[UID()];item=[slot_r_hand]'>[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td><B>Left Hand:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_LEFT_HAND]'>[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td><B>Right Hand:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_RIGHT_HAND]'>[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td>&nbsp;</td></tr>"}
dat += "<tr><td><B>Head:</B></td><td><A href='?src=[UID()];item=[slot_head]'>[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td><B>Head:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_HEAD]'>[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td>&nbsp;</td></tr>"
dat += "<tr><td><B>Exosuit:</B></td><td><A href='?src=[UID()];item=[slot_wear_suit]'>[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? html_encode(wear_suit) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td><B>Exosuit:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_OUTER_SUIT]'>[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? html_encode(wear_suit) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td><B>Pouches:</B></td><td><A href='?src=[UID()];item=pockets'>[((l_store && !(l_store.flags&ABSTRACT)) || (r_store && !(r_store.flags&ABSTRACT))) ? "Full" : "<font color=grey>Empty</font>"]</A>"
dat += {"</table>
code/modules/mob/living/carbon/alien/humanoid/humanoid_inventory.dm
+6 -6
View File
@@ -28,7 +28,7 @@
switch(slot_id)
// if("o_clothing")
// if("head")
if(slot_l_store)
if(SLOT_HUD_LEFT_STORE)
if(l_store)
return
if(W.w_class > WEIGHT_CLASS_NORMAL)
@@ -36,7 +36,7 @@
unEquip(W)
l_store = W
update_inv_pockets()
if(slot_r_store)
if(SLOT_HUD_RIGHT_STORE)
if(r_store)
return
if(W.w_class > WEIGHT_CLASS_NORMAL)
@@ -46,11 +46,11 @@
update_inv_pockets()
else
switch(slot_id)
if(slot_wear_suit)
if(SLOT_HUD_OUTER_SUIT)
if(wear_suit) wear_suit.attack_alien(src)
if(slot_head)
if(SLOT_HUD_HEAD)
if(head) head.attack_alien(src)
if(slot_l_store)
if(SLOT_HUD_LEFT_STORE)
if(l_store) l_store.attack_alien(src)
if(slot_r_store)
if(SLOT_HUD_RIGHT_STORE)
if(r_store) r_store.attack_alien(src)
code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm
+1 -1
View File
@@ -83,7 +83,7 @@
/mob/living/carbon/alien/humanoid/update_inv_wear_suit()
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_wear_suit]
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_OUTER_SUIT]
inv.update_icon()
if(wear_suit)
code/modules/mob/living/carbon/alien/special/facehugger.dm
+1 -1
View File
@@ -138,7 +138,7 @@
"<span class='userdanger'>[src] tears [W] off of [target]'s face!</span>")
src.loc = target
target.equip_to_slot_if_possible(src, slot_wear_mask, FALSE, TRUE)
target.equip_to_slot_if_possible(src, SLOT_HUD_WEAR_MASK, FALSE, TRUE)
if(!sterile)
M.KnockDown(impregnation_time + 2 SECONDS)
M.EyeBlind(impregnation_time + 2 SECONDS)
code/modules/mob/living/carbon/carbon.dm
+15 -15
View File
@@ -753,19 +753,19 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
user.set_machine(src)
var/dat = {"<table>
<tr><td><B>Left Hand:</B></td><td><A href='?src=[UID()];item=[slot_l_hand]'>[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td><B>Right Hand:</B></td><td><A href='?src=[UID()];item=[slot_r_hand]'>[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td><B>Left Hand:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_LEFT_HAND]'>[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td><B>Right Hand:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_RIGHT_HAND]'>[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td>&nbsp;</td></tr>"}
dat += "<tr><td><B>Back:</B></td><td><A href='?src=[UID()];item=[slot_back]'>[(back && !(back.flags&ABSTRACT)) ? html_encode(back) : "<font color=grey>Empty</font>"]</A>"
dat += "<tr><td><B>Back:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_BACK]'>[(back && !(back.flags&ABSTRACT)) ? html_encode(back) : "<font color=grey>Empty</font>"]</A>"
if(istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/tank))
dat += "&nbsp;<A href='?src=[UID()];internal=[slot_back]'>[internal ? "Disable Internals" : "Set Internals"]</A>"
dat += "&nbsp;<A href='?src=[UID()];internal=[SLOT_HUD_BACK]'>[internal ? "Disable Internals" : "Set Internals"]</A>"
dat += "</td></tr><tr><td>&nbsp;</td></tr>"
dat += "<tr><td><B>Head:</B></td><td><A href='?src=[UID()];item=[slot_head]'>[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td><B>Head:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_HEAD]'>[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td><B>Mask:</B></td><td><A href='?src=[UID()];item=[slot_wear_mask]'>[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? html_encode(wear_mask) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td><B>Mask:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_WEAR_MASK]'>[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? html_encode(wear_mask) : "<font color=grey>Empty</font>"]</A></td></tr>"
if(istype(wear_mask, /obj/item/clothing/mask/muzzle))
var/obj/item/clothing/mask/muzzle/M = wear_mask
@@ -775,9 +775,9 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
dat += "</td></tr><tr><td>&nbsp;</td></tr>"
if(handcuffed)
dat += "<tr><td><B>Handcuffed:</B> <A href='?src=[UID()];item=[slot_handcuffed]'>Remove</A></td></tr>"
dat += "<tr><td><B>Handcuffed:</B> <A href='?src=[UID()];item=[SLOT_HUD_HANDCUFFED]'>Remove</A></td></tr>"
if(legcuffed)
dat += "<tr><td><A href='?src=[UID()];item=[slot_legcuffed]'>Legcuffed</A></td></tr>"
dat += "<tr><td><A href='?src=[UID()];item=[SLOT_HUD_LEGCUFFED]'>Legcuffed</A></td></tr>"
dat += {"</table>
<A href='?src=[user.UID()];mach_close=mob\ref[src]'>Close</A>
@@ -829,19 +829,19 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
/mob/living/carbon/get_item_by_slot(slot_id)
switch(slot_id)
if(slot_back)
if(SLOT_HUD_BACK)
return back
if(slot_wear_mask)
if(SLOT_HUD_WEAR_MASK)
return wear_mask
if(slot_wear_suit)
if(SLOT_HUD_OUTER_SUIT)
return wear_suit
if(slot_l_hand)
if(SLOT_HUD_LEFT_HAND)
return l_hand
if(slot_r_hand)
if(SLOT_HUD_RIGHT_HAND)
return r_hand
if(slot_handcuffed)
if(SLOT_HUD_HANDCUFFED)
return handcuffed
if(slot_legcuffed)
if(SLOT_HUD_LEGCUFFED)
return legcuffed
return null
code/modules/mob/living/carbon/carbon_update_icons.dm
+4 -4
View File
@@ -35,9 +35,9 @@
/mob/living/carbon/proc/update_hands_hud()
if(!hud_used)
return
var/obj/screen/inventory/R = hud_used.inv_slots[slot_r_hand]
var/obj/screen/inventory/R = hud_used.inv_slots[SLOT_HUD_RIGHT_HAND]
R?.update_icon()
var/obj/screen/inventory/L = hud_used.inv_slots[slot_l_hand]
var/obj/screen/inventory/L = hud_used.inv_slots[SLOT_HUD_LEFT_HAND]
L?.update_icon()
/mob/living/carbon/update_inv_r_hand(ignore_cuffs)
@@ -63,8 +63,8 @@
update_hud_wear_mask(wear_mask)
/mob/living/carbon/update_inv_back()
if(client && hud_used && hud_used.inv_slots[slot_back])
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_back]
if(client && hud_used && hud_used.inv_slots[SLOT_HUD_BACK])
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_BACK]
inv.update_icon()
if(back)
code/modules/mob/living/carbon/examine.dm
+1 -1
View File
@@ -184,7 +184,7 @@
var/just_sleeping = FALSE //We don't appear as dead upon casual examination, just sleeping
if(stat == DEAD || HAS_TRAIT(src, TRAIT_FAKEDEATH))
var/obj/item/clothing/glasses/E = get_item_by_slot(slot_glasses)
var/obj/item/clothing/glasses/E = get_item_by_slot(SLOT_HUD_GLASSES)
var/are_we_in_weekend_at_bernies = E?.tint && istype(buckled, /obj/structure/chair) //Are we in a chair with our eyes obscured?
if(isliving(user) && are_we_in_weekend_at_bernies)
code/modules/mob/living/carbon/human/human_inventory.dm
+66 -66
View File
@@ -20,50 +20,50 @@
/mob/living/carbon/human/proc/has_organ_for_slot(slot)
switch(slot)
if(slot_back)
if(SLOT_HUD_BACK)
return has_organ("chest")
if(slot_wear_mask)
if(SLOT_HUD_WEAR_MASK)
return has_organ("head")
if(slot_handcuffed)
if(SLOT_HUD_HANDCUFFED)
return has_organ("l_hand") && has_organ("r_hand")
if(slot_legcuffed)
if(SLOT_HUD_LEGCUFFED)
return has_organ("l_leg") && has_organ("r_leg")
if(slot_l_hand)
if(SLOT_HUD_LEFT_HAND)
return has_organ("l_hand")
if(slot_r_hand)
if(SLOT_HUD_RIGHT_HAND)
return has_organ("r_hand")
if(slot_belt)
if(SLOT_HUD_BELT)
return has_organ("chest")
if(slot_wear_id)
if(SLOT_HUD_WEAR_ID)
// the only relevant check for this is the uniform check
return TRUE
if(slot_wear_pda)
if(SLOT_HUD_WEAR_PDA)
return TRUE
if(slot_l_ear)
if(SLOT_HUD_LEFT_EAR)
return has_organ("head")
if(slot_r_ear)
if(SLOT_HUD_RIGHT_EAR)
return has_organ("head")
if(slot_glasses)
if(SLOT_HUD_GLASSES)
return has_organ("head")
if(slot_gloves)
if(SLOT_HUD_GLOVES)
return has_organ("l_hand") && has_organ("r_hand")
if(slot_head)
if(SLOT_HUD_HEAD)
return has_organ("head")
if(slot_shoes)
if(SLOT_HUD_SHOES)
return has_organ("r_foot") && has_organ("l_foot")
if(slot_wear_suit)
if(SLOT_HUD_OUTER_SUIT)
return has_organ("chest")
if(slot_w_uniform)
if(SLOT_HUD_JUMPSUIT)
return has_organ("chest")
if(slot_l_store)
if(SLOT_HUD_LEFT_STORE)
return has_organ("chest")
if(slot_r_store)
if(SLOT_HUD_RIGHT_STORE)
return has_organ("chest")
if(slot_s_store)
if(SLOT_HUD_SUIT_STORE)
return has_organ("chest")
if(slot_in_backpack)
if(SLOT_HUD_IN_BACKPACK)
return TRUE
if(slot_tie)
if(SLOT_HUD_TIE)
return TRUE
/mob/living/carbon/human/unEquip(obj/item/I, force, silent = FALSE)
@@ -195,10 +195,10 @@
I.plane = ABOVE_HUD_PLANE
switch(slot)
if(slot_back)
if(SLOT_HUD_BACK)
back = I
update_inv_back()
if(slot_wear_mask)
if(SLOT_HUD_WEAR_MASK)
wear_mask = I
if((wear_mask.flags & BLOCKHAIR) || (wear_mask.flags & BLOCKHEADHAIR))
update_hair() //rebuild hair
@@ -208,48 +208,48 @@
sec_hud_set_ID()
wear_mask_update(I, toggle_off = TRUE)
update_inv_wear_mask()
if(slot_handcuffed)
if(SLOT_HUD_HANDCUFFED)
handcuffed = I
update_inv_handcuffed()
if(slot_legcuffed)
if(SLOT_HUD_LEGCUFFED)
legcuffed = I
update_inv_legcuffed()
if(slot_l_hand)
if(SLOT_HUD_LEFT_HAND)
l_hand = I
update_inv_l_hand()
if(slot_r_hand)
if(SLOT_HUD_RIGHT_HAND)
r_hand = I
update_inv_r_hand()
if(slot_belt)
if(SLOT_HUD_BELT)
belt = I
update_inv_belt()
if(slot_wear_id)
if(SLOT_HUD_WEAR_ID)
wear_id = I
if(hud_list.len)
sec_hud_set_ID()
update_inv_wear_id()
if(slot_wear_pda)
if(SLOT_HUD_WEAR_PDA)
wear_pda = I
update_inv_wear_pda()
if(slot_l_ear)
if(SLOT_HUD_LEFT_EAR)
l_ear = I
if(l_ear.slot_flags & SLOT_TWOEARS)
if(l_ear.slot_flags & SLOT_FLAG_TWOEARS)
var/obj/item/clothing/ears/offear/O = new(I)
O.forceMove(src)
r_ear = O
O.layer = ABOVE_HUD_LAYER
O.plane = ABOVE_HUD_PLANE
update_inv_ears()
if(slot_r_ear)
if(SLOT_HUD_RIGHT_EAR)
r_ear = I
if(r_ear.slot_flags & SLOT_TWOEARS)
if(r_ear.slot_flags & SLOT_FLAG_TWOEARS)
var/obj/item/clothing/ears/offear/O = new(I)
O.forceMove(src)
l_ear = O
O.layer = ABOVE_HUD_LAYER
O.plane = ABOVE_HUD_PLANE
update_inv_ears()
if(slot_glasses)
if(SLOT_HUD_GLASSES)
glasses = I
var/obj/item/clothing/glasses/G = I
if(G.tint)
@@ -260,10 +260,10 @@
update_sight()
update_inv_glasses()
update_client_colour()
if(slot_gloves)
if(SLOT_HUD_GLOVES)
gloves = I
update_inv_gloves()
if(slot_head)
if(SLOT_HUD_HEAD)
head = I
if((head.flags & BLOCKHAIR) || (head.flags & BLOCKHEADHAIR))
update_hair() //rebuild hair
@@ -276,27 +276,27 @@
update_sight()
head_update(I)
update_inv_head()
if(slot_shoes)
if(SLOT_HUD_SHOES)
shoes = I
update_inv_shoes()
if(slot_wear_suit)
if(SLOT_HUD_OUTER_SUIT)
wear_suit = I
if(wear_suit.flags_inv & HIDESHOES)
update_inv_shoes()
update_inv_wear_suit()
if(slot_w_uniform)
if(SLOT_HUD_JUMPSUIT)
w_uniform = I
update_inv_w_uniform()
if(slot_l_store)
if(SLOT_HUD_LEFT_STORE)
l_store = I
update_inv_pockets()
if(slot_r_store)
if(SLOT_HUD_RIGHT_STORE)
r_store = I
update_inv_pockets()
if(slot_s_store)
if(SLOT_HUD_SUIT_STORE)
s_store = I
update_inv_s_store()
if(slot_in_backpack)
if(SLOT_HUD_IN_BACKPACK)
if(get_active_hand() == I)
unEquip(I)
if(ismodcontrol(back))
@@ -305,7 +305,7 @@
I.forceMove(C.bag)
else
I.forceMove(back)
if(slot_tie)
if(SLOT_HUD_TIE)
var/obj/item/clothing/under/uniform = src.w_uniform
uniform.attackby(I, src)
else
@@ -329,45 +329,45 @@
// Return the item currently in the slot ID
/mob/living/carbon/human/get_item_by_slot(slot_id)
switch(slot_id)
if(slot_back)
if(SLOT_HUD_BACK)
return back
if(slot_wear_mask)
if(SLOT_HUD_WEAR_MASK)
return wear_mask
if(slot_handcuffed)
if(SLOT_HUD_HANDCUFFED)
return handcuffed
if(slot_legcuffed)
if(SLOT_HUD_LEGCUFFED)
return legcuffed
if(slot_l_hand)
if(SLOT_HUD_LEFT_HAND)
return l_hand
if(slot_r_hand)
if(SLOT_HUD_RIGHT_HAND)
return r_hand
if(slot_belt)
if(SLOT_HUD_BELT)
return belt
if(slot_wear_id)
if(SLOT_HUD_WEAR_ID)
return wear_id
if(slot_wear_pda)
if(SLOT_HUD_WEAR_PDA)
return wear_pda
if(slot_l_ear)
if(SLOT_HUD_LEFT_EAR)
return l_ear
if(slot_r_ear)
if(SLOT_HUD_RIGHT_EAR)
return r_ear
if(slot_glasses)
if(SLOT_HUD_GLASSES)
return glasses
if(slot_gloves)
if(SLOT_HUD_GLOVES)
return gloves
if(slot_head)
if(SLOT_HUD_HEAD)
return head
if(slot_shoes)
if(SLOT_HUD_SHOES)
return shoes
if(slot_wear_suit)
if(SLOT_HUD_OUTER_SUIT)
return wear_suit
if(slot_w_uniform)
if(SLOT_HUD_JUMPSUIT)
return w_uniform
if(slot_l_store)
if(SLOT_HUD_LEFT_STORE)
return l_store
if(slot_r_store)
if(SLOT_HUD_RIGHT_STORE)
return r_store
if(slot_s_store)
if(SLOT_HUD_SUIT_STORE)
return s_store
return null
code/modules/mob/living/carbon/human/human_mob.dm
+52 -52
View File
@@ -306,21 +306,21 @@
var/list/obscured = check_obscured_slots()
var/dat = {"<table>
<tr><td><B>Left Hand:</B></td><td><A href='?src=[UID()];item=[slot_l_hand]'>[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td><B>Right Hand:</B></td><td><A href='?src=[UID()];item=[slot_r_hand]'>[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td><B>Left Hand:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_LEFT_HAND]'>[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td><B>Right Hand:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_RIGHT_HAND]'>[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td>&nbsp;</td></tr>"}
dat += "<tr><td><B>Back:</B></td><td><A href='?src=[UID()];item=[slot_back]'>[(back && !(back.flags&ABSTRACT)) ? html_encode(back) : "<font color=grey>Empty</font>"]</A>"
dat += "<tr><td><B>Back:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_BACK]'>[(back && !(back.flags&ABSTRACT)) ? html_encode(back) : "<font color=grey>Empty</font>"]</A>"
if(has_breathable_mask && istype(back, /obj/item/tank))
dat += "&nbsp;<A href='?src=[UID()];internal=[slot_back]'>[internal ? "Disable Internals" : "Set Internals"]</A>"
dat += "&nbsp;<A href='?src=[UID()];internal=[SLOT_HUD_BACK]'>[internal ? "Disable Internals" : "Set Internals"]</A>"
dat += "</td></tr><tr><td>&nbsp;</td></tr>"
dat += "<tr><td><B>Head:</B></td><td><A href='?src=[UID()];item=[slot_head]'>[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td><B>Head:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_HEAD]'>[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "<font color=grey>Empty</font>"]</A></td></tr>"
var/obj/item/organ/internal/headpocket/C = get_int_organ(/obj/item/organ/internal/headpocket)
if(C)
if(slot_wear_mask in obscured)
if(SLOT_HUD_WEAR_MASK in obscured)
dat += "<tr><td><font color=grey>&nbsp;&#8627;<B>Headpocket:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
else
if(C.held_item)
@@ -328,10 +328,10 @@
else
dat += "<tr><td>&nbsp;&#8627;<B>Headpocket:</B></td><td><font color=grey>Empty</font></td></tr>"
if(slot_wear_mask in obscured)
if(SLOT_HUD_WEAR_MASK in obscured)
dat += "<tr><td><font color=grey><B>Mask:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
else
dat += "<tr><td><B>Mask:</B></td><td><A href='?src=[UID()];item=[slot_wear_mask]'>[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? html_encode(wear_mask) : "<font color=grey>Empty</font>"]</A>"
dat += "<tr><td><B>Mask:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_WEAR_MASK]'>[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? html_encode(wear_mask) : "<font color=grey>Empty</font>"]</A>"
if(istype(wear_mask, /obj/item/clothing/mask/muzzle))
var/obj/item/clothing/mask/muzzle/M = wear_mask
@@ -341,57 +341,57 @@
dat += "</td></tr><tr><td>&nbsp;</td></tr>"
if(!issmall(src))
if(slot_glasses in obscured)
if(SLOT_HUD_GLASSES in obscured)
dat += "<tr><td><font color=grey><B>Eyes:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
else
dat += "<tr><td><B>Eyes:</B></td><td><A href='?src=[UID()];item=[slot_glasses]'>[(glasses && !(glasses.flags&ABSTRACT)) ? html_encode(glasses) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td><B>Eyes:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_GLASSES]'>[(glasses && !(glasses.flags&ABSTRACT)) ? html_encode(glasses) : "<font color=grey>Empty</font>"]</A></td></tr>"
if(slot_l_ear in obscured)
if(SLOT_HUD_LEFT_EAR in obscured)
dat += "<tr><td><font color=grey><B>Left Ear:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
else
dat += "<tr><td><B>Left Ear:</B></td><td><A href='?src=[UID()];item=[slot_l_ear]'>[(l_ear && !(l_ear.flags&ABSTRACT)) ? html_encode(l_ear) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td><B>Left Ear:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_LEFT_EAR]'>[(l_ear && !(l_ear.flags&ABSTRACT)) ? html_encode(l_ear) : "<font color=grey>Empty</font>"]</A></td></tr>"
if(slot_r_ear in obscured)
if(SLOT_HUD_RIGHT_EAR in obscured)
dat += "<tr><td><font color=grey><B>Right Ear:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
else
dat += "<tr><td><B>Right Ear:</B></td><td><A href='?src=[UID()];item=[slot_r_ear]'>[(r_ear && !(r_ear.flags&ABSTRACT)) ? html_encode(r_ear) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td><B>Right Ear:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_RIGHT_EAR]'>[(r_ear && !(r_ear.flags&ABSTRACT)) ? html_encode(r_ear) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td>&nbsp;</td></tr>"
dat += "<tr><td><B>Exosuit:</B></td><td><A href='?src=[UID()];item=[slot_wear_suit]'>[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? html_encode(wear_suit) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td><B>Exosuit:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_OUTER_SUIT]'>[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? html_encode(wear_suit) : "<font color=grey>Empty</font>"]</A></td></tr>"
if(wear_suit)
dat += "<tr><td>&nbsp;&#8627;<B>Suit Storage:</B></td><td><A href='?src=[UID()];item=[slot_s_store]'>[(s_store && !(s_store.flags&ABSTRACT)) ? html_encode(s_store) : "<font color=grey>Empty</font>"]</A>"
dat += "<tr><td>&nbsp;&#8627;<B>Suit Storage:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_SUIT_STORE]'>[(s_store && !(s_store.flags&ABSTRACT)) ? html_encode(s_store) : "<font color=grey>Empty</font>"]</A>"
if(has_breathable_mask && istype(s_store, /obj/item/tank))
dat += "&nbsp;<A href='?src=[UID()];internal=[slot_s_store]'>[internal ? "Disable Internals" : "Set Internals"]</A>"
dat += "&nbsp;<A href='?src=[UID()];internal=[SLOT_HUD_SUIT_STORE]'>[internal ? "Disable Internals" : "Set Internals"]</A>"
dat += "</td></tr>"
else
dat += "<tr><td><font color=grey>&nbsp;&#8627;<B>Suit Storage:</B></font></td></tr>"
if(slot_shoes in obscured)
if(SLOT_HUD_SHOES in obscured)
dat += "<tr><td><font color=grey><B>Shoes:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
else
dat += "<tr><td><B>Shoes:</B></td><td><A href='?src=[UID()];item=[html_encode(slot_shoes)]'>[(shoes && !(shoes.flags&ABSTRACT)) ? html_encode(shoes) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td><B>Shoes:</B></td><td><A href='?src=[UID()];item=[html_encode(SLOT_HUD_SHOES)]'>[(shoes && !(shoes.flags&ABSTRACT)) ? html_encode(shoes) : "<font color=grey>Empty</font>"]</A></td></tr>"
if(slot_gloves in obscured)
if(SLOT_HUD_GLOVES in obscured)
dat += "<tr><td><font color=grey><B>Gloves:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
else
dat += "<tr><td><B>Gloves:</B></td><td><A href='?src=[UID()];item=[slot_gloves]'>[(gloves && !(gloves.flags&ABSTRACT)) ? html_encode(gloves) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td><B>Gloves:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_GLOVES]'>[(gloves && !(gloves.flags&ABSTRACT)) ? html_encode(gloves) : "<font color=grey>Empty</font>"]</A></td></tr>"
if(slot_w_uniform in obscured)
if(SLOT_HUD_JUMPSUIT in obscured)
dat += "<tr><td><font color=grey><B>Uniform:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
else
dat += "<tr><td><B>Uniform:</B></td><td><A href='?src=[UID()];item=[slot_w_uniform]'>[(w_uniform && !(w_uniform.flags&ABSTRACT)) ? html_encode(w_uniform) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td><B>Uniform:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_JUMPSUIT]'>[(w_uniform && !(w_uniform.flags&ABSTRACT)) ? html_encode(w_uniform) : "<font color=grey>Empty</font>"]</A></td></tr>"
if((w_uniform == null && !(dna && dna.species.nojumpsuit)) || (slot_w_uniform in obscured))
if((w_uniform == null && !(dna && dna.species.nojumpsuit)) || (SLOT_HUD_JUMPSUIT in obscured))
dat += "<tr><td><font color=grey>&nbsp;&#8627;<B>Pockets:</B></font></td></tr>"
dat += "<tr><td><font color=grey>&nbsp;&#8627;<B>ID:</B></font></td></tr>"
dat += "<tr><td><font color=grey>&nbsp;&#8627;<B>Belt:</B></font></td></tr>"
dat += "<tr><td><font color=grey>&nbsp;&#8627;<B>Suit Sensors:</B></font></td></tr>"
dat += "<tr><td><font color=grey>&nbsp;&#8627;<B>PDA:</B></font></td></tr>"
else
dat += "<tr><td>&nbsp;&#8627;<B>Belt:</B></td><td><A href='?src=[UID()];item=[slot_belt]'>[(belt && !(belt.flags&ABSTRACT)) ? html_encode(belt) : "<font color=grey>Empty</font>"]</A>"
dat += "<tr><td>&nbsp;&#8627;<B>Belt:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_BELT]'>[(belt && !(belt.flags&ABSTRACT)) ? html_encode(belt) : "<font color=grey>Empty</font>"]</A>"
if(has_breathable_mask && istype(belt, /obj/item/tank))
dat += "&nbsp;<A href='?src=[UID()];internal=[slot_belt]'>[internal ? "Disable Internals" : "Set Internals"]</A>"
dat += "&nbsp;<A href='?src=[UID()];internal=[SLOT_HUD_BELT]'>[internal ? "Disable Internals" : "Set Internals"]</A>"
dat += "</td></tr>"
// Pockets
dat += "<tr><td>&nbsp;&#8627;<B>Pockets:</B></td><td><A href='?src=[UID()];pockets=left'>"
@@ -409,8 +409,8 @@
else
dat += "<font color=grey>Right (Empty)</font>"
dat += "</A></td></tr>"
dat += "<tr><td>&nbsp;&#8627;<B>ID:</B></td><td><A href='?src=[UID()];item=[slot_wear_id]'>[(wear_id && !(wear_id.flags&ABSTRACT)) ? html_encode(wear_id) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td>&nbsp;&#8627;<B>PDA:</B></td><td><A href='?src=[UID()];item=[slot_wear_pda]'>[(wear_pda && !(wear_pda.flags&ABSTRACT)) ? "Full" : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td>&nbsp;&#8627;<B>ID:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_WEAR_ID]'>[(wear_id && !(wear_id.flags&ABSTRACT)) ? html_encode(wear_id) : "<font color=grey>Empty</font>"]</A></td></tr>"
dat += "<tr><td>&nbsp;&#8627;<B>PDA:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_WEAR_PDA]'>[(wear_pda && !(wear_pda.flags&ABSTRACT)) ? "Full" : "<font color=grey>Empty</font>"]</A></td></tr>"
if(istype(w_uniform, /obj/item/clothing/under))
var/obj/item/clothing/under/U = w_uniform
@@ -421,9 +421,9 @@
if(handcuffed)
dat += "<tr><td><B>Handcuffed:</B> <A href='?src=[UID()];item=[slot_handcuffed]'>Remove</A></td></tr>"
dat += "<tr><td><B>Handcuffed:</B> <A href='?src=[UID()];item=[SLOT_HUD_HANDCUFFED]'>Remove</A></td></tr>"
if(legcuffed)
dat += "<tr><td><b>Legcuffed:</b> <a href='?src=[UID()];item=[slot_legcuffed]'>Remove</a></td></tr>"
dat += "<tr><td><b>Legcuffed:</b> <a href='?src=[UID()];item=[SLOT_HUD_LEGCUFFED]'>Remove</a></td></tr>"
dat += {"</table>
<A href='?src=[user.UID()];mach_close=mob\ref[src]'>Close</A>
@@ -644,8 +644,8 @@
if(href_list["pockets"])
var/pocket_side = href_list["pockets"]
var/pocket_id = (pocket_side == "right" ? slot_r_store : slot_l_store)
var/obj/item/pocket_item = (pocket_id == slot_r_store ? r_store : l_store)
var/pocket_id = (pocket_side == "right" ? SLOT_HUD_RIGHT_STORE : SLOT_HUD_LEFT_STORE)
var/obj/item/pocket_item = (pocket_id == SLOT_HUD_RIGHT_STORE ? r_store : l_store)
var/obj/item/place_item = usr.get_active_hand() // Item to place in the pocket, if it's empty
var/delay_denominator = 1
@@ -661,7 +661,7 @@
if(do_mob(usr, src, POCKET_STRIP_DELAY/delay_denominator)) //placing an item into the pocket is 4 times faster
if(pocket_item)
if(pocket_item == (pocket_id == slot_r_store ? r_store : l_store)) //item still in the pocket we search
if(pocket_item == (pocket_id == SLOT_HUD_RIGHT_STORE ? r_store : l_store)) //item still in the pocket we search
unEquip(pocket_item)
if(thief_mode)
usr.put_in_hands(pocket_item)
@@ -1066,20 +1066,20 @@
if(wear_suit)
if(wear_suit.flags_inv & HIDEGLOVES)
obscured |= slot_gloves
obscured |= SLOT_HUD_GLOVES
if(wear_suit.flags_inv & HIDEJUMPSUIT)
obscured |= slot_w_uniform
obscured |= SLOT_HUD_JUMPSUIT
if(wear_suit.flags_inv & HIDESHOES)
obscured |= slot_shoes
obscured |= SLOT_HUD_SHOES
if(head)
if(head.flags_inv & HIDEMASK)
obscured |= slot_wear_mask
obscured |= SLOT_HUD_WEAR_MASK
if(head.flags_inv & HIDEEYES)
obscured |= slot_glasses
obscured |= SLOT_HUD_GLASSES
if(head.flags_inv & HIDEEARS)
obscured |= slot_r_ear
obscured |= slot_l_ear
obscured |= SLOT_HUD_RIGHT_EAR
obscured |= SLOT_HUD_LEFT_EAR
if(obscured.len > 0)
return obscured
@@ -1096,7 +1096,7 @@
/mob/living/carbon/human/proc/get_visible_gender()
var/list/obscured = check_obscured_slots()
var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
if((slot_w_uniform in obscured) && skipface)
if((SLOT_HUD_JUMPSUIT in obscured) && skipface)
return PLURAL
return gender
@@ -1300,7 +1300,7 @@
if(!(dna.species.bodyflags & HAS_SKIN_TONE))
s_tone = 0
var/list/thing_to_check = list(slot_wear_mask, slot_head, slot_shoes, slot_gloves, slot_l_ear, slot_r_ear, slot_glasses, slot_l_hand, slot_r_hand)
var/list/thing_to_check = list(SLOT_HUD_WEAR_MASK, SLOT_HUD_HEAD, SLOT_HUD_SHOES, SLOT_HUD_GLOVES, SLOT_HUD_LEFT_EAR, SLOT_HUD_RIGHT_EAR, SLOT_HUD_GLASSES, SLOT_HUD_LEFT_HAND, SLOT_HUD_RIGHT_HAND)
var/list/kept_items[0]
var/list/item_flags[0]
for(var/thing in thing_to_check)
@@ -1963,8 +1963,8 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
organs_list[O.name] = O.serialize()
// Equipment
equip_list.len = slots_amt
for(var/i = 1, i < slots_amt, i++)
equip_list.len = SLOT_HUD_AMOUNT
for(var/i = 1, i < SLOT_HUD_AMOUNT, i++)
var/obj/item/thing = get_item_by_slot(i)
if(thing != null)
equip_list[i] = thing.serialize()
@@ -2023,16 +2023,16 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
// #1: Jumpsuit
// #2: Outer suit
// #3+: Everything else
if(islist(equip_list[slot_w_uniform]))
var/obj/item/clothing/C = list_to_object(equip_list[slot_w_uniform], T)
equip_to_slot_if_possible(C, slot_w_uniform)
if(islist(equip_list[SLOT_HUD_JUMPSUIT]))
var/obj/item/clothing/C = list_to_object(equip_list[SLOT_HUD_JUMPSUIT], T)
equip_to_slot_if_possible(C, SLOT_HUD_JUMPSUIT)
if(islist(equip_list[slot_wear_suit]))
var/obj/item/clothing/C = list_to_object(equip_list[slot_wear_suit], T)
equip_to_slot_if_possible(C, slot_wear_suit)
if(islist(equip_list[SLOT_HUD_OUTER_SUIT]))
var/obj/item/clothing/C = list_to_object(equip_list[SLOT_HUD_OUTER_SUIT], T)
equip_to_slot_if_possible(C, SLOT_HUD_OUTER_SUIT)
for(var/i = 1, i < slots_amt, i++)
if(i == slot_w_uniform || i == slot_wear_suit)
for(var/i = 1, i < SLOT_HUD_AMOUNT, i++)
if(i == SLOT_HUD_JUMPSUIT || i == SLOT_HUD_OUTER_SUIT)
continue
if(islist(equip_list[i]))
var/obj/item/clothing/C = list_to_object(equip_list[i], T)
code/modules/mob/living/carbon/human/human_update_icons.dm
+16 -16
View File
@@ -572,7 +572,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/update_inv_w_uniform()
remove_overlay(UNIFORM_LAYER)
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_w_uniform]
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_JUMPSUIT]
if(inv)
inv.update_icon()
@@ -646,7 +646,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/update_inv_wear_id()
remove_overlay(ID_LAYER)
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_wear_id]
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_ID]
if(inv)
inv.update_icon()
@@ -662,7 +662,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/update_inv_gloves()
remove_overlay(GLOVES_LAYER)
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_gloves]
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_GLOVES]
if(inv)
inv.update_icon()
@@ -702,7 +702,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
remove_overlay(OVER_MASK_LAYER)
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_glasses]
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_GLASSES]
if(inv)
inv.update_icon()
@@ -740,12 +740,12 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/update_inv_ears()
remove_overlay(EARS_LAYER)
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_l_ear]
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_LEFT_EAR]
if(inv)
inv.update_icon()
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_r_ear]
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_RIGHT_EAR]
if(inv)
inv.update_icon()
@@ -788,7 +788,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/update_inv_shoes()
remove_overlay(SHOES_LAYER)
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_shoes]
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_SHOES]
if(inv)
inv.update_icon()
@@ -824,7 +824,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/update_inv_s_store()
remove_overlay(SUIT_STORE_LAYER)
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_s_store]
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_SUIT_STORE]
if(inv)
inv.update_icon()
@@ -846,7 +846,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
..()
remove_overlay(HEAD_LAYER)
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_head]
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_HEAD]
if(inv)
inv.update_icon()
@@ -875,7 +875,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/update_inv_belt()
remove_overlay(BELT_LAYER)
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_belt]
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_BELT]
if(inv)
inv.update_icon()
@@ -901,7 +901,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/update_inv_wear_suit()
remove_overlay(SUIT_LAYER)
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_wear_suit]
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_OUTER_SUIT]
if(inv)
inv.update_icon()
@@ -947,11 +947,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
if(client && hud_used)
var/obj/screen/inventory/inv
inv = hud_used.inv_slots[slot_l_store]
inv = hud_used.inv_slots[SLOT_HUD_LEFT_STORE]
if(inv)
inv.update_icon()
inv = hud_used.inv_slots[slot_r_store]
inv = hud_used.inv_slots[SLOT_HUD_RIGHT_STORE]
if(inv)
inv.update_icon()
@@ -966,7 +966,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/update_inv_wear_pda()
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_wear_pda]
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_PDA]
if(inv)
inv.update_icon()
@@ -978,11 +978,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
..()
remove_overlay(FACEMASK_LAYER)
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_wear_mask]
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_MASK]
if(inv)
inv.update_icon()
if(wear_mask && (istype(wear_mask, /obj/item/clothing/mask) || istype(wear_mask, /obj/item/clothing/accessory)))
if(!(slot_wear_mask in check_obscured_slots()))
if(!(SLOT_HUD_WEAR_MASK in check_obscured_slots()))
var/obj/item/organ/external/head/head_organ = get_organ("head")
if(!istype(head_organ))
return // Nothing to update here
code/modules/mob/living/carbon/human/npcs.dm
+1 -1
View File
@@ -13,7 +13,7 @@
. = ..()
name = "Pun Pun"
real_name = name
equip_to_slot(new /obj/item/clothing/under/punpun(src), slot_w_uniform)
equip_to_slot(new /obj/item/clothing/under/punpun(src), SLOT_HUD_JUMPSUIT)
/mob/living/carbon/human/monkey/teeny/Initialize(mapload)
. = ..()
code/modules/mob/living/carbon/human/species/_species.dm
+38 -38
View File
@@ -732,21 +732,21 @@
return FALSE
switch(slot)
if(slot_l_hand)
if(SLOT_HUD_LEFT_HAND)
return !H.l_hand && !H.incapacitated()
if(slot_r_hand)
if(SLOT_HUD_RIGHT_HAND)
return !H.r_hand && !H.incapacitated()
if(slot_wear_mask)
return !H.wear_mask && (I.slot_flags & SLOT_MASK)
if(slot_back)
return !H.back && (I.slot_flags & SLOT_BACK)
if(slot_wear_suit)
return !H.wear_suit && (I.slot_flags & SLOT_OCLOTHING)
if(slot_gloves)
return !H.gloves && (I.slot_flags & SLOT_GLOVES)
if(slot_shoes)
return !H.shoes && (I.slot_flags & SLOT_FEET)
if(slot_belt)
if(SLOT_HUD_WEAR_MASK)
return !H.wear_mask && (I.slot_flags & SLOT_FLAG_MASK)
if(SLOT_HUD_BACK)
return !H.back && (I.slot_flags & SLOT_FLAG_BACK)
if(SLOT_HUD_OUTER_SUIT)
return !H.wear_suit && (I.slot_flags & SLOT_FLAG_OCLOTHING)
if(SLOT_HUD_GLOVES)
return !H.gloves && (I.slot_flags & SLOT_FLAG_GLOVES)
if(SLOT_HUD_SHOES)
return !H.shoes && (I.slot_flags & SLOT_FLAG_FEET)
if(SLOT_HUD_BELT)
if(H.belt)
return FALSE
var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST)
@@ -755,20 +755,20 @@
if(!disable_warning)
to_chat(H, "<span class='alert'>You need a jumpsuit before you can attach this [I.name].</span>")
return FALSE
if(!(I.slot_flags & SLOT_BELT))
if(!(I.slot_flags & SLOT_FLAG_BELT))
return
return TRUE
if(slot_glasses)
return !H.glasses && (I.slot_flags & SLOT_EYES)
if(slot_head)
return !H.head && (I.slot_flags & SLOT_HEAD)
if(slot_l_ear)
return !H.l_ear && (I.slot_flags & SLOT_EARS) && !((I.slot_flags & SLOT_TWOEARS) && H.r_ear)
if(slot_r_ear)
return !H.r_ear && (I.slot_flags & SLOT_EARS) && !((I.slot_flags & SLOT_TWOEARS) && H.l_ear)
if(slot_w_uniform)
return !H.w_uniform && (I.slot_flags & SLOT_ICLOTHING)
if(slot_wear_id)
if(SLOT_HUD_GLASSES)
return !H.glasses && (I.slot_flags & SLOT_FLAG_EYES)
if(SLOT_HUD_HEAD)
return !H.head && (I.slot_flags & SLOT_FLAG_HEAD)
if(SLOT_HUD_LEFT_EAR)
return !H.l_ear && (I.slot_flags & SLOT_FLAG_EARS) && !((I.slot_flags & SLOT_FLAG_TWOEARS) && H.r_ear)
if(SLOT_HUD_RIGHT_EAR)
return !H.r_ear && (I.slot_flags & SLOT_FLAG_EARS) && !((I.slot_flags & SLOT_FLAG_TWOEARS) && H.l_ear)
if(SLOT_HUD_JUMPSUIT)
return !H.w_uniform && (I.slot_flags & SLOT_FLAG_ICLOTHING)
if(SLOT_HUD_WEAR_ID)
if(H.wear_id)
return FALSE
var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST)
@@ -777,10 +777,10 @@
if(!disable_warning)
to_chat(H, "<span class='alert'>You need a jumpsuit before you can attach this [I.name].</span>")
return FALSE
if(!(I.slot_flags & SLOT_ID))
if(!(I.slot_flags & SLOT_FLAG_ID))
return FALSE
return TRUE
if(slot_wear_pda)
if(SLOT_HUD_WEAR_PDA)
if(H.wear_pda)
return FALSE
var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST)
@@ -789,10 +789,10 @@
if(!disable_warning)
to_chat(H, "<span class='alert'>You need a jumpsuit before you can attach this [I.name].</span>")
return FALSE
if(!(I.slot_flags & SLOT_PDA))
if(!(I.slot_flags & SLOT_FLAG_PDA))
return FALSE
return TRUE
if(slot_l_store)
if(SLOT_HUD_LEFT_STORE)
if(I.flags & NODROP) //Pockets aren't visible, so you can't move NODROP items into them.
return FALSE
if(H.l_store)
@@ -803,9 +803,9 @@
if(!disable_warning)
to_chat(H, "<span class='alert'>You need a jumpsuit before you can attach this [I.name].</span>")
return FALSE
if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & SLOT_POCKET))
if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & SLOT_FLAG_POCKET))
return TRUE
if(slot_r_store)
if(SLOT_HUD_RIGHT_STORE)
if(I.flags & NODROP)
return FALSE
if(H.r_store)
@@ -816,10 +816,10 @@
if(!disable_warning)
to_chat(H, "<span class='alert'>You need a jumpsuit before you can attach this [I.name].</span>")
return FALSE
if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & SLOT_POCKET))
if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & SLOT_FLAG_POCKET))
return TRUE
return FALSE
if(slot_s_store)
if(SLOT_HUD_SUIT_STORE)
if(I.flags & NODROP) //Suit storage NODROP items drop if you take a suit off, this is to prevent people exploiting this.
return FALSE
if(H.s_store)
@@ -839,11 +839,11 @@
if(istype(I, /obj/item/pda) || is_pen(I) || is_type_in_list(I, H.wear_suit.allowed))
return TRUE
return FALSE
if(slot_handcuffed)
if(SLOT_HUD_HANDCUFFED)
return !H.handcuffed && istype(I, /obj/item/restraints/handcuffs)
if(slot_legcuffed)
if(SLOT_HUD_LEGCUFFED)
return !H.legcuffed && istype(I, /obj/item/restraints/legcuffs)
if(slot_in_backpack)
if(SLOT_HUD_IN_BACKPACK)
if(H.back && istype(H.back, /obj/item/storage/backpack))
var/obj/item/storage/backpack/B = H.back
if(B.contents.len < B.storage_slots && I.w_class <= B.max_w_class)
@@ -855,7 +855,7 @@
if(B.contents.len < B.storage_slots && I.w_class <= B.max_w_class)
return TRUE
return FALSE
if(slot_tie)
if(SLOT_HUD_TIE)
if(!istype(I, /obj/item/clothing/accessory))
return FALSE
var/obj/item/clothing/under/uniform = H.w_uniform
@@ -867,7 +867,7 @@
if(!disable_warning)
to_chat(H, "<span class='warning'>You already have an accessory of this type attached to your [uniform].</span>")
return FALSE
if(!(I.slot_flags & SLOT_TIE))
if(!(I.slot_flags & SLOT_FLAG_TIE))
return FALSE
return TRUE
code/modules/mob/living/carbon/human/species/golem.dm
+6 -6
View File
@@ -15,7 +15,7 @@
punchdamagelow = 5
punchdamagehigh = 14
punchstunthreshold = 11 //about 40% chance to stun
no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform, slot_s_store)
no_equip = list(SLOT_HUD_WEAR_MASK, SLOT_HUD_OUTER_SUIT, SLOT_HUD_GLOVES, SLOT_HUD_SHOES, SLOT_HUD_JUMPSUIT, SLOT_HUD_SUIT_STORE)
nojumpsuit = TRUE
dietflags = DIET_OMNI //golems can eat anything because they are magic or something
@@ -571,8 +571,8 @@
..()
last_banana = world.time
last_honk = world.time
H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(H), slot_r_store)
H.equip_to_slot_or_del(new /obj/item/bikehorn(H), slot_l_store)
H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(H), SLOT_HUD_RIGHT_STORE)
H.equip_to_slot_or_del(new /obj/item/bikehorn(H), SLOT_HUD_LEFT_STORE)
H.AddElement(/datum/element/waddling)
/datum/species/golem/bananium/on_species_loss(mob/living/carbon/C)
@@ -649,9 +649,9 @@
/datum/species/golem/tranquillite/on_species_gain(mob/living/carbon/human/H)
..()
H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_r_store)
H.equip_to_slot_or_del(new /obj/item/cane(H), slot_l_hand)
H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), SLOT_HUD_HEAD)
H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(H), SLOT_HUD_RIGHT_STORE)
H.equip_to_slot_or_del(new /obj/item/cane(H), SLOT_HUD_LEFT_HAND)
if(H.mind)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe/conjure/build/mime_wall(null))
H.mind.AddSpell(new /obj/effect/proc_holder/spell/mime/speak(null))
code/modules/mob/living/carbon/human/species/monkey.dm
+1 -1
View File
@@ -13,7 +13,7 @@
species_traits = list(NOT_SELECTABLE)
skinned_type = /obj/item/stack/sheet/animalhide/monkey
greater_form = /datum/species/human
no_equip = list(slot_belt, slot_wear_id, slot_l_ear, slot_r_ear, slot_glasses, slot_gloves, slot_shoes, slot_wear_suit, slot_w_uniform, slot_l_store, slot_r_store, slot_s_store, slot_wear_pda)
no_equip = list(SLOT_HUD_BELT, SLOT_HUD_WEAR_ID, SLOT_HUD_LEFT_EAR, SLOT_HUD_RIGHT_EAR, SLOT_HUD_GLASSES, SLOT_HUD_GLOVES, SLOT_HUD_SHOES, SLOT_HUD_OUTER_SUIT, SLOT_HUD_JUMPSUIT, SLOT_HUD_LEFT_STORE, SLOT_HUD_RIGHT_STORE, SLOT_HUD_SUIT_STORE, SLOT_HUD_WEAR_PDA)
inherent_factions = list("jungle", "monkey")
can_craft = FALSE
is_small = 1
code/modules/mob/living/carbon/human/species/plasmaman.dm
+2 -2
View File
@@ -178,7 +178,7 @@
if(!H.mind || !H.mind.assigned_role || H.mind.assigned_role != "Clown" && H.mind.assigned_role != "Mime")
H.unEquip(H.wear_mask)
H.equip_or_collect(new /obj/item/clothing/mask/breath(H), slot_wear_mask)
H.equip_or_collect(new /obj/item/clothing/mask/breath(H), SLOT_HUD_WEAR_MASK)
var/tank_pref = H.client && H.client.prefs ? H.client.prefs.active_character.speciesprefs : null
var/obj/item/tank/internal_tank
if(tank_pref) //Diseasel, here you go
@@ -187,7 +187,7 @@
internal_tank = new /obj/item/tank/internals/plasmaman/belt/full(H)
if(!H.equip_to_appropriate_slot(internal_tank) && !H.put_in_any_hand_if_possible(internal_tank))
H.unEquip(H.l_hand)
H.equip_or_collect(internal_tank, slot_l_hand)
H.equip_or_collect(internal_tank, SLOT_HUD_LEFT_HAND)
to_chat(H, "<span class='boldannounce'>Could not find an empty slot for internals! Please report this as a bug.</span>")
stack_trace("Failed to equip plasmaman with a tank, with the job [J.type]")
H.internal = internal_tank
code/modules/mob/living/carbon/human/species/vox.dm
+2 -2
View File
@@ -80,7 +80,7 @@
if(!H.mind || !H.mind.assigned_role || H.mind.assigned_role != "Clown" && H.mind.assigned_role != "Mime")
H.unEquip(H.wear_mask)
H.equip_or_collect(new /obj/item/clothing/mask/breath/vox/respirator(H), slot_wear_mask)
H.equip_or_collect(new /obj/item/clothing/mask/breath/vox/respirator(H), SLOT_HUD_WEAR_MASK)
var/tank_pref = H.client && H.client.prefs ? H.client.prefs.active_character.speciesprefs : null
var/obj/item/tank/internal_tank
if(tank_pref)//Diseasel, here you go
@@ -90,7 +90,7 @@
if(!H.equip_to_appropriate_slot(internal_tank))
if(!H.put_in_any_hand_if_possible(internal_tank))
H.unEquip(H.l_hand)
H.equip_or_collect(internal_tank, slot_l_hand)
H.equip_or_collect(internal_tank, SLOT_HUD_LEFT_HAND)
to_chat(H, "<span class='boldannounce'>Could not find an empty slot for internals! Please report this as a bug</span>")
H.internal = internal_tank
to_chat(H, "<span class='notice'>You are now running on nitrogen internals from [internal_tank]. Your species finds oxygen toxic, so you must breathe nitrogen only.</span>")
code/modules/mob/living/carbon/superheroes.dm
+28 -28
View File
@@ -22,7 +22,7 @@
H.rename_character(H.real_name, name)
for(var/obj/item/W in H.get_all_slots())
H.unEquip(W)
H.equip_to_slot_or_del(new /obj/item/radio/headset(H), slot_l_ear)
H.equip_to_slot_or_del(new /obj/item/radio/headset(H), SLOT_HUD_LEFT_EAR)
/datum/superheroes/proc/fixflags(mob/living/carbon/human/H)
for(var/obj/item/W in H.get_all_slots())
@@ -58,7 +58,7 @@
W.SetOwnerInfo(H)
W.UpdateName()
W.flags |= NODROP
H.equip_to_slot_or_del(W, slot_wear_id)
H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID)
H.regenerate_icons()
to_chat(H, desc)
@@ -73,12 +73,12 @@
/datum/superheroes/owlman/equip(mob/living/carbon/human/H)
..()
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/owl(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/owl_mask/super_hero(H), slot_wear_mask)
H.equip_to_slot_or_del(new /obj/item/storage/belt/bluespace/owlman(H), slot_belt)
H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), slot_glasses)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), SLOT_HUD_SHOES)
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/owl(H), SLOT_HUD_JUMPSUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings(H), SLOT_HUD_OUTER_SUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/owl_mask/super_hero(H), SLOT_HUD_WEAR_MASK)
H.equip_to_slot_or_del(new /obj/item/storage/belt/bluespace/owlman(H), SLOT_HUD_BELT)
H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), SLOT_HUD_GLASSES)
/datum/superheroes/griffin
@@ -92,10 +92,10 @@
/datum/superheroes/griffin/equip(mob/living/carbon/human/H)
..()
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/griffin(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/griffin(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings/griffinwings(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/head/griffin/(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/griffin(H), SLOT_HUD_SHOES)
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/griffin(H), SLOT_HUD_JUMPSUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings/griffinwings(H), SLOT_HUD_OUTER_SUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/head/griffin/(H), SLOT_HUD_HEAD)
var/obj/item/implant/freedom/L = new/obj/item/implant/freedom(H)
L.implant(H)
@@ -112,12 +112,12 @@
/datum/superheroes/lightnian/equip(mob/living/carbon/human/H)
..()
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/brown(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/super_hero(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/super_hero(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(H), slot_gloves)
H.equip_to_slot_or_del(new /obj/item/bedsheet/orange(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), SLOT_HUD_SHOES)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/brown(H), SLOT_HUD_JUMPSUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/super_hero(H), SLOT_HUD_OUTER_SUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/super_hero(H), SLOT_HUD_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(H), SLOT_HUD_GLOVES)
H.equip_to_slot_or_del(new /obj/item/bedsheet/orange(H), SLOT_HUD_BACK)
/datum/superheroes/electro
@@ -131,11 +131,11 @@
/datum/superheroes/electro/equip(mob/living/carbon/human/H)
..()
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/super_hero/en(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/super_hero/en(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/bedsheet/cult(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), SLOT_HUD_SHOES)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), SLOT_HUD_JUMPSUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/super_hero/en(H), SLOT_HUD_OUTER_SUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/super_hero/en(H), SLOT_HUD_HEAD)
H.equip_to_slot_or_del(new /obj/item/bedsheet/cult(H), SLOT_HUD_BACK)
@@ -229,10 +229,10 @@
for(var/obj/item/W in target.get_all_slots())
target.unEquip(W)
target.rename_character(target.real_name, "Generic Henchman ([rand(1, 1000)])")
target.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/greytide(target), slot_w_uniform)
target.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(target), slot_shoes)
target.equip_to_slot_or_del(new /obj/item/storage/toolbox/mechanical/greytide(target), slot_l_hand)
target.equip_to_slot_or_del(new /obj/item/radio/headset(target), slot_l_ear)
target.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/greytide(target), SLOT_HUD_JUMPSUIT)
target.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(target), SLOT_HUD_SHOES)
target.equip_to_slot_or_del(new /obj/item/storage/toolbox/mechanical/greytide(target), SLOT_HUD_LEFT_HAND)
target.equip_to_slot_or_del(new /obj/item/radio/headset(target), SLOT_HUD_LEFT_EAR)
var/obj/item/card/id/syndicate/W = new(target)
W.icon_state = "lifetimeid"
W.access = list(ACCESS_MAINT_TUNNELS)
@@ -241,5 +241,5 @@
W.flags |= NODROP
W.SetOwnerInfo(target)
W.UpdateName()
target.equip_to_slot_or_del(W, slot_wear_id)
target.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID)
target.regenerate_icons()
code/modules/mob/living/living.dm
+1 -1
View File
@@ -881,7 +881,7 @@
*/
/mob/living/proc/get_strip_slot_name_override(slot)
switch(slot)
if(slot_wear_pda)
if(SLOT_HUD_WEAR_PDA)
return "PDA"
// The src mob is trying to strip an item from someone
code/modules/mob/living/silicon/robot/component.dm
+1 -1
View File
@@ -254,7 +254,7 @@
item_state = "analyzer"
desc = "A hand-held scanner able to diagnose robotic injuries."
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
throwforce = 3
w_class = WEIGHT_CLASS_SMALL
throw_speed = 5
code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm
+1 -1
View File
@@ -264,7 +264,7 @@
icon_state = "herald_cloak"
item_state = "herald_cloak"
item_color = "herald_cloak"
slot_flags = SLOT_TIE
slot_flags = SLOT_FLAG_TIE
allow_duplicates = FALSE
actions_types = list(/datum/action/item_action/accessory/herald)
code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm
+1 -1
View File
@@ -206,7 +206,7 @@
icon_state = "hope"
item_state = "hope"
item_color = "hope"
slot_flags = SLOT_TIE
slot_flags = SLOT_FLAG_TIE
allow_duplicates = FALSE
resistance_flags = FIRE_PROOF
code/modules/mob/living/simple_animal/simple_animal.dm
+4 -4
View File
@@ -509,7 +509,7 @@
return
user.set_machine(src)
var/dat = "<table><tr><td><B>Collar:</B></td><td><A href='?src=[UID()];item=[slot_collar]'>[(pcollar && !(pcollar.flags & ABSTRACT)) ? html_encode(pcollar) : "<font color=grey>Empty</font>"]</A></td></tr></table>"
var/dat = "<table><tr><td><B>Collar:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_COLLAR]'>[(pcollar && !(pcollar.flags & ABSTRACT)) ? html_encode(pcollar) : "<font color=grey>Empty</font>"]</A></td></tr></table>"
dat += "<A href='?src=[user.UID()];mach_close=mob\ref[src]'>Close</A>"
var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 250)
@@ -518,14 +518,14 @@
/mob/living/simple_animal/get_item_by_slot(slot_id)
switch(slot_id)
if(slot_collar)
if(SLOT_HUD_COLLAR)
return pcollar
. = ..()
/mob/living/simple_animal/can_equip(obj/item/I, slot, disable_warning = 0)
// . = ..() // Do not call parent. We do not want animals using their hand slots.
switch(slot)
if(slot_collar)
if(SLOT_HUD_COLLAR)
if(pcollar)
return FALSE
if(!can_collar)
@@ -545,7 +545,7 @@
W.plane = ABOVE_HUD_PLANE
switch(slot)
if(slot_collar)
if(SLOT_HUD_COLLAR)
add_collar(W)
/mob/living/simple_animal/unEquip(obj/item/I, force, silent = FALSE)
code/modules/mob/mob.dm
+56 -56
View File
@@ -206,9 +206,9 @@
src:update_fhair()
/mob/proc/put_in_any_hand_if_possible(obj/item/W as obj, del_on_fail = 0, disable_warning = 1)
if(equip_to_slot_if_possible(W, slot_l_hand, del_on_fail, disable_warning))
if(equip_to_slot_if_possible(W, SLOT_HUD_LEFT_HAND, del_on_fail, disable_warning))
return 1
else if(equip_to_slot_if_possible(W, slot_r_hand, del_on_fail, disable_warning))
else if(equip_to_slot_if_possible(W, SLOT_HUD_RIGHT_HAND, del_on_fail, disable_warning))
return 1
return 0
@@ -268,23 +268,23 @@
//The list of slots by priority. equip_to_appropriate_slot() uses this list. Doesn't matter if a mob type doesn't have a slot.
GLOBAL_LIST_INIT(slot_equipment_priority, list( \
slot_back,\
slot_wear_pda,\
slot_wear_id,\
slot_w_uniform,\
slot_wear_suit,\
slot_wear_mask,\
slot_head,\
slot_shoes,\
slot_gloves,\
slot_l_ear,\
slot_r_ear,\
slot_glasses,\
slot_belt,\
slot_s_store,\
slot_tie,\
slot_l_store,\
slot_r_store\
SLOT_HUD_BACK,\
SLOT_HUD_WEAR_PDA,\
SLOT_HUD_WEAR_ID,\
SLOT_HUD_JUMPSUIT,\
SLOT_HUD_OUTER_SUIT,\
SLOT_HUD_WEAR_MASK,\
SLOT_HUD_HEAD,\
SLOT_HUD_SHOES,\
SLOT_HUD_GLOVES,\
SLOT_HUD_LEFT_EAR,\
SLOT_HUD_RIGHT_EAR,\
SLOT_HUD_GLASSES,\
SLOT_HUD_BELT,\
SLOT_HUD_SUIT_STORE,\
SLOT_HUD_TIE,\
SLOT_HUD_LEFT_STORE,\
SLOT_HUD_RIGHT_STORE\
))
//puts the item "W" into an appropriate slot in a human's inventory
@@ -293,7 +293,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
if(!istype(W)) return 0
for(var/slot in GLOB.slot_equipment_priority)
if(isstorage(W) && slot == slot_head) // Storage items should be put on the belt before the head
if(isstorage(W) && slot == SLOT_HUD_HEAD) // Storage items should be put on the belt before the head
continue
if(equip_to_slot_if_possible(W, slot, FALSE, TRUE)) //del_on_fail = 0; disable_warning = 0
return 1
@@ -317,22 +317,22 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
var/mob/living/carbon/human/H = M
switch(slot)
if(slot_l_hand)
if(SLOT_HUD_LEFT_HAND)
if(H.l_hand)
return 0
return 1
if(slot_r_hand)
if(SLOT_HUD_RIGHT_HAND)
if(H.r_hand)
return 0
return 1
if(slot_wear_mask)
if( !(slot_flags & SLOT_MASK) )
if(SLOT_HUD_WEAR_MASK)
if( !(slot_flags & SLOT_FLAG_MASK) )
return 0
if(H.wear_mask)
return 0
return 1
if(slot_back)
if( !(slot_flags & SLOT_BACK) )
if(SLOT_HUD_BACK)
if( !(slot_flags & SLOT_FLAG_BACK) )
return 0
if(H.back)
if(!(H.back.flags & NODROP))
@@ -340,8 +340,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
else
return 0
return 1
if(slot_wear_suit)
if( !(slot_flags & SLOT_OCLOTHING) )
if(SLOT_HUD_OUTER_SUIT)
if( !(slot_flags & SLOT_FLAG_OCLOTHING) )
return 0
if(H.wear_suit)
if(!(H.wear_suit.flags & NODROP))
@@ -349,8 +349,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
else
return 0
return 1
if(slot_gloves)
if( !(slot_flags & SLOT_GLOVES) )
if(SLOT_HUD_GLOVES)
if( !(slot_flags & SLOT_FLAG_GLOVES) )
return 0
if(H.gloves)
if(!(H.gloves.flags & NODROP))
@@ -358,8 +358,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
else
return 0
return 1
if(slot_shoes)
if( !(slot_flags & SLOT_FEET) )
if(SLOT_HUD_SHOES)
if( !(slot_flags & SLOT_FLAG_FEET) )
return 0
if(H.shoes)
if(!(H.shoes.flags & NODROP))
@@ -367,12 +367,12 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
else
return 0
return 1
if(slot_belt)
if(SLOT_HUD_BELT)
if(!H.w_uniform)
if(!disable_warning)
to_chat(H, "<span class='warning'>You need a jumpsuit before you can attach this [name].</span>")
return 0
if( !(slot_flags & SLOT_BELT) )
if( !(slot_flags & SLOT_FLAG_BELT) )
return 0
if(H.belt)
if(!(H.belt.flags & NODROP))
@@ -380,8 +380,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
else
return 0
return 1
if(slot_glasses)
if( !(slot_flags & SLOT_EYES) )
if(SLOT_HUD_GLASSES)
if( !(slot_flags & SLOT_FLAG_EYES) )
return 0
if(H.glasses)
if(!(H.glasses.flags & NODROP))
@@ -389,8 +389,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
else
return 0
return 1
if(slot_head)
if( !(slot_flags & SLOT_HEAD) )
if(SLOT_HUD_HEAD)
if( !(slot_flags & SLOT_FLAG_HEAD) )
return 0
if(H.head)
if(!(H.head.flags & NODROP))
@@ -398,8 +398,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
else
return 0
return 1
if(slot_l_ear)
if( !(slot_flags & slot_l_ear) )
if(SLOT_HUD_LEFT_EAR)
if( !(slot_flags & SLOT_HUD_LEFT_EAR) )
return 0
if(H.l_ear)
if(!(H.l_ear.flags & NODROP))
@@ -407,8 +407,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
else
return 0
return 1
if(slot_r_ear)
if( !(slot_flags & slot_r_ear) )
if(SLOT_HUD_RIGHT_EAR)
if( !(slot_flags & SLOT_HUD_RIGHT_EAR) )
return 0
if(H.r_ear)
if(!(H.r_ear.flags & NODROP))
@@ -416,8 +416,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
else
return 0
return 1
if(slot_w_uniform)
if( !(slot_flags & SLOT_ICLOTHING) )
if(SLOT_HUD_JUMPSUIT)
if( !(slot_flags & SLOT_FLAG_ICLOTHING) )
return 0
if(H.w_uniform)
if(!(H.w_uniform.flags & NODROP))
@@ -425,12 +425,12 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
else
return 0
return 1
if(slot_wear_id)
if(SLOT_HUD_WEAR_ID)
if(!H.w_uniform)
if(!disable_warning)
to_chat(H, "<span class='warning'>You need a jumpsuit before you can attach this [name].</span>")
return 0
if( !(slot_flags & SLOT_ID) )
if( !(slot_flags & SLOT_FLAG_ID) )
return 0
if(H.wear_id)
if(!(H.wear_id.flags & NODROP))
@@ -438,26 +438,26 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
else
return 0
return 1
if(slot_l_store)
if(SLOT_HUD_LEFT_STORE)
if(H.l_store)
return 0
if(!H.w_uniform)
if(!disable_warning)
to_chat(H, "<span class='warning'>You need a jumpsuit before you can attach this [name].</span>")
return 0
if( w_class <= WEIGHT_CLASS_SMALL || (slot_flags & SLOT_POCKET) )
if( w_class <= WEIGHT_CLASS_SMALL || (slot_flags & SLOT_FLAG_POCKET) )
return 1
if(slot_r_store)
if(SLOT_HUD_RIGHT_STORE)
if(H.r_store)
return 0
if(!H.w_uniform)
if(!disable_warning)
to_chat(H, "<span class='warning'>You need a jumpsuit before you can attach this [name].</span>")
return 0
if( w_class <= WEIGHT_CLASS_SMALL || (slot_flags & SLOT_POCKET) )
if( w_class <= WEIGHT_CLASS_SMALL || (slot_flags & SLOT_FLAG_POCKET) )
return 1
return 0
if(slot_s_store)
if(SLOT_HUD_SUIT_STORE)
if(!H.wear_suit)
if(!disable_warning)
to_chat(H, "<span class='warning'>You need a suit before you can attach this [name].</span>")
@@ -479,19 +479,19 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
else
return 1
return 0
if(slot_handcuffed)
if(SLOT_HUD_HANDCUFFED)
if(H.handcuffed)
return 0
if(!istype(src, /obj/item/restraints/handcuffs))
return 0
return 1
if(slot_legcuffed)
if(SLOT_HUD_LEGCUFFED)
if(H.legcuffed)
return 0
if(!istype(src, /obj/item/restraints/legcuffs))
return 0
return 1
if(slot_in_backpack)
if(SLOT_HUD_IN_BACKPACK)
if(H.back && istype(H.back, /obj/item/storage/backpack))
var/obj/item/storage/backpack/B = H.back
if(B.contents.len < B.storage_slots && w_class <= B.max_w_class)
@@ -588,8 +588,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
/mob/proc/show_inv(mob/user)
user.set_machine(src)
var/dat = {"<table>
<tr><td><B>Left Hand:</B></td><td><A href='?src=[UID()];item=[slot_l_hand]'>[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td><B>Right Hand:</B></td><td><A href='?src=[UID()];item=[slot_r_hand]'>[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td><B>Left Hand:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_LEFT_HAND]'>[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td><B>Right Hand:</B></td><td><A href='?src=[UID()];item=[SLOT_HUD_RIGHT_HAND]'>[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "<font color=grey>Empty</font>"]</A></td></tr>
<tr><td>&nbsp;</td></tr>"}
dat += {"</table>
<A href='?src=[user.UID()];mach_close=mob\ref[src]'>Close</A>
code/modules/mob/mob_holder.dm
+1 -1
View File
@@ -3,7 +3,7 @@
name = "holder"
desc = "You shouldn't ever see this."
icon = 'icons/obj/objects.dmi'
slot_flags = SLOT_HEAD|SLOT_EARS
slot_flags = SLOT_FLAG_HEAD|SLOT_FLAG_EARS
/obj/item/holder/New()
..()