Skip to content

Commit 94e6406

Browse files
committed
fixes
1 parent 0c2b59c commit 94e6406

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

code/modules/projectiles/guns/halo/unsc_guns.dm

+6-3
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
unload_sound = 'sound/weapons/halo/gun_m7_unload.ogg'
141141
empty_sound = null
142142

143-
flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER
143+
flags_gun_features = GUN_CAN_POINTBLANK
144144
start_automatic = TRUE
145145
map_specific_decoration = FALSE
146146
current_mag = /obj/item/ammo_magazine/smg/halo/m7
@@ -179,6 +179,7 @@
179179
WEAR_J_STORE = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
180180
WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo.dmi',
181181
WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo.dmi'
182+
WEAR_WAIST = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
182183
)
183184

184185
/obj/item/weapon/gun/shotgun/pump/halo/m90
@@ -370,11 +371,11 @@
370371
return TRUE
371372
if(!cover_open)
372373
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."))
374375
cover_open = TRUE
375376
else
376377
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."))
378379
cover_open = FALSE
379380
update_icon()
380381
return TRUE
@@ -426,6 +427,7 @@
426427
cocked_sound = 'sound/weapons/halo/gun_magnum_cocked.ogg'
427428
drop_sound = 'sound/items/halo/drop_lightweapon.ogg'
428429
pickup_sound = 'sound/items/halo/grab_lightweapon.ogg'
430+
flags_gun_features = GUN_CAN_POINTBLANK
429431
empty_sound = null
430432

431433
/obj/item/weapon/gun/pistol/halo/m6c
@@ -437,6 +439,7 @@
437439
current_mag = /obj/item/ammo_magazine/pistol/halo/m6c
438440
attachable_allowed = list(/obj/item/attachable/scope/mini/smartscope/m6c, /obj/item/attachable/flashlight/m6)
439441
fire_sound = "gun_m6c"
442+
flags_gun_features = GUN_CAN_POINTBLANK
440443

441444
/obj/item/weapon/gun/pistol/halo/m6c/set_gun_attachment_offsets()
442445
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)
Binary file not shown.

0 commit comments

Comments
 (0)