Skip to content

Commit 26f1cfb

Browse files
committed
fixes
1 parent 4c396d4 commit 26f1cfb

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

code/game/objects/items/storage/halo/halo_storageitems.dm

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
item_state = "m6_holster"
99
item_icons = list(
1010
WEAR_WAIST = 'icons/halo/mob/humans/onmob/belt.dmi',
11-
WEAR_J_STORE = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
12-
WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo.dmi',
13-
WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo.dmi')
11+
WEAR_J_STORE = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
12+
WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo.dmi',
13+
WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo.dmi')
1414
storage_slots = 7
1515
can_hold = list(
1616
/obj/item/weapon/gun/pistol/halo,

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
icon = 'icons/halo/obj/items/weapons/guns_by_faction/unsc/unsc_weapons.dmi'
66
item_icons = list(
77
WEAR_BACK = 'icons/halo/mob/humans/onmob/back_slot_halo.dmi',
8-
WEAR_J_STORE = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
9-
WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo.dmi',
10-
WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo.dmi'
8+
WEAR_J_STORE = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
9+
WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo.dmi',
10+
WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo.dmi'
1111
)
1212

1313
/obj/item/weapon/gun/rifle/halo/ma5c
@@ -117,9 +117,9 @@
117117
icon = 'icons/halo/obj/items/weapons/guns_by_faction/unsc/unsc_weapons.dmi'
118118
item_icons = list(
119119
WEAR_BACK = 'icons/halo/mob/humans/onmob/back_slot_halo.dmi',
120-
WEAR_J_STORE = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
121-
WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo.dmi',
122-
WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo.dmi'
120+
WEAR_J_STORE = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
121+
WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo.dmi',
122+
WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo.dmi'
123123
)
124124

125125
/obj/item/weapon/gun/smg/halo/m7
@@ -137,9 +137,9 @@
137137
icon = 'icons/halo/obj/items/weapons/guns_by_faction/unsc/unsc_weapons.dmi'
138138
item_icons = list(
139139
WEAR_BACK = 'icons/halo/mob/humans/onmob/back_slot_halo.dmi',
140-
WEAR_J_STORE = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
141-
WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo.dmi',
142-
WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo.dmi'
140+
WEAR_J_STORE = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
141+
WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo.dmi',
142+
WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo.dmi'
143143
)
144144

145145
/obj/item/weapon/gun/shotgun/pump/halo/m90
@@ -193,8 +193,8 @@
193193
worn_y_dimension = 64
194194
item_icons = list(
195195
WEAR_BACK = 'icons/halo/mob/humans/onmob/back_slot_halo_64.dmi',
196-
WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo_64.dmi',
197-
WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo_64.dmi'
196+
WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo_64.dmi',
197+
WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo_64.dmi'
198198
)
199199

200200
fire_sound = "gun_srs99"
@@ -368,9 +368,9 @@
368368
icon = 'icons/halo/obj/items/weapons/guns_by_faction/unsc/unsc_weapons.dmi'
369369
item_icons = list(
370370
WEAR_BACK = 'icons/halo/mob/humans/onmob/back_slot_halo.dmi',
371-
WEAR_J_STORE = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
372-
WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo.dmi',
373-
WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo.dmi'
371+
WEAR_J_STORE = 'icons/halo/mob/humans/onmob/suit_slot_halo.dmi',
372+
WEAR_L_HAND = 'icons/halo/mob/humans/onmob/items_lefthand_halo.dmi',
373+
WEAR_R_HAND = 'icons/halo/mob/humans/onmob/items_righthand_halo.dmi'
374374
)
375375
reload_sound = 'sound/weapons/halo/gun_magnum_reload.ogg'
376376
unload_sound = 'sound/weapons/halo/gun_magnum_unload.ogg'

colonialmarines.dme

+1
Original file line numberDiff line numberDiff line change
@@ -1273,6 +1273,7 @@
12731273
#include "code\game\objects\items\storage\toolbox.dm"
12741274
#include "code\game\objects\items\storage\toolkit.dm"
12751275
#include "code\game\objects\items\storage\wallets.dm"
1276+
#include "code\game\objects\items\storage\halo\halo_storageitems.dm"
12761277
#include "code\game\objects\items\tanks\tank_types.dm"
12771278
#include "code\game\objects\items\tanks\tanks.dm"
12781279
#include "code\game\objects\items\tools\cleaning_tools.dm"
1.17 KB
Binary file not shown.

0 commit comments

Comments
 (0)