Upload files
This commit is contained in:
@@ -163,7 +163,7 @@
|
||||
icon = 'icons/obj/ammo.dmi'
|
||||
icon_state = "shotgunclip"
|
||||
caliber = "shotgun" // slapped in to allow shell mix n match
|
||||
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKET
|
||||
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
w_volume = ITEM_VOLUME_STRIPPER_CLIP
|
||||
ammo_type = /obj/item/ammo_casing/shotgun
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
desc = "A miniature battery for an energy weapon."
|
||||
icon = 'icons/obj/ammo.dmi'
|
||||
icon_state = "mws_batt"
|
||||
slot_flags = SLOT_BELT | SLOT_EARS
|
||||
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_EARS
|
||||
throwforce = 1
|
||||
|
||||
caliber = "mws"
|
||||
|
||||
@@ -619,7 +619,7 @@
|
||||
. += knife_overlay
|
||||
|
||||
/obj/item/gun/item_action_slot_check(slot, mob/user, datum/action/A)
|
||||
if(istype(A, /datum/action/item_action/toggle_scope_zoom) && slot != SLOT_HANDS)
|
||||
if(istype(A, /datum/action/item_action/toggle_scope_zoom) && slot != ITEM_SLOT_HANDS)
|
||||
return FALSE
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -140,6 +140,6 @@
|
||||
recoil = 0.1
|
||||
inaccuracy_modifier = 0.25
|
||||
dualwield_spread_mult = 1.4
|
||||
slot_flags = SLOT_BELT
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
weapon_weight = WEAPON_MEDIUM
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
/obj/item/minigunpack/on_attack_hand(var/mob/living/carbon/user)
|
||||
if(src.loc == user)
|
||||
if(!armed)
|
||||
if(user.get_item_by_slot(SLOT_BACK) == src)
|
||||
if(user.get_item_by_slot(ITEM_SLOT_BACK) == src)
|
||||
armed = 1
|
||||
if(!user.put_in_hands(gun))
|
||||
armed = 0
|
||||
|
||||
Reference in New Issue
Block a user