Merge pull request #9872 from mwerezak/earslot

Fixes #9514
This commit is contained in:
PsiOmegaDelta
2015-06-21 09:03:00 +02:00
22 changed files with 27 additions and 9 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/ammo.dmi'
icon_state = "s-casing"
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 1
w_class = 1
var/caliber = "" //Which kind of guns it can be loaded into
@@ -6,7 +6,7 @@
var/icon_flight = "syringe-cartridge-flight" //so it doesn't look so weird when shot
matter = list(DEFAULT_WALL_MATERIAL = 125, "glass" = 375)
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 3
force = 3
w_class = 1