Using Weight Defines

This commit is contained in:
Sam
2017-05-27 16:34:49 +01:00
parent 7ecaabe492
commit 07e0f768d6
149 changed files with 430 additions and 436 deletions
+3 -3
View File
@@ -14,7 +14,7 @@ LINEN BINS
throwforce = 1
throw_speed = 1
throw_range = 2
w_class = 1
w_class = WEIGHT_CLASS_TINY
item_color = "white"
burn_state = FLAMMABLE
slot_flags = SLOT_BACK
@@ -204,7 +204,7 @@ LINEN BINS
sheets.Add(I)
amount++
to_chat(user, "<span class='notice'>You put [I] in [src].</span>")
else if(amount && !hidden && I.w_class < 4) //make sure there's sheets to hide it among, make sure nothing else is hidden in there.
else if(amount && !hidden && I.w_class < WEIGHT_CLASS_BULKY) //make sure there's sheets to hide it among, make sure nothing else is hidden in there.
user.drop_item()
I.loc = src
hidden = I
@@ -255,4 +255,4 @@ LINEN BINS
if(hidden)
hidden.loc = loc
hidden = null
hidden = null
+3 -3
View File
@@ -43,7 +43,7 @@
/obj/structure/flora/tree/palm/New()
..()
icon_state = pick("palm1","palm2")
pixel_x = 0
pixel_x = 0
//grass
/obj/structure/flora/grass
@@ -209,7 +209,7 @@
icon_state = "plant-1"
anchored = 0
layer = 5
w_class = 5
w_class = WEIGHT_CLASS_HUGE
force = 10
throwforce = 13
throw_speed = 2
@@ -333,4 +333,4 @@
else
qdel(src)
else
return ..()
return ..()
+2 -2
View File
@@ -3,7 +3,7 @@
desc = "A folded membrane which rapidly expands into a large cubical shape on activation."
icon = 'icons/obj/inflatable.dmi'
icon_state = "folded_wall"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
/obj/item/inflatable/attack_self(mob/user)
playsound(loc, 'sound/items/zip.ogg', 75, 1)
@@ -279,7 +279,7 @@
icon_state = "inf_box"
item_state = "syringe_kit"
max_combined_w_class = 21
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
/obj/item/weapon/storage/briefcase/inflatable/New()
..()
+1 -2
View File
@@ -40,7 +40,7 @@
name = "sign"
desc = ""
icon = 'icons/obj/decals.dmi'
w_class = 3 //big
w_class = WEIGHT_CLASS_NORMAL
burn_state = FLAMMABLE
var/sign_state = ""
@@ -225,4 +225,3 @@
name = "\improper Escape Arm"
desc = "A direction sign, pointing out which way escape shuttle dock is."
icon_state = "direction_evac"
@@ -93,7 +93,7 @@
desc = "A collapsed roller bed that can be carried around."
icon = 'icons/obj/rollerbed.dmi'
icon_state = "folded"
w_class = 4 // Can't be put in backpacks.
w_class = WEIGHT_CLASS_BULKY // Can't be put in backpacks.
/obj/item/roller/attack_self(mob/user)
var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
@@ -140,4 +140,4 @@
var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
R.add_fingerprint(user)
qdel(held)
held = null
held = null
@@ -54,7 +54,7 @@
icon_state = "stool"
force = 10
throwforce = 10
w_class = 5
w_class = WEIGHT_CLASS_HUGE
var/obj/structure/stool/origin = null
/obj/item/weapon/stool/attack_self(mob/user as mob)
+2 -2
View File
@@ -106,10 +106,10 @@
to_chat(user, "<span class='warning'>You need a tighter grip!</span>")
if(cistern)
if(I.w_class > 3)
if(I.w_class > WEIGHT_CLASS_NORMAL)
to_chat(user, "<span class='warning'>[I] does not fit!</span>")
return
if(w_items + I.w_class > 5)
if(w_items + I.w_class > WEIGHT_CLASS_HUGE)
to_chat(user, "<span class='warning'>The cistern is full!</span>")
return
if(!user.drop_item())