Merge remote-tracking branch 'upstream/master' into cash

This commit is contained in:
Hubblenaut
2016-02-26 13:48:01 +01:00
15 changed files with 122 additions and 36 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
item_state = "electronic"
w_class = 2.0
slot_flags = SLOT_BELT
show_messages = 1
show_messages = 0
var/flush = null
origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4)
+1 -1
View File
@@ -6,7 +6,7 @@
w_class = 2.0
slot_flags = SLOT_BELT
origin_tech = list(TECH_DATA = 2)
show_messages = 1
show_messages = 0
var/obj/item/device/radio/radio
var/looking_for_personality = 0