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

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

Browse Source 
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
This commit is contained in:
Contrabang
2023-10-03 18:27:51 +01:00
committed by GitHub
parent a6a34c2592
commit f3f9bd442a
219 changed files with 1114 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/clothing_defines.dm
+26 -25
View File
@@ -9,31 +9,32 @@
#define HIDEEYES 4 //APPLIES ONLY TO HELMETS/MASKS!! (eyes means glasses)
#define HIDEFACE 8 //APPLIES ONLY TO HELMETS/MASKS!! Dictates whether we appear as unknown.
// slots
#define slot_back 1
#define slot_wear_mask 2
#define slot_handcuffed 3
#define slot_l_hand 4
#define slot_r_hand 5
#define slot_belt 6
#define slot_wear_id 7
#define slot_l_ear 8
#define slot_glasses 9
#define slot_gloves 10
#define slot_head 11
#define slot_shoes 12
#define slot_wear_suit 13
#define slot_w_uniform 14
#define slot_l_store 15
#define slot_r_store 16
#define slot_s_store 17
#define slot_in_backpack 18
#define slot_legcuffed 19
#define slot_r_ear 20
#define slot_wear_pda 21
#define slot_tie 22
#define slot_collar 23
#define slots_amt 23
// 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
// accessory slots
#define ACCESSORY_SLOT_DECOR 1
code/__DEFINES/flags.dm
+16 -16
View File
@@ -2,7 +2,7 @@
#define NONE 0
//FLAGS BITMASK
#define STOPSPRESSUREDMAGE 1 //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_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 //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 NODROP 2 // 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 4 // when an item has this it produces no "X has been hit by Y with Z" message with the default handler
#define AIRTIGHT 8 // mask allows internals
@@ -143,21 +143,21 @@
#define NO_RUINS 4
//ITEM INVENTORY SLOT BITMASKS
#define SLOT_OCLOTHING (1<<0)
#define SLOT_ICLOTHING (1<<1)
#define SLOT_GLOVES (1<<2)
#define SLOT_EYES (1<<3)
#define SLOT_EARS (1<<4)
#define SLOT_MASK (1<<5)
#define SLOT_HEAD (1<<6)
#define SLOT_FEET (1<<7)
#define SLOT_ID (1<<8)
#define SLOT_BELT (1<<9)
#define SLOT_BACK (1<<10)
#define SLOT_POCKET (1<<11) //this is to allow items with a w_class of 3 or 4 to fit in pockets.
#define SLOT_TWOEARS (1<<12)
#define SLOT_PDA (1<<13)
#define SLOT_TIE (1<<14)
#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
code/__HELPERS/unsorted.dm
+24 -24
View File
@@ -2057,30 +2057,30 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
/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_OCLOTHING)
return slot_wear_suit
if(SLOT_ICLOTHING)
return slot_w_uniform
if(SLOT_GLOVES)
return slot_gloves
if(SLOT_EYES)
return slot_glasses
if(SLOT_MASK)
return slot_wear_mask
if(SLOT_HEAD)
return slot_head
if(SLOT_FEET)
return slot_shoes
if(SLOT_ID)
return slot_wear_id
if(SLOT_BELT)
return slot_belt
if(SLOT_BACK)
return slot_back
if(SLOT_PDA)
return slot_wear_pda
if(SLOT_TIE)
return slot_tie
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
/**
code/_onclick/hud/alien_hud.dm
+2 -2
View File
@@ -65,7 +65,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_r_hand
inv_box.slot_id = SLOT_HUD_RIGHT_HAND
static_inventory += inv_box
inv_box = new /obj/screen/inventory/hand()
@@ -73,7 +73,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_l_hand
inv_box.slot_id = SLOT_HUD_LEFT_HAND
static_inventory += inv_box
using = new /obj/screen/swap_hand()
code/_onclick/hud/hud_datum.dm
+5 -5
View File
@@ -32,7 +32,7 @@
var/list/toggleable_inventory = list() //the screen objects which can be hidden
var/list/hotkeybuttons = list() //the buttons that can be used via hotkeys
var/list/infodisplay = list() //the screen objects that display mob info (health, alien plasma, etc...)
var/list/inv_slots[slots_amt] // /obj/screen/inventory objects, ordered by their slot ID.
var/list/inv_slots[SLOT_HUD_AMOUNT] // /obj/screen/inventory objects, ordered by their slot ID.
var/obj/screen/movable/action_button/hide_toggle/hide_actions_toggle
var/action_buttons_hidden = FALSE
@@ -151,10 +151,10 @@
mymob.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_l_hand])
mymob.client.screen += inv_slots[slot_l_hand] //we want the hands to be visible
if(inv_slots[slot_r_hand])
mymob.client.screen += inv_slots[slot_r_hand] //we want the hands to be visible
if(inv_slots[SLOT_HUD_LEFT_HAND])
mymob.client.screen += inv_slots[SLOT_HUD_LEFT_HAND] //we want the hands to be visible
if(inv_slots[SLOT_HUD_RIGHT_HAND])
mymob.client.screen += inv_slots[SLOT_HUD_RIGHT_HAND] //we want the hands to be visible
if(action_intent)
mymob.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
+18 -18
View File
@@ -102,7 +102,7 @@
inv_box = new /obj/screen/inventory()
inv_box.name = "i_clothing"
inv_box.icon = ui_style
inv_box.slot_id = slot_w_uniform
inv_box.slot_id = SLOT_HUD_JUMPSUIT
inv_box.icon_state = "uniform"
inv_box.screen_loc = ui_iclothing
inv_box.color = ui_color
@@ -112,7 +112,7 @@
inv_box = new /obj/screen/inventory()
inv_box.name = "o_clothing"
inv_box.icon = ui_style
inv_box.slot_id = slot_wear_suit
inv_box.slot_id = SLOT_HUD_OUTER_SUIT
inv_box.icon_state = "suit"
inv_box.screen_loc = ui_oclothing
inv_box.color = ui_color
@@ -126,7 +126,7 @@
inv_box.color = ui_color
inv_box.alpha = ui_alpha
inv_box.screen_loc = ui_rhand
inv_box.slot_id = slot_r_hand
inv_box.slot_id = SLOT_HUD_RIGHT_HAND
static_inventory += inv_box
inv_box = new /obj/screen/inventory/hand()
@@ -136,7 +136,7 @@
inv_box.color = ui_color
inv_box.alpha = ui_alpha
inv_box.screen_loc = ui_lhand
inv_box.slot_id = slot_l_hand
inv_box.slot_id = SLOT_HUD_LEFT_HAND
static_inventory += inv_box
using = new /obj/screen/swap_hand()
@@ -162,7 +162,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "id"
inv_box.screen_loc = ui_id
inv_box.slot_id = slot_wear_id
inv_box.slot_id = SLOT_HUD_WEAR_ID
inv_box.color = ui_color
inv_box.alpha = ui_alpha
static_inventory += inv_box
@@ -172,7 +172,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "pda"
inv_box.screen_loc = ui_pda
inv_box.slot_id = slot_wear_pda
inv_box.slot_id = SLOT_HUD_WEAR_PDA
inv_box.color = ui_color
inv_box.alpha = ui_alpha
static_inventory += inv_box
@@ -182,7 +182,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "mask"
inv_box.screen_loc = ui_mask
inv_box.slot_id = slot_wear_mask
inv_box.slot_id = SLOT_HUD_WEAR_MASK
inv_box.color = ui_color
inv_box.alpha = ui_alpha
toggleable_inventory += inv_box
@@ -192,7 +192,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "back"
inv_box.screen_loc = ui_back
inv_box.slot_id = slot_back
inv_box.slot_id = SLOT_HUD_BACK
inv_box.color = ui_color
inv_box.alpha = ui_alpha
static_inventory += inv_box
@@ -202,7 +202,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "pocket"
inv_box.screen_loc = ui_storage1
inv_box.slot_id = slot_l_store
inv_box.slot_id = SLOT_HUD_LEFT_STORE
inv_box.color = ui_color
inv_box.alpha = ui_alpha
static_inventory += inv_box
@@ -212,7 +212,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "pocket"
inv_box.screen_loc = ui_storage2
inv_box.slot_id = slot_r_store
inv_box.slot_id = SLOT_HUD_RIGHT_STORE
inv_box.color = ui_color
inv_box.alpha = ui_alpha
static_inventory += inv_box
@@ -224,7 +224,7 @@
inv_box.color = ui_color
inv_box.alpha = ui_alpha
inv_box.screen_loc = ui_sstore1
inv_box.slot_id = slot_s_store
inv_box.slot_id = SLOT_HUD_SUIT_STORE
static_inventory += inv_box
using = new /obj/screen/resist()
@@ -253,7 +253,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "gloves"
inv_box.screen_loc = ui_gloves
inv_box.slot_id = slot_gloves
inv_box.slot_id = SLOT_HUD_GLOVES
inv_box.color = ui_color
inv_box.alpha = ui_alpha
toggleable_inventory += inv_box
@@ -263,7 +263,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "glasses"
inv_box.screen_loc = ui_glasses
inv_box.slot_id = slot_glasses
inv_box.slot_id = SLOT_HUD_GLASSES
inv_box.color = ui_color
inv_box.alpha = ui_alpha
toggleable_inventory += inv_box
@@ -273,7 +273,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "ears"
inv_box.screen_loc = ui_l_ear
inv_box.slot_id = slot_l_ear
inv_box.slot_id = SLOT_HUD_LEFT_EAR
inv_box.color = ui_color
inv_box.alpha = ui_alpha
toggleable_inventory += inv_box
@@ -283,7 +283,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "ears"
inv_box.screen_loc = ui_r_ear
inv_box.slot_id = slot_r_ear
inv_box.slot_id = SLOT_HUD_RIGHT_EAR
inv_box.color = ui_color
inv_box.alpha = ui_alpha
toggleable_inventory += inv_box
@@ -293,7 +293,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "head"
inv_box.screen_loc = ui_head
inv_box.slot_id = slot_head
inv_box.slot_id = SLOT_HUD_HEAD
inv_box.color = ui_color
inv_box.alpha = ui_alpha
toggleable_inventory += inv_box
@@ -303,7 +303,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "shoes"
inv_box.screen_loc = ui_shoes
inv_box.slot_id = slot_shoes
inv_box.slot_id = SLOT_HUD_SHOES
inv_box.color = ui_color
inv_box.alpha = ui_alpha
toggleable_inventory += inv_box
@@ -313,7 +313,7 @@
inv_box.icon = ui_style
inv_box.icon_state = "belt"
inv_box.screen_loc = ui_belt
inv_box.slot_id = slot_belt
inv_box.slot_id = SLOT_HUD_BELT
inv_box.color = ui_color
inv_box.alpha = ui_alpha
static_inventory += inv_box
code/_onclick/hud/screen_objects.dm
+4 -4
View File
@@ -443,7 +443,7 @@
if(!active_overlay)
active_overlay = image("icon"=icon, "icon_state"="hand_active")
if(!handcuff_overlay)
var/state = (slot_id == slot_r_hand) ? "markus" : "gabrielle"
var/state = (slot_id == SLOT_HUD_RIGHT_HAND) ? "markus" : "gabrielle"
handcuff_overlay = image("icon"='icons/mob/screen_gen.dmi', "icon_state"=state)
if(hud && hud.mymob)
@@ -452,13 +452,13 @@
if(C.handcuffed)
. += handcuff_overlay
var/obj/item/organ/external/hand = C.get_organ("[slot_id == slot_l_hand ? "l" : "r"]_hand")
var/obj/item/organ/external/hand = C.get_organ("[slot_id == SLOT_HUD_LEFT_HAND ? "l" : "r"]_hand")
if(!isalien(C) && (!hand || !hand.is_usable()))
. += blocked_overlay
if(slot_id == slot_l_hand && hud.mymob.hand)
if(slot_id == SLOT_HUD_LEFT_HAND && hud.mymob.hand)
. += active_overlay
else if(slot_id == slot_r_hand && !hud.mymob.hand)
else if(slot_id == SLOT_HUD_RIGHT_HAND && !hud.mymob.hand)
. += active_overlay
/obj/screen/inventory/hand/Click()
code/_onclick/telekinesis.dm
+1 -1
View File
@@ -89,7 +89,7 @@
//stops TK grabs being equipped anywhere but into hands
/obj/item/tk_grab/equipped(mob/user, slot)
if( (slot == slot_l_hand) || (slot== slot_r_hand) )
if( (slot == SLOT_HUD_LEFT_HAND) || (slot== SLOT_HUD_RIGHT_HAND) )
return
qdel(src)
code/controllers/subsystem/SSjobs.dm
+1 -1
View File
@@ -516,7 +516,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_glasses)
var/equipped = H.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(H), SLOT_HUD_GLASSES)
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
@@ -61,7 +61,7 @@
/datum/component/parry/proc/equipped(datum/source, mob/user, slot)
SIGNAL_HANDLER
if(slot in list(slot_l_hand, slot_r_hand))
if(slot in list(SLOT_HUD_LEFT_HAND, SLOT_HUD_RIGHT_HAND))
RegisterSignal(user, COMSIG_HUMAN_PARRY, PROC_REF(start_parry))
else
UnregisterSignal(user, COMSIG_HUMAN_PARRY)
code/datums/components/two_handed.dm
+2 -2
View File
@@ -126,7 +126,7 @@
/datum/component/two_handed/proc/on_equip(datum/source, mob/user, slot)
SIGNAL_HANDLER // COMSIG_ITEM_EQUIPPED
if(require_twohands && (slot == slot_l_hand || slot == slot_r_hand)) // force equip the item
if(require_twohands && (slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND)) // force equip the item
INVOKE_ASYNC(src, PROC_REF(wield), user)
if(!user.is_holding(parent) && wielded && !require_twohands)
INVOKE_ASYNC(src, PROC_REF(unwield), user)
@@ -277,7 +277,7 @@
parent_item.update_appearance()
if(istype(user)) // tk showed that we might not have a mob here
if(user.get_item_by_slot(slot_back) == parent)
if(user.get_item_by_slot(SLOT_HUD_BACK) == parent)
user.update_inv_back()
else
user.update_inv_l_hand()
code/datums/diseases/_MobProcs.dm
+2 -2
View File
@@ -101,8 +101,8 @@
if(isobj(H.wear_suit))
Cl = H.wear_suit
passed = prob((Cl.permeability_coefficient*100) - 1)
if(passed && isobj(slot_w_uniform))
Cl = slot_w_uniform
if(passed && isobj(SLOT_HUD_JUMPSUIT))
Cl = SLOT_HUD_JUMPSUIT
passed = prob((Cl.permeability_coefficient*100) - 1)
if(3)
if(isobj(H.wear_suit) && H.wear_suit.body_parts_covered&HANDS)
code/datums/diseases/pierrot_throat.dm
+1 -1
View File
@@ -63,4 +63,4 @@
if(!istype(affected_mob.wear_mask, /obj/item/clothing/mask/gas/clown_hat/nodrop))
affected_mob.unEquip(affected_mob.wear_mask, TRUE)
affected_mob.equip_to_slot(new /obj/item/clothing/mask/gas/clown_hat/nodrop(src), slot_wear_mask)
affected_mob.equip_to_slot(new /obj/item/clothing/mask/gas/clown_hat/nodrop(src), SLOT_HUD_WEAR_MASK)
code/datums/diseases/wizarditis.dm
+3 -3
View File
@@ -62,19 +62,19 @@ STI KALY - blind
if(!istype(H.head, /obj/item/clothing/head/wizard))
if(!H.unEquip(H.head))
qdel(H.head)
H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(H), SLOT_HUD_HEAD)
return
if(prob(chance))
if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe))
if(!H.unEquip(H.wear_suit))
qdel(H.wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(H), SLOT_HUD_OUTER_SUIT)
return
if(prob(chance))
if(!istype(H.shoes, /obj/item/clothing/shoes/sandal))
if(!H.unEquip(H.shoes))
qdel(H.shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), SLOT_HUD_SHOES)
return
else
var/mob/living/carbon/H = affected_mob
code/datums/elements/earhealing.dm
+1 -1
View File
@@ -20,7 +20,7 @@
/datum/element/earhealing/proc/equippedChanged(datum/source, mob/living/carbon/user, slot)
SIGNAL_HANDLER
if(((slot == slot_l_ear) || (slot == slot_r_ear)) && istype(user))
if(((slot == SLOT_HUD_LEFT_EAR) || (slot == SLOT_HUD_RIGHT_EAR)) && istype(user))
user_by_item[source] = user
else
user_by_item -= source
code/datums/keybindings/human_keybinds.dm
+3 -3
View File
@@ -11,7 +11,7 @@
/datum/keybinding/human/bag_equip/down(client/C)
. = ..()
var/mob/living/carbon/human/M = C.mob
M.quick_equip_item(slot_back)
M.quick_equip_item(SLOT_HUD_BACK)
/datum/keybinding/human/belt_equip
name = "Equip Held Object To Belt"
@@ -20,7 +20,7 @@
/datum/keybinding/human/belt_equip/down(client/C)
. = ..()
var/mob/living/carbon/human/M = C.mob
M.quick_equip_item(slot_belt)
M.quick_equip_item(SLOT_HUD_BELT)
/datum/keybinding/human/suit_equip
name = "Equip Held Object To Suit Storage"
@@ -29,7 +29,7 @@
/datum/keybinding/human/suit_equip/down(client/C)
. = ..()
var/mob/living/carbon/human/M = C.mob
M.quick_equip_item(slot_s_store)
M.quick_equip_item(SLOT_HUD_SUIT_STORE)
/datum/keybinding/human/toggle_holster
name = "Toggle Holster"
code/datums/outfits/outfit.dm
+17 -17
View File
@@ -57,29 +57,29 @@
//Start with uniform,suit,backpack for additional slots
if(uniform)
equip_item(H, uniform, slot_w_uniform)
equip_item(H, uniform, SLOT_HUD_JUMPSUIT)
if(suit)
equip_item(H, suit, slot_wear_suit)
equip_item(H, suit, SLOT_HUD_OUTER_SUIT)
if(back)
equip_item(H, back, slot_back)
equip_item(H, back, SLOT_HUD_BACK)
if(belt)
equip_item(H, belt, slot_belt)
equip_item(H, belt, SLOT_HUD_BELT)
if(gloves)
equip_item(H, gloves, slot_gloves)
equip_item(H, gloves, SLOT_HUD_GLOVES)
if(shoes)
equip_item(H, shoes, slot_shoes)
equip_item(H, shoes, SLOT_HUD_SHOES)
if(head)
equip_item(H, head, slot_head)
equip_item(H, head, SLOT_HUD_HEAD)
if(mask)
equip_item(H, mask, slot_wear_mask)
equip_item(H, mask, SLOT_HUD_WEAR_MASK)
if(l_ear)
equip_item(H, l_ear, slot_l_ear)
equip_item(H, l_ear, SLOT_HUD_LEFT_EAR)
if(r_ear)
equip_item(H, r_ear, slot_r_ear)
equip_item(H, r_ear, SLOT_HUD_RIGHT_EAR)
if(glasses)
equip_item(H, glasses, slot_glasses)
equip_item(H, glasses, SLOT_HUD_GLASSES)
if(id)
equip_item(H, id, slot_wear_id)
equip_item(H, id, SLOT_HUD_WEAR_ID)
if(!H.head && toggle_helmet && istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit))
var/obj/item/clothing/suit/space/hardsuit/HS = H.wear_suit
@@ -89,7 +89,7 @@
C.quick_activation()
if(suit_store)
equip_item(H, suit_store, slot_s_store)
equip_item(H, suit_store, SLOT_HUD_SUIT_STORE)
if(l_hand)
H.put_in_l_hand(new l_hand(H))
@@ -97,7 +97,7 @@
H.put_in_r_hand(new r_hand(H))
if(pda)
equip_item(H, pda, slot_wear_pda)
equip_item(H, pda, SLOT_HUD_WEAR_PDA)
if(uniform)
for(var/path in accessories)
@@ -107,9 +107,9 @@
if(!visualsOnly) // Items in pockets or backpack don't show up on mob's icon.
if(l_pocket)
equip_item(H, l_pocket, slot_l_store)
equip_item(H, l_pocket, SLOT_HUD_LEFT_STORE)
if(r_pocket)
equip_item(H, r_pocket, slot_r_store)
equip_item(H, r_pocket, SLOT_HUD_RIGHT_STORE)
if(box)
if(!backpack_contents)
@@ -122,7 +122,7 @@
if(!number)
number = 1
for(var/i in 1 to number)
H.equip_or_collect(new path(H), slot_in_backpack)
H.equip_or_collect(new path(H), SLOT_HUD_IN_BACKPACK)
for(var/path in cybernetic_implants)
var/obj/item/organ/internal/O = new path
code/datums/outfits/outfit_admin.dm
+2 -2
View File
@@ -9,7 +9,7 @@
/datum/outfit/admin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
@@ -1173,7 +1173,7 @@
if(istype(C))
C.name = "ancient robes"
C.hood.name = "ancient hood"
H.equip_to_slot_or_del(C, slot_in_backpack)
H.equip_to_slot_or_del(C, SLOT_HUD_IN_BACKPACK)
var/obj/item/card/id/I = H.wear_id
if(istype(I))
code/datums/outfits/outfit_debug.dm
+1 -1
View File
@@ -22,7 +22,7 @@
id = /obj/item/card/id/admin
pda = /obj/item/pda/centcom
internals_slot = slot_s_store
internals_slot = SLOT_HUD_SUIT_STORE
toggle_helmet = TRUE
cybernetic_implants = list(
code/datums/outfits/vv_outfit.dm
+21 -21
View File
@@ -11,37 +11,37 @@
/datum/outfit/varedit/proc/set_equipment_by_slot(slot, item_path)
switch(slot)
if(slot_w_uniform)
if(SLOT_HUD_JUMPSUIT)
uniform = item_path
if(slot_back)
if(SLOT_HUD_BACK)
back = item_path
if(slot_wear_suit)
if(SLOT_HUD_OUTER_SUIT)
suit = item_path
if(slot_belt)
if(SLOT_HUD_BELT)
belt = item_path
if(slot_gloves)
if(SLOT_HUD_GLOVES)
gloves = item_path
if(slot_shoes)
if(SLOT_HUD_SHOES)
shoes = item_path
if(slot_head)
if(SLOT_HUD_HEAD)
head = item_path
if(slot_wear_mask)
if(SLOT_HUD_WEAR_MASK)
mask = item_path
if(slot_l_ear)
if(SLOT_HUD_LEFT_EAR)
l_ear = item_path
if(slot_r_ear)
if(SLOT_HUD_RIGHT_EAR)
r_ear = item_path
if(slot_glasses)
if(SLOT_HUD_GLASSES)
glasses = item_path
if(slot_wear_id)
if(SLOT_HUD_WEAR_ID)
id = item_path
if(slot_wear_pda)
if(SLOT_HUD_WEAR_PDA)
pda = item_path
if(slot_s_store)
if(SLOT_HUD_SUIT_STORE)
suit_store = item_path
if(slot_l_store)
if(SLOT_HUD_LEFT_STORE)
l_pocket = item_path
if(slot_r_store)
if(SLOT_HUD_RIGHT_STORE)
r_pocket = item_path
@@ -68,7 +68,7 @@
//Copy equipment
var/list/result = list()
var/list/slots_to_check = list(slot_w_uniform, slot_back, slot_wear_suit, slot_belt, slot_gloves, slot_shoes, slot_head, slot_wear_mask, slot_l_ear, slot_r_ear, slot_glasses, slot_wear_id, slot_wear_pda, slot_s_store, slot_l_store, slot_r_store)
var/list/slots_to_check = list(SLOT_HUD_JUMPSUIT, SLOT_HUD_BACK, SLOT_HUD_OUTER_SUIT, SLOT_HUD_BELT, SLOT_HUD_GLOVES, SLOT_HUD_SHOES, SLOT_HUD_HEAD, SLOT_HUD_WEAR_MASK, SLOT_HUD_LEFT_EAR, SLOT_HUD_RIGHT_EAR, SLOT_HUD_GLASSES, SLOT_HUD_WEAR_ID, SLOT_HUD_WEAR_PDA, SLOT_HUD_SUIT_STORE, SLOT_HUD_LEFT_STORE, SLOT_HUD_RIGHT_STORE)
for(var/s in slots_to_check)
var/obj/item/I = get_item_by_slot(s)
var/vedits = collect_vv(I)
@@ -79,7 +79,7 @@
//Copy access
O.stored_access = list()
var/obj/item/id_slot = get_item_by_slot(slot_wear_id)
var/obj/item/id_slot = get_item_by_slot(SLOT_HUD_WEAR_ID)
if(id_slot)
O.stored_access |= id_slot.GetAccess()
var/obj/item/card/id/ID = id_slot.GetID()
@@ -103,7 +103,7 @@
O.vv_values = result
//Copy backpack contents if exist.
var/obj/item/backpack = get_item_by_slot(slot_back)
var/obj/item/backpack = get_item_by_slot(SLOT_HUD_BACK)
if(istype(backpack) && LAZYLEN(backpack.contents) > 0)
var/list/typecounts = list()
for(var/obj/item/I in backpack)
@@ -127,7 +127,7 @@
O.cybernetic_implants |= aug.type
// Copy accessories
var/obj/item/clothing/under/uniform_slot = get_item_by_slot(slot_w_uniform)
var/obj/item/clothing/under/uniform_slot = get_item_by_slot(SLOT_HUD_JUMPSUIT)
if(uniform_slot)
O.accessories = list()
for(var/obj/item/clothing/accessory/A in uniform_slot.accessories)
@@ -156,7 +156,7 @@
for(var/vname in edits)
I.vv_edit_var(vname,edits[vname])
//Apply access
var/obj/item/id_slot = H.get_item_by_slot(slot_wear_id)
var/obj/item/id_slot = H.get_item_by_slot(SLOT_HUD_WEAR_ID)
if(id_slot)
var/obj/item/card/id/card = id_slot.GetID()
if(istype(card))
code/datums/spells/banana_touch.dm
+7 -7
View File
@@ -43,17 +43,17 @@
unEquip(wear_mask, TRUE)
unEquip(head, TRUE)
unEquip(wear_suit, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/head/wizard/clown, slot_head, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/wizrobe/clown, slot_wear_suit, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/magical, slot_shoes, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clownwiz, slot_wear_mask, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/head/wizard/clown, SLOT_HUD_HEAD, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/wizrobe/clown, SLOT_HUD_OUTER_SUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/magical, SLOT_HUD_SHOES, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clownwiz, SLOT_HUD_WEAR_MASK, TRUE, TRUE)
else
qdel(shoes)
qdel(wear_mask)
qdel(w_uniform)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/clown/nodrop, slot_w_uniform, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/nodrop, slot_shoes, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/nodrop, slot_wear_mask, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/clown/nodrop, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/nodrop, SLOT_HUD_SHOES, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/nodrop, SLOT_HUD_WEAR_MASK, TRUE, TRUE)
dna.SetSEState(GLOB.clumsyblock, TRUE, TRUE)
dna.SetSEState(GLOB.comicblock, TRUE, TRUE)
singlemutcheck(src, GLOB.clumsyblock, MUTCHK_FORCED)
code/datums/spells/cluwne.dm
+6 -6
View File
@@ -36,10 +36,10 @@
tumor.insert(src)
if(!istype(wear_mask, /obj/item/clothing/mask/cursedclown)) //Infinite loops otherwise
unEquip(wear_mask, 1)
equip_to_slot_if_possible(new /obj/item/clothing/under/cursedclown, slot_w_uniform, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/gloves/cursedclown, slot_gloves, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/cursedclown, slot_wear_mask, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/cursedclown, slot_shoes, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/cursedclown, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/gloves/cursedclown, SLOT_HUD_GLOVES, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/cursedclown, SLOT_HUD_WEAR_MASK, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/cursedclown, SLOT_HUD_SHOES, TRUE, TRUE)
/mob/living/carbon/human/proc/makeAntiCluwne()
to_chat(src, "<span class='danger'>You don't feel very funny.</span>")
@@ -80,5 +80,5 @@
unEquip(gloves, 1)
qdel(G)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/lawyer/black, slot_w_uniform, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, slot_shoes, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/lawyer/black, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, SLOT_HUD_SHOES, TRUE, TRUE)
code/datums/spells/horsemask.dm
+1 -1
View File
@@ -36,6 +36,6 @@
"<span class='danger'>Your face burns up, and shortly after the fire you realise you have the face of a horse!</span>")
if(!target.unEquip(target.wear_mask))
qdel(target.wear_mask)
target.equip_to_slot_if_possible(magichead, slot_wear_mask, TRUE, TRUE)
target.equip_to_slot_if_possible(magichead, SLOT_HUD_WEAR_MASK, TRUE, TRUE)
target.flash_eyes()
code/datums/spells/lichdom.dm
+4 -4
View File
@@ -129,7 +129,7 @@
equip_lich(H)
/obj/effect/proc_holder/spell/lichdom/proc/equip_lich(mob/living/carbon/human/H)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), SLOT_HUD_OUTER_SUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), SLOT_HUD_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), SLOT_HUD_SHOES)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), SLOT_HUD_JUMPSUIT)
code/datums/spells/mime_malaise.dm
+6 -6
View File
@@ -37,17 +37,17 @@
unEquip(wear_mask, TRUE)
unEquip(w_uniform, TRUE)
unEquip(wear_suit, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime, slot_wear_mask, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime, slot_w_uniform, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders, slot_wear_suit, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime, SLOT_HUD_WEAR_MASK, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders, SLOT_HUD_OUTER_SUIT, TRUE, TRUE)
Silence(14 SECONDS)
else
qdel(wear_mask)
qdel(w_uniform)
qdel(wear_suit)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime/nodrop, slot_wear_mask, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime/nodrop, slot_w_uniform, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders/nodrop, slot_wear_suit, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime/nodrop, SLOT_HUD_WEAR_MASK, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime/nodrop, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders/nodrop, SLOT_HUD_OUTER_SUIT, TRUE, TRUE)
dna.SetSEState(GLOB.muteblock , TRUE, TRUE)
singlemutcheck(src, GLOB.muteblock, MUTCHK_FORCED)
dna.default_blocks.Add(GLOB.muteblock)
code/datums/spells/summonitem.dm
+4 -4
View File
@@ -105,12 +105,12 @@
if(target.hand) //left active hand
if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_l_hand, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_r_hand, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_LEFT_HAND, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_RIGHT_HAND, FALSE, TRUE))
butterfingers = TRUE
else //right active hand
if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_r_hand, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_l_hand, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_RIGHT_HAND, FALSE, TRUE))
if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_LEFT_HAND, FALSE, TRUE))
butterfingers = TRUE
if(butterfingers)
item_to_retrieve.loc = target.loc
code/datums/spells/touch_attacks.dm
+4 -4
View File
@@ -21,12 +21,12 @@
user.put_in_hands(attached_hand)
return
if(user.hand) //left active hand
if(!user.equip_to_slot_if_possible(attached_hand, slot_l_hand, FALSE, TRUE))
if(!user.equip_to_slot_if_possible(attached_hand, slot_r_hand, FALSE, TRUE))
if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_LEFT_HAND, FALSE, TRUE))
if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_RIGHT_HAND, FALSE, TRUE))
hand_handled = 0
else //right active hand
if(!user.equip_to_slot_if_possible(attached_hand, slot_r_hand, FALSE, TRUE))
if(!user.equip_to_slot_if_possible(attached_hand, slot_l_hand, FALSE, TRUE))
if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_RIGHT_HAND, FALSE, TRUE))
if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_LEFT_HAND, FALSE, TRUE))
hand_handled = 0
if(!hand_handled)
qdel(attached_hand)
code/game/gamemodes/cult/blood_magic.dm
+4 -4
View File
@@ -668,10 +668,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_wear_suit)
C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(user), slot_w_uniform)
C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), slot_back)
C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes)
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)
if(C == user)
qdel(src) //Clears the hands
code/game/gamemodes/cult/cult_items.dm
+1 -1
View File
@@ -220,7 +220,7 @@
user.unEquip(src, 1)
user.Confused(20 SECONDS)
user.Weaken(10 SECONDS)
else if(slot == slot_wear_suit)
else if(slot == SLOT_HUD_OUTER_SUIT)
ADD_TRAIT(user, TRAIT_GOTTAGOFAST, "cultrobes[UID()]")
/obj/item/clothing/suit/hooded/cultrobes/flagellant_robe/dropped(mob/user)
code/game/gamemodes/cult/cult_mode.dm
+3 -3
View File
@@ -114,9 +114,9 @@ GLOBAL_LIST_EMPTY(all_cults)
/datum/game_mode/proc/cult_give_item(obj/item/item_path, mob/living/carbon/human/H)
var/list/slots = list(
"backpack" = slot_in_backpack,
"left pocket" = slot_l_store,
"right pocket" = slot_r_store)
"backpack" = SLOT_HUD_IN_BACKPACK,
"left pocket" = SLOT_HUD_LEFT_STORE,
"right pocket" = SLOT_HUD_RIGHT_STORE)
var/T = new item_path(H)
var/item_name = initial(item_path.name)
var/where = H.equip_in_one_of_slots(T, slots)
code/game/gamemodes/cult/runes.dm
+1 -1
View File
@@ -368,7 +368,7 @@ structure_check() searches for nearby cultist structures required for the invoca
H.Silence(6 SECONDS) //Prevent "HALP MAINT CULT" before you realise you're converted
var/obj/item/melee/cultblade/dagger/D = new(get_turf(src))
if(H.equip_to_slot_if_possible(D, slot_in_backpack, FALSE, TRUE))
if(H.equip_to_slot_if_possible(D, SLOT_HUD_IN_BACKPACK, FALSE, TRUE))
to_chat(H, "<span class='cultlarge'>You have a dagger in your backpack. Use it to do [SSticker.cultdat.entity_title1]'s bidding. </span>")
else
to_chat(H, "<span class='cultlarge'>There is a dagger on the floor. Use it to do [SSticker.cultdat.entity_title1]'s bidding.</span>")
code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+2 -2
View File
@@ -54,7 +54,7 @@
A.UpdateButtonIcon()
/obj/item/clothing/suit/armor/abductor/vest/item_action_slot_check(slot, mob/user)
if(slot == slot_wear_suit) //we only give the mob the ability to activate the vest if he's actually wearing it.
if(slot == SLOT_HUD_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)
@@ -406,7 +406,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
icon_state = "wonderprodStun"
item_state = "wonderprod"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_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_back)
var/obj/item/abductor/gizmo/G = locate() in H.get_item_by_slot(SLOT_HUD_BACK)
if(G)
console.gizmo = G
G.console = console
code/game/gamemodes/nuclear/nuclear.dm
+19 -19
View File
@@ -203,7 +203,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_r_hand)
synd_mind.current.equip_to_slot_or_del(challenge, SLOT_HUD_RIGHT_HAND)
update_syndicate_id(synd_mind, leader_title, TRUE)
@@ -220,7 +220,7 @@
else
var/mob/living/carbon/human/H = synd_mind.current
P.loc = H.loc
H.equip_to_slot_or_del(P, slot_r_store, 0)
H.equip_to_slot_or_del(P, SLOT_HUD_RIGHT_STORE, 0)
H.update_icons()
@@ -258,7 +258,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_l_ear)
synd_mob.equip_to_slot_or_del(R, SLOT_HUD_LEFT_EAR)
var/back
@@ -274,18 +274,18 @@
else
back = /obj/item/storage/backpack
synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), slot_w_uniform)
synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(synd_mob), slot_shoes)
synd_mob.equip_or_collect(new /obj/item/clothing/gloves/combat(synd_mob), slot_gloves)
synd_mob.equip_to_slot_or_del(new /obj/item/card/id/syndicate(synd_mob), slot_wear_id)
synd_mob.equip_to_slot_or_del(new back(synd_mob), slot_back)
synd_mob.equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/pistol(synd_mob), slot_belt)
synd_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival_syndi(synd_mob.back), slot_in_backpack)
synd_mob.equip_to_slot_or_del(new /obj/item/pinpointer/nukeop(synd_mob), slot_wear_pda)
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)
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_in_backpack)
synd_mob.equip_to_slot_or_del(U, SLOT_HUD_IN_BACKPACK)
synd_mob.mind.offstation_role = TRUE
if(synd_mob.dna.species)
@@ -293,17 +293,17 @@
switch(race)
if("Vox")
synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), slot_wear_mask)
synd_mob.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double/vox(synd_mob), slot_l_hand)
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.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_wear_mask)
synd_mob.equip_or_collect(new /obj/item/tank/internals/plasmaman(synd_mob), slot_s_store)
synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), slot_in_backpack)
synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), slot_in_backpack)
synd_mob.internal = synd_mob.get_item_by_slot(slot_s_store)
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.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_PDA | SLOT_BELT
slot_flags = SLOT_FLAG_PDA | SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
item_state = "electronic"
throw_speed = 4
@@ -279,7 +279,7 @@
///////////////////////
/obj/item/pinpointer/nukeop
var/obj/docking_port/mobile/home = null
slot_flags = SLOT_BELT | SLOT_PDA
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_PDA
syndicate = TRUE
modes = list(MODE_DISK, MODE_NUKE)
code/game/gamemodes/objective.dm
+5 -5
View File
@@ -564,11 +564,11 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
/datum/objective/steal/proc/give_kit(obj/item/item_path)
var/I = new item_path
var/list/slots = list(
"backpack" = slot_in_backpack,
"left pocket" = slot_l_store,
"right pocket" = slot_r_store,
"left hand" = slot_l_hand,
"right hand" = slot_r_hand,
"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,
)
for(var/datum/mind/M in get_owners())
var/mob/living/carbon/human/H = M.current
code/game/gamemodes/wizard/artefact.dm
+169 -169
View File
@@ -53,21 +53,21 @@
if("healing")
M.mind.AddSpell(new /obj/effect/proc_holder/spell/charge(null))
M.mind.AddSpell(new /obj/effect/proc_holder/spell/forcewall(null))
M.equip_to_slot_or_del(new /obj/item/gun/magic/staff/healing(M), slot_r_hand)
M.equip_to_slot_or_del(new /obj/item/gun/magic/staff/healing(M), SLOT_HUD_RIGHT_HAND)
to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned livesaving survival spells. You are able to cast charge and forcewall.")
if("robeless")
M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe/knock(null))
M.mind.AddSpell(new /obj/effect/proc_holder/spell/mind_transfer(null))
to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.")
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/storage/backpack(M), slot_back)
M.equip_to_slot_or_del(new /obj/item/storage/box(M), slot_in_backpack)
M.equip_to_slot_or_del(new /obj/item/teleportation_scroll/apprentice(M), slot_r_store)
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/under/color/lightpurple(M), SLOT_HUD_JUMPSUIT)
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/clothing/suit/wizrobe(M), SLOT_HUD_OUTER_SUIT)
M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(M), SLOT_HUD_HEAD)
M.equip_to_slot_or_del(new /obj/item/storage/backpack(M), SLOT_HUD_BACK)
M.equip_to_slot_or_del(new /obj/item/storage/box(M), SLOT_HUD_IN_BACKPACK)
M.equip_to_slot_or_del(new /obj/item/teleportation_scroll/apprentice(M), SLOT_HUD_RIGHT_STORE)
var/wizard_name_first = pick(GLOB.wizard_first)
var/wizard_name_second = pick(GLOB.wizard_second)
var/randomname = "[wizard_name_first] [wizard_name_second]"
@@ -289,7 +289,7 @@ GLOBAL_LIST_EMPTY(multiverse)
item_state = "energy_katana"
hitsound = 'sound/weapons/bladeslice.ogg'
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 20
throwforce = 10
sharp = TRUE
@@ -433,199 +433,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_head)
var/obj/head = H.get_item_by_slot(SLOT_HUD_HEAD)
if(head)
M.equip_to_slot_or_del(new head.type(M), slot_head)
M.equip_to_slot_or_del(new head.type(M), SLOT_HUD_HEAD)
var/obj/mask = H.get_item_by_slot(slot_wear_mask)
var/obj/mask = H.get_item_by_slot(SLOT_HUD_WEAR_MASK)
if(mask)
M.equip_to_slot_or_del(new mask.type(M), slot_wear_mask)
M.equip_to_slot_or_del(new mask.type(M), SLOT_HUD_WEAR_MASK)
var/obj/glasses = H.get_item_by_slot(slot_glasses)
var/obj/glasses = H.get_item_by_slot(SLOT_HUD_GLASSES)
if(glasses)
M.equip_to_slot_or_del(new glasses.type(M), slot_glasses)
M.equip_to_slot_or_del(new glasses.type(M), SLOT_HUD_GLASSES)
var/obj/left_ear = H.get_item_by_slot(slot_l_ear)
var/obj/left_ear = H.get_item_by_slot(SLOT_HUD_LEFT_EAR)
if(left_ear)
M.equip_to_slot_or_del(new left_ear.type(M), slot_l_ear)
M.equip_to_slot_or_del(new left_ear.type(M), SLOT_HUD_LEFT_EAR)
var/obj/right_ear = H.get_item_by_slot(slot_r_ear)
var/obj/right_ear = H.get_item_by_slot(SLOT_HUD_RIGHT_EAR)
if(right_ear)
M.equip_to_slot_or_del(new right_ear.type(M), slot_r_ear)
M.equip_to_slot_or_del(new right_ear.type(M), SLOT_HUD_RIGHT_EAR)
var/obj/uniform = H.get_item_by_slot(slot_w_uniform)
var/obj/uniform = H.get_item_by_slot(SLOT_HUD_JUMPSUIT)
if(uniform)
M.equip_to_slot_or_del(new uniform.type(M), slot_w_uniform)
M.equip_to_slot_or_del(new uniform.type(M), SLOT_HUD_JUMPSUIT)
var/obj/suit = H.get_item_by_slot(slot_wear_suit)
var/obj/suit = H.get_item_by_slot(SLOT_HUD_OUTER_SUIT)
if(suit)
M.equip_to_slot_or_del(new suit.type(M), slot_wear_suit)
M.equip_to_slot_or_del(new suit.type(M), SLOT_HUD_OUTER_SUIT)
var/obj/gloves = H.get_item_by_slot(slot_gloves)
var/obj/gloves = H.get_item_by_slot(SLOT_HUD_GLOVES)
if(gloves)
M.equip_to_slot_or_del(new gloves.type(M), slot_gloves)
M.equip_to_slot_or_del(new gloves.type(M), SLOT_HUD_GLOVES)
var/obj/shoes = H.get_item_by_slot(slot_shoes)
var/obj/shoes = H.get_item_by_slot(SLOT_HUD_SHOES)
if(shoes)
M.equip_to_slot_or_del(new shoes.type(M), slot_shoes)
M.equip_to_slot_or_del(new shoes.type(M), SLOT_HUD_SHOES)
var/obj/belt = H.get_item_by_slot(slot_belt)
var/obj/belt = H.get_item_by_slot(SLOT_HUD_BELT)
if(belt)
M.equip_to_slot_or_del(new belt.type(M), slot_belt)
M.equip_to_slot_or_del(new belt.type(M), SLOT_HUD_BELT)
var/obj/pda = H.get_item_by_slot(slot_wear_pda)
var/obj/pda = H.get_item_by_slot(SLOT_HUD_WEAR_PDA)
if(pda)
M.equip_to_slot_or_del(new pda.type(M), slot_wear_pda)
M.equip_to_slot_or_del(new pda.type(M), SLOT_HUD_WEAR_PDA)
var/obj/back = H.get_item_by_slot(slot_back)
var/obj/back = H.get_item_by_slot(SLOT_HUD_BACK)
if(back)
M.equip_to_slot_or_del(new back.type(M), slot_back)
M.equip_to_slot_or_del(new back.type(M), SLOT_HUD_BACK)
var/obj/suit_storage = H.get_item_by_slot(slot_s_store)
var/obj/suit_storage = H.get_item_by_slot(SLOT_HUD_SUIT_STORE)
if(suit_storage)
M.equip_to_slot_or_del(new suit_storage.type(M), slot_s_store)
M.equip_to_slot_or_del(new suit_storage.type(M), SLOT_HUD_SUIT_STORE)
var/obj/left_pocket = H.get_item_by_slot(slot_l_store)
var/obj/left_pocket = H.get_item_by_slot(SLOT_HUD_LEFT_STORE)
if(left_pocket)
M.equip_to_slot_or_del(new left_pocket.type(M), slot_l_store)
M.equip_to_slot_or_del(new left_pocket.type(M), SLOT_HUD_LEFT_STORE)
var/obj/right_pocket = H.get_item_by_slot(slot_r_store)
var/obj/right_pocket = H.get_item_by_slot(SLOT_HUD_RIGHT_STORE)
if(right_pocket)
M.equip_to_slot_or_del(new right_pocket.type(M), slot_r_store)
M.equip_to_slot_or_del(new right_pocket.type(M), SLOT_HUD_RIGHT_STORE)
M.equip_to_slot_or_del(sword, slot_r_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, 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.
else
if(istajaran(M) || isunathi(M))
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_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), SLOT_HUD_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_head)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses)
M.equip_to_slot_or_del(new /obj/item/clothing/under/suit/really_black(M), slot_w_uniform)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
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_head)
M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/shield/riot/roman(M), slot_l_hand)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
if("wizard")
M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), slot_head)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
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_glasses)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
if("syndicate")
M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M),slot_wear_mask)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
if("assistant")
M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
if("animu")
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(M), slot_w_uniform)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
if("cultist")
M.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
if("highlander")
M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/head/beret(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
if("clown")
M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask)
M.equip_to_slot_or_del(new /obj/item/bikehorn(M), slot_l_store)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
if("killer")
M.equip_to_slot_or_del(new /obj/item/clothing/under/misc/overalls(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), slot_wear_mask)
M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/kitchen/knife(M), slot_l_store)
M.equip_to_slot_or_del(new /obj/item/scalpel(M), slot_r_store)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
for(var/obj/item/carried_item in M.contents)
if(!istype(carried_item, /obj/item/implant))
carried_item.add_mob_blood(M)
if("pirate")
M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
if("soviet")
M.equip_to_slot_or_del(new /obj/item/clothing/head/sovietofficerhat(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/sovietcoat(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/clothing/under/new_soviet/sovietofficer(M), slot_w_uniform)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
if("officer")
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), slot_wear_mask)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/jacket/miljacket(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
if("gladiator")
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/gladiator(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes)
M.equip_to_slot_or_del(sword, slot_r_hand)
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)
else
@@ -633,7 +633,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_wear_id)
var/duplicated_access = usr.get_item_by_slot(SLOT_HUD_WEAR_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
@@ -648,7 +648,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_wear_id)
M.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID)
if(isvox(M))
M.dna.species.after_equip_job(null, M) //Nitrogen tanks
@@ -746,38 +746,38 @@ GLOBAL_LIST_EMPTY(multiverse)
switch(randomSpooky)
if("roman")
var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire)
H.equip_to_slot_or_del(new hat(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand)
H.equip_to_slot_or_del(new /obj/item/claymore(H), slot_r_hand)
H.equip_to_slot_or_del(new /obj/item/spear(H), slot_back)
H.equip_to_slot_or_del(new hat(H), SLOT_HUD_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), SLOT_HUD_JUMPSUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), SLOT_HUD_SHOES)
H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND)
H.equip_to_slot_or_del(new /obj/item/claymore(H), SLOT_HUD_RIGHT_HAND)
H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK)
if("pirate")
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(H), slot_glasses)
H.equip_to_slot_or_del(new /obj/item/claymore(H), slot_r_hand)
H.equip_to_slot_or_del(new /obj/item/spear(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand)
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(H), SLOT_HUD_JUMPSUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(H), SLOT_HUD_OUTER_SUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(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/glasses/eyepatch(H), SLOT_HUD_GLASSES)
H.equip_to_slot_or_del(new /obj/item/claymore(H), SLOT_HUD_RIGHT_HAND)
H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK)
H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND)
if("yand")//mine is an evil laugh
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/katana(H), slot_r_hand)
H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand)
H.equip_to_slot_or_del(new /obj/item/spear(H), slot_back)
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/head/kitty(H), SLOT_HUD_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(H), SLOT_HUD_JUMPSUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), SLOT_HUD_OUTER_SUIT)
H.equip_to_slot_or_del(new /obj/item/katana(H), SLOT_HUD_RIGHT_HAND)
H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND)
H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK)
if("clown")
H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask)
H.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/bikehorn(H), slot_l_store)
H.equip_to_slot_or_del(new /obj/item/claymore(H), slot_r_hand)
H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand)
H.equip_to_slot_or_del(new /obj/item/spear(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(H), SLOT_HUD_JUMPSUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(H), SLOT_HUD_SHOES)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), SLOT_HUD_WEAR_MASK)
H.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(H), SLOT_HUD_HEAD)
H.equip_to_slot_or_del(new /obj/item/bikehorn(H), SLOT_HUD_LEFT_STORE)
H.equip_to_slot_or_del(new /obj/item/claymore(H), SLOT_HUD_RIGHT_HAND)
H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND)
H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK)
/obj/item/necromantic_stone/proc/spawnheresy(mob/living/carbon/human/H as mob)
H.set_species(/datum/species/human)
@@ -797,13 +797,13 @@ GLOBAL_LIST_EMPTY(multiverse)
H.update_body()
H.grab_ghost()
H.revive()
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/katana(H), slot_r_hand)
H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand)
H.equip_to_slot_or_del(new /obj/item/spear(H), slot_back)
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/head/kitty(H), SLOT_HUD_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(H), SLOT_HUD_JUMPSUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), SLOT_HUD_OUTER_SUIT)
H.equip_to_slot_or_del(new /obj/item/katana(H), SLOT_HUD_RIGHT_HAND)
H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND)
H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK)
if(!H.real_name || H.real_name == "unknown")
H.real_name = "Neko-chan"
else
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_BELT
slot_flags = SLOT_FLAG_BELT
origin_tech = "bluespace=4;materials=5"
/// The body/brain of the player inside this construct, transferred over from the soulstone.
code/game/gamemodes/wizard/spellbook.dm
+1 -1
View File
@@ -1078,7 +1078,7 @@
magichead.voicechange = TRUE //NEEEEIIGHH
if(!user.unEquip(user.wear_mask))
qdel(user.wear_mask)
user.equip_to_slot_if_possible(magichead, slot_wear_mask, TRUE, TRUE)
user.equip_to_slot_if_possible(magichead, SLOT_HUD_WEAR_MASK, TRUE, TRUE)
qdel(src)
else
to_chat(user, "<span class='notice'>I say thee neigh</span>")
code/game/gamemodes/wizard/wizard.dm
+10 -10
View File
@@ -123,22 +123,22 @@
wizard_mob.internal = wizard_mob.r_hand
wizard_mob.update_action_buttons_icon()
else
wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(wizard_mob), slot_w_uniform)
wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), slot_head)
wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(wizard_mob), SLOT_HUD_JUMPSUIT)
wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), SLOT_HUD_HEAD)
wizard_mob.dna.species.after_equip_job(null, wizard_mob)
wizard_mob.rejuvenate() //fix any damage taken by naked vox/plasmamen/etc while round setups
wizard_mob.equip_to_slot_or_del(new /obj/item/radio/headset(wizard_mob), slot_l_ear)
wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(wizard_mob), slot_shoes)
wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(wizard_mob), slot_wear_suit)
wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(wizard_mob), slot_back)
wizard_mob.equip_to_slot_or_del(new /obj/item/radio/headset(wizard_mob), SLOT_HUD_LEFT_EAR)
wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(wizard_mob), SLOT_HUD_SHOES)
wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(wizard_mob), SLOT_HUD_OUTER_SUIT)
wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(wizard_mob), SLOT_HUD_BACK)
if(wizard_mob.dna.species.speciesbox)
wizard_mob.equip_to_slot_or_del(new wizard_mob.dna.species.speciesbox(wizard_mob), slot_in_backpack)
wizard_mob.equip_to_slot_or_del(new wizard_mob.dna.species.speciesbox(wizard_mob), SLOT_HUD_IN_BACKPACK)
else
wizard_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival(wizard_mob), slot_in_backpack)
wizard_mob.equip_to_slot_or_del(new /obj/item/teleportation_scroll(wizard_mob), slot_r_store)
wizard_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival(wizard_mob), SLOT_HUD_IN_BACKPACK)
wizard_mob.equip_to_slot_or_del(new /obj/item/teleportation_scroll(wizard_mob), SLOT_HUD_RIGHT_STORE)
var/obj/item/spellbook/spellbook = new /obj/item/spellbook(wizard_mob)
spellbook.owner = wizard_mob
wizard_mob.equip_to_slot_or_del(spellbook, slot_l_hand)
wizard_mob.equip_to_slot_or_del(spellbook, SLOT_HUD_LEFT_HAND)
wizard_mob.faction = list("wizard")
wizard_mob.mind.offstation_role = TRUE
code/game/gamemodes/wizard/wizloadouts.dm
+6 -6
View File
@@ -61,10 +61,10 @@
is_ragin_restricted = TRUE
/obj/effect/proc_holder/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_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(H), slot_gloves)
H.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(H), slot_w_uniform)
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)
/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_w_uniform) //Just in case they're naked
user.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/glorf, SLOT_HUD_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_wear_id)
user.equip_to_slot_or_del(wizid, SLOT_HUD_WEAR_ID)
wizid.registered_name = user.real_name
wizid.access = list(ACCESS_MAINT_TUNNELS)
wizid.assignment = "Assistant"
code/game/jobs/job/support.dm
+1 -1
View File
@@ -109,7 +109,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_s_store
internals_slot = SLOT_HUD_SUIT_STORE
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
/obj/item/kitchen/knife/combat/survival=1,
code/game/objects/items.dm
+13 -13
View File
@@ -491,7 +491,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
if(!initial)
if(equip_sound && slot == slot_bitfield_to_slot(slot_flags))
playsound(src, equip_sound, EQUIP_SOUND_VOLUME, TRUE, ignore_walls = FALSE)
else if(slot == slot_l_hand || slot == slot_r_hand)
else if(slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND)
playsound(src, pickup_sound, PICKUP_SOUND_VOLUME, ignore_walls = FALSE)
/obj/item/proc/item_action_slot_check(slot, mob/user)
@@ -809,29 +809,29 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
return
var/mob/owner = loc
var/flags = slot_flags
if(flags & SLOT_OCLOTHING)
if(flags & SLOT_FLAG_OCLOTHING)
owner.update_inv_wear_suit()
if(flags & SLOT_ICLOTHING)
if(flags & SLOT_FLAG_ICLOTHING)
owner.update_inv_w_uniform()
if(flags & SLOT_GLOVES)
if(flags & SLOT_FLAG_GLOVES)
owner.update_inv_gloves()
if(flags & SLOT_EYES)
if(flags & SLOT_FLAG_EYES)
owner.update_inv_glasses()
if(flags & SLOT_EARS)
if(flags & SLOT_FLAG_EARS)
owner.update_inv_ears()
if(flags & SLOT_MASK)
if(flags & SLOT_FLAG_MASK)
owner.update_inv_wear_mask()
if(flags & SLOT_HEAD)
if(flags & SLOT_FLAG_HEAD)
owner.update_inv_head()
if(flags & SLOT_FEET)
if(flags & SLOT_FLAG_FEET)
owner.update_inv_shoes()
if(flags & SLOT_ID)
if(flags & SLOT_FLAG_ID)
owner.update_inv_wear_id()
if(flags & SLOT_BELT)
if(flags & SLOT_FLAG_BELT)
owner.update_inv_belt()
if(flags & SLOT_BACK)
if(flags & SLOT_FLAG_BACK)
owner.update_inv_back()
if(flags & SLOT_PDA)
if(flags & SLOT_FLAG_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
+1 -1
View File
@@ -10,7 +10,7 @@
icon = 'icons/obj/crayons.dmi'
icon_state = "crayonred"
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_BELT | SLOT_EARS
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_EARS
attack_verb = list("attacked", "coloured")
toolspeed = 1
var/colour = COLOR_RED
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_BELT
slot_flags = SLOT_FLAG_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_BELT
slot_flags = SLOT_FLAG_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_BELT
slot_flags = SLOT_FLAG_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_BELT
slot_flags = SLOT_FLAG_BELT
item_state = "electronic"
throwforce = 5
throw_speed = 3
code/game/objects/items/devices/flash.dm
+1 -1
View File
@@ -208,7 +208,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_BELT
slot_flags = SLOT_FLAG_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_BELT
slot_flags = SLOT_FLAG_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_BELT | SLOT_EARS
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_EARS
flags = CONDUCT
brightness_on = 2
var/colour = "blue" // Ink color
code/game/objects/items/devices/geiger_counter.dm
+1 -1
View File
@@ -11,7 +11,7 @@
icon_state = "geiger_off"
item_state = "multitool"
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_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_BELT
slot_flags = SLOT_FLAG_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
@@ -47,7 +47,7 @@
belt_icon = "light_replacer"
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_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_BELT
slot_flags = SLOT_FLAG_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_BELT
slot_flags = SLOT_FLAG_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/electropack.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "electropack0"
item_state = "electropack"
flags = CONDUCT
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_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
@@ -9,7 +9,7 @@
materials = list(MAT_METAL = 200)
canhear_range = 0 // can't hear headsets from very far away
slot_flags = SLOT_EARS
slot_flags = SLOT_FLAG_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
@@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
var/static/list/blacklisted_areas = list(/area/adminconstruction, /area/tdome)
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
throw_speed = 2
throw_range = 9
w_class = WEIGHT_CLASS_SMALL
code/game/objects/items/devices/scanners.dm
+6 -6
View File
@@ -13,7 +13,7 @@ REAGENT SCANNER
icon = 'icons/obj/device.dmi'
icon_state = "t-ray0"
var/on = FALSE
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
item_state = "electronic"
materials = list(MAT_METAL = 300)
@@ -91,7 +91,7 @@ REAGENT SCANNER
item_state = "healthanalyzer"
belt_icon = "health_analyzer"
flags = CONDUCT | NOBLUDGEON
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
throwforce = 3
throw_speed = 3
@@ -331,7 +331,7 @@ REAGENT SCANNER
icon = 'icons/obj/device.dmi'
icon_state = "atmos"
item_state = "analyzer"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
throwforce = 0
@@ -473,7 +473,7 @@ REAGENT SCANNER
item_state = "analyzer"
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
throwforce = 5
throw_speed = 4
throw_range = 20
@@ -548,7 +548,7 @@ REAGENT SCANNER
icon_state = "adv_spectrometer_s"
item_state = "analyzer"
origin_tech = "biotech=2"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
throwforce = 0
@@ -602,7 +602,7 @@ REAGENT SCANNER
icon = 'icons/obj/device.dmi'
icon_state = "bodyanalyzer_0"
item_state = "healthanalyser"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_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_BELT
slot_flags = SLOT_FLAG_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_BELT
slot_flags = SLOT_FLAG_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_BELT
slot_flags = SLOT_FLAG_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_BELT
slot_flags = SLOT_FLAG_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_BELT
slot_flags = SLOT_FLAG_BELT
force = 5
w_class = WEIGHT_CLASS_TINY
throwforce = 5
code/game/objects/items/tools/welder.dm
+1 -1
View File
@@ -8,7 +8,7 @@
item_state = "welder"
belt_icon = "welder"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 3
throwforce = 5
throw_speed = 3
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_BELT
slot_flags = SLOT_FLAG_BELT
force = 6
throw_speed = 3
throw_range = 7
code/game/objects/items/tools/wrench.dm
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "wrench"
belt_icon = "wrench"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 5
throwforce = 7
usesound = 'sound/items/ratchet.ogg'
code/game/objects/items/toys.dm
+4 -4
View File
@@ -258,7 +258,7 @@
icon_state = "katana"
item_state = "katana"
flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_BACK
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK
force = 5
throwforce = 5
w_class = WEIGHT_CLASS_NORMAL
@@ -429,7 +429,7 @@
desc = "This baby looks almost real. Wait, did it just burp?"
force = 5
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
//This should really be somewhere else but I don't know where. w/e
@@ -440,7 +440,7 @@
icon_state = "inflatable"
item_state = "inflatable"
icon = 'icons/obj/clothing/belts.dmi'
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
/*
* Fake meteor
@@ -1118,7 +1118,7 @@
righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
hitsound = "swing_hit"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
materials = list(MAT_METAL=2000)
w_class = WEIGHT_CLASS_NORMAL
throwforce = 5
code/game/objects/items/trash.dm
+1 -1
View File
@@ -68,7 +68,7 @@
name = "Kentucky Fried Vox"
icon_state = "fried_vox_empty"
item_state = "fried_vox_empty"
slot_flags = SLOT_HEAD
slot_flags = SLOT_FLAG_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
@@ -10,7 +10,7 @@
desc = "A wooden truncheon for beating criminal scum."
icon_state = "baton"
item_state = "classic_baton"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_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_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
needs_permit = FALSE
on = FALSE
@@ -197,7 +197,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_BELT
slot_flags = SLOT_FLAG_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
@@ -115,7 +115,7 @@
var/total_mining_points = 0
var/list/access = list()
var/registered_name = "Unknown" // The name registered_name on the card
slot_flags = SLOT_ID
slot_flags = SLOT_FLAG_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/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_BACK
slot_flags = SLOT_FLAG_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_back)
if(slot == SLOT_HUD_BACK)
return 1
code/game/objects/items/weapons/cigs.dm
+2 -2
View File
@@ -19,7 +19,7 @@ LIGHTERS ARE IN LIGHTERS.DM
icon_state = "cigoff"
throw_speed = 0.5
item_state = "cigoff"
slot_flags = SLOT_MASK
slot_flags = SLOT_FLAG_MASK
w_class = WEIGHT_CLASS_TINY
body_parts_covered = null
attack_verb = null
@@ -405,7 +405,7 @@ LIGHTERS ARE IN LIGHTERS.DM
/obj/item/clothing/mask/holo_cigar/equipped(mob/user, slot, initial)
. = ..()
if(enabled && slot == slot_wear_mask)
if(enabled && slot == SLOT_HUD_WEAR_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_BELT
slot_flags = SLOT_FLAG_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_BACK
slot_flags = SLOT_FLAG_BACK
force = 5
throwforce = 6
w_class = WEIGHT_CLASS_BULKY
@@ -165,12 +165,12 @@
/obj/item/defibrillator/equipped(mob/user, slot)
..()
if(slot != slot_back)
if(slot != SLOT_HUD_BACK)
remove_paddles(user)
update_icon(UPDATE_OVERLAYS)
/obj/item/defibrillator/item_action_slot_check(slot, mob/user)
if(slot == slot_back)
if(slot == SLOT_HUD_BACK)
return TRUE
/obj/item/defibrillator/proc/remove_paddles(mob/user) // from your hands
@@ -208,7 +208,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_BELT
slot_flags = SLOT_FLAG_BELT
origin_tech = "biotech=5"
/obj/item/defibrillator/compact/loaded/Initialize(mapload)
@@ -217,7 +217,7 @@
update_icon(UPDATE_OVERLAYS)
/obj/item/defibrillator/compact/item_action_slot_check(slot, mob/user)
if(slot == slot_belt)
if(slot == SLOT_HUD_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_BELT
slot_flags = SLOT_FLAG_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 = 4
throw_range = 20
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
resistance_flags = FLAMMABLE
max_integrity = 40
var/active = FALSE
code/game/objects/items/weapons/grenades/smokebomb.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "smoke"
det_time = 20
item_state = "smoke"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_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
@@ -11,7 +11,7 @@
icon_state = "handcuff"
belt_icon = "handcuffs"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_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_r_hand || slot == slot_l_hand)
if(slot == SLOT_HUD_RIGHT_HAND || slot == SLOT_HUD_LEFT_HAND)
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
+14 -14
View File
@@ -131,7 +131,7 @@
item_state = "godstaff-red"
w_class = WEIGHT_CLASS_HUGE
force = 5
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
/obj/item/nullrod/staff/Initialize(mapload)
. = ..()
@@ -150,7 +150,7 @@
item_state = "claymore"
desc = "A weapon fit for a crusade!"
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK|SLOT_BELT
slot_flags = SLOT_FLAG_BACK|SLOT_FLAG_BELT
sharp = TRUE
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -169,7 +169,7 @@
icon_state = "cultblade"
item_state = "darkbalde"
desc = "Spread the glory of the dark gods!"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
hitsound = 'sound/hallucinations/growl1.ogg'
/obj/item/nullrod/claymore/chainsaw_sword
@@ -177,7 +177,7 @@
icon_state = "chainswordon"
item_state = "chainswordon"
desc = "Suffer not a heretic to live."
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
hitsound = 'sound/weapons/chainsaw.ogg'
@@ -186,21 +186,21 @@
icon_state = "swordon"
item_state = "swordon"
desc = "The blade glows with the power of faith. Or possibly a battery."
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_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_BELT | SLOT_BACK
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK
/obj/item/nullrod/claymore/multiverse
name = "extradimensional blade"
desc = "Once the harbringer of a interdimensional war, now a dormant souvenir. Still sharp though."
icon_state = "multiverse"
item_state = "multiverse"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
/obj/item/nullrod/claymore/saber
name = "light energy blade"
@@ -208,7 +208,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_BELT
slot_flags = SLOT_FLAG_BELT
/obj/item/nullrod/claymore/saber/red
name = "dark energy blade"
@@ -227,7 +227,7 @@
desc = "This thing is so unspeakably HOLY you are having a hard time even holding it."
icon_state = "sord"
item_state = "sord"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 4.13
throwforce = 1
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -240,7 +240,7 @@
desc = "Ask not for whom the bell tolls..."
w_class = WEIGHT_CLASS_BULKY
armour_penetration_flat = 30
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
sharp = TRUE
attack_verb = list("chopped", "sliced", "cut", "reaped")
hitsound = 'sound/weapons/rapierhit.ogg'
@@ -375,7 +375,7 @@
icon_state = "hammeron"
item_state = "hammeron"
desc = "This war hammer cost the chaplain fourty thousand space dollars."
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_HUGE
attack_verb = list("smashed", "bashed", "hammered", "crunched")
@@ -408,7 +408,7 @@
desc = "The brim of the hat is as sharp as the division between 0 and 1. It makes a mighty throwing weapon."
icon_state = "fedora"
item_state = "fedora"
slot_flags = SLOT_HEAD
slot_flags = SLOT_FLAG_HEAD
icon = 'icons/obj/clothing/hats.dmi'
force = 0
throw_speed = 4
@@ -465,7 +465,7 @@
item_state = "bostaff0"
w_class = WEIGHT_CLASS_BULKY
force = 13
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
sharp = FALSE
hitsound = "swing_hit"
attack_verb = list("smashed", "slammed", "whacked", "thwacked")
@@ -619,7 +619,7 @@
item_state = "godstaff-red"
w_class = WEIGHT_CLASS_HUGE
force = 5
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_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
+2 -2
View File
@@ -10,7 +10,7 @@
w_class = WEIGHT_CLASS_TINY
throwforce = 4
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
attack_verb = null
resistance_flags = FIRE_PROOF
var/lit = FALSE
@@ -300,7 +300,7 @@
return ..()
/obj/item/proc/help_light_cig(mob/living/M)
var/mask_item = M.get_item_by_slot(slot_wear_mask)
var/mask_item = M.get_item_by_slot(SLOT_HUD_WEAR_MASK)
if(istype(mask_item, /obj/item/clothing/mask/cigarette))
return mask_item
code/game/objects/items/weapons/melee/energy_melee_weapons.dm
+1 -1
View File
@@ -292,7 +292,7 @@
inhand_y_dimension = 64
icon_state = "cleaving_saw"
icon_state_on = "cleaving_saw_open"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
var/attack_verb_off = list("attacked", "sawed", "sliced", "torn", "ripped", "diced", "cut")
attack_verb_on = list("cleaved", "swiped", "slashed", "chopped")
hitsound = 'sound/weapons/bladeslice.ogg'
code/game/objects/items/weapons/melee/melee_misc.dm
+1 -1
View File
@@ -9,7 +9,7 @@
icon_state = "chain"
item_state = "chain"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 10
throwforce = 7
w_class = WEIGHT_CLASS_NORMAL
code/game/objects/items/weapons/shields.dm
+2 -2
View File
@@ -20,7 +20,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_BACK
slot_flags = SLOT_FLAG_BACK
force = 10
throwforce = 5
throw_speed = 2
@@ -154,7 +154,7 @@
throwforce = 5
throw_speed = 2
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
to_chat(user, "<span class='notice'>You extend \the [src].</span>")
else
force = 3
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_BACK //ERROOOOO
slot_flags = SLOT_FLAG_BACK //ERROOOOO
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 21
storage_slots = 21
code/game/objects/items/weapons/storage/bags.dm
+6 -6
View File
@@ -21,7 +21,7 @@
allow_quick_empty = 1
display_contents_with_number = 1 // should work fine now
use_to_pickup = 1
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
// -----------------------------
// Trash bag
@@ -121,7 +121,7 @@
icon = 'icons/obj/trash.dmi'
icon_state = "plasticbag"
item_state = "plasticbag"
slot_flags = SLOT_HEAD|SLOT_BELT
slot_flags = SLOT_FLAG_HEAD|SLOT_FLAG_BELT
throwforce = 0
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_SMALL
@@ -132,14 +132,14 @@
/obj/item/storage/bag/plasticbag/mob_can_equip(M as mob, slot)
if(slot==slot_head && contents.len)
if(slot==SLOT_HUD_HEAD && contents.len)
to_chat(M, "<span class='warning'>You need to empty the bag first!</span>")
return 0
return ..()
/obj/item/storage/bag/plasticbag/equipped(mob/user, slot)
if(slot==slot_head)
if(slot==SLOT_HUD_HEAD)
storage_slots = 0
START_PROCESSING(SSobj, src)
return
@@ -148,7 +148,7 @@
if(is_equipped())
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
if(H.get_item_by_slot(slot_head) == src)
if(H.get_item_by_slot(SLOT_HUD_HEAD) == src)
if(H.internal)
return
H.AdjustLoseBreath(2 SECONDS)
@@ -167,7 +167,7 @@
icon = 'icons/obj/mining.dmi'
icon_state = "satchel"
origin_tech = "engineering=2"
slot_flags = SLOT_BELT | SLOT_POCKET
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_POCKET
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
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_BELT
slot_flags = SLOT_FLAG_BELT
attack_verb = list("whipped", "lashed", "disciplined")
max_integrity = 300
equip_sound = 'sound/items/equip/toolbelt_equip.ogg'
code/game/objects/items/weapons/storage/boxes.dm
+1 -1
View File
@@ -622,7 +622,7 @@
storage_slots = 10
w_class = WEIGHT_CLASS_TINY
max_w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
drop_sound = 'sound/items/handling/matchbox_drop.ogg'
pickup_sound = 'sound/items/handling/matchbox_pickup.ogg'
can_hold = list(/obj/item/match)
code/game/objects/items/weapons/storage/fancy.dm
+3 -3
View File
@@ -101,7 +101,7 @@
item_state = "candlebox5"
storage_slots = 5
throwforce = 2
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
/obj/item/storage/fancy/candle_box/full/populate_contents()
@@ -173,7 +173,7 @@
belt_icon = "patch_pack"
w_class = WEIGHT_CLASS_SMALL
throwforce = 2
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
storage_slots = 6
max_combined_w_class = 6
can_hold = list(/obj/item/clothing/mask/cigarette,
@@ -202,7 +202,7 @@
var/obj/item/I = contents[num]
if(istype(I, /obj/item/clothing/mask/cigarette))
var/obj/item/clothing/mask/cigarette/C = I
user.equip_to_slot_if_possible(C, slot_wear_mask)
user.equip_to_slot_if_possible(C, SLOT_HUD_WEAR_MASK)
to_chat(user, "<span class='notice'>You take \a [C.name] out of the pack.</span>")
update_icon()
got_cig = 1
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_ID
slot_flags = SLOT_FLAG_ID
var/obj/item/card/id/front_id = null
code/game/objects/items/weapons/stunbaton.dm
+3 -3
View File
@@ -5,7 +5,7 @@
var/base_icon = "stunbaton"
item_state = null
belt_icon = "stunbaton"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 10
throwforce = 7
origin_tech = "combat=2"
@@ -83,7 +83,7 @@
return cell
/obj/item/melee/baton/mob_can_equip(mob/user, slot, disable_warning = TRUE)
if(turned_on && (slot == slot_belt || slot == slot_s_store))
if(turned_on && (slot == SLOT_HUD_BELT || slot == SLOT_HUD_SUIT_STORE))
to_chat(user, "<span class='warning'>You can't equip [src] while it's active!</span>")
return FALSE
return ..(user, slot, disable_warning = TRUE) // call parent but disable warning
@@ -293,7 +293,7 @@
knockdown_duration = 6 SECONDS
w_class = WEIGHT_CLASS_BULKY
hitcost = 2000
slot_flags = SLOT_BACK | SLOT_BELT
slot_flags = SLOT_FLAG_BACK | SLOT_FLAG_BELT
var/obj/item/assembly/igniter/sparkler = null
/obj/item/melee/baton/cattleprod/Initialize(mapload)
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_BELT
slot_flags = SLOT_FLAG_BELT
force = 5
volume = 35
w_class = WEIGHT_CLASS_SMALL
@@ -130,7 +130,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_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
force = 4
distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
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_BACK
slot_flags = SLOT_FLAG_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_BACK
slot_flags = SLOT_FLAG_BACK
slowdown = 1
actions_types = list(/datum/action/item_action/toggle_mister)
max_integrity = 200
@@ -30,13 +30,13 @@
toggle_mister()
/obj/item/watertank/item_action_slot_check(slot, mob/user)
if(slot == slot_back)
if(slot == SLOT_HUD_BACK)
return 1
/obj/item/watertank/verb/toggle_mister()
set name = "Toggle Mister"
set category = "Object"
if(usr.get_item_by_slot(slot_back) != src)
if(usr.get_item_by_slot(SLOT_HUD_BACK) != src)
to_chat(usr, "<span class='notice'>The watertank needs to be on your back to use.</span>")
return
if(usr.incapacitated())
@@ -64,7 +64,7 @@
/obj/item/watertank/equipped(mob/user, slot)
..()
if(slot != slot_back)
if(slot != SLOT_HUD_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_wear_mask)
M.equip_to_slot(G, SLOT_HUD_WEAR_MASK)
G.add_fingerprint(user)
/obj/item/stack/tape_roll/update_icon_state()
code/game/objects/items/weapons/twohanded.dm
+7 -7
View File
@@ -12,7 +12,7 @@
throwforce = 15
sharp = TRUE
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
toolspeed = 0.25
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -234,7 +234,7 @@
desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
force = 10
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
var/force_unwielded = 10
var/force_wielded = 18
throwforce = 20
@@ -542,7 +542,7 @@
icon_state = "singulohammer0"
base_icon_state = "singulohammer"
flags = CONDUCT
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
force = 5
throwforce = 15
throw_range = 1
@@ -613,7 +613,7 @@
icon_state = "mjollnir0"
base_icon_state = "mjollnir"
flags = CONDUCT
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
force = 5
throwforce = 30
throw_range = 7
@@ -660,7 +660,7 @@
icon_state = "knighthammer0"
base_icon_state = "knighthammer"
flags = CONDUCT
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
force = 5
throwforce = 15
throw_range = 1
@@ -808,7 +808,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_gloves)
if(slot == SLOT_HUD_GLOVES)
return TRUE
/obj/item/clothing/gloves/color/black/pyro_claws/ui_action_click(mob/user)
@@ -1018,7 +1018,7 @@
sharp = TRUE
damtype = BURN
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
throwforce = 15
toolspeed = 0.25
attack_verb = list("enlightened", "enforced", "cleaved", "stabbed", "whacked")
code/game/objects/items/weapons/weaponry.dm
+4 -4
View File
@@ -6,7 +6,7 @@
name = "banhammer"
icon = 'icons/obj/items.dmi'
icon_state = "toyhammer"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_speed = 7
@@ -32,7 +32,7 @@
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
icon_state = "sord"
item_state = "sord"
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 2
throwforce = 1
w_class = WEIGHT_CLASS_NORMAL
@@ -51,7 +51,7 @@
item_state = "claymore"
flags = CONDUCT
hitsound = 'sound/weapons/bladeslice.ogg'
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
force = 40
throwforce = 10
sharp = TRUE
@@ -82,7 +82,7 @@
icon_state = "katana"
item_state = "katana"
flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_BACK
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK
force = 40
throwforce = 10
sharp = TRUE
code/game/objects/mail.dm
+1 -1
View File
@@ -219,7 +219,7 @@
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
origin_tech = "magnets=1"
/// The reference to the envelope that is currently stored in the mail scanner. It will be cleared upon confirming a correct delivery
code/game/objects/structures/bedsheet_bin.dm
+1 -1
View File
@@ -19,7 +19,7 @@ LINEN BINS
w_class = WEIGHT_CLASS_TINY
item_color = "white"
resistance_flags = FLAMMABLE
slot_flags = SLOT_BACK
slot_flags = SLOT_FLAG_BACK
dog_fashion = /datum/dog_fashion/head/ghost
var/list/dream_messages = list("white")

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