diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 698c7f6aa..8b068f298 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -567,7 +567,6 @@ {"id":{"name":"spr_loadbar","path":"sprites/spr_loadbar/spr_loadbar.yy",},}, {"id":{"name":"scr_mission_functions","path":"scripts/scr_mission_functions/scr_mission_functions.yy",},}, {"id":{"name":"spr_loadbar_empty","path":"sprites/spr_loadbar_empty/spr_loadbar_empty.yy",},}, - {"id":{"name":"spr_mk8_right_arm","path":"sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy",},}, {"id":{"name":"spr_loadbar_cover","path":"sprites/spr_loadbar_cover/spr_loadbar_cover.yy",},}, {"id":{"name":"scr_ground_ai_helpers","path":"scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.yy",},}, {"id":{"name":"spr_load_text","path":"sprites/spr_load_text/spr_load_text.yy",},}, @@ -758,7 +757,6 @@ {"id":{"name":"spr_ship_castellan","path":"sprites/spr_ship_castellan/spr_ship_castellan.yy",},}, {"id":{"name":"spr_manta","path":"sprites/spr_manta/spr_manta.yy",},}, {"id":{"name":"spr_ship_leviathan","path":"sprites/spr_ship_leviathan/spr_ship_leviathan.yy",},}, - {"id":{"name":"spr_mk8_complex","path":"sprites/spr_mk8_complex/spr_mk8_complex.yy",},}, {"id":{"name":"spr_ship_razorfiend","path":"sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy",},}, {"id":{"name":"spr_mk7_right_arm","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},}, {"id":{"name":"spr_artificer_left_trim","path":"sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy",},}, @@ -994,10 +992,8 @@ {"id":{"name":"scr_specialist_points","path":"scripts/scr_specialist_points/scr_specialist_points.yy",},}, {"id":{"name":"spr_constitution_icon","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},}, {"id":{"name":"scr_battle_sort","path":"scripts/scr_battle_sort/scr_battle_sort.yy",},}, - {"id":{"name":"spr_mk8_left_arm","path":"sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy",},}, {"id":{"name":"spr_gear_combat_shield","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},}, {"id":{"name":"spr_um_mk6_helm","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},}, - {"id":{"name":"spr_mk8_gorget","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},}, {"id":{"name":"scr_count_forces","path":"scripts/scr_count_forces/scr_count_forces.yy",},}, {"id":{"name":"spr_weapon_powmace","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},}, {"id":{"name":"scr_dead_marines","path":"scripts/scr_dead_marines/scr_dead_marines.yy",},}, @@ -1067,7 +1063,6 @@ {"id":{"name":"spr_dreadnought_chasis_colors","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},}, {"id":{"name":"scr_vehicle_count","path":"scripts/scr_vehicle_count/scr_vehicle_count.yy",},}, {"id":{"name":"scr_bionics_count","path":"scripts/scr_bionics_count/scr_bionics_count.yy",},}, - {"id":{"name":"spr_mk8_complex_backpack","path":"sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy",},}, {"id":{"name":"scr_ship_count","path":"scripts/scr_ship_count/scr_ship_count.yy",},}, {"id":{"name":"scr_ship_occupants","path":"scripts/scr_ship_occupants/scr_ship_occupants.yy",},}, {"id":{"name":"spr_leopard_sprite","path":"sprites/spr_leopard_sprite/spr_leopard_sprite.yy",},}, @@ -1229,6 +1224,7 @@ {"id":{"name":"spr_mk4_complex","path":"sprites/spr_mk4_complex/spr_mk4_complex.yy",},}, {"id":{"name":"obj_fleet_spawner","path":"objects/obj_fleet_spawner/obj_fleet_spawner.yy",},}, {"id":{"name":"spr_tartaros_gorget","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},}, + {"id":{"name":"spr_mk8_gorget","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},}, {"id":{"name":"obj_fleet_controller","path":"objects/obj_fleet_controller/obj_fleet_controller.yy",},}, {"id":{"name":"obj_p_ship","path":"objects/obj_p_ship/obj_p_ship.yy",},}, {"id":{"name":"scr_kill_unit","path":"scripts/scr_kill_unit/scr_kill_unit.yy",},}, @@ -1306,7 +1302,6 @@ {"id":{"name":"obj_p1_bullet","path":"objects/obj_p1_bullet/obj_p1_bullet.yy",},}, {"id":{"name":"obj_p1_bullet_miss","path":"objects/obj_p1_bullet_miss/obj_p1_bullet_miss.yy",},}, {"id":{"name":"obj_main_menu","path":"objects/obj_main_menu/obj_main_menu.yy",},}, - {"id":{"name":"spr_mk8_chest","path":"sprites/spr_mk8_chest/spr_mk8_chest.yy",},}, {"id":{"name":"spr_mk5_complex","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},}, {"id":{"name":"obj_cuicons","path":"objects/obj_cuicons/obj_cuicons.yy",},}, {"id":{"name":"obj_img","path":"objects/obj_img/obj_img.yy",},}, diff --git a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml index ca93219f4..d8be9534a 100644 --- a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml +++ b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml @@ -118,10 +118,10 @@ function get_complex_set(set = eARMOUR_SET.MK7){ }); }else if (set == eARMOUR_SET.MK8){ set_pieces.add_group({ - armour : spr_mk8_complex, - backpack : spr_mk8_complex_backpack, - left_arm : spr_mk8_left_arm, - right_arm : spr_mk8_right_arm, + armour : spr_mk7_complex, + backpack : spr_mk7_complex_backpack, + left_arm : spr_mk7_left_arm, + right_arm : spr_mk7_right_arm, left_trim : spr_mk7_left_trim, right_trim : spr_mk7_right_trim, mouth_variants : spr_mk7_mouth_variants, @@ -130,7 +130,6 @@ function get_complex_set(set = eARMOUR_SET.MK7){ leg_variants : spr_mk7_leg_variants, gorget : spr_mk8_gorget, }); - set_pieces.add_to_area("chest_variants", spr_mk8_chest); }else if (set == eARMOUR_SET.Indomitus){ set_pieces.add_group({ armour : spr_indomitus_complex, diff --git a/sprites/spr_mk7_chest_variants/0d02faaf-2101-406d-a94f-527d1c7834db.png b/sprites/spr_mk7_chest_variants/0d02faaf-2101-406d-a94f-527d1c7834db.png index c909a8965..b93e25895 100644 Binary files a/sprites/spr_mk7_chest_variants/0d02faaf-2101-406d-a94f-527d1c7834db.png and b/sprites/spr_mk7_chest_variants/0d02faaf-2101-406d-a94f-527d1c7834db.png differ diff --git a/sprites/spr_mk7_chest_variants/5769f893-c909-4b88-9856-62d72a0b6130.png b/sprites/spr_mk7_chest_variants/5769f893-c909-4b88-9856-62d72a0b6130.png new file mode 100644 index 000000000..545c19d54 Binary files /dev/null and b/sprites/spr_mk7_chest_variants/5769f893-c909-4b88-9856-62d72a0b6130.png differ diff --git a/sprites/spr_mk7_chest_variants/611de98f-d588-479c-ab78-87486ae53a43.png b/sprites/spr_mk7_chest_variants/611de98f-d588-479c-ab78-87486ae53a43.png index 403ad0734..9c2fb385b 100644 Binary files a/sprites/spr_mk7_chest_variants/611de98f-d588-479c-ab78-87486ae53a43.png and b/sprites/spr_mk7_chest_variants/611de98f-d588-479c-ab78-87486ae53a43.png differ diff --git a/sprites/spr_mk7_chest_variants/bc5e2753-207d-403d-81c5-a4e7066de053.png b/sprites/spr_mk7_chest_variants/bc5e2753-207d-403d-81c5-a4e7066de053.png index 660c992ea..f915e5585 100644 Binary files a/sprites/spr_mk7_chest_variants/bc5e2753-207d-403d-81c5-a4e7066de053.png and b/sprites/spr_mk7_chest_variants/bc5e2753-207d-403d-81c5-a4e7066de053.png differ diff --git a/sprites/spr_mk7_chest_variants/ca44f968-4109-4468-901b-d07add46e880.png b/sprites/spr_mk7_chest_variants/ca44f968-4109-4468-901b-d07add46e880.png index 02c8534fd..3ab949164 100644 Binary files a/sprites/spr_mk7_chest_variants/ca44f968-4109-4468-901b-d07add46e880.png and b/sprites/spr_mk7_chest_variants/ca44f968-4109-4468-901b-d07add46e880.png differ diff --git a/sprites/spr_mk7_chest_variants/d359bd56-6962-4c59-a10d-f16ae433baa8.png b/sprites/spr_mk7_chest_variants/d359bd56-6962-4c59-a10d-f16ae433baa8.png index d37056a8d..8a03325c0 100644 Binary files a/sprites/spr_mk7_chest_variants/d359bd56-6962-4c59-a10d-f16ae433baa8.png and b/sprites/spr_mk7_chest_variants/d359bd56-6962-4c59-a10d-f16ae433baa8.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/0d02faaf-2101-406d-a94f-527d1c7834db/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png b/sprites/spr_mk7_chest_variants/layers/0d02faaf-2101-406d-a94f-527d1c7834db/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png deleted file mode 100644 index c909a8965..000000000 Binary files a/sprites/spr_mk7_chest_variants/layers/0d02faaf-2101-406d-a94f-527d1c7834db/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png and /dev/null differ diff --git a/sprites/spr_mk7_chest_variants/layers/0d02faaf-2101-406d-a94f-527d1c7834db/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/0d02faaf-2101-406d-a94f-527d1c7834db/d0764e38-6f97-4f33-8770-83719dde468f.png new file mode 100644 index 000000000..b93e25895 Binary files /dev/null and b/sprites/spr_mk7_chest_variants/layers/0d02faaf-2101-406d-a94f-527d1c7834db/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/5769f893-c909-4b88-9856-62d72a0b6130/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/5769f893-c909-4b88-9856-62d72a0b6130/d0764e38-6f97-4f33-8770-83719dde468f.png new file mode 100644 index 000000000..545c19d54 Binary files /dev/null and b/sprites/spr_mk7_chest_variants/layers/5769f893-c909-4b88-9856-62d72a0b6130/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/611de98f-d588-479c-ab78-87486ae53a43/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png b/sprites/spr_mk7_chest_variants/layers/611de98f-d588-479c-ab78-87486ae53a43/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png deleted file mode 100644 index 403ad0734..000000000 Binary files a/sprites/spr_mk7_chest_variants/layers/611de98f-d588-479c-ab78-87486ae53a43/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png and /dev/null differ diff --git a/sprites/spr_mk7_chest_variants/layers/611de98f-d588-479c-ab78-87486ae53a43/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/611de98f-d588-479c-ab78-87486ae53a43/d0764e38-6f97-4f33-8770-83719dde468f.png new file mode 100644 index 000000000..9c2fb385b Binary files /dev/null and b/sprites/spr_mk7_chest_variants/layers/611de98f-d588-479c-ab78-87486ae53a43/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/bc5e2753-207d-403d-81c5-a4e7066de053/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png b/sprites/spr_mk7_chest_variants/layers/bc5e2753-207d-403d-81c5-a4e7066de053/d0764e38-6f97-4f33-8770-83719dde468f.png similarity index 84% rename from sprites/spr_mk7_chest_variants/layers/bc5e2753-207d-403d-81c5-a4e7066de053/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png rename to sprites/spr_mk7_chest_variants/layers/bc5e2753-207d-403d-81c5-a4e7066de053/d0764e38-6f97-4f33-8770-83719dde468f.png index 660c992ea..f915e5585 100644 Binary files a/sprites/spr_mk7_chest_variants/layers/bc5e2753-207d-403d-81c5-a4e7066de053/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png and b/sprites/spr_mk7_chest_variants/layers/bc5e2753-207d-403d-81c5-a4e7066de053/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/ca44f968-4109-4468-901b-d07add46e880/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png b/sprites/spr_mk7_chest_variants/layers/ca44f968-4109-4468-901b-d07add46e880/d0764e38-6f97-4f33-8770-83719dde468f.png similarity index 67% rename from sprites/spr_mk7_chest_variants/layers/ca44f968-4109-4468-901b-d07add46e880/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png rename to sprites/spr_mk7_chest_variants/layers/ca44f968-4109-4468-901b-d07add46e880/d0764e38-6f97-4f33-8770-83719dde468f.png index 02c8534fd..3ab949164 100644 Binary files a/sprites/spr_mk7_chest_variants/layers/ca44f968-4109-4468-901b-d07add46e880/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png and b/sprites/spr_mk7_chest_variants/layers/ca44f968-4109-4468-901b-d07add46e880/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/d359bd56-6962-4c59-a10d-f16ae433baa8/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png b/sprites/spr_mk7_chest_variants/layers/d359bd56-6962-4c59-a10d-f16ae433baa8/d0764e38-6f97-4f33-8770-83719dde468f.png similarity index 60% rename from sprites/spr_mk7_chest_variants/layers/d359bd56-6962-4c59-a10d-f16ae433baa8/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png rename to sprites/spr_mk7_chest_variants/layers/d359bd56-6962-4c59-a10d-f16ae433baa8/d0764e38-6f97-4f33-8770-83719dde468f.png index d37056a8d..8a03325c0 100644 Binary files a/sprites/spr_mk7_chest_variants/layers/d359bd56-6962-4c59-a10d-f16ae433baa8/c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b.png and b/sprites/spr_mk7_chest_variants/layers/d359bd56-6962-4c59-a10d-f16ae433baa8/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy index 51dca77c7..046d0a8c8 100644 --- a/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy +++ b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy @@ -18,13 +18,14 @@ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ca44f968-4109-4468-901b-d07add46e880",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"611de98f-d588-479c-ab78-87486ae53a43",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0d02faaf-2101-406d-a94f-527d1c7834db",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"5769f893-c909-4b88-9856-62d72a0b6130",}, ], "gridX": 0, "gridY": 0, "height": 232, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c51b53ea-bde7-49d3-a3ac-e7cb61fbce4b","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d0764e38-6f97-4f33-8770-83719dde468f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 9, @@ -47,7 +48,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 5.0, + "length": 6.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -63,6 +64,7 @@ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"dff23688-54a3-4f58-9748-753ea26db022","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"611de98f-d588-479c-ab78-87486ae53a43","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"c278fcc1-f8bf-4761-8bf5-6d43fc81c253","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0d02faaf-2101-406d-a94f-527d1c7834db","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"80777f49-d979-4e45-aeb9-a51c76f52090","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"5769f893-c909-4b88-9856-62d72a0b6130","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},},},"Disabled":false,"id":"efe29eea-b902-49f6-84aa-a2ed325b6df6","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, diff --git a/sprites/spr_mk8_complex/b18dfcbc-b847-441b-9b0c-618cd25c2349.png b/sprites/spr_mk8_complex/b18dfcbc-b847-441b-9b0c-618cd25c2349.png deleted file mode 100644 index 29dc47421..000000000 Binary files a/sprites/spr_mk8_complex/b18dfcbc-b847-441b-9b0c-618cd25c2349.png and /dev/null differ diff --git a/sprites/spr_mk8_complex/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/64129718-8943-408e-8011-70f160526bff.png b/sprites/spr_mk8_complex/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/64129718-8943-408e-8011-70f160526bff.png deleted file mode 100644 index 29dc47421..000000000 Binary files a/sprites/spr_mk8_complex/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/64129718-8943-408e-8011-70f160526bff.png and /dev/null differ diff --git a/sprites/spr_mk8_complex/spr_mk8_complex.yy b/sprites/spr_mk8_complex/spr_mk8_complex.yy deleted file mode 100644 index fb4b0336f..000000000 --- a/sprites/spr_mk8_complex/spr_mk8_complex.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk8_complex", - "bbox_bottom": 220, - "bbox_left": 10, - "bbox_right": 153, - "bbox_top": 12, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b18dfcbc-b847-441b-9b0c-618cd25c2349",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"64129718-8943-408e-8011-70f160526bff","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_8_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk8_complex", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","path":"sprites/spr_mk8_complex/spr_mk8_complex.yy",},},},"Disabled":false,"id":"c99da876-5d95-46d7-9177-cd6d87a6c32e","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk8_complex_backpack/3f895a37-c07c-48fe-a00d-9bfb26d3b23f.png b/sprites/spr_mk8_complex_backpack/3f895a37-c07c-48fe-a00d-9bfb26d3b23f.png deleted file mode 100644 index df814a5d5..000000000 Binary files a/sprites/spr_mk8_complex_backpack/3f895a37-c07c-48fe-a00d-9bfb26d3b23f.png and /dev/null differ diff --git a/sprites/spr_mk8_complex_backpack/layers/3f895a37-c07c-48fe-a00d-9bfb26d3b23f/c9a18a36-a89c-4dda-a652-bffda92b312f.png b/sprites/spr_mk8_complex_backpack/layers/3f895a37-c07c-48fe-a00d-9bfb26d3b23f/c9a18a36-a89c-4dda-a652-bffda92b312f.png deleted file mode 100644 index df814a5d5..000000000 Binary files a/sprites/spr_mk8_complex_backpack/layers/3f895a37-c07c-48fe-a00d-9bfb26d3b23f/c9a18a36-a89c-4dda-a652-bffda92b312f.png and /dev/null differ diff --git a/sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy b/sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy deleted file mode 100644 index 25753b75b..000000000 --- a/sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk8_complex_backpack", - "bbox_bottom": 36, - "bbox_left": 33, - "bbox_right": 130, - "bbox_top": 12, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"3f895a37-c07c-48fe-a00d-9bfb26d3b23f",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c9a18a36-a89c-4dda-a652-bffda92b312f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_8_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk8_complex_backpack", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"3f895a37-c07c-48fe-a00d-9bfb26d3b23f","path":"sprites/spr_mk8_complex_backpack/spr_mk8_complex_backpack.yy",},},},"Disabled":false,"id":"1356bf38-ea5e-45a3-beb4-13d49504e744","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk8_gorget/4898c548-a0c7-4e41-a1b5-a09ace2df4a7.png b/sprites/spr_mk8_gorget/4898c548-a0c7-4e41-a1b5-a09ace2df4a7.png index d48eca67b..dd6fae1d0 100644 Binary files a/sprites/spr_mk8_gorget/4898c548-a0c7-4e41-a1b5-a09ace2df4a7.png and b/sprites/spr_mk8_gorget/4898c548-a0c7-4e41-a1b5-a09ace2df4a7.png differ diff --git a/sprites/spr_mk8_gorget/603329e3-8632-4533-b8b4-82b83c307cac.png b/sprites/spr_mk8_gorget/603329e3-8632-4533-b8b4-82b83c307cac.png new file mode 100644 index 000000000..6b3648b5f Binary files /dev/null and b/sprites/spr_mk8_gorget/603329e3-8632-4533-b8b4-82b83c307cac.png differ diff --git a/sprites/spr_mk8_gorget/6988a4aa-1960-49dd-a4d3-166e6ff7c4df.png b/sprites/spr_mk8_gorget/6988a4aa-1960-49dd-a4d3-166e6ff7c4df.png index 4d1dc84eb..424a77617 100644 Binary files a/sprites/spr_mk8_gorget/6988a4aa-1960-49dd-a4d3-166e6ff7c4df.png and b/sprites/spr_mk8_gorget/6988a4aa-1960-49dd-a4d3-166e6ff7c4df.png differ diff --git a/sprites/spr_mk8_gorget/851a2104-903f-436b-b68b-06b80d754bf4.png b/sprites/spr_mk8_gorget/851a2104-903f-436b-b68b-06b80d754bf4.png index a49d87349..5cca02d07 100644 Binary files a/sprites/spr_mk8_gorget/851a2104-903f-436b-b68b-06b80d754bf4.png and b/sprites/spr_mk8_gorget/851a2104-903f-436b-b68b-06b80d754bf4.png differ diff --git a/sprites/spr_mk8_gorget/b18dfcbc-b847-441b-9b0c-618cd25c2349.png b/sprites/spr_mk8_gorget/b18dfcbc-b847-441b-9b0c-618cd25c2349.png index f5b0c7d81..211da2402 100644 Binary files a/sprites/spr_mk8_gorget/b18dfcbc-b847-441b-9b0c-618cd25c2349.png and b/sprites/spr_mk8_gorget/b18dfcbc-b847-441b-9b0c-618cd25c2349.png differ diff --git a/sprites/spr_mk8_gorget/d4999c3e-8f41-4b09-ac88-634015b49682.png b/sprites/spr_mk8_gorget/d4999c3e-8f41-4b09-ac88-634015b49682.png new file mode 100644 index 000000000..2a8345fa6 Binary files /dev/null and b/sprites/spr_mk8_gorget/d4999c3e-8f41-4b09-ac88-634015b49682.png differ diff --git a/sprites/spr_mk8_gorget/layers/4898c548-a0c7-4e41-a1b5-a09ace2df4a7/64129718-8943-408e-8011-70f160526bff.png b/sprites/spr_mk8_gorget/layers/4898c548-a0c7-4e41-a1b5-a09ace2df4a7/64129718-8943-408e-8011-70f160526bff.png deleted file mode 100644 index d48eca67b..000000000 Binary files a/sprites/spr_mk8_gorget/layers/4898c548-a0c7-4e41-a1b5-a09ace2df4a7/64129718-8943-408e-8011-70f160526bff.png and /dev/null differ diff --git a/sprites/spr_mk8_gorget/layers/4898c548-a0c7-4e41-a1b5-a09ace2df4a7/e79fd6c3-148d-41a0-b649-496590b98fdc.png b/sprites/spr_mk8_gorget/layers/4898c548-a0c7-4e41-a1b5-a09ace2df4a7/e79fd6c3-148d-41a0-b649-496590b98fdc.png new file mode 100644 index 000000000..dd6fae1d0 Binary files /dev/null and b/sprites/spr_mk8_gorget/layers/4898c548-a0c7-4e41-a1b5-a09ace2df4a7/e79fd6c3-148d-41a0-b649-496590b98fdc.png differ diff --git a/sprites/spr_mk8_gorget/layers/603329e3-8632-4533-b8b4-82b83c307cac/e79fd6c3-148d-41a0-b649-496590b98fdc.png b/sprites/spr_mk8_gorget/layers/603329e3-8632-4533-b8b4-82b83c307cac/e79fd6c3-148d-41a0-b649-496590b98fdc.png new file mode 100644 index 000000000..6b3648b5f Binary files /dev/null and b/sprites/spr_mk8_gorget/layers/603329e3-8632-4533-b8b4-82b83c307cac/e79fd6c3-148d-41a0-b649-496590b98fdc.png differ diff --git a/sprites/spr_mk8_gorget/layers/6988a4aa-1960-49dd-a4d3-166e6ff7c4df/64129718-8943-408e-8011-70f160526bff.png b/sprites/spr_mk8_gorget/layers/6988a4aa-1960-49dd-a4d3-166e6ff7c4df/64129718-8943-408e-8011-70f160526bff.png deleted file mode 100644 index 4d1dc84eb..000000000 Binary files a/sprites/spr_mk8_gorget/layers/6988a4aa-1960-49dd-a4d3-166e6ff7c4df/64129718-8943-408e-8011-70f160526bff.png and /dev/null differ diff --git a/sprites/spr_mk8_gorget/layers/6988a4aa-1960-49dd-a4d3-166e6ff7c4df/e79fd6c3-148d-41a0-b649-496590b98fdc.png b/sprites/spr_mk8_gorget/layers/6988a4aa-1960-49dd-a4d3-166e6ff7c4df/e79fd6c3-148d-41a0-b649-496590b98fdc.png new file mode 100644 index 000000000..424a77617 Binary files /dev/null and b/sprites/spr_mk8_gorget/layers/6988a4aa-1960-49dd-a4d3-166e6ff7c4df/e79fd6c3-148d-41a0-b649-496590b98fdc.png differ diff --git a/sprites/spr_mk8_gorget/layers/851a2104-903f-436b-b68b-06b80d754bf4/64129718-8943-408e-8011-70f160526bff.png b/sprites/spr_mk8_gorget/layers/851a2104-903f-436b-b68b-06b80d754bf4/64129718-8943-408e-8011-70f160526bff.png deleted file mode 100644 index a49d87349..000000000 Binary files a/sprites/spr_mk8_gorget/layers/851a2104-903f-436b-b68b-06b80d754bf4/64129718-8943-408e-8011-70f160526bff.png and /dev/null differ diff --git a/sprites/spr_mk8_gorget/layers/851a2104-903f-436b-b68b-06b80d754bf4/e79fd6c3-148d-41a0-b649-496590b98fdc.png b/sprites/spr_mk8_gorget/layers/851a2104-903f-436b-b68b-06b80d754bf4/e79fd6c3-148d-41a0-b649-496590b98fdc.png new file mode 100644 index 000000000..5cca02d07 Binary files /dev/null and b/sprites/spr_mk8_gorget/layers/851a2104-903f-436b-b68b-06b80d754bf4/e79fd6c3-148d-41a0-b649-496590b98fdc.png differ diff --git a/sprites/spr_mk8_gorget/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/64129718-8943-408e-8011-70f160526bff.png b/sprites/spr_mk8_gorget/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/64129718-8943-408e-8011-70f160526bff.png deleted file mode 100644 index f5b0c7d81..000000000 Binary files a/sprites/spr_mk8_gorget/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/64129718-8943-408e-8011-70f160526bff.png and /dev/null differ diff --git a/sprites/spr_mk8_gorget/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/e79fd6c3-148d-41a0-b649-496590b98fdc.png b/sprites/spr_mk8_gorget/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/e79fd6c3-148d-41a0-b649-496590b98fdc.png new file mode 100644 index 000000000..211da2402 Binary files /dev/null and b/sprites/spr_mk8_gorget/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/e79fd6c3-148d-41a0-b649-496590b98fdc.png differ diff --git a/sprites/spr_mk8_gorget/layers/d4999c3e-8f41-4b09-ac88-634015b49682/e79fd6c3-148d-41a0-b649-496590b98fdc.png b/sprites/spr_mk8_gorget/layers/d4999c3e-8f41-4b09-ac88-634015b49682/e79fd6c3-148d-41a0-b649-496590b98fdc.png new file mode 100644 index 000000000..2a8345fa6 Binary files /dev/null and b/sprites/spr_mk8_gorget/layers/d4999c3e-8f41-4b09-ac88-634015b49682/e79fd6c3-148d-41a0-b649-496590b98fdc.png differ diff --git a/sprites/spr_mk8_gorget/spr_mk8_gorget.yy b/sprites/spr_mk8_gorget/spr_mk8_gorget.yy index fcd2a311c..23d423e53 100644 --- a/sprites/spr_mk8_gorget/spr_mk8_gorget.yy +++ b/sprites/spr_mk8_gorget/spr_mk8_gorget.yy @@ -2,9 +2,9 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_mk8_gorget", - "bbox_bottom": 58, - "bbox_left": 56, - "bbox_right": 107, + "bbox_bottom": 53, + "bbox_left": 57, + "bbox_right": 106, "bbox_top": 24, "bboxMode": 0, "collisionKind": 1, @@ -13,17 +13,19 @@ "edgeFiltering": false, "For3D": false, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b18dfcbc-b847-441b-9b0c-618cd25c2349",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"851a2104-903f-436b-b68b-06b80d754bf4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b18dfcbc-b847-441b-9b0c-618cd25c2349",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"603329e3-8632-4533-b8b4-82b83c307cac",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d4999c3e-8f41-4b09-ac88-634015b49682",}, ], "gridX": 0, "gridY": 0, "height": 232, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"64129718-8943-408e-8011-70f160526bff","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"e79fd6c3-148d-41a0-b649-496590b98fdc","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 9, @@ -46,7 +48,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 4.0, + "length": 6.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -57,10 +59,12 @@ "timeUnits": 1, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},},"Disabled":false,"id":"383a62b7-cef5-4267-b973-3ac3aad57cca","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"851a2104-903f-436b-b68b-06b80d754bf4","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},},"Disabled":false,"id":"80b2289b-cc75-4ca5-96ca-3097105f3fd2","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"851a2104-903f-436b-b68b-06b80d754bf4","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},},"Disabled":false,"id":"80b2289b-cc75-4ca5-96ca-3097105f3fd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},},"Disabled":false,"id":"383a62b7-cef5-4267-b973-3ac3aad57cca","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},},"Disabled":false,"id":"3419f9e2-c3bc-467e-bdf0-b5dab567d3fb","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},},"Disabled":false,"id":"aaaa8953-8c99-4e89-99d3-90bb371e571c","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"603329e3-8632-4533-b8b4-82b83c307cac","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},},"Disabled":false,"id":"533ed542-183a-4df2-9110-ce46ac29753c","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},},"Disabled":false,"id":"aaaa8953-8c99-4e89-99d3-90bb371e571c","IsCreationKey":false,"Key":4.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d4999c3e-8f41-4b09-ac88-634015b49682","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},},"Disabled":false,"id":"98495c8f-472a-43e1-9468-6da68d0a2e8f","IsCreationKey":false,"Key":5.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, diff --git a/sprites/spr_mk8_left_arm/f8cc2659-4e53-42fc-bb02-c5965a87c144.png b/sprites/spr_mk8_left_arm/f8cc2659-4e53-42fc-bb02-c5965a87c144.png deleted file mode 100644 index 937279e26..000000000 Binary files a/sprites/spr_mk8_left_arm/f8cc2659-4e53-42fc-bb02-c5965a87c144.png and /dev/null differ diff --git a/sprites/spr_mk8_left_arm/layers/f8cc2659-4e53-42fc-bb02-c5965a87c144/3dc02faf-2d03-4290-a153-dfe87ca09155.png b/sprites/spr_mk8_left_arm/layers/f8cc2659-4e53-42fc-bb02-c5965a87c144/3dc02faf-2d03-4290-a153-dfe87ca09155.png deleted file mode 100644 index 937279e26..000000000 Binary files a/sprites/spr_mk8_left_arm/layers/f8cc2659-4e53-42fc-bb02-c5965a87c144/3dc02faf-2d03-4290-a153-dfe87ca09155.png and /dev/null differ diff --git a/sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy b/sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy deleted file mode 100644 index a98701bb4..000000000 --- a/sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk8_left_arm", - "bbox_bottom": 125, - "bbox_left": 117, - "bbox_right": 149, - "bbox_top": 66, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f8cc2659-4e53-42fc-bb02-c5965a87c144",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3dc02faf-2d03-4290-a153-dfe87ca09155","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_8_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk8_left_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f8cc2659-4e53-42fc-bb02-c5965a87c144","path":"sprites/spr_mk8_left_arm/spr_mk8_left_arm.yy",},},},"Disabled":false,"id":"1d7cc7e8-3cb3-4d96-9e6d-2efdce531aba","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file diff --git a/sprites/spr_mk8_right_arm/cdfc6c85-bc4a-4590-835b-2c50c8ee650a.png b/sprites/spr_mk8_right_arm/cdfc6c85-bc4a-4590-835b-2c50c8ee650a.png deleted file mode 100644 index 5176dbc1d..000000000 Binary files a/sprites/spr_mk8_right_arm/cdfc6c85-bc4a-4590-835b-2c50c8ee650a.png and /dev/null differ diff --git a/sprites/spr_mk8_right_arm/layers/cdfc6c85-bc4a-4590-835b-2c50c8ee650a/284b2f0c-1a6a-4b9a-85bc-25cfb1e4c795.png b/sprites/spr_mk8_right_arm/layers/cdfc6c85-bc4a-4590-835b-2c50c8ee650a/284b2f0c-1a6a-4b9a-85bc-25cfb1e4c795.png deleted file mode 100644 index 5176dbc1d..000000000 Binary files a/sprites/spr_mk8_right_arm/layers/cdfc6c85-bc4a-4590-835b-2c50c8ee650a/284b2f0c-1a6a-4b9a-85bc-25cfb1e4c795.png and /dev/null differ diff --git a/sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy b/sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy deleted file mode 100644 index 3ecd482be..000000000 --- a/sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy +++ /dev/null @@ -1,74 +0,0 @@ -{ - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_mk8_right_arm", - "bbox_bottom": 125, - "bbox_left": 13, - "bbox_right": 45, - "bbox_top": 66, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cdfc6c85-bc4a-4590-835b-2c50c8ee650a",}, - ], - "gridX": 0, - "gridY": 0, - "height": 232, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"284b2f0c-1a6a-4b9a-85bc-25cfb1e4c795","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - ], - "nineSlice": null, - "origin": 9, - "parent": { - "name": "mk_8_complex", - "path": "folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy", - }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_mk8_right_arm", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cdfc6c85-bc4a-4590-835b-2c50c8ee650a","path":"sprites/spr_mk8_right_arm/spr_mk8_right_arm.yy",},},},"Disabled":false,"id":"2be51d36-b09a-4d68-b918-f522c0dcf7a5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange": null, - "volume": 1.0, - "xorigin": -2, - "yorigin": 0, - }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "type": 0, - "VTile": false, - "width": 164, -} \ No newline at end of file