|
140 | 140 | unload_sound = 'sound/weapons/halo/gun_m7_unload.ogg'
|
141 | 141 | empty_sound = null
|
142 | 142 |
|
143 |
| - flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER |
| 143 | + flags_gun_features = GUN_CAN_POINTBLANK |
144 | 144 | start_automatic = TRUE
|
145 | 145 | map_specific_decoration = FALSE
|
146 | 146 | current_mag = /obj/item/ammo_magazine/smg/halo/m7
|
|
179 | 179 | WEAR_J_STORE = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
|
180 | 180 | WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo.dmi',
|
181 | 181 | WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo.dmi'
|
| 182 | + WEAR_WAIST = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi', |
182 | 183 | )
|
183 | 184 |
|
184 | 185 | /obj/item/weapon/gun/shotgun/pump/halo/m90
|
|
370 | 371 | return TRUE
|
371 | 372 | if(!cover_open)
|
372 | 373 | playsound(src.loc, 'sound/handling/smartgun_open.ogg', 50, TRUE, 3)
|
373 |
| - to_chat(user, SPAN_NOTICE("You open [src]'s feed cover, allowing the [current_mag.name] to be removed.")) |
| 374 | + to_chat(user, SPAN_NOTICE("You open [src]'s tube cover, allowing the [current_mag.name] to be removed.")) |
374 | 375 | cover_open = TRUE
|
375 | 376 | else
|
376 | 377 | playsound(src.loc, 'sound/handling/smartgun_close.ogg', 50, TRUE, 3)
|
377 |
| - to_chat(user, SPAN_NOTICE("You close [src]'s feed cover.")) |
| 378 | + to_chat(user, SPAN_NOTICE("You close [src]'s tube cover.")) |
378 | 379 | cover_open = FALSE
|
379 | 380 | update_icon()
|
380 | 381 | return TRUE
|
|
426 | 427 | cocked_sound = 'sound/weapons/halo/gun_magnum_cocked.ogg'
|
427 | 428 | drop_sound = 'sound/items/halo/drop_lightweapon.ogg'
|
428 | 429 | pickup_sound = 'sound/items/halo/grab_lightweapon.ogg'
|
| 430 | + flags_gun_features = GUN_CAN_POINTBLANK |
429 | 431 | empty_sound = null
|
430 | 432 |
|
431 | 433 | /obj/item/weapon/gun/pistol/halo/m6c
|
|
437 | 439 | current_mag = /obj/item/ammo_magazine/pistol/halo/m6c
|
438 | 440 | attachable_allowed = list(/obj/item/attachable/scope/mini/smartscope/m6c, /obj/item/attachable/flashlight/m6)
|
439 | 441 | fire_sound = "gun_m6c"
|
| 442 | + flags_gun_features = GUN_CAN_POINTBLANK |
440 | 443 |
|
441 | 444 | /obj/item/weapon/gun/pistol/halo/m6c/set_gun_attachment_offsets()
|
442 | 445 | attachable_offset = list("muzzle_x" = 27, "muzzle_y" = 21,"rail_x" = 16, "rail_y" = 16, "under_x" = 16, "under_y" = 16, "stock_x" = 18, "stock_y" = 15)
|
|
0 commit comments