diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml index 540ebd88328..43eab18a2ee 100644 --- a/Resources/Audio/Lobby/attributions.yml +++ b/Resources/Audio/Lobby/attributions.yml @@ -77,9 +77,4 @@ - files: ["every_light_is_blinking_at_once.ogg"] license: "CC-BY-NC-SA-3.0" copyright: "every light is blinking at once by Alexander Divine." - source: "https://soundcloud.com/alexanderdivine/every-light-is-blinking-at-once" - -- files: ["victory.ogg"] - license: "CC-BY-NC-SA-3.0" - copyright: "Victory by Koruu Chan. Rights reserved by Checkraze. Converted from WAV to OGG." - source: "https://github.com/Cheackraze" \ No newline at end of file + source: "https://soundcloud.com/alexanderdivine/every-light-is-blinking-at-once" \ No newline at end of file diff --git a/Resources/Audio/Lobby/victory.ogg b/Resources/Audio/Lobby/victory.ogg deleted file mode 100644 index 791aae37134..00000000000 Binary files a/Resources/Audio/Lobby/victory.ogg and /dev/null differ diff --git a/Resources/Audio/_NF/Lobby/attributions.yml b/Resources/Audio/_NF/Lobby/attributions.yml new file mode 100644 index 00000000000..65365a341b8 --- /dev/null +++ b/Resources/Audio/_NF/Lobby/attributions.yml @@ -0,0 +1,9 @@ +- files: ["victory.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "Victory by Koruu Chan. Rights reserved by Checkraze. Converted from WAV to OGG." + source: "https://github.com/Cheackraze" + +- files: ["shibamata.ogg"] + license: "CC-BY-3.0" + copyright: "Shibamata midi remake. Likely original: https://www.nicovideo.jp/watch/sm32841166" + source: "https://github.com/Elijahrane/arcadia-station/blob/c2ea3f44d4de4c0a337aeddb12f167a89c5ed3ef/Resources/Audio/Lobby/shibamata.ogg" \ No newline at end of file diff --git a/Resources/Audio/_NF/Lobby/shibamata.ogg b/Resources/Audio/_NF/Lobby/shibamata.ogg new file mode 100644 index 00000000000..e116449a5bd Binary files /dev/null and b/Resources/Audio/_NF/Lobby/shibamata.ogg differ diff --git a/Resources/Audio/_NF/Lobby/victory.ogg b/Resources/Audio/_NF/Lobby/victory.ogg new file mode 100644 index 00000000000..482cbc83f82 Binary files /dev/null and b/Resources/Audio/_NF/Lobby/victory.ogg differ diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c70d1e74232..aa41943b063 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2884,3 +2884,51 @@ Entries: message: Added plasteel arming sword! id: 4755 time: '2024-01-22T12:14:42.0000000+00:00' +- author: FoxxoTrystan + changes: + - type: Add + message: 'Xeeenoooossss Lobby Art by: gentlebutter' + - type: Add + message: 'Secrun Lobby Art by: GhostPrince' + - type: Remove + message: Upstream Lobby Arts + id: 4756 + time: '2024-01-22T21:13:12.0000000+00:00' +- author: TsjipTsjip + changes: + - type: Fix + message: The SLI Bazaar no longer spaces itself after purchase. + id: 4757 + time: '2024-01-22T21:32:58.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Add + message: Added NC Kilderkin - bar/brewery ship. + id: 4758 + time: '2024-01-24T01:30:58.0000000+00:00' +- author: McBosserson + changes: + - type: Add + message: Shibamata as lobby song + id: 4759 + time: '2024-01-24T19:07:40.0000000+00:00' +- author: dvir01 + changes: + - type: Add + message: Added a small gyro to be used in smaller ships. + id: 4760 + time: '2024-01-24T22:24:47.0000000+00:00' +- author: dvir01 + changes: + - type: Add + message: >- + NT Added the security guard job to frontier to help SR & STC keep the + outpost safe. + id: 4761 + time: '2024-01-24T22:30:31.0000000+00:00' +- author: dvir01 + changes: + - type: Add + message: Added ashtray to the shadycig vender. + id: 4762 + time: '2024-01-24T22:34:48.0000000+00:00' diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl index 8d90993933a..1d9a6c2bf8d 100644 --- a/Resources/Locale/en-US/_NF/job/job-description.ftl +++ b/Resources/Locale/en-US/_NF/job/job-description.ftl @@ -1,3 +1,4 @@ job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law. -job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships. job-description-pilot = Pilot spaceships from point A to B, outmaneuver pirates and dodge asteroids. You are a leaf on the solar wind, let others marvel at how you soar. +job-description-security-guard = Patrol the empty halls, whistle simple tunes you heard on radio, jingle your keychain and scurry away at the sight of danger. +job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships. diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl index ef760e87d29..7c34eb3e226 100644 --- a/Resources/Locale/en-US/_NF/job/job-names.ftl +++ b/Resources/Locale/en-US/_NF/job/job-names.ftl @@ -1,8 +1,10 @@ job-name-mercenary = Mercenary -job-name-stc = Station Traffic Controller job-name-pilot = Pilot +job-name-security-guard = Security Guard +job-name-stc = Station Traffic Controller # Role timers - Make these alphabetical or I cut you JobMercenary = Mercenary -JobSTC = Station Traffic Controller JobPilot = Pilot +JobSecurityGuard = Security Guard +JobSTC = Station Traffic Controller diff --git a/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl b/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl index b31848bd937..cf0684630b5 100644 --- a/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl @@ -1,5 +1,3 @@ -id-card-access-level-frontier = Station Traffic Controller - -id-card-access-level-mercenary = Mercenary - +id-card-access-level-frontier = Frontier id-card-access-level-pilot = Pilot +id-card-access-level-mercenary = Mercenary diff --git a/Resources/Maps/_NF/Shuttles/bazaar.yml b/Resources/Maps/_NF/Shuttles/bazaar.yml index fdbc4db9b16..bdc96c636ce 100644 --- a/Resources/Maps/_NF/Shuttles/bazaar.yml +++ b/Resources/Maps/_NF/Shuttles/bazaar.yml @@ -662,7 +662,7 @@ entities: pos: 5.5,-3.5 parent: 1 type: Transform - - secondsUntilStateChange: -516.57 + - secondsUntilStateChange: -621.60913 state: Opening type: Door - links: @@ -3257,14 +3257,6 @@ entities: type: Transform - proto: GasPassiveVent entities: - - uid: 378 - components: - - rot: 3.141592653589793 rad - pos: 5.5,-4.5 - parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - uid: 379 components: - rot: 3.141592653589793 rad @@ -3469,6 +3461,14 @@ entities: type: Transform - color: '#98FF98FF' type: AtmosPipeColor + - uid: 910 + components: + - rot: -1.5707963267948966 rad + pos: 5.5,-6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor - proto: GasPipeFourway entities: - uid: 405 @@ -3915,6 +3915,54 @@ entities: type: Transform - color: '#98FF98FF' type: AtmosPipeColor + - uid: 911 + components: + - rot: 3.141592653589793 rad + pos: 5.5,-4.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 912 + components: + - rot: 3.141592653589793 rad + pos: 5.5,-5.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 913 + components: + - rot: 1.5707963267948966 rad + pos: 4.5,-6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 914 + components: + - rot: 1.5707963267948966 rad + pos: 3.5,-6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 915 + components: + - rot: 1.5707963267948966 rad + pos: 2.5,-6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 916 + components: + - rot: 1.5707963267948966 rad + pos: 1.5,-6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor - proto: GasPipeTJunction entities: - uid: 462 @@ -4016,6 +4064,14 @@ entities: type: AtmosPipeColor - proto: GasVentScrubber entities: + - uid: 378 + components: + - rot: 1.5707963267948966 rad + pos: 0.5,-6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor - uid: 474 components: - rot: -1.5707963267948966 rad diff --git a/Resources/Maps/_NF/Shuttles/kilderkin.yml b/Resources/Maps/_NF/Shuttles/kilderkin.yml new file mode 100644 index 00000000000..acabfc8606d --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/kilderkin.yml @@ -0,0 +1,4029 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 28: FloorDark + 30: FloorDarkDiagonalMini + 32: FloorDarkMini + 33: FloorDarkMono + 97: FloorTechMaint + 112: FloorWoodTile + 113: Lattice + 114: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - name: grid + type: MetaData + - pos: -0.5,-0.53125 + parent: invalid + type: Transform + - chunks: + 0,0: + ind: 0,0 + tiles: cAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAIQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAIQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAIQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAIAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcAAAAAAAYQAAAAAAIAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAIQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAYQAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAYQAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAHAAAAAAAYQAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAAAHAAAAAAAcgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAAAHAAAAAAAcgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAIQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + type: MapGrid + - type: Broadphase + - bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + type: Physics + - fixtures: {} + type: Fixtures + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + type: Gravity + - chunkCollection: + version: 2 + nodes: + - node: + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: Arrows + decals: + 13: 7,-3 + 14: 7,-1 + - node: + angle: 4.71238898038469 rad + color: '#FFFFFFFF' + id: Arrows + decals: + 15: -6,-3 + 16: -6,-1 + - node: + color: '#FFFFFFFF' + id: BotGreyscale + decals: + 17: -6,3 + 52: 5,7 + 53: 6,6 + 54: 6,5 + 57: -4,7 + 58: -5,6 + 63: -6,2 + 64: 1,-6 + - node: + color: '#FFFFFFFF' + id: BotLeftGreyscale + decals: + 18: -6,-1 + 19: -6,-3 + 20: 7,-3 + 21: 7,-1 + - node: + color: '#FFFFFFFF' + id: BoxGreyscale + decals: + 59: 2,6 + 65: -5,2 + - node: + color: '#FFFFFFFF' + id: Bushi1 + decals: + 12: 1,-2 + - node: + angle: 4.71238898038469 rad + color: '#00FFFFFF' + id: DeliveryGreyscale + decals: + 27: 2,-6 + - node: + color: '#FFFFFFFF' + id: DeliveryGreyscale + decals: + 60: 2,5 + 61: -3,-6 + 62: 4,5 + - node: + angle: 4.71238898038469 rad + color: '#FFFFFFFF' + id: DeliveryGreyscale + decals: + 23: -5,-6 + 24: -5,-5 + 25: -4,-5 + 26: -3,-5 + - node: + color: '#FFFFFFFF' + id: Grassc1 + decals: + 8: 1,-2 + - node: + color: '#FFFFFFFF' + id: Grassc3 + decals: + 9: 1,-2 + - node: + color: '#FFFFFFFF' + id: Grasse1 + decals: + 11: 1,-2 + - node: + color: '#FFFFFFFF' + id: Grasse3 + decals: + 10: 1,-2 + - node: + color: '#FFFFFFFF' + id: GrayConcreteTrimInnerNe + decals: + 4: 0,-3 + - node: + color: '#FFFFFFFF' + id: GrayConcreteTrimInnerNw + decals: + 5: 2,-3 + - node: + color: '#FFFFFFFF' + id: GrayConcreteTrimInnerSe + decals: + 6: 0,-1 + - node: + color: '#FFFFFFFF' + id: GrayConcreteTrimInnerSw + decals: + 7: 2,-1 + - node: + color: '#FFFFFFFF' + id: GrayConcreteTrimLineE + decals: + 0: 0,-2 + - node: + color: '#FFFFFFFF' + id: GrayConcreteTrimLineN + decals: + 1: 1,-3 + - node: + color: '#FFFFFFFF' + id: GrayConcreteTrimLineS + decals: + 2: 1,-1 + - node: + color: '#FFFFFFFF' + id: GrayConcreteTrimLineW + decals: + 3: 2,-2 + - node: + angle: 4.71238898038469 rad + color: '#FFFFFFFF' + id: LoadingAreaGreyscale + decals: + 22: -5,0 + - node: + color: '#9D9D97FF' + id: MiniTileCheckerAOverlay + decals: + 66: 6,-5 + 67: 6,-6 + - node: + color: '#9FED5896' + id: MiniTileWhiteCornerSe + decals: + 40: -1,5 + - node: + color: '#EFB34196' + id: MiniTileWhiteCornerSe + decals: + 44: 4,-7 + - node: + color: '#334E6DC8' + id: MiniTileWhiteCornerSw + decals: + 30: 1,5 + - node: + color: '#EFB34196' + id: MiniTileWhiteCornerSw + decals: + 43: -4,-7 + - node: + color: '#9FED5896' + id: MiniTileWhiteLineE + decals: + 41: -1,6 + 42: -1,7 + - node: + color: '#334E6DC8' + id: MiniTileWhiteLineS + decals: + 31: 2,5 + 32: 3,5 + 33: 4,5 + 34: 5,5 + 35: 6,5 + - node: + color: '#9FED5896' + id: MiniTileWhiteLineS + decals: + 36: -2,5 + 37: -3,5 + 38: -4,5 + 39: -5,5 + - node: + color: '#EFB34196' + id: MiniTileWhiteLineS + decals: + 45: -3,-7 + 46: -2,-7 + 47: -1,-7 + 48: 0,-7 + 49: 1,-7 + 50: 2,-7 + 51: 3,-7 + - node: + color: '#334E6DC8' + id: MiniTileWhiteLineW + decals: + 29: 1,6 + type: DecalGrid + - version: 2 + data: + tiles: + 0,0: + 0: 65535 + 0,-1: + 0: 65535 + 0,1: + 0: 65535 + 0,2: + 0: 15 + 1: 128 + 1,0: + 0: 65535 + 1,1: + 0: 65535 + 1,2: + 0: 7 + 1: 48 + 2,0: + 0: 4369 + 2,1: + 0: 1 + 0,-2: + 0: 65535 + 0,-3: + 1: 32768 + 1,-3: + 1: 12288 + 1,-2: + 0: 65527 + 1,-1: + 0: 65535 + 2,-1: + 0: 4369 + -2,-1: + 0: 61166 + -2,-2: + 0: 52424 + -1,-3: + 1: 28672 + -1,-2: + 0: 65535 + -1,-1: + 0: 65535 + -2,0: + 0: 61166 + -2,1: + 0: 52430 + -2,2: + 0: 8 + -1,0: + 0: 65535 + -1,1: + 0: 65535 + -1,2: + 0: 15 + 1: 112 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + chunkSize: 4 + type: GridAtmosphere + - type: GasTileOverlay + - type: RadiationGridResistance + - id: kilderkin + type: BecomesStation +- proto: AirAlarm + entities: + - uid: 84 + components: + - rot: 1.5707963267948966 rad + pos: 0.5,7.5 + parent: 1 + type: Transform + - ShutdownSubscribers: + - 278 + - 279 + - 308 + - 316 + type: DeviceNetwork + - devices: + - 278 + - 279 + - 308 + - 316 + type: DeviceList + - uid: 482 + components: + - pos: 0.5,-5.5 + parent: 1 + type: Transform + - ShutdownSubscribers: + - 349 + type: DeviceNetwork + - devices: + - 349 + type: DeviceList +- proto: AirCanister + entities: + - uid: 324 + components: + - anchored: True + pos: 2.5,-5.5 + parent: 1 + type: Transform + - bodyType: Static + type: Physics +- proto: Airlock + entities: + - uid: 48 + components: + - pos: 5.5,-4.5 + parent: 1 + type: Transform + - uid: 178 + components: + - rot: -1.5707963267948966 rad + pos: -0.5,4.5 + parent: 1 + type: Transform +- proto: AirlockCaptainGlassLocked + entities: + - uid: 177 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,6.5 + parent: 1 + type: Transform +- proto: AirlockCargoGlass + entities: + - uid: 335 + components: + - pos: -4.5,4.5 + parent: 1 + type: Transform +- proto: AirlockEngineering + entities: + - uid: 169 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,-5.5 + parent: 1 + type: Transform +- proto: AirlockExternalGlass + entities: + - uid: 12 + components: + - pos: -2.5,8.5 + parent: 1 + type: Transform + - uid: 13 + components: + - pos: 4.5,8.5 + parent: 1 + type: Transform + - uid: 14 + components: + - pos: 4.5,-7.5 + parent: 1 + type: Transform + - uid: 15 + components: + - pos: -2.5,-7.5 + parent: 1 + type: Transform + - uid: 50 + components: + - rot: 1.5707963267948966 rad + pos: 5.5,-1.5 + parent: 1 + type: Transform + - links: + - 512 + type: DeviceLinkSink + - uid: 139 + components: + - rot: 1.5707963267948966 rad + pos: -3.5,-0.5 + parent: 1 + type: Transform + - links: + - 512 + type: DeviceLinkSink + - uid: 168 + components: + - rot: 1.5707963267948966 rad + pos: 5.5,-0.5 + parent: 1 + type: Transform + - links: + - 512 + type: DeviceLinkSink + - uid: 170 + components: + - rot: 1.5707963267948966 rad + pos: -3.5,-1.5 + parent: 1 + type: Transform + - links: + - 512 + type: DeviceLinkSink +- proto: AirlockGlassShuttle + entities: + - uid: 164 + components: + - rot: -1.5707963267948966 rad + pos: -6.5,-2.5 + parent: 1 + type: Transform + - uid: 165 + components: + - rot: -1.5707963267948966 rad + pos: -6.5,-0.5 + parent: 1 + type: Transform + - uid: 166 + components: + - rot: 1.5707963267948966 rad + pos: 8.5,-2.5 + parent: 1 + type: Transform + - uid: 167 + components: + - rot: 1.5707963267948966 rad + pos: 8.5,-0.5 + parent: 1 + type: Transform +- proto: APCBasic + entities: + - uid: 391 + components: + - pos: -1.5,-5.5 + parent: 1 + type: Transform + - uid: 392 + components: + - rot: 1.5707963267948966 rad + pos: 0.5,5.5 + parent: 1 + type: Transform +- proto: AtmosDeviceFanTiny + entities: + - uid: 4 + components: + - pos: -6.5,-0.5 + parent: 1 + type: Transform + - uid: 5 + components: + - pos: -6.5,-2.5 + parent: 1 + type: Transform + - uid: 6 + components: + - pos: 8.5,-0.5 + parent: 1 + type: Transform + - uid: 7 + components: + - pos: 8.5,-2.5 + parent: 1 + type: Transform + - uid: 8 + components: + - pos: -2.5,-7.5 + parent: 1 + type: Transform + - uid: 9 + components: + - pos: 4.5,-7.5 + parent: 1 + type: Transform + - uid: 10 + components: + - pos: 4.5,8.5 + parent: 1 + type: Transform + - uid: 11 + components: + - pos: -2.5,8.5 + parent: 1 + type: Transform + - uid: 71 + components: + - rot: -1.5707963267948966 rad + pos: -6.5,0.5 + parent: 1 + type: Transform +- proto: AtmosFixBlockerMarker + entities: + - uid: 523 + components: + - pos: -3.5,-8.5 + parent: 1 + type: Transform + - uid: 524 + components: + - pos: -2.5,-8.5 + parent: 1 + type: Transform + - uid: 525 + components: + - pos: -1.5,-8.5 + parent: 1 + type: Transform + - uid: 526 + components: + - pos: 3.5,-8.5 + parent: 1 + type: Transform + - uid: 527 + components: + - pos: 4.5,-8.5 + parent: 1 + type: Transform + - uid: 528 + components: + - pos: 5.5,-8.5 + parent: 1 + type: Transform + - uid: 529 + components: + - pos: -3.5,9.5 + parent: 1 + type: Transform + - uid: 530 + components: + - pos: -2.5,9.5 + parent: 1 + type: Transform + - uid: 531 + components: + - pos: -1.5,9.5 + parent: 1 + type: Transform + - uid: 532 + components: + - pos: 3.5,9.5 + parent: 1 + type: Transform + - uid: 533 + components: + - pos: 4.5,9.5 + parent: 1 + type: Transform + - uid: 534 + components: + - pos: 5.5,9.5 + parent: 1 + type: Transform +- proto: BarSign + entities: + - uid: 209 + components: + - pos: -2.5,4.5 + parent: 1 + type: Transform +- proto: BassGuitarInstrument + entities: + - uid: 291 + components: + - pos: 4.386519,3.6216404 + parent: 1 + type: Transform +- proto: BenchSofaCorner + entities: + - uid: 120 + components: + - rot: -1.5707963267948966 rad + pos: 7.5,1.5 + parent: 1 + type: Transform + - canCollide: False + bodyType: Static + type: Physics + - fixtures: {} + type: Fixtures +- proto: BenchSofaLeft + entities: + - uid: 119 + components: + - rot: 3.141592653589793 rad + pos: 5.5,1.5 + parent: 1 + type: Transform + - bodyType: Static + type: Physics +- proto: BenchSofaMiddle + entities: + - uid: 121 + components: + - rot: 3.141592653589793 rad + pos: 6.5,1.5 + parent: 1 + type: Transform + - bodyType: Static + type: Physics +- proto: BenchSofaRight + entities: + - uid: 122 + components: + - rot: -1.5707963267948966 rad + pos: 7.5,2.5 + parent: 1 + type: Transform + - bodyType: Static + type: Physics +- proto: BlastDoor + entities: + - uid: 179 + components: + - pos: -5.5,1.5 + parent: 1 + type: Transform + - links: + - 493 + type: DeviceLinkSink + - uid: 337 + components: + - rot: -1.5707963267948966 rad + pos: -6.5,0.5 + parent: 1 + type: Transform + - links: + - 493 + type: DeviceLinkSink + - uid: 345 + components: + - pos: -4.5,1.5 + parent: 1 + type: Transform + - links: + - 493 + type: DeviceLinkSink +- proto: BookshelfFilled + entities: + - uid: 115 + components: + - pos: 7.5,3.5 + parent: 1 + type: Transform + - uid: 116 + components: + - pos: 5.5,3.5 + parent: 1 + type: Transform +- proto: BoozeDispenser + entities: + - uid: 129 + components: + - pos: 0.5,3.5 + parent: 1 + type: Transform +- proto: BoxFolderBlue + entities: + - uid: 514 + components: + - pos: 2.720742,5.7433147 + parent: 1 + type: Transform +- proto: BoxFolderRed + entities: + - uid: 513 + components: + - pos: 2.330117,5.7120647 + parent: 1 + type: Transform +- proto: CableApcExtension + entities: + - uid: 186 + components: + - pos: 4.5,8.5 + parent: 1 + type: Transform + - uid: 195 + components: + - pos: 4.5,-7.5 + parent: 1 + type: Transform + - uid: 412 + components: + - pos: -1.5,-5.5 + parent: 1 + type: Transform + - uid: 413 + components: + - pos: -1.5,-6.5 + parent: 1 + type: Transform + - uid: 414 + components: + - pos: -2.5,-6.5 + parent: 1 + type: Transform + - uid: 415 + components: + - pos: -2.5,8.5 + parent: 1 + type: Transform + - uid: 416 + components: + - pos: 6.5,-1.5 + parent: 1 + type: Transform + - uid: 417 + components: + - pos: -0.5,-6.5 + parent: 1 + type: Transform + - uid: 418 + components: + - pos: 0.5,-6.5 + parent: 1 + type: Transform + - uid: 419 + components: + - pos: 1.5,-6.5 + parent: 1 + type: Transform + - uid: 420 + components: + - pos: 2.5,-6.5 + parent: 1 + type: Transform + - uid: 421 + components: + - pos: 3.5,-6.5 + parent: 1 + type: Transform + - uid: 422 + components: + - pos: 4.5,-6.5 + parent: 1 + type: Transform + - uid: 423 + components: + - pos: 5.5,-1.5 + parent: 1 + type: Transform + - uid: 424 + components: + - pos: -2.5,-7.5 + parent: 1 + type: Transform + - uid: 425 + components: + - pos: -0.5,-5.5 + parent: 1 + type: Transform + - uid: 426 + components: + - pos: -0.5,-4.5 + parent: 1 + type: Transform + - uid: 427 + components: + - pos: -0.5,-3.5 + parent: 1 + type: Transform + - uid: 428 + components: + - pos: -0.5,-2.5 + parent: 1 + type: Transform + - uid: 429 + components: + - pos: -0.5,-1.5 + parent: 1 + type: Transform + - uid: 430 + components: + - pos: -0.5,-0.5 + parent: 1 + type: Transform + - uid: 431 + components: + - pos: -1.5,-1.5 + parent: 1 + type: Transform + - uid: 432 + components: + - pos: -2.5,-1.5 + parent: 1 + type: Transform + - uid: 433 + components: + - pos: -3.5,-1.5 + parent: 1 + type: Transform + - uid: 434 + components: + - pos: -4.5,-1.5 + parent: 1 + type: Transform + - uid: 435 + components: + - pos: -5.5,-1.5 + parent: 1 + type: Transform + - uid: 436 + components: + - pos: 0.5,-0.5 + parent: 1 + type: Transform + - uid: 437 + components: + - pos: 1.5,-0.5 + parent: 1 + type: Transform + - uid: 438 + components: + - pos: 2.5,-0.5 + parent: 1 + type: Transform + - uid: 439 + components: + - pos: 3.5,-0.5 + parent: 1 + type: Transform + - uid: 440 + components: + - pos: 4.5,-0.5 + parent: 1 + type: Transform + - uid: 441 + components: + - pos: 7.5,-1.5 + parent: 1 + type: Transform + - uid: 444 + components: + - pos: -0.5,2.5 + parent: 1 + type: Transform + - uid: 445 + components: + - pos: -0.5,3.5 + parent: 1 + type: Transform + - uid: 446 + components: + - pos: -0.5,4.5 + parent: 1 + type: Transform + - uid: 447 + components: + - pos: -0.5,5.5 + parent: 1 + type: Transform + - uid: 448 + components: + - pos: 0.5,5.5 + parent: 1 + type: Transform + - uid: 449 + components: + - pos: 1.5,5.5 + parent: 1 + type: Transform + - uid: 450 + components: + - pos: 1.5,6.5 + parent: 1 + type: Transform + - uid: 451 + components: + - pos: 2.5,6.5 + parent: 1 + type: Transform + - uid: 452 + components: + - pos: 3.5,6.5 + parent: 1 + type: Transform + - uid: 453 + components: + - pos: 4.5,6.5 + parent: 1 + type: Transform + - uid: 454 + components: + - pos: 5.5,6.5 + parent: 1 + type: Transform + - uid: 455 + components: + - pos: 4.5,7.5 + parent: 1 + type: Transform + - uid: 458 + components: + - pos: -0.5,6.5 + parent: 1 + type: Transform + - uid: 459 + components: + - pos: -1.5,6.5 + parent: 1 + type: Transform + - uid: 460 + components: + - pos: -2.5,6.5 + parent: 1 + type: Transform + - uid: 461 + components: + - pos: -2.5,7.5 + parent: 1 + type: Transform + - uid: 464 + components: + - pos: -3.5,6.5 + parent: 1 + type: Transform + - uid: 465 + components: + - pos: -4.5,6.5 + parent: 1 + type: Transform + - uid: 466 + components: + - pos: -4.5,5.5 + parent: 1 + type: Transform + - uid: 467 + components: + - pos: -4.5,4.5 + parent: 1 + type: Transform + - uid: 468 + components: + - pos: -4.5,3.5 + parent: 1 + type: Transform + - uid: 469 + components: + - pos: -4.5,2.5 + parent: 1 + type: Transform + - uid: 471 + components: + - pos: 0.5,2.5 + parent: 1 + type: Transform + - uid: 472 + components: + - pos: 1.5,2.5 + parent: 1 + type: Transform + - uid: 473 + components: + - pos: -1.5,2.5 + parent: 1 + type: Transform + - uid: 474 + components: + - pos: -2.5,2.5 + parent: 1 + type: Transform + - uid: 475 + components: + - pos: 0.5,-3.5 + parent: 1 + type: Transform + - uid: 476 + components: + - pos: 1.5,-3.5 + parent: 1 + type: Transform + - uid: 477 + components: + - pos: 2.5,-3.5 + parent: 1 + type: Transform + - uid: 478 + components: + - pos: 3.5,-3.5 + parent: 1 + type: Transform + - uid: 479 + components: + - pos: 4.5,-3.5 + parent: 1 + type: Transform + - uid: 480 + components: + - pos: 4.5,-4.5 + parent: 1 + type: Transform + - uid: 481 + components: + - pos: 4.5,-1.5 + parent: 1 + type: Transform + - uid: 484 + components: + - pos: 2.5,2.5 + parent: 1 + type: Transform + - uid: 485 + components: + - pos: 3.5,2.5 + parent: 1 + type: Transform + - uid: 486 + components: + - pos: 4.5,2.5 + parent: 1 + type: Transform + - uid: 487 + components: + - pos: 5.5,2.5 + parent: 1 + type: Transform + - uid: 488 + components: + - pos: 6.5,2.5 + parent: 1 + type: Transform +- proto: CableHV + entities: + - uid: 386 + components: + - pos: -4.5,-5.5 + parent: 1 + type: Transform + - uid: 387 + components: + - pos: -4.5,-4.5 + parent: 1 + type: Transform + - uid: 388 + components: + - pos: -3.5,-4.5 + parent: 1 + type: Transform + - uid: 389 + components: + - pos: -2.5,-4.5 + parent: 1 + type: Transform +- proto: CableMV + entities: + - uid: 393 + components: + - pos: -2.5,-4.5 + parent: 1 + type: Transform + - uid: 394 + components: + - pos: -2.5,-5.5 + parent: 1 + type: Transform + - uid: 395 + components: + - pos: -2.5,-6.5 + parent: 1 + type: Transform + - uid: 396 + components: + - pos: -1.5,-6.5 + parent: 1 + type: Transform + - uid: 397 + components: + - pos: -0.5,-6.5 + parent: 1 + type: Transform + - uid: 398 + components: + - pos: -0.5,-5.5 + parent: 1 + type: Transform + - uid: 399 + components: + - pos: -1.5,-5.5 + parent: 1 + type: Transform + - uid: 400 + components: + - pos: -0.5,-4.5 + parent: 1 + type: Transform + - uid: 401 + components: + - pos: -0.5,-3.5 + parent: 1 + type: Transform + - uid: 402 + components: + - pos: -0.5,-2.5 + parent: 1 + type: Transform + - uid: 403 + components: + - pos: -0.5,-1.5 + parent: 1 + type: Transform + - uid: 404 + components: + - pos: -0.5,-0.5 + parent: 1 + type: Transform + - uid: 405 + components: + - pos: -0.5,0.5 + parent: 1 + type: Transform + - uid: 406 + components: + - pos: -0.5,1.5 + parent: 1 + type: Transform + - uid: 407 + components: + - pos: -0.5,2.5 + parent: 1 + type: Transform + - uid: 408 + components: + - pos: -0.5,3.5 + parent: 1 + type: Transform + - uid: 409 + components: + - pos: -0.5,4.5 + parent: 1 + type: Transform + - uid: 410 + components: + - pos: -0.5,5.5 + parent: 1 + type: Transform + - uid: 411 + components: + - pos: 0.5,5.5 + parent: 1 + type: Transform +- proto: CableTerminal + entities: + - uid: 390 + components: + - rot: 1.5707963267948966 rad + pos: -4.5,-4.5 + parent: 1 + type: Transform +- proto: CarpetPurple + entities: + - uid: 210 + components: + - pos: 7.5,1.5 + parent: 1 + type: Transform + - uid: 211 + components: + - pos: 7.5,2.5 + parent: 1 + type: Transform + - uid: 212 + components: + - pos: 6.5,1.5 + parent: 1 + type: Transform + - uid: 213 + components: + - pos: 6.5,2.5 + parent: 1 + type: Transform + - uid: 214 + components: + - pos: 5.5,1.5 + parent: 1 + type: Transform + - uid: 215 + components: + - pos: 5.5,2.5 + parent: 1 + type: Transform +- proto: Catwalk + entities: + - uid: 140 + components: + - rot: 1.5707963267948966 rad + pos: -3.5,-8.5 + parent: 1 + type: Transform + - uid: 141 + components: + - rot: 1.5707963267948966 rad + pos: -2.5,-8.5 + parent: 1 + type: Transform + - uid: 142 + components: + - rot: 1.5707963267948966 rad + pos: -1.5,-8.5 + parent: 1 + type: Transform + - uid: 143 + components: + - rot: 1.5707963267948966 rad + pos: 3.5,-8.5 + parent: 1 + type: Transform + - uid: 144 + components: + - rot: 1.5707963267948966 rad + pos: 4.5,-8.5 + parent: 1 + type: Transform + - uid: 145 + components: + - rot: 1.5707963267948966 rad + pos: 5.5,-8.5 + parent: 1 + type: Transform + - uid: 146 + components: + - rot: 1.5707963267948966 rad + pos: -3.5,9.5 + parent: 1 + type: Transform + - uid: 147 + components: + - rot: 1.5707963267948966 rad + pos: -2.5,9.5 + parent: 1 + type: Transform + - uid: 148 + components: + - rot: 1.5707963267948966 rad + pos: -1.5,9.5 + parent: 1 + type: Transform + - uid: 149 + components: + - rot: 1.5707963267948966 rad + pos: 3.5,9.5 + parent: 1 + type: Transform + - uid: 150 + components: + - rot: 1.5707963267948966 rad + pos: 4.5,9.5 + parent: 1 + type: Transform + - uid: 151 + components: + - rot: 1.5707963267948966 rad + pos: 5.5,9.5 + parent: 1 + type: Transform +- proto: ChairPilotSeat + entities: + - uid: 197 + components: + - rot: 3.141592653589793 rad + pos: 2.5,6.5 + parent: 1 + type: Transform +- proto: ChairWood + entities: + - uid: 218 + components: + - rot: 1.5707963267948966 rad + pos: -2.5,-2.5 + parent: 1 + type: Transform + - uid: 220 + components: + - pos: 1.5,-2.5 + parent: 1 + type: Transform + - uid: 221 + components: + - pos: 2.5,-2.5 + parent: 1 + type: Transform + - uid: 222 + components: + - rot: -1.5707963267948966 rad + pos: 3.5,-3.5 + parent: 1 + type: Transform + - uid: 223 + components: + - rot: 1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 + type: Transform + - uid: 224 + components: + - pos: -1.5,-1.5 + parent: 1 + type: Transform + - uid: 225 + components: + - rot: -1.5707963267948966 rad + pos: -0.5,-2.5 + parent: 1 + type: Transform +- proto: ClosetWallEmergencyFilledRandom + entities: + - uid: 506 + components: + - rot: 3.141592653589793 rad + pos: 5.5,4.5 + parent: 1 + type: Transform +- proto: ClothingBeltUtilityFilled + entities: + - uid: 346 + components: + - pos: 1.5155181,-5.436296 + parent: 1 + type: Transform +- proto: ComputerSurveillanceCameraMonitor + entities: + - uid: 198 + components: + - rot: 3.141592653589793 rad + pos: 1.5,5.5 + parent: 1 + type: Transform +- proto: ComputerTabletopShuttle + entities: + - uid: 470 + components: + - pos: 2.5,7.5 + parent: 1 + type: Transform +- proto: ComputerTabletopStationRecords + entities: + - uid: 463 + components: + - pos: 1.5,7.5 + parent: 1 + type: Transform +- proto: ComputerWallmountWithdrawBankATM + entities: + - uid: 190 + components: + - pos: 2.5,1.5 + parent: 1 + type: Transform + - containers: + board: !type:Container + ents: [] + bank-ATM-cashSlot: !type:ContainerSlot {} + type: ContainerContainer + - type: ItemSlots +- proto: ConveyorBelt + entities: + - uid: 180 + components: + - rot: -1.5707963267948966 rad + pos: -6.5,0.5 + parent: 1 + type: Transform + - links: + - 502 + type: DeviceLinkSink + - uid: 181 + components: + - rot: -1.5707963267948966 rad + pos: -5.5,0.5 + parent: 1 + type: Transform + - links: + - 502 + type: DeviceLinkSink +- proto: DefibrillatorCabinetFilled + entities: + - uid: 321 + components: + - rot: 3.141592653589793 rad + pos: 3.5,-4.5 + parent: 1 + type: Transform +- proto: DrinkKegSteel + entities: + - uid: 492 + components: + - pos: -1.4009669,5.600147 + parent: 1 + type: Transform +- proto: DrinkKegWood + entities: + - uid: 205 + components: + - pos: -1.8540919,5.537647 + parent: 1 + type: Transform +- proto: EmergencyLight + entities: + - uid: 516 + components: + - rot: 3.141592653589793 rad + pos: 2.5,-3.5 + parent: 1 + type: Transform + - uid: 517 + components: + - pos: 0.5,-6.5 + parent: 1 + type: Transform + - uid: 518 + components: + - pos: 3.5,7.5 + parent: 1 + type: Transform +- proto: ExtinguisherCabinetFilled + entities: + - uid: 293 + components: + - rot: 1.5707963267948966 rad + pos: -1.5,-4.5 + parent: 1 + type: Transform +- proto: FaxMachineShip + entities: + - uid: 202 + components: + - pos: 3.5,7.5 + parent: 1 + type: Transform +- proto: FirelockGlass + entities: + - uid: 356 + components: + - pos: 5.5,-0.5 + parent: 1 + type: Transform + - uid: 357 + components: + - pos: 5.5,-1.5 + parent: 1 + type: Transform + - uid: 358 + components: + - pos: -3.5,-1.5 + parent: 1 + type: Transform + - uid: 359 + components: + - pos: -3.5,-0.5 + parent: 1 + type: Transform + - uid: 360 + components: + - pos: -0.5,-5.5 + parent: 1 + type: Transform + - uid: 361 + components: + - pos: -5.5,1.5 + parent: 1 + type: Transform + - uid: 362 + components: + - pos: -4.5,1.5 + parent: 1 + type: Transform + - uid: 363 + components: + - pos: -4.5,4.5 + parent: 1 + type: Transform + - uid: 364 + components: + - pos: -0.5,4.5 + parent: 1 + type: Transform + - uid: 365 + components: + - pos: 0.5,6.5 + parent: 1 + type: Transform + - uid: 366 + components: + - pos: 5.5,-4.5 + parent: 1 + type: Transform +- proto: Fireplace + entities: + - uid: 114 + components: + - pos: 6.5,3.5 + parent: 1 + type: Transform +- proto: GasPassiveVent + entities: + - uid: 196 + components: + - rot: 3.141592653589793 rad + pos: -2.5,-8.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor +- proto: GasPipeBend + entities: + - uid: 271 + components: + - rot: 1.5707963267948966 rad + pos: -2.5,-6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 281 + components: + - pos: -2.5,-1.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 282 + components: + - rot: 3.141592653589793 rad + pos: -2.5,-2.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 283 + components: + - rot: 3.141592653589793 rad + pos: 2.5,-6.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 284 + components: + - rot: -1.5707963267948966 rad + pos: 4.5,-6.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 318 + components: + - rot: 3.141592653589793 rad + pos: 1.5,0.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor +- proto: GasPipeFourway + entities: + - uid: 238 + components: + - pos: -0.5,2.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 241 + components: + - pos: -0.5,-0.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor +- proto: GasPipeStraight + entities: + - uid: 235 + components: + - rot: 3.141592653589793 rad + pos: -0.5,5.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 236 + components: + - rot: 3.141592653589793 rad + pos: -0.5,4.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 237 + components: + - rot: 3.141592653589793 rad + pos: -0.5,3.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 239 + components: + - rot: 3.141592653589793 rad + pos: -0.5,1.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 240 + components: + - rot: 3.141592653589793 rad + pos: -0.5,0.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 242 + components: + - rot: 3.141592653589793 rad + pos: -0.5,-1.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 243 + components: + - rot: 3.141592653589793 rad + pos: -0.5,-2.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 245 + components: + - rot: 3.141592653589793 rad + pos: -0.5,-4.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 246 + components: + - rot: 3.141592653589793 rad + pos: -0.5,-5.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 248 + components: + - rot: -1.5707963267948966 rad + pos: -2.5,6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 250 + components: + - pos: 4.5,-3.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 251 + components: + - rot: -1.5707963267948966 rad + pos: -1.5,2.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 252 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,2.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 253 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,2.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 254 + components: + - rot: -1.5707963267948966 rad + pos: 2.5,2.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 255 + components: + - rot: -1.5707963267948966 rad + pos: 3.5,2.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 256 + components: + - rot: -1.5707963267948966 rad + pos: 4.5,2.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 257 + components: + - rot: -1.5707963267948966 rad + pos: 5.5,2.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 260 + components: + - rot: 1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 261 + components: + - rot: 1.5707963267948966 rad + pos: -2.5,-0.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 262 + components: + - rot: 1.5707963267948966 rad + pos: -3.5,-0.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 263 + components: + - rot: 1.5707963267948966 rad + pos: 0.5,-0.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 264 + components: + - rot: 1.5707963267948966 rad + pos: 1.5,-0.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 265 + components: + - rot: 1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 266 + components: + - rot: -1.5707963267948966 rad + pos: 3.5,0.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 267 + components: + - rot: 1.5707963267948966 rad + pos: 4.5,-0.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 268 + components: + - rot: 1.5707963267948966 rad + pos: 5.5,-0.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 272 + components: + - pos: -2.5,-7.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 274 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 275 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 276 + components: + - rot: -1.5707963267948966 rad + pos: 2.5,6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 277 + components: + - rot: -1.5707963267948966 rad + pos: -1.5,6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 288 + components: + - rot: 1.5707963267948966 rad + pos: 5.5,-1.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 289 + components: + - pos: 4.5,-5.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 290 + components: + - pos: 4.5,-4.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 292 + components: + - rot: -1.5707963267948966 rad + pos: 3.5,-2.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 294 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,-2.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 295 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,-2.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 296 + components: + - rot: -1.5707963267948966 rad + pos: -0.5,-2.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 297 + components: + - rot: -1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 298 + components: + - rot: 3.141592653589793 rad + pos: 4.5,-0.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 301 + components: + - rot: 3.141592653589793 rad + pos: 4.5,2.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 302 + components: + - rot: 3.141592653589793 rad + pos: 4.5,3.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 303 + components: + - rot: 3.141592653589793 rad + pos: 4.5,4.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 307 + components: + - rot: 1.5707963267948966 rad + pos: -3.5,-1.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 309 + components: + - rot: -1.5707963267948966 rad + pos: 3.5,5.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 310 + components: + - rot: -1.5707963267948966 rad + pos: 2.5,5.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 311 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,5.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 312 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,5.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 313 + components: + - rot: -1.5707963267948966 rad + pos: -0.5,5.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 314 + components: + - rot: -1.5707963267948966 rad + pos: -1.5,5.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 315 + components: + - rot: -1.5707963267948966 rad + pos: -2.5,5.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 317 + components: + - rot: -1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 325 + components: + - rot: 1.5707963267948966 rad + pos: 5.5,1.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 327 + components: + - rot: 3.141592653589793 rad + pos: 1.5,1.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 329 + components: + - rot: 1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 333 + components: + - rot: 1.5707963267948966 rad + pos: 3.5,-0.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor +- proto: GasPipeTJunction + entities: + - uid: 244 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,-3.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 247 + components: + - rot: 3.141592653589793 rad + pos: -0.5,-6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 273 + components: + - pos: -0.5,6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 280 + components: + - pos: 2.5,-2.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 286 + components: + - rot: -1.5707963267948966 rad + pos: 4.5,-2.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 287 + components: + - rot: 1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 299 + components: + - rot: -1.5707963267948966 rad + pos: 4.5,0.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 300 + components: + - rot: 1.5707963267948966 rad + pos: 4.5,1.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 304 + components: + - rot: -1.5707963267948966 rad + pos: 4.5,5.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor +- proto: GasPort + entities: + - uid: 319 + components: + - pos: 2.5,-5.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor +- proto: GasPressurePump + entities: + - uid: 194 + components: + - rot: -1.5707963267948966 rad + pos: -1.5,-6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 285 + components: + - rot: 1.5707963267948966 rad + pos: 3.5,-6.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor +- proto: GasVentPump + entities: + - uid: 249 + components: + - rot: 3.141592653589793 rad + pos: 2.5,-3.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 305 + components: + - rot: -1.5707963267948966 rad + pos: 6.5,-1.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 306 + components: + - rot: 1.5707963267948966 rad + pos: -4.5,-1.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 308 + components: + - pos: 4.5,6.5 + parent: 1 + type: Transform + - ShutdownSubscribers: + - 84 + type: DeviceNetwork + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 316 + components: + - rot: 1.5707963267948966 rad + pos: -3.5,5.5 + parent: 1 + type: Transform + - ShutdownSubscribers: + - 84 + type: DeviceNetwork + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 326 + components: + - rot: -1.5707963267948966 rad + pos: 6.5,1.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor + - uid: 328 + components: + - pos: 1.5,2.5 + parent: 1 + type: Transform + - color: '#0000CCFF' + type: AtmosPipeColor +- proto: GasVentScrubber + entities: + - uid: 258 + components: + - rot: -1.5707963267948966 rad + pos: 6.5,2.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 259 + components: + - rot: 1.5707963267948966 rad + pos: -2.5,2.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 269 + components: + - rot: 1.5707963267948966 rad + pos: -4.5,-0.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 270 + components: + - rot: -1.5707963267948966 rad + pos: 6.5,-0.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 278 + components: + - rot: 1.5707963267948966 rad + pos: -3.5,6.5 + parent: 1 + type: Transform + - ShutdownSubscribers: + - 84 + type: DeviceNetwork + - color: '#990000FF' + type: AtmosPipeColor + - uid: 279 + components: + - rot: -1.5707963267948966 rad + pos: 3.5,6.5 + parent: 1 + type: Transform + - ShutdownSubscribers: + - 84 + type: DeviceNetwork + - color: '#990000FF' + type: AtmosPipeColor + - uid: 331 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 349 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,-6.5 + parent: 1 + type: Transform + - ShutdownSubscribers: + - 482 + type: DeviceNetwork + - color: '#990000FF' + type: AtmosPipeColor +- proto: GravityGeneratorMini + entities: + - uid: 320 + components: + - pos: -2.5,-5.5 + parent: 1 + type: Transform +- proto: Grille + entities: + - uid: 64 + components: + - pos: -5.5,5.5 + parent: 1 + type: Transform + - uid: 65 + components: + - pos: -0.5,8.5 + parent: 1 + type: Transform + - uid: 68 + components: + - rot: -1.5707963267948966 rad + pos: -6.5,2.5 + parent: 1 + type: Transform + - uid: 69 + components: + - rot: -1.5707963267948966 rad + pos: -6.5,3.5 + parent: 1 + type: Transform + - uid: 82 + components: + - rot: 3.141592653589793 rad + pos: 2.5,-7.5 + parent: 1 + type: Transform + - uid: 85 + components: + - rot: 3.141592653589793 rad + pos: -0.5,-7.5 + parent: 1 + type: Transform + - uid: 97 + components: + - rot: 3.141592653589793 rad + pos: 8.5,1.5 + parent: 1 + type: Transform + - uid: 98 + components: + - rot: 3.141592653589793 rad + pos: 8.5,2.5 + parent: 1 + type: Transform + - uid: 99 + components: + - rot: 3.141592653589793 rad + pos: 8.5,3.5 + parent: 1 + type: Transform + - uid: 102 + components: + - pos: 7.5,6.5 + parent: 1 + type: Transform + - uid: 103 + components: + - pos: 7.5,5.5 + parent: 1 + type: Transform + - uid: 109 + components: + - pos: 1.5,8.5 + parent: 1 + type: Transform + - uid: 110 + components: + - pos: 2.5,8.5 + parent: 1 + type: Transform + - uid: 112 + components: + - pos: -5.5,6.5 + parent: 1 + type: Transform + - uid: 332 + components: + - pos: 1.5,-7.5 + parent: 1 + type: Transform +- proto: Gyroscope + entities: + - uid: 334 + components: + - pos: 4.5,5.5 + parent: 1 + type: Transform +- proto: HospitalCurtainsOpen + entities: + - uid: 229 + components: + - rot: 3.141592653589793 rad + pos: 6.5,-5.5 + parent: 1 + type: Transform +- proto: hydroponicsTrayAnchored + entities: + - uid: 192 + components: + - pos: -0.5,7.5 + parent: 1 + type: Transform + - uid: 193 + components: + - pos: -1.5,7.5 + parent: 1 + type: Transform +- proto: KitchenReagentGrinder + entities: + - uid: 494 + components: + - pos: -2.5,5.5 + parent: 1 + type: Transform +- proto: LampGold + entities: + - uid: 515 + components: + - rot: -1.5707963267948966 rad + pos: 4.638707,3.853603 + parent: 1 + type: Transform +- proto: LockerCaptainFilled + entities: + - uid: 204 + components: + - pos: 6.5,6.5 + parent: 1 + type: Transform +- proto: MinimoogInstrument + entities: + - uid: 323 + components: + - rot: 3.141592653589793 rad + pos: 3.5,3.5 + parent: 1 + type: Transform +- proto: Paper + entities: + - uid: 519 + components: + - rot: 3.141592653589793 rad + pos: -0.7506112,1.56815 + parent: 1 + type: Transform + - uid: 520 + components: + - rot: 3.141592653589793 rad + pos: -0.4693612,1.63065 + parent: 1 + type: Transform + - uid: 521 + components: + - pos: -3.7583714,-5.2648873 + parent: 1 + type: Transform + - stampState: paper_stamp-ce + stampedBy: + - stampedBorderless: False + stampedColor: '#C69B17FF' + stampedName: stamp-component-stamped-name-ce + - stampedBorderless: False + stampedColor: '#00BE00FF' + stampedName: stamp-component-stamped-name-approved + content: >- + [color=#1b67a5]█░░█░███[/color][color=#5b97bc]░███░█░█░█░██░░█░█░██░░██░░██░[/color] + + [color=#1b67a5]██░█░░█░[/color][color=#5b97bc]██░░░█░█░█░█░█░█░█░█░█░█░█░█░█[/color] + + [color=#1b67a5]█░██░░█░[/color][color=#5b97bc]░░██░███░█░██░░░█░░███░██░░█░█[/color] + + [color=#1b67a5]█░░█░░█░[/color][color=#5b97bc]███░░█░█░█░█░░░░█░░█░█░█░█░██░[/color] + + + [head=1]=========================[/head] + + [head=1] Kilderkin-class service ship[/head] + + [head=1] [/head] + + [head=1] PREFLIGHT CHECKLIST[/head] + + [head=1] [/head] + + [head=1]=========================[/head] + + + [head=2]1. Power supply.[/head] + + [head=3]1.1. Battery units.[/head] + + [bullet/][ ] Check if the SMES unit is anchored to the floor. + + [bullet/][ ] Check if the substation unit is anchored to the floor. + + [bullet/][ ] Check if the APC unit's Main Breakers are toggled on. + + [bullet/][ ] Check current Load[bold]*[/bold] (W) on APC unit. + + [head=3]1.2. P.A.C.M.A.N. generator units.[/head] + + [bullet/][ ] Check if the P.A.C.M.A.N. generator units are anchored to the floor. + + [bullet/][ ] Check if the P.A.C.M.A.N. generator units are fueled. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation. + + [bullet/][ ] Check if the P.A.C.M.A.N. generator units are set to HV output. + + [bullet/][ ] Set Target Power for 13 [bold]**[/bold] [bold]k[/bold]W. + + [bullet/][ ] Start the P.A.C.M.A.N. generator units. + + + [head=2]2. Atmospherics.[/head] + + [head=3]2.1. Distribution Loop.[/head] + + [bullet/][ ] Check if the air canister is anchored to connector port. + + [bullet/][ ] Check if the air output pump is set to normal pressure. + + [bullet/][ ] Enable the air output pump. + + [bullet/][ ] Check if the distribution pump is set to normal pressure. + + [bullet/][ ] Enable distribution pump. + + [head=3]2.2. Waste Loop.[/head] + + [bullet/][ ] Enable waste loop pump. + + + [head=2]3. Other checks.[/head] + + [bullet/][ ] Check if the gyroscope is anchored, powered, and enabled. + + [bullet/][ ] Check if the mini gravity generator is anchored, powered, and enabled. + + + __________________________________________________________________ + + [bold]*[/bold] - Kilderkin-class service ships are equipped with a two APC units that can be used to appraise the ship's total power consumption. Unmodifued Kilderkin-class ship requires 24.2 kW of power to remain operational. + + [bold]**[/bold] - Kilderkin-class service ships have higher power demand than single standard P.A.C.M.A.N. generator unit can provide at optimal settings, however the ship comes equipped with two P.A.C.M.A.N. generator units, recommended target power output for each P.A.C.M.A.N. generator unit is 13 kW. + + [bold]Note:[/bold] Additional generator units can be purchased at the Frontier Station. + type: Paper +- proto: PlasticFlapsClear + entities: + - uid: 336 + components: + - rot: -1.5707963267948966 rad + pos: -6.5,0.5 + parent: 1 + type: Transform +- proto: PortableGeneratorPacman + entities: + - uid: 182 + components: + - anchored: True + pos: -4.5,-5.5 + parent: 1 + type: Transform + - storage: + Plasma: 1500 + type: MaterialStorage + - bodyType: Static + type: Physics + - type: InsertingMaterialStorage + - uid: 183 + components: + - anchored: True + pos: -4.5,-4.5 + parent: 1 + type: Transform + - storage: + Plasma: 1500 + type: MaterialStorage + - bodyType: Static + type: Physics + - type: InsertingMaterialStorage +- proto: PowerCellRecharger + entities: + - uid: 203 + components: + - pos: 3.5,5.5 + parent: 1 + type: Transform +- proto: Poweredlight + entities: + - uid: 340 + components: + - rot: 3.141592653589793 rad + pos: 1.5,-3.5 + parent: 1 + type: Transform + - uid: 341 + components: + - rot: 1.5707963267948966 rad + pos: -5.5,-1.5 + parent: 1 + type: Transform + - uid: 342 + components: + - rot: -1.5707963267948966 rad + pos: 7.5,-1.5 + parent: 1 + type: Transform + - uid: 343 + components: + - rot: 3.141592653589793 rad + pos: 4.5,5.5 + parent: 1 + type: Transform + - uid: 344 + components: + - rot: 3.141592653589793 rad + pos: -2.5,5.5 + parent: 1 + type: Transform + - uid: 353 + components: + - rot: 3.141592653589793 rad + pos: -4.5,-2.5 + parent: 1 + type: Transform + - uid: 355 + components: + - rot: 3.141592653589793 rad + pos: 6.5,-2.5 + parent: 1 + type: Transform + - uid: 522 + components: + - rot: 1.5707963267948966 rad + pos: -2.5,2.5 + parent: 1 + type: Transform +- proto: PoweredlightLED + entities: + - uid: 542 + components: + - rot: 3.141592653589793 rad + pos: 0.5,-6.5 + parent: 1 + type: Transform +- proto: PoweredSmallLight + entities: + - uid: 352 + components: + - pos: 6.5,-4.5 + parent: 1 + type: Transform + - uid: 354 + components: + - rot: -1.5707963267948966 rad + pos: -4.5,3.5 + parent: 1 + type: Transform +- proto: Rack + entities: + - uid: 462 + components: + - pos: 1.5,-5.5 + parent: 1 + type: Transform +- proto: RandomPainting + entities: + - uid: 499 + components: + - pos: 2.5,3.5 + parent: 1 + type: Transform + - uid: 500 + components: + - rot: 3.141592653589793 rad + pos: 6.5,0.5 + parent: 1 + type: Transform + - uid: 501 + components: + - rot: 3.141592653589793 rad + pos: 1.5,-4.5 + parent: 1 + type: Transform +- proto: ReinforcedWindow + entities: + - uid: 132 + components: + - pos: 7.5,6.5 + parent: 1 + type: Transform + - uid: 133 + components: + - pos: 7.5,5.5 + parent: 1 + type: Transform + - uid: 134 + components: + - pos: 2.5,8.5 + parent: 1 + type: Transform + - uid: 135 + components: + - pos: 1.5,8.5 + parent: 1 + type: Transform + - uid: 136 + components: + - pos: -0.5,8.5 + parent: 1 + type: Transform + - uid: 137 + components: + - pos: -5.5,6.5 + parent: 1 + type: Transform + - uid: 138 + components: + - pos: -5.5,5.5 + parent: 1 + type: Transform + - uid: 230 + components: + - rot: 3.141592653589793 rad + pos: 8.5,3.5 + parent: 1 + type: Transform + - uid: 231 + components: + - rot: 3.141592653589793 rad + pos: 8.5,2.5 + parent: 1 + type: Transform + - uid: 232 + components: + - rot: 3.141592653589793 rad + pos: 8.5,1.5 + parent: 1 + type: Transform + - uid: 233 + components: + - rot: 3.141592653589793 rad + pos: -0.5,-7.5 + parent: 1 + type: Transform + - uid: 234 + components: + - rot: 3.141592653589793 rad + pos: 2.5,-7.5 + parent: 1 + type: Transform + - uid: 338 + components: + - rot: -1.5707963267948966 rad + pos: -6.5,3.5 + parent: 1 + type: Transform + - uid: 339 + components: + - rot: -1.5707963267948966 rad + pos: -6.5,2.5 + parent: 1 + type: Transform + - uid: 510 + components: + - pos: 1.5,-7.5 + parent: 1 + type: Transform +- proto: ShadowTree01 + entities: + - uid: 189 + components: + - pos: 1.5,-1.5 + parent: 1 + type: Transform +- proto: SheetPlasma + entities: + - uid: 347 + components: + - pos: -4.2716427,-5.469825 + parent: 1 + type: Transform + - count: 15 + type: Stack + - size: 15 + type: Item + - uid: 348 + components: + - pos: -4.280203,-4.4959035 + parent: 1 + type: Transform + - count: 15 + type: Stack + - size: 15 + type: Item +- proto: ShuttersNormalOpen + entities: + - uid: 367 + components: + - pos: -2.5,1.5 + parent: 1 + type: Transform + - links: + - 490 + type: DeviceLinkSink + - uid: 368 + components: + - pos: -1.5,1.5 + parent: 1 + type: Transform + - links: + - 490 + type: DeviceLinkSink + - uid: 369 + components: + - pos: -0.5,1.5 + parent: 1 + type: Transform + - links: + - 490 + type: DeviceLinkSink + - uid: 370 + components: + - pos: 0.5,1.5 + parent: 1 + type: Transform + - links: + - 490 + type: DeviceLinkSink + - uid: 371 + components: + - pos: -0.5,-7.5 + parent: 1 + type: Transform + - links: + - 489 + type: DeviceLinkSink + - uid: 372 + components: + - pos: 2.5,-7.5 + parent: 1 + type: Transform + - links: + - 489 + type: DeviceLinkSink + - uid: 373 + components: + - rot: -1.5707963267948966 rad + pos: -6.5,2.5 + parent: 1 + type: Transform + - links: + - 537 + type: DeviceLinkSink + - uid: 374 + components: + - rot: -1.5707963267948966 rad + pos: -6.5,3.5 + parent: 1 + type: Transform + - links: + - 537 + type: DeviceLinkSink + - uid: 375 + components: + - rot: -1.5707963267948966 rad + pos: -5.5,5.5 + parent: 1 + type: Transform + - links: + - 508 + type: DeviceLinkSink + - uid: 376 + components: + - rot: -1.5707963267948966 rad + pos: -5.5,6.5 + parent: 1 + type: Transform + - links: + - 508 + type: DeviceLinkSink + - uid: 377 + components: + - rot: 3.141592653589793 rad + pos: -0.5,8.5 + parent: 1 + type: Transform + - links: + - 508 + type: DeviceLinkSink + - uid: 378 + components: + - rot: 3.141592653589793 rad + pos: 1.5,8.5 + parent: 1 + type: Transform + - links: + - 491 + type: DeviceLinkSink + - uid: 379 + components: + - rot: 3.141592653589793 rad + pos: 2.5,8.5 + parent: 1 + type: Transform + - links: + - 491 + type: DeviceLinkSink + - uid: 380 + components: + - rot: 1.5707963267948966 rad + pos: 7.5,6.5 + parent: 1 + type: Transform + - links: + - 491 + type: DeviceLinkSink + - uid: 381 + components: + - rot: 1.5707963267948966 rad + pos: 7.5,5.5 + parent: 1 + type: Transform + - links: + - 491 + type: DeviceLinkSink + - uid: 382 + components: + - rot: 1.5707963267948966 rad + pos: 8.5,3.5 + parent: 1 + type: Transform + - links: + - 483 + type: DeviceLinkSink + - uid: 383 + components: + - rot: 1.5707963267948966 rad + pos: 8.5,2.5 + parent: 1 + type: Transform + - links: + - 483 + type: DeviceLinkSink + - uid: 384 + components: + - rot: 1.5707963267948966 rad + pos: 8.5,1.5 + parent: 1 + type: Transform + - links: + - 483 + type: DeviceLinkSink + - uid: 385 + components: + - rot: 1.5707963267948966 rad + pos: 2.5,2.5 + parent: 1 + type: Transform + - links: + - 490 + type: DeviceLinkSink + - uid: 495 + components: + - pos: 1.5,1.5 + parent: 1 + type: Transform + - links: + - 490 + type: DeviceLinkSink + - uid: 511 + components: + - pos: 1.5,-7.5 + parent: 1 + type: Transform + - links: + - 489 + type: DeviceLinkSink +- proto: SignalButtonDirectional + entities: + - uid: 483 + components: + - name: shutters switch + type: MetaData + - rot: 3.141592653589793 rad + pos: 7.5,0.5 + parent: 1 + type: Transform + - linkedPorts: + 384: + - Pressed: Toggle + 383: + - Pressed: Toggle + 382: + - Pressed: Toggle + type: DeviceLinkSource + - uid: 489 + components: + - name: shutters switch + type: MetaData + - rot: 3.141592653589793 rad + pos: 0.5,-7.5 + parent: 1 + type: Transform + - linkedPorts: + 371: + - Pressed: Toggle + 372: + - Pressed: Toggle + 511: + - Pressed: Toggle + type: DeviceLinkSource + - uid: 490 + components: + - name: bar shutters switch + type: MetaData + - pos: 0.5,4.5 + parent: 1 + type: Transform + - linkedPorts: + 385: + - Pressed: Toggle + 370: + - Pressed: Toggle + 369: + - Pressed: Toggle + 368: + - Pressed: Toggle + 367: + - Pressed: Toggle + 495: + - Pressed: Toggle + type: DeviceLinkSource + - uid: 491 + components: + - rot: 1.5707963267948966 rad + pos: 0.5,7.5 + parent: 1 + type: Transform + - linkedPorts: + 378: + - Pressed: Toggle + 379: + - Pressed: Toggle + 380: + - Pressed: Toggle + 381: + - Pressed: Toggle + type: DeviceLinkSource + - uid: 493 + components: + - name: blastdoors switch + type: MetaData + - rot: -1.5707963267948966 rad + pos: -3.5,2.5 + parent: 1 + type: Transform + - linkedPorts: + 345: + - Pressed: Toggle + 179: + - Pressed: Toggle + 337: + - Pressed: Toggle + type: DeviceLinkSource + - uid: 508 + components: + - name: shutters switch + type: MetaData + - pos: -1.5,8.5 + parent: 1 + type: Transform + - linkedPorts: + 377: + - Pressed: Toggle + 376: + - Pressed: Toggle + 375: + - Pressed: Toggle + type: DeviceLinkSource + - uid: 512 + components: + - name: bar entrance door bolts switch + type: MetaData + - pos: -1.5,4.5 + parent: 1 + type: Transform + - linkedPorts: + 139: + - Pressed: DoorBolt + 170: + - Pressed: DoorBolt + 50: + - Pressed: DoorBolt + 168: + - Pressed: DoorBolt + type: DeviceLinkSource + - uid: 537 + components: + - name: shutters switch + type: MetaData + - pos: -5.5,4.5 + parent: 1 + type: Transform + - linkedPorts: + 374: + - Pressed: Toggle + 373: + - Pressed: Toggle + type: DeviceLinkSource +- proto: SignBar + entities: + - uid: 540 + components: + - rot: 1.5707963267948966 rad + pos: -6.5,-1.5 + parent: 1 + type: Transform + - uid: 541 + components: + - rot: 1.5707963267948966 rad + pos: 8.5,-1.5 + parent: 1 + type: Transform +- proto: SignDirectionalBar + entities: + - uid: 538 + components: + - rot: -1.5707963267948966 rad + pos: 5.5,-2.5 + parent: 1 + type: Transform + - uid: 539 + components: + - rot: 1.5707963267948966 rad + pos: -3.5,-2.5 + parent: 1 + type: Transform +- proto: Sink + entities: + - uid: 227 + components: + - rot: -1.5707963267948966 rad + pos: 6.5,-4.5 + parent: 1 + type: Transform +- proto: SMESBasic + entities: + - uid: 184 + components: + - pos: -3.5,-4.5 + parent: 1 + type: Transform +- proto: soda_dispenser + entities: + - uid: 128 + components: + - pos: 1.5,3.5 + parent: 1 + type: Transform +- proto: SpawnPointBartender + entities: + - uid: 498 + components: + - pos: -0.5,2.5 + parent: 1 + type: Transform +- proto: SpawnPointBotanist + entities: + - uid: 535 + components: + - pos: -2.5,6.5 + parent: 1 + type: Transform +- proto: SpawnPointLatejoin + entities: + - uid: 497 + components: + - rot: -1.5707963267948966 rad + pos: 6.5,-5.5 + parent: 1 + type: Transform +- proto: SpawnPointMercenary + entities: + - uid: 536 + components: + - pos: 5.5,5.5 + parent: 1 + type: Transform +- proto: SpawnPointPilot + entities: + - uid: 442 + components: + - pos: 2.5,6.5 + parent: 1 + type: Transform +- proto: StoolBar + entities: + - uid: 172 + components: + - rot: 3.141592653589793 rad + pos: -2.5,0.5 + parent: 1 + type: Transform + - uid: 173 + components: + - rot: 3.141592653589793 rad + pos: -1.5,0.5 + parent: 1 + type: Transform + - uid: 174 + components: + - rot: 3.141592653589793 rad + pos: -0.5,0.5 + parent: 1 + type: Transform + - uid: 175 + components: + - rot: 3.141592653589793 rad + pos: 0.5,0.5 + parent: 1 + type: Transform + - uid: 176 + components: + - rot: -1.5707963267948966 rad + pos: 3.5,2.5 + parent: 1 + type: Transform +- proto: SubstationBasic + entities: + - uid: 185 + components: + - pos: -2.5,-4.5 + parent: 1 + type: Transform +- proto: SuitStorageEVAAlternate + entities: + - uid: 509 + components: + - pos: 6.5,5.5 + parent: 1 + type: Transform +- proto: SuitStorageWallmountEVAAlternate + entities: + - uid: 443 + components: + - pos: 3.5,-5.5 + parent: 1 + type: Transform +- proto: SurveillanceCameraRouterService + entities: + - uid: 199 + components: + - pos: 2.5,5.5 + parent: 1 + type: Transform +- proto: SurveillanceCameraService + entities: + - uid: 503 + components: + - pos: 2.5,-3.5 + parent: 1 + type: Transform + - uid: 504 + components: + - pos: -4.5,-2.5 + parent: 1 + type: Transform + - uid: 505 + components: + - pos: 7.5,-2.5 + parent: 1 + type: Transform +- proto: Table + entities: + - uid: 200 + components: + - rot: 3.141592653589793 rad + pos: 3.5,7.5 + parent: 1 + type: Transform + - uid: 456 + components: + - pos: 1.5,7.5 + parent: 1 + type: Transform + - uid: 457 + components: + - pos: 2.5,7.5 + parent: 1 + type: Transform +- proto: TableCarpet + entities: + - uid: 117 + components: + - pos: 6.5,2.5 + parent: 1 + type: Transform + - uid: 118 + components: + - pos: 5.5,2.5 + parent: 1 + type: Transform +- proto: TableCounterMetal + entities: + - uid: 201 + components: + - rot: 3.141592653589793 rad + pos: 3.5,5.5 + parent: 1 + type: Transform + - uid: 206 + components: + - pos: -1.5,5.5 + parent: 1 + type: Transform + - uid: 207 + components: + - pos: -2.5,5.5 + parent: 1 + type: Transform +- proto: TableCounterWood + entities: + - uid: 123 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,3.5 + parent: 1 + type: Transform + - uid: 124 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,3.5 + parent: 1 + type: Transform + - uid: 322 + components: + - pos: 4.5,3.5 + parent: 1 + type: Transform +- proto: TableWood + entities: + - uid: 216 + components: + - pos: 1.5,-3.5 + parent: 1 + type: Transform + - uid: 217 + components: + - pos: 2.5,-3.5 + parent: 1 + type: Transform + - uid: 219 + components: + - pos: -1.5,-2.5 + parent: 1 + type: Transform +- proto: TableWoodReinforced + entities: + - uid: 17 + components: + - pos: 0.5,1.5 + parent: 1 + type: Transform + - uid: 18 + components: + - pos: -0.5,1.5 + parent: 1 + type: Transform + - uid: 19 + components: + - pos: -1.5,1.5 + parent: 1 + type: Transform + - uid: 20 + components: + - pos: -2.5,1.5 + parent: 1 + type: Transform + - uid: 21 + components: + - pos: 2.5,2.5 + parent: 1 + type: Transform +- proto: Thruster + entities: + - uid: 152 + components: + - pos: 3.5,9.5 + parent: 1 + type: Transform + - uid: 153 + components: + - pos: 4.5,9.5 + parent: 1 + type: Transform + - uid: 154 + components: + - rot: -1.5707963267948966 rad + pos: 5.5,9.5 + parent: 1 + type: Transform + - uid: 155 + components: + - rot: -1.5707963267948966 rad + pos: 5.5,-8.5 + parent: 1 + type: Transform + - uid: 156 + components: + - rot: 3.141592653589793 rad + pos: 4.5,-8.5 + parent: 1 + type: Transform + - uid: 157 + components: + - rot: 3.141592653589793 rad + pos: 3.5,-8.5 + parent: 1 + type: Transform + - uid: 158 + components: + - rot: 3.141592653589793 rad + pos: -1.5,-8.5 + parent: 1 + type: Transform + - uid: 159 + components: + - rot: 3.141592653589793 rad + pos: -2.5,-8.5 + parent: 1 + type: Transform + - uid: 160 + components: + - rot: 1.5707963267948966 rad + pos: -3.5,-8.5 + parent: 1 + type: Transform + - uid: 161 + components: + - rot: 1.5707963267948966 rad + pos: -3.5,9.5 + parent: 1 + type: Transform + - uid: 162 + components: + - pos: -2.5,9.5 + parent: 1 + type: Transform + - uid: 163 + components: + - pos: -1.5,9.5 + parent: 1 + type: Transform +- proto: ToiletEmpty + entities: + - uid: 228 + components: + - rot: -1.5707963267948966 rad + pos: 6.5,-5.5 + parent: 1 + type: Transform +- proto: TwoWayLever + entities: + - uid: 502 + components: + - pos: -4.5,2.5 + parent: 1 + type: Transform + - linkedPorts: + 181: + - Left: Forward + - Right: Reverse + - Middle: Off + 180: + - Left: Forward + - Right: Reverse + - Middle: Off + type: DeviceLinkSource +- proto: VendingBarDrobe + entities: + - uid: 208 + components: + - pos: 5.5,7.5 + parent: 1 + type: Transform +- proto: VendingMachineBooze + entities: + - uid: 130 + components: + - pos: -1.5,3.5 + parent: 1 + type: Transform +- proto: VendingMachineCigs + entities: + - uid: 131 + components: + - pos: -2.5,3.5 + parent: 1 + type: Transform +- proto: VendingMachineNutri + entities: + - uid: 330 + components: + - pos: -4.5,6.5 + parent: 1 + type: Transform +- proto: VendingMachineSeeds + entities: + - uid: 191 + components: + - pos: -3.5,7.5 + parent: 1 + type: Transform +- proto: WallReinforced + entities: + - uid: 60 + components: + - pos: -3.5,8.5 + parent: 1 + type: Transform + - uid: 61 + components: + - pos: -4.5,8.5 + parent: 1 + type: Transform + - uid: 62 + components: + - pos: -4.5,7.5 + parent: 1 + type: Transform + - uid: 63 + components: + - pos: -5.5,7.5 + parent: 1 + type: Transform + - uid: 66 + components: + - pos: -5.5,4.5 + parent: 1 + type: Transform + - uid: 67 + components: + - pos: -6.5,4.5 + parent: 1 + type: Transform + - uid: 70 + components: + - pos: -6.5,1.5 + parent: 1 + type: Transform + - uid: 72 + components: + - pos: -6.5,-1.5 + parent: 1 + type: Transform + - uid: 73 + components: + - pos: -6.5,-3.5 + parent: 1 + type: Transform + - uid: 74 + components: + - pos: -5.5,-3.5 + parent: 1 + type: Transform + - uid: 75 + components: + - pos: -5.5,-4.5 + parent: 1 + type: Transform + - uid: 76 + components: + - pos: -5.5,-5.5 + parent: 1 + type: Transform + - uid: 77 + components: + - pos: -5.5,-6.5 + parent: 1 + type: Transform + - uid: 78 + components: + - pos: -4.5,-6.5 + parent: 1 + type: Transform + - uid: 79 + components: + - pos: -4.5,-7.5 + parent: 1 + type: Transform + - uid: 80 + components: + - pos: -3.5,-7.5 + parent: 1 + type: Transform + - uid: 81 + components: + - pos: -1.5,-7.5 + parent: 1 + type: Transform + - uid: 83 + components: + - pos: 0.5,-7.5 + parent: 1 + type: Transform + - uid: 86 + components: + - pos: 3.5,-7.5 + parent: 1 + type: Transform + - uid: 87 + components: + - pos: 5.5,-7.5 + parent: 1 + type: Transform + - uid: 88 + components: + - pos: 6.5,-7.5 + parent: 1 + type: Transform + - uid: 89 + components: + - pos: 6.5,-6.5 + parent: 1 + type: Transform + - uid: 90 + components: + - pos: 7.5,-6.5 + parent: 1 + type: Transform + - uid: 91 + components: + - pos: 7.5,-5.5 + parent: 1 + type: Transform + - uid: 92 + components: + - pos: 7.5,-4.5 + parent: 1 + type: Transform + - uid: 93 + components: + - pos: 7.5,-3.5 + parent: 1 + type: Transform + - uid: 94 + components: + - pos: 8.5,-3.5 + parent: 1 + type: Transform + - uid: 95 + components: + - pos: 8.5,-1.5 + parent: 1 + type: Transform + - uid: 96 + components: + - pos: 8.5,0.5 + parent: 1 + type: Transform + - uid: 100 + components: + - pos: 8.5,4.5 + parent: 1 + type: Transform + - uid: 101 + components: + - pos: 7.5,4.5 + parent: 1 + type: Transform + - uid: 104 + components: + - pos: 7.5,7.5 + parent: 1 + type: Transform + - uid: 105 + components: + - pos: 6.5,7.5 + parent: 1 + type: Transform + - uid: 106 + components: + - pos: 6.5,8.5 + parent: 1 + type: Transform + - uid: 107 + components: + - pos: 5.5,8.5 + parent: 1 + type: Transform + - uid: 108 + components: + - pos: 3.5,8.5 + parent: 1 + type: Transform + - uid: 111 + components: + - pos: 0.5,8.5 + parent: 1 + type: Transform + - uid: 113 + components: + - pos: -1.5,8.5 + parent: 1 + type: Transform +- proto: WallSolid + entities: + - uid: 2 + components: + - pos: 2.5,3.5 + parent: 1 + type: Transform + - uid: 3 + components: + - pos: 2.5,1.5 + parent: 1 + type: Transform + - uid: 22 + components: + - rot: 1.5707963267948966 rad + pos: -1.5,-4.5 + parent: 1 + type: Transform + - uid: 23 + components: + - rot: 1.5707963267948966 rad + pos: -1.5,-3.5 + parent: 1 + type: Transform + - uid: 24 + components: + - pos: -3.5,0.5 + parent: 1 + type: Transform + - uid: 25 + components: + - pos: -3.5,1.5 + parent: 1 + type: Transform + - uid: 26 + components: + - pos: -3.5,2.5 + parent: 1 + type: Transform + - uid: 27 + components: + - pos: -3.5,3.5 + parent: 1 + type: Transform + - uid: 28 + components: + - pos: -3.5,4.5 + parent: 1 + type: Transform + - uid: 29 + components: + - pos: -2.5,4.5 + parent: 1 + type: Transform + - uid: 30 + components: + - pos: -1.5,4.5 + parent: 1 + type: Transform + - uid: 31 + components: + - pos: 0.5,4.5 + parent: 1 + type: Transform + - uid: 32 + components: + - pos: 1.5,4.5 + parent: 1 + type: Transform + - uid: 33 + components: + - pos: 2.5,4.5 + parent: 1 + type: Transform + - uid: 34 + components: + - pos: 3.5,4.5 + parent: 1 + type: Transform + - uid: 35 + components: + - pos: 4.5,4.5 + parent: 1 + type: Transform + - uid: 36 + components: + - pos: 5.5,4.5 + parent: 1 + type: Transform + - uid: 37 + components: + - pos: 6.5,4.5 + parent: 1 + type: Transform + - uid: 38 + components: + - pos: -4.5,-3.5 + parent: 1 + type: Transform + - uid: 39 + components: + - pos: -3.5,-3.5 + parent: 1 + type: Transform + - uid: 40 + components: + - pos: -2.5,-3.5 + parent: 1 + type: Transform + - uid: 41 + components: + - rot: 1.5707963267948966 rad + pos: 4.5,-5.5 + parent: 1 + type: Transform + - uid: 42 + components: + - rot: 1.5707963267948966 rad + pos: 5.5,-5.5 + parent: 1 + type: Transform + - uid: 43 + components: + - pos: -1.5,-5.5 + parent: 1 + type: Transform + - uid: 44 + components: + - pos: 0.5,-5.5 + parent: 1 + type: Transform + - uid: 45 + components: + - pos: 1.5,-4.5 + parent: 1 + type: Transform + - uid: 46 + components: + - pos: 0.5,-4.5 + parent: 1 + type: Transform + - uid: 47 + components: + - pos: 3.5,-5.5 + parent: 1 + type: Transform + - uid: 49 + components: + - pos: 5.5,-6.5 + parent: 1 + type: Transform + - uid: 51 + components: + - pos: 5.5,-3.5 + parent: 1 + type: Transform + - uid: 52 + components: + - pos: 6.5,-3.5 + parent: 1 + type: Transform + - uid: 53 + components: + - pos: 5.5,-2.5 + parent: 1 + type: Transform + - uid: 54 + components: + - pos: 5.5,0.5 + parent: 1 + type: Transform + - uid: 55 + components: + - pos: 6.5,0.5 + parent: 1 + type: Transform + - uid: 56 + components: + - pos: 7.5,0.5 + parent: 1 + type: Transform + - uid: 57 + components: + - pos: -3.5,-2.5 + parent: 1 + type: Transform + - uid: 58 + components: + - pos: 0.5,5.5 + parent: 1 + type: Transform + - uid: 59 + components: + - pos: 0.5,7.5 + parent: 1 + type: Transform + - uid: 187 + components: + - pos: 2.5,-4.5 + parent: 1 + type: Transform + - uid: 188 + components: + - pos: 3.5,-4.5 + parent: 1 + type: Transform +- proto: WarpPointShip + entities: + - uid: 496 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,-1.5 + parent: 1 + type: Transform +- proto: Windoor + entities: + - uid: 226 + components: + - rot: 3.141592653589793 rad + pos: 6.5,-5.5 + parent: 1 + type: Transform +- proto: WindoorSecure + entities: + - uid: 126 + components: + - rot: 1.5707963267948966 rad + pos: 4.5,2.5 + parent: 1 + type: Transform + - uid: 127 + components: + - rot: 1.5707963267948966 rad + pos: 4.5,1.5 + parent: 1 + type: Transform + - uid: 171 + components: + - rot: 3.141592653589793 rad + pos: 1.5,1.5 + parent: 1 + type: Transform + - uid: 350 + components: + - rot: 3.141592653589793 rad + pos: -3.5,-6.5 + parent: 1 + type: Transform +- proto: WindowReinforcedDirectional + entities: + - uid: 16 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 + type: Transform + - uid: 125 + components: + - rot: 1.5707963267948966 rad + pos: 4.5,3.5 + parent: 1 + type: Transform + - uid: 351 + components: + - rot: 3.141592653589793 rad + pos: -2.5,-6.5 + parent: 1 + type: Transform +... diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml index e2b52bb693e..cba0210c493 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml @@ -16,6 +16,7 @@ # ParamedicPDA: 3 # Frontier # ChemistryPDA: 3 # Frontier # CMOPDA: 3 # Frontier + SecurityGuardPDA: 3 # Frontier SecurityPDA: 3 # Frontier BrigmedicPDA: 3 # Frontier WardenPDA: 3 # Frontier diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml index 7f72dfd9966..33a7aca74e0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml @@ -13,5 +13,6 @@ PackPaperRollingFilters: 8 CheapLighter: 6 Lighter: 4 + Ashtray: 4 emaggedInventory: CigPackSyndicate: 6 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 5f86857f882..bf0c3ac85ff 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -795,8 +795,8 @@ - ClothingUniformJumpskirtBrigmedic - ClothingUniformJumpsuitWarden - ClothingUniformJumpskirtWarden - - ClothingUniformJumpsuitSecStationGuard #Frontier - - ClothingUniformJumpskirtSecStationGuard #Frontier + - ClothingUniformJumpsuitSecGuard #Frontier + - ClothingUniformJumpskirtSecGuard #Frontier - ClothingOuterWinterCap - ClothingOuterWinterCE - ClothingOuterWinterCMO diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index d624f95bddc..07fb74c34b6 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -15,7 +15,7 @@ time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Security - time: 216000 # 60 hrs + time: 72000 # 20 hrs startingGear: SeniorOfficerGear icon: "JobIconSeniorOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index a749c56e042..f080ca0e8ea 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -33,9 +33,9 @@ - MartialArtist - MailCarrier - Gladiator - - Mercenary ## NF Job below - - StationTrafficController - + - Mercenary # Frontier + - Pilot # Frontier + - StationTrafficController # Frontier - type: department id: Command @@ -89,6 +89,7 @@ - PrisonGuard ##nyano - Prisoner ##nyano - Brigmedic + - SecurityGuard # Frontier - type: department id: Science diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index 0732c90c3c2..3e5f5b79c98 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -2,10 +2,13 @@ id: LobbyMusic files: - /Audio/Lobby/thunderdome.ogg +# - /Audio/Lobby/absconditus.ogg - /Audio/Lobby/space_asshole.ogg +# - /Audio/Lobby/endless_space.ogg - /Audio/Lobby/atomicamnesiammx.ogg - /Audio/Lobby/singuloose.ogg - /Audio/Lobby/comet_haley.ogg +# - /Audio/Lobby/marhaba.ogg - /Audio/Lobby/title3.ogg - /Audio/Lobby/mod.flip-flap.ogg - /Audio/Lobby/Monument.ogg @@ -13,5 +16,6 @@ - /Audio/Lobby/pwmur.ogg - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg - /Audio/Lobby/every_light_is_blinking_at_once.ogg - - /Audio/Lobby/victory.ogg - /Audio/Lobby/vibe_ace.ogg + - /Audio/_NF/Lobby/victory.ogg # Frontier + - /Audio/_NF/Lobby/shibamata.ogg # Frontier \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml index 03de3bc313b..d1754c0fb65 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml @@ -45,11 +45,11 @@ - type: entity parent: ClothingUniformSkirtBase - id: ClothingUniformJumpskirtSecStationGuard - name: station guard jumpskirt - description: A specialized uniform for a Frontier Outpost guard. Crisp and official to let dock loiterers know you mean business. + id: ClothingUniformJumpskirtSecGuard + name: security guard jumpskirt + description: A specialized uniform for a security guard. Crisp and official to let dock loiterers know you mean business. components: - type: Sprite - sprite: _NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi + sprite: _NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi - type: Clothing - sprite: _NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi + sprite: _NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml index b96125472f8..0a36e9ef1f2 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml @@ -45,14 +45,14 @@ - type: entity parent: ClothingUniformBase - id: ClothingUniformJumpsuitSecStationGuard - name: station guard jumpsuit - description: A specialized uniform for a Frontier Outpost guard. Crisp and official to let dock loiterers know you mean business. + id: ClothingUniformJumpsuitSecGuard + name: security guard jumpsuit + description: A specialized uniform for a security guard. Crisp and official to let dock loiterers know you mean business. components: - type: Sprite - sprite: _NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi + sprite: _NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi - type: Clothing - sprite: _NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi + sprite: _NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml index da0d31daefa..6c2491a800d 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml @@ -50,3 +50,11 @@ sprite: _NF/Objects/Misc/id_cards.rsi - type: Item heldPrefix: silver + +- type: entity + parent: SecurityIDCard + id: SecurityGuardIDCard + name: security guard ID card + components: + - type: PresetIdCard + job: SecurityGuard diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml index adae535b533..d5fdb1a48bd 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml @@ -68,3 +68,17 @@ accentVColor: "#A32D26" - type: Icon state: pda + +- type: entity + parent: SecurityPDA + id: SecurityGuardPDA + name: security guard PDA + description: Red to hide the stains of passenger blood. + components: + - type: Pda + id: SecurityGuardIDCard + state: pda-security + - type: PdaBorderColor + borderColor: "#A32D26" + - type: Icon + state: pda-security diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml new file mode 100644 index 00000000000..24d0b77e94a --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/ashtray.yml @@ -0,0 +1,48 @@ +- type: entity + name: ashtray + id: Ashtray + parent: BaseStorageItem + components: + - type: Sprite + scale: 0.5, 0.5 + sprite: _NF/Objects/Misc/ashtray.rsi + layers: + - state: icon-0 + map: ["enum.StorageFillLayers.Fill"] + - type: Storage + capacity: 12 + quickInsert: true + areaInsert: true + storageInsertSound: + collection: trashBagRustle + whitelist: + tags: + - Cigar + - Cigarette + - Ash + - type: Appearance + - type: StorageFillVisualizer + maxFillLevels: 4 + fillBaseName: icon + - type: Dumpable + - type: Item + size: 12 + - type: Damageable + damageContainer: Inorganic + - type: DamageOnLand + damage: + types: + Blunt: 1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1 +# triggersOnce: false + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:EmptyAllContainersBehaviour + - !type:DoActsBehavior + acts: [ "Destruction" ] diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml index aef8216fce5..cae829fc72b 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml @@ -673,7 +673,7 @@ state: service_keys - type: entity - parent: [ BaseComputerTabletop, ] + parent: [ BaseComputerTabletop, ComputerSensorMonitoring ] id: ComputerTabletopSensorMonitoring # Putting this as "DO NOT MAP" until the performance issues are fixed. # And it's more fleshed out. diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml index 0acdafc01a3..eaeb9dfd9a2 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml @@ -1,35 +1,22 @@ - type: entity - id: BaseThrusterSecurity - parent: BaseStructureDynamic - abstract: true + id: ThrusterSecurity + parent: Thruster + suffix: Security components: - - type: AmbientSound - enabled: false - range: 4 - volume: -4 - sound: - path: /Audio/Effects/shuttle_thruster.ogg - - type: Transform - anchored: true - - type: Physics - bodyType: Static - - type: Rotatable - rotateWhileAnchored: true - - type: Thruster - damage: - types: - Heat: 40 - thrusterIgnoreEmp: true - - type: InteractionOutline - - type: Sprite - - type: Appearance - - type: ThrusterVisuals - - type: ApcPowerReceiver - powerLoad: 1500 - - type: ExtensionCableReceiver - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + - type: Sprite + sprite: _NF/Structures/Shuttles/thrustersecurity.rsi + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false + offset: 0, 1 - type: Destructible thresholds: - trigger: @@ -38,32 +25,12 @@ behaviors: - !type:DoActsBehavior acts: ["Destruction"] - - type: StaticPrice - price: 300 - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.45,-0.45,0.45,0.45" - density: 60 - mask: - - MachineMask - layer: - - MidImpassable - - LowImpassable - - BulletImpassable - placement: - mode: SnapgridCenter - type: entity - id: ThrusterSecurity - name: security thruster - parent: [ BaseThrusterSecurity, ConstructibleMachine ] + id: ThrusterSecurityUnanchored + parent: ThrusterUnanchored + suffix: Unanchored, Security components: - - type: Thruster - - type: Machine - board: ThrusterMachineCircuitboard - type: Sprite sprite: _NF/Structures/Shuttles/thrustersecurity.rsi layers: @@ -78,20 +45,60 @@ shader: unshaded visible: false offset: 0, 1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 600 # Considering we need a lot of thrusters didn't want to make an individual one too tanky + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] - type: entity id: DebugThrusterSecurity - name: security thruster - parent: BaseThrusterSecurity - suffix: DEBUG + parent: DebugThruster + name: thruster + suffix: DEBUG, Security + components: + - type: Sprite + sprite: _NF/Structures/Shuttles/thrustersecurity.rsi + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false + offset: 0, 1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 600 # Considering we need a lot of thrusters didn't want to make an individual one too tanky + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + +- type: entity + id: SmallThruster + parent: Thruster + suffix: Small components: - type: Thruster - requireSpace: false + baseThrust: 33 + thrust: 33 + damage: + types: + Heat: 40 - type: ApcPowerReceiver - needsPower: false - powerLoad: 0 + powerLoad: 500 - type: Sprite - sprite: _NF/Structures/Shuttles/thrustersecurity.rsi + scale: 0.8, 0.8 + sprite: Structures/Shuttles/thruster.rsi layers: - state: base map: ["enum.ThrusterVisualLayers.Base"] @@ -104,20 +111,15 @@ shader: unshaded visible: false offset: 0, 1 + - type: StaticPrice + price: 100 - type: entity id: GyroscopeSecurity - name: security gyroscope - parent: [ BaseThrusterSecurity, ConstructibleMachine ] + parent: Gyroscope + suffix: Security components: - - type: Thruster - thrusterType: Angular - requireSpace: false - baseThrust: 2000 - thrust: 2000 - machinePartThrust: Manipulator - type: Sprite - # Listen I'm not the biggest fan of the sprite but it was the most appropriate thing I could find. sprite: _NF/Structures/Shuttles/gyroscope.rsi snapCardinals: true layers: @@ -134,37 +136,61 @@ map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] shader: unshaded visible: false - - type: PointLight - radius: 1.3 - energy: 0.8 - enabled: false - mask: /Textures/Effects/LightMasks/cone.png - autoRot: true - offset: "0, 0.1" # shine from the top, not bottom of the computer - color: "#4246b3" - - type: Machine - board: GyroscopeMachineCircuitboard - - type: UpgradePowerDraw - powerDrawMultiplier: 0.75 - scaling: Exponential - - type: StaticPrice - price: 2000 + +- type: entity + id: GyroscopeSecurityUnanchored + parent: GyroscopeUnanchored + components: + - type: Sprite + sprite: _NF/Structures/Shuttles/gyroscope.rsi + snapCardinals: true + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false - type: entity id: DebugGyroscopeSecurity - name: security gyroscope - parent: BaseThrusterSecurity - suffix: DEBUG + parent: DebugGyroscope + name: gyroscope + suffix: DEBUG, Security + components: + - type: Sprite + sprite: _NF/Structures/Shuttles/gyroscope.rsi + snapCardinals: true + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false + +- type: entity + id: SmallGyroscopeSecurity + parent: GyroscopeSecurity + suffix: Security, Small components: - type: Thruster thrusterType: Angular requireSpace: false - baseThrust: 100 - thrust: 100 + baseThrust: 250 + thrust: 250 - type: ApcPowerReceiver - needsPower: false - powerLoad: 0 + powerLoad: 200 - type: Sprite + scale: 0.8, 0.8 sprite: _NF/Structures/Shuttles/gyroscope.rsi snapCardinals: true layers: @@ -180,19 +206,20 @@ visible: false - type: entity - id: SmallGyroscopeSecurity - name: security gyroscope - parent: BaseThrusterSecurity - suffix: small + id: SmallGyroscope + parent: Gyroscope + suffix: Small components: - type: Thruster thrusterType: Angular requireSpace: false baseThrust: 250 thrust: 250 + - type: ApcPowerReceiver + powerLoad: 200 - type: Sprite scale: 0.8, 0.8 - sprite: _NF/Structures/Shuttles/gyroscope.rsi + sprite: Structures/Shuttles/gyroscope.rsi snapCardinals: true layers: - state: base @@ -205,3 +232,5 @@ map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] shader: unshaded visible: false + - type: StaticPrice + price: 250 diff --git a/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml b/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml index fb09242be18..8704aac3a2d 100644 --- a/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml +++ b/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml @@ -20,14 +20,15 @@ Passenger: [ -1, -1 ] HeadOfPersonnel: [ 1, 1 ] HeadOfSecurity: [ 1, 1 ] + SecurityGuard: [ 1, 1 ] SeniorOfficer: [ 0, 0 ] Brigmedic: [ 0, 0 ] SecurityOfficer: [ 0, 0 ] SecurityCadet: [ 0, 0 ] - StationTrafficController: [ 0, 0 ] + StationTrafficController: [ 1, 1 ] Valet: [ 1, 1 ] - MailCarrier: [ 0, 0 ] Janitor: [ 1, 1 ] + MailCarrier: [ 1, 1 ] # Others: Borg: [ 0, 0 ] Musician: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml index 08291492756..a3d546ff2d3 100644 --- a/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml @@ -23,3 +23,29 @@ layers: - state: green - state: pilot + +- type: entity + id: SpawnPointStc + parent: SpawnPointJobBase + name: stc + components: + - type: SpawnPoint + job_id: Stc + - type: Sprite + sprite: _NF/Markers/jobs.rsi + layers: + - state: green + - state: stc + +- type: entity + id: SpawnPointSecurityGuard + parent: SpawnPointJobBase + name: security guard + components: + - type: SpawnPoint + job_id: SecurityGuard + - type: Sprite + sprite: _NF/Markers/jobs.rsi + layers: + - state: green + - state: securityguard diff --git a/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml b/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml index d0b1ad095d6..4e799b9710c 100644 --- a/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml @@ -10,15 +10,15 @@ objectType: Item - type: latheRecipe - id: ClothingUniformJumpskirtSecStationGuard - result: ClothingUniformJumpskirtSecStationGuard + id: ClothingUniformJumpskirtSecGuard + result: ClothingUniformJumpskirtSecGuard completetime: 4 materials: Cloth: 300 - + - type: latheRecipe - id: ClothingUniformJumpsuitSecStationGuard - result: ClothingUniformJumpsuitSecStationGuard + id: ClothingUniformJumpsuitSecGuard + result: ClothingUniformJumpsuitSecGuard completetime: 4 materials: Cloth: 300 diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml index fe90e391947..f3f90975f69 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml @@ -6,7 +6,10 @@ startingGear: StcGear requirements: - !type:OverallPlaytimeRequirement - time: 10800 + time: 72000 # 20 hrs + - !type:DepartmentTimeRequirement + department: Security + time: 10800 # 3 hrs as sec canBeAntag: false icon: "JobIconStc" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml new file mode 100644 index 00000000000..87719ca508d --- /dev/null +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml @@ -0,0 +1,42 @@ +- type: job + id: SecurityGuard + name: job-name-security-guard + description: job-description-security-guard + playTimeTracker: JobSecurityGuard + requirements: + - !type:OverallPlaytimeRequirement + time: 36000 # Frontier - 10 hrs + startingGear: SecurityGuardGear + icon: "JobIconSecurityGuard" + supervisors: job-supervisors-hop # not hos + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - External + - Mercenary # Frontier + - Captain # Frontier + - Frontier # Frontier + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant, TrackingImplant ] + +- type: startingGear + id: SecurityGuardGear + equipment: + jumpsuit: ClothingUniformJumpsuitSecGuard + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesLeather #ClothingShoesBootsCombatFilled + eyes: ClothingEyesGlassesSunglasses #ClothingEyesGlassesSecurity + head: ClothingHeadHatBeretSecurity #ClothingHeadHelmetBasic + outerClothing: ClothingOuterArmorBasic + id: SecurityGuardPDA + ears: ClothingHeadsetSecurity + belt: ClothingBeltSecurityFilled + pocket1: WeaponPistolMk58Nonlethal + gloves: ClothingHandsGlovesCombat # Frontier + innerClothingSkirt: ClothingUniformJumpskirtSecGuard + satchel: ClothingBackpackSatchelSecurityFilled + duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml index d71b8812e11..da5ab2ebdf7 100644 --- a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml @@ -2,7 +2,10 @@ id: JobMercenary - type: playTimeTracker - id: JobStc + id: JobPilot - type: playTimeTracker - id: JobPilot + id: JobSecurityGuard + +- type: playTimeTracker + id: JobStc diff --git a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml new file mode 100644 index 00000000000..20f1953606c --- /dev/null +++ b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml @@ -0,0 +1,41 @@ +# Author Info +# GitHub: erhardsteinhauer +# Discord: erhardsteinhauer + +# Maintainer Info +# GitHub: erhardsteinhauer +# Discord: erhardsteinhauer + +# Shuttle Notes: +# + +- type: vessel + id: kilderkin + name: NC Kilderkin + description: "Spaceworthy bar/microbrewery with everything one needs to facilitate poor life choices: lots of booze, smokes, and lack of food." + price: 42900 + category: Medium + group: Civilian + shuttlePath: /Maps/_NF/Shuttles/kilderkin.yml + +- type: gameMap + id: kilderkin + mapName: 'Kilderkin' + mapPath: /Maps/_NF/Shuttles/kilderkin.yml + minPlayers: 0 + stations: + kilderkin: + stationProto: StandardFrontierVessel + components: + - type: StationNameSetup + mapNameTemplate: 'Kilderkin {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + overflowJobs: [] + availableJobs: + Bartender: [ 0, 0 ] + Botanist: [ 0, 0 ] + Mercenary: [ 0, 0 ] + Pilot: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/StatusEffects/job.yml b/Resources/Prototypes/_NF/StatusEffects/job.yml index 7b5dea47389..0a927fc83ab 100644 --- a/Resources/Prototypes/_NF/StatusEffects/job.yml +++ b/Resources/Prototypes/_NF/StatusEffects/job.yml @@ -19,6 +19,13 @@ sprite: _NF/Interface/Misc/job_icons.rsi state: Pilot +- type: statusIcon + parent: JobIcon + id: JobIconSecurityGuard + icon: + sprite: Interface/Misc/job_icons.rsi + state: SecurityOfficer + - type: statusIcon parent: JobIcon id: JobIconStc diff --git a/Resources/Prototypes/_NF/lobbyscreens.yml b/Resources/Prototypes/_NF/lobbyscreens.yml index 06abd86967a..68c65b26e86 100644 --- a/Resources/Prototypes/_NF/lobbyscreens.yml +++ b/Resources/Prototypes/_NF/lobbyscreens.yml @@ -1,7 +1,3 @@ -- type: lobbyBackground - id: RisingRed - background: /Textures/_NF/LobbyScreens/risingred.png - - type: lobbyBackground id: BingGuss background: /Textures/_NF/LobbyScreens/bingguss.png @@ -9,3 +5,11 @@ - type: lobbyBackground id: Janigang background: /Textures/_NF/LobbyScreens/janigang.png + +- type: lobbyBackground + id: Xeeenoooossss + background: /Textures/_NF/LobbyScreens/xeeenoooossss.png + +- type: lobbyBackground + id: Secrun + background: /Textures/_NF/LobbyScreens/secrun.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/equipped-INNERCLOTHING-monkey.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/equipped-INNERCLOTHING-monkey.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/meta.json diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/equipped-INNERCLOTHING-monkey.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/equipped-INNERCLOTHING-monkey.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/meta.json diff --git a/Resources/Textures/_NF/LobbyScreens/attributuions.yml b/Resources/Textures/_NF/LobbyScreens/attributuions.yml index 51520ae5ba2..ad709776302 100644 --- a/Resources/Textures/_NF/LobbyScreens/attributuions.yml +++ b/Resources/Textures/_NF/LobbyScreens/attributuions.yml @@ -1,14 +1,19 @@ -- files: ["risingred.png"] - license: "CC0-1.0" - copyright: "stikyt (268746891003428874) on Discord / @sTiKyt on GitHub / @sTiKyt on Telegram" - source: "https://github.com/new-frontiers-14/frontier-station-14" - - files: ["bingguss.png"] - license: "CC0-1.0" + license: "CC-BY-NC-SA-4.0" copyright: "gentlebutter (588410099190726656) on Discord" source: "https://cdn.discordapp.com/attachments/1128094390087340114/1171973024011001936/Lobby-art-frontier_clean.png?ex=655e9fef&is=654c2aef&hm=a9c42fc6f803bc0f8307247520a480a5d59dde5f7b196fff0b9045988e5886d8&" - files: ["janigang.png"] - license: "CC0-1.0" + license: "CC-BY-NC-SA-4.0" copyright: "GhostPrince (115894681304301569) on Discord" source: "https://discord.com/channels/1123826877245694004/1128094390087340114/1191491599855788154" + +- files: ["xeeenoooossss.png"] + license: "CC BY-NC-SA 4.0" + copyright: "gentlebutter (588410099190726656) on Discord" + source: "https://discord.com/channels/1123826877245694004/1128094390087340114/1197490518951727144" + +- files: ["secrun.png"] + license: "CC-BY-NC-SA-4.0" + copyright: "GhostPrince (115894681304301569) on Discord" + source: "https://discord.com/channels/1123826877245694004/1128094390087340114/1196033832017743922" diff --git a/Resources/Textures/_NF/LobbyScreens/risingred.png b/Resources/Textures/_NF/LobbyScreens/risingred.png deleted file mode 100644 index dfe06c9e676..00000000000 Binary files a/Resources/Textures/_NF/LobbyScreens/risingred.png and /dev/null differ diff --git a/Resources/Textures/_NF/LobbyScreens/secrun.png b/Resources/Textures/_NF/LobbyScreens/secrun.png new file mode 100644 index 00000000000..6da344c3d86 Binary files /dev/null and b/Resources/Textures/_NF/LobbyScreens/secrun.png differ diff --git a/Resources/Textures/_NF/LobbyScreens/risingred.png.yml b/Resources/Textures/_NF/LobbyScreens/secrun.png.yml similarity index 100% rename from Resources/Textures/_NF/LobbyScreens/risingred.png.yml rename to Resources/Textures/_NF/LobbyScreens/secrun.png.yml diff --git a/Resources/Textures/_NF/LobbyScreens/xeeenoooossss.png b/Resources/Textures/_NF/LobbyScreens/xeeenoooossss.png new file mode 100644 index 00000000000..27a20059bf8 Binary files /dev/null and b/Resources/Textures/_NF/LobbyScreens/xeeenoooossss.png differ diff --git a/Resources/Textures/_NF/LobbyScreens/xeeenoooossss.png.yml b/Resources/Textures/_NF/LobbyScreens/xeeenoooossss.png.yml new file mode 100644 index 00000000000..51ff40335ef --- /dev/null +++ b/Resources/Textures/_NF/LobbyScreens/xeeenoooossss.png.yml @@ -0,0 +1,2 @@ +sample: + filter: false diff --git a/Resources/Textures/_NF/Markers/jobs.rsi/meta.json b/Resources/Textures/_NF/Markers/jobs.rsi/meta.json index 388f334486b..0f8d397d17b 100644 --- a/Resources/Textures/_NF/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/_NF/Markers/jobs.rsi/meta.json @@ -15,6 +15,12 @@ }, { "name": "pilot" + }, + { + "name": "securityguard" + }, + { + "name": "stc" } ] } diff --git a/Resources/Textures/_NF/Markers/jobs.rsi/securityguard.png b/Resources/Textures/_NF/Markers/jobs.rsi/securityguard.png new file mode 100644 index 00000000000..fe9aea69e94 Binary files /dev/null and b/Resources/Textures/_NF/Markers/jobs.rsi/securityguard.png differ diff --git a/Resources/Textures/_NF/Markers/jobs.rsi/stc.png b/Resources/Textures/_NF/Markers/jobs.rsi/stc.png new file mode 100644 index 00000000000..75f15f31961 Binary files /dev/null and b/Resources/Textures/_NF/Markers/jobs.rsi/stc.png differ diff --git a/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-0.png b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-0.png new file mode 100644 index 00000000000..b912aa3bacd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-0.png differ diff --git a/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-1.png b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-1.png new file mode 100644 index 00000000000..0ae71a7e693 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-1.png differ diff --git a/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-2.png b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-2.png new file mode 100644 index 00000000000..9fc488a866e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-2.png differ diff --git a/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-3.png b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-3.png new file mode 100644 index 00000000000..1bb6940209f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/icon-3.png differ diff --git a/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/meta.json b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/meta.json new file mode 100644 index 00000000000..6229a0222d1 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Misc/ashtray.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made for Frontier by gentlebutter", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon-0" + }, + { + "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + } + ] +}