diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index fde874e723f..539d31c3ed7 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -5657,3 +5657,9 @@ Entries: message: Added the SBB Hammer, a medium-sized engineering shuttle. id: 5115 time: '2024-07-13T18:18:47.0000000+00:00' +- author: ErhardSteinhauer + changes: + - type: Add + message: '@mrscratch added Novalite C1 rifle chambered in .20 round.' + id: 5116 + time: '2024-07-13T21:00:10.0000000+00:00' diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl index fe42d53b1b0..6fe8952a4ba 100644 --- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl @@ -22,6 +22,7 @@ guide-entry-expedition-xenos = Xenos # Shipyard entries guide-entry-shipyard-ambition = Ambition +guide-entry-shipyard-apothecary = Apothecary guide-entry-shipyard-bazaar = Bazaar guide-entry-shipyard-bocadillo = Bocadillo guide-entry-shipyard-bookworm = Bookworm diff --git a/Resources/Maps/_NF/Shuttles/apothecary.yml b/Resources/Maps/_NF/Shuttles/apothecary.yml new file mode 100644 index 00000000000..667b3ce7bff --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/apothecary.yml @@ -0,0 +1,3282 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 3: FloorBar + 7: FloorClown + 17: FloorDark + 38: FloorDarkMono + 49: FloorGlass + 61: FloorHullReinforced + 8: FloorKitchen + 5: FloorMetalDiamond + 71: FloorMining + 13: FloorMiningDark + 73: FloorMiningLight + 4: FloorPlastic + 6: FloorShuttleWhite + 12: FloorSteelCheckerLight + 108: FloorSteelMono + 112: FloorTechMaint + 15: FloorTechMaint2 + 114: FloorTechMaint3 + 16: FloorWhite + 14: FloorWhiteDiagonal + 121: FloorWhiteMono + 11: FloorWhiteOffset + 9: FloorWhitePavement + 10: FloorWhitePlastic + 1: FloorWood + 2: FloorWoodLarge + 129: Lattice + 130: Plating + 136: TrainLattice +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.4375,-0.515625 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: eQAAAAAAeQAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAAADgAAAAAAggAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAAADgAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAiAAAAAAAiAAAAAAAiAAAAAAAiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAggAAAAAADgAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAADgAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAeQAAAAACeQAAAAADEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAeQAAAAAAeQAAAAABeQAAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAeQAAAAADeQAAAAAAeQAAAAABEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAeQAAAAACeQAAAAAAeQAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAJgAAAAACJgAAAAABJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAABAAAAAABBAAAAAADBAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAABAAAAAACBAAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAggAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAASQAAAAAAeQAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAADwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAADwAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAADwAAAAAAggAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAPQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAeQAAAAAAggAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAcAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + color: '#FFFFFFFF' + id: Bot + decals: + 26: 4,-1 + 27: 5,-1 + 28: 5,-3 + 29: 4,-3 + 30: 3,-3 + 58: 3,-1 + - node: + color: '#3EB388FF' + id: Box + decals: + 74: -4,-1 + - node: + color: '#FDFE89FF' + id: Box + decals: + 75: -5,-3 + 76: -3,-3 + - node: + color: '#334E6DC8' + id: BrickCornerOverlayNE + decals: + 0: -1,9 + - node: + color: '#A46106FF' + id: BrickCornerOverlayNE + decals: + 19: 5,-1 + - node: + color: '#334E6DC8' + id: BrickCornerOverlayNW + decals: + 4: -3,9 + - node: + color: '#A4610696' + id: BrickCornerOverlayNW + decals: + 57: 3,-1 + - node: + color: '#334E6DC8' + id: BrickCornerOverlaySE + decals: + 1: -1,8 + - node: + color: '#A46106FF' + id: BrickCornerOverlaySE + decals: + 21: 5,-3 + - node: + color: '#EFB341FF' + id: BrickCornerOverlaySE + decals: + 71: -3,-3 + - node: + color: '#334E6DC8' + id: BrickCornerOverlaySW + decals: + 5: -3,8 + - node: + color: '#A46106FF' + id: BrickCornerOverlaySW + decals: + 20: 3,-3 + - node: + color: '#EFB341FF' + id: BrickCornerOverlaySW + decals: + 70: -5,-3 + - node: + color: '#FA7500FF' + id: BrickCornerOverlaySW + decals: + 9: -4,4 + - node: + color: '#A46106FF' + id: BrickLineOverlayE + decals: + 24: 5,-2 + - node: + color: '#334E6DC8' + id: BrickLineOverlayN + decals: + 3: -2,9 + - node: + color: '#A46106FF' + id: BrickLineOverlayN + decals: + 23: 4,-1 + - node: + color: '#EFB341FF' + id: BrickLineOverlayN + decals: + 72: -4,-1 + - node: + color: '#334E6DC8' + id: BrickLineOverlayS + decals: + 2: -2,8 + - node: + color: '#A46106FF' + id: BrickLineOverlayS + decals: + 22: 4,-3 + - node: + color: '#EFB34196' + id: BrickLineOverlayW + decals: + 68: -5,-2 + - node: + color: '#EFB341FF' + id: BrickLineOverlayW + decals: + 69: -5,-2 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkEndE + decals: + 108: 1,-4 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkEndW + decals: + 105: -1,-4 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkLineN + decals: + 107: 0,-4 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkLineS + decals: + 106: 0,-4 + - node: + color: '#FFFFFFFF' + id: BrickTileSteelEndE + decals: + 109: 1,-4 + - node: + color: '#FFFFFFFF' + id: BrickTileSteelEndW + decals: + 110: -1,-4 + - node: + color: '#FFFFFFFF' + id: BrickTileSteelLineN + decals: + 112: 0,-4 + - node: + color: '#FFFFFFFF' + id: BrickTileSteelLineS + decals: + 111: 0,-4 + - node: + color: '#52B4E9FF' + id: BrickTileWhiteCornerNe + decals: + 49: 3,6 + - node: + color: '#EFB341FF' + id: BrickTileWhiteCornerNe + decals: + 65: -3,-1 + - node: + color: '#FA7500FF' + id: BrickTileWhiteCornerNe + decals: + 13: -2,6 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteCornerNe + decals: + 118: 2,2 + 125: 1,0 + - node: + color: '#52B4E9FF' + id: BrickTileWhiteCornerNw + decals: + 15: -1,6 + - node: + color: '#EFB341FF' + id: BrickTileWhiteCornerNw + decals: + 66: -5,-1 + - node: + color: '#FA7500FF' + id: BrickTileWhiteCornerNw + decals: + 6: -4,6 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteCornerNw + decals: + 101: -1,0 + 119: -2,2 + - node: + color: '#52B4E9FF' + id: BrickTileWhiteCornerSe + decals: + 16: 3,3 + - node: + color: '#FA7500FF' + id: BrickTileWhiteCornerSe + decals: + 11: -2,3 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteCornerSe + decals: + 96: 1,-2 + 116: 2,1 + - node: + color: '#52B4E9FF' + id: BrickTileWhiteCornerSw + decals: + 14: -1,3 + - node: + color: '#FA7500FF' + id: BrickTileWhiteCornerSw + decals: + 7: -4,4 + 10: -3,3 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteCornerSw + decals: + 97: -1,-2 + 117: -2,1 + - node: + color: '#52B4E996' + id: BrickTileWhiteInnerNe + decals: + 85: -1,-2 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteInnerNe + decals: + 89: 0,-1 + - node: + color: '#52B4E996' + id: BrickTileWhiteInnerNw + decals: + 84: 1,-2 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteInnerNw + decals: + 90: 0,-1 + - node: + color: '#52B4E996' + id: BrickTileWhiteInnerSe + decals: + 102: -1,0 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteInnerSe + decals: + 91: 0,-1 + - node: + color: '#52B4E996' + id: BrickTileWhiteInnerSw + decals: + 128: 1,0 + - node: + color: '#FA7500FF' + id: BrickTileWhiteInnerSw + decals: + 53: -3,4 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteInnerSw + decals: + 92: 0,-1 + - node: + color: '#52B4E996' + id: BrickTileWhiteLineE + decals: + 86: -1,-1 + - node: + color: '#52B4E9FF' + id: BrickTileWhiteLineE + decals: + 47: 3,5 + 48: 3,4 + - node: + color: '#791500FF' + id: BrickTileWhiteLineE + decals: + 103: 1,-4 + 113: 1,-4 + - node: + color: '#EFB341FF' + id: BrickTileWhiteLineE + decals: + 55: -3,-2 + - node: + color: '#FA7500FF' + id: BrickTileWhiteLineE + decals: + 12: -2,5 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteLineE + decals: + 93: 1,-1 + - node: + color: '#52B4E996' + id: BrickTileWhiteLineN + decals: + 87: 0,-2 + - node: + color: '#52B4E9FF' + id: BrickTileWhiteLineN + decals: + 17: 0,6 + 31: 3,6 + 37: 1,6 + 56: 2,6 + - node: + color: '#FA7500FF' + id: BrickTileWhiteLineN + decals: + 52: -3,6 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteLineN + decals: + 115: 1,2 + 120: -1,2 + 121: 0,2 + 126: 0,0 + - node: + color: '#52B4E996' + id: BrickTileWhiteLineS + decals: + 127: 0,0 + - node: + color: '#52B4E9FF' + id: BrickTileWhiteLineS + decals: + 18: 0,3 + 35: 1,3 + 36: 2,3 + - node: + color: '#EFB341FF' + id: BrickTileWhiteLineS + decals: + 64: -4,-3 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteLineS + decals: + 94: 0,-2 + 122: 1,1 + 123: 0,1 + 124: -1,1 + - node: + color: '#52B4E996' + id: BrickTileWhiteLineW + decals: + 88: 1,-1 + - node: + color: '#52B4E9FF' + id: BrickTileWhiteLineW + decals: + 33: -1,4 + 34: -1,5 + - node: + color: '#791500FF' + id: BrickTileWhiteLineW + decals: + 104: -1,-4 + 114: -1,-4 + - node: + color: '#A46106FF' + id: BrickTileWhiteLineW + decals: + 61: 3,-2 + - node: + color: '#EFB341FF' + id: BrickTileWhiteLineW + decals: + 62: -5,-2 + 63: -5,-2 + - node: + color: '#FA7500FF' + id: BrickTileWhiteLineW + decals: + 8: -4,5 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteLineW + decals: + 95: -1,-1 + - node: + color: '#52B4E9FF' + id: HalfTileOverlayGreyscale + decals: + 40: 1,5 + 42: 1,4 + 44: 1,3 + 46: 2,4 + 51: 0,4 + - node: + color: '#52B4E9FF' + id: HalfTileOverlayGreyscale180 + decals: + 39: 1,6 + 41: 1,5 + 43: 1,4 + 45: 0,5 + 60: 2,5 + - node: + color: '#FFFFFFFF' + id: StandClearGreyscale + decals: + 81: -1,-3 + 100: 1,-3 + - node: + color: '#FFFFFFFF' + id: WarnLineE + decals: + 25: 5,-2 + - node: + color: '#FFFFFFFF' + id: WarnLineGreyscaleN + decals: + 83: -1,-3 + 99: 1,-3 + - node: + color: '#FFFFFFFF' + id: WarnLineGreyscaleS + decals: + 82: -1,-3 + 98: 1,-3 + - node: + color: '#FFFFFFFF' + id: WarnLineN + decals: + 79: 1,-5 + 80: -1,-5 + - node: + color: '#FFFFFFFF' + id: WarnLineS + decals: + 67: -5,-2 + 73: -5,-2 + - node: + color: '#FFFFFFFF' + id: WarnLineW + decals: + 32: 3,6 + 38: 1,6 + 50: 3,6 + 59: 2,6 + 77: -1,-5 + 78: 1,-5 + - node: + color: '#52B4E996' + id: corgi + decals: + 54: -1,9 + - type: RadiationGridResistance + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 63347 + 0,-1: + 0: 49059 + -1,0: + 0: 60616 + 1: 256 + 0,1: + 0: 61439 + -1,1: + 0: 36863 + 0,2: + 1: 270 + -1,2: + 0: 238 + 1: 256 + 1,0: + 1: 8672 + 1,1: + 0: 273 + 1: 8192 + 1,2: + 1: 1 + 1,-1: + 0: 16176 + 1: 32896 + -2,0: + 1: 32994 + -2,-1: + 1: 8224 + 0: 36480 + -2,1: + 1: 32768 + -1,-1: + 0: 49080 + -2,-2: + 1: 57344 + -1,-2: + 1: 20480 + 0: 32768 + 0,-2: + 0: 8192 + 1: 16384 + 1,-2: + 1: 61440 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + chunkSize: 4 + - type: GasTileOverlay + - type: BecomesStation + id: Apothecary + - type: NavMap +- proto: AirAlarm + entities: + - uid: 34 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 + - type: DeviceList + devices: + - 365 + - 189 + - 184 + - 92 + - 107 + - 246 + - 263 + - 292 + - 129 +- proto: AirCanister + entities: + - uid: 225 + components: + - type: Transform + anchored: True + pos: -3.5,-0.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: AirlockCargo + entities: + - uid: 141 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-1.5 + parent: 1 +- proto: AirlockCommand + entities: + - uid: 148 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,7.5 + parent: 1 +- proto: AirlockEngineering + entities: + - uid: 282 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 +- proto: AirlockExternalGlass + entities: + - uid: 3 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-2.5 + parent: 1 + - type: Door + secondsUntilStateChange: -16030.429 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True + - uid: 61 + components: + - type: Transform + pos: 6.5,-1.5 + parent: 1 + - uid: 65 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-2.5 + parent: 1 + - uid: 283 + components: + - type: Transform + pos: -5.5,-1.5 + parent: 1 +- proto: AirlockGlassShuttle + entities: + - uid: 9 + components: + - type: Transform + pos: 1.5,-4.5 + parent: 1 + - uid: 139 + components: + - type: Transform + pos: -0.5,-4.5 + parent: 1 +- proto: AirSensor + entities: + - uid: 298 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,9.5 + parent: 1 +- proto: APCBasic + entities: + - uid: 224 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 +- proto: AtmosDeviceFanTiny + entities: + - uid: 63 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-1.5 + parent: 1 + - uid: 71 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,7.5 + parent: 1 + - uid: 72 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,7.5 + parent: 1 + - uid: 73 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,7.5 + parent: 1 + - uid: 76 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-4.5 + parent: 1 + - uid: 77 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-4.5 + parent: 1 + - uid: 111 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-1.5 + parent: 1 +- proto: Beaker + entities: + - uid: 369 + components: + - type: Transform + pos: -1.3774362,5.826776 + parent: 1 +- proto: BedsheetMedical + entities: + - uid: 137 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,4.5 + parent: 1 + - uid: 174 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,6.5 + parent: 1 +- proto: BlastDoorOpen + entities: + - uid: 28 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,7.5 + parent: 1 + - type: DeviceLinkSink + links: + - 296 + - uid: 29 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,7.5 + parent: 1 + - type: DeviceLinkSink + links: + - 296 + - uid: 37 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,7.5 + parent: 1 + - type: DeviceLinkSink + links: + - 296 +- proto: BoxBodyBag + entities: + - uid: 310 + components: + - type: Transform + pos: 2.6562257,2.8803794 + parent: 1 +- proto: BoxFolderRed + entities: + - uid: 309 + components: + - type: Transform + pos: 0.07594597,1.5664117 + parent: 1 +- proto: BoxVial + entities: + - uid: 171 + components: + - type: Transform + pos: -1.4840567,6.2677608 + parent: 1 +- proto: ButtonFrameExit + entities: + - uid: 276 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 +- proto: ButtonFrameGrey + entities: + - uid: 220 + components: + - type: Transform + pos: -3.5,7.5 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 15 + components: + - type: Transform + pos: -2.5,-1.5 + parent: 1 + - uid: 16 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 30 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 32 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 66 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 67 + components: + - type: Transform + pos: -0.5,3.5 + parent: 1 + - uid: 74 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 + - uid: 88 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 89 + components: + - type: Transform + pos: -3.5,-1.5 + parent: 1 + - uid: 124 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 1 + - uid: 126 + components: + - type: Transform + pos: 1.5,4.5 + parent: 1 + - uid: 155 + components: + - type: Transform + pos: 4.5,-1.5 + parent: 1 + - uid: 156 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 + - uid: 169 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - uid: 201 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 + - uid: 206 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 + - uid: 207 + components: + - type: Transform + pos: 3.5,4.5 + parent: 1 + - uid: 208 + components: + - type: Transform + pos: -0.5,4.5 + parent: 1 + - uid: 209 + components: + - type: Transform + pos: -1.5,4.5 + parent: 1 + - uid: 210 + components: + - type: Transform + pos: -2.5,4.5 + parent: 1 + - uid: 211 + components: + - type: Transform + pos: 3.5,5.5 + parent: 1 + - uid: 212 + components: + - type: Transform + pos: 3.5,6.5 + parent: 1 + - uid: 238 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - uid: 250 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 + - uid: 265 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 268 + components: + - type: Transform + pos: 5.5,-1.5 + parent: 1 + - uid: 288 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 1 + - uid: 307 + components: + - type: Transform + pos: 7.5,-0.5 + parent: 1 + - uid: 308 + components: + - type: Transform + pos: 7.5,-1.5 + parent: 1 + - uid: 311 + components: + - type: Transform + pos: 7.5,-2.5 + parent: 1 + - uid: 342 + components: + - type: Transform + pos: 6.5,-1.5 + parent: 1 + - uid: 343 + components: + - type: Transform + pos: -6.5,-0.5 + parent: 1 + - uid: 344 + components: + - type: Transform + pos: -6.5,-1.5 + parent: 1 + - uid: 345 + components: + - type: Transform + pos: -6.5,-2.5 + parent: 1 + - uid: 346 + components: + - type: Transform + pos: -5.5,-1.5 + parent: 1 + - uid: 347 + components: + - type: Transform + pos: -4.5,-1.5 + parent: 1 + - uid: 348 + components: + - type: Transform + pos: -0.5,5.5 + parent: 1 + - uid: 349 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 + - uid: 350 + components: + - type: Transform + pos: -0.5,7.5 + parent: 1 +- proto: CableHV + entities: + - uid: 11 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 1 + - uid: 12 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 1 + - uid: 13 + components: + - type: Transform + pos: -2.5,0.5 + parent: 1 + - uid: 22 + components: + - type: Transform + pos: -3.5,-1.5 + parent: 1 + - uid: 203 + components: + - type: Transform + pos: -4.5,-2.5 + parent: 1 + - uid: 223 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 1 + - uid: 235 + components: + - type: Transform + pos: -3.5,-2.5 + parent: 1 +- proto: CableMV + entities: + - uid: 7 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 1 + - uid: 180 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 1 + - uid: 200 + components: + - type: Transform + pos: -2.5,0.5 + parent: 1 +- proto: CableTerminal + entities: + - uid: 199 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-2.5 + parent: 1 + - uid: 226 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-2.5 + parent: 1 +- proto: Catwalk + entities: + - uid: 18 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-1.5 + parent: 1 + - uid: 19 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-1.5 + parent: 1 + - uid: 144 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,8.5 + parent: 1 + - uid: 145 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,8.5 + parent: 1 + - uid: 146 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,8.5 + parent: 1 + - uid: 147 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,8.5 + parent: 1 +- proto: ChairGreyscale + entities: + - uid: 300 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 + - uid: 301 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-0.5 + parent: 1 +- proto: ChairOfficeDark + entities: + - uid: 356 + components: + - type: Transform + pos: -0.17796904,2.4698343 + parent: 1 +- proto: ChairPilotSeat + entities: + - uid: 153 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,8.5 + parent: 1 + - uid: 316 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,8.5 + parent: 1 +- proto: ChemDispenser + entities: + - uid: 341 + components: + - type: Transform + pos: -3.5,6.5 + parent: 1 +- proto: ChemistryHotplate + entities: + - uid: 119 + components: + - type: Transform + pos: -1.5,6.5 + parent: 1 + - type: ItemPlacer + placedEntities: + - 221 + - type: PlaceableSurface + isPlaceable: False +- proto: ChemMaster + entities: + - uid: 122 + components: + - type: Transform + pos: -3.5,5.5 + parent: 1 +- proto: ClosetWall + entities: + - uid: 279 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,2.5 + parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.8856695 + - 7.0937095 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - uid: 325 + components: + - type: Transform + pos: 3.5,0.5 + parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - uid: 335 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - uid: 373 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-2.5 + parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: ClothingBeltUtilityFilled + entities: + - uid: 312 + components: + - type: Transform + pos: -2.650367,-1.544992 + parent: 1 +- proto: ClothingEyesGlassesChemical + entities: + - uid: 318 + components: + - type: Transform + pos: -1.4786649,5.3736095 + parent: 1 +- proto: ClothingEyesHudMedical + entities: + - uid: 315 + components: + - type: Transform + pos: 3.3001947,3.8460212 + parent: 1 +- proto: ClothingOuterCoatLabChem + entities: + - uid: 357 + components: + - type: Transform + pos: -1.7466118,4.912344 + parent: 1 +- proto: ComputerTabletopCrewMonitoring + entities: + - uid: 375 + components: + - type: Transform + pos: -1.5,9.5 + parent: 1 +- proto: ComputerTabletopShuttle + entities: + - uid: 192 + components: + - type: Transform + pos: -0.5,9.5 + parent: 1 +- proto: ComputerTabletopStationRecords + entities: + - uid: 228 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,8.5 + parent: 1 +- proto: ComputerWallmountWithdrawBankATM + entities: + - uid: 321 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + - type: Physics + canCollide: False + - type: ContainerContainer + containers: + board: !type:Container + ents: [] + bank-ATM-cashSlot: !type:ContainerSlot {} + - type: ItemSlots +- proto: CrateChemistryD + entities: + - uid: 363 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 1 +- proto: CrateChemistryP + entities: + - uid: 362 + components: + - type: Transform + pos: 5.5,-2.5 + parent: 1 +- proto: CrateChemistryS + entities: + - uid: 361 + components: + - type: Transform + pos: 4.5,-2.5 + parent: 1 +- proto: CrateChemistrySupplies + entities: + - uid: 322 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 +- proto: CrateFreezer + entities: + - uid: 163 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 +- proto: DefibrillatorCabinetFilled + entities: + - uid: 168 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,2.5 + parent: 1 +- proto: EmergencyLight + entities: + - uid: 172 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,1.5 + parent: 1 + - uid: 327 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-2.5 + parent: 1 + - uid: 328 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-2.5 + parent: 1 + - uid: 329 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,8.5 + parent: 1 + - uid: 332 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-0.5 + parent: 1 +- proto: EmergencyRollerBed + entities: + - uid: 334 + components: + - type: Transform + pos: 2.5494843,3.5438738 + parent: 1 +- proto: ExtinguisherCabinetFilled + entities: + - uid: 256 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,0.5 + parent: 1 +- proto: FaxMachineShip + entities: + - uid: 176 + components: + - type: Transform + pos: -2.5,9.5 + parent: 1 +- proto: FirelockGlass + entities: + - uid: 38 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,7.5 + parent: 1 + - uid: 131 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 + - uid: 133 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-1.5 + parent: 1 +- proto: FloorDrain + entities: + - uid: 360 + components: + - type: Transform + pos: -2.5,5.5 + parent: 1 + - type: Fixtures + fixtures: {} + - uid: 366 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 + - type: Fixtures + fixtures: {} +- proto: GasPassiveVent + entities: + - uid: 275 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeBend + entities: + - uid: 123 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 173 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 183 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 245 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 323 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 359 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeStraight + entities: + - uid: 2 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 36 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 55 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 57 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 106 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 121 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 135 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 150 + components: + - type: Transform + pos: -0.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 159 + components: + - type: Transform + pos: -2.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 170 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 177 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 179 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 187 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 188 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 193 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 195 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 196 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 204 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 214 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 219 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 222 + components: + - type: Transform + pos: -2.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 227 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 233 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 241 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 242 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 244 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 247 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeTJunction + entities: + - uid: 27 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 64 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 132 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 186 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 205 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 231 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 240 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 286 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPort + entities: + - uid: 216 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 1 +- proto: GasPressurePumpOn + entities: + - uid: 91 + components: + - type: Transform + pos: -3.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentPump + entities: + - uid: 107 + components: + - type: Transform + pos: -4.5,-1.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 34 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 129 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,6.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 34 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 184 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,8.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 34 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 263 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-0.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 34 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 364 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentScrubber + entities: + - uid: 92 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 34 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 189 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-2.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 34 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 246 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-1.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 34 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 292 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,6.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 34 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 365 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,2.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 34 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GravityGeneratorMini + entities: + - uid: 175 + components: + - type: Transform + pos: -4.5,-0.5 + parent: 1 +- proto: Grille + entities: + - uid: 96 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,10.5 + parent: 1 + - uid: 97 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,10.5 + parent: 1 + - uid: 98 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,10.5 + parent: 1 + - uid: 99 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,9.5 + parent: 1 + - uid: 100 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,8.5 + parent: 1 + - uid: 101 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,9.5 + parent: 1 + - uid: 102 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,8.5 + parent: 1 + - uid: 103 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,6.5 + parent: 1 + - uid: 104 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,5.5 + parent: 1 + - uid: 105 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,4.5 + parent: 1 + - uid: 108 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,4.5 + parent: 1 + - uid: 109 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,5.5 + parent: 1 + - uid: 110 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,6.5 + parent: 1 + - uid: 294 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 +- proto: GrilleDiagonal + entities: + - uid: 94 + components: + - type: Transform + pos: -3.5,10.5 + parent: 1 + - uid: 95 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,10.5 + parent: 1 +- proto: HandheldHealthAnalyzerUnpowered + entities: + - uid: 314 + components: + - type: Transform + rot: 6.283185307179586 rad + pos: 3.8157191,3.8739676 + parent: 1 +- proto: HandLabeler + entities: + - uid: 167 + components: + - type: Transform + pos: -1.7798774,5.744085 + parent: 1 +- proto: HospitalCurtainsOpen + entities: + - uid: 164 + components: + - type: Transform + pos: 4.5,4.5 + parent: 1 + - uid: 260 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,6.5 + parent: 1 +- proto: KitchenMicrowave + entities: + - uid: 215 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 +- proto: KitchenReagentGrinder + entities: + - uid: 120 + components: + - type: Transform + pos: -1.5,4.5 + parent: 1 +- proto: LargeBeaker + entities: + - uid: 221 + components: + - type: Transform + rot: 6.283185307179586 rad + pos: -1.5493114,6.8580256 + parent: 1 + - type: CollisionWake + enabled: False +- proto: LockerMedicineFilled + entities: + - uid: 290 + components: + - type: Transform + pos: 4.5,5.5 + parent: 1 +- proto: LockerWallMedical + entities: + - uid: 128 + components: + - type: Transform + pos: -2.5,7.5 + parent: 1 + - type: Lock + locked: False + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LuxuryPen + entities: + - uid: 251 + components: + - type: Transform + pos: -2.2429202,9.063046 + parent: 1 +- proto: MachineCentrifuge + entities: + - uid: 185 + components: + - type: Transform + pos: -1.5,5.5 + parent: 1 +- proto: MachineElectrolysisUnit + entities: + - uid: 269 + components: + - type: Transform + pos: -3.5,4.5 + parent: 1 +- proto: MedicalBed + entities: + - uid: 178 + components: + - type: Transform + pos: 4.5,4.5 + parent: 1 + - uid: 181 + components: + - type: Transform + pos: 4.5,6.5 + parent: 1 +- proto: MedicalTechFab + entities: + - uid: 354 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 +- proto: PaperBin10 + entities: + - uid: 191 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.7045135,9.029007 + parent: 1 +- proto: PaperBin20 + entities: + - uid: 218 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 +- proto: Pen + entities: + - uid: 370 + components: + - type: Transform + pos: -0.549054,1.5976616 + parent: 1 +- proto: PillCanister + entities: + - uid: 182 + components: + - type: Transform + pos: -1.3303041,2.0039113 + parent: 1 +- proto: PortableGeneratorPacmanShuttle + entities: + - uid: 160 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 1 + - type: FuelGenerator + on: False + - type: Physics + bodyType: Static +- proto: PosterLegitAnatomyPoster + entities: + - uid: 324 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,3.5 + parent: 1 +- proto: PosterLegitNanotrasenLogo + entities: + - uid: 234 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,1.5 + parent: 1 + - uid: 248 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,1.5 + parent: 1 +- proto: PosterLegitSafetyMothMeth + entities: + - uid: 291 + components: + - type: Transform + pos: -1.5,7.5 + parent: 1 +- proto: PosterLegitSMHardhats + entities: + - uid: 249 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,0.5 + parent: 1 +- proto: PottedPlant15 + entities: + - uid: 194 + components: + - type: Transform + pos: -1.3292966,1.4660685 + parent: 1 +- proto: PottedPlant18 + entities: + - uid: 198 + components: + - type: Transform + pos: -1.7355466,1.7473185 + parent: 1 +- proto: PowerCellRecharger + entities: + - uid: 317 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,3.5 + parent: 1 +- proto: Poweredlight + entities: + - uid: 10 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-4.5 + parent: 1 + - uid: 20 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-4.5 + parent: 1 + - uid: 138 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-3.5 + parent: 1 + - uid: 237 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,8.5 + parent: 1 + - uid: 239 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,2.5 + parent: 1 + - uid: 255 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,4.5 + parent: 1 + - uid: 299 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,2.5 + parent: 1 + - uid: 305 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1 + - uid: 368 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,4.5 + parent: 1 +- proto: PoweredlightBlue + entities: + - uid: 4 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,8.5 + parent: 1 +- proto: PoweredlightGreen + entities: + - uid: 151 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-2.5 + parent: 1 +- proto: PoweredlightRed + entities: + - uid: 165 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-2.5 + parent: 1 +- proto: PoweredlightSodium + entities: + - uid: 136 + components: + - type: Transform + pos: 4.5,-0.5 + parent: 1 + - uid: 166 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 1 +- proto: SheetPlasma1 + entities: + - uid: 230 + components: + - type: Transform + pos: -2.541231,-2.3959513 + parent: 1 + - type: Stack + count: 5 +- proto: ShuttersNormalOpen + entities: + - uid: 6 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,5.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 11 + links: + - 331 + - uid: 75 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,5.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 11 + links: + - 331 + - uid: 93 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,6.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 11 + links: + - 331 + - uid: 127 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,4.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 11 + links: + - 331 + - uid: 326 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,6.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 11 + links: + - 331 + - uid: 333 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,4.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 11 + links: + - 331 +- proto: ShuttleWindow + entities: + - uid: 42 + components: + - type: Transform + pos: 5.5,4.5 + parent: 1 + - uid: 43 + components: + - type: Transform + pos: 5.5,5.5 + parent: 1 + - uid: 44 + components: + - type: Transform + pos: 5.5,6.5 + parent: 1 + - uid: 45 + components: + - type: Transform + pos: -4.5,4.5 + parent: 1 + - uid: 46 + components: + - type: Transform + pos: -4.5,5.5 + parent: 1 + - uid: 47 + components: + - type: Transform + pos: -4.5,6.5 + parent: 1 + - uid: 78 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,8.5 + parent: 1 + - uid: 80 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,9.5 + parent: 1 + - uid: 81 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,8.5 + parent: 1 + - uid: 82 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,9.5 + parent: 1 + - uid: 83 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,10.5 + parent: 1 + - uid: 84 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,10.5 + parent: 1 + - uid: 85 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,10.5 + parent: 1 + - uid: 197 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 +- proto: ShuttleWindowDiagonal + entities: + - uid: 86 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,10.5 + parent: 1 + - uid: 87 + components: + - type: Transform + pos: -3.5,10.5 + parent: 1 +- proto: SignalButton + entities: + - uid: 296 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 37: + - Pressed: Toggle + 29: + - Pressed: Toggle + 28: + - Pressed: Toggle + invalid: [] + - uid: 331 + components: + - type: Transform + pos: -3.5,7.5 + parent: 1 + - type: SignalSwitch + state: True + - type: DeviceLinkSource + linkedPorts: + 93: + - Pressed: Toggle + 6: + - Pressed: Toggle + 127: + - Pressed: Toggle + 326: + - Pressed: Toggle + 75: + - Pressed: Toggle + 333: + - Pressed: Toggle +- proto: SignEVA + entities: + - uid: 337 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-2.5 + parent: 1 + - uid: 340 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-2.5 + parent: 1 +- proto: SignMedical + entities: + - uid: 319 + components: + - type: Transform + pos: 4.5,7.5 + parent: 1 + - uid: 372 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-4.5 + parent: 1 +- proto: SignShipDock + entities: + - uid: 289 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 1 + - uid: 313 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 1 +- proto: SignSpace + entities: + - uid: 149 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-0.5 + parent: 1 + - uid: 257 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-0.5 + parent: 1 +- proto: SinkStemlessWater + entities: + - uid: 217 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,3.5 + parent: 1 +- proto: SmallGyroscope + entities: + - uid: 252 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-0.5 + parent: 1 +- proto: SmallThruster + entities: + - uid: 158 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-4.5 + parent: 1 + - type: ApcPowerReceiver + powerLoad: 1 + - uid: 213 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-4.5 + parent: 1 + - uid: 336 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-2.5 + parent: 1 + - type: ApcPowerReceiver + powerLoad: 1 + - uid: 339 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-0.5 + parent: 1 + - uid: 355 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-0.5 + parent: 1 + - uid: 358 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-2.5 + parent: 1 +- proto: SMESBasic + entities: + - uid: 157 + components: + - type: Transform + pos: -3.5,-2.5 + parent: 1 +- proto: SpawnPointLatejoin + entities: + - uid: 303 + components: + - type: Transform + pos: -2.5,4.5 + parent: 1 +- proto: SubstationWallBasic + entities: + - uid: 21 + components: + - type: Transform + pos: -2.5,0.5 + parent: 1 +- proto: SuitStorageParamedic + entities: + - uid: 297 + components: + - type: Transform + pos: 4.5,-0.5 + parent: 1 + - uid: 306 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 1 +- proto: TableCounterMetal + entities: + - uid: 134 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,3.5 + parent: 1 +- proto: TableReinforced + entities: + - uid: 14 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,4.5 + parent: 1 + - uid: 90 + components: + - type: Transform + pos: -1.5,9.5 + parent: 1 + - uid: 113 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,6.5 + parent: 1 + - uid: 114 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,5.5 + parent: 1 + - uid: 115 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,4.5 + parent: 1 + - uid: 162 + components: + - type: Transform + pos: -0.5,9.5 + parent: 1 + - uid: 229 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 + - uid: 302 + components: + - type: Transform + pos: -2.5,8.5 + parent: 1 + - uid: 320 + components: + - type: Transform + pos: -2.5,9.5 + parent: 1 + - uid: 351 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 352 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 353 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 +- proto: Thruster + entities: + - uid: 202 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-4.5 + parent: 1 + - uid: 270 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-4.5 + parent: 1 + - uid: 277 + components: + - type: Transform + pos: 6.5,1.5 + parent: 1 + - uid: 293 + components: + - type: Transform + pos: -5.5,1.5 + parent: 1 +- proto: ToyFigurineChemist + entities: + - uid: 338 + components: + - type: Transform + pos: -0.95798266,1.6954913 + parent: 1 +- proto: VendingMachineWallMedical + entities: + - uid: 112 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,3.5 + parent: 1 +- proto: WallShuttle + entities: + - uid: 5 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-3.5 + parent: 1 + - uid: 8 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-2.5 + parent: 1 + - uid: 17 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-3.5 + parent: 1 + - uid: 23 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,7.5 + parent: 1 + - uid: 24 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,7.5 + parent: 1 + - uid: 25 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,0.5 + parent: 1 + - uid: 26 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,0.5 + parent: 1 + - uid: 31 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,0.5 + parent: 1 + - uid: 33 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,2.5 + parent: 1 + - uid: 35 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,0.5 + parent: 1 + - uid: 39 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,0.5 + parent: 1 + - uid: 40 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,2.5 + parent: 1 + - uid: 41 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,0.5 + parent: 1 + - uid: 60 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-2.5 + parent: 1 + - uid: 62 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-2.5 + parent: 1 + - uid: 70 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,3.5 + parent: 1 + - uid: 79 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,3.5 + parent: 1 + - uid: 125 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,0.5 + parent: 1 + - uid: 140 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,0.5 + parent: 1 + - uid: 142 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-0.5 + parent: 1 + - uid: 143 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,0.5 + parent: 1 + - uid: 152 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,7.5 + parent: 1 + - uid: 154 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,1.5 + parent: 1 + - uid: 190 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 1 + - uid: 232 + components: + - type: Transform + pos: 3.5,1.5 + parent: 1 + - uid: 236 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,0.5 + parent: 1 + - uid: 253 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-0.5 + parent: 1 + - uid: 254 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-3.5 + parent: 1 + - uid: 258 + components: + - type: Transform + pos: 5.5,-3.5 + parent: 1 + - uid: 259 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 1 + - uid: 261 + components: + - type: Transform + pos: 6.5,-3.5 + parent: 1 + - uid: 262 + components: + - type: Transform + pos: -4.5,-3.5 + parent: 1 + - uid: 264 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,0.5 + parent: 1 + - uid: 266 + components: + - type: Transform + pos: 4.5,-3.5 + parent: 1 + - uid: 267 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-3.5 + parent: 1 + - uid: 271 + components: + - type: Transform + pos: -3.5,-3.5 + parent: 1 + - uid: 273 + components: + - type: Transform + pos: -5.5,-3.5 + parent: 1 + - uid: 274 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-3.5 + parent: 1 + - uid: 278 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-0.5 + parent: 1 + - uid: 280 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-2.5 + parent: 1 + - uid: 281 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-0.5 + parent: 1 + - uid: 284 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,7.5 + parent: 1 + - uid: 285 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,7.5 + parent: 1 + - uid: 287 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,0.5 + parent: 1 + - uid: 295 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 1 + - uid: 330 + components: + - type: Transform + pos: 0.5,-4.5 + parent: 1 +- proto: WallShuttleDiagonal + entities: + - uid: 48 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,2.5 + parent: 1 + - uid: 49 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,3.5 + parent: 1 + - uid: 50 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,2.5 + parent: 1 + - uid: 51 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,3.5 + parent: 1 + - uid: 52 + components: + - type: Transform + pos: 5.5,1.5 + parent: 1 + - uid: 53 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,1.5 + parent: 1 + - uid: 54 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-4.5 + parent: 1 + - uid: 56 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-4.5 + parent: 1 + - uid: 58 + components: + - type: Transform + pos: -6.5,1.5 + parent: 1 + - uid: 59 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,1.5 + parent: 1 + - uid: 68 + components: + - type: Transform + pos: -4.5,7.5 + parent: 1 + - uid: 69 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,7.5 + parent: 1 + - uid: 243 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-4.5 + parent: 1 + - uid: 272 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-4.5 + parent: 1 +- proto: WarpPointShip + entities: + - uid: 304 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,6.5 + parent: 1 +- proto: WindowDirectional + entities: + - uid: 116 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,6.5 + parent: 1 + - uid: 117 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,5.5 + parent: 1 + - uid: 118 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,4.5 + parent: 1 + - uid: 130 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,4.5 + parent: 1 + - uid: 161 + components: + - type: Transform + pos: 4.5,6.5 + parent: 1 +... diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml index ce4eec0e60c..c3575452d2a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml @@ -6,6 +6,8 @@ WeaponSniperMosin: 10 WeaponSniperRepeater: 10 WeaponSubMachineGunVector45: 3 #FrontierCorvax + WeaponRifleGestio: 10 + WeaponRifleNovaliteC1: 5 MagazineBoxLightRifle: 10 MagazineBoxLightRiflePractice: 10 MagazineVector45: 5 #FrontierCorvax @@ -18,11 +20,11 @@ BoxShotgunSlug: 10 BoxLethalshot: 10 BoxBeanbag: 10 - BoxShotgunPractice: 10 MagazineBoxRifle: 10 MagazineBoxRifleRubber: 15 MagazineBoxMagnum: 10 - SpeedLoaderRifleHeavy: 10 - SpeedLoaderRifleHeavyRubber: 10 + SpeedLoaderRifleHeavyEmpty: 10 + MagazineNovaliteC1Empty: 10 + MagazineRifleLowCapacityEmpty: 10 emaggedInventory: WeaponPistolViper: 1 diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml index 1ebbe75cc60..99815bb9764 100644 --- a/Resources/Prototypes/Procedural/salvage_factions.yml +++ b/Resources/Prototypes/Procedural/salvage_factions.yml @@ -323,7 +323,7 @@ amount: 1 prob: 0.1 - entries: - - id: MobMercenarySoldierMosin + - id: MobMercenarySoldierNovalite amount: 2 maxAmount: 4 prob: 0.05 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml index d5638fd38e3..397be0d55dd 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml @@ -97,7 +97,7 @@ - type: entity parent: MercenaryDuffelGiftBox - id: ClothingBackpackDuffelMecranaryTier1Mosin + id: ClothingBackpackDuffelMecranaryTier1Novalite noSpawn: true components: - type: SpawnItemsOnUse @@ -110,7 +110,7 @@ - id: SpaceCash500 prob: 0.45 # Weapons - - id: WeaponSniperMosin + - id: WeaponRifleNovaliteC1 prob: 0.9 # Armor - id: ClothingOuterVestWebMercenary @@ -137,14 +137,20 @@ - type: entity parent: MercenaryWebbingBox - id: ClothingBeltWebbingMecranaryTier1Mosin + id: ClothingBeltWebbingMecranaryTier1Novalite noSpawn: true components: - type: SpawnItemsOnUse items: - - id: MagazineBoxLightRifle + - id: MagazineBoxRifle + prob: 0.9 + - id: MagazineNovaliteC1Empty + prob: 0.9 + - id: MagazineNovaliteC1Empty prob: 0.9 - - id: MagazineBoxLightRifleBig + - id: MagazineNovaliteC1 + prob: 0.2 + - id: MagazineBoxRifleBig prob: 0.2 sound: path: /Audio/Items/jumpsuit_equip.ogg diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml index 7a87e839d47..bed71b7d554 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml @@ -263,6 +263,19 @@ - id: MagazineRifleLowCapacity amount: 3 +- type: entity + parent: WeaponCaseLong + id: WeaponCaseLongWeaponRifleNovaliteC1Expedition + suffix: Dungeon, NovaliteC1 + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponRifleNovaliteC1Expedition + amount: 1 + - id: MagazineNovaliteC1 + amount: 2 + - type: entity parent: WeaponCaseLong id: WeaponCaseLongLecterExpedition diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index 9086abe8c7d..ea66484677a 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -2,7 +2,7 @@ id: LessLethalVendInventory startingInventory: WeaponDisabler: 10 - Kardashev-MosinNonlethal: 10 +# Kardashev-MosinNonlethal: 10 WeaponRevolverArgentiNonlethal: 10 WeaponShotgunDoubleBarreledRubber: 10 WeaponFlareGun: 20 diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml index c793cb2d795..5ddff0e8283 100644 --- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml @@ -229,7 +229,7 @@ name: uplink-security-emitter-name description: uplink-security-emitter-desc productEntity: WeaponEmpEmitter - icon: { sprite: _NF/Objects/Weapons/EMP-Gun.rsi, state: icon } + icon: { sprite: _NF/Objects/Weapons/Guns/Projectiles/emp.rsi, state: icon } cost: FrontierUplinkCoin: 1 categories: diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml index 2e61b05527b..e3e1f80bb7e 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml @@ -162,6 +162,21 @@ - sprite: _NF/Objects/Weapons/Gestio-Rifle.rsi state: wielded-inhand-right +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorMercNovalite + name: combat gloves + suffix: novalite + noSpawn: true + components: + - type: Clothing + clothingVisuals: + gloves: + - sprite: Clothing/Hands/Gloves/mercbattle.rsi + state: equipped-HAND + - sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi + state: wielded-inhand-right + - type: entity parent: ClothingHandsGlovesColorBlackSMG id: ClothingHandsGlovesColorMercHatchet diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml index 8975ad6b497..78aec57f96a 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml @@ -179,6 +179,7 @@ - WeaponCaseShortDeckardExpedition - WeaponCaseShortPython - WeaponCaseLongGestioExpedition + - WeaponCaseLongWeaponRifleNovaliteC1Expedition - WeaponCaseLongKammererExpedition - WeaponCaseLongEnergyGunExpedition - WeaponCaseLongRepeaterExpedition diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_mercenaries.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_mercenaries.yml index d6c309d5a28..44137932c49 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_mercenaries.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_mercenaries.yml @@ -29,7 +29,7 @@ prototypes: - MobMercenarySoldierKnife - MobMercenarySoldierPistol - - MobMercenarySoldierMosin + - MobMercenarySoldierNovalite chance: 1 offset: 0.0 rarePrototypes: diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml index 4d975cc9b87..57e51292435 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml @@ -151,7 +151,7 @@ - type: entity name: mercenary soldier parent: MobMercenaryBase - id: MobMercenarySoldierMosin + id: MobMercenarySoldierNovalite # No mosin: novalite rifle now description: Low-ranking soldiers armed with a variety of surplus weapons. noSpawn: true components: @@ -179,18 +179,18 @@ color: "#a9b6bd" shader: unshaded - type: BasicEntityAmmoProvider - proto: CartridgeLightRifle + proto: CartridgeRifle capacity: 10 count: 10 - type: Gun showExamineText: false - fireRate: 0.65 + fireRate: 0.85 minAngle: 1 maxAngle: 10 selectedMode: SemiAuto availableModes: - SemiAuto - soundGunshot: /Audio/Weapons/Guns/Gunshots/sniper.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg ## Tier 2 - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index a61a9c66969..0bea7905ab4 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -24,7 +24,7 @@ proto: CartridgeLightRifle capacity: 10 - type: Sprite - sprite: _NF/Objects/Weapons/Ammunition/svt40.rsi + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi - type: entity id: 10roundmagazineempty @@ -49,19 +49,19 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -# type: entity to be added back when Rubber rounds are added. - # id: 10roundmagazineRubber - #name: "10 round magazine(.30 rifle rubber)" - #parent: 10roundmagazine - #components: - # type: BallisticAmmoProvider - # proto: CartridgeLightRifleRubber - #type: Sprite - #layers: - # state: rubber - #map: ["enum.GunVisualLayers.Base"] - #state: mag-1 - #map: ["enum.GunVisualLayers.Mag"] +- type: entity + id: 10roundmagazineRubber + name: "10 round magazine(.30 rifle rubber)" + parent: 10roundmagazine + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] - type: entity id: 10roundmagazinePractice @@ -85,4 +85,4 @@ - type: BallisticAmmoProvider proto: CartridgeLightRifleIncendiary - type: Sprite - sprite: _NF/Objects/Weapons/Ammunition/svt40.rsi + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml new file mode 100644 index 00000000000..c9866174540 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml @@ -0,0 +1,48 @@ +# Empty mags +- type: entity + parent: BaseMagazineRifle + id: MagazineNovaliteC1Empty + name: "clip (.20 rifle any)" + suffix: empty + components: + - type: Tag + tags: + - MagazineNovaliteC1 + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - CartridgeRifle + capacity: 15 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 16 + zeroVisible: false + - type: Appearance + +- type: entity + parent: MagazineNovaliteC1Empty + id: MagazineNovaliteC1 + name: "clip (.20 rifle)" + suffix: full + components: + - type: BallisticAmmoProvider + proto: CartridgeRifle + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_lowcap.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_low.yml similarity index 68% rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_lowcap.yml rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_low.yml index 36ad148c41b..9e93b0dd01f 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_lowcap.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_low.yml @@ -1,6 +1,23 @@ +- type: entity + id: MagazineRifleLowCapacityEmpty + name: "low cap magazine (.20 rifle any)" + suffix: empty + parent: MagazineRifle + components: + - type: BallisticAmmoProvider + proto: null + capacity: 15 + - type: Item + size: Tiny + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: entity id: MagazineRifleLowCapacity - name: "magazine Low-Cap (.20 rifle)" + name: "low cap magazine (.20 rifle)" parent: BaseMagazineRifle components: - type: BallisticAmmoProvider @@ -9,7 +26,7 @@ - type: Item size: Tiny - type: Sprite - sprite: _NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi layers: - state: red map: ["enum.GunVisualLayers.Base"] @@ -18,7 +35,7 @@ - type: entity id: MagazineRifleLowCapacityPractice - name: "magazine Low-Cap (.20 rifle practice)" + name: "low cap magazine (.20 rifle practice)" parent: MagazineRifleLowCapacity components: - type: BallisticAmmoProvider @@ -35,7 +52,7 @@ - type: entity id: MagazineRifleLowCapacityRubber - name: "magazine Low-Cap (.20 rifle rubber)" + name: "low cap magazine (.20 rifle rubber)" parent: MagazineRifleLowCapacity components: - type: BallisticAmmoProvider @@ -52,7 +69,7 @@ - type: entity id: MagazineRifleLowCapacityUranium - name: "magazine Low-Cap (.20 rifle uranium)" + name: "low cap magazine (.20 rifle uranium)" parent: MagazineRifleLowCapacity components: - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml index 2fea05d787b..de5c79ba318 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml @@ -49,6 +49,9 @@ components: - type: BallisticAmmoProvider proto: null + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: base - type: Sprite sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi layers: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 87f0a10568d..b1a113efda0 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -5,7 +5,7 @@ description: Releases electromagnetic pulses that disrupt or damage many electronic devices or drain power cells, has a slow self charging nuclear powered battery. components: - type: Sprite - sprite: _NF/Objects/Weapons/EMP-Gun.rsi + sprite: _NF/Objects/Weapons/Guns/Projectiles/emp.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -13,7 +13,7 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Clothing - sprite: _NF/Objects/Weapons/EMP-Gun.rsi + sprite: _NF/Objects/Weapons/Guns/Projectiles/emp.rsi - type: Gun fireRate: 1 selectedMode: SemiAuto diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml index f9f22136860..6e29bf58b56 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml @@ -5,14 +5,14 @@ description: An old prototype burst-fire NanoTrasen marksman rifle. Manufactured by Silver Industries. It hasn't ever left the trials. Given it's antiquity it is considered a civilian grade weapon. Uses .20 rifle ammo. components: - type: Sprite - sprite: _NF/Objects/Weapons/Gestio-Rifle.rsi + sprite: _NF/Objects/Weapons/Guns/Rifles/gestio.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Clothing - sprite: _NF/Objects/Weapons/Gestio-Rifle.rsi + sprite: _NF/Objects/Weapons/Guns/Rifles/gestio.rsi - type: Gun fireRate: 3.75 projectileSpeed: 30 @@ -25,6 +25,8 @@ - Burst soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rifle3.ogg + params: + volume: -5 - type: Wieldable - type: GunWieldBonus minAngle: -2 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml new file mode 100644 index 00000000000..b3984c33eeb --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml @@ -0,0 +1,51 @@ +- type: entity + parent: BaseWeaponRifle + id: WeaponRifleNovaliteC1 + name: Novalite C1 + description: A modification to the Lecter from SW LLC, a civilian grade semi-automatic rifle with an internal magazine. Nanotrasen Representatives can not stress how compliant this rifle is. Uses .20 rifle ammo. + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi + - type: Gun + fireRate: 4 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + params: + variation: 0.125 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineNovaliteC1 + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineNovaliteC1 + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - 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/Entities/Objects/Weapons/Guns/expedition_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml index 88e97b3a1be..ada911b3367 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml @@ -51,6 +51,11 @@ noSpawn: true id: WeaponRifleGestioExpedition +- type: entity + parent: [ WeaponRifleNovaliteC1, UnregisteredFirearmBase ] + noSpawn: true + id: WeaponRifleNovaliteC1Expedition + # SMGs - type: entity parent: [ WeaponSubMachineGunWt550, UnregisteredFirearmBase ] diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml index 222815b3c34..39632226d6d 100644 --- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml +++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml @@ -5,6 +5,8 @@ priority: 5 children: - ShipyardAmbition + - ShipyardApothecary + - ShipyardBazaar - ShipyardBazaar - ShipyardBocadillo - ShipyardBookworm @@ -38,6 +40,11 @@ text: "/ServerInfo/_NF/Guidebook/Shipyard/Ambition.xml" - type: guideEntry + id: ShipyardApothecary + name: guide-entry-shipyard-apothecary + text: "/ServerInfo/_NF/Guidebook/Shipyard/Apothecary.xml" + +- type: guideEntry id: ShipyardBazaar name: guide-entry-shipyard-bazaar text: "/ServerInfo/_NF/Guidebook/Shipyard/Bazaar.xml" diff --git a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml index a7f3fd960b3..98d0eb6f02b 100644 --- a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml +++ b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml @@ -10,6 +10,18 @@ state: ambition scale: 1.2, 1.2 +- type: entity + parent: PosterBase + id: ShuttleMapApothecary + name: "NM Apothecary" + description: "Detailed map of a Apothecary shuttle." + noSpawn: true + components: + - type: Sprite + sprite: _NF/Guidebook/shuttle_maps/128x96.rsi + state: apothecary + scale: 1.2, 1.2 + - type: entity parent: PosterBase id: ShuttleMapBazaar diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/mercenaries.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/mercenaries.yml index 01db2de3bf2..420aad7f8a1 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/mercenaries.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/mercenaries.yml @@ -18,9 +18,9 @@ - type: startingGear id: MobHumanoidMercenaryGearRangedAltT1 equipment: - gloves: ClothingHandsGlovesColorMercMosin - back: ClothingBackpackDuffelMecranaryTier1Mosin - belt: ClothingBeltWebbingMecranaryTier1Mosin + gloves: ClothingHandsGlovesColorMercNovalite + back: ClothingBackpackDuffelMecranaryTier1Novalite + belt: ClothingBeltWebbingMecranaryTier1Novalite shoes: ClothingShoesBootsMercenary # Tier 2 diff --git a/Resources/Prototypes/_NF/Shipyard/apothecary.yml b/Resources/Prototypes/_NF/Shipyard/apothecary.yml new file mode 100644 index 00000000000..6f22084c389 --- /dev/null +++ b/Resources/Prototypes/_NF/Shipyard/apothecary.yml @@ -0,0 +1,38 @@ +# Author Info +# GitHub: dustylens (https://github.com/dustylens) +# Discord: dustylens + +# Maintainer Info +# GitHub: dustylens (https://github.com/dustylens) +# Discord: dustylens + +# Shuttle Notes: +# +- type: vessel + id: Apothecary + name: NM Apothecary + description: A small medical and chemistry support vessel. + price: 30000 #Appraise value 17782 with markup for chemistry equipment and rounding. Feel free to adjust on the backend. Medics are always poor. + category: Small + group: Civilian + shuttlePath: /Maps/_NF/Shuttles/apothecary.yml + +- type: gameMap + id: Apothecary + mapName: 'NM Apothecary' + mapPath: /Maps/_NF/Shuttles/apothecary.yml + minPlayers: 0 + stations: + Apothecary: + stationProto: StandardFrontierVessel + components: + - type: StationNameSetup + mapNameTemplate: 'Apothecary {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index 67ad837d3df..82b7ed2eff4 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -75,6 +75,12 @@ - type: Tag id: HoverbikeKeys + +- type: Tag + id: WeaponRifleNovaliteC1 + +- type: Tag + id: MagazineNovaliteC1 - type: Tag id: TrackingDart diff --git a/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/mercenaries.xml b/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/mercenaries.xml index 73ab433d20e..24b1fca2e8c 100644 --- a/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/mercenaries.xml +++ b/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/mercenaries.xml @@ -37,13 +37,13 @@ [bold][color=#a4885c]________________________________________________________________________[/color] - + - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 130 (death) - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (2.5 m/s) - - [bold][color=#a4885c]Damage (type):[/color][/bold] 19 [color=yellow]Piercing[/color] (.30 round) + - [bold][color=#a4885c]Damage (type):[/color][/bold] 17 [color=yellow]Piercing[/color] (.20 round) - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] and [color=yellow]Piercing[/color] 25%; [color=orange]Heat[/color] 20%; [color=orange]Caustic[/color] 10% - - [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (Kardashev-Mosin) + - [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (Novalite C1) [bold][color=#a4885c]________________________________________________________________________[/color] diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Apothecary.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Apothecary.xml new file mode 100644 index 00000000000..c8c14d7f379 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Apothecary.xml @@ -0,0 +1,94 @@ + + # APOTHECARY-CLASS MEDICAL SHUTTLE + + + + + + + + + + + + [color=#a4885c]Ship Size:[/color] Small + + [color=#a4885c]Recommended Crew:[/color] 1-3 + + [color=#a4885c]Power Gen Type:[/color] Plasma + + [color=#a4885c]Expeditions:[/color] None + + [color=#a4885c]IFF Console:[/color] None + + "A modest medical response center and chemical lab to ensure MINERS DO NOT DIE." + + # PREFLIGHT CHECKLIST + + ## 1. Power supply + + ## 1.1. Battery units + + + + + + + - Check that the SMES unit is anchored to the floor. + - Check the substation unit. + - Check that the APC unit's Main Breaker is toggled on. + - Check the APC unit's current Load* (W). + + ## 1.2. P.A.C.M.A.N. generator unit + + + + + + - Check that the P.A.C.M.A.N. generator unit is anchored to the floor. + - Check that the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. + - Check that the P.A.C.M.A.N. generator unit is set to HV output. + - Set Target Power for 15-16** [bold]kW[/bold]. + - Start the P.A.C.M.A.N. generator unit. + + ## 2. Atmospherics + + ## 2.1. Distribution Loop + + + + + + + - Check that the air canister is anchored to connector port. + - Check that the distribution pump is set to 101kPa (101kPa). + - Check the distribution pump. Located on the deck of the engineering nacelle. + + ## 2.2. Waste Loop + + + + + + - Check waste loop pump. Located on the deck of the cargo nacelle. + - Set the Air Alarm in the Engine Room to Filtering (Wide). + + ## 3. Other checks + + + + + + + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. + - Check that blast doors are closed. + - Check to ensure that figurines are comfortable. + + ## Sidenotes + + * - Apothecary-class medical response ships are equipped with a single APC unit that can be used to appraise the ship's total power consumption (which for the unmodified ship is 15.3 kW). To keep the substation and APC fully charged, the generator target power should exceed APC's Load, but by as little as possible to achieve maximum fuel efficiency. Remember to check the APC Load and adjust the generator unit's target power after adding or removing power-consuming machines. + + ** - Apothecary-class ships have a slightly above average power demand. A standard P.A.C.M.A.N. generator's target power value can be set to 15-16 kW to modulate between drain and charge. As much of the powerdraw is to sustain the chemistry lab powering down those machines can dramatically reduce the ship's overall draw. + + diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/apothecary.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/apothecary.png new file mode 100644 index 00000000000..0e9f4be0448 Binary files /dev/null and b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/apothecary.png differ diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json index 1d163856aa0..9b3f91f59d8 100644 --- a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json +++ b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json @@ -11,8 +11,11 @@ "name": "ambition" }, { - "name": "bazaar" + "name": "apothecary" }, + { + "name": "bazaar" + }, { "name": "bocadillo" }, diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png new file mode 100644 index 00000000000..956577e3a1a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png new file mode 100644 index 00000000000..8182b21f64d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png new file mode 100644 index 00000000000..e5098ddf47c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png new file mode 100644 index 00000000000..aa689c92906 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png new file mode 100644 index 00000000000..a2c008fa1cf Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png new file mode 100644 index 00000000000..d3a7d26fee3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png new file mode 100644 index 00000000000..06c8afc777e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png new file mode 100644 index 00000000000..9302a392790 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png new file mode 100644 index 00000000000..7081547a514 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png new file mode 100644 index 00000000000..458e8cd9729 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png new file mode 100644 index 00000000000..f9767afa04c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png new file mode 100644 index 00000000000..f4f0b1df6b5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png new file mode 100644 index 00000000000..dc7c1302499 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png new file mode 100644 index 00000000000..bf3cfe20a87 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png new file mode 100644 index 00000000000..db949f30b94 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png new file mode 100644 index 00000000000..b9af911cacd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json new file mode 100644 index 00000000000..62b8aa22373 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "version": 1, + "size": { + "x": 32, + "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", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "mag-6" + }, + { + "name": "mag-7" + }, + { + "name": "mag-8" + }, + { + "name": "mag-9" + }, + { + "name": "mag-10" + }, + { + "name": "mag-11" + }, + { + "name": "mag-12" + }, + { + "name": "mag-13" + }, + { + "name": "mag-14" + }, + { + "name": "mag-15" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/base.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/base.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/base.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/mag-1.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/mag-1.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/mag-1.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/practice.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/practice.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/practice.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/practice.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/red.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/red.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/red.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/red.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/rubber.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/rubber.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/rubber.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/rubber.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/uranium.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/uranium.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/uranium.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/uranium.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/base.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/base.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/mag-1.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-1.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/mag-1.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/practice.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/practice.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/red.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/red.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/rubber.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/rubber.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/uranium.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/uranium.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/base.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/base.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/base.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/equipped-SUITSTORAGE.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/equipped-SUITSTORAGE.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/icon.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/icon.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/inhand-left.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/inhand-right.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-0.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-0.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-0.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-1.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-1.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-1.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-2.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-2.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-2.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-3.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-3.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-3.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-4.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-4.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-4.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/base.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/base.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/base.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/bolt-open.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/bolt-open.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/bolt-open.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-SUITSTORAGE.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/equipped-SUITSTORAGE.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/icon.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/icon.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/inhand-left.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/inhand-right.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/mag-0.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/mag-0.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/mag-0.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/wielded-inhand-left.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/wielded-inhand-right.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png new file mode 100644 index 00000000000..947d0a89b48 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png new file mode 100644 index 00000000000..9a8d405132b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..aff01673b18 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png new file mode 100644 index 00000000000..0e1eb2312bb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png new file mode 100644 index 00000000000..9054ef072fc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png new file mode 100644 index 00000000000..e0bb34e6c76 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png new file mode 100644 index 00000000000..8aeb1b4d9d7 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json new file mode 100644 index 00000000000..70e934ec946 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111 | wielded-inhand-right and wielded-inhand-left sprites made by Stagnation (discord) and those two sprites specifically are under CC-BY-NC-SA-3.0", + "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-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..1a20b9c047c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..0dd4640d405 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-right.png differ