cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743)

Browse Source 
* IT WORKS UP UNTIL THIS POINT

* Consolidates SLOT_FLAG and SLOT_HUD into one

* Remove cover_both_ears

* SLOT_HUD to ITEM_SLOT

* Remove clothing_trait changes for the time being

* Remove accidental copy-paste

* Re-add no-slip var

* More failure to copy-paste correctly

* Leftover flag

* Combine left and right slot flags where possible

* UNGOOF MY DEFINES, PHAND IS NOT A THING

* Minor spacing changes

* Some more fixes from merge

* Seperates ITEM SLOT AMOUNT into two defines

* ON SECOND THOUGHT LETS NOT DO THAT.

* Addresses Contra's review

* Thank you GREP

* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES

* Added a comment to the bitmasks in clothing defines

* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY

* These are for a seperate PR.

* Magboot fixes

* Requested changes

* Re-add accidental removal

* Wrong flags

* Update code/__DEFINES/clothing_defines.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

* Requested changes

* Merge fixes

* Fix double headset

* Fixes multiple accessories

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
Chap
2024-11-13 13:02:29 +00:00
committed by GitHub
co-authored by Contrabang Adrer
parent c297dde150
commit d90a70ecda
232 changed files with 1231 additions and 1192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/clothing_defines.dm
+37 -30
View File
@@ -1,3 +1,36 @@
//Item inventory slots bitmasks
#define ITEM_SLOT_BACK (1<<0) // back
#define ITEM_SLOT_MASK (1<<1) // mask
#define ITEM_SLOT_HANDCUFFED (1<<2) // handcuffs
#define ITEM_SLOT_LEFT_HAND (1<<3) // l_hand
#define ITEM_SLOT_RIGHT_HAND (1<<4) // r_hand
#define ITEM_SLOT_BOTH_HANDS (ITEM_SLOT_LEFT_HAND | ITEM_SLOT_RIGHT_HAND)
#define ITEM_SLOT_BELT (1<<5) // belt
#define ITEM_SLOT_ID (1<<6) // id
#define ITEM_SLOT_LEFT_EAR (1<<7) // l_ear
#define ITEM_SLOT_RIGHT_EAR (1<<8) // r_ear
#define ITEM_SLOT_BOTH_EARS (ITEM_SLOT_LEFT_EAR | ITEM_SLOT_RIGHT_EAR)
#define ITEM_SLOT_EYES (1<<9) // eyes
#define ITEM_SLOT_GLOVES (1<<10) // gloves
#define ITEM_SLOT_HEAD (1<<11) // head
#define ITEM_SLOT_SHOES (1<<12) // shoes
#define ITEM_SLOT_OUTER_SUIT (1<<13) // wear_suit
#define ITEM_SLOT_JUMPSUIT (1<<14) // w_uniform
#define ITEM_SLOT_LEFT_POCKET (1<<15) // l_store
#define ITEM_SLOT_RIGHT_POCKET (1<<16) // r_store
#define ITEM_SLOT_BOTH_POCKETS (ITEM_SLOT_LEFT_POCKET | ITEM_SLOT_RIGHT_POCKET)
#define ITEM_SLOT_SUIT_STORE (1<<17) // suit_storage
#define ITEM_SLOT_IN_BACKPACK (1<<18) // this just puts stuff a backpack if you have one
#define ITEM_SLOT_LEGCUFFED (1<<19) // legcuffs
#define ITEM_SLOT_PDA (1<<20) // pda
#define ITEM_SLOT_ACCESSORY (1<<21) // accessories
#define ITEM_SLOT_COLLAR (1<<22) // pet collar
#define ITEM_SLOT_AMOUNT_FLAG (1<<ITEM_SLOT_AMOUNT)
#define ITEM_SLOT_AMOUNT 22 // IF YOU ADD ANY NEW CLOTHING SLOTS, MAKE SURE TO UPDATE THIS TO THE AMOUNT OF SLOTS.
/// Translates an ITEM_SLOT back to an index that can be looked up in inv_slots. e.g. (1<<19) becomes 19.
#define ITEM_SLOT_2_INDEX(slot) (log(2, slot) + 1)
//Bit flags for the flags_inv variable, which determine when a piece of clothing hides another. IE a helmet hiding glasses.
#define HIDEGLOVES (1<<0) //APPLIES ONLY TO THE EXTERIOR SUIT!!
#define HIDESUITSTORAGE (1<<1) //APPLIES ONLY TO THE EXTERIOR SUIT!!
@@ -10,41 +43,14 @@
#define HIDEEYES (1<<2) //APPLIES ONLY TO HELMETS/MASKS!! (eyes means glasses)
#define HIDEFACE (1<<3) //APPLIES ONLY TO HELMETS/MASKS!! Dictates whether we appear as unknown.
// Slot defines for var/list/inv_slots, some of these dont really show up on the HUD,
// but still function like it in other ways. I know thats weird, and I hate it too.
#define SLOT_HUD_BACK 1
#define SLOT_HUD_WEAR_MASK 2
#define SLOT_HUD_HANDCUFFED 3
#define SLOT_HUD_LEFT_HAND 4 // l_hand
#define SLOT_HUD_RIGHT_HAND 5 // r_hand
#define SLOT_HUD_BELT 6
#define SLOT_HUD_WEAR_ID 7
#define SLOT_HUD_LEFT_EAR 8 // l_ear
#define SLOT_HUD_GLASSES 9
#define SLOT_HUD_GLOVES 10
#define SLOT_HUD_HEAD 11
#define SLOT_HUD_SHOES 12
#define SLOT_HUD_OUTER_SUIT 13 // wear_suit
#define SLOT_HUD_JUMPSUIT 14 // w_uniform
#define SLOT_HUD_LEFT_STORE 15 // l_store
#define SLOT_HUD_RIGHT_STORE 16 // r_store
#define SLOT_HUD_SUIT_STORE 17
#define SLOT_HUD_IN_BACKPACK 18 // this just puts stuff a backpack if you have one
#define SLOT_HUD_LEGCUFFED 19
#define SLOT_HUD_RIGHT_EAR 20 // r_ear
#define SLOT_HUD_WEAR_PDA 21
#define SLOT_HUD_TIE 22
#define SLOT_HUD_COLLAR 23
#define SLOT_HUD_AMOUNT 23
// Boolean defines for hands
#define HAND_BOOL_RIGHT 0
#define HAND_BOOL_LEFT 1
// accessory slots
#define ACCESSORY_SLOT_DECOR 1
#define ACCESSORY_SLOT_UTILITY 2
#define ACCESSORY_SLOT_ARMBAND 3
#define ACCESSORY_SLOT_DECOR (1<<0)
#define ACCESSORY_SLOT_UTILITY (1<<1)
#define ACCESSORY_SLOT_ARMBAND (1<<2)
///max number of accessories that can be equiped to one piece of clothing
#define MAX_EQUIPABLE_ACCESSORIES 5
@@ -104,3 +110,4 @@
#define MUZZLE_MUTE_NONE 0 // Does not mute you.
#define MUZZLE_MUTE_MUFFLE 1 // Muffles everything you say "MHHPHHMMM!!!
#define MUZZLE_MUTE_ALL 2 // Completely mutes you.
code/__DEFINES/flags.dm
+1 -18
View File
@@ -2,7 +2,7 @@
#define NONE 0
//FLAGS BITMASK
#define STOPSPRESSUREDMAGE (1<<0) //This flag is used on the flags variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & SLOT_FLAG_BACK) if you see it anywhere To successfully stop you taking all pressure damage you must have both a suit and head item with this flag.
#define STOPSPRESSUREDMAGE (1<<0) //This flag is used on the flags variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & ITEM_SLOT_BACK) if you see it anywhere To successfully stop you taking all pressure damage you must have both a suit and head item with this flag.
#define NODROP (1<<1) // This flag makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted.
#define NOBLUDGEON (1<<2) // when an item has this it produces no "X has been hit by Y with Z" message with the default handler
#define AIRTIGHT (1<<3) // mask allows internals
@@ -146,23 +146,6 @@
#define NO_LAVA_GEN (1<<1) //Blocks lava rivers being generated on the turf
#define NO_RUINS (1<<2)
//ITEM INVENTORY SLOT BITMASKS
#define SLOT_FLAG_OCLOTHING (1<<0)
#define SLOT_FLAG_ICLOTHING (1<<1)
#define SLOT_FLAG_GLOVES (1<<2)
#define SLOT_FLAG_EYES (1<<3)
#define SLOT_FLAG_EARS (1<<4)
#define SLOT_FLAG_MASK (1<<5)
#define SLOT_FLAG_HEAD (1<<6)
#define SLOT_FLAG_FEET (1<<7)
#define SLOT_FLAG_ID (1<<8)
#define SLOT_FLAG_BELT (1<<9)
#define SLOT_FLAG_BACK (1<<10)
#define SLOT_FLAG_POCKET (1<<11) //this is to allow items with a w_class of 3 or 4 to fit in pockets.
#define SLOT_FLAG_TWOEARS (1<<12)
#define SLOT_FLAG_PDA (1<<13)
#define SLOT_FLAG_TIE (1<<14)
//ORGAN TYPE FLAGS
#define AFFECT_ROBOTIC_ORGAN 1
#define AFFECT_ORGANIC_ORGAN 2
code/__HELPERS/unsorted.dm
-28
View File
@@ -1967,34 +1967,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
if(CHANNEL_SURGERY_SOUNDS)
return "Surgery Sounds"
/proc/slot_bitfield_to_slot(input_slot_flags) // Kill off this garbage ASAP; slot flags and clothing flags should be IDENTICAL. GOSH DARN IT. Doesn't work with ears or pockets, either.
switch(input_slot_flags)
if(SLOT_FLAG_OCLOTHING)
return SLOT_HUD_OUTER_SUIT
if(SLOT_FLAG_ICLOTHING)
return SLOT_HUD_JUMPSUIT
if(SLOT_FLAG_GLOVES)
return SLOT_HUD_GLOVES
if(SLOT_FLAG_EYES)
return SLOT_HUD_GLASSES
if(SLOT_FLAG_MASK)
return SLOT_HUD_WEAR_MASK
if(SLOT_FLAG_HEAD)
return SLOT_HUD_HEAD
if(SLOT_FLAG_FEET)
return SLOT_HUD_SHOES
if(SLOT_FLAG_ID)
return SLOT_HUD_WEAR_ID
if(SLOT_FLAG_BELT)
return SLOT_HUD_BELT
if(SLOT_FLAG_BACK)
return SLOT_HUD_BACK
if(SLOT_FLAG_PDA)
return SLOT_HUD_WEAR_PDA
if(SLOT_FLAG_TIE)
return SLOT_HUD_TIE
/**
* HTTP Get (Powered by RUSTG)
*
code/_onclick/hud/alien_hud.dm
+3 -3
View File
@@ -73,7 +73,7 @@
inv_box.icon = 'icons/mob/screen_alien.dmi'
inv_box.icon_state = "hand_r"
inv_box.screen_loc = ui_rhand
inv_box.slot_id = SLOT_HUD_RIGHT_HAND
inv_box.slot_id = ITEM_SLOT_RIGHT_HAND
static_inventory += inv_box
inv_box = new /atom/movable/screen/inventory/hand()
@@ -81,7 +81,7 @@
inv_box.icon = 'icons/mob/screen_alien.dmi'
inv_box.icon_state = "hand_l"
inv_box.screen_loc = ui_lhand
inv_box.slot_id = SLOT_HUD_LEFT_HAND
inv_box.slot_id = ITEM_SLOT_LEFT_HAND
static_inventory += inv_box
using = new /atom/movable/screen/swap_hand()
@@ -143,7 +143,7 @@
for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
inv.hud = src
inv_slots[inv.slot_id] = inv
inv_slots[ITEM_SLOT_2_INDEX(inv.slot_id)] = inv
inv.update_icon()
/datum/hud/alien/persistent_inventory_update(mob/viewer)
code/_onclick/hud/hud_datum.dm
+5 -5
View File
@@ -55,7 +55,7 @@
//the screen objects that display mob info (health, alien plasma, etc...)
var/list/infodisplay = list()
/// /atom/movable/screen/inventory objects, ordered by their slot ID.
var/list/inv_slots[SLOT_HUD_AMOUNT]
var/list/inv_slots[ITEM_SLOT_AMOUNT]
var/list/atom/movable/screen/plane_master/plane_masters = list() // see "appearance_flags" in the ref, assoc list of "[plane]" = object
///Assoc list of controller groups, associated with key string group name with value of the plane master controller ref
@@ -205,10 +205,10 @@
screenmob.client.screen += infodisplay
//These ones are a part of 'static_inventory', 'toggleable_inventory' or 'hotkeybuttons' but we want them to stay
if(inv_slots[SLOT_HUD_LEFT_HAND])
screenmob.client.screen += inv_slots[SLOT_HUD_LEFT_HAND] //we want the hands to be visible
if(inv_slots[SLOT_HUD_RIGHT_HAND])
screenmob.client.screen += inv_slots[SLOT_HUD_RIGHT_HAND] //we want the hands to be visible
if(inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_LEFT_HAND)])
screenmob.client.screen += inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_LEFT_HAND)] //we want the hands to be visible
if(inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_RIGHT_HAND)])
screenmob.client.screen += inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_RIGHT_HAND)] //we want the hands to be visible
if(action_intent)
screenmob.client.screen += action_intent //we want the intent switcher visible
action_intent.screen_loc = ui_acti_alt //move this to the alternative position, where zone_select usually is.
code/_onclick/hud/human_hud.dm
+20 -20
View File
@@ -113,7 +113,7 @@
inv_box = new /atom/movable/screen/inventory()
inv_box.name = "i_clothing"
inv_box.icon = ui_style
inv_box.slot_id = SLOT_HUD_JUMPSUIT
inv_box.slot_id = ITEM_SLOT_JUMPSUIT
inv_box.icon_state = "uniform"
inv_box.screen_loc = ui_iclothing
inv_box.color = ui_color
@@ -123,7 +123,7 @@
inv_box = new /atom/movable/screen/inventory()
inv_box.name = "o_clothing"
inv_box.icon = ui_style
inv_box.slot_id = SLOT_HUD_OUTER_SUIT
inv_box.slot_id = ITEM_SLOT_OUTER_SUIT
inv_box.icon_state = "suit"
inv_box.screen_loc = ui_oclothing
inv_box.color = ui_color
@@ -137,7 +137,7 @@
inv_box.color = ui_color
inv_box.alpha = ui_alpha
inv_box.screen_loc = ui_rhand
inv_box.slot_id = SLOT_HUD_RIGHT_HAND
inv_box.slot_id = ITEM_SLOT_RIGHT_HAND
static_inventory += inv_box
inv_box = new /atom/movable/screen/inventory/hand()
@@ -147,7 +147,7 @@
inv_box.color = ui_color
inv_box.alpha = ui_alpha
inv_box.screen_loc = ui_lhand
inv_box.slot_id = SLOT_HUD_LEFT_HAND
inv_box.slot_id = ITEM_SLOT_LEFT_HAND
static_inventory += inv_box
using = new /atom/movable/screen/swap_hand()
@@ -173,7 +173,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "id"
inv_box.screen_loc = ui_id
inv_box.slot_id = SLOT_HUD_WEAR_ID
inv_box.slot_id = ITEM_SLOT_ID
inv_box.color = ui_color
inv_box.alpha = ui_alpha
static_inventory += inv_box
@@ -183,7 +183,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "pda"
inv_box.screen_loc = ui_pda
inv_box.slot_id = SLOT_HUD_WEAR_PDA
inv_box.slot_id = ITEM_SLOT_PDA
inv_box.color = ui_color
inv_box.alpha = ui_alpha
static_inventory += inv_box
@@ -193,7 +193,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "mask"
inv_box.screen_loc = ui_mask
inv_box.slot_id = SLOT_HUD_WEAR_MASK
inv_box.slot_id = ITEM_SLOT_MASK
inv_box.color = ui_color
inv_box.alpha = ui_alpha
toggleable_inventory += inv_box
@@ -203,7 +203,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "back"
inv_box.screen_loc = ui_back
inv_box.slot_id = SLOT_HUD_BACK
inv_box.slot_id = ITEM_SLOT_BACK
inv_box.color = ui_color
inv_box.alpha = ui_alpha
static_inventory += inv_box
@@ -213,7 +213,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "pocket"
inv_box.screen_loc = ui_storage1
inv_box.slot_id = SLOT_HUD_LEFT_STORE
inv_box.slot_id = ITEM_SLOT_LEFT_POCKET
inv_box.color = ui_color
inv_box.alpha = ui_alpha
static_inventory += inv_box
@@ -223,7 +223,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "pocket"
inv_box.screen_loc = ui_storage2
inv_box.slot_id = SLOT_HUD_RIGHT_STORE
inv_box.slot_id = ITEM_SLOT_RIGHT_POCKET
inv_box.color = ui_color
inv_box.alpha = ui_alpha
static_inventory += inv_box
@@ -235,7 +235,7 @@
inv_box.color = ui_color
inv_box.alpha = ui_alpha
inv_box.screen_loc = ui_sstore1
inv_box.slot_id = SLOT_HUD_SUIT_STORE
inv_box.slot_id = ITEM_SLOT_SUIT_STORE
static_inventory += inv_box
using = new /atom/movable/screen/resist()
@@ -264,7 +264,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "gloves"
inv_box.screen_loc = ui_gloves
inv_box.slot_id = SLOT_HUD_GLOVES
inv_box.slot_id = ITEM_SLOT_GLOVES
inv_box.color = ui_color
inv_box.alpha = ui_alpha
toggleable_inventory += inv_box
@@ -274,7 +274,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "glasses"
inv_box.screen_loc = ui_glasses
inv_box.slot_id = SLOT_HUD_GLASSES
inv_box.slot_id = ITEM_SLOT_EYES
inv_box.color = ui_color
inv_box.alpha = ui_alpha
toggleable_inventory += inv_box
@@ -284,7 +284,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "ears"
inv_box.screen_loc = ui_l_ear
inv_box.slot_id = SLOT_HUD_LEFT_EAR
inv_box.slot_id = ITEM_SLOT_LEFT_EAR
inv_box.color = ui_color
inv_box.alpha = ui_alpha
toggleable_inventory += inv_box
@@ -294,7 +294,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "ears"
inv_box.screen_loc = ui_r_ear
inv_box.slot_id = SLOT_HUD_RIGHT_EAR
inv_box.slot_id = ITEM_SLOT_RIGHT_EAR
inv_box.color = ui_color
inv_box.alpha = ui_alpha
toggleable_inventory += inv_box
@@ -304,7 +304,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "head"
inv_box.screen_loc = ui_head
inv_box.slot_id = SLOT_HUD_HEAD
inv_box.slot_id = ITEM_SLOT_HEAD
inv_box.color = ui_color
inv_box.alpha = ui_alpha
toggleable_inventory += inv_box
@@ -314,7 +314,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "shoes"
inv_box.screen_loc = ui_shoes
inv_box.slot_id = SLOT_HUD_SHOES
inv_box.slot_id = ITEM_SLOT_SHOES
inv_box.color = ui_color
inv_box.alpha = ui_alpha
toggleable_inventory += inv_box
@@ -324,7 +324,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "belt"
inv_box.screen_loc = ui_belt
inv_box.slot_id = SLOT_HUD_BELT
inv_box.slot_id = ITEM_SLOT_BELT
inv_box.color = ui_color
inv_box.alpha = ui_alpha
static_inventory += inv_box
@@ -377,7 +377,7 @@
for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
inv.hud = src
inv_slots[inv.slot_id] = inv
inv_slots[ITEM_SLOT_2_INDEX(inv.slot_id)] = inv
inv.update_icon()
update_locked_slots()
@@ -391,7 +391,7 @@
var/datum/species/S = H.dna.species
for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
if(inv.slot_id in S.no_equip)
if(inv.slot_id & S.no_equip)
inv.alpha = hud_alpha / 2
else
inv.alpha = hud_alpha
code/_onclick/hud/screen_objects.dm
+5 -5
View File
@@ -403,7 +403,7 @@
if(!user || user != usr)
return
if(!hud?.mymob || !slot_id || slot_id == SLOT_HUD_LEFT_HAND || slot_id == SLOT_HUD_RIGHT_HAND)
if(!hud?.mymob || !slot_id || (slot_id & ITEM_SLOT_BOTH_HANDS))
return
var/obj/item/holding = user.get_active_hand()
@@ -461,7 +461,7 @@
if(!active_overlay)
active_overlay = image("icon"=icon, "icon_state"="hand_active")
if(!handcuff_overlay)
var/state = (slot_id == SLOT_HUD_RIGHT_HAND) ? "markus" : "gabrielle"
var/state = (slot_id == ITEM_SLOT_RIGHT_HAND) ? "markus" : "gabrielle"
handcuff_overlay = image("icon"='icons/mob/screen_gen.dmi', "icon_state"=state)
if(hud && hud.mymob)
@@ -470,13 +470,13 @@
if(C.handcuffed)
. += handcuff_overlay
var/obj/item/organ/external/hand = C.get_organ("[slot_id == SLOT_HUD_LEFT_HAND ? "l" : "r"]_hand")
var/obj/item/organ/external/hand = C.get_organ("[slot_id == ITEM_SLOT_LEFT_HAND ? "l" : "r"]_hand")
if(!isalien(C) && (!hand || !hand.is_usable()))
. += blocked_overlay
if(slot_id == SLOT_HUD_LEFT_HAND && hud.mymob.hand)
if(slot_id == ITEM_SLOT_LEFT_HAND && hud.mymob.hand)
. += active_overlay
else if(slot_id == SLOT_HUD_RIGHT_HAND && !hud.mymob.hand)
else if(slot_id == ITEM_SLOT_RIGHT_HAND && !hud.mymob.hand)
. += active_overlay
/atom/movable/screen/inventory/hand/Click()
code/_onclick/telekinesis.dm
+1 -1
View File
@@ -95,7 +95,7 @@
//stops TK grabs being equipped anywhere but into hands
/obj/item/tk_grab/equipped(mob/user, slot)
if((slot == SLOT_HUD_LEFT_HAND) || (slot== SLOT_HUD_RIGHT_HAND))
if(slot & ITEM_SLOT_BOTH_HANDS)
return
qdel(src)
code/controllers/subsystem/SSjobs.dm
+1 -1
View File
@@ -550,7 +550,7 @@ SUBSYSTEM_DEF(jobs)
//Gives glasses to the vision impaired
if(HAS_TRAIT(H, TRAIT_NEARSIGHT))
var/equipped = H.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(H), SLOT_HUD_GLASSES)
var/equipped = H.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(H), ITEM_SLOT_EYES)
if(equipped != 1)
var/obj/item/clothing/glasses/G = H.glasses
if(istype(G) && !G.prescription)
code/datums/components/parry.dm
+1 -1
View File
@@ -67,7 +67,7 @@
/datum/component/parry/proc/equipped(datum/source, mob/user, slot)
SIGNAL_HANDLER
if(slot in list(SLOT_HUD_LEFT_HAND, SLOT_HUD_RIGHT_HAND))
if(slot & ITEM_SLOT_BOTH_HANDS)
RegisterSignal(user, COMSIG_HUMAN_PARRY, PROC_REF(start_parry))
else
UnregisterSignal(user, COMSIG_HUMAN_PARRY)
code/datums/components/shielded.dm
+1 -1
View File
@@ -111,7 +111,7 @@
/datum/component/shielded/proc/on_equipped(datum/source, mob/user, slot)
SIGNAL_HANDLER
if((slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND) && !shield_inhand)
if((slot & ITEM_SLOT_BOTH_HANDS) && !shield_inhand)
lost_wearer(source, user)
return
set_wearer(user)
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_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND)) // force equip the item
if(require_twohands && (slot & ITEM_SLOT_BOTH_HANDS)) // 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_HUD_BACK) == parent)
if(user.get_item_by_slot(ITEM_SLOT_BACK) == parent)
user.update_inv_back()
else
user.update_inv_l_hand()
code/datums/diseases/_MobProcs.dm
+2 -2
View File
@@ -102,8 +102,8 @@
if(isobj(H.wear_suit))
Cl = H.wear_suit
passed = prob((Cl.permeability_coefficient*100) - 1)
if(passed && isobj(SLOT_HUD_JUMPSUIT))
Cl = SLOT_HUD_JUMPSUIT
if(passed && isobj(ITEM_SLOT_JUMPSUIT))
Cl = ITEM_SLOT_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
+3 -3
View File
@@ -45,15 +45,15 @@
if(!istype(H)) // Xenos don't have masks. They can still feel silly though
return
if(!H.has_organ_for_slot(SLOT_HUD_WEAR_MASK) || !H.canUnEquip(H.get_item_by_slot(SLOT_HUD_WEAR_MASK)))
if(!H.has_organ_for_slot(ITEM_SLOT_MASK) || !H.canUnEquip(H.get_item_by_slot(ITEM_SLOT_MASK)))
return
var/saved_internals = H.internal
H.unEquip(H.get_item_by_slot(SLOT_HUD_WEAR_MASK))
H.unEquip(H.get_item_by_slot(ITEM_SLOT_MASK))
var/obj/item/clothing/mask/gas/clown_hat/peak_comedy = new
peak_comedy.flags |= DROPDEL
H.equip_to_slot_or_del(peak_comedy, SLOT_HUD_WEAR_MASK)
H.equip_to_slot_or_del(peak_comedy, ITEM_SLOT_MASK)
if(saved_internals) // Let's not stealthily suffocate Vox/Plasmamen, this isn't a murder virus
H.internal = saved_internals
code/datums/diseases/wizarditis.dm
+7 -7
View File
@@ -10,7 +10,7 @@
viable_mobtypes = list(/mob/living/carbon/human)
permeability_mod = 0.75
severity = MINOR
/// A mapping of `num2text(SLOT_HUD_XYZ)` -> item path
/// A mapping of `num2text(ITEM_SLOT_XYZ)` -> item path
var/list/magic_fashion = list()
@@ -18,11 +18,11 @@
. = ..()
var/list/magic_fashion_slot_IDs = list(
SLOT_HUD_RIGHT_HAND,
SLOT_HUD_LEFT_HAND,
SLOT_HUD_HEAD,
SLOT_HUD_OUTER_SUIT,
SLOT_HUD_SHOES
ITEM_SLOT_LEFT_HAND,
ITEM_SLOT_RIGHT_HAND,
ITEM_SLOT_HEAD,
ITEM_SLOT_OUTER_SUIT,
ITEM_SLOT_SHOES
)
var/list/magic_fashion_items = list(
/obj/item/staff,
@@ -70,7 +70,7 @@
continue
switch(slot_ID) // Extra filtering for specific slots
if(SLOT_HUD_HEAD)
if(ITEM_SLOT_HEAD)
if(isplasmaman(H))
continue // We want them to spread the magical joy, not burn to death in agony
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_HUD_LEFT_EAR) || (slot == SLOT_HUD_RIGHT_EAR)) && istype(user))
if((slot & ITEM_SLOT_BOTH_EARS) && istype(user))
user_by_item[source] = user
else
user_by_item -= source
code/datums/elements/strippable.dm
+2 -2
View File
@@ -181,7 +181,7 @@
/// A preset for equipping items onto mob slots
/datum/strippable_item/mob_item_slot
/// The SLOT_FLAG_* to equip to.
/// The ITEM_SLOT_* to equip to.
var/item_slot
/datum/strippable_item/mob_item_slot/get_item(atom/source)
@@ -230,7 +230,7 @@
/datum/strippable_item/mob_item_slot/get_obscuring(atom/source)
if(ishuman(source))
var/mob/living/carbon/human/human_source = source
if(item_slot in human_source.check_obscured_slots())
if(item_slot & human_source.check_obscured_slots())
return STRIPPABLE_OBSCURING_COMPLETELY
return STRIPPABLE_OBSCURING_NONE
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_HUD_BACK)
M.quick_equip_item(ITEM_SLOT_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_HUD_BELT)
M.quick_equip_item(ITEM_SLOT_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_HUD_SUIT_STORE)
M.quick_equip_item(ITEM_SLOT_SUIT_STORE)
/datum/keybinding/human/toggle_holster
name = "Toggle Holster"
code/datums/outfits/outfit.dm
+17 -17
View File
@@ -70,29 +70,29 @@
//Start with uniform,suit,backpack for additional slots
if(uniform)
equip_item(H, uniform, SLOT_HUD_JUMPSUIT)
equip_item(H, uniform, ITEM_SLOT_JUMPSUIT)
if(suit)
equip_item(H, suit, SLOT_HUD_OUTER_SUIT)
equip_item(H, suit, ITEM_SLOT_OUTER_SUIT)
if(back)
equip_item(H, back, SLOT_HUD_BACK)
equip_item(H, back, ITEM_SLOT_BACK)
if(belt)
equip_item(H, belt, SLOT_HUD_BELT)
equip_item(H, belt, ITEM_SLOT_BELT)
if(gloves)
equip_item(H, gloves, SLOT_HUD_GLOVES)
equip_item(H, gloves, ITEM_SLOT_GLOVES)
if(shoes)
equip_item(H, shoes, SLOT_HUD_SHOES)
equip_item(H, shoes, ITEM_SLOT_SHOES)
if(head)
equip_item(H, head, SLOT_HUD_HEAD)
equip_item(H, head, ITEM_SLOT_HEAD)
if(mask)
equip_item(H, mask, SLOT_HUD_WEAR_MASK)
equip_item(H, mask, ITEM_SLOT_MASK)
if(l_ear)
equip_item(H, l_ear, SLOT_HUD_LEFT_EAR)
equip_item(H, l_ear, ITEM_SLOT_LEFT_EAR)
if(r_ear)
equip_item(H, r_ear, SLOT_HUD_RIGHT_EAR)
equip_item(H, r_ear, ITEM_SLOT_RIGHT_EAR)
if(glasses)
equip_item(H, glasses, SLOT_HUD_GLASSES)
equip_item(H, glasses, ITEM_SLOT_EYES)
if(id)
equip_item(H, id, SLOT_HUD_WEAR_ID)
equip_item(H, id, ITEM_SLOT_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
@@ -102,7 +102,7 @@
C.quick_activation()
if(suit_store)
equip_item(H, suit_store, SLOT_HUD_SUIT_STORE)
equip_item(H, suit_store, ITEM_SLOT_SUIT_STORE)
if(l_hand)
H.put_in_l_hand(new l_hand(H))
@@ -110,7 +110,7 @@
H.put_in_r_hand(new r_hand(H))
if(pda)
equip_item(H, pda, SLOT_HUD_WEAR_PDA)
equip_item(H, pda, ITEM_SLOT_PDA)
if(uniform)
for(var/path in accessories)
@@ -120,9 +120,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_HUD_LEFT_STORE)
equip_item(H, l_pocket, ITEM_SLOT_LEFT_POCKET)
if(r_pocket)
equip_item(H, r_pocket, SLOT_HUD_RIGHT_STORE)
equip_item(H, r_pocket, ITEM_SLOT_RIGHT_POCKET)
if(box)
if(!backpack_contents)
@@ -135,7 +135,7 @@
if(!number)
number = 1
for(var/i in 1 to number)
H.equip_or_collect(new path(H), SLOT_HUD_IN_BACKPACK)
H.equip_or_collect(new path(H), ITEM_SLOT_IN_BACKPACK)
for(var/path in cybernetic_implants)
var/obj/item/organ/internal/O = new path
code/datums/outfits/outfit_admin.dm
+3 -3
View File
@@ -1247,7 +1247,7 @@
if(istype(C))
C.name = "ancient robes"
C.hood.name = "ancient hood"
H.equip_to_slot_or_del(C, SLOT_HUD_IN_BACKPACK)
H.equip_to_slot_or_del(C, ITEM_SLOT_IN_BACKPACK)
var/obj/item/card/id/I = H.wear_id
if(istype(I))
@@ -1289,7 +1289,7 @@
if(istype(C))
C.name = "ancient robes"
C.hood.name = "ancient hood"
H.equip_to_slot_or_del(C, SLOT_HUD_IN_BACKPACK)
H.equip_to_slot_or_del(C, ITEM_SLOT_IN_BACKPACK)
var/obj/item/card/id/I = H.wear_id
if(istype(I))
@@ -1602,7 +1602,7 @@
H.update_dna()
H.wear_mask.adjustmask(H) // push it back on the head
equip_item(H, /obj/item/clothing/mask/cigarette/cigar, SLOT_HUD_WEAR_MASK) // get them their cigar
equip_item(H, /obj/item/clothing/mask/cigarette/cigar, ITEM_SLOT_MASK) // get them their cigar
if(istype(H.glasses, /obj/item/clothing/glasses)) // this is gonna be always true
var/obj/item/clothing/glasses/glassass = H.glasses
glassass.over_mask = TRUE
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_HUD_SUIT_STORE
internals_slot = ITEM_SLOT_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_HUD_JUMPSUIT)
if(ITEM_SLOT_JUMPSUIT)
uniform = item_path
if(SLOT_HUD_BACK)
if(ITEM_SLOT_BACK)
back = item_path
if(SLOT_HUD_OUTER_SUIT)
if(ITEM_SLOT_OUTER_SUIT)
suit = item_path
if(SLOT_HUD_BELT)
if(ITEM_SLOT_BELT)
belt = item_path
if(SLOT_HUD_GLOVES)
if(ITEM_SLOT_GLOVES)
gloves = item_path
if(SLOT_HUD_SHOES)
if(ITEM_SLOT_SHOES)
shoes = item_path
if(SLOT_HUD_HEAD)
if(ITEM_SLOT_HEAD)
head = item_path
if(SLOT_HUD_WEAR_MASK)
if(ITEM_SLOT_MASK)
mask = item_path
if(SLOT_HUD_LEFT_EAR)
if(ITEM_SLOT_LEFT_EAR)
l_ear = item_path
if(SLOT_HUD_RIGHT_EAR)
if(ITEM_SLOT_RIGHT_EAR)
r_ear = item_path
if(SLOT_HUD_GLASSES)
if(ITEM_SLOT_EYES)
glasses = item_path
if(SLOT_HUD_WEAR_ID)
if(ITEM_SLOT_ID)
id = item_path
if(SLOT_HUD_WEAR_PDA)
if(ITEM_SLOT_PDA)
pda = item_path
if(SLOT_HUD_SUIT_STORE)
if(ITEM_SLOT_SUIT_STORE)
suit_store = item_path
if(SLOT_HUD_LEFT_STORE)
if(ITEM_SLOT_LEFT_POCKET)
l_pocket = item_path
if(SLOT_HUD_RIGHT_STORE)
if(ITEM_SLOT_RIGHT_POCKET)
r_pocket = item_path
@@ -70,7 +70,7 @@
// Copy equipment
var/list/result = list()
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)
var/list/slots_to_check = list(ITEM_SLOT_JUMPSUIT, ITEM_SLOT_BACK, ITEM_SLOT_OUTER_SUIT, ITEM_SLOT_BELT, ITEM_SLOT_GLOVES, ITEM_SLOT_SHOES, ITEM_SLOT_HEAD, ITEM_SLOT_MASK, ITEM_SLOT_LEFT_EAR, ITEM_SLOT_RIGHT_EAR, ITEM_SLOT_EYES, ITEM_SLOT_ID, ITEM_SLOT_PDA, ITEM_SLOT_SUIT_STORE, ITEM_SLOT_LEFT_POCKET, ITEM_SLOT_RIGHT_POCKET)
for(var/s in slots_to_check)
var/obj/item/I = get_item_by_slot(s)
var/vedits = collect_vv(I)
@@ -81,7 +81,7 @@
// Copy access
O.stored_access = list()
var/obj/item/id_slot = get_item_by_slot(SLOT_HUD_WEAR_ID)
var/obj/item/id_slot = get_item_by_slot(ITEM_SLOT_ID)
if(id_slot)
O.stored_access |= id_slot.GetAccess()
var/obj/item/card/id/ID = id_slot.GetID()
@@ -105,7 +105,7 @@
O.vv_values = result
// Copy backpack contents if exist.
var/obj/item/backpack = get_item_by_slot(SLOT_HUD_BACK)
var/obj/item/backpack = get_item_by_slot(ITEM_SLOT_BACK)
if(istype(backpack) && LAZYLEN(backpack.contents) > 0)
var/list/typecounts = list()
for(var/obj/item/I in backpack)
@@ -129,7 +129,7 @@
O.cybernetic_implants |= aug.type
// Copy accessories
var/obj/item/clothing/under/uniform_slot = get_item_by_slot(SLOT_HUD_JUMPSUIT)
var/obj/item/clothing/under/uniform_slot = get_item_by_slot(ITEM_SLOT_JUMPSUIT)
if(uniform_slot)
O.accessories = list()
for(var/obj/item/clothing/accessory/A in uniform_slot.accessories)
@@ -160,7 +160,7 @@
I.vv_edit_var(vname,edits[vname])
// Apply access
var/obj/item/id_slot = H.get_item_by_slot(SLOT_HUD_WEAR_ID)
var/obj/item/id_slot = H.get_item_by_slot(ITEM_SLOT_ID)
if(!id_slot)
return
code/datums/spells/banana_touch.dm
+7 -7
View File
@@ -54,17 +54,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_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)
equip_to_slot_if_possible(new /obj/item/clothing/head/wizard/clown, ITEM_SLOT_HEAD, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/wizrobe/clown, ITEM_SLOT_OUTER_SUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/magical, ITEM_SLOT_SHOES, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clownwiz, ITEM_SLOT_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_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)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/clown/nodrop, ITEM_SLOT_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/nodrop, ITEM_SLOT_SHOES, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/nodrop, ITEM_SLOT_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
@@ -41,10 +41,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_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)
equip_to_slot_if_possible(new /obj/item/clothing/under/cursedclown, ITEM_SLOT_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/gloves/cursedclown, ITEM_SLOT_GLOVES, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/cursedclown, ITEM_SLOT_MASK, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/cursedclown, ITEM_SLOT_SHOES, TRUE, TRUE)
/mob/living/carbon/human/proc/makeAntiCluwne()
to_chat(src, "<span class='danger'>You don't feel very funny.</span>")
@@ -85,5 +85,5 @@
unEquip(gloves, 1)
qdel(G)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/procedure/iaa/formal/black, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, SLOT_HUD_SHOES, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/procedure/iaa/formal/black, ITEM_SLOT_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, ITEM_SLOT_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_HUD_WEAR_MASK, TRUE, TRUE)
target.equip_to_slot_if_possible(magichead, ITEM_SLOT_MASK, TRUE, TRUE)
target.flash_eyes()
code/datums/spells/lichdom.dm
+4 -4
View File
@@ -138,7 +138,7 @@
return TRUE
/datum/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_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)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), ITEM_SLOT_OUTER_SUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), ITEM_SLOT_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), ITEM_SLOT_SHOES)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), ITEM_SLOT_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_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)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime, ITEM_SLOT_MASK, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime, ITEM_SLOT_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders, ITEM_SLOT_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_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)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime/nodrop, ITEM_SLOT_MASK, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime/nodrop, ITEM_SLOT_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders/nodrop, ITEM_SLOT_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
@@ -130,12 +130,12 @@
N.visible_message("<span class='warning'>As [item_to_retrieve] vanishes, [N] remains behind!</span>")
break //If you have 2 nads, well, congrats? Keeps message from doubling up
if(target.hand) //left active hand
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))
if(!target.equip_to_slot_if_possible(item_to_retrieve, ITEM_SLOT_LEFT_HAND, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, ITEM_SLOT_RIGHT_HAND, FALSE, TRUE))
butterfingers = TRUE
else //right active hand
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))
if(!target.equip_to_slot_if_possible(item_to_retrieve, ITEM_SLOT_RIGHT_HAND, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, ITEM_SLOT_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_HUD_LEFT_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, ITEM_SLOT_LEFT_HAND, FALSE, TRUE))
if(!user.equip_to_slot_if_possible(attached_hand, ITEM_SLOT_RIGHT_HAND, FALSE, TRUE))
hand_handled = 0
else //right active hand
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))
if(!user.equip_to_slot_if_possible(attached_hand, ITEM_SLOT_RIGHT_HAND, FALSE, TRUE))
if(!user.equip_to_slot_if_possible(attached_hand, ITEM_SLOT_LEFT_HAND, FALSE, TRUE))
hand_handled = 0
if(!hand_handled)
qdel(attached_hand)
code/datums/wires/wires.dm
+1 -1
View File
@@ -106,7 +106,7 @@
if(ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes)
var/obj/item/clothing/glasses/glasses = H.get_item_by_slot(SLOT_HUD_GLASSES)
var/obj/item/clothing/glasses/glasses = H.get_item_by_slot(ITEM_SLOT_EYES)
if(eyes && HAS_TRAIT(H, TRAIT_COLORBLIND) && (!glasses || !glasses.correct_wires)) // Check if the human has colorblindness.
replace_colors = eyes.replace_colours // Get the colorblind replacement colors list.
code/game/gamemodes/cult/blood_magic.dm
+4 -4
View File
@@ -688,10 +688,10 @@
if(iscarbon(target) && proximity)
uses--
var/mob/living/carbon/C = target
var/armour = C.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), SLOT_HUD_OUTER_SUIT)
C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(user), SLOT_HUD_JUMPSUIT)
C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), SLOT_HUD_BACK)
C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), SLOT_HUD_SHOES)
var/armour = C.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), ITEM_SLOT_OUTER_SUIT)
C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(user), ITEM_SLOT_JUMPSUIT)
C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), ITEM_SLOT_BACK)
C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), ITEM_SLOT_SHOES)
if(C == user)
qdel(src) //Clears the hands
code/game/gamemodes/cult/cult_items.dm
+1 -1
View File
@@ -206,7 +206,7 @@
user.unEquip(src, 1)
user.Confused(20 SECONDS)
user.Weaken(10 SECONDS)
else if(slot == SLOT_HUD_OUTER_SUIT)
else if(slot == ITEM_SLOT_OUTER_SUIT)
ADD_TRAIT(user, TRAIT_GOTTAGOFAST, "cultrobes[UID()]")
/obj/item/clothing/suit/hooded/cultrobes/flagellant_robe/dropped(mob/user)
code/game/gamemodes/cult/runes.dm
+1 -1
View File
@@ -358,7 +358,7 @@ structure_check() searches for nearby cultist structures required for the invoca
H.reagents.del_reagent("holywater") // Also prevent fill stomach with holy water and "forgot" about it after converting
var/obj/item/melee/cultblade/dagger/D = new(get_turf(src))
if(H.equip_to_slot_if_possible(D, SLOT_HUD_IN_BACKPACK, FALSE, TRUE))
if(H.equip_to_slot_if_possible(D, ITEM_SLOT_IN_BACKPACK, FALSE, TRUE))
to_chat(H, "<span class='cultlarge'>You have a dagger in your backpack. Use it to do [GET_CULT_DATA(entity_title1, "your god")]'s bidding.</span>")
else
to_chat(H, "<span class='cultlarge'>There is a dagger on the floor. Use it to do [GET_CULT_DATA(entity_title1, "your god")]'s bidding.</span>")
code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+2 -2
View File
@@ -107,7 +107,7 @@ CONTENTS:
A.UpdateButtons()
/obj/item/clothing/suit/armor/abductor/vest/item_action_slot_check(slot, mob/user)
if(slot == SLOT_HUD_OUTER_SUIT) //we only give the mob the ability to activate the vest if he's actually wearing it.
if(slot == ITEM_SLOT_OUTER_SUIT) //we only give the mob the ability to activate the vest if he's actually wearing it.
return 1
/obj/item/clothing/suit/armor/abductor/vest/proc/SetDisguise(datum/icon_snapshot/entry)
@@ -245,7 +245,7 @@ CONTENTS:
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
icon_state = "wonderprodStun"
item_state = "wonderprod"
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
origin_tech = "materials=4;combat=4;biotech=7;abductor=4"
w_class = WEIGHT_CLASS_NORMAL
actions_types = list(/datum/action/item_action/toggle_mode)
code/game/gamemodes/miniantags/abduction/abduction_outfits.dm
+1 -1
View File
@@ -25,7 +25,7 @@
console.vest = V
V.flags |= NODROP
var/obj/item/abductor/gizmo/G = locate() in H.get_item_by_slot(SLOT_HUD_BACK)
var/obj/item/abductor/gizmo/G = locate() in H.get_item_by_slot(ITEM_SLOT_BACK)
if(G)
console.gizmo = G
G.console = console
code/game/gamemodes/nuclear/nuclear.dm
+19 -19
View File
@@ -202,7 +202,7 @@
to_chat(synd_mind.current, "<B>In your hand you will find a special item capable of triggering a greater challenge for your team. Examine it carefully and consult with your fellow operatives before activating it.</B>")
var/obj/item/nuclear_challenge/challenge = new /obj/item/nuclear_challenge
synd_mind.current.equip_to_slot_or_del(challenge, SLOT_HUD_RIGHT_HAND)
synd_mind.current.equip_to_slot_or_del(challenge, ITEM_SLOT_RIGHT_HAND)
update_syndicate_id(synd_mind, leader_title, TRUE)
@@ -219,7 +219,7 @@
else
var/mob/living/carbon/human/H = synd_mind.current
P.loc = H.loc
H.equip_to_slot_or_del(P, SLOT_HUD_RIGHT_STORE, 0)
H.equip_to_slot_or_del(P, ITEM_SLOT_RIGHT_POCKET, 0)
H.update_icons()
@@ -259,7 +259,7 @@
var/obj/item/radio/R = new /obj/item/radio/headset/syndicate/alt(synd_mob)
R.set_frequency(radio_freq)
synd_mob.equip_to_slot_or_del(R, SLOT_HUD_LEFT_EAR)
synd_mob.equip_to_slot_or_del(R, ITEM_SLOT_LEFT_EAR)
var/back
@@ -275,18 +275,18 @@
else
back = /obj/item/storage/backpack
synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), SLOT_HUD_JUMPSUIT)
synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(synd_mob), SLOT_HUD_SHOES)
synd_mob.equip_or_collect(new /obj/item/clothing/gloves/combat(synd_mob), SLOT_HUD_GLOVES)
synd_mob.equip_to_slot_or_del(new /obj/item/card/id/syndicate(synd_mob), SLOT_HUD_WEAR_ID)
synd_mob.equip_to_slot_or_del(new back(synd_mob), SLOT_HUD_BACK)
synd_mob.equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/pistol(synd_mob), SLOT_HUD_BELT)
synd_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival_syndi(synd_mob.back), SLOT_HUD_IN_BACKPACK)
synd_mob.equip_to_slot_or_del(new /obj/item/pinpointer/nukeop(synd_mob), SLOT_HUD_WEAR_PDA)
synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), ITEM_SLOT_JUMPSUIT)
synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(synd_mob), ITEM_SLOT_SHOES)
synd_mob.equip_or_collect(new /obj/item/clothing/gloves/combat(synd_mob), ITEM_SLOT_GLOVES)
synd_mob.equip_to_slot_or_del(new /obj/item/card/id/syndicate(synd_mob), ITEM_SLOT_ID)
synd_mob.equip_to_slot_or_del(new back(synd_mob), ITEM_SLOT_BACK)
synd_mob.equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/pistol(synd_mob), ITEM_SLOT_BELT)
synd_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival_syndi(synd_mob.back), ITEM_SLOT_IN_BACKPACK)
synd_mob.equip_to_slot_or_del(new /obj/item/pinpointer/nukeop(synd_mob), ITEM_SLOT_PDA)
var/obj/item/radio/uplink/nuclear/U = new /obj/item/radio/uplink/nuclear(synd_mob)
U.hidden_uplink.uplink_owner="[synd_mob.key]"
U.hidden_uplink.uses = uplink_uses
synd_mob.equip_to_slot_or_del(U, SLOT_HUD_IN_BACKPACK)
synd_mob.equip_to_slot_or_del(U, ITEM_SLOT_IN_BACKPACK)
synd_mob.mind.offstation_role = TRUE
if(synd_mob.dna.species)
@@ -294,17 +294,17 @@
switch(race)
if("Vox")
synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), SLOT_HUD_WEAR_MASK)
synd_mob.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double/vox(synd_mob), SLOT_HUD_LEFT_HAND)
synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), ITEM_SLOT_MASK)
synd_mob.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double/vox(synd_mob), ITEM_SLOT_LEFT_HAND)
synd_mob.internal = synd_mob.l_hand
synd_mob.update_action_buttons_icon()
if("Plasmaman")
synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), SLOT_HUD_WEAR_MASK)
synd_mob.equip_or_collect(new /obj/item/tank/internals/plasmaman(synd_mob), SLOT_HUD_SUIT_STORE)
synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), SLOT_HUD_IN_BACKPACK)
synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), SLOT_HUD_IN_BACKPACK)
synd_mob.internal = synd_mob.get_item_by_slot(SLOT_HUD_SUIT_STORE)
synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), ITEM_SLOT_MASK)
synd_mob.equip_or_collect(new /obj/item/tank/internals/plasmaman(synd_mob), ITEM_SLOT_SUIT_STORE)
synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), ITEM_SLOT_IN_BACKPACK)
synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), ITEM_SLOT_IN_BACKPACK)
synd_mob.internal = synd_mob.get_item_by_slot(ITEM_SLOT_SUIT_STORE)
synd_mob.update_action_buttons_icon()
synd_mob.rejuvenate() //fix any damage taken by naked vox/plasmamen/etc while round setups
code/game/gamemodes/nuclear/pinpointer.dm
+2 -2
View File
@@ -16,7 +16,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "pinoff"
flags = CONDUCT
slot_flags = SLOT_FLAG_PDA | SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_PDA | ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
item_state = "electronic"
throw_speed = 4
@@ -275,7 +275,7 @@
///////////////////////
/obj/item/pinpointer/nukeop
var/obj/docking_port/mobile/home = null
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_PDA
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_PDA
syndicate = TRUE
modes = list(MODE_DISK, MODE_NUKE)
code/game/gamemodes/objective.dm
+5 -5
View File
@@ -674,11 +674,11 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
var/obj/item/item_to_give = new item_path
var/static/list/slots = list(
"backpack" = SLOT_HUD_IN_BACKPACK,
"left pocket" = SLOT_HUD_LEFT_STORE,
"right pocket" = SLOT_HUD_RIGHT_STORE,
"left hand" = SLOT_HUD_LEFT_HAND,
"right hand" = SLOT_HUD_RIGHT_HAND,
"backpack" = ITEM_SLOT_IN_BACKPACK,
"left pocket" = ITEM_SLOT_LEFT_POCKET,
"right pocket" = ITEM_SLOT_RIGHT_POCKET,
"left hand" = ITEM_SLOT_LEFT_HAND,
"right hand" = ITEM_SLOT_RIGHT_HAND,
)
for(var/datum/mind/kit_receiver_mind as anything in shuffle(objective_owners))
code/game/gamemodes/wizard/artefact.dm
+160 -160
View File
@@ -262,7 +262,7 @@ GLOBAL_LIST_EMPTY(multiverse)
item_state = "energy_katana"
hitsound = 'sound/weapons/bladeslice.ogg'
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
force = 20
throwforce = 10
sharp = TRUE
@@ -411,199 +411,199 @@ GLOBAL_LIST_EMPTY(multiverse)
//Duplicates the user's current equipent
var/mob/living/carbon/human/H = usr
var/obj/head = H.get_item_by_slot(SLOT_HUD_HEAD)
var/obj/head = H.get_item_by_slot(ITEM_SLOT_HEAD)
if(head)
M.equip_to_slot_or_del(new head.type(M), SLOT_HUD_HEAD)
M.equip_to_slot_or_del(new head.type(M), ITEM_SLOT_HEAD)
var/obj/mask = H.get_item_by_slot(SLOT_HUD_WEAR_MASK)
var/obj/mask = H.get_item_by_slot(ITEM_SLOT_MASK)
if(mask)
M.equip_to_slot_or_del(new mask.type(M), SLOT_HUD_WEAR_MASK)
M.equip_to_slot_or_del(new mask.type(M), ITEM_SLOT_MASK)
var/obj/glasses = H.get_item_by_slot(SLOT_HUD_GLASSES)
var/obj/glasses = H.get_item_by_slot(ITEM_SLOT_EYES)
if(glasses)
M.equip_to_slot_or_del(new glasses.type(M), SLOT_HUD_GLASSES)
M.equip_to_slot_or_del(new glasses.type(M), ITEM_SLOT_EYES)
var/obj/left_ear = H.get_item_by_slot(SLOT_HUD_LEFT_EAR)
var/obj/left_ear = H.get_item_by_slot(ITEM_SLOT_LEFT_EAR)
if(left_ear)
M.equip_to_slot_or_del(new left_ear.type(M), SLOT_HUD_LEFT_EAR)
M.equip_to_slot_or_del(new left_ear.type(M), ITEM_SLOT_LEFT_EAR)
var/obj/right_ear = H.get_item_by_slot(SLOT_HUD_RIGHT_EAR)
var/obj/right_ear = H.get_item_by_slot(ITEM_SLOT_RIGHT_EAR)
if(right_ear)
M.equip_to_slot_or_del(new right_ear.type(M), SLOT_HUD_RIGHT_EAR)
M.equip_to_slot_or_del(new right_ear.type(M), ITEM_SLOT_RIGHT_EAR)
var/obj/uniform = H.get_item_by_slot(SLOT_HUD_JUMPSUIT)
var/obj/uniform = H.get_item_by_slot(ITEM_SLOT_JUMPSUIT)
if(uniform)
M.equip_to_slot_or_del(new uniform.type(M), SLOT_HUD_JUMPSUIT)
M.equip_to_slot_or_del(new uniform.type(M), ITEM_SLOT_JUMPSUIT)
var/obj/suit = H.get_item_by_slot(SLOT_HUD_OUTER_SUIT)
var/obj/suit = H.get_item_by_slot(ITEM_SLOT_OUTER_SUIT)
if(suit)
M.equip_to_slot_or_del(new suit.type(M), SLOT_HUD_OUTER_SUIT)
M.equip_to_slot_or_del(new suit.type(M), ITEM_SLOT_OUTER_SUIT)
var/obj/gloves = H.get_item_by_slot(SLOT_HUD_GLOVES)
var/obj/gloves = H.get_item_by_slot(ITEM_SLOT_GLOVES)
if(gloves)
M.equip_to_slot_or_del(new gloves.type(M), SLOT_HUD_GLOVES)
M.equip_to_slot_or_del(new gloves.type(M), ITEM_SLOT_GLOVES)
var/obj/shoes = H.get_item_by_slot(SLOT_HUD_SHOES)
var/obj/shoes = H.get_item_by_slot(ITEM_SLOT_SHOES)
if(shoes)
M.equip_to_slot_or_del(new shoes.type(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(new shoes.type(M), ITEM_SLOT_SHOES)
var/obj/belt = H.get_item_by_slot(SLOT_HUD_BELT)
var/obj/belt = H.get_item_by_slot(ITEM_SLOT_BELT)
if(belt)
M.equip_to_slot_or_del(new belt.type(M), SLOT_HUD_BELT)
M.equip_to_slot_or_del(new belt.type(M), ITEM_SLOT_BELT)
var/obj/pda = H.get_item_by_slot(SLOT_HUD_WEAR_PDA)
var/obj/pda = H.get_item_by_slot(ITEM_SLOT_PDA)
if(pda)
M.equip_to_slot_or_del(new pda.type(M), SLOT_HUD_WEAR_PDA)
M.equip_to_slot_or_del(new pda.type(M), ITEM_SLOT_PDA)
var/obj/back = H.get_item_by_slot(SLOT_HUD_BACK)
var/obj/back = H.get_item_by_slot(ITEM_SLOT_BACK)
if(back)
M.equip_to_slot_or_del(new back.type(M), SLOT_HUD_BACK)
M.equip_to_slot_or_del(new back.type(M), ITEM_SLOT_BACK)
var/obj/suit_storage = H.get_item_by_slot(SLOT_HUD_SUIT_STORE)
var/obj/suit_storage = H.get_item_by_slot(ITEM_SLOT_SUIT_STORE)
if(suit_storage)
M.equip_to_slot_or_del(new suit_storage.type(M), SLOT_HUD_SUIT_STORE)
M.equip_to_slot_or_del(new suit_storage.type(M), ITEM_SLOT_SUIT_STORE)
var/obj/left_pocket = H.get_item_by_slot(SLOT_HUD_LEFT_STORE)
var/obj/left_pocket = H.get_item_by_slot(ITEM_SLOT_LEFT_POCKET)
if(left_pocket)
M.equip_to_slot_or_del(new left_pocket.type(M), SLOT_HUD_LEFT_STORE)
M.equip_to_slot_or_del(new left_pocket.type(M), ITEM_SLOT_LEFT_POCKET)
var/obj/right_pocket = H.get_item_by_slot(SLOT_HUD_RIGHT_STORE)
var/obj/right_pocket = H.get_item_by_slot(ITEM_SLOT_RIGHT_POCKET)
if(right_pocket)
M.equip_to_slot_or_del(new right_pocket.type(M), SLOT_HUD_RIGHT_STORE)
M.equip_to_slot_or_del(new right_pocket.type(M), ITEM_SLOT_RIGHT_POCKET)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) //Don't duplicate what's equipped to hands, or else duplicate swords could be generated...or weird cases of factionless swords.
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) //Don't duplicate what's equipped to hands, or else duplicate swords could be generated...or weird cases of factionless swords.
else
if(istajaran(M) || isunathi(M))
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), SLOT_HUD_SHOES) //If they can't wear shoes, give them a pair of sandals.
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), ITEM_SLOT_SHOES) //If they can't wear shoes, give them a pair of sandals.
var/randomize = pick("mobster","roman","wizard","cyborg","syndicate","assistant", "animu", "cultist", "highlander", "clown", "killer", "pirate", "soviet", "officer", "gladiator")
switch(randomize)
if("mobster")
M.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(M), SLOT_HUD_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), SLOT_HUD_GLOVES)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), SLOT_HUD_GLASSES)
M.equip_to_slot_or_del(new /obj/item/clothing/under/suit/really_black(M), SLOT_HUD_JUMPSUIT)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(M), ITEM_SLOT_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), ITEM_SLOT_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), ITEM_SLOT_GLOVES)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), ITEM_SLOT_EYES)
M.equip_to_slot_or_del(new /obj/item/clothing/under/suit/really_black(M), ITEM_SLOT_JUMPSUIT)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
if("roman")
var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire)
M.equip_to_slot_or_del(new hat(M), SLOT_HUD_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(M), SLOT_HUD_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(new /obj/item/shield/riot/roman(M), SLOT_HUD_LEFT_HAND)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new hat(M), ITEM_SLOT_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(M), ITEM_SLOT_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(M), ITEM_SLOT_SHOES)
M.equip_to_slot_or_del(new /obj/item/shield/riot/roman(M), ITEM_SLOT_LEFT_HAND)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
if("wizard")
M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), SLOT_HUD_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), SLOT_HUD_OUTER_SUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), SLOT_HUD_HEAD)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), ITEM_SLOT_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), ITEM_SLOT_OUTER_SUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), ITEM_SLOT_SHOES)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), ITEM_SLOT_HEAD)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
if("cyborg")
if(!ismachineperson(M))
for(var/obj/item/organ/O in M.bodyparts)
O.robotize(make_tough = 1)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), SLOT_HUD_GLASSES)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), ITEM_SLOT_EYES)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
if("syndicate")
M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), SLOT_HUD_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), SLOT_HUD_GLOVES)
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), SLOT_HUD_HEAD)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), SLOT_HUD_OUTER_SUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M),SLOT_HUD_WEAR_MASK)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), ITEM_SLOT_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), ITEM_SLOT_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), ITEM_SLOT_GLOVES)
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), ITEM_SLOT_HEAD)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), ITEM_SLOT_OUTER_SUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M),ITEM_SLOT_MASK)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
if("assistant")
M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), SLOT_HUD_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), ITEM_SLOT_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), ITEM_SLOT_SHOES)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
if("animu")
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(M), SLOT_HUD_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(M), SLOT_HUD_JUMPSUIT)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), ITEM_SLOT_SHOES)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(M), ITEM_SLOT_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(M), ITEM_SLOT_JUMPSUIT)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
if("cultist")
M.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(M), SLOT_HUD_OUTER_SUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(M), ITEM_SLOT_OUTER_SUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(M), ITEM_SLOT_SHOES)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
if("highlander")
M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt(M), SLOT_HUD_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/head/beret(M), SLOT_HUD_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt(M), ITEM_SLOT_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/head/beret(M), ITEM_SLOT_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), ITEM_SLOT_SHOES)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
if("clown")
M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(M), SLOT_HUD_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), SLOT_HUD_WEAR_MASK)
M.equip_to_slot_or_del(new /obj/item/bikehorn(M), SLOT_HUD_LEFT_STORE)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(M), ITEM_SLOT_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), ITEM_SLOT_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), ITEM_SLOT_MASK)
M.equip_to_slot_or_del(new /obj/item/bikehorn(M), ITEM_SLOT_LEFT_POCKET)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
if("killer")
M.equip_to_slot_or_del(new /obj/item/clothing/under/misc/overalls(M), SLOT_HUD_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), SLOT_HUD_GLOVES)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), SLOT_HUD_WEAR_MASK)
M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), SLOT_HUD_HEAD)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), SLOT_HUD_OUTER_SUIT)
M.equip_to_slot_or_del(new /obj/item/kitchen/knife(M), SLOT_HUD_LEFT_STORE)
M.equip_to_slot_or_del(new /obj/item/scalpel(M), SLOT_HUD_RIGHT_STORE)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new /obj/item/clothing/under/misc/overalls(M), ITEM_SLOT_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), ITEM_SLOT_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), ITEM_SLOT_GLOVES)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), ITEM_SLOT_MASK)
M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), ITEM_SLOT_HEAD)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), ITEM_SLOT_OUTER_SUIT)
M.equip_to_slot_or_del(new /obj/item/kitchen/knife(M), ITEM_SLOT_LEFT_POCKET)
M.equip_to_slot_or_del(new /obj/item/scalpel(M), ITEM_SLOT_RIGHT_POCKET)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
for(var/obj/item/carried_item in M.contents)
if(!istype(carried_item, /obj/item/bio_chip))
carried_item.add_mob_blood(M)
if("pirate")
M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(M), SLOT_HUD_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), SLOT_HUD_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), SLOT_HUD_GLASSES)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(M), ITEM_SLOT_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(M), ITEM_SLOT_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), ITEM_SLOT_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), ITEM_SLOT_EYES)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
if("soviet")
M.equip_to_slot_or_del(new /obj/item/clothing/head/sovietofficerhat(M), SLOT_HUD_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), SLOT_HUD_GLOVES)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/sovietcoat(M), SLOT_HUD_OUTER_SUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/under/new_soviet/sovietofficer(M), SLOT_HUD_JUMPSUIT)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new /obj/item/clothing/head/sovietofficerhat(M), ITEM_SLOT_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), ITEM_SLOT_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), ITEM_SLOT_GLOVES)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/sovietcoat(M), ITEM_SLOT_OUTER_SUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/under/new_soviet/sovietofficer(M), ITEM_SLOT_JUMPSUIT)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
if("officer")
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), SLOT_HUD_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), SLOT_HUD_GLOVES)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), SLOT_HUD_WEAR_MASK)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/jacket/miljacket(M), SLOT_HUD_OUTER_SUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), SLOT_HUD_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), SLOT_HUD_GLASSES)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), ITEM_SLOT_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), ITEM_SLOT_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), ITEM_SLOT_GLOVES)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), ITEM_SLOT_MASK)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/jacket/miljacket(M), ITEM_SLOT_OUTER_SUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), ITEM_SLOT_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), ITEM_SLOT_EYES)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
if("gladiator")
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator(M), SLOT_HUD_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/gladiator(M), SLOT_HUD_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND)
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator(M), ITEM_SLOT_HEAD)
M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/gladiator(M), ITEM_SLOT_JUMPSUIT)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), ITEM_SLOT_SHOES)
M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND)
else
@@ -611,7 +611,7 @@ GLOBAL_LIST_EMPTY(multiverse)
var/obj/item/card/id/W = new /obj/item/card/id
if(duplicate_self)
var/duplicated_access = usr.get_item_by_slot(SLOT_HUD_WEAR_ID)
var/duplicated_access = usr.get_item_by_slot(ITEM_SLOT_ID)
if(duplicated_access && istype(duplicated_access, /obj/item/card/id))
var/obj/item/card/id/duplicated_id = duplicated_access
W.access = duplicated_id.access
@@ -626,7 +626,7 @@ GLOBAL_LIST_EMPTY(multiverse)
W.registered_name = M.real_name
W.update_label(M.real_name)
W.SetOwnerInfo(M)
M.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID)
M.equip_to_slot_or_del(W, ITEM_SLOT_ID)
if(isvox(M))
M.dna.species.after_equip_job(null, M) //Nitrogen tanks
@@ -759,38 +759,38 @@ GLOBAL_LIST_EMPTY(multiverse)
switch(skeleton_type)
if("roman")
var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire)
victim.equip_to_slot_or_del(new hat(victim), SLOT_HUD_HEAD)
victim.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(victim), SLOT_HUD_JUMPSUIT)
victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(victim), SLOT_HUD_SHOES)
victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND)
victim.equip_to_slot_or_del(new /obj/item/claymore(victim), SLOT_HUD_RIGHT_HAND)
victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK)
victim.equip_to_slot_or_del(new hat(victim), ITEM_SLOT_HEAD)
victim.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(victim), ITEM_SLOT_JUMPSUIT)
victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(victim), ITEM_SLOT_SHOES)
victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND)
victim.equip_to_slot_or_del(new /obj/item/claymore(victim), ITEM_SLOT_RIGHT_HAND)
victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK)
if("pirate")
victim.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(victim), SLOT_HUD_JUMPSUIT)
victim.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(victim), SLOT_HUD_OUTER_SUIT)
victim.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(victim), SLOT_HUD_HEAD)
victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), SLOT_HUD_SHOES)
victim.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(victim), SLOT_HUD_GLASSES)
victim.equip_to_slot_or_del(new /obj/item/claymore(victim), SLOT_HUD_RIGHT_HAND)
victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK)
victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND)
victim.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(victim), ITEM_SLOT_JUMPSUIT)
victim.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(victim), ITEM_SLOT_OUTER_SUIT)
victim.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(victim), ITEM_SLOT_HEAD)
victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), ITEM_SLOT_SHOES)
victim.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(victim), ITEM_SLOT_EYES)
victim.equip_to_slot_or_del(new /obj/item/claymore(victim), ITEM_SLOT_RIGHT_HAND)
victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK)
victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND)
if("yand")//mine is an evil laugh
victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), SLOT_HUD_SHOES)
victim.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(victim), SLOT_HUD_HEAD)
victim.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(victim), SLOT_HUD_JUMPSUIT)
victim.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(victim), SLOT_HUD_OUTER_SUIT)
victim.equip_to_slot_or_del(new /obj/item/katana(victim), SLOT_HUD_RIGHT_HAND)
victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND)
victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK)
victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), ITEM_SLOT_SHOES)
victim.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(victim), ITEM_SLOT_HEAD)
victim.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(victim), ITEM_SLOT_JUMPSUIT)
victim.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(victim), ITEM_SLOT_OUTER_SUIT)
victim.equip_to_slot_or_del(new /obj/item/katana(victim), ITEM_SLOT_RIGHT_HAND)
victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND)
victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK)
if("clown")
victim.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(victim), SLOT_HUD_JUMPSUIT)
victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(victim), SLOT_HUD_SHOES)
victim.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(victim), SLOT_HUD_WEAR_MASK)
victim.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(victim), SLOT_HUD_HEAD)
victim.equip_to_slot_or_del(new /obj/item/bikehorn(victim), SLOT_HUD_LEFT_STORE)
victim.equip_to_slot_or_del(new /obj/item/claymore(victim), SLOT_HUD_RIGHT_HAND)
victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND)
victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK)
victim.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(victim), ITEM_SLOT_JUMPSUIT)
victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(victim), ITEM_SLOT_SHOES)
victim.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(victim), ITEM_SLOT_MASK)
victim.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(victim), ITEM_SLOT_HEAD)
victim.equip_to_slot_or_del(new /obj/item/bikehorn(victim), ITEM_SLOT_LEFT_POCKET)
victim.equip_to_slot_or_del(new /obj/item/claymore(victim), ITEM_SLOT_RIGHT_HAND)
victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND)
victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK)
///Updates the mobs species and gear to anime
/obj/item/necromantic_stone/proc/equip_heresy(mob/living/carbon/human/victim)
@@ -812,13 +812,13 @@ GLOBAL_LIST_EMPTY(multiverse)
victim.grab_ghost()
victim.revive()
victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), SLOT_HUD_SHOES)
victim.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(victim), SLOT_HUD_HEAD)
victim.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(victim), SLOT_HUD_JUMPSUIT)
victim.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(victim), SLOT_HUD_OUTER_SUIT)
victim.equip_to_slot_or_del(new /obj/item/katana(victim), SLOT_HUD_RIGHT_HAND)
victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND)
victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK)
victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), ITEM_SLOT_SHOES)
victim.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(victim), ITEM_SLOT_HEAD)
victim.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(victim), ITEM_SLOT_JUMPSUIT)
victim.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(victim), ITEM_SLOT_OUTER_SUIT)
victim.equip_to_slot_or_del(new /obj/item/katana(victim), ITEM_SLOT_RIGHT_HAND)
victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND)
victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK)
if(!victim.real_name || victim.real_name == "unknown")
victim.real_name = "Neko-chan"
code/game/gamemodes/wizard/raginmages.dm
+1 -1
View File
@@ -118,7 +118,7 @@
wizard.additional_text = "Make sure the station pays for its actions against our diplomats. We might send more Wizards to the station if the situation is not developing in our favour."
new_character.mind.add_antag_datum(wizard)
new_character.forceMove(pick(GLOB.wizardstart))
new_character.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/mugwort(harry), SLOT_HUD_IN_BACKPACK)
new_character.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/mugwort(harry), ITEM_SLOT_IN_BACKPACK)
// The first wiznerd can get their mugwort from the wizard's den, new ones will also need mugwort!
mages_made++
dust_if_respawnable(harry)
code/game/gamemodes/wizard/soulstone.dm
+1 -1
View File
@@ -8,7 +8,7 @@
var/icon_state_full = "soulstone2"
desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artifact's power."
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
origin_tech = "bluespace=4;materials=5"
/// Should we show rays? Triggered by a held body
code/game/gamemodes/wizard/spellbook.dm
+1 -1
View File
@@ -1107,7 +1107,7 @@
magichead.voicechange = TRUE //NEEEEIIGHH
if(!user.unEquip(user.wear_mask))
qdel(user.wear_mask)
user.equip_to_slot_if_possible(magichead, SLOT_HUD_WEAR_MASK, TRUE, TRUE)
user.equip_to_slot_if_possible(magichead, ITEM_SLOT_MASK, TRUE, TRUE)
qdel(src)
else
to_chat(user, "<span class='notice'>I say thee neigh</span>")
code/game/gamemodes/wizard/wizloadouts.dm
+9 -9
View File
@@ -61,10 +61,10 @@
is_ragin_restricted = TRUE
/datum/spell/lichdom/gunslinger/equip_lich(mob/living/carbon/human/H)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit(H), SLOT_HUD_OUTER_SUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), SLOT_HUD_SHOES)
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(H), SLOT_HUD_GLOVES)
H.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(H), SLOT_HUD_JUMPSUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit(H), ITEM_SLOT_OUTER_SUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), ITEM_SLOT_SHOES)
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(H), ITEM_SLOT_GLOVES)
H.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(H), ITEM_SLOT_JUMPSUIT)
/datum/spellbook_entry/loadout/greytide
name = "Tyde the Grey"
@@ -87,9 +87,9 @@
new /obj/item/clothing/head/helmet/space/plasmaman/assistant(get_turf(user))
new /obj/item/clothing/under/plasmaman/assistant(get_turf(user))
user.unEquip(user.wear_id)
user.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/glorf, SLOT_HUD_JUMPSUIT) //Just in case they're naked
user.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/glorf, ITEM_SLOT_JUMPSUIT) //Just in case they're naked
var/obj/item/card/id/wizid = new /obj/item/card/id(src)
user.equip_to_slot_or_del(wizid, SLOT_HUD_WEAR_ID)
user.equip_to_slot_or_del(wizid, ITEM_SLOT_ID)
wizid.registered_name = user.real_name
wizid.access = list(ACCESS_MAINT_TUNNELS)
wizid.assignment = "Assistant"
@@ -144,10 +144,10 @@
ADD_TRAIT(user, TRAIT_RESISTHEAT, MAGIC_TRAIT)
ADD_TRAIT(user, TRAIT_RESISTHIGHPRESSURE, MAGIC_TRAIT)
user.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red/fireball(user), SLOT_HUD_OUTER_SUIT)
user.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red/fireball(user), SLOT_HUD_HEAD)
user.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red/fireball(user), ITEM_SLOT_OUTER_SUIT)
user.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red/fireball(user), ITEM_SLOT_HEAD)
user.equip_or_collect(new /obj/item/storage/belt/wands/fireballs(), SLOT_HUD_BELT)
user.equip_or_collect(new /obj/item/storage/belt/wands/fireballs(), ITEM_SLOT_BELT)
/obj/item/clothing/suit/wizrobe/red/fireball
name = "infernal robe"
code/game/jobs/job/support.dm
+1 -1
View File
@@ -138,7 +138,7 @@
mask = /obj/item/clothing/mask/gas/explorer
glasses = /obj/item/clothing/glasses/meson
suit_store = /obj/item/tank/internals/emergency_oxygen
internals_slot = SLOT_HUD_SUIT_STORE
internals_slot = ITEM_SLOT_SUIT_STORE
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
/obj/item/kitchen/knife/combat/survival=1,
code/game/objects/items.dm
+14 -14
View File
@@ -533,9 +533,9 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
A.Grant(user)
in_inventory = TRUE
if(!initial)
if(equip_sound && slot == slot_bitfield_to_slot(slot_flags))
if(equip_sound && (slot & slot_flags))
playsound(src, equip_sound, EQUIP_SOUND_VOLUME, TRUE, ignore_walls = FALSE)
else if(slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND)
else if(slot & ITEM_SLOT_BOTH_HANDS)
playsound(src, pickup_sound, PICKUP_SOUND_VOLUME, ignore_walls = FALSE)
/obj/item/proc/item_action_slot_check(slot, mob/user)
@@ -853,29 +853,29 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
return
var/mob/owner = loc
var/flags = slot_flags
if(flags & SLOT_FLAG_OCLOTHING)
if(flags & ITEM_SLOT_OUTER_SUIT)
owner.update_inv_wear_suit()
if(flags & SLOT_FLAG_ICLOTHING)
if(flags & ITEM_SLOT_JUMPSUIT)
owner.update_inv_w_uniform()
if(flags & SLOT_FLAG_GLOVES)
if(flags & ITEM_SLOT_GLOVES)
owner.update_inv_gloves()
if(flags & SLOT_FLAG_EYES)
if(flags & ITEM_SLOT_EYES)
owner.update_inv_glasses()
if(flags & SLOT_FLAG_EARS)
if(flags & ITEM_SLOT_BOTH_EARS)
owner.update_inv_ears()
if(flags & SLOT_FLAG_MASK)
if(flags & ITEM_SLOT_MASK)
owner.update_inv_wear_mask()
if(flags & SLOT_FLAG_HEAD)
if(flags & ITEM_SLOT_HEAD)
owner.update_inv_head()
if(flags & SLOT_FLAG_FEET)
if(flags & ITEM_SLOT_SHOES)
owner.update_inv_shoes()
if(flags & SLOT_FLAG_ID)
if(flags & ITEM_SLOT_ID)
owner.update_inv_wear_id()
if(flags & SLOT_FLAG_BELT)
if(flags & ITEM_SLOT_BELT)
owner.update_inv_belt()
if(flags & SLOT_FLAG_BACK)
if(flags & ITEM_SLOT_BACK)
owner.update_inv_back()
if(flags & SLOT_FLAG_PDA)
if(flags & ITEM_SLOT_PDA)
owner.update_inv_wear_pda()
/// Called on cyborg items that need special charging behavior. Override as needed for specific items.
code/game/objects/items/crayons.dm
+2 -2
View File
@@ -11,7 +11,7 @@
icon = 'icons/obj/crayons.dmi'
icon_state = "crayonred"
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_EARS
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_EARS
attack_verb = list("attacked", "coloured")
toolspeed = 1
var/colour = COLOR_RED
@@ -307,7 +307,7 @@
name = "\improper Nanotrasen-brand Rapid Paint Applicator"
desc = "A metallic container containing spray paint."
icon_state = "spraycan_cap"
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
var/capped = TRUE
instant = TRUE
validSurfaces = list(/turf/simulated/floor,/turf/simulated/wall)
code/game/objects/items/devices/aicard.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "aicard" // aicard-full
item_state = "electronic"
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
flags = NOBLUDGEON
var/flush = null
origin_tech = "programming=3;materials=3"
code/game/objects/items/devices/autopsy.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "autopsy_scanner"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
origin_tech = "magnets=1;biotech=1"
var/list/datum/autopsy_data_scanner/wdata = list()
code/game/objects/items/devices/chameleon_counter.dm
+1 -1
View File
@@ -3,7 +3,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "cham_counter"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
item_state = "electronic"
w_class = WEIGHT_CLASS_SMALL
origin_tech = "syndicate=1;magnets=3"
code/game/objects/items/devices/chameleonproj.dm
+1 -1
View File
@@ -3,7 +3,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "shield0"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
item_state = "electronic"
throwforce = 5
throw_speed = 3
code/game/objects/items/devices/flash.dm
+1 -1
View File
@@ -228,7 +228,7 @@
icon_state = "camera"
item_state = "electropack" //spelling, a coders worst enemy. This part gave me trouble for a while.
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
can_overcharge = FALSE
var/flash_max_charges = 5
var/flash_cur_charges = 5
code/game/objects/items/devices/flashlight.dm
+2 -2
View File
@@ -6,7 +6,7 @@
item_state = "flashlight"
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
materials = list(MAT_METAL = 200, MAT_GLASS = 100)
actions_types = list(/datum/action/item_action/toggle_light)
var/on = FALSE
@@ -93,7 +93,7 @@
icon_state = "penlight"
item_state = ""
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_EARS
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_EARS
flags = CONDUCT
brightness_on = 2
var/colour = "blue" // Ink color
code/game/objects/items/devices/geiger_counter.dm
+1 -1
View File
@@ -12,7 +12,7 @@
icon_state = "geiger_off"
item_state = "multitool"
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
flags = NOBLUDGEON
materials = list(MAT_METAL = 210, MAT_GLASS = 150)
code/game/objects/items/devices/laserpointer.dm
+1 -1
View File
@@ -6,7 +6,7 @@
item_state = "pen"
var/pointer_icon_state
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
materials = list(MAT_METAL=500, MAT_GLASS=500)
w_class = WEIGHT_CLASS_SMALL //Increased to 2, because diodes are w_class 2. Conservation of matter.
origin_tech = "combat=1;magnets=2"
code/game/objects/items/devices/lightreplacer.dm
+1 -1
View File
@@ -40,7 +40,7 @@
belt_icon = "light_replacer"
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
origin_tech = "magnets=3;engineering=4"
force = 8
var/max_uses = 20
code/game/objects/items/devices/paicard.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "pai"
item_state = "electronic"
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
origin_tech = "programming=2"
var/request_cooldown = 5 // five seconds
var/last_request
code/game/objects/items/devices/painter/painter.dm
+1 -1
View File
@@ -5,7 +5,7 @@
usesound = 'sound/effects/spray2.ogg'
flags = CONDUCT | NOBLUDGEON
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
materials = list(MAT_METAL = 5000, MAT_GLASS = 2000)
/// Associative list of painter types, with the value being the datum. (For use in the radial menu)
var/static/list/painter_type_list = list(
code/game/objects/items/devices/radio/beacon.dm
+1 -1
View File
@@ -6,7 +6,7 @@
item_state = "signaler"
origin_tech = "bluespace=1"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
throw_speed = 2
throw_range = 9
w_class = WEIGHT_CLASS_SMALL
code/game/objects/items/devices/radio/electropack.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "electropack0"
item_state = "electropack"
flags = CONDUCT
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_HUGE
materials = list(MAT_METAL = 10000, MAT_GLASS = 2500)
/// The integrated signaler
code/game/objects/items/devices/radio/headset.dm
+1 -1
View File
@@ -11,7 +11,7 @@
materials = list(MAT_METAL = 200)
canhear_range = 0 // can't hear headsets from very far away
slot_flags = SLOT_FLAG_EARS
slot_flags = ITEM_SLOT_BOTH_EARS
var/translate_binary = FALSE
var/translate_hive = FALSE
var/obj/item/encryptionkey/keyslot1 = null
code/game/objects/items/devices/radio/radio_objects.dm
+1 -1
View File
@@ -64,7 +64,7 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems)
var/static/list/blacklisted_areas = list(/area/adminconstruction, /area/tdome, /area/ruin/space/bubblegum_arena)
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
throw_speed = 2
throw_range = 9
w_class = WEIGHT_CLASS_SMALL
code/game/objects/items/devices/scanners.dm
+7 -7
View File
@@ -18,7 +18,7 @@ SLIME SCANNER
icon = 'icons/obj/device.dmi'
icon_state = "t-ray0"
var/on = FALSE
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
item_state = "electronic"
materials = list(MAT_METAL = 300)
@@ -109,7 +109,7 @@ SLIME SCANNER
item_state = "healthanalyzer"
belt_icon = "health_analyzer"
flags = CONDUCT | NOBLUDGEON
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
throwforce = 3
throw_speed = 3
@@ -373,7 +373,7 @@ SLIME SCANNER
icon_state = "robotanalyzer"
item_state = "analyzer"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
throwforce = 3
w_class = WEIGHT_CLASS_SMALL
throw_speed = 5
@@ -520,7 +520,7 @@ SLIME SCANNER
icon = 'icons/obj/device.dmi'
icon_state = "atmos"
item_state = "analyzer"
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
throwforce = 0
@@ -719,7 +719,7 @@ SLIME SCANNER
item_state = "analyzer"
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
throwforce = 5
throw_speed = 4
throw_range = 20
@@ -797,7 +797,7 @@ SLIME SCANNER
icon_state = "adv_spectrometer_s"
item_state = "analyzer"
origin_tech = "biotech=2"
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
throwforce = 0
@@ -854,7 +854,7 @@ SLIME SCANNER
icon = 'icons/obj/device.dmi'
icon_state = "bodyanalyzer_0"
item_state = "healthanalyser"
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
throwforce = 3
throw_speed = 5
code/game/objects/items/devices/sensor_device.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "scanner"
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
origin_tech = "programming=3;materials=3;magnets=3"
var/datum/ui_module/crew_monitor/crew_monitor
code/game/objects/items/devices/taperecorder.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "taperecorder_empty"
item_state = "analyzer"
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
materials = list(MAT_METAL = 180, MAT_GLASS = 90)
force = 2
throwforce = 0
code/game/objects/items/robot/robot_parts.dm
+1 -1
View File
@@ -4,7 +4,7 @@
item_state = "buildpipe"
icon_state = "blank"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
var/list/part = null
var/sabotaged = FALSE //Emagging limbs can have repercussions when installed as prosthetics.
var/model_info = "Unbranded"
code/game/objects/items/tools/crowbar.dm
+1 -1
View File
@@ -7,7 +7,7 @@
belt_icon = "crowbar"
usesound = 'sound/items/crowbar.ogg'
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
force = 5
throwforce = 7
w_class = WEIGHT_CLASS_NORMAL
code/game/objects/items/tools/screwdriver.dm
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "screwdriver_map"
belt_icon = "screwdriver"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
force = 5
w_class = WEIGHT_CLASS_TINY
throwforce = 5
code/game/objects/items/tools/welder.dm
+2 -2
View File
@@ -8,7 +8,7 @@
item_state = "welder"
belt_icon = "welder"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
force = 3
throwforce = 5
throw_speed = 3
@@ -27,7 +27,7 @@
pickup_sound = 'sound/items/handling/weldingtool_pickup.ogg'
var/maximum_fuel = 20
/// Set to FALSE if it doesn't need fuel, but serves equally well as a cost modifier.
var/requires_fuel = TRUE
var/requires_fuel = TRUE
/// If TRUE, fuel will regenerate over time.
var/refills_over_time = FALSE
/// Sound played when turned on.
code/game/objects/items/tools/wirecutters.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "cutters"
belt_icon = "wirecutters_red"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
force = 6
throw_speed = 3
throw_range = 7
code/game/objects/items/tools/wrench.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "wrench"
belt_icon = "wrench"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
force = 5
throwforce = 7
usesound = 'sound/items/ratchet.ogg'
code/game/objects/items/toys.dm
+3 -3
View File
@@ -325,7 +325,7 @@
icon_state = "katana"
item_state = "katana"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 //Look, you can strap it to your back. You can strap it to your waist too.
force = 5
throwforce = 5
@@ -503,7 +503,7 @@
icon_state = "inflatable"
item_state = "inflatable"
icon = 'icons/obj/clothing/belts.dmi'
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
flags_2 = ALLOW_BELT_NO_JUMPSUIT_2
/*
@@ -1171,7 +1171,7 @@
righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
hitsound = "swing_hit"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
materials = list(MAT_METAL=2000)
w_class = WEIGHT_CLASS_NORMAL
throwforce = 5
code/game/objects/items/trash.dm
+1 -1
View File
@@ -74,7 +74,7 @@
name = "Kentucky Fried Vox"
icon_state = "fried_vox_empty"
item_state = "fried_vox_empty"
slot_flags = SLOT_FLAG_HEAD
slot_flags = ITEM_SLOT_HEAD
dog_fashion = /datum/dog_fashion/head/fried_vox_empty
sprite_sheets = list(
"Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
code/game/objects/items/weapons/batons.dm
+3 -3
View File
@@ -11,7 +11,7 @@
icon = 'icons/obj/weapons/baton.dmi'
icon_state = "baton"
item_state = "classic_baton"
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
force = 12 //9 hit crit
w_class = WEIGHT_CLASS_NORMAL
// Settings
@@ -155,7 +155,7 @@
desc = "A compact yet robust personal defense weapon. Can be concealed when folded."
icon_state = "telebaton_0" // For telling what it is when mapping
item_state = null
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
on = FALSE
/// Force when concealed
@@ -196,7 +196,7 @@
else
to_chat(user, "<span class='notice'>You collapse [src].</span>")
item_state = null //no sprite for concealment even when in hand
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
force = force_off //not so robust now
attack_verb = attack_verb_off
code/game/objects/items/weapons/cards_ids.dm
+1 -1
View File
@@ -94,7 +94,7 @@
var/total_mining_points = 0
var/list/access = list()
var/registered_name = "Unknown" // The name registered_name on the card
slot_flags = SLOT_FLAG_ID
slot_flags = ITEM_SLOT_ID
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF
var/untrackable // Can not be tracked by AI's
code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
+1 -1
View File
@@ -11,7 +11,7 @@
throw_speed = 1
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
materials = list(MAT_METAL = 5000)
resistance_flags = FIRE_PROOF
origin_tech = "combat=1;plasmatech=2;engineering=2"
code/game/objects/items/weapons/chrono_eraser.dm
+2 -2
View File
@@ -7,7 +7,7 @@
icon_state = "chronobackpack"
item_state = "backpack"
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
slowdown = 1
actions_types = list(/datum/action/item_action/equip_unequip_TED_Gun)
var/obj/item/gun/energy/chrono_gun/PA = null
@@ -36,7 +36,7 @@
user.put_in_hands(PA)
/obj/item/chrono_eraser/item_action_slot_check(slot, mob/user)
if(slot == SLOT_HUD_BACK)
if(slot == ITEM_SLOT_BACK)
return 1
code/game/objects/items/weapons/cigs.dm
+3 -3
View File
@@ -22,7 +22,7 @@ LIGHTERS ARE IN LIGHTERS.DM
icon_state = "cigoff"
item_state = "cigoff"
throw_speed = 0.5
slot_flags = SLOT_FLAG_MASK
slot_flags = ITEM_SLOT_MASK
w_class = WEIGHT_CLASS_TINY
body_parts_covered = null
attack_verb = null
@@ -99,7 +99,7 @@ LIGHTERS ARE IN LIGHTERS.DM
var/mob/living/carbon/M = target
if(istype(M) && user.zone_selected == "mouth" && !M.wear_mask && user.a_intent == INTENT_HELP)
user.unEquip(src, TRUE)
M.equip_to_slot_if_possible(src, SLOT_HUD_WEAR_MASK)
M.equip_to_slot_if_possible(src, ITEM_SLOT_MASK)
if(target != user)
user.visible_message(
"<span class='notice'>[user] slips \a [name] into the mouth of [M].</span>",
@@ -488,7 +488,7 @@ LIGHTERS ARE IN LIGHTERS.DM
/obj/item/clothing/mask/holo_cigar/equipped(mob/user, slot, initial)
. = ..()
if(enabled && slot == SLOT_HUD_WEAR_MASK)
if(enabled && slot == ITEM_SLOT_MASK)
if(!HAS_TRAIT_FROM(user, TRAIT_BADASS, HOLO_CIGAR))
ADD_TRAIT(user, TRAIT_BADASS, HOLO_CIGAR)
to_chat(user, "<span class='notice'>You feel more badass while smoking [src].</span>")
code/game/objects/items/weapons/clown_items.dm
+1 -1
View File
@@ -72,7 +72,7 @@
icon_state = "clown_recorder"
item_state = "analyzer"
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
materials = list(MAT_METAL = 180, MAT_GLASS = 90)
force = 2
throwforce = 0
code/game/objects/items/weapons/defib.dm
+5 -5
View File
@@ -6,7 +6,7 @@
icon = 'icons/obj/defib.dmi'
icon_state = "defibunit"
item_state = "defibunit"
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
force = 5
throwforce = 6
w_class = WEIGHT_CLASS_BULKY
@@ -163,12 +163,12 @@
/obj/item/defibrillator/equipped(mob/user, slot)
..()
if(slot != SLOT_HUD_BACK)
if(slot != ITEM_SLOT_BACK)
remove_paddles(user)
update_icon(UPDATE_OVERLAYS)
/obj/item/defibrillator/item_action_slot_check(slot, mob/user)
if(slot == SLOT_HUD_BACK)
if(slot == ITEM_SLOT_BACK)
return TRUE
/obj/item/defibrillator/proc/remove_paddles(mob/user) // from your hands
@@ -206,7 +206,7 @@
item_state = "defibcompact"
sprite_sheets = null //Because Vox had the belt defibrillator sprites in back.dm
w_class = WEIGHT_CLASS_NORMAL
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
flags_2 = ALLOW_BELT_NO_JUMPSUIT_2
origin_tech = "biotech=5"
@@ -216,7 +216,7 @@
update_icon(UPDATE_OVERLAYS)
/obj/item/defibrillator/compact/item_action_slot_check(slot, mob/user)
if(slot == SLOT_HUD_BELT)
if(slot == ITEM_SLOT_BELT)
return TRUE
/obj/item/defibrillator/compact/combat
code/game/objects/items/weapons/grenades/ghettobomb.dm
+1 -1
View File
@@ -10,7 +10,7 @@
throw_speed = 3
throw_range = 7
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
active = FALSE
det_time = 5 SECONDS
display_timer = FALSE
code/game/objects/items/weapons/grenades/grenade.dm
+1 -1
View File
@@ -8,7 +8,7 @@
throw_speed = 3
throw_range = 20
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
resistance_flags = FLAMMABLE
max_integrity = 40
/// Has the pin been pulled?
code/game/objects/items/weapons/grenades/smokebomb.dm
+1 -1
View File
@@ -6,7 +6,7 @@
det_time = 2 SECONDS
modifiable_timer = FALSE
item_state = "smoke"
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
var/datum/effect_system/smoke_spread/bad/smoke
/obj/item/grenade/smokebomb/Initialize(mapload)
code/game/objects/items/weapons/handcuffs.dm
+1 -1
View File
@@ -42,7 +42,7 @@
icon_state = "handcuff"
belt_icon = "handcuffs"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
throwforce = 5
w_class = WEIGHT_CLASS_SMALL
throw_speed = 2
code/game/objects/items/weapons/highlander_swords.dm
+1 -1
View File
@@ -28,7 +28,7 @@
if(!ishuman(user) || !user.mind)
return
var/mob/living/carbon/human/H = user
if(slot == SLOT_HUD_RIGHT_HAND || slot == SLOT_HUD_LEFT_HAND)
if(slot & ITEM_SLOT_BOTH_HANDS)
if(H.mind.martial_art != style)
style.teach(H, TRUE)
to_chat(H, "<span class='notice'>THERE CAN ONLY BE ONE!</span>")
code/game/objects/items/weapons/holy_weapons.dm
+15 -15
View File
@@ -134,7 +134,7 @@
item_state = "godstaff-red"
w_class = WEIGHT_CLASS_HUGE
force = 5
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
/obj/item/nullrod/staff/Initialize(mapload)
. = ..()
@@ -154,7 +154,7 @@
item_state = "claymore"
desc = "A weapon fit for a crusade!"
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_FLAG_BACK|SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT
sharp = TRUE
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -174,7 +174,7 @@
icon_state = "cultblade"
item_state = "darkbalde"
desc = "Spread the glory of the dark gods!"
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
hitsound = 'sound/hallucinations/growl1.ogg'
/obj/item/nullrod/claymore/chainsaw_sword
@@ -183,7 +183,7 @@
icon_state = "chainswordon"
item_state = "chainswordon"
desc = "Suffer not a heretic to live."
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
hitsound = 'sound/weapons/chainsaw.ogg'
@@ -193,14 +193,14 @@
icon_state = "swordon"
item_state = "swordon"
desc = "The blade glows with the power of faith. Or possibly a battery."
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
/obj/item/nullrod/claymore/katana
name = "hanzo steel"
desc = "Capable of cutting clean through a holy claymore."
icon_state = "katana"
item_state = "katana"
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
/obj/item/nullrod/claymore/multiverse
name = "extradimensional blade"
@@ -208,7 +208,7 @@
icon = 'icons/obj/weapons/magical_weapons.dmi'
icon_state = "multiverse"
item_state = "multiverse"
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
/obj/item/nullrod/claymore/saber
name = "light energy blade"
@@ -217,7 +217,7 @@
icon_state = "swordblue"
item_state = "swordblue"
desc = "If you strike me down, I shall become more robust than you can possibly imagine."
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
/obj/item/nullrod/claymore/saber/red
name = "dark energy blade"
@@ -238,7 +238,7 @@
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
icon_state = "sord"
item_state = "sord"
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
force = 4.13
throwforce = 1
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -252,7 +252,7 @@
desc = "Ask not for whom the bell tolls..."
w_class = WEIGHT_CLASS_BULKY
armour_penetration_flat = 30
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
sharp = TRUE
attack_verb = list("chopped", "sliced", "cut", "reaped")
hitsound = 'sound/weapons/rapierhit.ogg'
@@ -390,7 +390,7 @@
icon_state = "hammeron"
item_state = "hammeron"
desc = "This war hammer cost the chaplain fourty thousand space dollars."
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_HUGE
attack_verb = list("smashed", "bashed", "hammered", "crunched")
@@ -425,7 +425,7 @@
icon = 'icons/obj/clothing/hats.dmi'
icon_state = "fedora"
item_state = "fedora"
slot_flags = SLOT_FLAG_HEAD
slot_flags = ITEM_SLOT_HEAD
force = 0
throw_speed = 4
throw_range = 7
@@ -493,7 +493,7 @@
item_state = "bostaff0"
w_class = WEIGHT_CLASS_BULKY
force = 13
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
sharp = FALSE
hitsound = "swing_hit"
attack_verb = list("smashed", "slammed", "whacked", "thwacked")
@@ -628,7 +628,7 @@
/obj/item/nullrod/rosary/bread/equipped(mob/user, slot, initial = FALSE)
. = ..()
if(ishuman(user) && (slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND))
if(ishuman(user) && (slot & ITEM_SLOT_BOTH_HANDS))
START_PROCESSING(SSobj, src)
else
STOP_PROCESSING(SSobj, src)
@@ -672,7 +672,7 @@
item_state = "godstaff-red"
w_class = WEIGHT_CLASS_HUGE
force = 5
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
var/team_color = "red"
var/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/robes = null //the robes linked with this staff
code/game/objects/items/weapons/lighters.dm
+1 -1
View File
@@ -10,7 +10,7 @@
w_class = WEIGHT_CLASS_TINY
throwforce = 4
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
attack_verb = null
resistance_flags = FIRE_PROOF
var/lit = FALSE
code/game/objects/items/weapons/melee/energy_melee_weapons.dm
+1 -1
View File
@@ -406,7 +406,7 @@
inhand_y_dimension = 64
icon_state = "cleaving_saw"
icon_state_on = "cleaving_saw_open"
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
is_a_cleaving_saw = TRUE
var/attack_verb_off = list("attacked", "sawed", "sliced", "torn", "ripped", "diced", "cut")
attack_verb_on = list("cleaved", "swiped", "slashed", "chopped")
code/game/objects/items/weapons/melee/melee_misc.dm
+1 -1
View File
@@ -10,7 +10,7 @@
icon_state = "chain"
item_state = "chain"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
force = 10
throwforce = 7
w_class = WEIGHT_CLASS_NORMAL
code/game/objects/items/weapons/shields.dm
+2 -2
View File
@@ -21,7 +21,7 @@
name = "riot shield"
desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
icon_state = "riot"
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
force = 10
throwforce = 5
throw_speed = 2
@@ -163,7 +163,7 @@
throwforce = 5
throw_speed = 2
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
to_chat(user, "<span class='notice'>You extend \the [src].</span>")
icon_state = "teleriot[HAS_TRAIT(src, TRAIT_ITEM_ACTIVE)]"
playsound(loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
code/game/objects/items/weapons/storage/backpack.dm
+1 -1
View File
@@ -11,7 +11,7 @@
lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_FLAG_BACK //ERROOOOO
slot_flags = ITEM_SLOT_BACK //ERROOOOO
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 21
storage_slots = 21
code/game/objects/items/weapons/storage/bags.dm
+7 -7
View File
@@ -24,7 +24,7 @@
allow_quick_empty = TRUE
display_contents_with_number = 1 // should work fine now
use_to_pickup = 1
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
////////////////////////////////////////
// MARK: Trash bag
@@ -117,7 +117,7 @@
icon = 'icons/obj/trash.dmi'
icon_state = "plasticbag"
item_state = "plasticbag"
slot_flags = SLOT_FLAG_HEAD|SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_HEAD|ITEM_SLOT_BELT
throwforce = 0
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_SMALL
@@ -127,14 +127,14 @@
cant_hold = list(/obj/item/disk/nuclear)
/obj/item/storage/bag/plasticbag/mob_can_equip(mob/M, slot, disable_warning = FALSE)
if(slot == SLOT_HUD_HEAD && length(contents))
if(slot == ITEM_SLOT_HEAD && length(contents))
to_chat(M, "<span class='warning'>You need to empty the bag first!</span>")
return FALSE
return ..()
/obj/item/storage/bag/plasticbag/equipped(mob/user, slot)
if(slot==SLOT_HUD_HEAD)
if(slot==ITEM_SLOT_HEAD)
storage_slots = 0
START_PROCESSING(SSobj, src)
return
@@ -143,7 +143,7 @@
if(is_equipped())
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
if(H.get_item_by_slot(SLOT_HUD_HEAD) == src)
if(H.get_item_by_slot(ITEM_SLOT_HEAD) == src)
if(H.internal)
return
H.AdjustLoseBreath(2 SECONDS)
@@ -161,7 +161,7 @@
icon = 'icons/obj/mining.dmi'
icon_state = "satchel"
origin_tech = "engineering=2"
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_POCKET
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_POCKETS
w_class = WEIGHT_CLASS_NORMAL
storage_slots = 10
max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
@@ -473,7 +473,7 @@
icon = 'icons/obj/mining.dmi'
icon_state = "satchel"
origin_tech = "engineering=2"
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_POCKET
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_POCKETS
w_class = WEIGHT_CLASS_NORMAL
storage_slots = 15
max_combined_w_class = 60
code/game/objects/items/weapons/storage/belt.dm
+1 -1
View File
@@ -6,7 +6,7 @@
item_state = "utility"
lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi'
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 | BLOCKS_LIGHT_2
attack_verb = list("whipped", "lashed", "disciplined")
max_integrity = 300
code/game/objects/items/weapons/storage/fancy.dm
+4 -4
View File
@@ -112,7 +112,7 @@
item_state = "candlebox5"
storage_slots = 5
throwforce = 2
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
/obj/item/storage/fancy/candle_box/Initialize(mapload)
. = ..()
@@ -189,7 +189,7 @@
storage_slots = 10
w_class = WEIGHT_CLASS_TINY
max_w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
drop_sound = 'sound/items/handling/matchbox_drop.ogg'
pickup_sound = 'sound/items/handling/matchbox_pickup.ogg'
can_hold = list(/obj/item/match)
@@ -228,7 +228,7 @@
belt_icon = "patch_pack"
w_class = WEIGHT_CLASS_SMALL
throwforce = 2
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
storage_slots = 6
max_combined_w_class = 6
can_hold = list(/obj/item/clothing/mask/cigarette,
@@ -257,7 +257,7 @@
var/obj/item/I = contents[num]
if(istype(I, /obj/item/clothing/mask/cigarette))
var/obj/item/clothing/mask/cigarette/C = I
M.equip_to_slot_if_possible(C, SLOT_HUD_WEAR_MASK)
M.equip_to_slot_if_possible(C, ITEM_SLOT_MASK)
if(M != user)
user.visible_message(
"<span class='notice'>[user] takes \a [C.name] out of [src] and gives it to [M].</span>",
code/game/objects/items/weapons/storage/wallets.dm
+1 -1
View File
@@ -29,7 +29,7 @@
cant_hold = list(
/obj/item/screwdriver/power
)
slot_flags = SLOT_FLAG_ID
slot_flags = ITEM_SLOT_ID
var/obj/item/card/id/front_id = null
code/game/objects/items/weapons/stunbaton.dm
+3 -3
View File
@@ -6,7 +6,7 @@
var/base_icon = "stunbaton"
item_state = null
belt_icon = "stunbaton"
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
force = 10
throwforce = 7
origin_tech = "combat=2"
@@ -89,7 +89,7 @@
return cell
/obj/item/melee/baton/mob_can_equip(mob/user, slot, disable_warning = TRUE) // disable the warning
if(turned_on && (slot == SLOT_HUD_BELT || slot == SLOT_HUD_SUIT_STORE))
if(turned_on && (slot == ITEM_SLOT_BELT || slot == ITEM_SLOT_SUIT_STORE))
to_chat(user, "<span class='warning'>You can't equip [src] while it's active!</span>")
return FALSE
return ..()
@@ -313,7 +313,7 @@
knockdown_duration = 6 SECONDS
w_class = WEIGHT_CLASS_BULKY
hitcost = 2000
slot_flags = SLOT_FLAG_BACK | SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT
flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 //Look, you can strap it to your back. You can strap it to your waist too.
var/obj/item/assembly/igniter/sparkler = null
code/game/objects/items/weapons/tanks/tank_types.dm
+2 -2
View File
@@ -103,7 +103,7 @@
/obj/item/tank/internals/plasmaman/belt
icon_state = "plasmaman_tank_belt"
item_state = "plasmaman_tank_belt"
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
flags_2 = ALLOW_BELT_NO_JUMPSUIT_2
force = 5
volume = 35
@@ -131,7 +131,7 @@
desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it."
icon_state = "emergency"
flags = CONDUCT
slot_flags = SLOT_FLAG_BELT
slot_flags = ITEM_SLOT_BELT
flags_2 = ALLOW_BELT_NO_JUMPSUIT_2
w_class = WEIGHT_CLASS_SMALL
force = 4
code/game/objects/items/weapons/tanks/tanks.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "tank"
icon = 'icons/obj/tank.dmi'
flags = CONDUCT
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
hitsound = 'sound/weapons/smash.ogg'
w_class = WEIGHT_CLASS_NORMAL
pressure_resistance = ONE_ATMOSPHERE * 5
code/game/objects/items/weapons/tanks/watertank.dm
+4 -4
View File
@@ -6,7 +6,7 @@
icon_state = "waterbackpack"
item_state = "waterbackpack"
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
slowdown = 1
actions_types = list(/datum/action/item_action/toggle_mister)
max_integrity = 200
@@ -32,13 +32,13 @@
toggle_mister(user)
/obj/item/watertank/item_action_slot_check(slot, mob/user)
if(slot == SLOT_HUD_BACK)
if(slot == ITEM_SLOT_BACK)
return TRUE
/obj/item/watertank/proc/toggle_mister(mob/user)
if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
return
if(user.get_item_by_slot(SLOT_HUD_BACK) != src)
if(user.get_item_by_slot(ITEM_SLOT_BACK) != src)
to_chat(user, "<span class='notice'>The watertank needs to be on your back to use.</span>")
return
on = !on
@@ -62,7 +62,7 @@
/obj/item/watertank/equipped(mob/user, slot)
..()
if(slot != SLOT_HUD_BACK)
if(slot != ITEM_SLOT_BACK)
remove_noz()
/obj/item/watertank/proc/remove_noz()
code/game/objects/items/weapons/tape.dm
+1 -1
View File
@@ -38,7 +38,7 @@
user.visible_message("<span class='warning'>[user] tapes [M]'s mouth shut!</span>",
"<span class='notice'>You cover [M == user ? "your own" : "[M]'s"] mouth with a piece of duct tape.[M == user ? null : " That will shut them up."]</span>")
var/obj/item/clothing/mask/muzzle/G = new /obj/item/clothing/mask/muzzle/tapegag
M.equip_to_slot(G, SLOT_HUD_WEAR_MASK)
M.equip_to_slot(G, ITEM_SLOT_MASK)
G.add_fingerprint(user)
/obj/item/stack/tape_roll/update_icon_state()
code/game/objects/items/weapons/twohanded.dm
+7 -7
View File
@@ -14,7 +14,7 @@
throwforce = 15
sharp = TRUE
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
toolspeed = 0.25
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -267,7 +267,7 @@
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
force = 10
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
var/force_unwielded = 10
var/force_wielded = 18
throwforce = 20
@@ -579,7 +579,7 @@
icon_state = "singulohammer0"
base_icon_state = "singulohammer"
flags = CONDUCT
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
force = 5
throwforce = 15
throw_range = 1
@@ -650,7 +650,7 @@
icon_state = "mjollnir0"
base_icon_state = "mjollnir"
flags = CONDUCT
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
force = 5
throwforce = 30
throw_range = 7
@@ -699,7 +699,7 @@
icon_state = "knighthammer0"
base_icon_state = "knighthammer"
flags = CONDUCT
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
force = 5
throwforce = 15
throw_range = 1
@@ -854,7 +854,7 @@
. += "<span class='warning'>It is missing a pyroclastic anomaly core.</span>"
/obj/item/clothing/gloves/color/black/pyro_claws/item_action_slot_check(slot)
if(slot == SLOT_HUD_GLOVES)
if(slot == ITEM_SLOT_GLOVES)
return TRUE
/obj/item/clothing/gloves/color/black/pyro_claws/ui_action_click(mob/user)
@@ -1058,7 +1058,7 @@
sharp = TRUE
damtype = BURN
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_FLAG_BACK
slot_flags = ITEM_SLOT_BACK
throwforce = 15
toolspeed = 0.25
attack_verb = list("enlightened", "enforced", "cleaved", "stabbed", "whacked")

Some files were not shown because too many files have changed in this diff Show More