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

View File

@@ -119,6 +119,7 @@
item_state = "paper"
throwforce = 1
w_class = 1.0
slot_flags = SLOT_EARS
throw_speed = 3
throw_range = 5

View File

@@ -8,6 +8,7 @@
force = 0.0
throwforce = 0.0
w_class = 1.0
slot_flags = SLOT_EARS
var/string_attached
var/sides = 2

View File

@@ -14,7 +14,7 @@ var/const/MAX_ACTIVE_TIME = 400
icon = 'icons/mob/alien.dmi'
icon_state = "facehugger"
item_state = "facehugger"
w_class = 1 //note: can be picked up by aliens unlike most other items of w_class below 4
w_class = 3 //note: can be picked up by aliens unlike most other items of w_class below 4
flags = MASKCOVERSMOUTH | MASKCOVERSEYES | AIRTIGHT
body_parts_covered = FACE|EYES
throw_range = 5

View File

@@ -7,7 +7,7 @@
icon_state = "soulstone"
item_state = "electronic"
desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power."
w_class = 1.0
w_class = 2
slot_flags = SLOT_BELT
origin_tech = "bluespace=4;materials=4"
var/imprinted = "empty"

View File

@@ -5,7 +5,7 @@
icon_state = "paper"
item_state = "paper"
throwforce = 0
w_class = 1.0
w_class = 2
throw_range = 2
throw_speed = 1
layer = 4

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

View File

@@ -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

View File

@@ -9,6 +9,7 @@
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(1,2,3,4,5)
w_class = 1
slot_flags = SLOT_EARS
volume = 5
afterattack(var/obj/target, var/mob/user, var/flag)

View File

@@ -9,6 +9,7 @@
item_state = "pill"
possible_transfer_amounts = null
w_class = 1
slot_flags = SLOT_EARS
volume = 60
New()

View File

@@ -16,6 +16,7 @@
possible_transfer_amounts = null
volume = 15
w_class = 1
slot_flags = SLOT_EARS
sharp = 1
var/mode = SYRINGE_DRAW
var/image/filling //holds a reference to the current filling overlay

View File

@@ -5,7 +5,7 @@
icon_state ="spellbook"
throw_speed = 1
throw_range = 5
w_class = 1.0
w_class = 2
var/uses = 5
var/temp = null
var/max_uses = 5