From 827e7faafe334145815817c0abfa680a8458a325 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 13 Jul 2024 19:10:43 +0000 Subject: [PATCH 1/3] Apothecary Shuttle Again! (#1634) * Pre-chem locker apothecary. Now without random file saturation. This is the Apothecary release candidate that received the Magnus walkthrough. Never again. * Update guides.ftl * Update shipyard.yml * Update shipyard.yml * Update shuttle_maps.yml * Update meta.json * Update meta.json * Update shipyard.yml * Airlock correction Airlock correction --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Locale/en-US/_NF/guidebook/guides.ftl | 1 + Resources/Maps/_NF/Shuttles/apothecary.yml | 3282 +++++++++++++++++ .../Prototypes/_NF/Guidebook/shipyard.yml | 7 + .../Prototypes/_NF/Guidebook/shuttle_maps.yml | 12 + .../Prototypes/_NF/Shipyard/apothecary.yml | 38 + .../_NF/Guidebook/Shipyard/Apothecary.xml | 94 + .../shuttle_maps/128x96.rsi/apothecary.png | Bin 0 -> 1583 bytes .../shuttle_maps/128x96.rsi/meta.json | 5 +- 8 files changed, 3438 insertions(+), 1 deletion(-) create mode 100644 Resources/Maps/_NF/Shuttles/apothecary.yml create mode 100644 Resources/Prototypes/_NF/Shipyard/apothecary.yml create mode 100644 Resources/ServerInfo/_NF/Guidebook/Shipyard/Apothecary.xml create mode 100644 Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/apothecary.png 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/_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/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/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 0000000000000000000000000000000000000000..0e9f4be0448d3f54154f8d2869c1b9ea07741d6a GIT binary patch literal 1583 zcmV+~2GIG5P) zL5LnT6o8YT6-1@bbC)8$DCogb=vAy0){EdCtX9#stnGrJ;6bd4qS)5O(pzP13$~)I z?V*QW6x1$)r-~?|pcnD5o(n}U75qJP=Qs1_z2r?MGf5`zyZn=xH<>rdo0sGzGrv+w zsp$r411yd0hx?`mO2`MZ0)2jAK0-cBs*UM%I@MZhDs2Pv7D67(3_xqG&B}vmE?lD# z(tz{;6sBBdB+zq+7Z8L@&`OQJ-OjOD!kS~~aohCMiX~U$rbbwQF`lh~Pb#HSY!R~_(_Mj0?D#N!T`T*;zdt>cTvV zFn}B}13#R!Qn$Pc3=&c4iqSOzkoo2Fu~qN}>np$tq-Jp8sDTk1ChB1R`8y++B6$2QU*WZ4XC5MgkZSLQ83`r~uwoUnJ+jh(>>j}IVr6dd@V6rgSKy_sLp5Yn`u#90HV0A_X zfT+5yH37B?#*~4Xxs1qE$R;D)0+y4jY$Gd1m!%uk%v#0JC8rJYepdZZM=`!Z4tbKv(cV z7!PD9mVDSLsWTMpnF=i@;4`a}|5ppCjmLXt;Oa~Xv z=of@wL7*=9j{j3dJV4=y0ThlHK;ei16izmsz?&;CHugP_$erGGd;iKX`FHJu#=e_t z5frg7n+!4oL0C`-9>?UUe4q^6c3n@XV=GfCP08236iO{PtfGLNb%0ntoCS*9>y-{H z8(5}Pnv$=Df;ks&D}$xE6)PTq2d9jwvaET45XxYaNH8rG8>3EReg zDJ3X*&h;p`FN zO^xGNxm>u^UN09}dVst3{Tf>ZZyr1RWo#8{WN84Q>H75NO!Ow8Eq|SDeq$#mt{i(L zwhA@G0~Ahl53q9l@y5QRTRuW0{bxe44?e%I?g*OSPikw>{8oy6|Eu157%SVhL9lXC5j>($_B2RlBboyF2^&WsW2(Pjb60d&@ zammAr*j`%r=f=*4mvBV_+k!;`tB%**Cw^0ZynK&RivN!xm|WXPpb0k;c-y9H!5^sE zD1h^_fr(9?l6A=m!;|ETA?Gg!&Tn7X{KiD|7eit<0i`36z`}{%7RP##W7i(+12a6X zUOXL86F%}{h!7kx0Kn4Xf?8T!h^@w8hyfIi7y#hRebdiD~hyetES{o^3imUCW(rsM77)ipER5{TX hgrvxj1`vCJ?0=4~g^Y&F#mN8w002ovPDHLkV1ndx Date: Sun, 14 Jul 2024 00:00:10 +0300 Subject: [PATCH 2/3] Novalite Rifle by @mrscratch (#1618) * Novalite Part 1, YML and Sprites * novalite part 2, yml warrior recommended tag placement * forgot featureless grip aka sharkfin * Removed files from base SS14 and relocated into NewFrontier folder * Updated player equipped weapon sprites * tags appears to be missing hoverbikekeys, hopefully this fixes * Renamed Magazine to more accurate match what it is * updates, clean up and exped loot integration * magazine-clip * fire rate * actually 4 is fine * replaced mosin merc with novalite merc * fix * very fixed now * End me * Update battery_guns.yml * Update security_uplink_catalog.yml --------- Co-authored-by: Scratchie Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../VendingMachines/Inventories/ammo.yml | 12 ++-- .../Procedural/salvage_factions.yml | 2 +- .../Fills/Backpacks/npc_loot_mercenaries.yml | 16 +++-- .../Fills/Items/weapon_cases_expedition.yml | 13 ++++ .../Inventories/lesslethalvend.yml | 2 +- .../_NF/Catalog/security_uplink_catalog.yml | 2 +- .../Hands/gloves_mob_hostile_npcs.yml | 15 +++++ .../Spawners/Random/dungeon_items_weapons.yml | 1 + .../Random/mobs_hostile_mercenaries.yml | 2 +- .../Mobs/NPCs/mob_hostile_mercenaries.yml | 8 +-- .../Guns/Ammunition/Magazines/light_rifle.yml | 30 ++++----- .../Ammunition/Magazines/novalitec1clip.yml | 48 ++++++++++++++ .../{rifle_lowcap.yml => rifle_low.yml} | 27 ++++++-- .../Ammunition/SpeedLoaders/heavy_rifle.yml | 3 + .../Weapons/Guns/Battery/battery_guns.yml | 4 +- .../Objects/Weapons/Guns/Rifles/gestio.yml | 6 +- .../Weapons/Guns/Rifles/novalitec1.yml | 51 +++++++++++++++ .../Objects/Weapons/Guns/expedition_guns.yml | 5 ++ .../_NF/Roles/Jobs/Hostile/mercenaries.yml | 6 +- Resources/Prototypes/_NF/tags.yml | 6 ++ .../MobsHostileExpedition/mercenaries.xml | 6 +- .../Magazine/Rifle/novalite_clip.rsi/base.png | Bin 0 -> 5642 bytes .../Rifle/novalite_clip.rsi/mag-1.png | Bin 0 -> 5359 bytes .../Rifle/novalite_clip.rsi/mag-10.png | Bin 0 -> 5485 bytes .../Rifle/novalite_clip.rsi/mag-11.png | Bin 0 -> 5492 bytes .../Rifle/novalite_clip.rsi/mag-12.png | Bin 0 -> 5495 bytes .../Rifle/novalite_clip.rsi/mag-13.png | Bin 0 -> 5509 bytes .../Rifle/novalite_clip.rsi/mag-14.png | Bin 0 -> 5510 bytes .../Rifle/novalite_clip.rsi/mag-15.png | Bin 0 -> 5524 bytes .../Rifle/novalite_clip.rsi/mag-2.png | Bin 0 -> 5384 bytes .../Rifle/novalite_clip.rsi/mag-3.png | Bin 0 -> 5419 bytes .../Rifle/novalite_clip.rsi/mag-4.png | Bin 0 -> 5444 bytes .../Rifle/novalite_clip.rsi/mag-5.png | Bin 0 -> 5463 bytes .../Rifle/novalite_clip.rsi/mag-6.png | Bin 0 -> 5468 bytes .../Rifle/novalite_clip.rsi/mag-7.png | Bin 0 -> 5472 bytes .../Rifle/novalite_clip.rsi/mag-8.png | Bin 0 -> 5478 bytes .../Rifle/novalite_clip.rsi/mag-9.png | Bin 0 -> 5486 bytes .../Rifle/novalite_clip.rsi/meta.json | 59 ++++++++++++++++++ .../Rifle/rifle_cap_mag.rsi}/base.png | Bin .../Rifle/rifle_cap_mag.rsi}/mag-1.png | Bin .../Rifle/rifle_cap_mag.rsi}/meta.json | 0 .../Rifle/rifle_cap_mag.rsi}/practice.png | Bin .../Magazine/Rifle/rifle_cap_mag.rsi}/red.png | Bin .../Rifle/rifle_cap_mag.rsi}/rubber.png | Bin .../Rifle/rifle_cap_mag.rsi}/uranium.png | Bin .../Magazine/Rifle}/svt40.rsi/base.png | Bin .../Magazine/Rifle}/svt40.rsi/mag-1.png | Bin .../Magazine/Rifle}/svt40.rsi/meta.json | 0 .../Magazine/Rifle}/svt40.rsi/practice.png | Bin .../Magazine/Rifle}/svt40.rsi/red.png | Bin .../Magazine/Rifle}/svt40.rsi/rubber.png | Bin .../Magazine/Rifle}/svt40.rsi/uranium.png | Bin .../Projectiles/emp.rsi}/base.png | Bin .../emp.rsi}/equipped-BACKPACK.png | Bin .../Projectiles/emp.rsi}/icon.png | Bin .../Projectiles/emp.rsi}/inhand-left.png | Bin .../Projectiles/emp.rsi}/inhand-right.png | Bin .../Projectiles/emp.rsi}/mag-unshaded-0.png | Bin .../Projectiles/emp.rsi}/mag-unshaded-1.png | Bin .../Projectiles/emp.rsi}/mag-unshaded-2.png | Bin .../Projectiles/emp.rsi}/mag-unshaded-3.png | Bin .../Projectiles/emp.rsi}/mag-unshaded-4.png | Bin .../Projectiles/emp.rsi}/meta.json | 0 .../Rifles/gestio.rsi}/base.png | Bin .../Rifles/gestio.rsi}/bolt-open.png | Bin .../Rifles/gestio.rsi}/equipped-BACKPACK.png | Bin .../gestio.rsi}/equipped-SUITSTORAGE.png | Bin .../Rifles/gestio.rsi}/icon.png | Bin .../Rifles/gestio.rsi}/inhand-left.png | Bin .../Rifles/gestio.rsi}/inhand-right.png | Bin .../Rifles/gestio.rsi}/mag-0.png | Bin .../Rifles/gestio.rsi}/meta.json | 0 .../gestio.rsi}/wielded-inhand-left.png | Bin .../gestio.rsi}/wielded-inhand-right.png | Bin .../Guns/Rifles/novalitec1.rsi/base.png | Bin 0 -> 5246 bytes .../Guns/Rifles/novalitec1.rsi/bolt-open.png | Bin 0 -> 5974 bytes .../novalitec1.rsi/equipped-BACKPACK.png | Bin 0 -> 6310 bytes .../Guns/Rifles/novalitec1.rsi/icon.png | Bin 0 -> 5245 bytes .../Rifles/novalitec1.rsi/inhand-left.png | Bin 0 -> 5717 bytes .../Rifles/novalitec1.rsi/inhand-right.png | Bin 0 -> 5253 bytes .../Guns/Rifles/novalitec1.rsi/mag-0.png | Bin 0 -> 4981 bytes .../Guns/Rifles/novalitec1.rsi/meta.json | 43 +++++++++++++ .../novalitec1.rsi/wielded-inhand-left.png | Bin 0 -> 820 bytes .../novalitec1.rsi/wielded-inhand-right.png | Bin 0 -> 870 bytes 84 files changed, 319 insertions(+), 48 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml rename Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/{rifle_lowcap.yml => rifle_low.yml} (68%) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json rename Resources/Textures/_NF/Objects/Weapons/{Low-Cap-Rifle-Magazine.rsi => Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi}/base.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Low-Cap-Rifle-Magazine.rsi => Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi}/mag-1.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Low-Cap-Rifle-Magazine.rsi => Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi}/meta.json (100%) rename Resources/Textures/_NF/Objects/Weapons/{Low-Cap-Rifle-Magazine.rsi => Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi}/practice.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Low-Cap-Rifle-Magazine.rsi => Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi}/red.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Low-Cap-Rifle-Magazine.rsi => Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi}/rubber.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Low-Cap-Rifle-Magazine.rsi => Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi}/uranium.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Ammunition => Guns/Ammunition/Magazine/Rifle}/svt40.rsi/base.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Ammunition => Guns/Ammunition/Magazine/Rifle}/svt40.rsi/mag-1.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Ammunition => Guns/Ammunition/Magazine/Rifle}/svt40.rsi/meta.json (100%) rename Resources/Textures/_NF/Objects/Weapons/{Ammunition => Guns/Ammunition/Magazine/Rifle}/svt40.rsi/practice.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Ammunition => Guns/Ammunition/Magazine/Rifle}/svt40.rsi/red.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Ammunition => Guns/Ammunition/Magazine/Rifle}/svt40.rsi/rubber.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Ammunition => Guns/Ammunition/Magazine/Rifle}/svt40.rsi/uranium.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/base.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/equipped-BACKPACK.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/icon.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/inhand-left.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/inhand-right.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/mag-unshaded-0.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/mag-unshaded-1.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/mag-unshaded-2.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/mag-unshaded-3.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/mag-unshaded-4.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/meta.json (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/base.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/bolt-open.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/equipped-BACKPACK.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/equipped-SUITSTORAGE.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/icon.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/inhand-left.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/inhand-right.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/mag-0.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/meta.json (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/wielded-inhand-left.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/wielded-inhand-right.png (100%) create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml index 9b4aef4996c..4f8e10fc938 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml @@ -3,8 +3,10 @@ startingInventory: SurvivalKnife: 10 WeaponLaserPistolNF: 10 # Frontier - WeaponSniperMosin: 10 - WeaponSniperRepeater: 10 +# WeaponSniperMosin: 10 + WeaponRifleGestio: 10 +# WeaponSniperRepeater: 10 + WeaponRifleNovaliteC1: 5 MagazineBoxLightRifle: 10 MagazineBoxLightRiflePractice: 10 MagazineBoxLightRifleRubber: 15 @@ -13,11 +15,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 ff84e6b8e0b..6d61c72710c 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml @@ -237,6 +237,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 100f6eeaa80..b0641a0a6a9 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/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/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/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 0000000000000000000000000000000000000000..956577e3a1a9a14d6ef3669cce3d2ee7b1d507d9 GIT binary patch literal 5642 zcmeHLdr(x@9ljU>7BJ03)SBveU7DcLyL+E|AMT2>ytcZ4xK&b;srPX%TxB2Gz3VQF zi3tf7C8IISFpk=w2J0j?Oro~NA*raKQBzCt)ro~thG~rnnlx6^1d^V+JcKqg8K%fz zz%0A>oZtD*@B4m_bJ)%Kx!F?^9!)?HWQsEp z0iUXs0#q;a0~ACw6+t2&dGd=MI)zXE`X9-Q(kFF?cI!R$?Q71|P0hKSdpLO#7iiKq zbXdxh{O&gQS}z~JWS8}3&RYETOu2Pt>YwLdI=c8*v9CY&Zp*oyeSJ61tZZu7y71|j zZd}~llS_yCzDntyb9P6`@^>2ZgLB1{eTjO}g6>u4LzO*~!|p|NMRL)zn|rVPytCuA z*5toC_QhswFMZ$x?x$_r=a~{eZA!^{O-()f&)7}9UuZA?B&;>5O=H(#ti-0)CC1^Q)7*QcHJ*G-RoW0`-X>hsQb=iIt!zu6I!e(-{udIfR+ zfjsm^ec`-@s=cdY@t4tklbs)4x_GS8W;=7$zG1`r)n6>U72LQrX1_uLVW#MTEl&pBpp>^*&~>+L2gC2R4b>{)ZCFR(AXiywUSiO=b0 zmakyW%}6jW*nN~c_^-H6{!()sf2yrE_|yS@OY-#XS#c(X&Ueh7-gRVc{f-aXo@+am z*7YUT{p#7DJ&=E~O`t=^CB+{(*vC!9ttSS!dT9%i489^R-TZ0K!=vpqw zK95;cd=fB6JbsvY2x3c%_(gdg&`}8#YhJtQR^xFKswsBUYQ}}T{0>l}<&+1&%JN*d zT)s}`6;s;c1Y1Oa03M)=Xv9C@T zBiee>v^W8^1r${%$jBOifKPT)iLUzvizOTmo5PgZ7bvz6JkMKj(n69Lw7`O8UR{h} z-e8IW(T|YzdDt8knNw3+Z-~3C^Q~{(1Z^*ATonIG_U5!x9nw7Q&2MJRZyN z6+u07Jp>tW=sQ;g-LOtA1t91P1!R!99(eVX;Sh>EwB8>Ilt$?&vIUd^4>S$JU5OD} zW;2MdXRh67+SepLWWNc8SXhV z>?UJ>LGj6&B1AuOjKb2YC}M<6${5XZDkf4QjmZ?PkPOYU6ip0+a(aWh=#_y11;Nc4 z#8C*2w{mbHr2+`Sa1tib9E(|LUZoh(N|BUx7(`w`gIOt-4)@A{QXmv9DV)p_1V$6k zB^qZKjHht|!#SA-6r5E>5QS1?AOq#3_Al3yz7 zDqH|-K=UfTaPZ!gTl0XGx@hQ0umr^t9L?h-P0-eUucL^oKp+Tn(Lg0|^8gSBhd0|*ND6L4A}2{%Cs3@tD? z1|RWZ_C7^Z%f8RrC?C|;AM_k82=_0G4)xd6O7KkoQ~zVB7A+56LwSoy6)e4EC`%h0{Rf(f<8B=7E zhqO!<3#{?*rW+YX72+%Rv^Zy_GE=qtSam(I0xw&=L`X? z7=f!eOGvVnki@a4$KbHLj7Rh&TqSwH5g4#qVF*cy#5e#u9HGJ!RN^3af*Naj1BcBZ zJ)6b2YYme`%E@!ag_K(3!AG||ahAxom#$S(}_OO-wx3=N{94dEaEOi&2>Zx6k z(1a#AC`(GmukRjTerJDGQrwp6m*1OnqHYs?Wzy*#GXfW4o656dzizDR^iFx}y5n!< zN84kNJ%^^wYAy+&p}jw>YkRPGuRZOJ#B62hl}&T2&YRlm6MsAHl?#=5-&FkdkCjK} mbxvw3I5%@y^;K5>Fo}JATh^uKhhq%K5NBp?Mnn3VivIvZ2agE= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8182b21f64d11c0d09cee0c0092adf462b64c2c5 GIT binary patch literal 5359 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 R-GE^ruC%PwZOMg|{{ha>bDRJG literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..aa689c929068eb511242d982f6f65d9c47d769d8 GIT binary patch literal 5492 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d3a7d26fee33546575cbcf7aa2b4a626bc13e5c6 GIT binary patch literal 5509 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9302a392790bb76f011913ef4ac6451802e40841 GIT binary patch literal 5524 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 C_)~WP literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f9767afa04cbfa666c80931f8f878f481e90a4a7 GIT binary patch literal 5444 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 P0bq{I+>9-0g%$q+QLb}o literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b9af911cacd5b2e85048f0753bb43c57627cd0da GIT binary patch literal 5486 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9a8d405132bf2703ab26fcca091854422f603869 GIT binary patch literal 5974 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0e1eb2312bb864f5b42d3d28fc31fdfc44ca5053 GIT binary patch literal 5245 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 fjXC7sE060{IeEWrIC literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e0bb34e6c769400e89f97a7566534b67f0ffdda9 GIT binary patch literal 5253 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8aeb1b4d9d77149fbbe31f29f8f9de314d55549c GIT binary patch literal 4981 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 Date: Sat, 13 Jul 2024 21:00:35 +0000 Subject: [PATCH 3/3] Automatic Changelog (#1618) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) 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'