Merge pull request #2149 from SinTwo/item_state

Item State Cleanup
This commit is contained in:
Anewbe
2016-07-23 15:53:36 -05:00
committed by GitHub
151 changed files with 798 additions and 1182 deletions
-1
View File
@@ -2,7 +2,6 @@
name = "hand labeler"
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "labeler0"
item_state = "flight"
var/label = null
var/labels_left = 30
var/mode = 0 //off or on.
+4
View File
@@ -2,6 +2,10 @@
name = "paper bin"
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper_bin1"
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_material.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_material.dmi',
)
item_state = "sheet-metal"
throwforce = 1
w_class = 3
+2 -2
View File
@@ -14,7 +14,7 @@
icon = 'icons/obj/items.dmi'
desc = "A camera film cartridge. Insert it into a camera to reload it."
icon_state = "film"
item_state = "electropack"
item_state = "camera"
w_class = 1.0
@@ -120,7 +120,7 @@ var/global/photo_count = 0
icon = 'icons/obj/items.dmi'
desc = "A polaroid camera. 10 photos left."
icon_state = "camera"
item_state = "electropack"
item_state = "camera"
w_class = 2.0
flags = CONDUCT
slot_flags = SLOT_BELT