From c04178b440b1179e314910517e7d4913162d04f3 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Sun, 11 Feb 2024 13:03:49 -0600 Subject: [PATCH 01/27] Is It fix?? --- Resources/Maps/_NF/Shuttles/mayflower.yml | 731 ++++++++++++---------- 1 file changed, 401 insertions(+), 330 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/mayflower.yml b/Resources/Maps/_NF/Shuttles/mayflower.yml index ffb248fea26..e1618dbac16 100644 --- a/Resources/Maps/_NF/Shuttles/mayflower.yml +++ b/Resources/Maps/_NF/Shuttles/mayflower.yml @@ -35,19 +35,19 @@ entities: version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAcgAAAAAAZAAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAcgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAIgAAAAAAcgAAAAAAcgAAAAAAbwAAAAAAawAAAAAAZAAAAAAAZAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAZAAAAAAAZAAAAAAAIgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAIgAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAZAAAAAAAXgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAZAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAXgAAAAAAXgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAZAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAZAAAAAAAIgAAAAAAcgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAZAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAZAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAcgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAcgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAIgAAAAAAZAAAAAAAIgAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXgAAAAAAZAAAAAAAXgAAAAAAZAAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAcgAAAAAAZAAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAcgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAIgAAAAAAcgAAAAAAcgAAAAAAbwAAAAAAawAAAAAAZAAAAAAAZAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAZAAAAAAAZAAAAAAAIgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAIgAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAZAAAAAAAXgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAZAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAXgAAAAAAXgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAZAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAZAAAAAAAIgAAAAAAcgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAZAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAZAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAcgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAcgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAIgAAAAAAZAAAAAAAIgAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: cgAAAAAAYQAAAAAAZAAAAAAAXgAAAAAAZAAAAAAAXgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAZAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAcgAAAAAASAAAAAAASAAAAAAASAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAcgAAAAAASAAAAAAASAAAAAAASAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAawAAAAAASAAAAAAAcgAAAAAAcgAAAAAASAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAIgAAAAAAZAAAAAAAZAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAcgAAAAAAZAAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAcgAAAAAAIgAAAAAAZAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIgAAAAAAZAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAZAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAZAAAAAAAIgAAAAAAZAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAcgAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: cgAAAAAAYQAAAAAAXgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAZAAAAAAAZAAAAAAAXgAAAAAAZAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAcgAAAAAASAAAAAAASAAAAAAASAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAcgAAAAAASAAAAAAASAAAAAAASAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAawAAAAAASAAAAAAAcgAAAAAAcgAAAAAASAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAIgAAAAAAZAAAAAAAZAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAcgAAAAAAZAAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAcgAAAAAAIgAAAAAAZAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIgAAAAAAZAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAZAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAZAAAAAAAIgAAAAAAZAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAcgAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-2: ind: 0,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAZAAAAAAAXgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAZAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAZAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAZAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAXgAAAAAAZAAAAAAAXgAAAAAAXgAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAZAAAAAAAXgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAZAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAZAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAZAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAXgAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-2: ind: -1,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAZAAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAXgAAAAAAZAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAZAAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAZAAAAAAAZAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAZAAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAA version: 6 type: MapGrid - type: Broadphase @@ -108,199 +108,215 @@ entities: 30: 3,-8 31: 3,-7 32: 2,-7 - 33: 1,-7 - 34: 1,-7 - 35: 0,-7 - 36: 0,-8 - 37: 1,-8 - 38: -1,-6 - 39: -2,-6 - 40: -2,-7 - 41: -1,-7 - 42: -1,-8 - 43: -2,-8 - 44: -2,-5 - 45: -1,-5 - 46: -1,-4 - 47: -2,-4 - 48: -4,-4 + 33: 0,-7 + 34: 0,-8 + 35: 1,-8 + 36: -1,-6 + 37: -2,-6 + 38: -2,-7 + 39: -1,-7 + 40: -1,-8 + 41: -2,-8 + 42: -2,-5 + 43: -1,-5 + 44: -1,-4 + 45: -2,-4 + 46: -4,-4 + 47: -4,-4 + 48: -5,-4 49: -4,-4 - 50: -5,-4 + 50: -4,-4 51: -4,-4 52: -4,-4 53: -4,-4 - 54: -4,-4 - 55: -4,-4 - 56: -2,-2 - 57: -2,-3 + 54: -2,-2 + 55: -2,-3 + 56: -1,-2 + 57: -1,-3 58: -1,-2 - 59: -1,-3 - 60: -1,-2 - 61: -1,-1 - 62: -2,-1 - 63: -2,0 - 64: -1,0 - 65: 0,0 - 66: -1,1 - 67: -2,1 - 68: -3,1 - 69: -3,0 - 70: 0,1 - 71: 1,-4 - 72: 2,-4 - 73: 2,-5 - 74: 3,-4 - 75: 3,-5 - 76: 4,-5 - 77: 5,-5 - 78: 5,-6 - 79: 6,-6 - 80: 6,-7 - 81: 5,-7 - 82: 5,-8 - 83: 6,-8 - 84: 7,-8 - 85: 7,-7 - 86: 7,-6 - 87: -5,-3 - 88: -1,-11 - 89: -2,-11 - 90: -2,-10 - 91: -1,-10 - 92: -3,-12 - 93: -3,-13 - 94: -2,-13 - 95: 0,-13 - 96: -1,-13 - 97: 0,-14 - 98: -3,-14 - 99: -4,-15 - 100: -3,-15 - 101: -2,-15 - 102: 0,-15 - 103: 0,-15 - 104: 1,-15 - 105: 1,-14 - 106: 1,-15 - 107: 1,-16 - 108: 1,-17 - 109: 1,-18 - 110: 2,-18 - 111: 3,-18 - 112: 4,-18 - 113: 5,-18 - 114: 5,-17 - 115: 4,-17 - 116: 3,-17 - 117: 2,-17 - 118: 2,-16 - 119: 3,-16 - 120: 3,-15 - 121: 2,-15 - 122: 4,-16 - 123: 5,-16 - 124: 5,-15 - 125: 4,-15 - 126: -5,-15 - 127: -6,-15 - 128: -7,-15 - 129: -8,-15 - 130: -8,-16 - 131: -7,-16 - 132: -5,-16 - 133: -6,-16 - 134: -5,-17 - 135: -6,-17 - 136: -7,-17 - 137: -8,-17 - 138: -8,-18 - 139: -7,-18 - 140: -6,-18 - 141: -5,-18 - 142: -5,-19 - 143: -4,-18 - 144: -4,-17 - 145: -4,-19 - 146: -4,-20 + 59: -1,-1 + 60: -2,-1 + 61: -2,0 + 62: -1,0 + 63: 0,0 + 64: -1,1 + 65: -2,1 + 66: -3,1 + 67: -3,0 + 68: 0,1 + 69: 1,-4 + 70: 2,-4 + 71: 2,-5 + 72: 3,-4 + 73: 3,-5 + 74: 4,-5 + 75: 5,-5 + 76: 5,-6 + 77: 6,-6 + 78: 6,-7 + 79: 5,-7 + 80: 5,-8 + 81: 6,-8 + 82: 7,-8 + 83: 7,-7 + 84: 7,-6 + 85: -5,-3 + 86: -1,-11 + 87: -2,-10 + 88: -1,-10 + 89: -3,-12 + 90: -3,-13 + 91: -2,-13 + 92: 0,-13 + 93: -1,-13 + 94: 0,-14 + 95: -3,-14 + 96: -4,-15 + 97: -3,-15 + 98: -2,-15 + 99: 0,-15 + 100: 0,-15 + 101: 1,-15 + 102: 1,-14 + 103: 1,-15 + 104: 1,-16 + 105: 1,-17 + 106: 1,-18 + 107: 2,-18 + 108: 3,-18 + 109: 4,-18 + 110: 5,-18 + 111: 5,-17 + 112: 4,-17 + 113: 3,-17 + 114: 2,-17 + 115: 2,-16 + 116: 3,-16 + 117: 3,-15 + 118: 2,-15 + 119: 4,-16 + 120: 5,-16 + 121: 5,-15 + 122: 4,-15 + 123: -5,-15 + 124: -6,-15 + 125: -7,-15 + 126: -8,-15 + 127: -8,-16 + 128: -7,-16 + 129: -5,-16 + 130: -6,-16 + 131: -5,-17 + 132: -6,-17 + 133: -7,-17 + 134: -8,-17 + 135: -8,-18 + 136: -7,-18 + 137: -6,-18 + 138: -5,-18 + 139: -5,-19 + 140: -4,-18 + 141: -4,-17 + 142: -4,-19 + 143: -4,-20 + 144: -4,-20 + 145: -3,-20 + 146: -5,-20 147: -4,-20 - 148: -3,-20 - 149: -5,-20 - 150: -4,-20 - 151: -4,-20 - 152: -4,-20 + 148: -4,-20 + 149: -4,-20 + 150: -2,-20 + 151: -2,-20 + 152: -2,-20 153: -2,-20 154: -2,-20 - 155: -2,-20 - 156: -2,-20 - 157: -2,-20 - 158: -1,-20 - 159: -1,-20 - 160: 0,-20 + 155: -1,-20 + 156: -1,-20 + 157: 0,-20 + 158: 1,-20 + 159: 1,-19 + 160: 0,-19 161: 1,-20 - 162: 1,-19 - 163: 0,-19 - 164: 1,-20 - 165: 2,-20 - 166: 2,-19 - 167: 2,-18 - 168: 1,-18 - 169: -1,-22 - 170: -2,-22 - 171: -1,-21 - 172: -2,-21 - 173: -1,-9 - 174: -1,-9 - 175: -2,-7 - 176: -2,-7 - 177: -2,-7 + 162: 2,-20 + 163: 2,-19 + 164: 2,-18 + 165: 1,-18 + 166: -1,-22 + 167: -2,-22 + 168: -1,-21 + 169: -2,-21 + 170: -1,-9 + 171: -1,-9 + 172: -2,-7 + 173: -2,-7 + 174: -2,-7 + 175: -2,1 + 176: -2,1 + 177: -2,1 178: -2,1 179: -2,1 - 180: -2,1 - 181: -2,1 - 182: -2,1 + 180: -2,-4 + 181: -2,-4 + 182: -2,-4 183: -2,-4 184: -2,-4 185: -2,-4 - 186: -2,-4 - 187: -2,-4 - 188: -2,-4 + 186: 5,-5 + 187: 5,-5 + 188: 5,-5 189: 5,-5 - 190: 5,-5 - 191: 5,-5 - 192: 5,-5 - 193: -5,-11 - 194: -4,-11 - 195: -5,-12 - 196: -6,-12 - 197: -6,-13 - 198: -7,-13 - 199: -6,-13 - 200: -5,-13 - 201: 2,-13 - 202: 2,-12 - 203: 2,-11 - 204: 3,-12 - 205: 4,-13 - 206: 4,-13 - 207: 4,-13 - 208: 3,-12 - 209: 2,-12 - 210: 2,-13 - 211: 1,-12 - 212: 2,-2 - 213: 1,-2 - 214: -5,-2 - 215: -6,-2 - 216: -4,-2 + 190: -5,-11 + 191: -4,-11 + 192: -5,-12 + 193: -6,-12 + 194: -6,-13 + 195: -7,-13 + 196: -6,-13 + 197: -5,-13 + 198: 2,-13 + 199: 2,-12 + 200: 2,-11 + 201: 3,-12 + 202: 4,-13 + 203: 4,-13 + 204: 4,-13 + 205: 3,-12 + 206: 2,-12 + 207: 2,-13 + 208: 1,-12 + 209: 2,-2 + 210: 1,-2 + 211: -5,-2 + 212: -6,-2 + 213: -4,-2 + 214: 4,-12 + 215: 4,-12 + 216: 4,-12 217: 4,-12 - 218: 4,-12 - 219: 4,-12 - 220: 4,-12 - 221: -1,-12 - 222: -2,-12 - 223: 3,-13 - 224: -2,-14 - 225: -1,-15 + 218: -1,-12 + 219: -2,-12 + 220: 3,-13 + 221: -2,-14 + 222: -1,-15 + - node: + cleanable: True + color: '#4D0000FF' + id: a + decals: + 224: -7.104003,-13.216866 + 225: -3.1560862,-11.048694 + - node: + cleanable: True + color: '#4D0000FF' + id: m + decals: + 226: 3.9688463,-13.17517 + - node: + cleanable: True + color: '#4D0000FF' + id: s + decals: + 223: 1.9992087,-9.260017 type: DecalGrid - version: 2 data: @@ -1796,6 +1812,27 @@ entities: - pos: -1.5,1.5 parent: 1 type: Transform +- proto: CrateChemistryD + entities: + - uid: 378 + components: + - pos: -5.5,-17.5 + parent: 1 + type: Transform +- proto: CrateChemistryP + entities: + - uid: 379 + components: + - pos: -5.5,-14.5 + parent: 1 + type: Transform +- proto: CrateChemistryS + entities: + - uid: 380 + components: + - pos: -7.5,-14.5 + parent: 1 + type: Transform - proto: CrowbarRed entities: - uid: 425 @@ -1905,6 +1942,53 @@ entities: - pos: -2.6394038,1.270113 parent: 1 type: Transform +- proto: Eggshells + entities: + - uid: 341 + components: + - pos: 1.239249,-15.080102 + parent: 1 + type: Transform + - uid: 351 + components: + - pos: 2.30122,-15.863964 + parent: 1 + type: Transform + - uid: 354 + components: + - pos: 2.715496,-18.09944 + parent: 1 + type: Transform + - uid: 355 + components: + - pos: 0.040803254,-18.866049 + parent: 1 + type: Transform + - uid: 363 + components: + - pos: 1.0616367,-19.105799 + parent: 1 + type: Transform + - uid: 370 + components: + - pos: 1.2866013,-18.318907 + parent: 1 + type: Transform + - uid: 451 + components: + - pos: 3.7988815,-15.246962 + parent: 1 + type: Transform + - uid: 496 + components: + - pos: 2.621189,-16.868666 + parent: 1 + type: Transform + - uid: 513 + components: + - pos: -0.4859361,-14.443678 + parent: 1 + type: Transform - proto: EmergencyLight entities: - uid: 301 @@ -2162,6 +2246,43 @@ entities: - ShutdownSubscribers: - 466 type: DeviceNetwork +- proto: FoodEgg + entities: + - uid: 47 + components: + - name: Spider egg + type: MetaData + - pos: 3.9900136,-16.748203 + parent: 1 + type: Transform + - uid: 360 + components: + - name: Spider egg + type: MetaData + - pos: 4.104988,-16.852442 + parent: 1 + type: Transform + - uid: 375 + components: + - name: Spider egg + type: MetaData + - pos: 4.2191806,-16.748203 + parent: 1 + type: Transform + - uid: 444 + components: + - name: Spider egg + type: MetaData + - pos: 3.9691806,-16.92541 + parent: 1 + type: Transform + - uid: 514 + components: + - name: Spider egg + type: MetaData + - pos: 4.1926556,-17.002691 + parent: 1 + type: Transform - proto: FoodPlateSmallTrash entities: - uid: 486 @@ -2992,14 +3113,6 @@ entities: type: Transform - canCollide: False type: Physics - - uid: 609 - components: - - flags: InContainer - type: MetaData - - parent: 84 - type: Transform - - canCollide: False - type: Physics - uid: 617 components: - flags: InContainer @@ -3328,15 +3441,17 @@ entities: pos: -0.5,-0.5 parent: 1 type: Transform - - enabled: False + - softness: 0.5 + energy: 4 + color: '#FFAF38FF' type: PointLight - containers: light_bulb: !type:ContainerSlot showEnts: False occludes: True - ent: 609 + ent: 280 type: ContainerContainer - - powerLoad: 0 + - powerLoad: 100 type: ApcPowerReceiver - uid: 613 components: @@ -3877,7 +3992,7 @@ entities: 68: - Pressed: Toggle type: DeviceLinkSource - + - type: ItemCooldown - proto: SignArmory entities: - uid: 686 @@ -3924,6 +4039,16 @@ entities: - pos: 0.5,-15.5 parent: 1 type: Transform +- proto: SodiumLightTube + entities: + - uid: 280 + components: + - flags: InContainer + type: MetaData + - parent: 84 + type: Transform + - canCollide: False + type: Physics - proto: SpawnPointLatejoin entities: - uid: 627 @@ -3950,8 +4075,7 @@ entities: entities: - uid: 14 components: - - rot: 3.141592653589793 rad - pos: 0.5,-15.5 + - pos: -2.5,-18.5 parent: 1 type: Transform - uid: 33 @@ -3959,15 +4083,9 @@ entities: - pos: -8.5,-7.5 parent: 1 type: Transform - - uid: 47 - components: - - rot: -1.5707963267948966 rad - pos: -4.5,-19.5 - parent: 1 - type: Transform - uid: 59 components: - - pos: -0.5,-19.5 + - pos: -2.5,-15.5 parent: 1 type: Transform - uid: 131 @@ -3978,8 +4096,7 @@ entities: type: Transform - uid: 133 components: - - rot: 3.141592653589793 rad - pos: -5.5,-4.5 + - pos: 0.5,-13.5 parent: 1 type: Transform - uid: 144 @@ -3989,8 +4106,7 @@ entities: type: Transform - uid: 212 components: - - rot: 3.141592653589793 rad - pos: -0.5,-8.5 + - pos: 4.5,-17.5 parent: 1 type: Transform - uid: 279 @@ -4001,14 +4117,12 @@ entities: type: Transform - uid: 299 components: - - rot: -1.5707963267948966 rad - pos: -7.5,-17.5 + - pos: -1.5,-7.5 parent: 1 type: Transform - uid: 337 components: - - rot: 1.5707963267948966 rad - pos: 6.5,-16.5 + - pos: -6.5,-16.5 parent: 1 type: Transform - uid: 342 @@ -4017,183 +4131,172 @@ entities: pos: -8.5,-16.5 parent: 1 type: Transform - - uid: 447 + - uid: 381 components: - - pos: 3.5,-6.5 + - pos: 0.5,-17.5 parent: 1 type: Transform - - uid: 610 + - uid: 382 components: - - rot: -1.5707963267948966 rad - pos: -8.5,-7.5 + - pos: -5.5,-17.5 parent: 1 type: Transform - - uid: 611 + - uid: 384 components: - - pos: -1.5,-20.5 + - pos: -7.5,-17.5 parent: 1 type: Transform - - uid: 621 + - uid: 401 components: - - rot: -1.5707963267948966 rad - pos: -2.5,-15.5 + - pos: -2.5,-17.5 parent: 1 type: Transform - - uid: 624 + - uid: 447 components: - - rot: -1.5707963267948966 rad - pos: -0.5,-15.5 + - pos: -1.5,-10.5 parent: 1 type: Transform - - uid: 639 + - uid: 449 components: - - rot: -1.5707963267948966 rad - pos: -2.5,-17.5 + - pos: -3.5,-19.5 parent: 1 type: Transform - - uid: 681 + - uid: 457 components: - - rot: -1.5707963267948966 rad - pos: -0.5,-2.5 + - pos: -4.5,-19.5 parent: 1 type: Transform - - uid: 683 + - uid: 472 components: - - pos: -5.5,-15.5 + - pos: 0.5,-16.5 parent: 1 type: Transform - - uid: 695 + - uid: 473 components: - - pos: -6.5,-16.5 + - pos: -2.5,-6.5 parent: 1 type: Transform - - uid: 696 + - uid: 474 components: - - pos: -4.5,-16.5 + - pos: -7.5,-4.5 parent: 1 type: Transform - - uid: 699 + - uid: 475 components: - - rot: -1.5707963267948966 rad - pos: 1.5,-19.5 + - pos: -0.5,-5.5 parent: 1 type: Transform - - uid: 700 + - uid: 476 components: - - rot: -1.5707963267948966 rad - pos: -1.5,-9.5 + - pos: -2.5,-3.5 parent: 1 type: Transform - - uid: 701 + - uid: 490 components: - - rot: -1.5707963267948966 rad - pos: -1.5,-5.5 + - pos: 3.5,-4.5 parent: 1 type: Transform - - uid: 702 + - uid: 491 components: - - rot: -1.5707963267948966 rad - pos: -2.5,-7.5 + - pos: 3.5,-16.5 parent: 1 type: Transform - - uid: 703 + - uid: 492 components: - - rot: -1.5707963267948966 rad - pos: 3.5,-10.5 + - pos: 3.5,-17.5 parent: 1 type: Transform - - uid: 705 + - uid: 493 components: - - rot: -1.5707963267948966 rad - pos: -2.5,0.5 + - pos: 2.5,-17.5 parent: 1 type: Transform - - uid: 706 + - uid: 494 components: - - rot: -1.5707963267948966 rad - pos: -2.5,-4.5 + - pos: -5.5,-4.5 parent: 1 type: Transform - - uid: 708 + - uid: 495 components: - - pos: -5.5,-3.5 + - pos: 4.5,-16.5 parent: 1 type: Transform - - uid: 709 + - uid: 497 components: - - pos: -6.5,-10.5 + - pos: -4.5,-18.5 parent: 1 type: Transform - - uid: 711 + - uid: 498 components: - - rot: 1.5707963267948966 rad - pos: 0.5,-8.5 + - pos: -2.5,0.5 parent: 1 type: Transform - - uid: 713 + - uid: 499 components: - - pos: 1.5,-6.5 + - pos: -0.5,-15.5 parent: 1 type: Transform - - uid: 715 + - uid: 507 components: - - pos: 5.5,-15.5 + - pos: -5.5,-15.5 parent: 1 type: Transform - - uid: 775 + - uid: 510 components: - - pos: -0.5,-21.5 + - pos: -5.5,-16.5 parent: 1 type: Transform - - uid: 790 + - uid: 515 components: - - rot: -1.5707963267948966 rad - pos: -9.5,-5.5 + - pos: 0.5,-19.5 parent: 1 type: Transform - - uid: 832 + - uid: 516 components: - - pos: -6.5,-16.5 + - pos: -7.5,-5.5 parent: 1 type: Transform - - uid: 856 + - uid: 517 components: - - pos: -6.5,-15.5 + - pos: 1.5,-3.5 parent: 1 type: Transform - - uid: 857 + - uid: 518 components: - - pos: -5.5,-16.5 + - pos: 4.5,-4.5 parent: 1 type: Transform - - uid: 860 + - uid: 519 components: - - pos: -4.5,-17.5 + - pos: 4.5,-15.5 parent: 1 type: Transform - - uid: 869 + - uid: 520 components: - - pos: -7.5,-15.5 + - pos: 5.5,-16.5 parent: 1 type: Transform - - uid: 870 + - uid: 610 components: - - pos: -6.5,-14.5 + - rot: -1.5707963267948966 rad + pos: -8.5,-7.5 parent: 1 type: Transform - - uid: 871 + - uid: 611 components: - - pos: 5.5,-17.5 + - pos: -1.5,-20.5 parent: 1 type: Transform - - uid: 874 + - uid: 681 components: - - pos: 1.5,-14.5 + - rot: -1.5707963267948966 rad + pos: -0.5,-2.5 parent: 1 type: Transform - - uid: 875 + - uid: 700 components: - - pos: -2.5,-13.5 + - rot: -1.5707963267948966 rad + pos: -1.5,-9.5 parent: 1 type: Transform - uid: 877 @@ -4201,31 +4304,6 @@ entities: - pos: 2.5,-2.5 parent: 1 type: Transform - - uid: 881 - components: - - pos: 5.5,-5.5 - parent: 1 - type: Transform - - uid: 882 - components: - - pos: 6.5,-4.5 - parent: 1 - type: Transform - - uid: 883 - components: - - pos: 5.5,-4.5 - parent: 1 - type: Transform - - uid: 885 - components: - - pos: -7.5,-5.5 - parent: 1 - type: Transform - - uid: 886 - components: - - pos: -7.5,-4.5 - parent: 1 - type: Transform - proto: Stairs entities: - uid: 716 @@ -5253,33 +5331,26 @@ entities: type: Transform - id: Mayflower type: BecomesStation -- proto: WeaponRackWallmountedMercenary - entities: - - uid: 280 - components: - - pos: -3.5,-0.5 - parent: 1 - type: Transform - proto: WebNest entities: - - uid: 697 + - uid: 343 components: - - pos: -6.5,-15.5 + - pos: 4.5,-16.5 parent: 1 type: Transform - - uid: 714 + - uid: 350 components: - - pos: -5.5,-16.5 + - pos: 4.5,-17.5 parent: 1 type: Transform - - uid: 732 + - uid: 361 components: - - pos: -6.5,-16.5 + - pos: 3.5,-16.5 parent: 1 type: Transform - - uid: 759 + - uid: 362 components: - - pos: -5.5,-15.5 + - pos: 3.5,-17.5 parent: 1 type: Transform - proto: WindoorSecure From 06df0433583179a40b64ee15182fdf574fcf636f Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Fri, 22 Mar 2024 16:32:24 -0500 Subject: [PATCH 02/27] New GUNS ! --- .../VendingMachines/Inventories/ammo.yml | 1 + .../VendingMachines/Inventories/janidrobe.yml | 1 + .../Objects/Weapons/Guns/Snipers/snipers.yml | 36 +- .../Inventories/lesslethalvend.yml | 2 + .../Markers/Spawners/Random/event.yml | 346 ++++++++++++++++++ .../_NF/Entities/Markers/Spawners/mobs.yml | 130 ++++++- .../Weapons/Ammunition/Magazines/Rifles.yml | 55 +++ .../Objects/Weapons/Ammunition/explosives.yml | 34 ++ .../Objects/Weapons/Guns/Guns/pistols.yml | 51 +++ .../Objects/Weapons/Guns/Guns/revolvers.yml | 4 +- .../Objects/Weapons/Guns/Guns/snipers.yml | 117 ++++++ .../_NF/Recipes/Cooking/meal_recipes.yml | 13 + .../Weapons/Ammunition/svt40.rsi/base.png | Bin 0 -> 258 bytes .../Weapons/Ammunition/svt40.rsi/mag-0.png | Bin 0 -> 153 bytes .../Weapons/Ammunition/svt40.rsi/mag-1.png | Bin 0 -> 157 bytes .../Weapons/Ammunition/svt40.rsi/meta.json | 29 ++ .../Weapons/Ammunition/svt40.rsi/practice.png | Bin 0 -> 258 bytes .../Weapons/Ammunition/svt40.rsi/red.png | Bin 0 -> 258 bytes .../Weapons/Ammunition/svt40.rsi/rubber.png | Bin 0 -> 257 bytes .../Weapons/Ammunition/svt40.rsi/uranium.png | Bin 0 -> 258 bytes .../Objects/Weapons/CleanNade.rsi/icon.png | Bin 0 -> 739 bytes .../Objects/Weapons/CleanNade.rsi/meta.json | 17 + .../Objects/Weapons/CleanNade.rsi/primed.png | Bin 0 -> 710 bytes .../Guns/Pistols/Valentine.rsi/base.png | Bin 0 -> 872 bytes .../Guns/Pistols/Valentine.rsi/bolt-open.png | Bin 0 -> 883 bytes .../Pistols/Valentine.rsi/equipped-BELT.png | Bin 0 -> 194 bytes .../Guns/Pistols/Valentine.rsi/icon.png | Bin 0 -> 872 bytes .../Pistols/Valentine.rsi/inhand-left.png | Bin 0 -> 306 bytes .../Pistols/Valentine.rsi/inhand-right.png | Bin 0 -> 294 bytes .../Guns/Pistols/Valentine.rsi/mag-0.png | Bin 0 -> 118 bytes .../Guns/Pistols/Valentine.rsi/meta.json | 35 ++ .../Argenti-Revolver.rsi/bolt-open.png | Bin .../Argenti-Revolver.rsi/equipped-BELT.png | Bin .../Revolvers}/Argenti-Revolver.rsi/icon.png | Bin .../Argenti-Revolver.rsi/inhand-left.png | Bin .../Argenti-Revolver.rsi/inhand-right.png | Bin .../Revolvers}/Argenti-Revolver.rsi/meta.json | 0 .../Guns/Rifles/svt40.rsi/Inhand-left.png | Bin 0 -> 583 bytes .../Weapons/Guns/Rifles/svt40.rsi/base.png | Bin 0 -> 633 bytes .../Guns/Rifles/svt40.rsi/bolt-open.png | Bin 0 -> 622 bytes .../Rifles/svt40.rsi/equipped-BACKPACK.png | Bin 0 -> 907 bytes .../Weapons/Guns/Rifles/svt40.rsi/icon.png | Bin 0 -> 633 bytes .../Guns/Rifles/svt40.rsi/inhand-right.png | Bin 0 -> 631 bytes .../Weapons/Guns/Rifles/svt40.rsi/mag-0.png | Bin 0 -> 153 bytes .../Weapons/Guns/Rifles/svt40.rsi/meta.json | 35 ++ .../_NF/Objects/Weapons/M34.rsi/icon.png | Bin 0 -> 787 bytes .../_NF/Objects/Weapons/M34.rsi/meta.json | 17 + .../_NF/Objects/Weapons/M34.rsi/primed.png | Bin 0 -> 752 bytes 48 files changed, 919 insertions(+), 4 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/event.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-0.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-1.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/primed.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/base.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/bolt-open.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/mag-0.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/meta.json rename Resources/Textures/_NF/Objects/Weapons/{ => Guns/Revolvers}/Argenti-Revolver.rsi/bolt-open.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{ => Guns/Revolvers}/Argenti-Revolver.rsi/equipped-BELT.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{ => Guns/Revolvers}/Argenti-Revolver.rsi/icon.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{ => Guns/Revolvers}/Argenti-Revolver.rsi/inhand-left.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{ => Guns/Revolvers}/Argenti-Revolver.rsi/inhand-right.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{ => Guns/Revolvers}/Argenti-Revolver.rsi/meta.json (100%) create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/Inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/base.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/bolt-open.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/mag-0.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Weapons/M34.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/M34.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Weapons/M34.rsi/primed.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml index 4d3babb4da1..f5ec7547579 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml @@ -8,6 +8,7 @@ MagazineBoxLightRiflePractice: 15 MagazineBoxLightRifleRubber: 15 WeaponShotgunDoubleBarreled: 15 + WhitePhosphorusGrenade: 3 BoxShotgunSlug: 15 BoxLethalshot: 15 BoxBeanbag: 15 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml index 8d31c103772..4bc5e369ac8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml @@ -1,6 +1,7 @@ - type: vendingMachineInventory id: JaniDrobeInventory startingInventory: + SpaceCleanerGrenade: 10 # For you Slips, Frontier ClothingBackpackMessengerJanitor: 2 # Frontier ClothingUniformJumpsuitJanitor: 2 ClothingUniformJumpskirtJanitor: 2 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index b5404c0da75..607d1b28e2d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -45,7 +45,41 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi - - type: StaticPrice + state: base + - type: AmmoCounter + - type: Gun + useKey: false + fireRate: 1.25 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/sniper.ogg + - type: BallisticAmmoProvider + capacity: 5 + proto: CartridgeLightRifle + whitelist: + tags: + - CartridgeLightRifle + - type: MeleeWeapon + attackRate: .85 + damage: + types: + Piercing: 16 + Slash: 5 + angle: 0 + wideAnimationRotation: -135 + - type: DisarmMalus + animation: WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Sharp + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage + sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi price: 210 - type: entity diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index fa67a4a6923..d13aff2eacf 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -6,6 +6,8 @@ WeaponRevolverArgentiNonlethal: 10 WeaponShotgunDoubleBarreledRubber: 10 WeaponFlareGun: 20 + WeaponPistolValentineNonLethal: 4 + WeaponSVTnonlethal: 4 BoxDonkSoftBox: 10 BoxCartridgeCap: 10 MagazineBoxPistolRubber: 10 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/event.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/event.yml new file mode 100644 index 00000000000..e5b55658840 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/event.yml @@ -0,0 +1,346 @@ +- type: entity + id: RandomEventLootLegal + name: random EventLootLegal + suffix: Dungeon + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Objects/Misc/bedsheets.rsi + state: sheetUSA + - type: RandomSpawner + prototypes: + - WeaponRevolverArgenti + - CombatKnife + - WeaponPistolMk58 + - WeaponLaserGun + - WeaponRifleBB + - ClothingOuterArmorCult + - ClothingOuterArmorHeavyRed + - ClothingOuterArmorHeavyGreen + - ClothingOuterArmorHeavy + - ChemDispenserMachineCircuitboard + - RiotBulletShield + - MakeshiftShield + - RiotLaserShield + - RiotShield + - TelescopicShield + - WebShield + - BedsheetUSA + - FlatpackerMachineCircuitboard + - WeaponGauntletGorilla + - ClothingHeadHatHetmanHat + - MonkeyCubeBox + - RCD + - MedkitAdvancedFilled + - MedkitToxinFilled + - MedkitRadiationFilled + - MedkitBurnFilled + - MedkitOxygenFilled + - MedkitFilled + - ResearchAndDevelopmentServerMachineCircuitboard + - CableApcStack + - BoxMRE + - FoodTinPeachesMaint + - CigCartonBlack + - PlushieRGBee + - RPED + - MobSlimesPet + - PlushieAbductor + - ClothingHeadAreopagite + - ClothingOuterHardsuitAtmos + - ClothingBackpackWaterTank + - ClothingBeltBandolier + - BaseBallBat + - ClothingOuterHardsuitBasic + - Bible + - BikeHornImplanter + - BoxHugHealing + - FoodCabbage + - ClothingOuterHardsuitEngineeringWhite + - ClothingOuterHardsuitMedical + - ClaymoreDulled + - ClothingOuterHardsuitClown + - WeaponShotgunDoubleBarreled + - ClothingHandsGlovesCombat + - ClothingOuterHardsuitEngineering + - FireAxe + - ClothingShoesGaloshes + - HandHeldMassScanner + - BoxPerformer + - HolofanProjector + - ProtolatheHyperConvectionMachineCircuitboard + - AutolatheHyperConvectionMachineCircuitboard + - OreProcessorIndustrialMachineCircuitboard + - JetpackBlueFilled + - KatanaDulled + - Kanabou + - LightImplanter + - PlushieLoveable + - ClothingOuterHardsuitLuxury + - WeaponMakeshiftLaser + - MedicalTrackingImplanter + - MedicalTechFabCircuitboard + - MegaSprayBottle + - JetpackMiniFilled + - ClothingOuterHardsuitSalvage + - WeaponPistolMk58 + - WeaponPistolMk58Nonlethal + - MothroachCube + - PlushiePenguin + - PlasteelArmingSword + - SheetPlastic + - WeaponShotgunSawnNonlethal + - WeaponShotgunSawn + - ClothingOuterArmorScaf + - ClothingHeadHelmetScaf + - ScienceTechFabCircuitboard + - ServiceTechFabCircuitboard + - SheetifierMachineCircuitboard + - ShredderMachineCircuitboard + - Sledgehammer + - ClothingOuterHardsuitSpatio + - WeaponLaserSvalinn + - TechnologyDisk + - ClothingHeadHelmetTemplar + - SheetUranium + - ClothingNeckCloakVoid + - BoxHandcuff + - ResearchDisk5000 + - ResearchDisk + - WeaponRevolverDeckardNonlethal + - ToySword + - ClothingShoesBootsSpeed + - PinpointerUniversal + chance: 1 + rarePrototypes: + - ClothingBeltSheathFilled + - WeaponShotgunKammerer + - WeaponForceGun + - WeaponParticleDecelerator + - ClothingOuterArmorPodWars + - ClothingHeadHelmetPodWars + - ClockworkShield + - MirrorShield + - BedsheetUSA + - HypoMini + - HypoMiniLimitedEdition + - RCDRecharging + - ClothingShoesBootsSpeed + - MedkitCombatFilled + - TrashBagOfHolding + - ClothingBackpackHolding + - ClothingBackpackMessengerHolding + - ClothingBackpackDuffelHolding + - ClothingShoesBootsMagAdv + - AdvMopItem + - RGBStaff + - WeaponAdvancedLaser + - AmmoTechFabCircuitboard + - PlushieArachind + - ClothingMaskArcadia + - ClothingBeltChiefEngineerFilled + - CowToolboxFilled + - ClothingShoesBootsMagCombatFilled + - ClothingShoesBootsMagGaloshes + - Hypospray + - Katana + - WeaponLaserCannon + - MuteToxinChemistryBottle + - ClothingOuterHardsuitCap + - ClothingShoesBootsMagBlinding + - TurboItemRechargerCircuitboard + - WeaponRevolverDeckard + - MedicatedSuture + - FoodPizzaArnold + - PinpointerUniversal + - Claymore + rareChance: 0.3 + +- type: entity + id: RandomEvent Rare legal loot + name: random Event Rare Legal Loot + suffix: Dungeon + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Objects/Misc/bedsheets.rsi + state: sheetUSA + - type: RandomSpawner + prototypes: + - ClothingBeltSheathFilled + - SpaceCash10000 + - WeaponAntiqueLaser + - WeaponForceGun + - PenCentcom + - ClothingOuterArmorPodWars + - ClothingHeadHelmetPodWars + - ClothingOuterCoatSpaceAsshole + - UnholyHalberd + - ClockworkShield + - MirrorShield + - BedsheetUSA + - HypoMini + - HypoMiniLimitedEdition + - ClothingBackpackHolding + - ClothingShoesBootsMagAdv + - OreBagOfHolding + - ClothingShoesBootsSpeed + - ClothingBackpackDuffelHolding + - ClothingBackpackMessengerHolding + - MedkitCombatFilled + - TrashBagOfHolding + - AdvMopItem + - HandheldCrewMonitor + - WeaponAdvancedLaser + - VariedXenoArtifactItem + - ClothingMaskArcadia + - ClothingShoesBootsMagCombatFilled + - WeaponLaserCannon + - ClothingEyesHudMedSec + - PowerCellMicroreactor + - MuteToxinChemistryBottle + - SmokeGrenade + - ClothingShoesBootsMagBlinding + - TechnologyDiskRare + - Truncheon + - TurboItemRechargerCircuitboard + - ResearchDisk10000 + - MedicatedSuture + - RegenerativeMesh + - FoodPizzaArnold + - PinpointerUniversal + chance: 1 + +- type: entity + id: RandomEvent Illegal Loot spawner + name: random Illegal Loot spawner + suffix: Dungeon + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Objects/Misc/bedsheets.rsi + state: sheetsyndie + - type: RandomSpawner + prototypes: + - DnaScramblerImplanter + - CyberPen + - CigPackSyndicate + - WeaponRevolverPythonAP + - ClothingEyesGlassesOutlawGlasses + - SyndicatePersonalAI + - EnergySword + - WeaponPistolCobra + - EmpGrenade + - Stimpack + - ClusterGrenade + - EncryptionKeyBinary + - EnergyShield + - SyndieMiniBomb + - PenExplodingBox + - GrenadeShrapnel + - GrenadeIncendiary + - ExGrenade + - C4 + - SmokeGrenade + - GrenadeFlashBang + - ClothingShoesBootsMagSyndie + - ClothingBackpackDuffelSyndicateEVABundle + - ClothingUniformJumpskirtOperative + - ClothingOuterVestWeb + - ClothingNeckScarfStripedSyndieGreen + - ClothingUniformJumpsuitOperative + - ClothingHandsGlovesBoxingRigged + - ScramImplanter + - StorageImplanter + - ClothingHeadHatOutlawHat + - ClothingBackpackDuffelSyndicateCostumeClown + - RubberStampSyndicate + - ClothingBackpackDuffelSyndicatePyjamaBundle + - ClothingBackpackDuffelSyndicateCarpSuit + - EnergyDagger + - RevolverCapGun + - BalloonSyn + - ClothingHeadHatCatEars + - RadioJammer + - JetpackBlackFilled + - SoapSyndie + - BoxEncryptionKeySyndie + - ClothingHeadsetAltSyndicate + - HappyHonkNukieSnacks + - NukeDiskFake + - LanternFlash + - CrateFunSyndicateSegway + - SlipocalypseClusterSoap + - CombatMedipen + - BriefcaseSyndieLobbyingBundleFilled + - MedkitCombatFilled + - Emag + - ClothingBackpackDuffelSyndicateBundleSamurai + - BorgModuleSyndicateWeapon + - ClothingOuterHardsuitSyndie + - ClothingOuterHardsuitSyndieMedic + - SyndiHypo + - WeaponRifleAk + - WeaponRifleLecter + - WeaponPistolCHIMPUpgradeKit + - WeaponSniperHristov + - WeaponPistolN1984 + - WeaponLauncherPirateCannon + - ClothingHeadHelmetSwatSyndicate + - ClothingShoesBootsWinterSyndicate + - ClothingBeltMilitaryWebbingMedFilled + - EnergyKatana + - PenCentcom + - FoodPizzaArnold + - WeaponShotgunEnforcer + - SadTromboneImplanter + - PinpointerUniversal + - BluespaceBeaker + - ClothingBackpackHolding + chance: 1 + rarePrototypes: + - ClothingBackpackDuffelSyndicateFilledGrenadeLauncher + - StealthBox + - ClothingBackpackDuffelSyndicateFilledEmpGrenadeLauncher + - ClothingBackpackDuffelSyndicateFilledLMG + - ClothingBackpackDuffelSyndicateFilledShotgun + - ClothingBackpackDuffelSyndicateFilledSMG + - BriefcaseSyndieSniperBundleFilled + - ElectricalDisruptionKit + - ChemicalSynthesisKit + - ClothingOuterHardsuitSyndieElite + - EmpImplanter + - ClothingBackpackChameleonFill + - NocturineChemistryBottle + - ThievingGloves + - ScramImplanter + - ClothingOuterHardsuitJuggernaut + - WeaponPistolViper + - WhiteholeGrenade + - FireAxeFlaming + - ClothingMaskGasVoiceChameleon + - StimkitFilled + - AgentIDCard + - HypopenBox + - ReinforcementRadioSyndicateMonkey + - HypoDartBox + - BoxHoloparasite + - ReinforcementRadioSyndicate + - ClothingHandsGlovesNorthStar + - FreedomImplanter + - EnergySwordDouble + - FoodPizzaArnold + - SadTromboneImplanter + - PinpointerUniversal + - BluespaceBeaker + - ClothingBackpackHolding + - VendingMachineSyndieContraband + - ClothingBackpackDuffelSyndicateC4tBundle + - HolyHandGrenade + rarechance: .2 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml index 4c0e45a98a3..fdddb8e66db 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: Arcadia Industries Shredder Spawner id: SpawnMobArcIndShredder parent: MarkerBase @@ -39,3 +39,131 @@ - type: ConditionalSpawner prototypes: - MobArcIndBlaster + +- type: entity + name: Salvager Spawner + id: SpawnMobSalvager + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: full + sprite: Mobs/Species/Human/parts.rsi + - type: ConditionalSpawner + prototypes: + - MobSalvager + +- type: entity + name: Laser Raptor Spawner + id: SpawnMobLaserRaptor + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: laser_raptor + sprite: Mobs/Aliens/laser_raptor.rsi + - type: ConditionalSpawner + prototypes: + - MobLaserRaptor + +- type: entity + name: RatKing Spawner + id: SpawnMobRatKing + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: icon + sprite: Mobs/Animals/regalrat.rsi + - type: ConditionalSpawner + prototypes: + - MobRatKing + +- type: entity + name: RatBuff Spawner + id: SpawnMobRatKingBuff + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: icon + sprite: Mobs/Animals/buffrat.rsi + - type: ConditionalSpawner + prototypes: + - MobRatKingBuff + +- type: entity + name: Abomination Spawner + id: SpawnMobAbomination + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: abomination + sprite: Mobs/Demons/abomination.rsi + - type: ConditionalSpawner + prototypes: + - MobAbomination + +- type: entity + name: Watcher Spawner + id: SpawnMobWatchers + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: unshaded + sprite: Mobs/Aliens/Lavaland/watcher.rsi + - type: ConditionalSpawner + prototypes: + - MobWatcherLavaland + - MobWatcherMagmawing + - MobWatcherIcewing + +- type: entity + name: KillerTomato Spawner + id: SpawnMobTomatoKillers + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: produce + sprite: Nyanotrasen/Mobs/Mutants/killer_tomato.rsi + - type: ConditionalSpawner + prototypes: + - MobTomatoKiller + +- type: entity + name: Dungeon SpaceDragon Spawner + id: SpawnDungeon SpaceDragon + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: alive + sprite: Mobs/Aliens/Carps/dragon.rsi + - type: ConditionalSpawner + prototypes: + - MobDragonDungeon + +- type: entity + name: Tarantula (Angry) Spawner + id: SpawnTarantula + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: tarantula + sprite: Mobs/Animals/spider.rsi + - type: ConditionalSpawner + prototypes: + - MobGiantSpiderAngry diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml new file mode 100644 index 00000000000..d2f38fa7bd1 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml @@ -0,0 +1,55 @@ +- type: entity + id: MagazineSVT + name: "10 rounder SVT Magazine (.30 rifle)" + parent: BaseMagazineLightRifle + components: + - type: Tag + tags: + - MagazineLightRifle + - type: BallisticAmmoProvider + proto: CartridgeLightRifle + capacity: 10 + - type: Sprite + sprite: _NF/Objects/Weapons/Ammunition/svt40.rsi + +- type: entity + id: MagazineSVTUranium + name: "10 rounder SVT magazine (.30 rifle uranium)" + parent: MagazineSVT + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleUranium + - type: Sprite + layers: + - state: uranium + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineSVTRubber + name: "10 Rounder SVT magazine (.30 rifle rubber)" + parent: MagazineSVT + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineSVTPractice + name: "10 rounder SVT magazine (.30 rifle practice)" + parent: MagazineSVT + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRiflePractice + - type: Sprite + layers: + - state: practice + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml index 0955471580d..06d80e99033 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml @@ -36,3 +36,37 @@ - type: SpentAmmoVisuals state: emp suffix: false + +- type: entity + parent: SmokeGrenade + id: WhitePhosphorusGrenade + name: M34 'Willie Pete' Grenade + description: With the Team up of Kesco and A Single Arachnid, We bring you the old but, faithful Phosphorus based Smoke Incendiary Grenade. + components: + - type: Sprite + sprite: _NF/Objects/Weapons/M34.rsi + - type: SmokeOnTrigger + duration: 5 + spreadAmount: 10 + solution: + reagents: + - ReagentId: Phlogiston + Quantity: 10 + - ReagentId: Napalm + Quantity: 10 + +- type: entity + parent: SmokeGrenade + id: SpaceCleanerGrenade + name: SpaceCleaner Grenade + description: A Jani's Best Friend + components: + - type: Sprite + sprite: _NF/Objects/Weapons/CleanNade.rsi + - type: SmokeOnTrigger + duration: 5 + spreadAmount: 20 + solution: + reagents: + - ReagentId: SpaceCleaner + Quantity: 50 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml new file mode 100644 index 00000000000..90b0d8d27d3 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml @@ -0,0 +1,51 @@ +- type: entity + name: Valentine + parent: BaseWeaponPistol + id: WeaponPistolValentine + description: An Old and bloodstain this Pistol is feature with a wooden pistol grip that has S.T.A.R on it + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Pistols/Valentine.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Pistols/Valentine.rsi + - type: AmmoCounter + - type: Gun + fireRate: 3 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + +- type: entity + name: Valentine + suffix: Non-lethal + parent: BaseWeaponPistol + id: WeaponPistolValentineNonLethal + description: An Old and bloodstain this Pistol is feature with a wooden pistol grip that has S.T.A.R on it + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Pistols/Valentine.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Pistols/Valentine.rsi + - type: AmmoCounter + - type: Gun + fireRate: 3 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolRubber diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml index 4ce4ee7df02..4a74dc7823e 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml @@ -5,9 +5,9 @@ description: Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo. components: - type: Sprite - sprite: _NF/Objects/Weapons/Argenti-Revolver.rsi + sprite: _NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi - type: Clothing - sprite: _NF/Objects/Weapons/Argenti-Revolver.rsi + sprite: _NF/Objects/WeaponsGuns/Revolvers/Argenti-Revolver.rsi - type: Gun fireRate: 2 resetOnHandSelected: false diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml index c7518a112b3..e51c698d1cf 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml @@ -10,3 +10,120 @@ - CartridgeLightRifle capacity: 10 proto: CartridgeLightRifleRubber + +- type: entity + id: WeaponSVT + name: SVT-40 + parent: BaseWeaponRifle + description: Retreating is Consider Treason + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: AmmoCounter + - type: Gun + fireRate: 3.5 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg + - type: ChamberMagazineAmmoProvider + soundRack: + path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineSVT + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + +- type: entity + id: WeaponSVTnonlethal + name: SVT-40 + suffix: Non-lethal + parent: BaseWeaponRifle + description: Retreating is Consider Treason + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: AmmoCounter + - type: Gun + fireRate: 3.5 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg + - type: ChamberMagazineAmmoProvider + soundRack: + path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineSVTRubber + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifleRubber + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml index 1a12846c1f6..a27ab1c68c8 100644 --- a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml @@ -12,3 +12,16 @@ FoodMealFries: 1 FoodOnionRings: 1 OrganAnimalHeart: 1 + +- type: microwaveMealRecipe + id: ChickenNuggets Recipe + name: McNuggets recipe + result: FoodBoxNugget + time: 15 + reagents: + Cornoil: 10 + Flour: 10 + solids: + FoodEgg: 3 + FoodMeatChickenCutlet: 2 + MaterialCardboard1: 1 diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..795c69b9d30270b7fbed857bd845af01e654b466 GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}dpunnLn2z= zUUKweb`)rRxW7v6nM9O^f@gzsnmF<}t zyW&I5c{P_#3Hp_6`0T^cKX*cz4t)D=6>usgzS|(6;?+F#4fAh z_f4Mc^5S6CTgwirPH0g%bX$B;wdIUJzudao(wAAA1E1D@KA8}Bi;cC#$FRk570==0 z7v}`lC!`lvKfn5z`SMB0*W2Yn7P8#U{;&NLXz#!6`XTduRwi^D*bDRrgQu&X%Q~lo FCIDsPY@h%D literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..bb873aa26119570899abb4f2f1fe20655d90a206 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}!JaOTArY-_ zFK*;Lpupo2s9x-nsWjn6y@ZNUPo}bqu)OU5(!84Vn>-8*4ikbu&gs&&=2QJ+y?uLI z*<9^IqWh!IA6k69ovTN6O2NtEyQl9lFjT*ubX{O^f@gzsnmF<}t zyW&I5c{P_#3Hp_6`0T^cKX*cz4t)D=6>usgzS|(6;?+F#4fAh z_f4Mc^5S6CTgwirPH0g%bX$B;wdIUJzudao(wAAA1E1D@KA8}Bi;cC#$FRk570==0 z7v}`lC!`lvKfn5z`SMB0*W2Yn7P8#U{;&NLXz#!6`XTduRwi^D*bDRrgQu&X%Q~lo FCIDsPY@h%D literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png new file mode 100644 index 0000000000000000000000000000000000000000..795c69b9d30270b7fbed857bd845af01e654b466 GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}dpunnLn2z= zUUKweb`)rRxW7v6nM9O^f@gzsnmF<}t zyW&I5c{P_#3Hp_6`0T^cKX*cz4t)D=6>usgzS|(6;?+F#4fAh z_f4Mc^5S6CTgwirPH0g%bX$B;wdIUJzudao(wAAA1E1D@KA8}Bi;cC#$FRk570==0 z7v}`lC!`lvKfn5z`SMB0*W2Yn7P8#U{;&NLXz#!6`XTduRwi^D*bDRrgQu&X%Q~lo FCIDsPY@h%D literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..6e838bd805c1b7ce7943b62226ee7a49899f771d GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}yFFbTLn2z= zUUKwuHWX=n_+M@PF22AR2kS!JyX|~3yQIVekMwR?8dAW$w$}1^_ON7Ol<)=fU3 zYWZD_CCE#2>6i0KCm!B@Ep5)paQl9?zvg0R-9rwE`(k9?Ugecc2wfgfzw7tQjM57X z;Wo){^Ydo8glp?Hs;CJ5t6KQ8v**+8XXTSO&OYncd-h%Py+tLWtSvrPx#yh%hsR9J=W(y>YdK@^4I|ITjW6A1Q-ja}0CVp{lYL3|7wT_l1K*v3lD&N(SG zRx5}r2y(w>;4*XWonauQlu}B6ET$YjJw9=j0I>bB4wN$ctVI|o+;#V(z1k@Q^kbW7A&Kz&3-vsYW|W^cKVL3fZMLesY~L6xO531-kST^R zNR?rD{W53LAK1IRxbn^Qii6pl$EP)@LJ7Ku^{?colv4WNcJg*jCVI~jN&o-=07*qo IM6N<$g7778ZU6uP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1ca66989e3e80ebf50d9a2148c72720f2d43d462 GIT binary patch literal 739 zcmV<90v!E`P)Qn}CTp9KV8FM$vg-4^ z(M~sBdT5PmmN6R+hiJIIA81nbeoXahe6Q~6h$k!!n%ab?G{dxoWg0@8wxM`exKB$( zzn>AdzgkNT3%M0ROG z>VWJ)EFuI6;3Gz!4bs?*NzF=T^?l=I-#j_-X!15FV2UG2O1yqi^U^gTRTn)WPnv?t z{ePa8J~>h8-Whg`>k&a69PW;wVBFKSaKPOFu)m zB6JgkE^^LdH@U%6utB;da4x1(PYzCK!dW}yw>kaOL4|n zS=d&h)r0`0)cI`Sa%gyeW^PaKf@s_|-;*|!QV7EkQc7f5W_71i2aX?lh{j#B=*MVX ze1S0rrIdAXX8{0cU!RombC82lYW@CB0zwEQw5a43{TQ!@FHRDT4B-Z?H5g-764nAw z(c`asX_^L7N@%UOzRz0V>f^08e-j^+5-!8IH6$TsZXz?ls1iv+oPI&485lnIYU54> zrsqdi`Nr9cCm3D61NdqEX1x=EVpatCYFWwUt0jtA@pqG72T6#TcRJ3k_jo*e!x{}) Ve~=+ne^LMd002ovPDHLkV1n3lM`Zv2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/meta.json new file mode 100644 index 00000000000..60b919588c3 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/524270a5bcc1e0ea844b98c5a204986cec9721ac/icons/obj/weapons/grenade.dmi and modified by deltanedas (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "primed" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/primed.png b/Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/primed.png new file mode 100644 index 0000000000000000000000000000000000000000..f37a031dfdf482b0d8ce0910deef728b1c9112d1 GIT binary patch literal 710 zcmV;%0y+JOP)Qn}CTp9KV8FM$vg-4^ z(M~sBdT5PmmN6R+hiJIIA81nbeoXahe6Q~6h$k!!n%ab?G{dxoWg0@8wxM`exKB$( zzn>AdzgkNT3%M0ROG z>VWJ)EFuI6;3Gz!4bs?*NzF=T^?l=I-#j_-X!15FV2UG2O1yqi^U^gTRTn)WPnv?t z{ePa8J~>h8-WhAIOLEs+u{|pQa3^r4Y|65sE{nyje`%kV}EaYg? zKVr%7ddi#sSL~b^bQtzADDPEfU|?YQf9cXCMpDgUBF6y?3=9nHIVN!WweuqeadB}5 zazcV+2Q)M^{BQW$fFgFq&WYin%x$t9L3RjW17E*>Wl&aDCdm;bJK&NcPejNYz|F`+?%#e;kbNF$Pl@-ZK z1A&(AhXKMF>{C>S&V0Jwf|YY9OJyZ`_I07*qoM6N<$g52{x(EtDd literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..4eb8087206f7fbbed3b7425021abbcbac11ddbd6 GIT binary patch literal 872 zcmV-u1DE`XP)Px&B1uF+R9J=WlTB|MRTPGwJ9ix0v1#fiHVLWg;I>F4)HNbmgs5sz7wlLf7Tsmn zKhOoMmJO(?+CRXKHSAax5JXjgp>fiHO4ZO1CDb;l?YJI)%-p#wnz*&pWa26UA^BO& z+;eo!d%mDYkN*SGH1(xhSuLg1hY|16t!z7v@N*VI=(A_fkWQyqxx2_alha635)Ow6 z1SD6kd;)-JnuNna8jTiq%?6;n{g~zD9JySMLZLvlT4U|uI!&j=qP4<@AANx7C%`Za z5{U%0dXs#y!jg5H^!NC}f zMuTi7!sia0+z(_XBFg`ZGbptZ(R3L$o?H3ZtzD935%^&P>vi6pUO zQR4A9{gHlD%fb5DYTL(89|z#OZ|4QT{OtuafHrWOE#bLJD8~`XafI7!iRY91BBj)` znKAw5_-Q>9KdMipUemLgF?}*M(s7Q@S8oRUbRZNs@VWYSVAJ;K?+@|u)pv=<2l=Da zBsTbJN7CKu&(F^2ndvFCK6sJ7XXq-;#knM(eKW%4Iku<`RF!h2m9{8>gt~;Gy?;#kk97{3*VLL8u`LUDfQcl5Eaj4baa?RVi+NyRH?GM zxkahP@{k#tSvSG<)tqG#-ay5jH9SB!FM?bv(~IwCcg< y3eHU=+yA?p-(J3dL%?3P!xqt_M~@!=DgOZQELJ{8!pKqp0000Px&ElET{R9J=WlfQ3URTRfR_ul8kPE1`Vv73;(4u&E%Y26^o5TdF<8Q2&R65X=( zA7Ef=SwIMte}D}krm`^>5RIa^n8ry1f=ZzwN?O}ZZO8cMd-q)i5;ul8j-dhuf2Mce zIlAY2&ix+f(&hh#vMh7u=A=Wm))qy;Q4p%B3>-oyV-Kq)4SwWHK3w#S-iHH>lZlmXfQy`PLf;7XSRS z8^YROTuMne9HvyMk`+4I5c@iB%5j%9KE|qeHYPC*2m#17QQ?1moZB4CS!5Bkvr-as8 z97(|0ksuEp!{A_$YPHH_JkE_Tz7zoG;uB_Nc~xARnQj11e z+ZIl(F7_91i&DzW#K+8;@zZ7~bljYZK5J&;W9IqjNYi@l@80U|F&?ky$Sd4-0$XL5 zzCJJSUVD{LXpmoWHG+dDnu_jqe`#jgOi#UnF-LFGYM0<>!{xaMAAB{!J9F^iwM|l~ z6fUw!1i-EN1OT0kxn-hK%3L@(MAqsh7z}WEF2eQqmxu*=_;z*UNuqo*#E#x~mqRDu zguC)vt<#)FvR5;%%;Kl#|002ov JPDHLkV1h%7th@jK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..af76d78defc46d03a73cd68171b80e33b631d6b9 GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|YCK&WLn`LH zy|q#BkbwZp0poKqt=a{=@AfMg_0JIyn7~oTkX=^%caPp*Z=h-hhF@E2qoXH%d+l0v zx9geDX&dq0U+Y#e=&jai_+1#%%LG=#Q1Nu}=05`0AJ#@sHgA?tYFM6k=*sW14hFeh l_Vam!8uAXY?)GH(!0s0!%CFWG$ioNH<>~6@vd$@?2>{t@L(>2N literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4eb8087206f7fbbed3b7425021abbcbac11ddbd6 GIT binary patch literal 872 zcmV-u1DE`XP)Px&B1uF+R9J=WlTB|MRTPGwJ9ix0v1#fiHVLWg;I>F4)HNbmgs5sz7wlLf7Tsmn zKhOoMmJO(?+CRXKHSAax5JXjgp>fiHO4ZO1CDb;l?YJI)%-p#wnz*&pWa26UA^BO& z+;eo!d%mDYkN*SGH1(xhSuLg1hY|16t!z7v@N*VI=(A_fkWQyqxx2_alha635)Ow6 z1SD6kd;)-JnuNna8jTiq%?6;n{g~zD9JySMLZLvlT4U|uI!&j=qP4<@AANx7C%`Za z5{U%0dXs#y!jg5H^!NC}f zMuTi7!sia0+z(_XBFg`ZGbptZ(R3L$o?H3ZtzD935%^&P>vi6pUO zQR4A9{gHlD%fb5DYTL(89|z#OZ|4QT{OtuafHrWOE#bLJD8~`XafI7!iRY91BBj)` znKAw5_-Q>9KdMipUemLgF?}*M(s7Q@S8oRUbRZNs@VWYSVAJ;K?+@|u)pv=<2l=Da zBsTbJN7CKu&(F^2ndvFCK6sJ7XXq-;#knM(eKW%4Iku<`RF!h2m9{8>gt~;Gy?;#kk97{3*VLL8u`LUDfQcl5Eaj4baa?RVi+NyRH?GM zxkahP@{k#tSvSG<)tqG#-ay5jH9SB!FM?bv(~IwCcg< y3eHU=+yA?p-(J3dL%?3P!xqt_M~@!=DgOZQELJ{8!pKqp0000KW zynIdVz=@x y==_qoGym)Pq%j6n)I9uqC)DciE_Mcn3G3C>|4co==4kW}WQV7#pUXO@geCwy`h@EM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..bb94093fd6c35edc37f4c5f7bf7f775a2b1645d1 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|9(cMqhE&XX zd&`%vSwW!f;Y#zDoH?_;2-$jV*Xs>`ef0%fPf&M*NaLRKe##cj_1yM?KutiTT|Qyang?zH3=elC&FbegTe~DWM4fH1&3K literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..332593944fb91ab8fe16485c6c6219c42b6e591b GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}2A(dCArY-_ z&lz$t7;vySe*W)%JkCSdMJMgoV>2d(gq7B%C3ehlySFt+T`c2Z2xa=}!py|dmUa)Q Om%-E3&t;ucLK6V51tAy! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/meta.json new file mode 100644 index 00000000000..398957a77be --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-3.0", + "copyright": "Made by VividPups", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/bolt-open.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/bolt-open.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/bolt-open.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-BELT.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/equipped-BELT.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/icon.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/icon.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-left.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-right.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/Inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/Inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8481ebeba260a6f2ed974888d278945113f80d79 GIT binary patch literal 583 zcmV-N0=WH&P)Px%0ZBwbRCt{2+Pi83K@^wI%}}? zT9q8r3O}!;cqQA_wUadeCA`EQ5x27NdL1;Hon!hU$F%Ssd&c+3N4M`O8K-i=DsHUg zAyjrOs<`<`w!89~4T?7&40L+EUHuUNqh71hkJrNImlxUil>ZOt_C2H9_Y7JZu#@Jl z6*U~wqGqFoxRnL|3)geo@8cE=>*EkU7Af04_L%5v+i!wnI`>h0AUp|fv2b6-GsYNW zj4{R-V@wPBTt=MW&`VJQfYqhsO-{nT2_OJSCla991Qj$u9bE!ItIJ7UP$`!Yx=a%g&E*FUO+t95+--i~Cbs;k?zV7t0e>}t V?6{Kw45a`7002ovPDHLkV1h4h{~!PW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..55a312cfe42cacf5b4c0531eb129b623540073be GIT binary patch literal 633 zcmV-<0*3vGP)Px%Gf6~2R9J<@mrG9*VHkyd$9Z~p^VI{{C`;?mQ5f%WWXr4zhU8crnY#_p9PxidD5q1yngZEn=$cu|2oUwGyU z4&ZAy{6TUE`*4@Y$SAMhzWZ;&?W{o3u_%{&yZK%)S;=Kxy}Ml%2tc3D$F6Rj0JOukTLIa7bbouy_gsKTR>LALV;ykBb^4$V~{ zGouOex=Hv_h@HbcAG2FcSJ`L+)rr=vw&wsfG6&?v`~v;`Aylml2n9puLnhaf6SoP- z^z<}8_79N#J!}Ou+aYi<)CwDLw+Ccme3Fu0=9*&A74%cm9gZxUPr2s1cWvP2jfemY z^eFiJKFXG$39M#Yi@u_|b0C#U%60V^098@g(@c&fz-l(rwh>-$56D&P2-C7LEt{7s zn-mRLX(POz1dzvxTf(2C=gGHR%>)+bW-%OL=Ha6X+>@1`^-@`!n`Qs&1_j;X&3dlZ zbDkKG`Kfyp@;j&~yjuI>DI88$AW!d4u=ndH;7~LiFS%7!Rwqv;$I(hff&o88O=Bs$ zee%Ai24re%1To44aWG7WrLAv&8}w8HNGcMMyU~HlvFq6HQ?-H`*E_0?uDqh(y`0|_ Toh@8h00000NkvXXu0mjfn^7C` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..7c4f0962ba0fac7d189b32f02f695b7262c0a1c5 GIT binary patch literal 622 zcmV-!0+IcRP)Px%C`m*?R9J<@m)lR%U>L@K-GL#X2~%S<4ksHMIufbNTb2xyjA9yt22jGg=ORi94E7gAB&Qq@uG~j;UGzYmnACld}p~nbT z=R=aKX?QP9a(I&CV|u^mD0}IE0E{}U*+5+zh{qlP;C3qHOTYT6z8eDq5PKLGInH7z zP&G{47bp8+1D(x)EG;fmu2s0EsEl}Alxrp>-QZKEzv??OaPx*w0H($ioGvF7U8o9d zr!$reLECd65(&$7$0+~~MIl?&I2AYB>6B$hc)J;pt9l7dH_&v0SBX7}DkLm~x03)8 z58aYK_cUECRm%=+tgoS(!s?^Pb+|2+pSP%NtgmtWb(ca-=j~3W)pxcSkY_9RDC7=t zpzu2R#a1|+jX<8>Un2YS2VhcEO*^>_)vJ>y%ZpUYMLcd7#cGw!^g;7`TMfv{!W^Pj z@L-~9CY$@;{x)c<1dxc&CwKi*^=&t>-={_dEuIfl1FgKS-;5gA*?6!8X8-^I07*qo IM6N<$g4n|thX4Qo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..3de79a0dad9068cbba33174486a901e4827a9ee8 GIT binary patch literal 907 zcmV;619bd}P)Px&MM*?KRCt{2n$JrcQ4q(!8=F9)(Lr`{MgLS`@WgU zOJ)FxL?R*N+0z*oqrr6J&9ZHiO zp^P$80oK>o@nCR}(&QE9Cr4S{+$OU}CO}D3*^H_{-}y#mvLlOo=K$(LP}n0AAQ6iI z0G2n(q(!O|uRm`Bpb>#Y0IJ;(Av<2gUO0_cU(ZPFxfWnyI@ehI%hi3)cOL*AC3_l= z-HPu@fab-|t!(?U_-0;w*i-;_A~+VHdGXv4KiK-T1OWK*<9o|Jor>T{fceQ$W?Y&u zE=@dtztQ4Iu~_u99voLqtnHpOo^$a}Yq}$Qwgs5Y53|#nj?1b*$4}e82JgBEp89v!7tirD0{%5@3E=hg2NjD%NDC_Nx0jM`?=2o^9K0h!vG$Q1Ktq5rD%Uj`O7o4y#onw)%y8G>2 zArU`0q$$8#)O=jVON`5UXT)u5URVI$kLUgQcKFWscE>#L)A4(?x8|GuYo8ym!d3*V z?VjMcdbKCThb639=9KWoTivI9e&8nViC(BBz~cQ$%lGg1_H^74YAU*MZHlGhA*A9- zR1bbL(pLRMF2f30f2#X+hPx%Gf6~2R9J<@mrG9*VHkyd$9Z~p^VI{{C`;?mQ5f%WWXr4zhU8crnY#_p9PxidD5q1yngZEn=$cu|2oUwGyU z4&ZAy{6TUE`*4@Y$SAMhzWZ;&?W{o3u_%{&yZK%)S;=Kxy}Ml%2tc3D$F6Rj0JOukTLIa7bbouy_gsKTR>LALV;ykBb^4$V~{ zGouOex=Hv_h@HbcAG2FcSJ`L+)rr=vw&wsfG6&?v`~v;`Aylml2n9puLnhaf6SoP- z^z<}8_79N#J!}Ou+aYi<)CwDLw+Ccme3Fu0=9*&A74%cm9gZxUPr2s1cWvP2jfemY z^eFiJKFXG$39M#Yi@u_|b0C#U%60V^098@g(@c&fz-l(rwh>-$56D&P2-C7LEt{7s zn-mRLX(POz1dzvxTf(2C=gGHR%>)+bW-%OL=Ha6X+>@1`^-@`!n`Qs&1_j;X&3dlZ zbDkKG`Kfyp@;j&~yjuI>DI88$AW!d4u=ndH;7~LiFS%7!Rwqv;$I(hff&o88O=Bs$ zee%Ai24re%1To44aWG7WrLAv&8}w8HNGcMMyU~HlvFq6HQ?-H`*E_0?uDqh(y`0|_ Toh@8h00000NkvXXu0mjfn^7C` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..abb15caff4e311f7a1a5f6e243f726fc6d17edf8 GIT binary patch literal 631 zcmV--0*L*IP)Px%F-b&0RCt{2+Rbj-KoAG;|E3@6B|Je%BC+cw1%rG`4^dAQ*Q$NaRC$LyKqUkU z##E}rq31RcA*#ys5Z2z=y8IM=f?VRoCJtiGiU5}JjTPH8K(EY^1hVZ5CFP3 zeH&Klm(QOPS1ny?wXdbW$UeG{|6}_aTzi&G|Gn4k1L-c1bg2~pAdSr$Njt#Q@mx$MQ{4D5Hz7pGYLmt; zCS2;j2g3ony+Pu6O~10)3VZsgc)5c)1OQZ2gXWJzVvCzJ(hMHh@zytU*Tj*)U^v`r zZl@+mh!^ljesMQwXsOAmN$Ulxl$$iXc8eARiyB|beG0Zgl`imAr4Nu5*gqN|*gi>y RwG03N002ovPDHLkV1nQo9q|AF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..bb873aa26119570899abb4f2f1fe20655d90a206 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}!JaOTArY-_ zFK*;Lpupo2s9x-nsWjn6y@ZNUPo}bqu)OU5(!84Vn>-8*4ikbu&gs&&=2QJ+y?uLI z*<9^IqWh!IA6k69ovTN6O2NtEyQl9lFjT*ubX{Qn}CTp9KV8FM$vg-4^ z(M~sBdT5PmmN6R+hiJIIA81nbeoXahe6Q~6h$k!!n%ab?G{dxoWg0@8wxM`exKB$( zzn>AdzgkNT3%M0ROG z>VWJ)EFuI6;3Gz!4bs?*NzF=T^?l=I-#j_-X!15FV2UG2O1yqi^U^gTRTn)WPnv?t z{ePa8J~>h8-Wh(-e;5KnQ`+Xrz^s)PcRLeT3~m zxqca?lNT_?kfy12ak2maaQ!lRg8^K>jM>2ip66-LA0Uh%iXs)s=!-wB1=u*>gb)Hr zk}RE<+<~wb6ixt;Qi3t2)d_6@x8XH__Yr(P<2bg25Rg(Xoljf9>EpwX{y2^;on_P( z(CUuS=k>~TUXV|G!(MX2qRI1bzbO9eX z|2tcUHA>L*W}X+G-96_v1=3$&H*K}EwVm6O`4egWWC05ii#xTr!C?3oya8$Xbf~u% R77YLZ002ovPDHLkV1h<&XBhwh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/M34.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/M34.rsi/meta.json new file mode 100644 index 00000000000..60b919588c3 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/M34.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/524270a5bcc1e0ea844b98c5a204986cec9721ac/icons/obj/weapons/grenade.dmi and modified by deltanedas (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "primed" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/M34.rsi/primed.png b/Resources/Textures/_NF/Objects/Weapons/M34.rsi/primed.png new file mode 100644 index 0000000000000000000000000000000000000000..2455be0117e7ec78203b260d284df83ae468b961 GIT binary patch literal 752 zcmVQn}CTp9KV8FM$vg-4^ z(M~sBdT5PmmN6R+hiJIIA81nbeoXahe6Q~6h$k!!n%ab?G{dxoWg0@8wxM`exKB$( zzn>AdzgkNT3%M0ROG z>VWJ)EFuI6;3Gz!4bs?*NzF=T^?l=I-#j_-X!15FV2UG2O1yqi^U^gTRTn)WPnv?t z{ePa8J~>h8-Whdxc~im@7)0wi^XF3j~rhfY5>Rv ziB8j0$8oHwTI-ZUd)NCY2Br2R55-A|@G1lVErf7Pwbm#G0KkttoJ}V1BM-&F96=C( zQVCf3t822P(Izsz&aojlKft_A(k4CA=l$c^JJ`lFet6ac~yx<{_AcB_Voo|wXYa8X@U zzxND>tu}gMiealwm7p7VJNci*CXjx@m)k{sadBVPF$LqE0n0hq+1jq-`Qn+>f3ks< iiPfHZxy54n6TAYUux847%FY}B0000 Date: Fri, 22 Mar 2024 16:54:44 -0500 Subject: [PATCH 03/27] Sprite fixs for Revolver and hopefully the SVT --- .../_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml index 4a74dc7823e..05f9f041251 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml @@ -7,7 +7,7 @@ - type: Sprite sprite: _NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi - type: Clothing - sprite: _NF/Objects/WeaponsGuns/Revolvers/Argenti-Revolver.rsi + sprite: _NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi - type: Gun fireRate: 2 resetOnHandSelected: false From 5e060a4e8c4047aefa2f850a4919e57ab84ee0f3 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Fri, 22 Mar 2024 17:27:14 -0500 Subject: [PATCH 04/27] Fix this --- .../Weapons/Guns/Rifles/svt40.rsi/Inhand-left.png | Bin 583 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/Inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/Inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/Inhand-left.png deleted file mode 100644 index 8481ebeba260a6f2ed974888d278945113f80d79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 583 zcmV-N0=WH&P)Px%0ZBwbRCt{2+Pi83K@^wI%}}? zT9q8r3O}!;cqQA_wUadeCA`EQ5x27NdL1;Hon!hU$F%Ssd&c+3N4M`O8K-i=DsHUg zAyjrOs<`<`w!89~4T?7&40L+EUHuUNqh71hkJrNImlxUil>ZOt_C2H9_Y7JZu#@Jl z6*U~wqGqFoxRnL|3)geo@8cE=>*EkU7Af04_L%5v+i!wnI`>h0AUp|fv2b6-GsYNW zj4{R-V@wPBTt=MW&`VJQfYqhsO-{nT2_OJSCla991Qj$u9bE!ItIJ7UP$`!Yx=a%g&E*FUO+t95+--i~Cbs;k?zV7t0e>}t V?6{Kw45a`7002ovPDHLkV1h4h{~!PW From 2a30bf9c135831596725bdbc00d56671e3f03971 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Fri, 22 Mar 2024 17:27:43 -0500 Subject: [PATCH 05/27] fix svt hiopefully --- .../Guns/Rifles/svt40.rsi/inhand-left.png.png | Bin 0 -> 583 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-left.png.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-left.png.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-left.png.png new file mode 100644 index 0000000000000000000000000000000000000000..8481ebeba260a6f2ed974888d278945113f80d79 GIT binary patch literal 583 zcmV-N0=WH&P)Px%0ZBwbRCt{2+Pi83K@^wI%}}? zT9q8r3O}!;cqQA_wUadeCA`EQ5x27NdL1;Hon!hU$F%Ssd&c+3N4M`O8K-i=DsHUg zAyjrOs<`<`w!89~4T?7&40L+EUHuUNqh71hkJrNImlxUil>ZOt_C2H9_Y7JZu#@Jl z6*U~wqGqFoxRnL|3)geo@8cE=>*EkU7Af04_L%5v+i!wnI`>h0AUp|fv2b6-GsYNW zj4{R-V@wPBTt=MW&`VJQfYqhsO-{nT2_OJSCla991Qj$u9bE!ItIJ7UP$`!Yx=a%g&E*FUO+t95+--i~Cbs;k?zV7t0e>}t V?6{Kw45a`7002ovPDHLkV1h4h{~!PW literal 0 HcmV?d00001 From 23bdbf91034ded8bdfa2d486bcbbb9f545bd0684 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Fri, 22 Mar 2024 17:31:03 -0500 Subject: [PATCH 06/27] Changes spawners back to default where it is just Arcadia stuff --- .../_NF/Entities/Markers/Spawners/mobs.yml | 128 ------------------ 1 file changed, 128 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml index fdddb8e66db..cacc1eb5b68 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml @@ -39,131 +39,3 @@ - type: ConditionalSpawner prototypes: - MobArcIndBlaster - -- type: entity - name: Salvager Spawner - id: SpawnMobSalvager - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - state: full - sprite: Mobs/Species/Human/parts.rsi - - type: ConditionalSpawner - prototypes: - - MobSalvager - -- type: entity - name: Laser Raptor Spawner - id: SpawnMobLaserRaptor - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - state: laser_raptor - sprite: Mobs/Aliens/laser_raptor.rsi - - type: ConditionalSpawner - prototypes: - - MobLaserRaptor - -- type: entity - name: RatKing Spawner - id: SpawnMobRatKing - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - state: icon - sprite: Mobs/Animals/regalrat.rsi - - type: ConditionalSpawner - prototypes: - - MobRatKing - -- type: entity - name: RatBuff Spawner - id: SpawnMobRatKingBuff - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - state: icon - sprite: Mobs/Animals/buffrat.rsi - - type: ConditionalSpawner - prototypes: - - MobRatKingBuff - -- type: entity - name: Abomination Spawner - id: SpawnMobAbomination - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - state: abomination - sprite: Mobs/Demons/abomination.rsi - - type: ConditionalSpawner - prototypes: - - MobAbomination - -- type: entity - name: Watcher Spawner - id: SpawnMobWatchers - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - state: unshaded - sprite: Mobs/Aliens/Lavaland/watcher.rsi - - type: ConditionalSpawner - prototypes: - - MobWatcherLavaland - - MobWatcherMagmawing - - MobWatcherIcewing - -- type: entity - name: KillerTomato Spawner - id: SpawnMobTomatoKillers - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - state: produce - sprite: Nyanotrasen/Mobs/Mutants/killer_tomato.rsi - - type: ConditionalSpawner - prototypes: - - MobTomatoKiller - -- type: entity - name: Dungeon SpaceDragon Spawner - id: SpawnDungeon SpaceDragon - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - state: alive - sprite: Mobs/Aliens/Carps/dragon.rsi - - type: ConditionalSpawner - prototypes: - - MobDragonDungeon - -- type: entity - name: Tarantula (Angry) Spawner - id: SpawnTarantula - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - state: tarantula - sprite: Mobs/Animals/spider.rsi - - type: ConditionalSpawner - prototypes: - - MobGiantSpiderAngry From 16b2080feded3956d046a773b6997d6fd40c7093 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Fri, 22 Mar 2024 17:50:09 -0500 Subject: [PATCH 07/27] Add # Text to the files --- .../Prototypes/Catalog/VendingMachines/Inventories/ammo.yml | 2 +- .../Catalog/VendingMachines/Inventories/janidrobe.yml | 2 +- .../Entities/Objects/Weapons/Guns/Snipers/snipers.yml | 2 +- .../_NF/Entities/Objects/Weapons/Ammunition/explosives.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml index f5ec7547579..cb852ac93c2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml @@ -8,7 +8,7 @@ MagazineBoxLightRiflePractice: 15 MagazineBoxLightRifleRubber: 15 WeaponShotgunDoubleBarreled: 15 - WhitePhosphorusGrenade: 3 + WhitePhosphorusGrenade: 3 # Add for Frontier BoxShotgunSlug: 15 BoxLethalshot: 15 BoxBeanbag: 15 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml index 4bc5e369ac8..a0a918e6deb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml @@ -1,7 +1,7 @@ - type: vendingMachineInventory id: JaniDrobeInventory startingInventory: - SpaceCleanerGrenade: 10 # For you Slips, Frontier + SpaceCleanerGrenade: 10 # For you Slips, Frontier ClothingBackpackMessengerJanitor: 2 # Frontier ClothingUniformJumpsuitJanitor: 2 ClothingUniformJumpskirtJanitor: 2 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 607d1b28e2d..19c947dfa69 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -38,7 +38,7 @@ price: 500 - type: entity - name: Kardashev-Mosin + name: Kardashev-Mosin # Mosin Rework was done for Frontier parent: BaseWeaponSniper id: WeaponSniperMosin description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml index 06d80e99033..3b9fe8cbcc9 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml @@ -40,7 +40,7 @@ - type: entity parent: SmokeGrenade id: WhitePhosphorusGrenade - name: M34 'Willie Pete' Grenade + name: M34 'Willie Pete' Grenade description: With the Team up of Kesco and A Single Arachnid, We bring you the old but, faithful Phosphorus based Smoke Incendiary Grenade. components: - type: Sprite From adc5a35b9853888cef016158538d4a941af72e45 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Fri, 22 Mar 2024 22:41:35 -0500 Subject: [PATCH 08/27] More balancing, lowing Amount of ammo use in the mosin by 5 and also change the meta.json to the right one --- .../_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml | 6 +++--- .../_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml index e51c698d1cf..5f16c8a25c4 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml @@ -8,7 +8,7 @@ whitelist: tags: - CartridgeLightRifle - capacity: 10 + capacity: 5 proto: CartridgeLightRifleRubber - type: entity @@ -32,7 +32,7 @@ - suitStorage - type: AmmoCounter - type: Gun - fireRate: 3.5 + fireRate: 3 selectedMode: SemiAuto availableModes: - SemiAuto @@ -91,7 +91,7 @@ - suitStorage - type: AmmoCounter - type: Gun - fireRate: 3.5 + fireRate: 3 selectedMode: SemiAuto availableModes: - SemiAuto diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json index 40eaed0198f..17803dfbc77 100644 --- a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi", + "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f, https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi", "states": [ { "name": "base" From 5c49e912eb4b539618a0248d0fdab8afdd1cb7a1 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Fri, 22 Mar 2024 22:44:39 -0500 Subject: [PATCH 09/27] FIX THIS TIME?????????? --- .../{inhand-left.png.png => inhand-left.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/{inhand-left.png.png => inhand-left.png} (100%) diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-left.png.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-left.png.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-left.png From 8516efaa5e4692dd12a965fa488aec515a665a3e Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Fri, 22 Mar 2024 22:50:40 -0500 Subject: [PATCH 10/27] fix now? --- .../Weapons/Ammunition/svt40.rsi/mag-0.png | Bin 153 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-0.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-0.png deleted file mode 100644 index bb873aa26119570899abb4f2f1fe20655d90a206..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}!JaOTArY-_ zFK*;Lpupo2s9x-nsWjn6y@ZNUPo}bqu)OU5(!84Vn>-8*4ikbu&gs&&=2QJ+y?uLI z*<9^IqWh!IA6k69ovTN6O2NtEyQl9lFjT*ubX{ Date: Fri, 22 Mar 2024 23:07:39 -0500 Subject: [PATCH 11/27] updates and fixs --- .../Entities/Objects/Weapons/Guns/Snipers/snipers.yml | 3 ++- .../_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 19c947dfa69..6e8d59f9318 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -80,7 +80,8 @@ - back - suitStorage sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi - price: 210 + - type: StaticPrice + price: 500 - type: entity name: Hristov diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml index 5f16c8a25c4..4b473e39e76 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml @@ -68,6 +68,8 @@ steps: 1 zeroVisible: true - type: Appearance + - type: StaticPrice + price: 1000 - type: entity id: WeaponSVTnonlethal @@ -127,3 +129,5 @@ steps: 1 zeroVisible: true - type: Appearance + - type: StaticPrice + price: 1000 From fbd2fccd51ae21461948f915bb143e47ee21a92d Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Sat, 23 Mar 2024 09:33:04 -0500 Subject: [PATCH 12/27] the FIX for the Sawn PKA --- .../inhand-left.png | Bin 9434 -> 9405 bytes .../inhand-right.png | Bin 9405 -> 9434 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-left.png index e54e8fa2cc8b2349e1fde514b18adc25af9a78aa..767ed5b8e494e6e1fe9e5f273312f3d120eb2e70 100644 GIT binary patch delta 5201 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 Date: Sun, 24 Mar 2024 09:26:27 -0500 Subject: [PATCH 13/27] Update snipers.yml --- .../_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml index 4b473e39e76..69474ebfdb8 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml @@ -15,7 +15,7 @@ id: WeaponSVT name: SVT-40 parent: BaseWeaponRifle - description: Retreating is Consider Treason + description: Magazine fed rifle chamber in .30 Cal. "Retreating is considered Treason" is carved in the wooden stock of the gun components: - type: Sprite sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi @@ -76,7 +76,7 @@ name: SVT-40 suffix: Non-lethal parent: BaseWeaponRifle - description: Retreating is Consider Treason + description: Magazine fed rifle chamber in .30 Cal. "Retreating is considered Treason" is carved in the wooden stock of the gun components: - type: Sprite sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi From cb35423522cfec04c3261a54557ae610328d3b1f Mon Sep 17 00:00:00 2001 From: VividPups <150621839+VividPups@users.noreply.github.com> Date: Sun, 24 Mar 2024 09:34:11 -0500 Subject: [PATCH 14/27] Update explosives.yml --- .../_NF/Entities/Objects/Weapons/Ammunition/explosives.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml index 3b9fe8cbcc9..63bf7483d52 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml @@ -41,7 +41,7 @@ parent: SmokeGrenade id: WhitePhosphorusGrenade name: M34 'Willie Pete' Grenade - description: With the Team up of Kesco and A Single Arachnid, We bring you the old but, faithful Phosphorus based Smoke Incendiary Grenade. + description: A collaboration of Kesco and Sam's Weaponary Emporium, brings you this old but faithful phosphorous smoke-based incendiary grenade. components: - type: Sprite sprite: _NF/Objects/Weapons/M34.rsi @@ -59,7 +59,7 @@ parent: SmokeGrenade id: SpaceCleanerGrenade name: SpaceCleaner Grenade - description: A Jani's Best Friend + description: "A Jani's Best Friend" components: - type: Sprite sprite: _NF/Objects/Weapons/CleanNade.rsi From 4b189a7a69d327a0a81947479f5dee8370df2285 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Sun, 24 Mar 2024 09:42:05 -0500 Subject: [PATCH 15/27] Not post to be in this PR --- .../Markers/Spawners/Random/event.yml | 346 ------------------ 1 file changed, 346 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/event.yml diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/event.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/event.yml deleted file mode 100644 index e5b55658840..00000000000 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/event.yml +++ /dev/null @@ -1,346 +0,0 @@ -- type: entity - id: RandomEventLootLegal - name: random EventLootLegal - suffix: Dungeon - parent: MarkerBase - components: - - type: Sprite - layers: - - state: red - - sprite: Objects/Misc/bedsheets.rsi - state: sheetUSA - - type: RandomSpawner - prototypes: - - WeaponRevolverArgenti - - CombatKnife - - WeaponPistolMk58 - - WeaponLaserGun - - WeaponRifleBB - - ClothingOuterArmorCult - - ClothingOuterArmorHeavyRed - - ClothingOuterArmorHeavyGreen - - ClothingOuterArmorHeavy - - ChemDispenserMachineCircuitboard - - RiotBulletShield - - MakeshiftShield - - RiotLaserShield - - RiotShield - - TelescopicShield - - WebShield - - BedsheetUSA - - FlatpackerMachineCircuitboard - - WeaponGauntletGorilla - - ClothingHeadHatHetmanHat - - MonkeyCubeBox - - RCD - - MedkitAdvancedFilled - - MedkitToxinFilled - - MedkitRadiationFilled - - MedkitBurnFilled - - MedkitOxygenFilled - - MedkitFilled - - ResearchAndDevelopmentServerMachineCircuitboard - - CableApcStack - - BoxMRE - - FoodTinPeachesMaint - - CigCartonBlack - - PlushieRGBee - - RPED - - MobSlimesPet - - PlushieAbductor - - ClothingHeadAreopagite - - ClothingOuterHardsuitAtmos - - ClothingBackpackWaterTank - - ClothingBeltBandolier - - BaseBallBat - - ClothingOuterHardsuitBasic - - Bible - - BikeHornImplanter - - BoxHugHealing - - FoodCabbage - - ClothingOuterHardsuitEngineeringWhite - - ClothingOuterHardsuitMedical - - ClaymoreDulled - - ClothingOuterHardsuitClown - - WeaponShotgunDoubleBarreled - - ClothingHandsGlovesCombat - - ClothingOuterHardsuitEngineering - - FireAxe - - ClothingShoesGaloshes - - HandHeldMassScanner - - BoxPerformer - - HolofanProjector - - ProtolatheHyperConvectionMachineCircuitboard - - AutolatheHyperConvectionMachineCircuitboard - - OreProcessorIndustrialMachineCircuitboard - - JetpackBlueFilled - - KatanaDulled - - Kanabou - - LightImplanter - - PlushieLoveable - - ClothingOuterHardsuitLuxury - - WeaponMakeshiftLaser - - MedicalTrackingImplanter - - MedicalTechFabCircuitboard - - MegaSprayBottle - - JetpackMiniFilled - - ClothingOuterHardsuitSalvage - - WeaponPistolMk58 - - WeaponPistolMk58Nonlethal - - MothroachCube - - PlushiePenguin - - PlasteelArmingSword - - SheetPlastic - - WeaponShotgunSawnNonlethal - - WeaponShotgunSawn - - ClothingOuterArmorScaf - - ClothingHeadHelmetScaf - - ScienceTechFabCircuitboard - - ServiceTechFabCircuitboard - - SheetifierMachineCircuitboard - - ShredderMachineCircuitboard - - Sledgehammer - - ClothingOuterHardsuitSpatio - - WeaponLaserSvalinn - - TechnologyDisk - - ClothingHeadHelmetTemplar - - SheetUranium - - ClothingNeckCloakVoid - - BoxHandcuff - - ResearchDisk5000 - - ResearchDisk - - WeaponRevolverDeckardNonlethal - - ToySword - - ClothingShoesBootsSpeed - - PinpointerUniversal - chance: 1 - rarePrototypes: - - ClothingBeltSheathFilled - - WeaponShotgunKammerer - - WeaponForceGun - - WeaponParticleDecelerator - - ClothingOuterArmorPodWars - - ClothingHeadHelmetPodWars - - ClockworkShield - - MirrorShield - - BedsheetUSA - - HypoMini - - HypoMiniLimitedEdition - - RCDRecharging - - ClothingShoesBootsSpeed - - MedkitCombatFilled - - TrashBagOfHolding - - ClothingBackpackHolding - - ClothingBackpackMessengerHolding - - ClothingBackpackDuffelHolding - - ClothingShoesBootsMagAdv - - AdvMopItem - - RGBStaff - - WeaponAdvancedLaser - - AmmoTechFabCircuitboard - - PlushieArachind - - ClothingMaskArcadia - - ClothingBeltChiefEngineerFilled - - CowToolboxFilled - - ClothingShoesBootsMagCombatFilled - - ClothingShoesBootsMagGaloshes - - Hypospray - - Katana - - WeaponLaserCannon - - MuteToxinChemistryBottle - - ClothingOuterHardsuitCap - - ClothingShoesBootsMagBlinding - - TurboItemRechargerCircuitboard - - WeaponRevolverDeckard - - MedicatedSuture - - FoodPizzaArnold - - PinpointerUniversal - - Claymore - rareChance: 0.3 - -- type: entity - id: RandomEvent Rare legal loot - name: random Event Rare Legal Loot - suffix: Dungeon - parent: MarkerBase - components: - - type: Sprite - layers: - - state: red - - sprite: Objects/Misc/bedsheets.rsi - state: sheetUSA - - type: RandomSpawner - prototypes: - - ClothingBeltSheathFilled - - SpaceCash10000 - - WeaponAntiqueLaser - - WeaponForceGun - - PenCentcom - - ClothingOuterArmorPodWars - - ClothingHeadHelmetPodWars - - ClothingOuterCoatSpaceAsshole - - UnholyHalberd - - ClockworkShield - - MirrorShield - - BedsheetUSA - - HypoMini - - HypoMiniLimitedEdition - - ClothingBackpackHolding - - ClothingShoesBootsMagAdv - - OreBagOfHolding - - ClothingShoesBootsSpeed - - ClothingBackpackDuffelHolding - - ClothingBackpackMessengerHolding - - MedkitCombatFilled - - TrashBagOfHolding - - AdvMopItem - - HandheldCrewMonitor - - WeaponAdvancedLaser - - VariedXenoArtifactItem - - ClothingMaskArcadia - - ClothingShoesBootsMagCombatFilled - - WeaponLaserCannon - - ClothingEyesHudMedSec - - PowerCellMicroreactor - - MuteToxinChemistryBottle - - SmokeGrenade - - ClothingShoesBootsMagBlinding - - TechnologyDiskRare - - Truncheon - - TurboItemRechargerCircuitboard - - ResearchDisk10000 - - MedicatedSuture - - RegenerativeMesh - - FoodPizzaArnold - - PinpointerUniversal - chance: 1 - -- type: entity - id: RandomEvent Illegal Loot spawner - name: random Illegal Loot spawner - suffix: Dungeon - parent: MarkerBase - components: - - type: Sprite - layers: - - state: red - - sprite: Objects/Misc/bedsheets.rsi - state: sheetsyndie - - type: RandomSpawner - prototypes: - - DnaScramblerImplanter - - CyberPen - - CigPackSyndicate - - WeaponRevolverPythonAP - - ClothingEyesGlassesOutlawGlasses - - SyndicatePersonalAI - - EnergySword - - WeaponPistolCobra - - EmpGrenade - - Stimpack - - ClusterGrenade - - EncryptionKeyBinary - - EnergyShield - - SyndieMiniBomb - - PenExplodingBox - - GrenadeShrapnel - - GrenadeIncendiary - - ExGrenade - - C4 - - SmokeGrenade - - GrenadeFlashBang - - ClothingShoesBootsMagSyndie - - ClothingBackpackDuffelSyndicateEVABundle - - ClothingUniformJumpskirtOperative - - ClothingOuterVestWeb - - ClothingNeckScarfStripedSyndieGreen - - ClothingUniformJumpsuitOperative - - ClothingHandsGlovesBoxingRigged - - ScramImplanter - - StorageImplanter - - ClothingHeadHatOutlawHat - - ClothingBackpackDuffelSyndicateCostumeClown - - RubberStampSyndicate - - ClothingBackpackDuffelSyndicatePyjamaBundle - - ClothingBackpackDuffelSyndicateCarpSuit - - EnergyDagger - - RevolverCapGun - - BalloonSyn - - ClothingHeadHatCatEars - - RadioJammer - - JetpackBlackFilled - - SoapSyndie - - BoxEncryptionKeySyndie - - ClothingHeadsetAltSyndicate - - HappyHonkNukieSnacks - - NukeDiskFake - - LanternFlash - - CrateFunSyndicateSegway - - SlipocalypseClusterSoap - - CombatMedipen - - BriefcaseSyndieLobbyingBundleFilled - - MedkitCombatFilled - - Emag - - ClothingBackpackDuffelSyndicateBundleSamurai - - BorgModuleSyndicateWeapon - - ClothingOuterHardsuitSyndie - - ClothingOuterHardsuitSyndieMedic - - SyndiHypo - - WeaponRifleAk - - WeaponRifleLecter - - WeaponPistolCHIMPUpgradeKit - - WeaponSniperHristov - - WeaponPistolN1984 - - WeaponLauncherPirateCannon - - ClothingHeadHelmetSwatSyndicate - - ClothingShoesBootsWinterSyndicate - - ClothingBeltMilitaryWebbingMedFilled - - EnergyKatana - - PenCentcom - - FoodPizzaArnold - - WeaponShotgunEnforcer - - SadTromboneImplanter - - PinpointerUniversal - - BluespaceBeaker - - ClothingBackpackHolding - chance: 1 - rarePrototypes: - - ClothingBackpackDuffelSyndicateFilledGrenadeLauncher - - StealthBox - - ClothingBackpackDuffelSyndicateFilledEmpGrenadeLauncher - - ClothingBackpackDuffelSyndicateFilledLMG - - ClothingBackpackDuffelSyndicateFilledShotgun - - ClothingBackpackDuffelSyndicateFilledSMG - - BriefcaseSyndieSniperBundleFilled - - ElectricalDisruptionKit - - ChemicalSynthesisKit - - ClothingOuterHardsuitSyndieElite - - EmpImplanter - - ClothingBackpackChameleonFill - - NocturineChemistryBottle - - ThievingGloves - - ScramImplanter - - ClothingOuterHardsuitJuggernaut - - WeaponPistolViper - - WhiteholeGrenade - - FireAxeFlaming - - ClothingMaskGasVoiceChameleon - - StimkitFilled - - AgentIDCard - - HypopenBox - - ReinforcementRadioSyndicateMonkey - - HypoDartBox - - BoxHoloparasite - - ReinforcementRadioSyndicate - - ClothingHandsGlovesNorthStar - - FreedomImplanter - - EnergySwordDouble - - FoodPizzaArnold - - SadTromboneImplanter - - PinpointerUniversal - - BluespaceBeaker - - ClothingBackpackHolding - - VendingMachineSyndieContraband - - ClothingBackpackDuffelSyndicateC4tBundle - - HolyHandGrenade - rarechance: .2 From 953642cfd7b8f3e71d07f950ed3a2cab57238870 Mon Sep 17 00:00:00 2001 From: VividPups <150621839+VividPups@users.noreply.github.com> Date: Sun, 24 Mar 2024 09:50:30 -0500 Subject: [PATCH 16/27] Update pistols.yml --- .../_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml index 90b0d8d27d3..68e2cd2b1c3 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml @@ -2,7 +2,7 @@ name: Valentine parent: BaseWeaponPistol id: WeaponPistolValentine - description: An Old and bloodstain this Pistol is feature with a wooden pistol grip that has S.T.A.R on it + description: An old and bloodstain, with a light blue S.T.A.R.S. medallion on the wooden grip. Seem to be chamber in .35 Auto components: - type: Sprite sprite: _NF/Objects/Weapons/Guns/Pistols/Valentine.rsi @@ -26,7 +26,7 @@ suffix: Non-lethal parent: BaseWeaponPistol id: WeaponPistolValentineNonLethal - description: An Old and bloodstain this Pistol is feature with a wooden pistol grip that has S.T.A.R on it + description: An old and bloodstain, with a light blue S.T.A.R.S. medallion on the wooden grip. Seem to be chamber in .35 Auto components: - type: Sprite sprite: _NF/Objects/Weapons/Guns/Pistols/Valentine.rsi From c66434e87f1b82880acd1ef01b850a75f9bae12e Mon Sep 17 00:00:00 2001 From: VividPups <150621839+VividPups@users.noreply.github.com> Date: Sun, 24 Mar 2024 10:06:03 -0500 Subject: [PATCH 17/27] Update snipers.yml --- .../Objects/Weapons/Guns/Guns/snipers.yml | 42 ++----------------- 1 file changed, 3 insertions(+), 39 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml index 69474ebfdb8..ae97d9c28db 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml @@ -72,36 +72,10 @@ price: 1000 - type: entity - id: WeaponSVTnonlethal - name: SVT-40 + parent: WeaponSniperSVT + id: WeaponSniperSVTNonlethal suffix: Non-lethal - parent: BaseWeaponRifle - description: Magazine fed rifle chamber in .30 Cal. "Retreating is considered Treason" is carved in the wooden stock of the gun components: - - type: Sprite - sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi - quickEquip: false - slots: - - Back - - suitStorage - - type: AmmoCounter - - type: Gun - fireRate: 3 - selectedMode: SemiAuto - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg - - type: ChamberMagazineAmmoProvider - soundRack: - path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg - type: ItemSlots slots: gun_magazine: @@ -120,14 +94,4 @@ whitelist: tags: - CartridgeLightRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance - - type: StaticPrice - price: 1000 + From 7ee9f8686a4d53bce1296593478603af38f66c6d Mon Sep 17 00:00:00 2001 From: VividPups <150621839+VividPups@users.noreply.github.com> Date: Sun, 24 Mar 2024 10:06:33 -0500 Subject: [PATCH 18/27] Update snipers.yml --- .../_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml index ae97d9c28db..00342772c04 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml @@ -12,7 +12,7 @@ proto: CartridgeLightRifleRubber - type: entity - id: WeaponSVT + id: WeaponSniperSVT name: SVT-40 parent: BaseWeaponRifle description: Magazine fed rifle chamber in .30 Cal. "Retreating is considered Treason" is carved in the wooden stock of the gun From fd09aaaf015be2ca070da53cd63b3aa9a0d42093 Mon Sep 17 00:00:00 2001 From: VividPups <150621839+VividPups@users.noreply.github.com> Date: Sun, 24 Mar 2024 10:14:31 -0500 Subject: [PATCH 19/27] Update lesslethalvend.yml --- .../_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index d13aff2eacf..ca45291b477 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -7,7 +7,7 @@ WeaponShotgunDoubleBarreledRubber: 10 WeaponFlareGun: 20 WeaponPistolValentineNonLethal: 4 - WeaponSVTnonlethal: 4 + WeaponSniperSVTnonlethal: 4 BoxDonkSoftBox: 10 BoxCartridgeCap: 10 MagazineBoxPistolRubber: 10 From a9cad04211b5cb94978b4202bf24ba18909149d3 Mon Sep 17 00:00:00 2001 From: VividPups <150621839+VividPups@users.noreply.github.com> Date: Sun, 24 Mar 2024 10:19:34 -0500 Subject: [PATCH 20/27] Update snipers.yml --- .../_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml index 00342772c04..338cc6f8da9 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml @@ -81,8 +81,6 @@ gun_magazine: name: Magazine startingItem: MagazineSVTRubber - insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg priority: 2 whitelist: tags: @@ -95,3 +93,4 @@ tags: - CartridgeLightRifle + From 8b026ad80643932cee459fff102518f92c912e12 Mon Sep 17 00:00:00 2001 From: VividPups <150621839+VividPups@users.noreply.github.com> Date: Sun, 24 Mar 2024 10:20:35 -0500 Subject: [PATCH 21/27] Update explosives.yml --- .../_NF/Entities/Objects/Weapons/Ammunition/explosives.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml index 63bf7483d52..cb9345b51c5 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml @@ -59,7 +59,7 @@ parent: SmokeGrenade id: SpaceCleanerGrenade name: SpaceCleaner Grenade - description: "A Jani's Best Friend" + description: "A Jani's best friend" components: - type: Sprite sprite: _NF/Objects/Weapons/CleanNade.rsi From f19c8c2de2ceb21c221d7bfc5ae339d4e1697e49 Mon Sep 17 00:00:00 2001 From: VividPups <150621839+VividPups@users.noreply.github.com> Date: Sun, 24 Mar 2024 10:30:44 -0500 Subject: [PATCH 22/27] Update pistols.yml --- .../Objects/Weapons/Guns/Guns/pistols.yml | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml index 68e2cd2b1c3..811b1d95728 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml @@ -2,7 +2,7 @@ name: Valentine parent: BaseWeaponPistol id: WeaponPistolValentine - description: An old and bloodstain, with a light blue S.T.A.R.S. medallion on the wooden grip. Seem to be chamber in .35 Auto + description: An old and bloodstain, with a light blue S.T.A.R.S. medallion on the wooden grip. It Seem to be chamber in .35 Auto components: - type: Sprite sprite: _NF/Objects/Weapons/Guns/Pistols/Valentine.rsi @@ -24,26 +24,10 @@ - type: entity name: Valentine suffix: Non-lethal - parent: BaseWeaponPistol + parent: WeaponPistolValentine id: WeaponPistolValentineNonLethal - description: An old and bloodstain, with a light blue S.T.A.R.S. medallion on the wooden grip. Seem to be chamber in .35 Auto + description: An old and bloodstain, with a light blue S.T.A.R.S. medallion on the wooden grip. It Seem to be chamber in .35 Auto components: - - type: Sprite - sprite: _NF/Objects/Weapons/Guns/Pistols/Valentine.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: _NF/Objects/Weapons/Guns/Pistols/Valentine.rsi - - type: AmmoCounter - - type: Gun - fireRate: 3 - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/mk58.ogg - type: ItemSlots slots: gun_magazine: From 70e699c584c68d612f5cf800dbdaa5addcce4c3d Mon Sep 17 00:00:00 2001 From: VividPups <150621839+VividPups@users.noreply.github.com> Date: Sun, 24 Mar 2024 10:40:59 -0500 Subject: [PATCH 23/27] Update lesslethalvend.yml --- .../_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index ca45291b477..1f7aa6d322b 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -7,7 +7,7 @@ WeaponShotgunDoubleBarreledRubber: 10 WeaponFlareGun: 20 WeaponPistolValentineNonLethal: 4 - WeaponSniperSVTnonlethal: 4 + WeaponSniperSVTNonlethal: 4 BoxDonkSoftBox: 10 BoxCartridgeCap: 10 MagazineBoxPistolRubber: 10 From 05f789a3013b5c77fb8be5d213265635737f3222 Mon Sep 17 00:00:00 2001 From: VividPups <150621839+VividPups@users.noreply.github.com> Date: Mon, 25 Mar 2024 08:46:04 -0500 Subject: [PATCH 24/27] Update pistols.yml --- .../_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml index 811b1d95728..332fff637fb 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml @@ -2,7 +2,7 @@ name: Valentine parent: BaseWeaponPistol id: WeaponPistolValentine - description: An old and bloodstain, with a light blue S.T.A.R.S. medallion on the wooden grip. It Seem to be chamber in .35 Auto + description: An old and bloodstain, with a light blue S.T.A.R.S. medallion on the wooden grip. It seems to use .35 Auto. components: - type: Sprite sprite: _NF/Objects/Weapons/Guns/Pistols/Valentine.rsi @@ -26,7 +26,6 @@ suffix: Non-lethal parent: WeaponPistolValentine id: WeaponPistolValentineNonLethal - description: An old and bloodstain, with a light blue S.T.A.R.S. medallion on the wooden grip. It Seem to be chamber in .35 Auto components: - type: ItemSlots slots: From b3550344c97edbbebd7342e3d1bcfc5b0e70826b Mon Sep 17 00:00:00 2001 From: VividPups <150621839+VividPups@users.noreply.github.com> Date: Mon, 25 Mar 2024 08:47:59 -0500 Subject: [PATCH 25/27] Update snipers.yml --- .../_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml index 338cc6f8da9..11f8d4794b1 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml @@ -15,7 +15,7 @@ id: WeaponSniperSVT name: SVT-40 parent: BaseWeaponRifle - description: Magazine fed rifle chamber in .30 Cal. "Retreating is considered Treason" is carved in the wooden stock of the gun + description: Magazine-fed rifle That uses .30 ammunition. "Retreating is considered Treason" is carved in the wooden stock of the gun. components: - type: Sprite sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi From 5452d84492bc09a9d9bc9705d1f4727060c2de5c Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Mon, 25 Mar 2024 09:01:38 -0500 Subject: [PATCH 26/27] remove slips nade --- .../Objects/Weapons/Ammunition/explosives.yml | 16 ---------------- .../_NF/Objects/Weapons/CleanNade.rsi/icon.png | Bin 739 -> 0 bytes .../Objects/Weapons/CleanNade.rsi/meta.json | 17 ----------------- .../Objects/Weapons/CleanNade.rsi/primed.png | Bin 710 -> 0 bytes 4 files changed, 33 deletions(-) delete mode 100644 Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/icon.png delete mode 100644 Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/primed.png diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml index cb9345b51c5..68973e7986c 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml @@ -54,19 +54,3 @@ Quantity: 10 - ReagentId: Napalm Quantity: 10 - -- type: entity - parent: SmokeGrenade - id: SpaceCleanerGrenade - name: SpaceCleaner Grenade - description: "A Jani's best friend" - components: - - type: Sprite - sprite: _NF/Objects/Weapons/CleanNade.rsi - - type: SmokeOnTrigger - duration: 5 - spreadAmount: 20 - solution: - reagents: - - ReagentId: SpaceCleaner - Quantity: 50 diff --git a/Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/icon.png deleted file mode 100644 index 1ca66989e3e80ebf50d9a2148c72720f2d43d462..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 739 zcmV<90v!E`P)Qn}CTp9KV8FM$vg-4^ z(M~sBdT5PmmN6R+hiJIIA81nbeoXahe6Q~6h$k!!n%ab?G{dxoWg0@8wxM`exKB$( zzn>AdzgkNT3%M0ROG z>VWJ)EFuI6;3Gz!4bs?*NzF=T^?l=I-#j_-X!15FV2UG2O1yqi^U^gTRTn)WPnv?t z{ePa8J~>h8-Whg`>k&a69PW;wVBFKSaKPOFu)m zB6JgkE^^LdH@U%6utB;da4x1(PYzCK!dW}yw>kaOL4|n zS=d&h)r0`0)cI`Sa%gyeW^PaKf@s_|-;*|!QV7EkQc7f5W_71i2aX?lh{j#B=*MVX ze1S0rrIdAXX8{0cU!RombC82lYW@CB0zwEQw5a43{TQ!@FHRDT4B-Z?H5g-764nAw z(c`asX_^L7N@%UOzRz0V>f^08e-j^+5-!8IH6$TsZXz?ls1iv+oPI&485lnIYU54> zrsqdi`Nr9cCm3D61NdqEX1x=EVpatCYFWwUt0jtA@pqG72T6#TcRJ3k_jo*e!x{}) Ve~=+ne^LMd002ovPDHLkV1n3lM`Zv2 diff --git a/Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/meta.json deleted file mode 100644 index 60b919588c3..00000000000 --- a/Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/524270a5bcc1e0ea844b98c5a204986cec9721ac/icons/obj/weapons/grenade.dmi and modified by deltanedas (github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "primed" - } - ] -} diff --git a/Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/primed.png b/Resources/Textures/_NF/Objects/Weapons/CleanNade.rsi/primed.png deleted file mode 100644 index f37a031dfdf482b0d8ce0910deef728b1c9112d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 710 zcmV;%0y+JOP)Qn}CTp9KV8FM$vg-4^ z(M~sBdT5PmmN6R+hiJIIA81nbeoXahe6Q~6h$k!!n%ab?G{dxoWg0@8wxM`exKB$( zzn>AdzgkNT3%M0ROG z>VWJ)EFuI6;3Gz!4bs?*NzF=T^?l=I-#j_-X!15FV2UG2O1yqi^U^gTRTn)WPnv?t z{ePa8J~>h8-WhAIOLEs+u{|pQa3^r4Y|65sE{nyje`%kV}EaYg? zKVr%7ddi#sSL~b^bQtzADDPEfU|?YQf9cXCMpDgUBF6y?3=9nHIVN!WweuqeadB}5 zazcV+2Q)M^{BQW$fFgFq&WYin%x$t9L3RjW17E*>Wl&aDCdm;bJK&NcPejNYz|F`+?%#e;kbNF$Pl@-ZK z1A&(AhXKMF>{C>S&V0Jwf|YY9OJyZ`_I07*qoM6N<$g52{x(EtDd From f6597579ba7fb284b1dadcd163ec9d918e00564b Mon Sep 17 00:00:00 2001 From: VividPups <150621839+VividPups@users.noreply.github.com> Date: Mon, 25 Mar 2024 09:27:13 -0500 Subject: [PATCH 27/27] Update janidrobe.yml --- .../Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml index a0a918e6deb..8d31c103772 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml @@ -1,7 +1,6 @@ - type: vendingMachineInventory id: JaniDrobeInventory startingInventory: - SpaceCleanerGrenade: 10 # For you Slips, Frontier ClothingBackpackMessengerJanitor: 2 # Frontier ClothingUniformJumpsuitJanitor: 2 ClothingUniformJumpskirtJanitor: 2