Merge pull request #279 from Mark9013100/clothingcoverageremoval

Comments out clothing coverage.
This commit is contained in:
Neerti
2015-10-31 04:14:54 -04:00
3 changed files with 12 additions and 10 deletions
+8 -6
View File
@@ -29,9 +29,9 @@
//It should be used purely for appearance. For gameplay effects caused by items covering body parts, use body_parts_covered.
var/flags_inv = 0
var/body_parts_covered = 0 //see setup.dm for appropriate bit flags
var/item_flags = 0 //Miscellaneous flags pertaining to equippable objects.
//var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible
var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets)
var/permeability_coefficient = 1 // for chemicals/diseases
@@ -293,12 +293,12 @@ var/list/global/slot_flags_enumeration = list(
//Next check that the slot is free
if(H.get_equipped_item(slot))
return 0
/*
//Next check if the slot is accessible.
var/mob/_user = disable_warning? null : H
if(!H.slot_is_accessible(slot, src, _user))
return 0
*/
//Lastly, check special rules for the desired slot.
switch(slot)
if(slot_l_ear, slot_r_ear)
@@ -364,8 +364,10 @@ var/list/global/slot_flags_enumeration = list(
if(!canremove)
return 0
/*
if(!M.slot_is_accessible(slot, src, disable_warning? null : M))
return 0
*/
return 1
/obj/item/verb/verb_pickup()
@@ -608,10 +610,10 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
usr.visible_message("[zoomdevicename ? "[usr] looks up from the [src.name]" : "[usr] lowers the [src.name]"].")
return
/obj/item/proc/pwr_drain()
return 0 // Process Kill
/obj/item/proc/resolve_attackby(atom/A, mob/source)
return A.attackby(src,source)
+2 -2
View File
@@ -57,11 +57,11 @@ var/list/slot_equipment_priority = list( \
slot_l_store,\
slot_r_store\
)
/*
//Checks if a given slot can be accessed at this time, either to equip or unequip I
/mob/proc/slot_is_accessible(var/slot, var/obj/item/I, mob/user=null)
return 1
*/
//puts the item "W" into an appropriate slot in a human's inventory
//returns 0 if it cannot, 1 if successful
/mob/proc/equip_to_appropriate_slot(obj/item/W)
@@ -314,7 +314,7 @@ This saves us from having to call add_fingerprint() any time something is put in
update_action_buttons()
return 1
/*
//Checks if a given slot can be accessed at this time, either to equip or unequip I
/mob/living/carbon/human/slot_is_accessible(var/slot, var/obj/item/I, mob/user=null)
var/obj/item/covering = null
@@ -334,7 +334,7 @@ This saves us from having to call add_fingerprint() any time something is put in
user << "<span class='warning'>\The [covering] is in the way.</span>"
return 0
return 1
*/
/mob/living/carbon/human/get_equipped_item(var/slot)
switch(slot)
if(slot_back) return back