stop this nonsense
This commit is contained in:
@@ -269,7 +269,7 @@
|
||||
if(user in src)
|
||||
return
|
||||
if(src.tool_interact(W,user))
|
||||
return 1 // No afterattack
|
||||
return TRUE // No afterattack
|
||||
else
|
||||
return ..()
|
||||
|
||||
@@ -396,7 +396,7 @@
|
||||
close()
|
||||
else
|
||||
O.forceMove(T)
|
||||
return 1
|
||||
return TRUE
|
||||
|
||||
/obj/structure/closet/relaymove(mob/living/user, direction)
|
||||
if(user.stat || !isturf(loc))
|
||||
|
||||
@@ -46,8 +46,8 @@
|
||||
/obj/structure/closet/body_bag/close()
|
||||
if(..())
|
||||
density = FALSE
|
||||
return 1
|
||||
return 0
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/obj/structure/closet/body_bag/handle_lock_addition()
|
||||
return
|
||||
@@ -59,11 +59,11 @@
|
||||
. = ..()
|
||||
if(over_object == usr && Adjacent(usr) && (in_range(src, usr) || usr.contents.Find(src)))
|
||||
if(!ishuman(usr))
|
||||
return 0
|
||||
return FALSE
|
||||
if(opened)
|
||||
return 0
|
||||
return FALSE
|
||||
if(contents.len)
|
||||
return 0
|
||||
return FALSE
|
||||
visible_message("<span class='notice'>[usr] folds up [src].</span>")
|
||||
var/obj/item/bodybag/B = new foldedbag_path(get_turf(src))
|
||||
usr.put_in_hands(B)
|
||||
@@ -83,15 +83,15 @@
|
||||
. = ..()
|
||||
if(over_object == usr && Adjacent(usr) && (in_range(src, usr) || usr.contents.Find(src)))
|
||||
if(!ishuman(usr))
|
||||
return 0
|
||||
return FALSE
|
||||
if(opened)
|
||||
return 0
|
||||
return FALSE
|
||||
if(contents.len >= mob_storage_capacity / 2)
|
||||
to_chat(usr, "<span class='warning'>There are too many things inside of [src] to fold it up!</span>")
|
||||
return 0
|
||||
return FALSE
|
||||
for(var/obj/item/bodybag/bluespace/B in src)
|
||||
to_chat(usr, "<span class='warning'>You can't recursively fold bluespace body bags!</span>" )
|
||||
return 0
|
||||
return FALSE
|
||||
visible_message("<span class='notice'>[usr] folds up [src].</span>")
|
||||
var/obj/item/bodybag/B = new foldedbag_path(get_turf(src))
|
||||
usr.put_in_hands(B)
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
/obj/structure/closet/cardboard/open()
|
||||
if(opened || !can_open())
|
||||
return 0
|
||||
return FALSE
|
||||
var/list/alerted = null
|
||||
if(egged < world.time)
|
||||
var/mob/living/Snake = null
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
/obj/structure/closet/secure_closet/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
|
||||
if(damage_flag == MELEE && damage_amount < melee_min_damage)
|
||||
return 0
|
||||
return FALSE
|
||||
. = ..()
|
||||
|
||||
// Exists to work around the minimum 700 cr price for goodies / small items / materials
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
qdel(src)
|
||||
|
||||
else
|
||||
if(user.a_intent == INTENT_HARM) //Only return ..() if intent is harm, otherwise return 0 or just end it.
|
||||
if(user.a_intent == INTENT_HARM) //Only return ..() if intent is harm, otherwise return FALSE or just end it.
|
||||
return ..() //Stops it from opening and turning invisible when items are used on it.
|
||||
|
||||
else
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
/obj/structure/closet/crate/secure/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
|
||||
if(damage_flag == MELEE && damage_amount < 25)
|
||||
return 0
|
||||
return FALSE
|
||||
. = ..()
|
||||
|
||||
/obj/structure/closet/crate/secure/update_overlays()
|
||||
|
||||
Reference in New Issue
Block a user