diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index 55023e4e14a..689e28790a1 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -28,39 +28,39 @@ public sealed partial class IdCardConsoleComponent : Component public List> AccessLevels = new() { "Armory", - "Atmospherics", - "Bar", + //"Atmospherics", + //"Bar", "Brig", "Detective", "Captain", - "Cargo", - "Chapel", - "Chemistry", - "ChiefEngineer", - "ChiefMedicalOfficer", + //"Cargo", + //"Chapel", + //"Chemistry", + //"ChiefEngineer", + //"ChiefMedicalOfficer", "Command", - "Cryogenics", - "Engineering", + //"Cryogenics", + //"Engineering", "External", "Frontier", // Frontier "HeadOfPersonnel", "HeadOfSecurity", - "Hydroponics", + //"Hydroponics", "Janitor", - "Kitchen", + //"Kitchen", "Lawyer", "Mail", // Frontier "Maintenance", "Medical", "Mercenary", // Frontier "Pilot", // Frontier - "Quartermaster", - "Research", - "ResearchDirector", - "Salvage", + //"Quartermaster", + //"Research", + //"ResearchDirector", + //"Salvage", "Security", "Service", - "Theatre", + //"Theatre", }; [Serializable, NetSerializable] diff --git a/Content.Shared/CriminalRecords/Components/CriminalRecordsConsoleComponent.cs b/Content.Shared/CriminalRecords/Components/CriminalRecordsConsoleComponent.cs index 70e927e3cb8..318a7266815 100644 --- a/Content.Shared/CriminalRecords/Components/CriminalRecordsConsoleComponent.cs +++ b/Content.Shared/CriminalRecords/Components/CriminalRecordsConsoleComponent.cs @@ -35,7 +35,7 @@ public sealed partial class CriminalRecordsConsoleComponent : Component /// Channel to send messages to when someone's status gets changed. /// [DataField] - public ProtoId SecurityChannel = "Security"; + public ProtoId SecurityChannel = "Nfsd"; /// /// Max length of arrest and crime history strings. diff --git a/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs b/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs index 6a0bed0507d..d14643c4548 100644 --- a/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs +++ b/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs @@ -25,7 +25,7 @@ public sealed partial class ShipyardConsoleComponent : Component public string ShipyardChannel = "Traffic"; [DataField("securityShipyardChannel")] - public string SecurityShipyardChannel = "NFSD"; + public string SecurityShipyardChannel = "Nfsd"; [DataField("blackMarketShipyardChannel")] public string BlackMarketShipyardChannel = "Syndicate"; diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ec8e49b0fb3..e12b6e05e0a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4079,3 +4079,53 @@ Entries: message: NFSD now has access to breaching charges. id: 4918 time: '2024-04-18T21:59:45.0000000+00:00' +- author: Kesiath + changes: + - type: Add + message: Added NFSD combat and command hardsuits. + id: 4919 + time: '2024-04-19T17:57:57.0000000+00:00' +- author: Salvantrix + changes: + - type: Remove + message: Removed NFSD ships awaiting rework. (Interceptor and Whiskey.) + id: 4920 + time: '2024-04-19T22:32:58.0000000+00:00' +- author: Kesiath + changes: + - type: Tweak + message: Changed the Hospitaller and Templar to include NFSD changes. + id: 4921 + time: '2024-04-20T01:22:08.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Tweak + message: '"Night Of The Post Goblin" (painting) has come.' + id: 4922 + time: '2024-04-21T13:59:35.0000000+00:00' +- author: MoistBiscuits + changes: + - type: Add + message: Added Vagabond medium freighter + id: 4923 + time: '2024-04-21T22:14:31.0000000+00:00' +- author: Kesiath + changes: + - type: Tweak + message: Changed descriptions of guns to be clearly contraband or not. + id: 4924 + time: '2024-04-22T00:06:47.0000000+00:00' +- author: Kesiath + changes: + - type: Add + message: >- + Added the N2524 Pattern Repeater, a lever action rifle, to the + liberation station. + id: 4925 + time: '2024-04-22T00:16:43.0000000+00:00' +- author: Tych0theSynth + changes: + - type: Fix + message: Blood cultists no longer use numerals instead of punctuation + id: 4926 + time: '2024-04-22T10:12:32.0000000+00:00' diff --git a/Resources/Locale/en-US/_NF/advertisements/mobchatter/bloodculthumanoidmob.ftl b/Resources/Locale/en-US/_NF/advertisements/mobchatter/bloodculthumanoidmob.ftl index 9be975fd847..96172edcdcd 100644 --- a/Resources/Locale/en-US/_NF/advertisements/mobchatter/bloodculthumanoidmob.ftl +++ b/Resources/Locale/en-US/_NF/advertisements/mobchatter/bloodculthumanoidmob.ftl @@ -15,6 +15,6 @@ advertisement-bloodcultisthumanoid-14 = There will be no mercy, unbeliever. advertisement-bloodcultisthumanoid-15 = Hey, nice jacket! advertisement-bloodcultisthumanoid-16 = Death to the followers of False Gods! advertisement-bloodcultisthumanoid-17 = Yes-yes, blood. Need more blood. More, yes. -advertisement-bloodcultisthumanoid-18 = Void take you1 +advertisement-bloodcultisthumanoid-18 = Void take you! advertisement-bloodcultisthumanoid-19 = *hums* advertisement-bloodcultisthumanoid-20 = I will make a flute out of your collarbone! diff --git a/Resources/Locale/en-US/_NF/job/job-supervisors.ftl b/Resources/Locale/en-US/_NF/job/job-supervisors.ftl new file mode 100644 index 00000000000..e6812347eab --- /dev/null +++ b/Resources/Locale/en-US/_NF/job/job-supervisors.ftl @@ -0,0 +1,7 @@ +job-supervisors-sr = the station representative +job-supervisors-sheriff = the sheriff +job-supervisors-bailiff = the bailiff +job-supervisors-sergeant = the sergeant +job-supervisors-cadet = all higher ranking nfsd personnel +job-supervisors-prisoner = all nfsd personnel +job-supervisors-nfsd = deputies, the bailiff, and the sheriff diff --git a/Resources/Locale/en-US/job/job-supervisors.ftl b/Resources/Locale/en-US/job/job-supervisors.ftl index b2fe4868773..89fc68d464e 100644 --- a/Resources/Locale/en-US/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/job/job-supervisors.ftl @@ -1,15 +1,15 @@ job-supervisors-centcom = CentCom official job-supervisors-captain = the captain -job-supervisors-hop = the station representative -job-supervisors-hos = the sheriff +job-supervisors-hop = the head of personnel +job-supervisors-hos = the head of security job-supervisors-ce = the chief engineer job-supervisors-cmo = the chief medical officer job-supervisors-rd = the research director job-supervisors-qm = the quartermaster job-supervisors-service = chefs, botanists, the bartender, and the head of personnel -job-supervisors-engineering = station engineers, atmospheric technicians, the senior engineer, and the chief engineer -job-supervisors-medicine = medical doctors, chemists, the senior physician, and the chief medical officer -job-supervisors-security = deputies, the bailiff, and the sheriff -job-supervisors-science = scientists, the senior researcher, and the research director +job-supervisors-engineering = station engineers, atmospheric technicians, and the chief engineer +job-supervisors-medicine = medical doctors, chemists, and the chief medical officer +job-supervisors-security = security officers, the warden, and the head of security +job-supervisors-science = scientists, and the research director job-supervisors-hire = whoever hires you -job-supervisors-everyone = absolutely everyone +job-supervisors-everyone = absolutely everyone \ No newline at end of file diff --git a/Resources/Maps/Shuttles/prowler.yml b/Resources/Maps/Shuttles/prowler.yml index cde99be471b..ed586d65adf 100644 --- a/Resources/Maps/Shuttles/prowler.yml +++ b/Resources/Maps/Shuttles/prowler.yml @@ -1704,7 +1704,7 @@ entities: pos: 1.5,7.5 parent: 1 type: Transform -- proto: ClothingOuterHardsuitSecuritypatrol +- proto: ClothingOuterHardsuitNfsdBronze entities: - uid: 242 components: diff --git a/Resources/Maps/Shuttles/templar.yml b/Resources/Maps/Shuttles/templar.yml index ce241ca640a..ba8829aabae 100644 --- a/Resources/Maps/Shuttles/templar.yml +++ b/Resources/Maps/Shuttles/templar.yml @@ -489,7 +489,7 @@ entities: - canCollide: False type: Physics - type: InsideEntityStorage -- proto: ClothingOuterHardsuitSecuritypatrol +- proto: ClothingOuterHardsuitNfsdBronze entities: - uid: 51 components: diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml index fa7a5368081..76bbbd35a64 100644 --- a/Resources/Maps/_NF/POI/nfsd.yml +++ b/Resources/Maps/_NF/POI/nfsd.yml @@ -16326,7 +16326,7 @@ entities: - type: Transform pos: -4.5,-3.5 parent: 1 -- proto: VendingMachineCart +- proto: VendingMachineCartNfsd entities: - uid: 934 components: diff --git a/Resources/Maps/_NF/Shuttles/Security/hospitaller.yml b/Resources/Maps/_NF/Shuttles/Security/hospitaller.yml new file mode 100644 index 00000000000..0434c9c977f --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/Security/hospitaller.yml @@ -0,0 +1,1136 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 30: FloorDark + 57: FloorHull + 65: FloorMetalDiamond + 107: FloorTechMaint + 111: FloorWhite + 124: Lattice + 125: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.4761362,-0.4642291 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: bwAAAAAAbwAAAAAAbwAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAACfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAbwAAAAAAbwAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + color: '#49392696' + id: CheckerNWSE + decals: + 4: -1,4 + 5: 0,4 + 6: 1,4 + 7: 1,3 + 8: 0,3 + 9: -1,3 + 10: -1,2 + 11: 0,2 + 12: 1,2 + - node: + color: '#4B653E96' + id: CheckerNWSE + decals: + 13: -2,-2 + 14: -2,-1 + 15: -2,0 + 16: -1,0 + 17: -1,-1 + 18: -1,-2 + 19: -1,-3 + 20: -1,-4 + 21: 0,-4 + 22: 0,-3 + 23: 0,-2 + 24: 0,-1 + 25: 0,0 + 26: 1,0 + 27: 1,-1 + 28: 1,-2 + 29: 1,-3 + 30: 1,-4 + 31: 2,-2 + 32: 2,-1 + 33: 2,0 + - node: + color: '#FFFFFFFF' + id: WarnLineN + decals: + 1: 0,1 + 2: 0,1 + - node: + color: '#FFFFFFFF' + id: WarnLineW + decals: + 0: 0,1 + 3: 0,1 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 30719 + 1: 34816 + 0,1: + 0: 55 + 1: 72 + 0,-1: + 0: 65527 + 1: 8 + 0,-2: + 0: 12288 + 1: 49152 + -1,0: + 0: 52462 + 1: 8704 + -1,1: + 0: 140 + 1: 66 + -1,-1: + 1: 2 + 0: 61164 + -1,-2: + 1: 24576 + 0: 32768 + 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: GasTileOverlay + - type: RadiationGridResistance + - type: BecomesStation + id: Hospitaller +- proto: AirCanister + entities: + - uid: 2 + components: + - type: Transform + anchored: True + pos: 1.5,3.5 + parent: 1 + - type: Physics + bodyType: Static + - type: AtmosDevice + joinedGrid: 1 +- proto: AirlockGlassShuttle + entities: + - uid: 3 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-1.5 + parent: 1 + - uid: 4 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-1.5 + parent: 1 +- proto: AirlockNfsdLocked + entities: + - uid: 5 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 +- proto: APCBasic + entities: + - uid: 6 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,2.5 + parent: 1 +- proto: AtmosDeviceFanTiny + entities: + - uid: 7 + components: + - type: Transform + pos: -2.5,-1.5 + parent: 1 + - uid: 8 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 +- proto: AtmosFixBlockerMarker + entities: + - uid: 9 + components: + - type: Transform + pos: 3.5,4.5 + parent: 1 + - uid: 10 + components: + - type: Transform + pos: -2.5,4.5 + parent: 1 + - uid: 11 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 + - uid: 12 + components: + - type: Transform + pos: -1.5,5.5 + parent: 1 + - uid: 13 + components: + - type: Transform + pos: -2.5,-3.5 + parent: 1 + - uid: 14 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 1 + - uid: 15 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 1 + - uid: 16 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 1 + - uid: 17 + components: + - type: Transform + pos: 3.5,-4.5 + parent: 1 + - uid: 18 + components: + - type: Transform + pos: -2.5,2.5 + parent: 1 + - uid: 19 + components: + - type: Transform + pos: 3.5,2.5 + parent: 1 + - uid: 20 + components: + - type: Transform + pos: -2.5,3.5 + parent: 1 + - uid: 21 + components: + - type: Transform + pos: 3.5,3.5 + parent: 1 + - uid: 22 + components: + - type: Transform + pos: -2.5,-4.5 + parent: 1 +- proto: BedsheetNfsdBrigmedic + entities: + - uid: 23 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 24 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 + - uid: 25 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 26 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 27 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 28 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 29 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 30 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 31 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - uid: 32 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - uid: 33 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 34 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 35 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - uid: 36 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 + - uid: 37 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 + - uid: 38 + components: + - type: Transform + pos: 1.5,-3.5 + parent: 1 +- proto: CableHV + entities: + - uid: 39 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - uid: 40 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 41 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 42 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 43 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 44 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 +- proto: CableMV + entities: + - uid: 45 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 46 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - uid: 47 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 48 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 49 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 +- proto: ChairPilotSeat + entities: + - uid: 50 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,3.5 + parent: 1 + - uid: 51 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 + - uid: 52 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 +- proto: ClothingBackpackDuffelSurgeryFilled + entities: + - uid: 53 + components: + - type: Transform + pos: 0.5574491,-3.3398647 + parent: 1 +- proto: ComputerTabletopCrewMonitoring + entities: + - uid: 54 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,2.5 + parent: 1 +- proto: ComputerTabletopShuttle + entities: + - uid: 55 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 +- proto: ComputerTabletopStationRecords + entities: + - uid: 56 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,3.5 + parent: 1 +- proto: DefibrillatorCabinetFilled + entities: + - uid: 57 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-2.5 + parent: 1 +- proto: EmergencyRollerBed + entities: + - uid: 58 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 59 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 1 +- proto: ExtinguisherCabinetFilled + entities: + - uid: 143 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 +- proto: FaxMachineShip + entities: + - uid: 61 + components: + - type: Transform + pos: -0.5,4.5 + parent: 1 +- proto: GasPassiveVent + entities: + - uid: 62 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,4.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - uid: 63 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,4.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 +- proto: GasPipeStraight + entities: + - uid: 64 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-0.5 + parent: 1 + - uid: 65 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 66 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 67 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 68 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 69 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 70 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - uid: 71 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,4.5 + parent: 1 + - uid: 72 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,4.5 + parent: 1 + - uid: 73 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,4.5 + parent: 1 + - uid: 74 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,4.5 + parent: 1 + - uid: 75 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 +- proto: GasPipeTJunction + entities: + - uid: 76 + components: + - type: Transform + pos: 1.5,4.5 + parent: 1 + - uid: 77 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPort + entities: + - uid: 78 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,3.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentPump + entities: + - uid: 79 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,0.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - uid: 80 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,3.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentScrubber + entities: + - uid: 81 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 82 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-2.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GeneratorWallmountAPU + entities: + - uid: 60 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 83 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - uid: 84 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 +- proto: GravityGeneratorMini + entities: + - uid: 85 + components: + - type: Transform + pos: -1.5,0.5 + parent: 1 +- proto: Grille + entities: + - uid: 86 + components: + - type: Transform + pos: -2.5,0.5 + parent: 1 + - uid: 87 + components: + - type: Transform + pos: 3.5,0.5 + parent: 1 + - uid: 88 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 + - uid: 89 + components: + - type: Transform + pos: -1.5,4.5 + parent: 1 + - uid: 90 + components: + - type: Transform + pos: 0.5,-4.5 + parent: 1 + - uid: 91 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 92 + components: + - type: Transform + pos: -0.5,5.5 + parent: 1 + - uid: 93 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 + - uid: 94 + components: + - type: Transform + pos: 1.5,5.5 + parent: 1 + - uid: 95 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 +- proto: GrilleDiagonal + entities: + - uid: 96 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,5.5 + parent: 1 + - uid: 97 + components: + - type: Transform + pos: -1.5,5.5 + parent: 1 +- proto: LockerNfsdBrigmedic + entities: + - uid: 98 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 +- proto: MedicalBed + entities: + - uid: 99 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 +- proto: MedkitAdvancedFilled + entities: + - uid: 100 + components: + - type: Transform + pos: 1.5215306,-3.481596 + parent: 1 +- proto: Paper + entities: + - uid: 101 + components: + - type: Transform + pos: -0.31553048,4.661093 + parent: 1 + - uid: 102 + components: + - type: Transform + pos: -0.35719717,4.51526 + parent: 1 +- proto: PoweredlightColoredRed + entities: + - uid: 103 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-3.5 + parent: 1 + - uid: 104 + components: + - type: Transform + pos: -1.5,0.5 + parent: 1 + - uid: 105 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 + - uid: 106 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,4.5 + parent: 1 +- proto: ShuttleWindow + entities: + - uid: 107 + components: + - type: Transform + pos: 3.5,0.5 + parent: 1 + - uid: 108 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 109 + components: + - type: Transform + pos: -1.5,4.5 + parent: 1 + - uid: 110 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 + - uid: 111 + components: + - type: Transform + pos: -0.5,5.5 + parent: 1 + - uid: 112 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 + - uid: 113 + components: + - type: Transform + pos: 1.5,5.5 + parent: 1 + - uid: 114 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 115 + components: + - type: Transform + pos: 0.5,-4.5 + parent: 1 + - uid: 116 + components: + - type: Transform + pos: -2.5,0.5 + parent: 1 +- proto: ShuttleWindowDiagonal + entities: + - uid: 117 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,5.5 + parent: 1 + - uid: 118 + components: + - type: Transform + pos: -1.5,5.5 + parent: 1 +- proto: SmallGyroscopeNfsd + entities: + - uid: 119 + components: + - type: Transform + pos: 1.5,4.5 + parent: 1 +- proto: StasisBed + entities: + - uid: 120 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 +- proto: SubstationWallBasic + entities: + - uid: 121 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,2.5 + parent: 1 +- proto: TableReinforced + entities: + - uid: 122 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 + - uid: 123 + components: + - type: Transform + pos: 1.5,-3.5 + parent: 1 + - uid: 124 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 + - uid: 125 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 126 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,4.5 + parent: 1 + - uid: 127 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,3.5 + parent: 1 + - uid: 128 + components: + - type: Transform + pos: -0.5,4.5 + parent: 1 +- proto: ThrusterNfsd + entities: + - uid: 129 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-4.5 + parent: 1 + - uid: 130 + components: + - type: Transform + pos: -2.5,3.5 + parent: 1 + - uid: 131 + components: + - type: Transform + pos: 3.5,3.5 + parent: 1 + - uid: 132 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-4.5 + parent: 1 + - uid: 133 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-3.5 + parent: 1 + - uid: 134 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-3.5 + parent: 1 +- proto: VendingMachineMedical + entities: + - uid: 135 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 +- proto: WallShuttle + entities: + - uid: 136 + components: + - type: Transform + pos: -2.5,1.5 + parent: 1 + - uid: 137 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 138 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 + - uid: 139 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - uid: 140 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 141 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 142 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 144 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 1 + - uid: 145 + components: + - type: Transform + pos: -1.5,-2.5 + parent: 1 + - uid: 146 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 1 + - uid: 147 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 + - uid: 148 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 1 + - uid: 149 + components: + - type: Transform + pos: -0.5,-4.5 + parent: 1 + - uid: 150 + components: + - type: Transform + pos: 1.5,-4.5 + parent: 1 + - uid: 151 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 1 + - uid: 152 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 + - uid: 153 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - uid: 160 + components: + - type: Transform + pos: 3.5,1.5 + parent: 1 +- proto: WallShuttleDiagonal + entities: + - uid: 154 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,2.5 + parent: 1 + - uid: 155 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-4.5 + parent: 1 + - uid: 156 + components: + - type: Transform + pos: -2.5,2.5 + parent: 1 + - uid: 157 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-4.5 + parent: 1 +- proto: WallWeaponCapacitorRecharger + entities: + - uid: 158 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 +- proto: WarpPointShip + entities: + - uid: 159 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - type: WarpPoint + location: Hospitaller +... diff --git a/Resources/Maps/_NF/Shuttles/hospitaller.yml b/Resources/Maps/_NF/Shuttles/Security/templar.yml similarity index 53% rename from Resources/Maps/_NF/Shuttles/hospitaller.yml rename to Resources/Maps/_NF/Shuttles/Security/templar.yml index ea449aff2f7..4d694d33ac9 100644 --- a/Resources/Maps/_NF/Shuttles/hospitaller.yml +++ b/Resources/Maps/_NF/Shuttles/Security/templar.yml @@ -3,89 +3,78 @@ meta: postmapinit: false tilemap: 0: Space - 28: FloorDark - 55: FloorHull - 63: FloorMetalDiamond - 97: FloorTechMaint - 101: FloorWhite - 113: Lattice - 114: Plating + 30: FloorDark + 46: FloorGlass + 57: FloorHull + 65: FloorMetalDiamond + 99: FloorSteelDirty + 107: FloorTechMaint + 124: Lattice entities: - proto: "" entities: - uid: 1 components: - - name: grid - type: MetaData - - pos: -0.4761362,-0.4642291 + - type: MetaData + name: grid + - type: Transform + pos: -0.4761362,-0.4642291 parent: invalid - type: Transform - - chunks: + - type: MapGrid + chunks: 0,0: ind: 0,0 - tiles: PwAAAAAAPwAAAAAAPwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAABHAAAAAADcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAACHAAAAAACcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: QQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAHgAAAAACOQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAOQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAACOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZQAAAAAAZQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZQAAAAAAZQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcgAAAAAAcgAAAAAANwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACLgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAawAAAAAAHgAAAAABOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAPwAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAHAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAHAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOQAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOQAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAZQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAZQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANwAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAPwAAAAAAPwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAABYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAADYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAHgAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAA version: 6 - type: MapGrid - type: Broadphase - - bodyStatus: InAir + - type: Physics + bodyStatus: InAir angularDamping: 0.05 linearDamping: 0.05 fixedRotation: False bodyType: Dynamic - type: Physics - - fixtures: {} - type: Fixtures + - type: Fixtures + fixtures: {} - type: OccluderTree - type: SpreaderGrid - type: Shuttle - type: GridPathfinding - - gravityShakeSound: !type:SoundPathSpecifier + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg - type: Gravity - - chunkCollection: + - type: DecalGrid + chunkCollection: version: 2 nodes: - node: - color: '#5973D966' - id: CheckerNESW + color: '#49392696' + id: CheckerNWSE decals: - 15: -1,-3 - 16: 0,-3 - 17: 1,-3 - 18: 1,-4 - 19: 0,-4 - 20: -1,-4 - 21: -1,-3 - 22: 0,-3 - 23: 1,-3 - 24: 1,-4 - 25: 0,-4 - 26: -1,-4 - - node: - color: '#C1463E67' - id: CheckerNESW - decals: - 6: -1,2 - 7: -1,3 - 8: -1,4 - 9: 0,2 + 6: -1,4 + 7: 0,4 + 8: 1,4 + 9: 1,3 10: 0,3 - 11: 0,4 - 12: 1,2 - 13: 1,3 - 14: 1,4 + 11: -1,3 + 12: -1,2 + 13: 0,2 + 14: 1,2 + 15: 0,-3 + 16: 1,-3 + 17: 1,-4 + 18: 0,-4 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' @@ -104,45 +93,30 @@ entities: decals: 1: 2,0 5: 2,-1 - - node: - color: '#FFFFFFFF' - id: WarnLineN - decals: - 29: 0,1 - 30: 0,-2 - 31: 0,-2 - 32: 0,1 - node: color: '#FFFFFFFF' id: WarnLineS decals: 0: -2,0 4: -2,-1 - - node: - color: '#FFFFFFFF' - id: WarnLineW - decals: - 27: 0,-2 - 28: 0,1 - 33: 0,1 - 34: 0,-2 - type: DecalGrid - - version: 2 + - type: GridAtmosphere + version: 2 data: tiles: 0,0: - 0: 32783 + 0: 15 1: 32240 2: 512 0,1: 1: 119 0,-1: - 1: 2047 + 1: 2031 + 3: 16 0: 63488 0,-2: 1: 28672 -1,0: - 0: 8206 + 0: 14 1: 52960 -1,1: 1: 204 @@ -197,697 +171,616 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.1499 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GridAtmosphere - type: GasTileOverlay - type: RadiationGridResistance - - id: Hospitaller - type: BecomesStation -- proto: AirCanister - entities: - - uid: 55 - components: - - anchored: True - pos: 1.5,3.5 - parent: 1 - type: Transform - - bodyType: Static - type: Physics + - type: BecomesStation + id: Hospitaller - proto: AirlockGlassShuttle entities: - uid: 2 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -2.5,-1.5 parent: 1 - type: Transform - uid: 3 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 3.5,-1.5 parent: 1 - type: Transform -- proto: AirlockSecurityGlassLocked +- proto: AirlockNfsd entities: - uid: 4 components: - - pos: 0.5,1.5 + - type: Transform + pos: 1.5,-1.5 parent: 1 - type: Transform - uid: 5 components: - - pos: 0.5,-1.5 + - type: Transform + pos: 0.5,1.5 parent: 1 - type: Transform - proto: APCBasic entities: - uid: 6 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -1.5,2.5 parent: 1 - type: Transform - proto: AtmosDeviceFanTiny entities: - uid: 7 components: - - pos: 0.5,1.5 + - type: Transform + pos: 0.5,1.5 parent: 1 - type: Transform - uid: 8 components: - - pos: 0.5,-1.5 - parent: 1 - type: Transform - - uid: 129 - components: - - pos: -2.5,-1.5 - parent: 1 - type: Transform - - uid: 134 - components: - - pos: 3.5,-1.5 - parent: 1 - type: Transform -- proto: AtmosFixBlockerMarker - entities: - - uid: 46 - components: - - pos: 2.5,5.5 - parent: 1 - type: Transform - - uid: 57 - components: - - pos: -1.5,5.5 - parent: 1 - type: Transform - - uid: 96 - components: - - pos: -2.5,-2.5 - parent: 1 - type: Transform - - uid: 141 - components: - - pos: -2.5,-3.5 - parent: 1 - type: Transform - - uid: 147 - components: - - pos: -1.5,-4.5 - parent: 1 - type: Transform - - uid: 148 - components: - - pos: 2.5,-4.5 - parent: 1 - type: Transform - - uid: 149 - components: - - pos: 3.5,-3.5 - parent: 1 - type: Transform - - uid: 150 - components: - - pos: 3.5,-2.5 - parent: 1 - type: Transform - - uid: 151 - components: - - pos: 3.5,-0.5 - parent: 1 - type: Transform - - uid: 152 - components: - - pos: 3.5,0.5 - parent: 1 - type: Transform - - uid: 153 - components: - - pos: 2.5,0.5 - parent: 1 - type: Transform - - uid: 154 - components: - - pos: 2.5,-0.5 - parent: 1 - type: Transform - - uid: 155 - components: - - pos: 1.5,-0.5 - parent: 1 - type: Transform - - uid: 156 - components: - - pos: 1.5,0.5 - parent: 1 - type: Transform - - uid: 157 - components: - - pos: 0.5,0.5 - parent: 1 - type: Transform - - uid: 158 - components: - - pos: 0.5,-0.5 - parent: 1 - type: Transform - - uid: 159 - components: - - pos: -0.5,-0.5 - parent: 1 - type: Transform - - uid: 160 - components: - - pos: -0.5,0.5 - parent: 1 - type: Transform - - uid: 161 - components: - - pos: -1.5,0.5 - parent: 1 - type: Transform - - uid: 162 - components: - - pos: -1.5,-0.5 - parent: 1 - type: Transform - - uid: 163 - components: - - pos: -2.5,-0.5 - parent: 1 - type: Transform - - uid: 164 - components: - - pos: -2.5,0.5 - parent: 1 - type: Transform - - uid: 165 - components: - - pos: -2.5,2.5 - parent: 1 - type: Transform - - uid: 166 - components: - - pos: 3.5,2.5 - parent: 1 - type: Transform - - uid: 169 - components: - - pos: 3.5,3.5 - parent: 1 - type: Transform - - uid: 170 - components: - - pos: -2.5,3.5 + - type: Transform + pos: 1.5,-1.5 parent: 1 - type: Transform -- proto: BedsheetBrigmedic +- proto: Bed entities: - uid: 9 components: - - pos: 0.5,-3.5 + - type: Transform + pos: -0.5,-2.5 parent: 1 - type: Transform -- proto: BlastDoorOpen +- proto: BedsheetOrange entities: - - uid: 103 - components: - - pos: 3.5,0.5 - parent: 1 - type: Transform - - links: - - 107 - type: DeviceLinkSink - - uid: 104 - components: - - pos: -2.5,-0.5 - parent: 1 - type: Transform - - links: - - 107 - type: DeviceLinkSink - - uid: 105 - components: - - pos: -2.5,0.5 - parent: 1 - type: Transform - - links: - - 107 - type: DeviceLinkSink - - uid: 106 + - uid: 10 components: - - pos: 3.5,-0.5 + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-2.5 parent: 1 - type: Transform - - links: - - 107 - type: DeviceLinkSink - proto: CableApcExtension entities: - - uid: 10 - components: - - pos: -1.5,2.5 - parent: 1 - type: Transform - uid: 11 components: - - pos: -0.5,2.5 + - type: Transform + pos: -1.5,2.5 parent: 1 - type: Transform - uid: 12 components: - - pos: 0.5,2.5 + - type: Transform + pos: -0.5,2.5 parent: 1 - type: Transform - uid: 13 components: - - pos: 0.5,1.5 + - type: Transform + pos: 0.5,2.5 parent: 1 - type: Transform - uid: 14 components: - - pos: 0.5,0.5 + - type: Transform + pos: 0.5,1.5 parent: 1 - type: Transform - uid: 15 components: - - pos: 0.5,-0.5 + - type: Transform + pos: 0.5,0.5 parent: 1 - type: Transform - uid: 16 components: - - pos: 0.5,-1.5 + - type: Transform + pos: 0.5,-0.5 parent: 1 - type: Transform - uid: 17 components: - - pos: 0.5,-2.5 + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 18 + components: + - type: Transform + pos: 0.5,-2.5 parent: 1 - type: Transform - uid: 19 components: - - pos: 0.5,3.5 + - type: Transform + pos: 0.5,-3.5 + parent: 1 + - uid: 20 + components: + - type: Transform + pos: 0.5,3.5 parent: 1 - type: Transform - uid: 21 components: - - pos: -0.5,-0.5 + - type: Transform + pos: 0.5,4.5 + parent: 1 + - uid: 22 + components: + - type: Transform + pos: -0.5,-0.5 parent: 1 - type: Transform - uid: 23 components: - - pos: 1.5,-0.5 + - type: Transform + pos: -1.5,-0.5 parent: 1 - type: Transform - - uid: 82 + - uid: 24 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 25 components: - - pos: 1.5,2.5 + - type: Transform + pos: 2.5,-0.5 parent: 1 - type: Transform - - uid: 176 + - uid: 26 components: - - pos: -0.5,-3.5 + - type: Transform + pos: 1.5,-3.5 parent: 1 - type: Transform - - uid: 177 + - uid: 27 components: - - pos: 0.5,-3.5 + - type: Transform + pos: 2.5,-3.5 parent: 1 - type: Transform - - uid: 178 + - uid: 28 components: - - pos: 1.5,-3.5 + - type: Transform + pos: -0.5,-3.5 parent: 1 - type: Transform -- proto: CableHV - entities: - uid: 29 components: - - pos: 2.5,1.5 + - type: Transform + pos: -1.5,-3.5 parent: 1 - type: Transform +- proto: CableHV + entities: - uid: 30 components: - - pos: 1.5,1.5 + - type: Transform + pos: 2.5,1.5 parent: 1 - type: Transform - uid: 31 components: - - pos: 0.5,1.5 + - type: Transform + pos: 1.5,1.5 parent: 1 - type: Transform - uid: 32 components: - - pos: 2.5,2.5 + - type: Transform + pos: 0.5,1.5 parent: 1 - type: Transform - uid: 33 components: - - pos: -1.5,1.5 + - type: Transform + pos: 2.5,2.5 parent: 1 - type: Transform - uid: 34 components: - - pos: -0.5,1.5 + - type: Transform + pos: -1.5,1.5 parent: 1 - type: Transform -- proto: CableMV - entities: - uid: 35 components: - - pos: 2.5,2.5 + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 145 + components: + - type: Transform + pos: 0.5,0.5 parent: 1 - type: Transform + - uid: 146 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 147 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 +- proto: CableMV + entities: - uid: 36 components: - - pos: 1.5,2.5 + - type: Transform + pos: 2.5,2.5 parent: 1 - type: Transform - uid: 37 components: - - pos: 0.5,2.5 + - type: Transform + pos: 1.5,2.5 parent: 1 - type: Transform - uid: 38 components: - - pos: -0.5,2.5 + - type: Transform + pos: 0.5,2.5 parent: 1 - type: Transform - uid: 39 components: - - pos: -1.5,2.5 + - type: Transform + pos: -0.5,2.5 parent: 1 - type: Transform -- proto: Catwalk - entities: - uid: 40 components: - - pos: 3.5,0.5 + - type: Transform + pos: -1.5,2.5 parent: 1 - type: Transform +- proto: Catwalk + entities: - uid: 41 components: - - pos: -2.5,-1.5 + - type: Transform + pos: 3.5,0.5 parent: 1 - type: Transform - uid: 42 components: - - rot: 1.5707963267948966 rad - pos: -2.5,0.5 + - type: Transform + pos: -2.5,-1.5 parent: 1 - type: Transform - uid: 43 components: - - pos: -2.5,-0.5 + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,0.5 parent: 1 - type: Transform - uid: 44 components: - - pos: 3.5,-1.5 + - type: Transform + pos: -2.5,-0.5 parent: 1 - type: Transform - uid: 45 components: - - pos: 3.5,-0.5 + - type: Transform + pos: 3.5,-1.5 + parent: 1 + - uid: 46 + components: + - type: Transform + pos: 3.5,-0.5 parent: 1 - type: Transform - proto: ChairPilotSeat entities: - uid: 47 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,3.5 + parent: 1 + - uid: 48 + components: + - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,-3.5 parent: 1 - type: Transform - - uid: 108 + - uid: 49 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 0.5,3.5 parent: 1 - type: Transform -- proto: ComputerTabletopShuttle +- proto: ClothingMaskBreath entities: - - uid: 18 + - uid: 51 components: - - pos: 0.5,4.5 - parent: 1 - type: Transform -- proto: ComputerTabletopStationRecords + - type: Transform + parent: 50 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 52 + components: + - type: Transform + parent: 50 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingOuterHardsuitEVAPrisoner + entities: + - uid: 53 + components: + - type: Transform + parent: 50 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 54 + components: + - type: Transform + parent: 50 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingShoesColorOrange entities: + - uid: 55 + components: + - type: Transform + parent: 50 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 56 components: - - rot: 1.5707963267948966 rad - pos: -0.5,3.5 + - type: Transform + parent: 50 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingUniformJumpskirtPrisoner + entities: + - uid: 57 + components: + - type: Transform + parent: 50 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 58 + components: + - type: Transform + parent: 50 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingUniformJumpsuitPrisoner + entities: + - uid: 59 + components: + - type: Transform + parent: 50 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 60 + components: + - type: Transform + parent: 50 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ComputerIFF + entities: + - uid: 63 + components: + - type: Transform + pos: -0.5,4.5 parent: 1 - type: Transform -- proto: DefibrillatorCabinetFilled +- proto: ComputerShuttle entities: - - uid: 97 + - uid: 64 components: - - rot: -1.5707963267948966 rad - pos: 2.5,-2.5 + - type: Transform + pos: 1.5,4.5 parent: 1 - type: Transform -- proto: ExtinguisherCabinetFilled +- proto: ComputerStationRecords entities: - - uid: 91 + - uid: 65 components: - - rot: 3.141592653589793 rad - pos: -0.5,-1.5 + - type: Transform + pos: 0.5,4.5 parent: 1 - type: Transform +- proto: EmergencyNitrogenTankFilled + entities: + - uid: 61 + components: + - type: Transform + parent: 50 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: EmergencyOxygenTankFilled + entities: + - uid: 62 + components: + - type: Transform + parent: 50 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: FaxMachineShip entities: - - uid: 60 + - uid: 66 components: - - pos: -0.5,4.5 + - type: Transform + pos: -0.5,2.5 parent: 1 - type: Transform - proto: GasPassiveVent entities: - - uid: 61 + - uid: 67 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -1.5,-0.5 parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 62 + - type: AtmosDevice + joinedGrid: 1 + - uid: 68 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 2.5,-0.5 parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosDevice + joinedGrid: 1 - proto: GasPipeFourway entities: - - uid: 63 + - uid: 69 components: - - pos: 1.5,-0.5 + - type: Transform + pos: 1.5,-0.5 parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - proto: GasPipeStraight entities: - - uid: 20 - components: - - pos: 0.5,1.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 26 + - uid: 70 components: - - pos: 0.5,2.5 + - type: Transform + pos: 1.5,-1.5 parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 64 + - uid: 71 components: - - pos: 1.5,-1.5 + - type: Transform + pos: 1.5,0.5 parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 65 + - uid: 72 components: - - pos: 1.5,0.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-0.5 parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 66 + - uid: 73 components: - - rot: -1.5707963267948966 rad - pos: 0.5,-0.5 + - type: Transform + pos: 1.5,1.5 parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 67 + - uid: 74 components: - - pos: 1.5,1.5 + - type: Transform + pos: -0.5,-1.5 parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 68 +- proto: GasPipeTJunction + entities: + - uid: 75 components: - - rot: -1.5707963267948966 rad + - type: Transform pos: -0.5,-0.5 parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 171 +- proto: GasVentScrubber + entities: + - uid: 76 components: - - pos: 0.5,0.5 + - type: Transform + pos: 1.5,2.5 parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 172 + - type: AtmosDevice + joinedGrid: 1 + - uid: 77 components: - - pos: 0.5,-0.5 + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-2.5 parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 173 + - type: AtmosDevice + joinedGrid: 1 + - uid: 78 components: - - pos: 0.5,-1.5 + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-2.5 parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor -- proto: GasPipeTJunction + - type: AtmosDevice + joinedGrid: 1 +- proto: GeneratorWallmountAPU entities: - - uid: 28 + - uid: 79 components: - - pos: 0.5,3.5 + - type: Transform + pos: 2.5,1.5 parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor -- proto: GasPort - entities: - - uid: 27 + - uid: 80 components: - - rot: -1.5707963267948966 rad - pos: 1.5,3.5 + - type: Transform + pos: -1.5,1.5 parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor -- proto: GasVentPump - entities: - - uid: 174 + - uid: 144 components: - - rot: 3.141592653589793 rad - pos: 0.5,-2.5 + - type: Transform + pos: 0.5,-1.5 parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 175 - components: - - rot: 1.5707963267948966 rad - pos: -0.5,3.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor -- proto: GasVentScrubber +- proto: GravityGeneratorMini entities: - - uid: 69 - components: - - pos: 1.5,2.5 - parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 70 + - uid: 81 components: - - rot: 3.141592653589793 rad - pos: 1.5,-2.5 + - type: Transform + pos: -0.5,3.5 parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor -- proto: GeneratorWallmountAPU +- proto: Grille entities: - - uid: 71 - components: - - pos: 2.5,1.5 - parent: 1 - type: Transform - - uid: 72 + - uid: 82 components: - - pos: -1.5,1.5 + - type: Transform + pos: 2.5,3.5 parent: 1 - type: Transform -- proto: GravityGeneratorMini - entities: - - uid: 73 + - uid: 83 components: - - pos: -0.5,2.5 + - type: Transform + pos: -0.5,5.5 parent: 1 - type: Transform -- proto: Grille - entities: - - uid: 54 + - uid: 84 components: - - pos: 0.5,-4.5 + - type: Transform + pos: 0.5,5.5 parent: 1 - type: Transform - - uid: 74 + - uid: 85 components: - - pos: 2.5,3.5 + - type: Transform + pos: 1.5,5.5 parent: 1 - type: Transform - - uid: 75 + - uid: 86 components: - - pos: -0.5,5.5 + - type: Transform + pos: 2.5,-2.5 parent: 1 - type: Transform - - uid: 76 + - uid: 87 components: - - pos: 0.5,5.5 + - type: Transform + pos: -1.5,-2.5 parent: 1 - type: Transform - - uid: 77 + - uid: 88 components: - - pos: 1.5,5.5 + - type: Transform + pos: -1.5,3.5 parent: 1 - type: Transform - - uid: 80 +- proto: GyroscopeNfsd + entities: + - uid: 89 components: - - pos: -1.5,3.5 + - type: Transform + pos: 1.5,0.5 parent: 1 - type: Transform - proto: IntercomMedical entities: - - uid: 83 + - uid: 90 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,4.5 + parent: 1 + - uid: 91 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 2.5,-3.5 parent: 1 - type: Transform -- proto: LockerBrigmedicFilledHardsuit +- proto: LockerNfsdEvidence entities: - - uid: 48 + - uid: 50 components: - - pos: 1.5,2.5 + - type: Transform + pos: 0.5,-2.5 parent: 1 - type: Transform - - air: + - type: EntityStorage + air: volume: 200 immutable: False - temperature: 293.1496 + temperature: 293.14914 moles: - 1.7459903 - 6.568249 @@ -901,452 +794,370 @@ entities: - 0 - 0 - 0 - type: EntityStorage - - containers: + - type: ContainerContainer + containers: entity_storage: !type:Container showEnts: False occludes: True ents: - - 49 - - 50 + - 62 + - 61 + - 59 + - 60 + - 57 + - 53 - 51 + - 52 + - 55 + - 54 + - 58 + - 56 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null - type: ContainerContainer -- proto: MagazineRifle +- proto: LockerNfsdSilver entities: - - uid: 49 - components: - - flags: InContainer - type: MetaData - - parent: 48 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 50 - components: - - flags: InContainer - type: MetaData - - parent: 48 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: MedicalBed - entities: - - uid: 84 - components: - - pos: 0.5,-3.5 - parent: 1 - type: Transform -- proto: MedkitAdvancedFilled - entities: - - uid: 85 + - uid: 92 components: - - pos: -0.48612905,-2.4243455 + - type: Transform + pos: 1.5,2.5 parent: 1 - type: Transform -- proto: MedkitBruteFilled +- proto: PlastitaniumWindow entities: - - uid: 86 + - uid: 93 components: - - pos: -0.48612905,-2.6628194 + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,5.5 parent: 1 - type: Transform -- proto: MedkitBurnFilled - entities: - - uid: 87 + - uid: 94 components: - - pos: -0.48612905,-2.9489884 + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,5.5 parent: 1 - type: Transform -- proto: MedkitCombatFilled - entities: - - uid: 88 + - uid: 95 components: - - pos: -0.48612905,-3.211309 + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,5.5 parent: 1 - type: Transform -- proto: MedkitOxygenFilled - entities: - - uid: 89 + - uid: 96 components: - - pos: -0.48612905,-3.4020886 + - type: Transform + pos: -1.5,3.5 parent: 1 - type: Transform -- proto: MedkitToxinFilled - entities: - - uid: 90 + - uid: 97 components: - - pos: -0.46226525,-3.616715 + - type: Transform + pos: 2.5,3.5 parent: 1 - type: Transform -- proto: Paper - entities: - - uid: 137 + - uid: 98 components: - - pos: -0.31553048,4.661093 + - type: Transform + pos: -1.5,-2.5 parent: 1 - type: Transform - - uid: 138 + - uid: 99 components: - - pos: -0.35719717,4.51526 + - type: Transform + pos: 2.5,-2.5 parent: 1 - type: Transform -- proto: PlastitaniumWindow +- proto: PoweredlightColoredRed entities: - - uid: 92 - components: - - rot: -1.5707963267948966 rad - pos: 1.5,5.5 - parent: 1 - type: Transform - - uid: 93 - components: - - rot: -1.5707963267948966 rad - pos: 0.5,5.5 - parent: 1 - type: Transform - - uid: 94 + - uid: 100 components: - - rot: -1.5707963267948966 rad - pos: -0.5,5.5 + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-3.5 parent: 1 - type: Transform - - uid: 95 + - uid: 101 components: - - pos: -1.5,3.5 + - type: Transform + pos: -1.5,0.5 parent: 1 - type: Transform - - uid: 118 + - uid: 102 components: - - pos: 0.5,-4.5 + - type: Transform + pos: 2.5,0.5 parent: 1 - type: Transform - - uid: 139 + - uid: 103 components: - - pos: 2.5,3.5 + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,4.5 parent: 1 - type: Transform -- proto: PoweredlightColoredRed +- proto: ShuttersWindowOpen entities: - - uid: 99 + - uid: 104 components: - - pos: -1.5,0.5 + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,0.5 parent: 1 - type: Transform - - uid: 100 + - type: DeviceLinkSink + links: + - 108 + - uid: 105 components: - - pos: 2.5,0.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-0.5 parent: 1 - type: Transform - - uid: 101 + - type: DeviceLinkSink + links: + - 108 + - uid: 106 components: - - rot: 1.5707963267948966 rad - pos: -0.5,4.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,0.5 parent: 1 - type: Transform - - uid: 102 + - type: DeviceLinkSink + links: + - 108 + - uid: 107 components: - - pos: 1.5,-2.5 + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-0.5 parent: 1 - type: Transform + - type: DeviceLinkSink + links: + - 108 - proto: SignalButton entities: - - uid: 107 + - uid: 108 components: - - pos: -0.5,1.5 + - type: Transform + pos: -0.5,1.5 parent: 1 - type: Transform - - linkedPorts: + - type: DeviceLinkSource + linkedPorts: + 106: + - Pressed: Toggle 105: - Pressed: Toggle 104: - Pressed: Toggle - 103: - - Pressed: Toggle - 106: + 107: - Pressed: Toggle - type: DeviceLinkSource -- proto: SmallGyroscopeSecurity - entities: - - uid: 25 - components: - - pos: 1.5,4.5 - parent: 1 - type: Transform -- proto: SpawnPointBrigmedic - entities: - - uid: 146 - components: - - pos: 0.5,2.5 - parent: 1 - type: Transform -- proto: SpawnPointLatejoin +- proto: SubstationWallBasic entities: - uid: 109 components: - - pos: 0.5,2.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,2.5 parent: 1 - type: Transform -- proto: SubstationWallBasic +- proto: TableReinforced entities: - uid: 110 components: - - rot: -1.5707963267948966 rad - pos: 2.5,2.5 + - type: Transform + pos: -0.5,2.5 parent: 1 - type: Transform -- proto: TableCounterMetal +- proto: ThrusterNfsd entities: - uid: 111 components: - - pos: -0.5,-3.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-2.5 parent: 1 - type: Transform - uid: 112 components: - - pos: -0.5,-2.5 - parent: 1 - type: Transform -- proto: TableReinforced - entities: - - uid: 22 - components: - - rot: 1.5707963267948966 rad - pos: 0.5,4.5 - parent: 1 - type: Transform - - uid: 24 - components: - - rot: 1.5707963267948966 rad - pos: -0.5,3.5 + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-3.5 parent: 1 - type: Transform - uid: 113 components: - - pos: -0.5,4.5 + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-3.5 parent: 1 - type: Transform -- proto: ThrusterSecurity - entities: - uid: 114 components: - - rot: -1.5707963267948966 rad - pos: 3.5,-2.5 + - type: Transform + pos: 3.5,2.5 parent: 1 - type: Transform - uid: 115 components: - - rot: 3.141592653589793 rad - pos: 3.5,-3.5 + - type: Transform + pos: -2.5,2.5 parent: 1 - type: Transform - uid: 116 components: - - rot: 3.141592653589793 rad - pos: -2.5,-3.5 - parent: 1 - type: Transform - - uid: 119 - components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -2.5,-2.5 parent: 1 - type: Transform - - uid: 167 - components: - - pos: 3.5,3.5 - parent: 1 - type: Transform - - uid: 168 - components: - - pos: -2.5,3.5 - parent: 1 - type: Transform -- proto: VendingMachineWallMedical +- proto: WallPlastitanium entities: - - uid: 52 + - uid: 117 components: - - pos: 1.5,-1.5 + - type: Transform + pos: -0.5,-1.5 parent: 1 - type: Transform -- proto: WallPlastitanium - entities: - - uid: 53 + - uid: 118 components: - - pos: 2.5,-2.5 + - type: Transform + pos: 0.5,-1.5 parent: 1 - type: Transform - - uid: 59 + - uid: 119 components: - - rot: 3.141592653589793 rad - pos: -0.5,-4.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,4.5 parent: 1 - type: Transform - - uid: 78 + - uid: 120 components: - - pos: 2.5,-3.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,2.5 parent: 1 - type: Transform - - uid: 98 + - uid: 121 components: - - rot: 3.141592653589793 rad - pos: 1.5,-4.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,1.5 parent: 1 - type: Transform - - uid: 120 + - uid: 122 components: - - pos: -1.5,-3.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-3.5 parent: 1 - type: Transform - uid: 123 components: - - pos: -1.5,-2.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,2.5 parent: 1 - type: Transform - uid: 124 components: - - pos: 3.5,1.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,1.5 parent: 1 - type: Transform - uid: 125 components: - - rot: -1.5707963267948966 rad - pos: -1.5,4.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,4.5 parent: 1 - type: Transform - uid: 126 components: - - rot: -1.5707963267948966 rad - pos: 2.5,2.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-1.5 parent: 1 - type: Transform - uid: 127 components: - - rot: -1.5707963267948966 rad - pos: 2.5,1.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-4.5 parent: 1 - type: Transform - uid: 128 components: - - pos: -2.5,1.5 + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 129 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-3.5 parent: 1 - type: Transform - uid: 130 components: - - rot: -1.5707963267948966 rad - pos: -1.5,2.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-4.5 parent: 1 - type: Transform - uid: 131 components: - - rot: -1.5707963267948966 rad - pos: -1.5,1.5 + - type: Transform + pos: -0.5,1.5 parent: 1 - type: Transform - uid: 132 components: - - rot: -1.5707963267948966 rad - pos: 2.5,4.5 + - type: Transform + pos: 0.5,-4.5 parent: 1 - type: Transform - uid: 133 components: - - rot: -1.5707963267948966 rad - pos: -1.5,-1.5 - parent: 1 - type: Transform - - uid: 135 - components: - - pos: 1.5,1.5 - parent: 1 - type: Transform - - uid: 136 - components: - - pos: 1.5,-1.5 - parent: 1 - type: Transform - - uid: 140 - components: - - pos: -0.5,1.5 - parent: 1 - type: Transform - - uid: 142 - components: - - pos: -0.5,-1.5 - parent: 1 - type: Transform - - uid: 143 - components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 2.5,-1.5 parent: 1 - type: Transform - proto: WallPlastitaniumDiagonal entities: - - uid: 58 + - uid: 134 components: - - rot: 3.141592653589793 rad - pos: 2.5,-4.5 + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-4.5 parent: 1 - type: Transform - - uid: 79 + - uid: 135 components: - - rot: -1.5707963267948966 rad - pos: 3.5,2.5 + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-4.5 parent: 1 - type: Transform - - uid: 81 + - uid: 136 components: - - pos: -2.5,2.5 + - type: Transform + pos: -1.5,5.5 parent: 1 - type: Transform - - uid: 117 + - uid: 137 components: - - rot: 1.5707963267948966 rad - pos: -1.5,-4.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,5.5 parent: 1 - type: Transform - - uid: 121 + - uid: 138 components: - - pos: -1.5,5.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,1.5 parent: 1 - type: Transform - - uid: 122 + - uid: 139 components: - - rot: -1.5707963267948966 rad - pos: 2.5,5.5 + - type: Transform + pos: -2.5,1.5 parent: 1 - type: Transform - proto: WallWeaponCapacitorRecharger entities: - - uid: 144 + - uid: 140 components: - - pos: 1.5,1.5 + - type: Transform + pos: 1.5,1.5 parent: 1 - type: Transform - proto: WarpPointShip entities: - - uid: 145 + - uid: 141 components: - - pos: 0.5,0.5 + - type: Transform + pos: 0.5,0.5 parent: 1 - type: Transform - - location: Hospitaller - type: WarpPoint -- proto: WeaponRifleLecter + - type: WarpPoint + location: Hospitaller +- proto: WindoorSecureSecurityLocked entities: - - uid: 51 + - uid: 142 components: - - flags: InContainer - type: MetaData - - parent: 48 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 +- proto: WindowReinforcedDirectional + entities: + - uid: 143 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-2.5 + parent: 1 ... diff --git a/Resources/Maps/_NF/Shuttles/vagabond.yml b/Resources/Maps/_NF/Shuttles/vagabond.yml new file mode 100644 index 00000000000..09f6320064d --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/vagabond.yml @@ -0,0 +1,6039 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 30: FloorDark + 46: FloorGlass + 65: FloorMetalDiamond + 94: FloorSteelCheckerDark + 103: FloorSteelMono + 107: FloorTechMaint + 120: FloorWhitePlastic + 124: Lattice + 125: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5244612,-0.4938817 + parent: invalid + - type: MapGrid + chunks: + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAawAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAXgAAAAAAXgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAawAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAZwAAAAAAZwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAZwAAAAAAZwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAawAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeAAAAAAAawAAAAAAHgAAAAAAHgAAAAAAawAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAA + version: 6 + 0,0: + ind: 0,0 + tiles: HgAAAAAAHgAAAAAAHgAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfAAAAAAALgAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAawAAAAAAfQAAAAAAAAAAAAAALgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAHgAAAAAAawAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAawAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAHgAAAAAAawAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAHgAAAAAAawAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAawAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfQAAAAAAHgAAAAAAawAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAawAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAawAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAawAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAawAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAawAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAawAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAawAAAAAAHgAAAAAAHgAAAAAAHgAAAAAA + version: 6 + -1,1: + ind: -1,1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAawAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAawAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + color: '#EFB34196' + id: ArrowsGreyscale + decals: + 147: -7,-12 + - node: + angle: 4.71238898038469 rad + color: '#EFB34196' + id: ArrowsGreyscale + decals: + 50: -8,-10 + - node: + color: '#BC863FFF' + id: Bot + decals: + 212: -8,9 + 213: -8,8 + - node: + color: '#3C44AAFF' + id: BotGreyscale + decals: + 3: -5,10 + - node: + color: '#B02E26FF' + id: BotGreyscale + decals: + 2: -5,11 + - node: + color: '#D4D4D4FF' + id: BrickTileDarkCornerNe + decals: + 57: -8,2 + 62: -5,6 + - node: + color: '#D4D4D4FF' + id: BrickTileDarkCornerNw + decals: + 63: -6,6 + - node: + color: '#D4D4D4FF' + id: BrickTileDarkCornerSe + decals: + 64: -5,5 + 145: -8,-1 + - node: + color: '#D4D4D4FF' + id: BrickTileDarkCornerSw + decals: + 115: -6,5 + - node: + color: '#D4D4D4FF' + id: BrickTileDarkInnerSe + decals: + 61: -10,-1 + - node: + color: '#D4D4D4FF' + id: BrickTileDarkLineE + decals: + 58: -8,0 + 59: -8,1 + - node: + color: '#D4D4D4FF' + id: BrickTileDarkLineN + decals: + 60: -9,2 + - node: + color: '#D4D4D4FF' + id: BrickTileDarkLineS + decals: + 146: -9,-1 + - node: + color: '#334E6DC8' + id: BrickTileSteelCornerNe + decals: + 67: -5,19 + - node: + color: '#334E6DC8' + id: BrickTileSteelCornerNw + decals: + 66: -8,19 + - node: + color: '#334E6DC8' + id: BrickTileSteelCornerSe + decals: + 65: -5,17 + - node: + color: '#334E6DFF' + id: BrickTileSteelCornerSe + decals: + 228: -7,13 + - node: + color: '#334E6DFF' + id: BrickTileSteelCornerSw + decals: + 224: -8,13 + - node: + color: '#334E6DFF' + id: BrickTileSteelInnerNe + decals: + 225: -8,11 + - node: + color: '#A4610696' + id: BrickTileSteelInnerNe + decals: + 1: -5,-10 + - node: + color: '#334E6DFF' + id: BrickTileSteelInnerNw + decals: + 226: -6,11 + - node: + color: '#334E6DC8' + id: BrickTileSteelInnerSe + decals: + 78: -7,17 + - node: + color: '#A4610696' + id: BrickTileSteelInnerSe + decals: + 56: -5,2 + - node: + color: '#334E6DC8' + id: BrickTileSteelLineE + decals: + 68: -5,18 + 76: -7,15 + 77: -7,16 + - node: + color: '#334E6DFF' + id: BrickTileSteelLineE + decals: + 223: -7,14 + - node: + color: '#A4610696' + id: BrickTileSteelLineE + decals: + 0: -5,-1 + 32: -5,-6 + 33: -5,-5 + 34: -5,-4 + 35: -5,-3 + 36: -5,-2 + 51: -5,-7 + 52: -5,-8 + 53: -5,-9 + 54: -5,0 + 55: -5,1 + - node: + color: '#334E6DC8' + id: BrickTileSteelLineN + decals: + 69: -7,19 + 70: -6,19 + - node: + color: '#334E6DFF' + id: BrickTileSteelLineN + decals: + 227: -7,11 + - node: + color: '#334E6DC8' + id: BrickTileSteelLineS + decals: + 71: -6,17 + - node: + color: '#334E6DC8' + id: BrickTileSteelLineW + decals: + 72: -8,15 + 73: -8,16 + 74: -8,17 + 75: -8,18 + - node: + color: '#334E6DFF' + id: BrickTileSteelLineW + decals: + 222: -8,14 + - node: + color: '#A4610696' + id: BrickTileSteelLineW + decals: + 21: -3,-1 + 22: -3,0 + 23: -3,1 + 24: -3,-7 + 25: -3,-8 + 26: -3,-9 + 27: -3,-6 + 28: -3,-5 + 29: -3,-4 + 30: -3,-3 + 31: -3,-2 + - node: + color: '#EFB34196' + id: BrickTileWhiteLineN + decals: + 4: -1,6 + 5: 0,6 + 6: 1,6 + 7: 2,6 + - node: + angle: 4.71238898038469 rad + color: '#EFB34196' + id: Caution + decals: + 85: 2,0 + 86: 2,-1 + - node: + cleanable: True + color: '#D4D4D4FF' + id: DirtHeavy + decals: + 39: 0,6 + 40: 2,6 + - node: + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 44: -11,-2 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 177: -7,-2 + 178: -2,-3 + 179: 2,-4 + 180: 2,1 + 181: 1,-8 + 182: -2,-8 + 183: -7,-10 + 184: -10,-11 + 185: -7,-7 + 186: -9,-4 + 187: -8,-12 + 188: -8,-7 + 189: -5,2 + 190: -9,1 + 191: -9,-1 + 192: -6,9 + 193: -7,8 + 194: 1,10 + 195: 2,7 + 196: -7,17 + 197: -7,18 + 198: -10,14 + 199: -10,17 + 205: -8,6 + 206: 0,7 + - node: + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 49: -10,-8 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 148: -5,5 + 149: -6,6 + 200: -11,3 + 207: -7,16 + 208: 0,-1 + - node: + cleanable: True + color: '#D4D4D4FF' + id: DirtLight + decals: + 37: -7,0 + 38: -7,1 + 41: -1,6 + 42: 0,6 + - node: + color: '#FFFFFFFF' + id: DirtLight + decals: + 43: -11,-1 + 47: -9,5 + 48: -9,5 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtLight + decals: + 116: 1,9 + 117: -2,7 + 118: -3,7 + 119: -6,8 + 120: -7,9 + 121: -8,8 + 122: -7,7 + 123: -7,5 + 124: -8,4 + 125: -7,3 + 126: -5,3 + 127: -5,9 + 128: -7,10 + 129: -8,15 + 130: -10,18 + 131: -5,17 + 132: -5,14 + 133: 2,9 + 134: 2,7 + 135: -12,0 + 136: -7,-6 + 137: -8,-4 + 138: -8,-3 + 139: -10,-10 + 140: -8,-14 + 141: 1,-10 + 142: -1,-9 + 143: 2,-8 + 144: -7,-5 + 201: -11,-3 + 204: -7,6 + 209: -8,-6 + - node: + cleanable: True + angle: 4.71238898038469 rad + color: '#FFFFFFFF' + id: DirtLight + decals: + 87: -10,-8 + 88: -8,-10 + 89: -6,-14 + 90: -5,-14 + 91: -7,-9 + 92: -5,-9 + 93: -10,-4 + 94: -11,-3 + 95: -10,-3 + 96: -3,-9 + 97: -3,-8 + 98: 1,-5 + 99: 3,-5 + 100: 1,-3 + 101: 1,-2 + 102: 2,-2 + 103: -3,-4 + 104: 1,0 + 105: -1,0 + 106: -3,0 + 107: 1,2 + 108: 2,0 + 109: -5,1 + 110: -5,0 + 111: -5,-5 + 112: -5,-4 + 113: -7,0 + 114: -2,8 + - node: + color: '#FFFFFFFF' + id: DirtMedium + decals: + 45: -6,18 + 46: -4,17 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtMedium + decals: + 150: -8,-2 + 151: -1,-2 + 152: 1,-7 + 153: 2,-6 + 154: -2,-6 + 155: -1,-9 + 156: 1,-9 + 157: 2,-10 + 158: 0,-8 + 159: -7,-4 + 160: -5,-5 + 161: -5,-3 + 162: -9,-2 + 163: -10,0 + 164: -8,1 + 165: -7,4 + 166: -8,7 + 167: -6,8 + 168: -5,8 + 169: -8,17 + 170: -8,16 + 171: 1,9 + 172: -8,9 + 173: -11,-1 + 174: -10,-9 + 175: -2,-4 + 176: -2,0 + 202: -11,-3 + 203: -9,-5 + 210: 0,-5 + 211: -10,1 + - node: + angle: 1.5707963267948966 rad + color: '#EFB34196' + id: LoadingAreaGreyscale + decals: + 17: 0,-7 + 18: 0,1 + - node: + color: '#D4C8BFFF' + id: QuarterTileOverlayGreyscale270 + decals: + 220: -10,15 + 221: -10,14 + - node: + color: '#D4C8BFFF' + id: QuarterTileOverlayGreyscale90 + decals: + 218: -10,15 + 219: -10,14 + - node: + angle: 4.71238898038469 rad + color: '#EFB34196' + id: StandClearGreyscale + decals: + 79: -5,1 + 80: -5,-7 + - node: + color: '#EFB34196' + id: WarnCornerNE + decals: + 81: 1,-1 + - node: + color: '#EFB34196' + id: WarnCornerNW + decals: + 8: -2,-1 + - node: + color: '#EFB34196' + id: WarnCornerSE + decals: + 9: 1,-5 + - node: + color: '#EFB34196' + id: WarnCornerSW + decals: + 16: -2,-5 + - node: + color: '#EFB34196' + id: WarnCornerSmallGreyscaleSE + decals: + 20: 2,2 + - node: + color: '#EFB34196' + id: WarnFullGreyscale + decals: + 10: -1,-2 + 11: 0,-2 + 12: 0,-3 + 13: -1,-3 + 14: -1,-4 + 15: 0,-4 + - node: + color: '#A4610696' + id: WarnLineGreyscaleE + decals: + 217: -7,-8 + - node: + color: '#EFB34196' + id: WarnLineGreyscaleE + decals: + 19: 2,1 + 82: 2,0 + 83: 2,-1 + 84: 2,-2 + - node: + color: '#BC863FFF' + id: WarnLineGreyscaleN + decals: + 214: -9,-4 + 215: -8,-4 + 216: -7,-4 + - type: GridAtmosphere + version: 2 + data: + tiles: + -4,0: + 0: 34952 + -4,1: + 0: 8 + 1: 128 + -3,0: + 0: 65535 + -3,1: + 0: 36047 + 1: 48 + -3,3: + 0: 61160 + -3,2: + 0: 35020 + -2,0: + 0: 65535 + -2,1: + 0: 65535 + -2,2: + 0: 65535 + -2,3: + 0: 65535 + -1,0: + 0: 57343 + -1,1: + 0: 65489 + 1: 8 + -1,2: + 0: 57343 + -1,3: + 0: 30585 + -4,-1: + 0: 34952 + -3,-1: + 0: 65535 + -3,-2: + 0: 52462 + 1: 8704 + -2,-2: + 0: 65535 + -2,-1: + 0: 65535 + 0,1: + 0: 65520 + 1: 3 + 0,2: + 0: 65535 + -3,4: + 0: 61166 + -3,5: + 0: 14 + -2,4: + 0: 65535 + -2,5: + 0: 15 + -1,4: + 0: 30583 + -1,5: + 0: 7 + 0,0: + 0: 65535 + 0,3: + 0: 7 + 1: 8 + 1,0: + 0: 273 + -3,-4: + 0: 34944 + -3,-3: + 0: 61166 + -2,-4: + 0: 65520 + -2,-3: + 0: 65535 + -1,-4: + 0: 4368 + -1,-3: + 0: 65501 + -1,-2: + 0: 65535 + -1,-1: + 0: 65535 + 0,-3: + 0: 65527 + 1: 8 + 0,-2: + 0: 65535 + 0,-1: + 0: 65535 + 1,-3: + 0: 4352 + 1: 16 + 1,-1: + 0: 4368 + 1,-2: + 1: 1 + 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: GasTileOverlay + - type: RadiationGridResistance + - type: BecomesStation + id: Vagabond +- proto: AirAlarm + entities: + - uid: 568 + components: + - type: MetaData + name: Engineering Air Alarm + - type: Transform + pos: -1.5,10.5 + parent: 1 + - type: DeviceList + devices: + - 460 + - 616 + - 431 + - type: AtmosDevice + joinedGrid: 1 + - uid: 569 + components: + - type: MetaData + name: Midship Air Alarm + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,3.5 + parent: 1 + - type: DeviceList + devices: + - 619 + - 625 + - 233 + - 92 + - 600 + - 614 + - 616 + - 770 + - 610 + - 611 + - 618 + - 615 + - 771 + - 772 + - 773 + - type: AtmosDevice + joinedGrid: 1 + - uid: 570 + components: + - type: MetaData + name: Cargo Bay Air Alarm + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-1.5 + parent: 1 + - type: DeviceList + devices: + - 491 + - 492 + - 610 + - 611 + - 612 + - 613 + - type: AtmosDevice + joinedGrid: 1 + - uid: 590 + components: + - type: MetaData + name: Bridge Air Alarm + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,14.5 + parent: 1 + - type: DeviceList + devices: + - 223 + - 768 + - 767 + - 557 + - 462 + - 769 + - 463 + - 241 + - 770 + - type: AtmosDevice + joinedGrid: 1 + - uid: 775 + components: + - type: MetaData + name: Docking Access Air Alarm + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-10.5 + parent: 1 + - type: DeviceList + devices: + - 490 + - 641 + - 612 + - 613 + - 618 + - 615 + - 771 + - 772 + - 773 + - type: AtmosDevice + joinedGrid: 1 +- proto: Airlock + entities: + - uid: 606 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,3.5 + parent: 1 + - uid: 607 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-2.5 + parent: 1 + - uid: 608 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,17.5 + parent: 1 + - uid: 609 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,15.5 + parent: 1 +- proto: AirlockCaptainLocked + entities: + - uid: 604 + components: + - type: MetaData + name: airlock + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,15.5 + parent: 1 +- proto: AirlockCommandGlass + entities: + - uid: 620 + components: + - type: MetaData + name: Bridge Airlock + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,12.5 + parent: 1 +- proto: AirlockEngineering + entities: + - uid: 605 + components: + - type: MetaData + name: Engineering Airlock + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,8.5 + parent: 1 +- proto: AirlockExternalGlass + entities: + - uid: 66 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-12.5 + parent: 1 + - uid: 67 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-10.5 + parent: 1 + - uid: 70 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-9.5 + parent: 1 + - uid: 182 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-8.5 + parent: 1 + - uid: 760 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-12.5 + parent: 1 + - uid: 761 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-12.5 + parent: 1 +- proto: AirlockShuttle + entities: + - uid: 185 + components: + - type: Transform + pos: -5.5,-14.5 + parent: 1 + - uid: 186 + components: + - type: Transform + pos: -6.5,-14.5 + parent: 1 + - uid: 187 + components: + - type: Transform + pos: -7.5,-14.5 + parent: 1 + - uid: 213 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-10.5 + parent: 1 + - uid: 214 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-9.5 + parent: 1 + - uid: 487 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-8.5 + parent: 1 +- proto: APCBasic + entities: + - uid: 159 + components: + - type: MetaData + name: Bridge APC + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,16.5 + parent: 1 + - uid: 163 + components: + - type: MetaData + name: Engineering APC + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,6.5 + parent: 1 + - type: Apc + hasAccess: True + lastExternalState: Good + lastChargeState: Full + - uid: 164 + components: + - type: MetaData + name: Cargo Bay APC + - type: Transform + pos: -1.5,2.5 + parent: 1 + - uid: 361 + components: + - type: MetaData + name: Dock APC + - type: Transform + pos: -2.5,-9.5 + parent: 1 + - uid: 737 + components: + - type: MetaData + name: Midship APC + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,6.5 + parent: 1 +- proto: AtmosDeviceFanTiny + entities: + - uid: 180 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-7.5 + parent: 1 + - uid: 188 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-12.5 + parent: 1 + - uid: 189 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,1.5 + parent: 1 + - uid: 190 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,0.5 + parent: 1 + - uid: 191 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-0.5 + parent: 1 + - uid: 192 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-1.5 + parent: 1 + - uid: 752 + components: + - type: Transform + pos: -10.5,-7.5 + parent: 1 + - uid: 753 + components: + - type: Transform + pos: -10.5,-8.5 + parent: 1 + - uid: 754 + components: + - type: Transform + pos: -10.5,-9.5 + parent: 1 + - uid: 755 + components: + - type: Transform + pos: -10.5,-10.5 + parent: 1 + - uid: 756 + components: + - type: Transform + pos: -7.5,-14.5 + parent: 1 + - uid: 757 + components: + - type: Transform + pos: -6.5,-14.5 + parent: 1 + - uid: 758 + components: + - type: Transform + pos: -5.5,-14.5 + parent: 1 + - uid: 759 + components: + - type: Transform + pos: -4.5,-14.5 + parent: 1 +- proto: AtmosFixBlockerMarker + entities: + - uid: 4 + components: + - type: Transform + pos: 2.5,12.5 + parent: 1 + - uid: 13 + components: + - type: Transform + pos: 0.5,12.5 + parent: 1 + - uid: 32 + components: + - type: Transform + pos: -0.5,-11.5 + parent: 1 + - uid: 33 + components: + - type: Transform + pos: 0.5,-11.5 + parent: 1 + - uid: 36 + components: + - type: Transform + pos: -1.5,-11.5 + parent: 1 + - uid: 61 + components: + - type: Transform + pos: -12.5,5.5 + parent: 1 + - uid: 73 + components: + - type: Transform + pos: 3.5,-11.5 + parent: 1 + - uid: 80 + components: + - type: Transform + pos: -11.5,5.5 + parent: 1 + - uid: 429 + components: + - type: Transform + pos: 1.5,-11.5 + parent: 1 + - uid: 432 + components: + - type: Transform + pos: 4.5,-7.5 + parent: 1 + - uid: 447 + components: + - type: Transform + pos: -10.5,5.5 + parent: 1 + - uid: 449 + components: + - type: Transform + pos: 4.5,-10.5 + parent: 1 + - uid: 450 + components: + - type: Transform + pos: 3.5,12.5 + parent: 1 + - uid: 453 + components: + - type: Transform + pos: 3.5,3.5 + parent: 1 + - uid: 456 + components: + - type: Transform + pos: -10.5,13.5 + parent: 1 + - uid: 496 + components: + - type: Transform + pos: 2.5,-11.5 + parent: 1 + - uid: 584 + components: + - type: Transform + pos: -10.5,-4.5 + parent: 1 + - uid: 585 + components: + - type: Transform + pos: -10.5,-5.5 + parent: 1 + - uid: 704 + components: + - type: Transform + pos: 3.5,5.5 + parent: 1 + - uid: 797 + components: + - type: Transform + pos: -1.5,20.5 + parent: 1 + - uid: 798 + components: + - type: Transform + pos: -10.5,20.5 + parent: 1 + - uid: 800 + components: + - type: Transform + pos: -1.5,13.5 + parent: 1 + - uid: 803 + components: + - type: Transform + pos: 1.5,12.5 + parent: 1 + - uid: 806 + components: + - type: Transform + pos: -0.5,4.5 + parent: 1 + - uid: 807 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 + - uid: 808 + components: + - type: Transform + pos: 1.5,4.5 + parent: 1 + - uid: 809 + components: + - type: Transform + pos: -3.5,-14.5 + parent: 1 + - uid: 810 + components: + - type: Transform + pos: 4.5,2.5 + parent: 1 + - uid: 811 + components: + - type: Transform + pos: 4.5,1.5 + parent: 1 + - uid: 812 + components: + - type: Transform + pos: 4.5,0.5 + parent: 1 + - uid: 813 + components: + - type: Transform + pos: 4.5,-0.5 + parent: 1 + - uid: 814 + components: + - type: Transform + pos: 4.5,-1.5 + parent: 1 + - uid: 815 + components: + - type: Transform + pos: 4.5,-2.5 + parent: 1 + - uid: 816 + components: + - type: Transform + pos: 4.5,-8.5 + parent: 1 + - uid: 817 + components: + - type: Transform + pos: 4.5,-9.5 + parent: 1 + - uid: 824 + components: + - type: Transform + pos: -8.5,-14.5 + parent: 1 + - uid: 825 + components: + - type: Transform + pos: -10.5,-11.5 + parent: 1 + - uid: 827 + components: + - type: Transform + pos: -12.5,-3.5 + parent: 1 + - uid: 829 + components: + - type: Transform + pos: -9.5,6.5 + parent: 1 +- proto: Bed + entities: + - uid: 239 + components: + - type: Transform + pos: -11.5,3.5 + parent: 1 + - uid: 240 + components: + - type: Transform + pos: -11.5,-2.5 + parent: 1 + - uid: 242 + components: + - type: Transform + pos: -9.5,19.5 + parent: 1 + - uid: 469 + components: + - type: Transform + pos: -4.5,13.5 + parent: 1 +- proto: BedsheetBrown + entities: + - uid: 245 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-2.5 + parent: 1 +- proto: BedsheetCaptain + entities: + - uid: 597 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,13.5 + parent: 1 +- proto: BedsheetGrey + entities: + - uid: 246 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,19.5 + parent: 1 +- proto: BedsheetQM + entities: + - uid: 244 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,3.5 + parent: 1 +- proto: BenchSofaCorner + entities: + - uid: 232 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-0.5 + parent: 1 + - type: Physics + canCollide: False + bodyType: Static + - type: Fixtures + fixtures: {} +- proto: BenchSofaLeft + entities: + - uid: 225 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,1.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: BenchSofaMiddle + entities: + - uid: 227 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,0.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: BenchSofaRight + entities: + - uid: 656 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-0.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: BlastDoor + entities: + - uid: 176 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,1.5 + parent: 1 + - type: DeviceLinkSink + links: + - 266 + - uid: 177 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,0.5 + parent: 1 + - type: DeviceLinkSink + links: + - 266 + - uid: 178 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-0.5 + parent: 1 + - type: DeviceLinkSink + links: + - 266 + - uid: 179 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-1.5 + parent: 1 + - type: DeviceLinkSink + links: + - 266 + - uid: 762 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-14.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + links: + - 628 + - uid: 765 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-7.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + links: + - 628 +- proto: BoxLightMixed + entities: + - uid: 730 + components: + - type: Transform + pos: 0.40422624,6.6067433 + parent: 1 +- proto: Bucket + entities: + - uid: 706 + components: + - type: Transform + pos: -7.688952,11.425062 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 87 + components: + - type: Transform + pos: -1.5,-8.5 + parent: 1 + - uid: 106 + components: + - type: Transform + pos: -0.5,-8.5 + parent: 1 + - uid: 108 + components: + - type: Transform + pos: -0.5,-9.5 + parent: 1 + - uid: 113 + components: + - type: Transform + pos: 0.5,-9.5 + parent: 1 + - uid: 143 + components: + - type: Transform + pos: 1.5,-9.5 + parent: 1 + - uid: 161 + components: + - type: Transform + pos: 2.5,-9.5 + parent: 1 + - uid: 162 + components: + - type: Transform + pos: 2.5,-8.5 + parent: 1 + - uid: 268 + components: + - type: Transform + pos: 2.5,-7.5 + parent: 1 + - uid: 269 + components: + - type: Transform + pos: -10.5,3.5 + parent: 1 + - uid: 271 + components: + - type: Transform + pos: -9.5,3.5 + parent: 1 + - uid: 272 + components: + - type: Transform + pos: -10.5,-2.5 + parent: 1 + - uid: 275 + components: + - type: Transform + pos: -9.5,-2.5 + parent: 1 + - uid: 276 + components: + - type: Transform + pos: -8.5,-5.5 + parent: 1 + - uid: 277 + components: + - type: Transform + pos: -8.5,-4.5 + parent: 1 + - uid: 284 + components: + - type: Transform + pos: -7.5,14.5 + parent: 1 + - uid: 285 + components: + - type: Transform + pos: -7.5,15.5 + parent: 1 + - uid: 286 + components: + - type: Transform + pos: -4.5,18.5 + parent: 1 + - uid: 287 + components: + - type: Transform + pos: -5.5,18.5 + parent: 1 + - uid: 288 + components: + - type: Transform + pos: -6.5,18.5 + parent: 1 + - uid: 289 + components: + - type: Transform + pos: -7.5,18.5 + parent: 1 + - uid: 290 + components: + - type: Transform + pos: -2.5,-8.5 + parent: 1 + - uid: 293 + components: + - type: Transform + pos: -2.5,-9.5 + parent: 1 + - uid: 295 + components: + - type: Transform + pos: 2.5,9.5 + parent: 1 + - uid: 300 + components: + - type: Transform + pos: 2.5,10.5 + parent: 1 + - uid: 302 + components: + - type: Transform + pos: 1.5,10.5 + parent: 1 + - uid: 303 + components: + - type: Transform + pos: -4.5,-8.5 + parent: 1 + - uid: 304 + components: + - type: Transform + pos: -3.5,-8.5 + parent: 1 + - uid: 312 + components: + - type: Transform + pos: -7.5,16.5 + parent: 1 + - uid: 313 + components: + - type: Transform + pos: -7.5,17.5 + parent: 1 + - uid: 314 + components: + - type: Transform + pos: 2.5,8.5 + parent: 1 + - uid: 318 + components: + - type: Transform + pos: -6.5,15.5 + parent: 1 + - uid: 323 + components: + - type: Transform + pos: -4.5,15.5 + parent: 1 + - uid: 338 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 + - uid: 339 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 340 + components: + - type: Transform + pos: -1.5,0.5 + parent: 1 + - uid: 341 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 342 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 343 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 344 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - uid: 345 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 1 + - uid: 346 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 347 + components: + - type: Transform + pos: -1.5,-2.5 + parent: 1 + - uid: 348 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - uid: 349 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - uid: 350 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 1 + - uid: 351 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 + - uid: 352 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 1 + - uid: 353 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 1 + - uid: 354 + components: + - type: Transform + pos: -1.5,-5.5 + parent: 1 + - uid: 355 + components: + - type: Transform + pos: -1.5,-6.5 + parent: 1 + - uid: 356 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 1 + - uid: 357 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 1 + - uid: 362 + components: + - type: Transform + pos: -5.5,15.5 + parent: 1 + - uid: 368 + components: + - type: Transform + pos: -8.5,5.5 + parent: 1 + - uid: 369 + components: + - type: Transform + pos: -8.5,4.5 + parent: 1 + - uid: 370 + components: + - type: Transform + pos: -8.5,3.5 + parent: 1 + - uid: 371 + components: + - type: Transform + pos: -8.5,2.5 + parent: 1 + - uid: 375 + components: + - type: Transform + pos: -8.5,1.5 + parent: 1 + - uid: 376 + components: + - type: Transform + pos: -8.5,0.5 + parent: 1 + - uid: 377 + components: + - type: Transform + pos: -8.5,-0.5 + parent: 1 + - uid: 378 + components: + - type: Transform + pos: -8.5,-1.5 + parent: 1 + - uid: 382 + components: + - type: Transform + pos: -8.5,-2.5 + parent: 1 + - uid: 383 + components: + - type: Transform + pos: -8.5,-3.5 + parent: 1 + - uid: 384 + components: + - type: Transform + pos: -7.5,5.5 + parent: 1 + - uid: 385 + components: + - type: Transform + pos: -6.5,5.5 + parent: 1 + - uid: 386 + components: + - type: Transform + pos: -5.5,5.5 + parent: 1 + - uid: 387 + components: + - type: Transform + pos: -5.5,6.5 + parent: 1 + - uid: 388 + components: + - type: Transform + pos: -5.5,7.5 + parent: 1 + - uid: 389 + components: + - type: Transform + pos: -5.5,8.5 + parent: 1 + - uid: 390 + components: + - type: Transform + pos: -5.5,9.5 + parent: 1 + - uid: 391 + components: + - type: Transform + pos: -5.5,10.5 + parent: 1 + - uid: 392 + components: + - type: Transform + pos: -5.5,4.5 + parent: 1 + - uid: 393 + components: + - type: Transform + pos: -5.5,3.5 + parent: 1 + - uid: 394 + components: + - type: Transform + pos: -5.5,2.5 + parent: 1 + - uid: 395 + components: + - type: Transform + pos: -5.5,1.5 + parent: 1 + - uid: 396 + components: + - type: Transform + pos: -5.5,0.5 + parent: 1 + - uid: 397 + components: + - type: Transform + pos: -5.5,-0.5 + parent: 1 + - uid: 398 + components: + - type: Transform + pos: -5.5,-1.5 + parent: 1 + - uid: 399 + components: + - type: Transform + pos: -5.5,-2.5 + parent: 1 + - uid: 400 + components: + - type: Transform + pos: -5.5,-3.5 + parent: 1 + - uid: 401 + components: + - type: Transform + pos: -5.5,-4.5 + parent: 1 + - uid: 403 + components: + - type: Transform + pos: -5.5,-6.5 + parent: 1 + - uid: 404 + components: + - type: Transform + pos: -5.5,-7.5 + parent: 1 + - uid: 405 + components: + - type: Transform + pos: -5.5,-8.5 + parent: 1 + - uid: 406 + components: + - type: Transform + pos: -5.5,-9.5 + parent: 1 + - uid: 407 + components: + - type: Transform + pos: -5.5,-10.5 + parent: 1 + - uid: 408 + components: + - type: Transform + pos: -5.5,-11.5 + parent: 1 + - uid: 409 + components: + - type: Transform + pos: -1.5,6.5 + parent: 1 + - uid: 410 + components: + - type: Transform + pos: -1.5,7.5 + parent: 1 + - uid: 411 + components: + - type: Transform + pos: -0.5,7.5 + parent: 1 + - uid: 412 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 + - uid: 413 + components: + - type: Transform + pos: 1.5,7.5 + parent: 1 + - uid: 414 + components: + - type: Transform + pos: -1.5,8.5 + parent: 1 + - uid: 415 + components: + - type: Transform + pos: -1.5,9.5 + parent: 1 + - uid: 422 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 + - uid: 424 + components: + - type: Transform + pos: -11.5,3.5 + parent: 1 + - uid: 428 + components: + - type: Transform + pos: -8.5,16.5 + parent: 1 + - uid: 438 + components: + - type: Transform + pos: -4.5,13.5 + parent: 1 + - uid: 655 + components: + - type: Transform + pos: -8.5,6.5 + parent: 1 + - uid: 658 + components: + - type: Transform + pos: -4.5,14.5 + parent: 1 + - uid: 732 + components: + - type: Transform + pos: -6.5,-9.5 + parent: 1 + - uid: 733 + components: + - type: Transform + pos: -7.5,-9.5 + parent: 1 + - uid: 783 + components: + - type: Transform + pos: -5.5,-12.5 + parent: 1 + - uid: 784 + components: + - type: Transform + pos: -5.5,-13.5 + parent: 1 + - uid: 785 + components: + - type: Transform + pos: -6.5,-13.5 + parent: 1 + - uid: 786 + components: + - type: Transform + pos: -8.5,-9.5 + parent: 1 + - uid: 787 + components: + - type: Transform + pos: -9.5,-9.5 + parent: 1 + - uid: 788 + components: + - type: Transform + pos: -9.5,-8.5 + parent: 1 + - uid: 789 + components: + - type: Transform + pos: -9.5,-10.5 + parent: 1 +- proto: CableHV + entities: + - uid: 226 + components: + - type: Transform + pos: -0.5,10.5 + parent: 1 + - uid: 267 + components: + - type: Transform + pos: 0.5,10.5 + parent: 1 + - uid: 270 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 + - uid: 273 + components: + - type: Transform + pos: -0.5,9.5 + parent: 1 + - uid: 274 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - uid: 291 + components: + - type: Transform + pos: -0.5,7.5 + parent: 1 + - uid: 301 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 + - uid: 321 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1 + - uid: 322 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 +- proto: CableMV + entities: + - uid: 71 + components: + - type: Transform + pos: -8.5,6.5 + parent: 1 + - uid: 114 + components: + - type: Transform + pos: 1.5,7.5 + parent: 1 + - uid: 129 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 + - uid: 280 + components: + - type: Transform + pos: -5.5,-0.5 + parent: 1 + - uid: 294 + components: + - type: Transform + pos: -2.5,-9.5 + parent: 1 + - uid: 305 + components: + - type: Transform + pos: -2.5,-8.5 + parent: 1 + - uid: 306 + components: + - type: Transform + pos: -3.5,-8.5 + parent: 1 + - uid: 307 + components: + - type: Transform + pos: -4.5,-8.5 + parent: 1 + - uid: 310 + components: + - type: Transform + pos: -5.5,-8.5 + parent: 1 + - uid: 311 + components: + - type: Transform + pos: -7.5,16.5 + parent: 1 + - uid: 315 + components: + - type: Transform + pos: -6.5,14.5 + parent: 1 + - uid: 316 + components: + - type: Transform + pos: -6.5,9.5 + parent: 1 + - uid: 317 + components: + - type: Transform + pos: -6.5,10.5 + parent: 1 + - uid: 319 + components: + - type: Transform + pos: -5.5,-6.5 + parent: 1 + - uid: 320 + components: + - type: Transform + pos: -5.5,-3.5 + parent: 1 + - uid: 324 + components: + - type: Transform + pos: -3.5,8.5 + parent: 1 + - uid: 325 + components: + - type: Transform + pos: -6.5,7.5 + parent: 1 + - uid: 326 + components: + - type: Transform + pos: -1.5,0.5 + parent: 1 + - uid: 327 + components: + - type: Transform + pos: -6.5,11.5 + parent: 1 + - uid: 328 + components: + - type: Transform + pos: -6.5,12.5 + parent: 1 + - uid: 329 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 + - uid: 330 + components: + - type: Transform + pos: -6.5,5.5 + parent: 1 + - uid: 331 + components: + - type: Transform + pos: -6.5,6.5 + parent: 1 + - uid: 332 + components: + - type: Transform + pos: -5.5,8.5 + parent: 1 + - uid: 333 + components: + - type: Transform + pos: -1.5,6.5 + parent: 1 + - uid: 334 + components: + - type: Transform + pos: -1.5,8.5 + parent: 1 + - uid: 335 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 + - uid: 336 + components: + - type: Transform + pos: -5.5,-4.5 + parent: 1 + - uid: 337 + components: + - type: Transform + pos: -5.5,-1.5 + parent: 1 + - uid: 358 + components: + - type: Transform + pos: -5.5,-7.5 + parent: 1 + - uid: 359 + components: + - type: Transform + pos: -5.5,-5.5 + parent: 1 + - uid: 360 + components: + - type: Transform + pos: -5.5,-2.5 + parent: 1 + - uid: 363 + components: + - type: Transform + pos: -6.5,13.5 + parent: 1 + - uid: 364 + components: + - type: Transform + pos: -6.5,15.5 + parent: 1 + - uid: 365 + components: + - type: Transform + pos: -6.5,16.5 + parent: 1 + - uid: 366 + components: + - type: Transform + pos: 0.5,8.5 + parent: 1 + - uid: 367 + components: + - type: Transform + pos: -1.5,7.5 + parent: 1 + - uid: 372 + components: + - type: Transform + pos: -2.5,8.5 + parent: 1 + - uid: 373 + components: + - type: Transform + pos: -4.5,8.5 + parent: 1 + - uid: 374 + components: + - type: Transform + pos: -6.5,8.5 + parent: 1 + - uid: 379 + components: + - type: Transform + pos: -7.5,6.5 + parent: 1 + - uid: 380 + components: + - type: Transform + pos: -6.5,4.5 + parent: 1 + - uid: 381 + components: + - type: Transform + pos: -2.5,0.5 + parent: 1 + - uid: 402 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 416 + components: + - type: Transform + pos: -3.5,0.5 + parent: 1 + - uid: 417 + components: + - type: Transform + pos: -4.5,0.5 + parent: 1 + - uid: 418 + components: + - type: Transform + pos: -5.5,0.5 + parent: 1 + - uid: 419 + components: + - type: Transform + pos: -5.5,1.5 + parent: 1 + - uid: 420 + components: + - type: Transform + pos: -5.5,2.5 + parent: 1 + - uid: 421 + components: + - type: Transform + pos: -5.5,3.5 + parent: 1 + - uid: 423 + components: + - type: Transform + pos: -5.5,4.5 + parent: 1 + - uid: 441 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - uid: 589 + components: + - type: Transform + pos: -8.5,16.5 + parent: 1 +- proto: CableTerminal + entities: + - uid: 292 + components: + - type: Transform + pos: -0.5,7.5 + parent: 1 +- proto: CarpetBlack + entities: + - uid: 731 + components: + - type: Transform + pos: -4.5,13.5 + parent: 1 +- proto: Catwalk + entities: + - uid: 167 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,2.5 + parent: 1 + - uid: 168 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,0.5 + parent: 1 + - uid: 169 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,1.5 + parent: 1 + - uid: 170 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-0.5 + parent: 1 + - uid: 175 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-1.5 + parent: 1 + - uid: 181 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-2.5 + parent: 1 + - uid: 309 + components: + - type: Transform + pos: -1.5,8.5 + parent: 1 + - uid: 501 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-4.5 + parent: 1 + - uid: 633 + components: + - type: Transform + pos: -5.5,3.5 + parent: 1 + - uid: 634 + components: + - type: Transform + pos: -5.5,2.5 + parent: 1 + - uid: 635 + components: + - type: Transform + pos: -5.5,1.5 + parent: 1 + - uid: 636 + components: + - type: Transform + pos: -5.5,0.5 + parent: 1 + - uid: 637 + components: + - type: Transform + pos: -5.5,-0.5 + parent: 1 + - uid: 638 + components: + - type: Transform + pos: -5.5,-1.5 + parent: 1 + - uid: 639 + components: + - type: Transform + pos: -5.5,-2.5 + parent: 1 + - uid: 640 + components: + - type: Transform + pos: -5.5,-3.5 + parent: 1 + - uid: 642 + components: + - type: Transform + pos: -5.5,-5.5 + parent: 1 + - uid: 643 + components: + - type: Transform + pos: -5.5,-6.5 + parent: 1 + - uid: 644 + components: + - type: Transform + pos: -5.5,-7.5 + parent: 1 + - uid: 645 + components: + - type: Transform + pos: -5.5,-8.5 + parent: 1 + - uid: 646 + components: + - type: Transform + pos: -5.5,-9.5 + parent: 1 + - uid: 647 + components: + - type: Transform + pos: -5.5,-10.5 + parent: 1 + - uid: 648 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - uid: 649 + components: + - type: Transform + pos: 0.5,8.5 + parent: 1 + - uid: 650 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 + - uid: 652 + components: + - type: Transform + pos: -2.5,17.5 + parent: 1 + - uid: 653 + components: + - type: Transform + pos: -2.5,18.5 + parent: 1 + - uid: 654 + components: + - type: Transform + pos: -2.5,19.5 + parent: 1 + - uid: 792 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,4.5 + parent: 1 + - uid: 793 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,4.5 + parent: 1 +- proto: Chair + entities: + - uid: 82 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,15.5 + parent: 1 +- proto: ChairPilotSeat + entities: + - uid: 578 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,18.5 + parent: 1 + - uid: 579 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,18.5 + parent: 1 +- proto: CigarSpent + entities: + - uid: 308 + components: + - type: Transform + pos: -10.413393,0.7620512 + parent: 1 +- proto: ClosetWallEmergencyFilledRandom + entities: + - uid: 693 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,10.5 + parent: 1 +- proto: ClosetWallFireFilledRandom + entities: + - uid: 692 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,6.5 + parent: 1 +- proto: ComputerFrame + entities: + - uid: 576 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,18.5 + parent: 1 +- proto: ComputerRadar + entities: + - uid: 577 + components: + - type: Transform + pos: -5.5,19.5 + parent: 1 +- proto: ComputerShuttle + entities: + - uid: 574 + components: + - type: Transform + pos: -6.5,19.5 + parent: 1 +- proto: ComputerStationRecords + entities: + - uid: 575 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,18.5 + parent: 1 +- proto: ConveyorBelt + entities: + - uid: 193 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-12.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 194 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-11.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 195 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-10.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 196 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-9.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 197 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-6.5 + parent: 1 + - type: DeviceLinkSink + links: + - 595 + - uid: 198 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-6.5 + parent: 1 + - uid: 199 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-6.5 + parent: 1 + - type: DeviceLinkSink + links: + - 595 + - uid: 200 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-6.5 + parent: 1 + - type: DeviceLinkSink + links: + - 595 + - uid: 201 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,1.5 + parent: 1 + - type: DeviceLinkSink + links: + - 595 + - uid: 202 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,1.5 + parent: 1 + - type: DeviceLinkSink + links: + - 595 + - uid: 203 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,1.5 + parent: 1 + - type: DeviceLinkSink + links: + - 595 + - uid: 204 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,1.5 + parent: 1 + - type: DeviceLinkSink + links: + - 595 + - uid: 205 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-5.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 206 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-4.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 207 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-3.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 208 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-2.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 209 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-1.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 210 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-7.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 211 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-7.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 212 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-7.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 564 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-7.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 593 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-7.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 763 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-14.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 + - uid: 764 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-13.5 + parent: 1 + - type: DeviceLinkSink + links: + - 221 +- proto: DefibrillatorCabinetFilled + entities: + - uid: 546 + components: + - type: Transform + pos: -5.5,7.5 + parent: 1 +- proto: DrinkBeerBottleFull + entities: + - uid: 165 + components: + - type: Transform + parent: 258 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 238 + components: + - type: Transform + parent: 258 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 265 + components: + - type: Transform + parent: 258 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 468 + components: + - type: Transform + parent: 258 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: DrinkColaBottleFull + entities: + - uid: 85 + components: + - type: Transform + parent: 258 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 86 + components: + - type: Transform + parent: 258 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 237 + components: + - type: Transform + parent: 258 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: DrinkGlass + entities: + - uid: 261 + components: + - type: Transform + pos: -7.755818,2.6170106 + parent: 1 + - uid: 262 + components: + - type: Transform + pos: -7.425592,2.6720865 + parent: 1 + - uid: 263 + components: + - type: Transform + pos: -7.2788243,2.3967075 + parent: 1 + - uid: 264 + components: + - type: Transform + pos: -7.5723586,2.359989 + parent: 1 +- proto: DrinkMugOne + entities: + - uid: 591 + components: + - type: Transform + pos: -7.253589,19.503275 + parent: 1 +- proto: EmergencyLight + entities: + - uid: 626 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,9.5 + parent: 1 + - uid: 777 + components: + - type: Transform + pos: 0.5,10.5 + parent: 1 + - uid: 778 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - uid: 779 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-9.5 + parent: 1 + - uid: 780 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-10.5 + parent: 1 + - uid: 781 + components: + - type: Transform + pos: -9.5,1.5 + parent: 1 + - uid: 782 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,16.5 + parent: 1 +- proto: ExtinguisherCabinetFilled + entities: + - uid: 743 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-5.5 + parent: 1 +- proto: FaxMachineShip + entities: + - uid: 582 + components: + - type: Transform + pos: -4.5,19.5 + parent: 1 +- proto: filingCabinetRandom + entities: + - uid: 705 + components: + - type: Transform + pos: -7.5,13.5 + parent: 1 +- proto: Firelock + entities: + - uid: 610 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,0.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + - uid: 611 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-0.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + - uid: 612 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-7.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + - uid: 613 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-8.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + - uid: 616 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,8.5 + parent: 1 +- proto: FirelockEdge + entities: + - uid: 615 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-3.5 + parent: 1 + - uid: 618 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-3.5 + parent: 1 + - uid: 771 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-3.5 + parent: 1 + - uid: 772 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-3.5 + parent: 1 + - uid: 773 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-3.5 + parent: 1 +- proto: FirelockGlass + entities: + - uid: 600 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-2.5 + parent: 1 + - uid: 614 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,3.5 + parent: 1 + - uid: 767 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,15.5 + parent: 1 + - uid: 768 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,17.5 + parent: 1 + - uid: 769 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,15.5 + parent: 1 + - uid: 770 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,12.5 + parent: 1 +- proto: FloorDrain + entities: + - uid: 160 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,14.5 + parent: 1 + - type: Fixtures + fixtures: {} +- proto: FoodBoxDonkpocket + entities: + - uid: 596 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,0.5 + parent: 1 +- proto: FoodPlateSmall + entities: + - uid: 252 + components: + - type: Transform + pos: -10.5,1.5 + parent: 1 +- proto: GasMixerFlipped + entities: + - uid: 478 + components: + - type: MetaData + name: Distro Mixer + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,11.5 + parent: 1 + - type: GasMixer + inletTwoConcentration: 0.22000003 + inletOneConcentration: 0.78 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeBend + entities: + - uid: 464 + components: + - type: Transform + pos: -6.5,17.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 482 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeStraight + entities: + - uid: 243 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,15.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 248 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,14.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 430 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 433 + components: + - type: Transform + pos: 1.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 465 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,17.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 466 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,17.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 467 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,14.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 470 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,16.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 472 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,14.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 473 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,13.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 474 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,12.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 479 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 480 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 481 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 483 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 484 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 486 + components: + - type: Transform + pos: -6.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 488 + components: + - type: Transform + pos: -6.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 489 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 503 + components: + - type: Transform + pos: -6.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 504 + components: + - type: Transform + pos: -6.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 505 + components: + - type: Transform + pos: -6.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 509 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 510 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 511 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 512 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 513 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 514 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 515 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 516 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 517 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 518 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 519 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 520 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 521 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 522 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 523 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 524 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 525 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 526 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 528 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 529 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 530 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 531 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 532 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 533 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 534 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 535 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 536 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 537 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 538 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 539 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 540 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 541 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 542 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 543 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 544 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 545 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 548 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 549 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 550 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 551 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 552 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 553 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 554 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 558 + components: + - type: Transform + pos: -7.5,15.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 560 + components: + - type: Transform + pos: -7.5,13.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 561 + components: + - type: Transform + pos: -7.5,12.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 562 + components: + - type: Transform + pos: -7.5,11.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 563 + components: + - type: Transform + pos: -7.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 565 + components: + - type: Transform + pos: -7.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 566 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 599 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 722 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeTJunction + entities: + - uid: 427 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 471 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,15.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 477 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,11.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 485 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 506 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 507 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 508 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 527 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 555 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 559 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,14.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPort + entities: + - uid: 475 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,11.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 476 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,10.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentPump + entities: + - uid: 92 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-2.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 223 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,17.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 233 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,3.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 442 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,4.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 460 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,7.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 462 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,16.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 463 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,15.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 490 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-5.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 491 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-0.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 619 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,6.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentScrubber + entities: + - uid: 241 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,14.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 431 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,8.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 568 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 492 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-4.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 557 + components: + - type: Transform + pos: -7.5,16.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 625 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,6.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 641 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-5.5 + parent: 1 + - type: DeviceNetwork + configurators: + - invalid + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasVolumePump + entities: + - uid: 434 + components: + - type: Transform + pos: 1.5,7.5 + parent: 1 + - type: AtmosDevice + joinedGrid: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GravityGeneratorMini + entities: + - uid: 448 + components: + - type: Transform + pos: 1.5,10.5 + parent: 1 +- proto: Grille + entities: + - uid: 16 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,7.5 + parent: 1 + - uid: 17 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,8.5 + parent: 1 + - uid: 18 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,9.5 + parent: 1 + - uid: 39 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-4.5 + parent: 1 + - uid: 40 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-5.5 + parent: 1 + - uid: 41 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-6.5 + parent: 1 + - uid: 89 + components: + - type: Transform + pos: -12.5,1.5 + parent: 1 + - uid: 90 + components: + - type: Transform + pos: -12.5,0.5 + parent: 1 + - uid: 91 + components: + - type: Transform + pos: -12.5,-0.5 + parent: 1 + - uid: 110 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,15.5 + parent: 1 + - uid: 122 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,18.5 + parent: 1 + - uid: 125 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,20.5 + parent: 1 + - uid: 126 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,20.5 + parent: 1 + - uid: 127 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,20.5 + parent: 1 + - uid: 128 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,20.5 + parent: 1 + - uid: 136 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,18.5 + parent: 1 + - uid: 138 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,15.5 + parent: 1 + - uid: 155 + components: + - type: Transform + pos: -3.5,4.5 + parent: 1 + - uid: 451 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,3.5 + parent: 1 + - uid: 735 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,-3.5 + parent: 1 +- proto: Gyroscope + entities: + - uid: 583 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 +- proto: HospitalCurtainsOpen + entities: + - uid: 247 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,19.5 + parent: 1 + - uid: 249 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,3.5 + parent: 1 + - uid: 250 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-2.5 + parent: 1 + - uid: 651 + components: + - type: Transform + pos: -4.5,13.5 + parent: 1 +- proto: KitchenMicrowave + entities: + - uid: 259 + components: + - type: Transform + pos: -8.5,2.5 + parent: 1 +- proto: LockerCaptainFilled + entities: + - uid: 72 + components: + - type: Transform + pos: -2.5,14.5 + parent: 1 +- proto: LockerElectricalSuppliesFilled + entities: + - uid: 723 + components: + - type: Transform + pos: -2.5,9.5 + parent: 1 +- proto: LockerEngineerFilled + entities: + - uid: 766 + components: + - type: Transform + pos: -8.5,-4.5 + parent: 1 +- proto: LockerFreezerBase + entities: + - uid: 258 + components: + - type: Transform + pos: -9.5,1.5 + parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.1496 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 85 + - 86 + - 165 + - 237 + - 238 + - 265 + - 468 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null +- proto: LockerQuarterMasterFilled + entities: + - uid: 83 + components: + - type: Transform + pos: -8.5,4.5 + parent: 1 +- proto: LockerSalvageSpecialistFilled + entities: + - uid: 602 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 681 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 +- proto: LockerWallMedicalFilled + entities: + - uid: 682 + components: + - type: Transform + pos: -4.5,7.5 + parent: 1 +- proto: Mirror + entities: + - uid: 657 + components: + - type: Transform + pos: -9.5,16.5 + parent: 1 +- proto: MopItem + entities: + - uid: 707 + components: + - type: Transform + pos: -7.591108,11.425062 + parent: 1 +- proto: NFAshtray + entities: + - uid: 629 + components: + - type: Transform + pos: -10.5,0.5 + parent: 1 +- proto: NitrogenCanister + entities: + - uid: 795 + components: + - type: Transform + anchored: True + pos: -4.5,11.5 + parent: 1 + - type: Physics + bodyType: Static + - type: AtmosDevice + joinedGrid: 1 +- proto: OreProcessor + entities: + - uid: 624 + components: + - type: Transform + pos: -2.5,-1.5 + parent: 1 +- proto: OxygenCanister + entities: + - uid: 794 + components: + - type: Transform + anchored: True + pos: -4.5,10.5 + parent: 1 + - type: Physics + bodyType: Static + - type: AtmosDevice + joinedGrid: 1 +- proto: PaintingNightHawks + entities: + - uid: 696 + components: + - type: Transform + pos: -10.5,2.5 + parent: 1 +- proto: PaintingSaturn + entities: + - uid: 698 + components: + - type: MetaData + desc: This painting depicts giant devouring the corpse of a corgi. He has a frightening look in his eyes. + name: Head of Personnel Devouring His Son + - type: Transform + pos: -2.5,16.5 + parent: 1 +- proto: Paper + entities: + - uid: 745 + components: + - type: Transform + pos: -7.6545224,19.56597 + parent: 1 + - type: Paper + stampState: paper_stamp-ok + stampedBy: + - stampedBorderless: False + stampedColor: '#00BE00FF' + stampedName: stamp-component-stamped-name-approved + content: >- + [color=#cb0000]  ▐║   ║ + +   ▐╠══╣ + +   ▐║   ║[head=2]EPHÆSTUS SHIPYARDS[/head] [/color] + +   ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿ ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿ ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  Welcome captain, to your very own Vagabond-Class long-distance freighter. We here at Hephaestus are proud to offer this line of vessels to enterprising private captains through our Ship Refurbishment Program. Combining a complete refressh of electronics, propulsion, and other technical systems with the reliable frame and architecture that our company is renowned for, you have at your fingertips one of the finest vessels money can buy. + + + [bold]Pre-Flight[/bold] + + To help facilitate ease of transition into your new vessel, we recommend completing this pre-flight checklist to ensure smooth operation for many years to come: + +   • Ensure proper distribution gasses have been installed and engaged. + +   • Turn on the waste-line gas output to ensure crew safety. + +   • Complimentary fuel has been provided. However, for longer journeys, additional fuel or power sources may be required. + + + The Vagabond is well-beloved by pilots for its flowing floorplan, generous capacity, and adaptability to many industrial and scientific use cases. We look forward to the creativity and entrepreneurial spirit you will bring to your new home amongst the stars. +- proto: PaperBin10 + entities: + - uid: 603 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,15.5 + parent: 1 +- proto: PlasticFlapsAirtightClear + entities: + - uid: 183 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-7.5 + parent: 1 + - uid: 184 + components: + - type: Transform + pos: -4.5,-12.5 + parent: 1 + - uid: 215 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-6.5 + parent: 1 + - uid: 216 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,1.5 + parent: 1 + - uid: 714 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-7.5 + parent: 1 + - uid: 790 + components: + - type: Transform + pos: -4.5,-14.5 + parent: 1 +- proto: Plunger + entities: + - uid: 659 + components: + - type: Transform + pos: -9.13515,14.548155 + parent: 1 +- proto: PlushieAtmosian + entities: + - uid: 791 + components: + - type: Transform + pos: -0.5,4.5 + parent: 1 +- proto: PortableGeneratorPacmanShuttle + entities: + - uid: 30 + components: + - type: Transform + pos: 0.5,10.5 + parent: 1 + - type: FuelGenerator + on: False + - type: Physics + bodyType: Static + - uid: 157 + components: + - type: Transform + pos: -0.5,10.5 + parent: 1 + - type: FuelGenerator + on: False + - type: Physics + bodyType: Static +- proto: PosterContrabandHighEffectEngineering + entities: + - uid: 695 + components: + - type: Transform + pos: -2.5,10.5 + parent: 1 +- proto: PosterContrabandPunchShit + entities: + - uid: 711 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-3.5 + parent: 1 +- proto: PosterLegitBarDrinks + entities: + - uid: 740 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,19.5 + parent: 1 +- proto: PosterLegitCleanliness + entities: + - uid: 694 + components: + - type: Transform + pos: -3.5,5.5 + parent: 1 +- proto: PosterLegitSMHardhats + entities: + - uid: 697 + components: + - type: Transform + pos: -3.5,-2.5 + parent: 1 +- proto: PowerCellRecharger + entities: + - uid: 708 + components: + - type: Transform + pos: -4.5,5.5 + parent: 1 +- proto: Poweredlight + entities: + - uid: 686 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-0.5 + parent: 1 +- proto: PoweredlightColoredFrostyBlue + entities: + - uid: 678 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,17.5 + parent: 1 +- proto: PoweredlightColoredRed + entities: + - uid: 680 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-9.5 + parent: 1 + - uid: 687 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,6.5 + parent: 1 + - uid: 688 + components: + - type: Transform + pos: 1.5,10.5 + parent: 1 + - uid: 725 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-1.5 + parent: 1 + - uid: 726 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-2.5 + parent: 1 + - uid: 727 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-9.5 + parent: 1 +- proto: PoweredlightLED + entities: + - uid: 677 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,18.5 + parent: 1 + - uid: 684 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,6.5 + parent: 1 +- proto: PoweredlightSodium + entities: + - uid: 676 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-2.5 + parent: 1 + - uid: 724 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,2.5 + parent: 1 +- proto: PoweredSmallLight + entities: + - uid: 627 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-4.5 + parent: 1 + - uid: 671 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,18.5 + parent: 1 + - uid: 672 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,3.5 + parent: 1 + - uid: 673 + components: + - type: Transform + pos: -10.5,-2.5 + parent: 1 + - uid: 674 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,14.5 + parent: 1 + - uid: 675 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,14.5 + parent: 1 + - uid: 679 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,14.5 + parent: 1 + - uid: 683 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,2.5 + parent: 1 + - uid: 685 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,9.5 + parent: 1 +- proto: Rack + entities: + - uid: 571 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,10.5 + parent: 1 + - uid: 601 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,19.5 + parent: 1 + - uid: 691 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,6.5 + parent: 1 + - uid: 744 + components: + - type: Transform + pos: -7.5,11.5 + parent: 1 +- proto: RailingCorner + entities: + - uid: 173 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,2.5 + parent: 1 + - uid: 174 + components: + - type: Transform + pos: 4.5,-2.5 + parent: 1 +- proto: RailingCornerSmall + entities: + - uid: 171 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-1.5 + parent: 1 + - uid: 172 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,1.5 + parent: 1 +- proto: RandomSpawner100 + entities: + - uid: 260 + components: + - type: Transform + pos: -7.5,1.5 + parent: 1 +- proto: ReinforcedWindow + entities: + - uid: 21 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,7.5 + parent: 1 + - uid: 22 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,8.5 + parent: 1 + - uid: 23 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,9.5 + parent: 1 + - uid: 62 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-4.5 + parent: 1 + - uid: 63 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-5.5 + parent: 1 + - uid: 64 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-6.5 + parent: 1 + - uid: 77 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,-3.5 + parent: 1 + - uid: 94 + components: + - type: Transform + pos: -12.5,1.5 + parent: 1 + - uid: 95 + components: + - type: Transform + pos: -12.5,0.5 + parent: 1 + - uid: 96 + components: + - type: Transform + pos: -12.5,-0.5 + parent: 1 + - uid: 118 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,15.5 + parent: 1 + - uid: 131 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,20.5 + parent: 1 + - uid: 132 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,20.5 + parent: 1 + - uid: 133 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,20.5 + parent: 1 + - uid: 134 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,20.5 + parent: 1 + - uid: 135 + components: + - type: Transform + pos: -1.5,15.5 + parent: 1 + - uid: 139 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,18.5 + parent: 1 + - uid: 296 + components: + - type: Transform + pos: -3.5,4.5 + parent: 1 +- proto: SheetPlasma + entities: + - uid: 19 + components: + - type: Transform + pos: 2.4900203,10.542679 + parent: 1 +- proto: ShuttersWindow + entities: + - uid: 217 + components: + - type: Transform + pos: -3.5,-7.5 + parent: 1 + - type: DeviceLinkSink + links: + - 712 + - uid: 218 + components: + - type: Transform + pos: -3.5,-8.5 + parent: 1 + - type: DeviceLinkSink + links: + - 712 + - uid: 219 + components: + - type: Transform + pos: -3.5,0.5 + parent: 1 + - type: DeviceLinkSink + links: + - 712 + - uid: 220 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 1 + - type: DeviceLinkSink + links: + - 712 +- proto: SignalButton + entities: + - uid: 266 + components: + - type: MetaData + desc: Opens and closes the salvage bay blast doors. + name: Bay Door Control + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-2.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 179: + - Pressed: Toggle + 178: + - Pressed: Toggle + 177: + - Pressed: Toggle + 176: + - Pressed: Toggle + - uid: 628 + components: + - type: MetaData + desc: Opens and closes the blast doors attached at each docking port. + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-6.5 + parent: 1 + - type: SignalSwitch + state: True + - type: DeviceLinkSource + linkedPorts: + 765: + - Pressed: Toggle + 762: + - Pressed: Toggle + - uid: 712 + components: + - type: MetaData + desc: Opens and closes the cargo shutters. + name: Shutter Control + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-3.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 220: + - Pressed: Toggle + 219: + - Pressed: Toggle + 217: + - Pressed: Toggle + 218: + - Pressed: Toggle +- proto: SignAtmos + entities: + - uid: 700 + components: + - type: Transform + pos: -3.5,11.5 + parent: 1 +- proto: SinkStemlessWater + entities: + - uid: 229 + components: + - type: Transform + pos: -9.5,15.5 + parent: 1 +- proto: SMESBasic + entities: + - uid: 158 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 +- proto: SolidSecretDoor + entities: + - uid: 588 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,17.5 + parent: 1 +- proto: SpawnPointCargoTechnician + entities: + - uid: 717 + components: + - type: Transform + pos: -8.5,-2.5 + parent: 1 +- proto: SpawnPointLatejoin + entities: + - uid: 719 + components: + - type: Transform + pos: -9.5,0.5 + parent: 1 +- proto: SpawnPointQuartermaster + entities: + - uid: 716 + components: + - type: Transform + pos: -8.5,3.5 + parent: 1 +- proto: SpawnPointSalvageSpecialist + entities: + - uid: 715 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 +- proto: SpawnPointStationEngineer + entities: + - uid: 718 + components: + - type: Transform + pos: -1.5,9.5 + parent: 1 +- proto: SubstationBasic + entities: + - uid: 435 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 +- proto: SuitStorageCaptain + entities: + - uid: 721 + components: + - type: Transform + pos: -3.5,14.5 + parent: 1 +- proto: SuitStorageEngi + entities: + - uid: 617 + components: + - type: Transform + pos: -8.5,-5.5 + parent: 1 +- proto: SuitStorageQuartermaster + entities: + - uid: 741 + components: + - type: Transform + pos: -8.5,5.5 + parent: 1 +- proto: SuitStorageSalv + entities: + - uid: 222 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 592 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 +- proto: TableCounterMetal + entities: + - uid: 254 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,2.5 + parent: 1 + - uid: 255 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,2.5 + parent: 1 + - uid: 256 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,1.5 + parent: 1 + - uid: 257 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,0.5 + parent: 1 + - uid: 502 + components: + - type: Transform + pos: -4.5,6.5 + parent: 1 + - uid: 623 + components: + - type: Transform + pos: -4.5,5.5 + parent: 1 +- proto: TableReinforced + entities: + - uid: 224 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,15.5 + parent: 1 + - uid: 572 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,19.5 + parent: 1 + - uid: 573 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,19.5 + parent: 1 +- proto: TableReinforcedGlass + entities: + - uid: 228 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,1.5 + parent: 1 + - uid: 253 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,0.5 + parent: 1 +- proto: Thruster + entities: + - uid: 35 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-11.5 + parent: 1 + - uid: 425 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-11.5 + parent: 1 + - uid: 440 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-11.5 + parent: 1 + - uid: 445 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-11.5 + parent: 1 + - uid: 455 + components: + - type: Transform + pos: 2.5,12.5 + parent: 1 + - uid: 547 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-5.5 + parent: 1 + - uid: 567 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-4.5 + parent: 1 + - uid: 586 + components: + - type: Transform + pos: -11.5,5.5 + parent: 1 + - uid: 587 + components: + - type: Transform + pos: -10.5,5.5 + parent: 1 + - uid: 663 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-8.5 + parent: 1 + - uid: 664 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-9.5 + parent: 1 + - uid: 669 + components: + - type: Transform + pos: 1.5,12.5 + parent: 1 +- proto: TintedWindow + entities: + - uid: 140 + components: + - type: MetaData + name: reinforced window + - type: Transform + pos: -1.5,18.5 + parent: 1 +- proto: ToiletEmpty + entities: + - uid: 230 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,14.5 + parent: 1 +- proto: TwoWayLever + entities: + - uid: 221 + components: + - type: Transform + pos: -6.5,-8.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 210: + - Left: Reverse + - Right: Forward + - Middle: Off + 211: + - Left: Reverse + - Right: Forward + - Middle: Off + 212: + - Left: Reverse + - Middle: Off + - Right: Forward + 196: + - Left: Reverse + - Right: Forward + - Middle: Off + 195: + - Left: Reverse + - Right: Forward + - Middle: Off + 194: + - Left: Reverse + - Right: Forward + - Middle: Off + 193: + - Left: Reverse + - Right: Forward + - Middle: Off + 205: + - Left: Reverse + - Right: Forward + - Middle: Off + 206: + - Left: Reverse + - Right: Forward + - Middle: Off + 207: + - Left: Reverse + - Right: Forward + - Middle: Off + 208: + - Left: Reverse + - Right: Forward + - Middle: Off + 209: + - Left: Reverse + - Right: Forward + - Middle: Off + 564: + - Left: Reverse + - Right: Forward + - Middle: Off + 593: + - Left: Reverse + - Right: Forward + - Middle: Off + 764: + - Left: Reverse + - Right: Forward + - Middle: Off + 763: + - Left: Reverse + - Right: Forward + - Middle: Off + - uid: 595 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 204: + - Left: Reverse + - Right: Forward + - Middle: Off + 203: + - Left: Reverse + - Right: Forward + - Middle: Off + 202: + - Left: Reverse + - Right: Forward + - Middle: Off + 201: + - Left: Reverse + - Right: Forward + - Middle: Off + 200: + - Left: Reverse + - Right: Forward + - Middle: Off + 199: + - Right: Forward + - Left: Reverse + - Middle: Off + 197: + - Left: Reverse + - Right: Forward + - Middle: Off +- proto: VendingMachineCargoDrobe + entities: + - uid: 689 + components: + - type: Transform + pos: -0.5,-9.5 + parent: 1 +- proto: VendingMachineSalvage + entities: + - uid: 796 + components: + - type: Transform + pos: 2.5,-9.5 + parent: 1 +- proto: WallReinforced + entities: + - uid: 3 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-2.5 + parent: 1 + - uid: 5 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,6.5 + parent: 1 + - uid: 6 + components: + - type: Transform + pos: 3.5,11.5 + parent: 1 + - uid: 7 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,6.5 + parent: 1 + - uid: 8 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,5.5 + parent: 1 + - uid: 9 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,5.5 + parent: 1 + - uid: 10 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,5.5 + parent: 1 + - uid: 11 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,5.5 + parent: 1 + - uid: 12 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,5.5 + parent: 1 + - uid: 15 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,10.5 + parent: 1 + - uid: 20 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,6.5 + parent: 1 + - uid: 24 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,11.5 + parent: 1 + - uid: 25 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,11.5 + parent: 1 + - uid: 26 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,11.5 + parent: 1 + - uid: 27 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,11.5 + parent: 1 + - uid: 28 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,11.5 + parent: 1 + - uid: 29 + components: + - type: Transform + pos: -3.5,10.5 + parent: 1 + - uid: 31 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,10.5 + parent: 1 + - uid: 34 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,10.5 + parent: 1 + - uid: 37 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-9.5 + parent: 1 + - uid: 38 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-8.5 + parent: 1 + - uid: 42 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,4.5 + parent: 1 + - uid: 43 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-3.5 + parent: 1 + - uid: 44 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-10.5 + parent: 1 + - uid: 45 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-10.5 + parent: 1 + - uid: 46 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-10.5 + parent: 1 + - uid: 47 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-10.5 + parent: 1 + - uid: 48 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-10.5 + parent: 1 + - uid: 49 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-9.5 + parent: 1 + - uid: 50 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-9.5 + parent: 1 + - uid: 51 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-9.5 + parent: 1 + - uid: 52 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-10.5 + parent: 1 + - uid: 53 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-11.5 + parent: 1 + - uid: 54 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,2.5 + parent: 1 + - uid: 55 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,2.5 + parent: 1 + - uid: 56 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,3.5 + parent: 1 + - uid: 57 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,3.5 + parent: 1 + - uid: 58 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,3.5 + parent: 1 + - uid: 59 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,3.5 + parent: 1 + - uid: 60 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,3.5 + parent: 1 + - uid: 65 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-10.5 + parent: 1 + - uid: 68 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-11.5 + parent: 1 + - uid: 69 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-6.5 + parent: 1 + - uid: 74 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,13.5 + parent: 1 + - uid: 75 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,16.5 + parent: 1 + - uid: 76 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-3.5 + parent: 1 + - uid: 78 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,4.5 + parent: 1 + - uid: 79 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-2.5 + parent: 1 + - uid: 81 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,4.5 + parent: 1 + - uid: 84 + components: + - type: Transform + pos: -9.5,4.5 + parent: 1 + - uid: 88 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,2.5 + parent: 1 + - uid: 93 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-1.5 + parent: 1 + - uid: 98 + components: + - type: Transform + pos: -8.5,6.5 + parent: 1 + - uid: 99 + components: + - type: Transform + pos: -8.5,7.5 + parent: 1 + - uid: 100 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,8.5 + parent: 1 + - uid: 101 + components: + - type: Transform + pos: -8.5,9.5 + parent: 1 + - uid: 102 + components: + - type: Transform + pos: -8.5,10.5 + parent: 1 + - uid: 103 + components: + - type: Transform + pos: -8.5,11.5 + parent: 1 + - uid: 104 + components: + - type: Transform + pos: -8.5,12.5 + parent: 1 + - uid: 105 + components: + - type: Transform + pos: -8.5,13.5 + parent: 1 + - uid: 107 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,13.5 + parent: 1 + - uid: 109 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,13.5 + parent: 1 + - uid: 111 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,20.5 + parent: 1 + - uid: 112 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,20.5 + parent: 1 + - uid: 115 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,20.5 + parent: 1 + - uid: 116 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,20.5 + parent: 1 + - uid: 119 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,17.5 + parent: 1 + - uid: 121 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,14.5 + parent: 1 + - uid: 123 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,17.5 + parent: 1 + - uid: 124 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,14.5 + parent: 1 + - uid: 130 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,19.5 + parent: 1 + - uid: 137 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,16.5 + parent: 1 + - uid: 166 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,2.5 + parent: 1 + - uid: 278 + components: + - type: Transform + pos: -3.5,11.5 + parent: 1 + - uid: 279 + components: + - type: Transform + pos: -3.5,12.5 + parent: 1 + - uid: 281 + components: + - type: Transform + pos: -3.5,6.5 + parent: 1 + - uid: 282 + components: + - type: Transform + pos: -3.5,2.5 + parent: 1 + - uid: 283 + components: + - type: Transform + pos: -3.5,5.5 + parent: 1 + - uid: 297 + components: + - type: Transform + pos: -3.5,3.5 + parent: 1 + - uid: 436 + components: + - type: Transform + pos: 3.5,-7.5 + parent: 1 + - uid: 452 + components: + - type: Transform + pos: -10.5,19.5 + parent: 1 + - uid: 500 + components: + - type: Transform + pos: -10.5,-6.5 + parent: 1 + - uid: 594 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-3.5 + parent: 1 + - uid: 630 + components: + - type: Transform + pos: -9.5,-5.5 + parent: 1 + - uid: 631 + components: + - type: Transform + pos: -3.5,-12.5 + parent: 1 + - uid: 690 + components: + - type: Transform + pos: -9.5,-6.5 + parent: 1 + - uid: 734 + components: + - type: Transform + pos: -9.5,-4.5 + parent: 1 + - uid: 739 + components: + - type: Transform + pos: -9.5,5.5 + parent: 1 + - uid: 742 + components: + - type: Transform + pos: -9.5,-11.5 + parent: 1 + - uid: 746 + components: + - type: Transform + pos: -8.5,-12.5 + parent: 1 + - uid: 747 + components: + - type: Transform + pos: -8.5,-13.5 + parent: 1 + - uid: 748 + components: + - type: Transform + pos: -3.5,-13.5 + parent: 1 +- proto: WallReinforcedDiagonal + entities: + - uid: 2 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-11.5 + parent: 1 + - uid: 14 + components: + - type: Transform + pos: 0.5,12.5 + parent: 1 + - uid: 426 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-7.5 + parent: 1 + - uid: 439 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-10.5 + parent: 1 + - uid: 443 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,12.5 + parent: 1 + - uid: 444 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-11.5 + parent: 1 + - uid: 446 + components: + - type: Transform + pos: -12.5,5.5 + parent: 1 + - uid: 454 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-11.5 + parent: 1 + - uid: 457 + components: + - type: Transform + pos: -9.5,6.5 + parent: 1 + - uid: 458 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,13.5 + parent: 1 + - uid: 459 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-3.5 + parent: 1 + - uid: 461 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-14.5 + parent: 1 + - uid: 493 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-14.5 + parent: 1 + - uid: 494 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,13.5 + parent: 1 + - uid: 495 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,3.5 + parent: 1 + - uid: 497 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,5.5 + parent: 1 + - uid: 498 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,20.5 + parent: 1 + - uid: 499 + components: + - type: Transform + pos: -10.5,20.5 + parent: 1 +- proto: WallSolid + entities: + - uid: 97 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-1.5 + parent: 1 + - uid: 117 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,16.5 + parent: 1 + - uid: 120 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,16.5 + parent: 1 + - uid: 141 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,12.5 + parent: 1 + - uid: 142 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,12.5 + parent: 1 + - uid: 144 + components: + - type: Transform + pos: -5.5,16.5 + parent: 1 + - uid: 145 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-5.5 + parent: 1 + - uid: 146 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,14.5 + parent: 1 + - uid: 147 + components: + - type: Transform + pos: -4.5,16.5 + parent: 1 + - uid: 148 + components: + - type: Transform + pos: -3.5,16.5 + parent: 1 + - uid: 149 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,18.5 + parent: 1 + - uid: 150 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,19.5 + parent: 1 + - uid: 151 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,18.5 + parent: 1 + - uid: 152 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,19.5 + parent: 1 + - uid: 153 + components: + - type: Transform + pos: -3.5,-3.5 + parent: 1 + - uid: 154 + components: + - type: Transform + pos: -3.5,-1.5 + parent: 1 + - uid: 156 + components: + - type: Transform + pos: -4.5,12.5 + parent: 1 + - uid: 231 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-1.5 + parent: 1 + - uid: 234 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,2.5 + parent: 1 + - uid: 235 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,2.5 + parent: 1 + - uid: 236 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,2.5 + parent: 1 + - uid: 298 + components: + - type: Transform + pos: -3.5,-2.5 + parent: 1 + - uid: 299 + components: + - type: Transform + pos: -3.5,-4.5 + parent: 1 + - uid: 556 + components: + - type: Transform + pos: -5.5,14.5 + parent: 1 + - uid: 580 + components: + - type: Transform + pos: -5.5,13.5 + parent: 1 + - uid: 581 + components: + - type: Transform + pos: -2.5,16.5 + parent: 1 + - uid: 598 + components: + - type: Transform + pos: -3.5,9.5 + parent: 1 + - uid: 621 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,7.5 + parent: 1 + - uid: 622 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,7.5 + parent: 1 + - uid: 632 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,-1.5 + parent: 1 + - uid: 720 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,7.5 + parent: 1 +- proto: WallWeaponCapacitorRecharger + entities: + - uid: 703 + components: + - type: Transform + pos: -4.5,16.5 + parent: 1 +- proto: WarpPointShip + entities: + - uid: 713 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-0.5 + parent: 1 +- proto: WaterCooler + entities: + - uid: 251 + components: + - type: Transform + pos: -7.5,-0.5 + parent: 1 +- proto: Window + entities: + - uid: 437 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,3.5 + parent: 1 +- proto: WindowFrostedDirectional + entities: + - uid: 709 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,4.5 + parent: 1 + - uid: 710 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,4.5 + parent: 1 +... diff --git a/Resources/Maps/_NF/Shuttles/wasp.yml b/Resources/Maps/_NF/Shuttles/wasp.yml index 25b30465854..399a483f9c0 100644 --- a/Resources/Maps/_NF/Shuttles/wasp.yml +++ b/Resources/Maps/_NF/Shuttles/wasp.yml @@ -4116,7 +4116,7 @@ entities: - type: Transform pos: -4.5055804,-4.226667 parent: 1 -- proto: ClothingOuterHardsuitSecuritypatrol +- proto: ClothingOuterHardsuitNfsdBronze entities: - uid: 559 components: diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index a876388a6bd..429f4c20250 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -28,19 +28,18 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: FrontierUplinkCoin5 - type: entity noSpawn: true - parent: ClothingBackpack - id: ClothingBackpackFilledDetective + parent: ClothingBackpackSecurity + id: ClothingBackpackSecurityFilledDetective components: - type: StorageFill contents: - - id: BoxSurvival + - id: BoxSurvivalSecurity + - id: Flash - id: ForensicPad - id: ForensicScanner - - id: FrontierUplinkCoin5 - type: entity noSpawn: true @@ -134,14 +133,9 @@ components: - type: StorageFill contents: - - id: BoxSurvivalNFSD + - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: RubberStampSheriff # Frontier - - id: DoorRemoteNfsd # Frontier - - id: NFSDTechFabCircuitboard # Frontier - - id: BaseSecurityUplinkRadioSheriff # Frontier - - id: ClothingNeckNfsdBadgeHoS # Frontier - type: entity noSpawn: true @@ -384,15 +378,3 @@ - id: Cutlass - id: WeaponRevolverPirate - id: ClothingEyesEyepatch - -- type: entity - noSpawn: true - parent: ClothingBackpackBrigmedic - id: ClothingBackpackBrigmedicFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalBrigmedic - - id: Flash - - id: FrontierUplinkCoin5 - - id: EncryptionKeyMedical \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index e741f22f666..a0e44295746 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -27,30 +27,18 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: FrontierUplinkCoin5 - type: entity noSpawn: true - parent: ClothingBackpackDuffel - id: ClothingBackpackDuffelFilledDetective + parent: ClothingBackpackDuffelSecurity + id: ClothingBackpackDuffelSecurityFilledDetective components: - type: StorageFill contents: - - id: BoxSurvival + - id: BoxSurvivalSecurity + - id: Flash - id: ForensicPad - id: ForensicScanner - - id: FrontierUplinkCoin5 - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelBrigmedic - id: ClothingBackpackDuffelBrigmedicFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalBrigmedic - - id: Flash - - id: FrontierUplinkCoin5 - type: entity noSpawn: true @@ -144,14 +132,9 @@ components: - type: StorageFill contents: - - id: BoxSurvivalNFSD + - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: RubberStampSheriff # Frontier - - id: DoorRemoteNfsd # Frontier - - id: NFSDTechFabCircuitboard # Frontier - - id: BaseSecurityUplinkRadioSheriff # Frontier - - id: ClothingNeckNfsdBadgeHoS # Frontier - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index ed12703efc3..b52f417a855 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -41,30 +41,18 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: FrontierUplinkCoin5 - type: entity noSpawn: true - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelFilledDetective + parent: ClothingBackpackSatchelSecurity + id: ClothingBackpackSatchelSecurityFilledDetective components: - type: StorageFill contents: - - id: BoxSurvival + - id: BoxSurvivalSecurity + - id: Flash - id: ForensicPad - id: ForensicScanner - - id: FrontierUplinkCoin5 - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelBrigmedic - id: ClothingBackpackSatchelBrigmedicFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalBrigmedic - - id: Flash - - id: FrontierUplinkCoin5 - type: entity noSpawn: true @@ -158,14 +146,9 @@ components: - type: StorageFill contents: - - id: BoxSurvivalNFSD + - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: RubberStampSheriff # Frontier - - id: DoorRemoteNfsd # Frontier - - id: NFSDTechFabCircuitboard # Frontier - - id: BaseSecurityUplinkRadioSheriff # Frontier - - id: ClothingNeckNfsdBadgeHoS # Frontier - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index 7ab9db35d31..86c86f29401 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -44,70 +44,21 @@ name: survival box parent: BoxCardboard id: BoxSurvivalSecurity - description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. + description: It's a box with basic internals inside. suffix: Security components: - type: StorageFill contents: - id: ClothingMaskGasSecurity -# - id: EmergencyOxygenTankFilled - - id: ExtendedEmergencyOxygenTankFilled # Frontier - - id: SpaceMedipen - - id: EmergencyMedipen - ##- id: Flare - - id: FoodPSB - - id: DrinkWaterBottleFull - - id: EncryptionKeyTraffic # Frontier - - type: Sprite - layers: - - state: internals - - state: extendedtank # Frontier - -- type: entity - name: survival box - parent: BoxCardboard - id: BoxSurvivalNFSD - description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. - suffix: NFSD - components: - - type: StorageFill - contents: - - id: ClothingMaskGasNFSD -# - id: EmergencyOxygenTankFilled - - id: ExtendedEmergencyOxygenTankFilled # Frontier - - id: SpaceMedipen - - id: EmergencyMedipen - ##- id: Flare - - id: FoodPSB - - id: DrinkWaterBottleFull - - id: EncryptionKeyTraffic # Frontier - - type: Sprite - layers: - - state: internals - - state: extendedtank # Frontier - -- type: entity - name: survival box - parent: BoxCardboard - id: BoxSurvivalBrigmedic - description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. - suffix: MedSec - components: - - type: StorageFill - contents: - - id: ClothingMaskBreathMedicalSecurity -# - id: EmergencyOxygenTankFilled - - id: ExtendedEmergencyOxygenTankFilled # Frontier - - id: SpaceMedipen + - id: EmergencyOxygenTankFilled - id: EmergencyMedipen - ##- id: EmergencyMedipen - - id: FoodPSB + - id: Flare + - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - - id: EncryptionKeyTraffic # Frontier - type: Sprite layers: - state: internals - - state: extendedtank # Frontier + - state: emergencytank - type: entity name: survival box diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 2f9f1e20f75..db0b97f000f 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -182,9 +182,6 @@ # - id: OxygenTankFilled - id: AirTankFilled - id: ClothingOuterHardsuitSecurity - orGroup: HardsuitSecurity - - id: ClothingOuterHardsuitSecuritypatrol # Frontier - 50% to get the patrol suit - orGroup: HardsuitSecurity - id: ClothingMaskBreath - id: JetpackSecurityFilled # Frontier - id: HandheldGPSBasic # Frontier diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml index 0bccf796b29..7c6e52d44fb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml @@ -4,6 +4,7 @@ SurvivalKnife: 15 WeaponLaserGun: 15 WeaponSniperMosin: 15 + WeaponSniperRepeater: 15 MagazineBoxLightRifle: 15 MagazineBoxLightRiflePractice: 15 MagazineBoxLightRifleRubber: 15 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml index 35693279d90..fd0fc39e459 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml @@ -17,9 +17,6 @@ # ChemistryPDA: 3 # Frontier # CMOPDA: 3 # Frontier SecurityGuardPDA: 3 # Frontier - SecurityPDA: 3 # Frontier - BrigmedicPDA: 3 # Frontier - WardenPDA: 3 # Frontier PassengerIDCard: 10 # Frontier 5<10 ClothingHeadsetGrey: 10 # Frontier 5<10 RubberStampStc: 1 # Frontier @@ -42,7 +39,7 @@ DeskBell: 3 # Frontier EncryptionKeyCommand: 3 # Frontier EncryptionKeySecurity: 10 # Frontier 1<10 - EncryptionKeyNFSD: 10 # Frontier 1<10 + EncryptionKeyNfsd: 10 # Frontier 1<10 EncryptionKeyCargo: 20 # Frontier 2<20 EncryptionKeyEngineering: 20 # Frontier 2<20 EncryptionKeyMedical: 20 # Frontier 2<20 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index 7b8203ebf28..32097278005 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -4,7 +4,6 @@ ClothingBackpackSecurity: 3 ClothingBackpackSatchelSecurity: 3 ClothingBackpackDuffelSecurity: 3 - ClothingBackpackMessengerSecurity: 3 # Frontier ClothingHeadHatBeretBrigmedic: 3 ClothingHeadHatBeretSecurity: 3 ClothingHeadHatSecsoft: 3 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 6a39417f35e..b7fe47a1cbd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -2,7 +2,7 @@ name: energy gun parent: BaseWeaponBattery id: WeaponEnergyGun - description: "A basic hybrid energy gun with two settings: disable and kill." + description: "A basic hybrid energy gun with two settings: disable and kill. On the handle is a label that says 'for authorized use only.'" components: - type: Sprite sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi @@ -60,7 +60,7 @@ suffix: DO NOT MAP # Frontier - Add DO NOT MAP, this is the sheriff's gun parent: BaseWeaponBatterySmall id: WeaponEnergyGunMultiphase - description: This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time. + description: This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time. On the handle is a label that says 'for authorized use only.' components: - type: Sprite sprite: DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml index ddbb018ff61..bf57c92b6fc 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml @@ -26,6 +26,7 @@ - PaintingSleepingGypsy - PaintingRedBlueYellow - PaintingHelloWorld + - PaintingNightOfThePostGoblin # Frontier chance: 1 rarePrototypes: - PaintingSkeletonBoof diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 47df34a1d57..d18ca9aa799 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -99,25 +99,6 @@ DefaultPrototype: Beaker ExamineName: Glass Beaker -- type: entity - id: NFSDTechFabCircuitboard - parent: BaseMachineCircuitboard - name: nfsd techfab machine board - description: A machine printed circuit board for an nfsd techfab. - components: - - type: Sprite - state: nfsd - - type: MachineBoard - prototype: NFSDTechFab - requirements: - MatterBin: 2 - Manipulator: 2 - tagRequirements: - GlassBeaker: - Amount: 2 - DefaultPrototype: Beaker - ExamineName: Glass Beaker - - type: entity id: AmmoTechFabCircuitboard parent: BaseMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 2ddc10518e5..cd5c131fe03 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -76,7 +76,7 @@ - Medical - Science - Security - - NFSD + - Nfsd - Service - Supply - Traffic # Frontier diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index 5186c548b04..e0c712f1ba9 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -102,7 +102,7 @@ - Critical - Dead - type: Rattle - radioChannel: "NFSD" + radioChannel: "Nfsd" #Traitor implants diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml index 2ec63e0bad0..ae61d9dcfd4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -141,7 +141,8 @@ - MailDrobeInventory - RepDrobeInventory - BoxingDrobeInventory - - PietyVendInventory +# - PietyVendInventory # Dont enable, infinite demon dogs issue + - NfsdDrobeInventory # Frontier - type: Sprite layers: - state: base @@ -320,6 +321,7 @@ - type: VendingMachineRestock canRestock: - PTechInventory + - PTechNfsdInventory # Frontier - type: Sprite layers: - state: base @@ -359,6 +361,7 @@ - type: VendingMachineRestock canRestock: - SecTechInventory + - NfsdTechInventory - type: Sprite layers: - state: base diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index d12e7e99c6e..6bc2a40b003 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -126,7 +126,7 @@ name: retro laser pistol parent: BaseWeaponBatterySmall id: WeaponLaserGun - description: A weapon using light amplified by the stimulated emission of radiation. + description: A civilian grade weapon using light amplified by the stimulated emission of radiation. components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi @@ -153,7 +153,7 @@ name: makeshift laser pistol parent: BaseWeaponBatterySmall id: WeaponMakeshiftLaser - description: Better pray it won't burn your hands off. + description: Better pray it won't burn your hands off. At least it's legal. components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/makeshift.rsi @@ -176,7 +176,7 @@ name: tesla gun parent: BaseWeaponBattery id: WeaponTeslaGun - description: The power of the primordial element of lightning in your hands. + description: The power of the primordial element of lightning in your hands. An experimental and illegal weapon. components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/tesla_gun.rsi @@ -205,7 +205,7 @@ name: laser rifle parent: BaseWeaponBattery id: WeaponLaserCarbine - description: Favoured by Nanotrasen Security for being cheap and easy to use. + description: A simple civilian grade laser carbine, the workhorse of many private security organizations. components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi @@ -243,7 +243,7 @@ name: pulse pistol parent: BaseWeaponBatterySmall id: WeaponPulsePistol - description: A state of the art energy pistol favoured as a sidearm by the NT operatives. + description: A state of the art energy pistol favoured as a sidearm by the NT operatives. On the handle is a label that says 'for authorized use only.' components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi @@ -272,7 +272,7 @@ name: pulse carbine parent: BaseWeaponBattery id: WeaponPulseCarbine - description: A high tech energy carbine favoured by the NT-ERT operatives. + description: A high tech energy carbine favoured by the NT-ERT operatives. On the handle is a label that says 'for authorized use only.' components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/pulse_carbine.rsi @@ -303,7 +303,7 @@ name: pulse rifle parent: BaseWeaponBattery id: WeaponPulseRifle - description: A weapon that is almost as infamous as its users. + description: A weapon that is almost as infamous as its users. On the handle is a label that says 'for authorized use only.' components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi @@ -330,7 +330,7 @@ name: laser cannon parent: BaseWeaponBattery id: WeaponLaserCannon - description: A heavy duty, high powered laser weapon. + description: A heavy duty, high powered laser weapon. On the handle is a label that says 'for authorized use only.' components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi @@ -389,7 +389,7 @@ name: x-ray cannon parent: BaseWeaponBattery id: WeaponXrayCannon - description: An experimental weapon that uses concentrated x-ray energy against its target. + description: An illegal and experimental weapon that uses concentrated x-ray energy against its target. components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/xray.rsi @@ -420,7 +420,7 @@ name: disabler parent: BaseWeaponBatterySmall id: WeaponDisabler - description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. + description: A civilian grade self-defense weapon that exhausts organic targets, weakening them until they collapse. components: - type: Tag tags: @@ -460,7 +460,7 @@ name: disabler SMG parent: BaseWeaponBattery id: WeaponDisablerSMG - description: Advanced weapon that exhausts organic targets, weakening them until they collapse. + description: Advanced weapon that exhausts organic targets, weakening them until they collapse. On the handle is a label that says 'for authorized use only.' components: - type: Item size: Large @@ -498,7 +498,7 @@ name: practice disabler parent: WeaponDisabler id: WeaponDisablerPractice - description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for cadets. + description: A civilian-grade self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for firearm training. components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/practice_disabler.rsi @@ -523,7 +523,7 @@ name: taser parent: BaseWeaponBatterySmall id: WeaponTaser - description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range. + description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range. On the handle is a label that says 'for authorized use only.' components: - type: Tag tags: @@ -559,7 +559,7 @@ name: antique laser pistol parent: BaseWeaponBatterySmall id: WeaponAntiqueLaser - description: This is an antique laser pistol. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. + description: This is a civilian grade antique laser pistol. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi @@ -598,7 +598,7 @@ name: advanced laser pistol parent: BaseWeaponBatterySmall id: WeaponAdvancedLaser - description: An experimental high-energy laser pistol with a self-charging nuclear battery. + description: An experimental civilian grade high-energy laser pistol with a self-charging nuclear battery. components: - type: Item size: Normal # Intentionally larger than other pistols @@ -693,7 +693,7 @@ name: eye of a behonker parent: BaseWeaponBatterySmall id: WeaponBehonkerLaser - description: The eye of a behonker, it fires a laser when squeezed. + description: The eye of a behonker, it fires a laser when squeezed. An illegal weapon often used by the cult of the Honkmother. components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/behonker_eye.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml index 9d685e1ddc0..42e5b7ee554 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml @@ -25,7 +25,7 @@ name: minigun id: WeaponMinigun parent: BaseWeaponHeavyMachineGun - description: Vzzzzzt! Rahrahrahrah! Vrrrrr! Uses .10 rifle ammo. + description: Vzzzzzt! Rahrahrahrah! Vrrrrr! Uses .10 rifle ammo. Illegal for use in the Frontier sector. components: - type: Sprite sprite: Objects/Weapons/Guns/HMGs/minigun.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 943ab4b8ed7..d23bdfbdc9e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -65,7 +65,7 @@ name: L6 SAW id: WeaponLightMachineGunL6 parent: BaseWeaponLightMachineGun - description: A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses .30 rifle ammo. + description: A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses .30 rifle ammo. An illegal firearm often used by Syndicate agents. components: - type: Sprite sprite: Objects/Weapons/Guns/LMGs/l6.rsi @@ -85,7 +85,7 @@ name: L6C ROW id: WeaponLightMachineGunL6C parent: BaseItem - description: A L6 SAW for use by cyborgs. Creates .30 rifle ammo on the fly from an internal ammo fabricator, which slowly self-charges. + description: A L6 SAW for use by cyborgs. Creates .30 rifle ammo on the fly from an internal ammo fabricator, which slowly self-charges. An illegal firearm often used by Syndicate agents. components: - type: Gun minAngle: 4 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index fc4e9a31add..414540561d2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -70,7 +70,7 @@ name: viper parent: BaseWeaponPistol id: WeaponPistolViper - description: A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses .35 auto ammo. + description: A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses .35 auto ammo. An illegal firearm often used by Syndicate agents. components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/viper.rsi @@ -108,7 +108,7 @@ name: cobra parent: BaseWeaponPistol id: WeaponPistolCobra - description: A rugged, robust operator handgun with inbuilt silencer. Uses .25 caseless ammo. + description: A rugged, robust operator handgun with inbuilt silencer. Uses .25 caseless ammo. An illegal firearm often used by Syndicate agents. components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/cobra.rsi @@ -157,7 +157,7 @@ name: mk 58 parent: BaseWeaponPistol id: WeaponPistolMk58 - description: A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo. + description: A cheap, civilian grade, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/mk58.rsi @@ -205,7 +205,7 @@ name: N1984 parent: BaseWeaponPistol id: WeaponPistolN1984 # the spaces in description are for formatting. - description: The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber. + description: The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber. On the handle is a label that says 'for authorized use only.' components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/N1984.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 398614f3d19..ee65bb65491 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -54,7 +54,7 @@ name: Deckard parent: BaseWeaponRevolver id: WeaponRevolverDeckard - description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. + description: A rare, civilian grade custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi @@ -82,7 +82,7 @@ name: Inspector parent: BaseWeaponRevolver id: WeaponRevolverInspector - description: A detective's best friend. Uses .45 magnum ammo. + description: A detective's best friend. Uses .45 magnum ammo. On the handle is a label that says 'for authorized use only.' components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi @@ -97,7 +97,7 @@ name: Mateba parent: BaseWeaponRevolver id: WeaponRevolverMateba - description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. + description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. On the handle is a label that says 'for authorized use only.' components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi @@ -112,7 +112,7 @@ name: Python parent: BaseWeaponRevolver id: WeaponRevolverPython - description: A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo. + description: An illegal revolver favoured by Syndicate agents. Uses .45 magnum ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/python.rsi @@ -135,7 +135,7 @@ parent: WeaponRevolverPython id: WeaponRevolverPythonAP # For the uplink. suffix: armor-piercing - description: A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo. + description: An illegal revolver favoured by Syndicate agents. Uses .45 magnum ammo. components: - type: RevolverAmmoProvider whitelist: @@ -150,7 +150,7 @@ name: pirate revolver parent: BaseWeaponRevolver id: WeaponRevolverPirate - description: An odd, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo. + description: An odd, illegal, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 5bc8125ebaa..0e7f1a62272 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -54,7 +54,7 @@ name: AKMS parent: BaseWeaponRifle id: WeaponRifleAk - description: An iconic weapon of war. Uses .30 rifle ammo. + description: An iconic weapon of war. Uses .30 rifle ammo. An illegal firearm often used by Syndicate agents. components: - type: Sprite sprite: Objects/Weapons/Guns/Rifles/ak.rsi @@ -102,7 +102,7 @@ name: M-90gl parent: BaseWeaponRifle id: WeaponRifleM90GrenadeLauncher - description: An older bullpup carbine model, with an attached underbarrel grenade launcher. Uses .20 rifle ammo. + description: An older bullpup carbine model, with an attached underbarrel grenade launcher. Uses .20 rifle ammo. An illegal firearm often used by Syndicate agents. components: - type: Sprite sprite: Objects/Weapons/Guns/Rifles/carbine.rsi @@ -145,7 +145,7 @@ name: Lecter parent: BaseWeaponRifle id: WeaponRifleLecter - description: A high end military grade assault rifle. Uses .20 rifle ammo. + description: A high end military grade assault rifle. Uses .20 rifle ammo. On the receiver is a label that says 'for authorized use only.' components: - type: Sprite sprite: Objects/Weapons/Guns/Rifles/lecter.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index e258bdb0ff6..91d8f8a7ec5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -59,7 +59,7 @@ name: Atreides parent: BaseWeaponSubMachineGun id: WeaponSubMachineGunAtreides - description: Pla-ket-ket-ket-ket! Uses .35 auto ammo. + description: Pla-ket-ket-ket-ket! Uses .35 auto ammo. An illegal firearm often used by Syndicate agents. components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/atreides.rsi @@ -82,7 +82,7 @@ name: C-20r sub machine gun parent: BaseWeaponSubMachineGun id: WeaponSubMachineGunC20r - description: A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo. + description: An illegal firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/c20r.rsi @@ -109,7 +109,7 @@ name: Drozd parent: BaseWeaponSubMachineGun id: WeaponSubMachineGunDrozd - description: An excellent fully automatic Heavy SMG. + description: An excellent fully automatic Heavy SMG. An illegal firearm often used by Syndicate agents. components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/drozd.rsi @@ -156,7 +156,7 @@ parent: BaseWeaponSubMachineGun id: WeaponSubMachineGunVector suffix: Deprecated use Drozd - description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. + description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. An illegal firearm often used by Syndicate agents. components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/vector.rsi @@ -202,7 +202,7 @@ name: WT550 parent: BaseWeaponSubMachineGun id: WeaponSubMachineGunWt550 - description: An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. + description: An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. On the receiver is a label that says 'for authorized use only.' components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/wt550.rsi @@ -280,7 +280,7 @@ name: Vector parent: WeaponSubMachineGunVector id: WeaponSubMachineGunVectorRubber - description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. + description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. An illegal firearm often used by Syndicate agents. suffix: Non-Lethal components: - type: ItemSlots diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 553b9a409e2..62229713fde 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -48,7 +48,7 @@ # Don't parent to BaseWeaponShotgun because it differs significantly parent: BaseItem id: WeaponShotgunBulldog - description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells. + description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells. An illegal firearm often used by Syndicate agents. components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi @@ -104,7 +104,7 @@ name: double-barreled shotgun parent: BaseWeaponShotgun id: WeaponShotgunDoubleBarreled - description: An immortal classic. Uses .50 shotgun shells. + description: An immortal classic. A civilian grade shotgun. Uses .50 shotgun shells. components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi @@ -139,7 +139,7 @@ name: Enforcer parent: BaseWeaponShotgun id: WeaponShotgunEnforcer - description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells. + description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells. On the receiver is a label that says 'for authorized use only.' components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi @@ -162,7 +162,7 @@ name: Kammerer parent: BaseWeaponShotgun id: WeaponShotgunKammerer - description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells. + description: When an old Remington design meets modern materials, this is the result. A civilian grade shotgun, favored by militia forces throughout many worlds. Uses .50 shotgun shells. components: - type: Item size: Normal @@ -184,7 +184,7 @@ name: sawn-off shotgun parent: BaseWeaponShotgun id: WeaponShotgunSawn - description: Groovy! Uses .50 shotgun shells. + description: Groovy! Uses .50 shotgun shells. A modified civilian grade shotgun. components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi @@ -207,7 +207,7 @@ name: sawn-off shogun parent: WeaponShotgunSawn id: WeaponShotgunSawnEmpty - description: Groovy! Uses .50 shotgun shells. + description: Groovy! Uses .50 shotgun shells. A modified civilian grade shotgun. suffix: Empty components: - type: BallisticAmmoProvider @@ -221,7 +221,7 @@ name: handmade pistol parent: BaseWeaponShotgun id: WeaponShotgunHandmade - description: Looks unreliable. Uses .50 shotgun shells. + description: Looks unreliable, but legal. Uses .50 shotgun shells. components: - type: Item size: Small @@ -246,7 +246,7 @@ parent: BaseWeaponShotgun id: WeaponShotgunBlunderbuss suffix: Pirate - description: Deadly at close range. + description: Deadly at close range, an illegal shotgun often found at the side of a pirate. components: - type: Item size: Normal @@ -265,7 +265,7 @@ name: improvised shotgun parent: BaseWeaponShotgun id: WeaponShotgunImprovised - description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber. + description: A shitty, but legal, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber. components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index b5404c0da75..08abe0f5dce 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -41,7 +41,7 @@ name: Kardashev-Mosin parent: BaseWeaponSniper id: WeaponSniperMosin - description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. + description: A civilian grade weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi @@ -52,7 +52,7 @@ name: Hristov parent: BaseWeaponSniper id: WeaponSniperHristov - description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo. + description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo. On the receiver is a label that says 'for authorized use only.' components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi @@ -108,7 +108,7 @@ name: flintlock pistol parent: BaseWeaponSniper id: WeaponPistolFlintlock - description: A pirate's companion. Yarrr! Uses .60 anti-materiel ammo. + description: A pirate's companion. Yarrr! Uses .60 anti-materiel ammo. An illegal weapon often used by pirates. components: - type: Gun minAngle: 0 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 082a8a956c8..3d3924bbd5e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -87,7 +87,7 @@ name: truncheon parent: BaseItem id: Truncheon - description: A rigid, steel-studded baton, meant to harm. + description: A rigid, steel-studded baton, meant to harm. On the handle is a label that says 'for authorized use only.' components: - type: Sprite sprite: Objects/Weapons/Melee/truncheon.rsi diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 316c5ba69d3..026c290822d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -161,14 +161,12 @@ - CellRechargerCircuitboard - BorgChargerCircuitboard - WeaponCapacitorRechargerCircuitboard - # Frontier Start - - Durathread - - Plasteel - - ClothingOuterSuitEmergency - - ClothingHeadHelmetEVA - - ClothingHeadHelmetEVALarge - - ClothingOuterHardsuitEVA - # Frontier End + - Durathread # Frontier + - Plasteel # Frontier + - ClothingOuterSuitEmergency # Frontier + - ClothingHeadHelmetEVA # Frontier + - ClothingHeadHelmetEVALarge # Frontier + - ClothingOuterHardsuitEVA # Frontier - type: EmagLatheRecipes emagStaticRecipes: - CartridgePistol @@ -183,11 +181,9 @@ - MagazineBoxRifle - MagazineBoxLightRifle - GrenadeBlast - # Frontier Start - - ClothingHeadHelmetCosmonaut - - ClothingHeadHelmetSyndicate - - ClothingOuterHardsuitSyndicate - # Frontier End +# - ClothingHeadHelmetCosmonaut # Frontier +# - ClothingHeadHelmetSyndicate # Frontier +# - ClothingOuterHardsuitSyndicate # Frontier emagDynamicRecipes: - CartridgePistolRubber - CartridgeMagnumRubber @@ -351,26 +347,24 @@ - DeviceQuantumSpinInverter - UtilityBeltChiefEngineer - JetpackVoid - # Frontier Start - - ClothingShoesBootsMagAdv - - ClothingOuterHardsuitBasic - - ClothingOuterHardsuitAtmos - - ClothingOuterHardsuitEngineering - - ClothingOuterHardsuitSpatio - - ClothingOuterHardsuitSalvage - - ClothingOuterHardsuitClown - - ClothingOuterHardsuitMime - - ClothingOuterHardsuitCap - - ClothingOuterHardsuitEngineeringWhite - - ClothingOuterHardsuitMedical - - ClothingOuterHardsuitRd - - ClothingOuterHardsuitLuxury - - ClothingOuterHardsuitMercenary - - ClothingOuterHardsuitPilot - - ClothingOuterHardsuitMaximPrototype - - ClothingHeadHelmetAncient - - ClothingOuterHardsuitAncientEVA - # Frontier End + - ClothingShoesBootsMagAdv # Frontier + - ClothingOuterHardsuitBasic # Frontier + - ClothingOuterHardsuitAtmos # Frontier + - ClothingOuterHardsuitEngineering # Frontier + - ClothingOuterHardsuitSpatio # Frontier + - ClothingOuterHardsuitSalvage # Frontier + - ClothingOuterHardsuitClown # Frontier + - ClothingOuterHardsuitMime # Frontier + - ClothingOuterHardsuitCap # Frontier + - ClothingOuterHardsuitEngineeringWhite # Frontier + - ClothingOuterHardsuitMedical # Frontier + - ClothingOuterHardsuitRd # Frontier + - ClothingOuterHardsuitLuxury # Frontier + - ClothingOuterHardsuitMercenary # Frontier + - ClothingOuterHardsuitPilot # Frontier + - ClothingOuterHardsuitMaximPrototype # Frontier + - ClothingHeadHelmetAncient # Frontier + - ClothingOuterHardsuitAncientEVA # Frontier - type: EmagLatheRecipes emagDynamicRecipes: - ExplosivePayload @@ -378,10 +372,7 @@ - WeaponAdvancedLaser - WeaponLaserCannon - WeaponXrayCannon - # Frontier Start - - ClothingOuterHardsuitPirateEVA - - ClothingOuterHardsuitSundie - # Frontier End + - ClothingOuterHardsuitPirateEVA # Frontier - type: entity id: ProtolatheHyperConvection @@ -513,15 +504,13 @@ - SodaDispenserMachineCircuitboard - TelecomServerCircuitboard - MassMediaCircuitboard - # Begin Nyano additions - - DoorElectronics - - FireAlarmElectronics - - FirelockElectronics - - IntercomElectronics - - MailingUnitElectronics - - StationMapElectronics - - DeepFryerMachineCircuitboard - # End Nyano additions + - DoorElectronics # Nyano + - FireAlarmElectronics # Nyano + - FirelockElectronics # Nyano + - IntercomElectronics # Nyano + - MailingUnitElectronics # Nyano + - StationMapElectronics # Nyano + - DeepFryerMachineCircuitboard # Nyano - SmallThrusterMachineCircuitboard # Frontier - SmallGyroscopeMachineCircuitboard # Frontier - type: MaterialStorage @@ -806,12 +795,10 @@ - ShuttleGunPerforatorCircuitboard - ShuttleGunFriendshipCircuitboard - ShuttleGunDusterCircuitboard - # Frontier Start - - ClothingOuterHardsuitSecurity - - ClothingOuterHardsuitSecuritypatrol - - ClothingOuterHardsuitWarden - - ClothingOuterHardsuitBrigmedic - # Frontier End +# - ClothingOuterHardsuitSecurity # Frontier +# - ClothingOuterHardsuitNfsdPatrol # Frontier +# - ClothingOuterHardsuitWarden # Frontier +# - ClothingOuterHardsuitBrigmedic # Frontier - type: MaterialStorage whitelist: tags: @@ -1102,30 +1089,30 @@ - ClothingNeckScarfStripedOrange - ClothingNeckScarfStripedBlack - ClothingNeckScarfStripedPurple - - type: EmagLatheRecipes - emagStaticRecipes: - - ClothingHeadHatCentcomcap - - ClothingHeadHatCentcom - - ClothingUniformJumpsuitCentcomAgent - - ClothingUniformJumpsuitCentcomFormal - - ClothingUniformJumpskirtCentcomFormalDress - - ClothingUniformJumpsuitCentcomOfficer - - ClothingUniformJumpsuitCentcomOfficial - - ClothingHeadHatSyndieMAA - - ClothingHeadHatSyndie - - ClothingUniformJumpsuitOperative - - ClothingUniformJumpskirtOperative - - ClothingUniformJumpsuitSyndieFormal - - ClothingUniformJumpskirtSyndieFormalDress - - ClothingHeadPyjamaSyndicateBlack - - ClothingUniformJumpsuitPyjamaSyndicateBlack - - ClothingHeadPyjamaSyndicatePink - - ClothingUniformJumpsuitPyjamaSyndicatePink - - ClothingHeadPyjamaSyndicateRed - - ClothingUniformJumpsuitPyjamaSyndicateRed - - ClothingOuterWinterCentcom - - ClothingOuterWinterSyndie - - ClothingOuterWinterSyndieCap +# - type: EmagLatheRecipes # Frontier +# emagStaticRecipes: # Frontier +# - ClothingHeadHatCentcomcap # Frontier +# - ClothingHeadHatCentcom # Frontier +# - ClothingUniformJumpsuitCentcomAgent # Frontier +# - ClothingUniformJumpsuitCentcomFormal # Frontier +# - ClothingUniformJumpskirtCentcomFormalDress # Frontier +# - ClothingUniformJumpsuitCentcomOfficer # Frontier +# - ClothingUniformJumpsuitCentcomOfficial # Frontier +# - ClothingHeadHatSyndieMAA # Frontier +# - ClothingHeadHatSyndie # Frontier +# - ClothingUniformJumpsuitOperative # Frontier +# - ClothingUniformJumpskirtOperative # Frontier +# - ClothingUniformJumpsuitSyndieFormal # Frontier +# - ClothingUniformJumpskirtSyndieFormalDress # Frontier +# - ClothingHeadPyjamaSyndicateBlack # Frontier +# - ClothingUniformJumpsuitPyjamaSyndicateBlack # Frontier +# - ClothingHeadPyjamaSyndicatePink # Frontier +# - ClothingUniformJumpsuitPyjamaSyndicatePink # Frontier +# - ClothingHeadPyjamaSyndicateRed # Frontier +# - ClothingUniformJumpsuitPyjamaSyndicateRed # Frontier +# - ClothingOuterWinterCentcom # Frontier +# - ClothingOuterWinterSyndie # Frontier +# - ClothingOuterWinterSyndieCap # Frontier - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml index df4f3c596fb..79946133021 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml @@ -81,7 +81,7 @@ - EncryptionKeyMedical - EncryptionKeyScience - EncryptionKeySecurity - - EncryptionKeyNFSD + - EncryptionKeyNfsd - EncryptionKeyService - EncryptionKeyCommand - EncryptionKeyTraffic # Frontier - Add Traffic channel diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 03fe5a83ea4..cc5953beae7 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -224,7 +224,7 @@ energy: 1.3 color: "#ffb0b0" - type: AccessReader - access: [["HeadOfPersonnel"], ["HeadOfSecurity"]] # Frontier - Added sheriff access + access: [["HeadOfPersonnel"]] - type: MarketModifier mod: 5 diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml index 228596acfcd..409d52af995 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml @@ -237,7 +237,7 @@ - Medical - Science - Security - - NFSD #Frontier - Add NFSD channel + - Nfsd #Frontier - Add NFSD channel - Service - Supply - Traffic # Frontier - Add Traffic channel diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml index 6e3a90eae68..7c639cdadad 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml @@ -9,16 +9,17 @@ startingGear: ValetGear alwaysUseSpawner: true icon: "JobIconServiceWorker" - supervisors: job-supervisors-everyone + supervisors: job-supervisors-sr + canBeAntag: false access: - - Service - - Bar - - Kitchen - - Cargo - Maintenance - - Janitor - External # Frontier + - Service + - Janitor - Mail # Frontier + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] - type: startingGear id: ValetGear diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml index 3ab6483671d..ecb858b9915 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml @@ -11,7 +11,7 @@ time: 36000 # Frontier - 10 hrs startingGear: PrisonGuardGear icon: "JobIconWarden" - supervisors: job-supervisors-hos # Frontier + supervisors: job-supervisors-bailiff # Frontier canBeAntag: false access: - Security @@ -42,4 +42,4 @@ innerClothingSkirt: ClothingUniformJumpsuitPrisonGuard satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled - messenger: ClothingBackpackMessengerSecurityFilled # Frontier + messenger: ClothingBackpackSecurityFilled diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Service/mail_carrier.yml similarity index 88% rename from Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml rename to Resources/Prototypes/Nyanotrasen/Roles/Jobs/Service/mail_carrier.yml index 3c5b145f865..21246200078 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Service/mail_carrier.yml @@ -9,13 +9,16 @@ - !type:OverallPlaytimeRequirement time: 10800 icon: "JobIconMailCarrier" - supervisors: job-supervisors-hop + supervisors: job-supervisors-sr + canBeAntag: false access: - - Cargo + - External # Frontier - Maintenance - Service - - External # Frontier - Mail # Frontier + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] - type: startingGear id: MailCarrierGear diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml index fe6c23edfbb..266d53ea3f0 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml @@ -9,8 +9,7 @@ startingGear: GladiatorGear canBeAntag: false icon: "JobIconBoxer" - supervisors: job-supervisors-security - access: - - Service - - Maintenance - - External # Frontier + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier + setPreference: false # Frontier \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml index 5178a53693f..b8ecd39da29 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml @@ -8,7 +8,7 @@ time: 10800 startingGear: MartialGear icon: "JobIconBoxer" - supervisors: job-supervisors-hop + supervisors: job-supervisors-hire access: - Service - Maintenance diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml index f809dcdf369..ae296cbe933 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml @@ -10,7 +10,7 @@ canBeAntag: false whitelistRequired: true icon: "JobIconPrisoner" - supervisors: job-supervisors-security + supervisors: job-supervisors-prisoner special: - !type:AddImplantSpecial implants: [ TrackingImplant ] # Frontier diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index a4d1ee5fdcb..1da7fbb58fc 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -8,12 +8,9 @@ time: 10800 startingGear: CargoTechGear icon: "JobIconCargoTechnician" - supervisors: job-supervisors-qm - access: - - Cargo - - Maintenance - extendedAccess: - - Salvage + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: CargoTechGear diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 1b48fb36437..59114b29f18 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -9,21 +9,10 @@ weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" - supervisors: job-supervisors-captain - canBeAntag: false - access: - - Cargo - - Salvage - - Quartermaster - - Maintenance - - Command - - Brig - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - - !type:AddComponentSpecial - components: - - type: CommandStaff + supervisors: job-supervisors-hire # Frontier +# canBeAntag: false + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: QuartermasterGear diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 1b7231dfcd5..d51ef55eef7 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -8,12 +8,9 @@ time: 10800 icon: "JobIconShaftMiner" startingGear: SalvageSpecialistGear - supervisors: job-supervisors-qm - access: - - Cargo - - Salvage - - Maintenance - - External + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: SalvageSpecialistGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml index eb1287b2327..175e56d5181 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml @@ -5,10 +5,9 @@ playTimeTracker: JobPassenger startingGear: PassengerGear icon: "JobIconPassenger" - supervisors: job-supervisors-everyone - access: - - Maintenance - - External # Frontier +# supervisors: job-supervisors-everyone + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: PassengerGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index bd485a2d04b..253d2af09b0 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -8,15 +8,9 @@ time: 10800 startingGear: BartenderGear icon: "JobIconBartender" - supervisors: job-supervisors-hop - access: - - Service - - Maintenance - - Bar - - External # Frontier - extendedAccess: - - Kitchen - - Hydroponics + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: BartenderGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index aaef15006cf..97859555067 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -8,15 +8,9 @@ time: 10800 startingGear: BotanistGear icon: "JobIconBotanist" - supervisors: job-supervisors-hop - access: - - Service - - Maintenance - - Hydroponics - - External # Frontier - extendedAccess: - - Kitchen - - Bar + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: BotanistGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 5ee51a09b0d..4d6bdc089dc 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -8,11 +8,9 @@ time: 10800 startingGear: ChaplainGear icon: "JobIconChaplain" - supervisors: job-supervisors-hop - access: - - Chapel - - Maintenance - - External # Frontier + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index 6fa36496e1e..afd19800eae 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -8,15 +8,9 @@ time: 10800 startingGear: ChefGear icon: "JobIconChef" - supervisors: job-supervisors-hop - access: - - Service - - Maintenance - - Kitchen - - External # Frontier - extendedAccess: - - Hydroponics - - Bar #Nyano - Summary: After this line, Professional Che is a component to be added. Very important. + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index 2ec34c3aa1f..9b6ec931e9f 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -8,11 +8,9 @@ time: 10800 startingGear: ClownGear icon: "JobIconClown" - supervisors: job-supervisors-hop - access: - - Theatre - - Maintenance - - External # Frontier + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index 49a948d23fd..84451ae7e15 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -9,16 +9,16 @@ startingGear: JanitorGear alwaysUseSpawner: true icon: "JobIconJanitor" - supervisors: job-supervisors-hop - access: - - Service - - Janitor - - Maintenance - - External # Frontier + supervisors: job-supervisors-hire # Frontier + canBeAntag: false + accessGroups: # Frontier + - GeneralAccess # Frontier special: - !type:GiveItemOnHolidaySpecial holiday: GarbageDay prototype: WeaponRevolverInspector + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] - type: startingGear id: JanitorGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 6fc2b56f2b6..0dabe07f133 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -8,13 +8,10 @@ time: 21600 startingGear: LawyerGear icon: "JobIconLawyer" - supervisors: job-supervisors-hop - access: - - Service - - Lawyer - - Brig - - Maintenance - - External # Frontier + supervisors: job-supervisors-hire # Frontier + canBeAntag: false + accessGroups: # Frontier + - GeneralNfsdBrigAccess # Frontier - type: startingGear id: LawyerGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index 2c7e0df44d9..e0d75a711fd 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -8,11 +8,9 @@ time: 10800 startingGear: LibrarianGear icon: "JobIconLibrarian" - supervisors: job-supervisors-hop - access: - - Service - - Maintenance - - External # Frontier + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: LibrarianGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 0fc778e5bf9..2068da37726 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -8,11 +8,9 @@ time: 10800 startingGear: MimeGear icon: "JobIconMime" - supervisors: job-supervisors-hop - access: - - Theatre - - Maintenance - - External # Frontier + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index 4698be8edbf..247e1aacb9e 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -8,11 +8,9 @@ time: 10800 startingGear: MusicianGear icon: "JobIconMusician" - supervisors: job-supervisors-hire - access: - - Maintenance # TODO Remove maint access for all gimmick jobs once access work is completed - - Theatre - - External # Frontier + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier special: - !type:GiveItemOnHolidaySpecial holiday: MikuDay diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index efa6692816c..aa6bebc7879 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -8,16 +8,9 @@ time: 10800 startingGear: ServiceWorkerGear icon: "JobIconServiceWorker" - supervisors: job-supervisors-service - canBeAntag: false - access: - - Service - - Maintenance - - Bar - - Kitchen - - External # Frontier - extendedAccess: - - Hydroponics + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: ServiceWorkerGear diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 1a34a367c87..0615d1cfae6 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -25,10 +25,10 @@ weight: 20 startingGear: CaptainGear icon: "JobIconCaptain" - requireAdminNotify: true - joinNotifyCrew: true - supervisors: job-supervisors-centcom - canBeAntag: false +# requireAdminNotify: true +# joinNotifyCrew: true +# supervisors: job-supervisors-centcom +# canBeAntag: false access: - Captain # Just making sure in the case of any error that this role cannot be used for any bad doing. - Maintenance # Frontier @@ -51,7 +51,7 @@ head: ClothingHeadHatCaptain eyes: ClothingEyesGlassesSunglasses gloves: ClothingHandsGlovesCaptain - outerClothing: ClothingOuterArmorCaptainCarapace +# outerClothing: ClothingOuterArmorCaptainCarapace id: CaptainPDA # ears: ClothingHeadsetAltCommand ears: ClothingHeadsetGrey diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 92ddcc00df9..331577209f3 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -8,12 +8,9 @@ time: 10800 startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" - supervisors: job-supervisors-ce - access: - - Maintenance - - Engineering - - External - - Atmospherics + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: AtmosphericTechnicianGear diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 58703a6e856..1b8992ccad8 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -9,23 +9,17 @@ weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" - requireAdminNotify: true - supervisors: job-supervisors-captain - canBeAntag: false - access: - - Maintenance - - Engineering - - Command - - External - - ChiefEngineer - - Atmospherics - - Brig - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - - !type:AddComponentSpecial - components: - - type: CommandStaff +# requireAdminNotify: true + supervisors: job-supervisors-hire # Frontier +# canBeAntag: false + accessGroups: # Frontier + - GeneralAccess # Frontier +# special: +# - !type:AddImplantSpecial +# implants: [ MindShieldImplant ] +# - !type:AddComponentSpecial +# components: +# - type: CommandStaff - type: startingGear id: ChiefEngineerGear diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 5c44f3297e0..0da116f5377 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -8,13 +8,9 @@ time: 10800 startingGear: StationEngineerGear icon: "JobIconStationEngineer" - supervisors: job-supervisors-ce - access: - - Maintenance - - Engineering - - External - extendedAccess: - - Atmospherics + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: StationEngineerGear diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index ee25a159a18..da0affd94a1 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -4,20 +4,19 @@ description: job-description-technical-assistant playTimeTracker: JobTechnicalAssistant requirements: - - !type:OverallPlaytimeRequirement - time: 3600 #1 hr - - !type:DepartmentTimeRequirement - department: Engineering - time: 54000 #15 hrs - inverted: true # stop playing intern if you're good at engineering! +# - !type:DepartmentTimeRequirement +# department: Engineering +# time: 54000 #15 hrs +# inverted: true # stop playing intern if you're good at engineering! + - !type:OverallPlaytimeRequirement # Frontier + time: 10800 # Frontier startingGear: TechnicalAssistantGear icon: "JobIconTechnicalAssistant" - supervisors: job-supervisors-engineering + supervisors: job-supervisors-hire # Frontier canBeAntag: false - access: - - Maintenance - - Engineering - - External + accessGroups: # Frontier + - GeneralAccess # Frontier + setPreference: false # Frontier - type: startingGear id: TechnicalAssistantGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 184b553c700..669a45a6020 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -8,12 +8,9 @@ time: 10800 startingGear: ChemistGear icon: "JobIconChemist" - supervisors: job-supervisors-cmo - access: - - Medical - - Chemistry - - Maintenance - - External # Frontier + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: ChemistGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index efc9ed9308f..f5958ff6857 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -11,23 +11,17 @@ weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" - requireAdminNotify: true - supervisors: job-supervisors-captain - canBeAntag: false - access: - - Medical - - Command - - Maintenance - - Chemistry - - ChiefMedicalOfficer - - External # Frontier - - Brig - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - - !type:AddComponentSpecial - components: - - type: CommandStaff +# requireAdminNotify: true + supervisors: job-supervisors-hire # Frontier +# canBeAntag: false + accessGroups: # Frontier + - GeneralAccess # Frontier +# special: +# - !type:AddImplantSpecial +# implants: [ MindShieldImplant ] +# - !type:AddComponentSpecial +# components: +# - type: CommandStaff - type: startingGear id: CMOGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 68318029fb3..fcdcc906bf4 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -8,13 +8,9 @@ time: 10800 startingGear: DoctorGear icon: "JobIconMedicalDoctor" - supervisors: job-supervisors-cmo - access: - - Medical - - Maintenance - - External # Frontier - extendedAccess: - - Chemistry + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: DoctorGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 8b1ad0e5f5e..39eecefe821 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -4,10 +4,12 @@ description: job-description-intern playTimeTracker: JobMedicalIntern requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 54000 # 15 hrs - inverted: true # stop playing intern if you're good at med! +# - !type:DepartmentTimeRequirement +# department: Medical +# time: 54000 # 15 hrs +# inverted: true # stop playing intern if you're good at med! + - !type:OverallPlaytimeRequirement # Frontier + time: 10800 # Frontier startingGear: MedicalInternGear icon: "JobIconMedicalIntern" supervisors: job-supervisors-medicine @@ -16,6 +18,7 @@ - Medical - Maintenance - External # Frontier + setPreference: false # Frontier - type: startingGear id: MedicalInternGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index c1bbefd2acf..731d37b1a51 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -8,13 +8,9 @@ time: 10800 startingGear: ParamedicGear icon: "JobIconParamedic" - supervisors: job-supervisors-cmo - access: - - Medical - - Maintenance - - External # Frontier - extendedAccess: - - Chemistry + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: ParamedicGear diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index 3288084f479..e1a6c787151 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -8,6 +8,5 @@ time: 21600 canBeAntag: false icon: JobIconBorg - supervisors: job-supervisors-rd - jobEntity: PlayerBorgGeneric - + supervisors: job-supervisors-hire # Frontier + jobEntity: PlayerBorgGeneric \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index 380cdd3b6ff..ec0f7f80731 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -4,10 +4,12 @@ description: job-description-research-assistant playTimeTracker: JobResearchAssistant requirements: - - !type:DepartmentTimeRequirement - department: Science - time: 10800 - inverted: true # stop playing intern if you're good at science! +# - !type:DepartmentTimeRequirement +# department: Science +# time: 10800 +# inverted: true # stop playing intern if you're good at science! + - !type:OverallPlaytimeRequirement # Frontier + time: 10800 # Frontier startingGear: ResearchAssistantGear icon: "JobIconResearchAssistant" supervisors: job-supervisors-science @@ -16,6 +18,7 @@ - Research - Maintenance - External # Frontier + setPreference: false # Frontier - type: startingGear id: ResearchAssistantGear diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index fc1f72c4d35..5d7259d1bd1 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -9,21 +9,17 @@ weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" - requireAdminNotify: true - supervisors: job-supervisors-captain - canBeAntag: false - access: - - Research - - Command - - Maintenance - - ResearchDirector - - External # Frontier - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - - !type:AddComponentSpecial - components: - - type: CommandStaff +# requireAdminNotify: true + supervisors: job-supervisors-hire # Frontier +# canBeAntag: false + accessGroups: # Frontier + - GeneralAccess # Frontier +# special: +# - !type:AddImplantSpecial +# implants: [ MindShieldImplant ] +# - !type:AddComponentSpecial +# components: +# - type: CommandStaff - type: startingGear id: ResearchDirectorGear diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 7bd96fd27eb..b466e7c3f03 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -8,11 +8,9 @@ time: 10800 startingGear: ScientistGear icon: "JobIconScientist" - supervisors: job-supervisors-rd - access: - - Research - - Maintenance - - External # Frontier + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: ScientistGear diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 08a584658bb..be2cc866b55 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -26,7 +26,7 @@ id: DetectiveGear equipment: jumpsuit: ClothingUniformJumpsuitDetective - back: ClothingBackpackFilledDetective + back: ClothingBackpackSecurityFilledDetective shoes: ClothingShoesBootsCombatFilled eyes: ClothingEyesGlassesSecurity head: ClothingHeadHatFedoraBrown @@ -35,5 +35,6 @@ ears: ClothingHeadsetSecurity belt: ClothingBeltHolsterFilled innerClothingSkirt: ClothingUniformJumpskirtDetective - satchel: ClothingBackpackSatchelFilledDetective - duffelbag: ClothingBackpackDuffelFilledDetective + satchel: ClothingBackpackSatchelSecurityFilledDetective + duffelbag: ClothingBackpackDuffelSecurityFilledDetective + messenger: ClothingBackpackSecurityFilledDetective \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index c926be0d77a..accdbac1ed9 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -8,11 +8,9 @@ time: 10800 startingGear: BoxerGear icon: "JobIconBoxer" - supervisors: job-supervisors-hop - access: - - Service - - Maintenance - - External # Frontier + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: BoxerGear diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index c44a3c06e1c..1f724fe5c57 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -8,13 +8,9 @@ time: 10800 startingGear: PsychologistGear icon: "JobIconPsychologist" - supervisors: job-supervisors-cmo - access: - - Medical - - Maintenance - - External # Frontier - extendedAccess: - - Chemistry + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: PsychologistGear diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index db318d01f58..e42e180356b 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -8,11 +8,9 @@ time: 10800 startingGear: ReporterGear icon: "JobIconReporter" - supervisors: job-supervisors-hop - access: - - Service - - Maintenance - - External # Frontier + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: ReporterGear diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml index fc6b506b0da..dabd226f046 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -8,11 +8,9 @@ time: 10800 startingGear: ZookeeperGear icon: "JobIconZookeeper" - supervisors: job-supervisors-hop - access: - - Service - - Maintenance - - External # Frontier + supervisors: job-supervisors-hire # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier - type: startingGear id: ZookeeperGear diff --git a/Resources/Prototypes/_NF/Access/misc.yml b/Resources/Prototypes/_NF/Access/misc.yml new file mode 100644 index 00000000000..0858fd2c82d --- /dev/null +++ b/Resources/Prototypes/_NF/Access/misc.yml @@ -0,0 +1,12 @@ +- type: accessGroup + id: GeneralAccess + tags: + - Maintenance + - External + +- type: accessGroup + id: GeneralCommandAccess + tags: + - Maintenance + - External + - Command diff --git a/Resources/Prototypes/_NF/Access/security.yml b/Resources/Prototypes/_NF/Access/security.yml index d97c4d14fd3..d6fa4f60a31 100644 --- a/Resources/Prototypes/_NF/Access/security.yml +++ b/Resources/Prototypes/_NF/Access/security.yml @@ -1,3 +1,21 @@ - type: accessLevel id: Mercenary name: id-card-access-level-mercenary + +- type: accessGroup + id: GeneralNfsdAccess + tags: + - Maintenance + - External + - Command + - Brig + - Security + - Mercenary # Frontier + - Captain # Frontier + +- type: accessGroup + id: GeneralNfsdBrigAccess + tags: + - Maintenance + - External + - Brig diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 44f03a33774..b12b4ec9d72 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -61,18 +61,6 @@ - id: Lighter - id: CigPackGreen -- type: entity - noSpawn: true - parent: ClothingBackpacknfsd - id: ClothingBackpackOfficerFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalNFSD - - id: Flash - - id: MagazinePistol - - id: BaseSecurityUplinkRadioOfficer # Frontier - - type: entity noSpawn: true parent: ClothingBackpackERTMailCarrier @@ -100,3 +88,62 @@ - id: DoorRemoteCommand - id: AccessConfigurator - id: PhoneInstrument + +- type: entity + noSpawn: true + parent: ClothingBackpackNfsdBrown + id: ClothingBackpackNfsdBrownFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalNfsd + - id: Flash + - id: MagazinePistol + - id: FrontierUplinkCoin5 + +- type: entity + noSpawn: true + parent: ClothingBackpackNfsdBrownFilled + id: ClothingBackpackNfsdCreamFilled + +- type: entity + noSpawn: true + parent: ClothingBackpackNfsdBrown + id: ClothingBackpackNfsdBrownDetectiveFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalNfsd + - id: Flash + - id: ForensicPad + - id: MagazinePistol + - id: ForensicScanner + - id: FrontierUplinkCoin5 + +- type: entity + noSpawn: true + parent: ClothingBackpackNfsdBrown + id: ClothingBackpackNfsdBrownRadioFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalNfsd + - id: Flash + - id: MagazinePistol + - id: BaseSecurityUplinkRadioOfficer + +- type: entity + noSpawn: true + parent: ClothingBackpackNfsdBrown + id: ClothingBackpackNfsdBrownSheriffFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalNfsd + - id: Flash + - id: MagazinePistol + - id: RubberStampSheriff + - id: DoorRemoteNfsd + - id: NfsdTechFabFlatpack + - id: BaseSecurityUplinkRadioSheriff + - id: ClothingNeckNfsdBadgeSheriff diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 9538378ce87..a1850af565f 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -60,18 +60,6 @@ - id: BoxSurvival - id: Lighter - id: CigPackGreen - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelnfsd - id: ClothingBackpackDuffelOfficerFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalNFSD - - id: Flash - - id: MagazinePistol - - id: BaseSecurityUplinkRadioOfficer # Frontier - type: entity noSpawn: true @@ -86,3 +74,62 @@ - id: DoorRemoteCommand - id: AccessConfigurator - id: PhoneInstrument + +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelNfsdBrown + id: ClothingBackpackDuffelNfsdBrownFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalNfsd + - id: Flash + - id: MagazinePistol + - id: FrontierUplinkCoin5 + +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelNfsdBrownFilled + id: ClothingBackpackDuffelNfsdCreamFilled + +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelNfsdBrown + id: ClothingBackpackDuffelNfsdBrownDetectiveFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalNfsd + - id: Flash + - id: ForensicPad + - id: MagazinePistol + - id: ForensicScanner + - id: FrontierUplinkCoin5 + +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelNfsdBrown + id: ClothingBackpackDuffelNfsdBrownRadioFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalNfsd + - id: Flash + - id: MagazinePistol + - id: BaseSecurityUplinkRadioOfficer + +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelNfsdBrown + id: ClothingBackpackDuffelNfsdBrownSheriffFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalNfsd + - id: Flash + - id: MagazinePistol + - id: RubberStampSheriff + - id: DoorRemoteNfsd + - id: NfsdTechFabFlatpack + - id: BaseSecurityUplinkRadioSheriff + - id: ClothingNeckNfsdBadgeSheriff diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/messenger.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/messenger.yml index 638fd075d1c..c17e3a82075 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/messenger.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/messenger.yml @@ -8,15 +8,10 @@ parent: [ClothingBackpackMessengerClown, ClothingBackpackClownFilled] id: ClothingBackpackMessengerClownFilled -- type: entity - noSpawn: true - parent: [ClothingBackpackMessengerSecurity, ClothingBackpackSecurityFilled] - id: ClothingBackpackMessengerSecurityFilled - -- type: entity - noSpawn: true - parent: [ClothingBackpackMessengerSecurity, ClothingBackpackFilledDetective] - id: ClothingBackpackMessengerSecurityFilledDetective +#- type: entity +# noSpawn: true +# parent: [ClothingBackpackMessengerSecurity, ClothingBackpackSecurityFilled] +# id: ClothingBackpackMessengerSecurityFilled - type: entity noSpawn: true @@ -53,11 +48,6 @@ parent: [ClothingBackpackMessengerCargo, ClothingBackpackQuartermasterFilled] id: ClothingBackpackMessengerQuartermasterFilled -- type: entity - noSpawn: true - parent: [ClothingBackpackMessengerSecurity, ClothingBackpackHOSFilled] - id: ClothingBackpackMessengerHOSFilled - - type: entity noSpawn: true parent: [ClothingBackpackMessengerEngineering, ClothingBackpackEngineeringFilled] @@ -103,11 +93,6 @@ parent: [ClothingBackpackMessenger, ClothingBackpackLibrarianFilled] id: ClothingBackpackMessengerLibrarianFilled -- type: entity - noSpawn: true - parent: [ClothingBackpackMessenger, ClothingBackpackFilledDetective] - id: ClothingBackpackMessengerDetectiveFilled - - type: entity noSpawn: true parent: [ClothingBackpackMessengerCargo, ClothingBackpackCargoFilled] @@ -119,10 +104,10 @@ id: ClothingBackpackMessengerSalvageFilled # Frontier -- type: entity - noSpawn: true - parent: [ClothingBackpackMessengerBrigmedic, ClothingBackpackBrigmedicFilled] - id: ClothingBackpackMessengerBrigmedicFilled +#- type: entity +# noSpawn: true +# parent: [ClothingBackpackMessengerBrigmedic, ClothingBackpackSecurityFilled] +# id: ClothingBackpackMessengerBrigmedicFilled - type: entity noSpawn: true @@ -163,13 +148,33 @@ noSpawn: true parent: [ClothingBackpackMessengerMailCarrier, ClothingBackpackFilled] id: ClothingBackpackMessengerMailCarrierFilled - -- type: entity - noSpawn: true - parent: [ClothingBackpackMessengerSecurity, ClothingBackpackOfficerFilled] - id: ClothingBackpackMessengerOfficerFilled - type: entity noSpawn: true parent: [ClothingBackpackMessenger, ClothingBackpackSrFilled] id: ClothingBackpackMessengerSrFilled + +- type: entity + noSpawn: true + parent: [ClothingBackpackMessenger, ClothingBackpackNfsdBrownFilled] + id: ClothingBackpackMessengerNfsdBrownFilled + +- type: entity + noSpawn: true + parent: [ClothingBackpackMessenger, ClothingBackpackNfsdCreamFilled] + id: ClothingBackpackMessengerNfsdCreamFilled + +- type: entity + noSpawn: true + parent: [ClothingBackpackMessenger, ClothingBackpackNfsdBrownDetectiveFilled] + id: ClothingBackpackMessengerNfsdBrownDetectiveFilled + +- type: entity + noSpawn: true + parent: [ClothingBackpackMessenger, ClothingBackpackNfsdBrownRadioFilled] + id: ClothingBackpackMessengerNfsdBrownRadioFilled + +- type: entity + noSpawn: true + parent: [ClothingBackpackMessenger, ClothingBackpackNfsdBrownSheriffFilled] + id: ClothingBackpackMessengerNfsdBrownSheriffFilled diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml index ebec25aff2d..980e8da31de 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -60,18 +60,6 @@ - id: BoxSurvival - id: Lighter - id: CigPackGreen - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelnfsd - id: ClothingBackpackSatchelOfficerFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalNFSD - - id: Flash - - id: MagazinePistol - - id: BaseSecurityUplinkRadioOfficer # Frontier - type: entity noSpawn: true @@ -86,3 +74,62 @@ - id: DoorRemoteCommand - id: AccessConfigurator - id: PhoneInstrument + +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelNfsdBrown + id: ClothingBackpackSatchelNfsdBrownFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalNfsd + - id: Flash + - id: MagazinePistol + - id: FrontierUplinkCoin5 + +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelNfsdBrownFilled + id: ClothingBackpackSatchelNfsdCreamFilled + +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelNfsdBrown + id: ClothingBackpackSatchelNfsdBrownDetectiveFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalNfsd + - id: Flash + - id: ForensicPad + - id: MagazinePistol + - id: ForensicScanner + - id: FrontierUplinkCoin5 + +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelNfsdBrown + id: ClothingBackpackSatchelNfsdBrownRadioFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalNfsd + - id: Flash + - id: MagazinePistol + - id: BaseSecurityUplinkRadioOfficer + +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelNfsdBrown + id: ClothingBackpackSatchelNfsdBrownSheriffFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalNfsd + - id: Flash + - id: MagazinePistol + - id: RubberStampSheriff + - id: DoorRemoteNfsd + - id: NfsdTechFabFlatpack + - id: BaseSecurityUplinkRadioSheriff + - id: ClothingNeckNfsdBadgeSheriff \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/emergency.yml new file mode 100644 index 00000000000..a536418880f --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/emergency.yml @@ -0,0 +1,20 @@ +- type: entity + name: survival box + parent: BoxSurvivalSecurity + id: BoxSurvivalNfsd + description: It's a box with basic internals inside. This one is labelled to contain an double extended-capacity tank. + suffix: NFSD + components: + - type: StorageFill + contents: + - id: ClothingMaskGasNfsd + - id: DoubleEmergencyAirTankFilled + - id: SpaceMedipen + - id: EmergencyMedipen + - id: FoodPSB + - id: DrinkWaterBottleFull + - id: EncryptionKeyTraffic + - type: Sprite + layers: + - state: internals + - state: extendedtank diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml index 37faa87eb9a..8b5196b6ae4 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml @@ -113,10 +113,10 @@ - type: entity name: nfsd encryption key box - parent: BoxEncryptionKeyPassenger - id: BoxEncryptionKeyNFSD + parent: BoxEncryptionKeySecurity + id: BoxEncryptionKeyNfsd components: - type: StorageFill contents: - - id: EncryptionKeyNFSD + - id: EncryptionKeyNfsd amount: 4 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsd.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsd.yml index 0d734b80341..b6bc5c351ba 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsd.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsd.yml @@ -1,28 +1,28 @@ - type: entity - id: CrateNFSDArmor - parent: CratenfsdSecure1 + id: CrateNfsdArmor + parent: CrateNfsdSecure1 name: nfsd armor crate description: Three vests of well-rounded, decently-protective armor. Requires Security access to open. components: - type: StorageFill contents: - - id: ClothingOuterArmorNfsdArmor + - id: ClothingOuterArmorNfsd amount: 3 - type: entity - id: CrateNFSDHelmet - parent: CratenfsdSecure1 + id: CrateNfsdHelmet + parent: CrateNfsdSecure1 name: nfsd helmet crate description: Contains three standard-issue brain buckets. Requires Security access to open. components: - type: StorageFill contents: - - id: ClothingHeadHelmetNFSD + - id: ClothingHeadHelmetNfsd amount: 3 - type: entity - id: CrateNFSDNonlethal - parent: CratenfsdSecure1 + id: CrateNfsdNonlethal + parent: CrateNfsdSecure1 name: nfsd nonlethals crate description: Disabler weapons. Requires Security access to open. components: @@ -39,8 +39,8 @@ # - GrenadeTeargas - type: entity - id: CrateNFSDRiot - parent: CratenfsdSecure1 + id: CrateNfsdRiot + parent: CrateNfsdSecure1 name: nfsd swat crate description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open. components: @@ -59,8 +59,8 @@ # - SecGasmask - type: entity - id: CrateNFSDSupplies - parent: CratenfsdSecure1 + id: CrateNfsdSupplies + parent: CrateNfsdSecure1 name: nfsd supplies crate description: Contains various supplies for the station's Security team. Requires Security access to open. components: @@ -73,8 +73,8 @@ # - SpacelawBook - type: entity - id: CrateNFSDRestraints - parent: CratenfsdSecure2 + id: CrateNfsdRestraints + parent: CrateNfsdSecure2 name: nfsd restraints crate description: Contains two boxes each of handcuffs and zipties. Requires Security access to open. components: @@ -86,8 +86,8 @@ amount: 2 - type: entity - id: CrateNFSDBioSuit - parent: CratenfsdSecure2 + id: CrateNfsdBioSuit + parent: CrateNfsdSecure2 name: nfsd bio suit crate description: Contains 2 biohazard suits to ensure that no disease will distract you from your duties. Requires Security access to open. components: @@ -101,10 +101,10 @@ amount: 2 - type: entity - id: CrateNFSDImplants + id: CrateNfsdImplants name: nfsd implanter crate description: Contains 4 MindShield implants and 4 tracking implant. Requires Security access to open. - parent: CratenfsdSecure2 + parent: CrateNfsdSecure2 components: - type: StorageFill contents: diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml index 5ed653ca727..03916e5b3a5 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateArmorySMGNFSD - parent: CratenfsdSecure1 + id: CrateArmorySMGNfsd + parent: CrateNfsdSecure1 name: nfsd SMG crate description: Contains two high-powered, semiautomatic rifles with four mags. Requires Armory access to open. components: @@ -12,8 +12,8 @@ amount: 4 - type: entity - id: CrateArmoryShotgunNFSD - parent: CratenfsdSecure1 + id: CrateArmoryShotgunNfsd + parent: CrateNfsdSecure1 name: nfsd shotgun crate description: For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open. components: @@ -25,8 +25,8 @@ amount: 3 - type: entity - id: CrateTrackingImplantsNFSD - parent: CratenfsdSecure1 + id: CrateTrackingImplantsNfsd + parent: CrateNfsdSecure1 name: nfsd tracking implants description: Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of. components: @@ -36,8 +36,8 @@ amount: 5 - type: entity - parent: CratenfsdSecure2 - id: CrateTrainingBombsNFSD + parent: CrateNfsdSecure2 + id: CrateTrainingBombsNfsd name: nfsd training bombs description: Contains three low-yield training bombs for security to learn defusal and safe ordnance disposal, EOD suit not included. Requires Armory access to open. components: @@ -47,8 +47,8 @@ amount: 3 - type: entity - id: CrateArmoryLaserNFSD - parent: CratenfsdSecure2 + id: CrateArmoryLaserNfsd + parent: CrateNfsdSecure2 name: nfsd lasers crate description: Contains three standard-issue laser rifles. Requires Armory access to open. components: @@ -58,8 +58,8 @@ amount: 3 - type: entity - id: CrateArmoryPistolsNFSD - parent: CratenfsdSecure2 + id: CrateArmoryPistolsNfsd + parent: CrateNfsdSecure2 name: nfsd pistols crate description: Contains two standard NT pistols with four mags. Requires Armory access to open. components: diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml index 69e363a567b..d17e0ddd447 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml @@ -15,9 +15,9 @@ parent: [ClothingShoesBootsMagMercenary, ClothingShoesBootsMercenaryFilled] - type: entity - id: ClothingShoesBootsNFSDBrownFilled - parent: [ClothingShoesBootsNFSDBrown, ClothingShoesBootsCombatFilled] + id: ClothingShoesBootsNfsdBrownFilled + parent: [ClothingShoesBootsNfsdBrown, ClothingShoesBootsCombatFilled] - type: entity - id: ClothingShoesBootsNFSDCreamFilled - parent: [ClothingShoesBootsNFSDCream, ClothingShoesBootsCombatFilled] + id: ClothingShoesBootsNfsdCreamFilled + parent: [ClothingShoesBootsNfsdCream, ClothingShoesBootsCombatFilled] diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml index db55b86c18b..a2f50543550 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml @@ -19,25 +19,6 @@ # access: [["Medical"]] #HARDSUITS -#Brigmedic's hardsuit -- type: entity - id: SuitStorageBrigmedic - parent: SuitStorageBase - suffix: Brigmedic - components: - - type: StorageFill - contents: -# - id: NitrogenTankFilled -# - id: OxygenTankFilled - - id: AirTankFilled - - id: ClothingOuterHardsuitBrigmedic - - id: ClothingMaskBreathMedicalSecurity - - id: JetpackSecurityFilled - - id: HandheldGPSBasic - - id: ClothingShoesBootsMagCombatFilled # Frontier - - type: AccessReader - access: [["Security"]] - #Quartermaster hardsuit - type: entity id: SuitStorageQuartermaster @@ -118,7 +99,7 @@ - type: entity id: SuitStorageCadet parent: SuitStorageBase - suffix: NFSDCadet + suffix: NFSD Cadet components: - type: StorageFill contents: @@ -126,8 +107,8 @@ # - id: OxygenTankFilled - id: AirTankFilled - id: ClothingOuterHardsuitNfsdBronze # Frontier - - id: ClothingMaskBreathMedicalSecurity - - id: JetpackSecurityFilled + - id: ClothingMaskGasNfsd + - id: JetpackNfsdFilled - id: HandheldGPSBasic - id: ClothingShoesBootsMagNfsd # Frontier - type: AccessReader @@ -137,7 +118,7 @@ - type: entity id: SuitStorageDeputy parent: SuitStorageBase - suffix: NFSDDeputy + suffix: NFSD Deputy components: - type: StorageFill contents: @@ -145,8 +126,8 @@ # - id: OxygenTankFilled - id: AirTankFilled - id: ClothingOuterHardsuitNfsdSilver # Frontier - - id: ClothingMaskBreathMedicalSecurity - - id: JetpackSecurityFilled + - id: ClothingMaskGasNfsd + - id: JetpackNfsdFilled - id: HandheldGPSBasic - id: ClothingShoesBootsMagNfsd # Frontier - type: AccessReader @@ -154,18 +135,18 @@ #Brigmed hardsuit - type: entity - id: SuitStorageBrigmed + id: SuitStorageBrigmedic parent: SuitStorageBase - suffix: NFSDBrigMedic + suffix: NFSD Brigmedic components: - type: StorageFill contents: # - id: NitrogenTankFilled # - id: OxygenTankFilled - id: AirTankFilled - - id: ClothingOuterHardsuitNfsdBrigMed # Frontier - - id: ClothingMaskBreathMedicalSecurity - - id: JetpackSecurityFilled + - id: ClothingOuterHardsuitNfsdBrigmedic # Frontier + - id: ClothingMaskGasNfsd + - id: JetpackNfsdFilled - id: HandheldGPSBasic - id: ClothingShoesBootsMagNfsd # Frontier - type: AccessReader @@ -175,7 +156,7 @@ - type: entity id: SuitStorageSergeant parent: SuitStorageBase - suffix: NFSDSergeant + suffix: NFSD Sergeant components: - type: StorageFill contents: @@ -183,8 +164,8 @@ # - id: OxygenTankFilled - id: AirTankFilled - id: ClothingOuterHardsuitNfsdGold # Frontier - - id: ClothingMaskBreathMedicalSecurity - - id: JetpackSecurityFilled + - id: ClothingMaskGasNfsd + - id: JetpackNfsdFilled - id: HandheldGPSBasic - id: ClothingShoesBootsMagNfsd # Frontier - type: AccessReader @@ -194,7 +175,7 @@ - type: entity id: SuitStorageBailiff parent: SuitStorageBase - suffix: NFSDBailiff + suffix: NFSD Bailiff components: - type: StorageFill contents: @@ -202,8 +183,8 @@ # - id: OxygenTankFilled - id: AirTankFilled - id: ClothingOuterHardsuitNfsdGold # Frontier - - id: ClothingMaskBreathMedicalSecurity - - id: JetpackSecurityFilled + - id: ClothingMaskGasNfsd + - id: JetpackNfsdFilled - id: HandheldGPSBasic - id: ClothingShoesBootsMagNfsd # Frontier - type: AccessReader @@ -213,7 +194,7 @@ - type: entity id: SuitStorageSheriff parent: SuitStorageBase - suffix: NFSDSheriff + suffix: NFSD Sheriff components: - type: StorageFill contents: @@ -221,8 +202,46 @@ # - id: OxygenTankFilled - id: AirTankFilled - id: ClothingOuterHardsuitNfsdSheriff # Frontier - - id: ClothingMaskBreathMedicalSecurity - - id: JetpackSecurityFilled + - id: ClothingMaskGasSheriff + - id: JetpackNfsdFilled + - id: HandheldGPSBasic + - id: ClothingShoesBootsMagNfsd # Frontier + - type: AccessReader + access: [["Security"]] + +#Combat hardsuit +- type: entity + id: SuitStorageNfsdCombat + parent: SuitStorageBase + suffix: NFSD Combat + components: + - type: StorageFill + contents: +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled + - id: ClothingOuterHardsuitNfsdCombat # Frontier + - id: ClothingMaskGasNfsd + - id: JetpackNfsdFilled + - id: HandheldGPSBasic + - id: ClothingShoesBootsMagNfsd # Frontier + - type: AccessReader + access: [["Security"]] + +#Command hardsuit +- type: entity + id: SuitStorageNfsdCommand + parent: SuitStorageBase + suffix: NFSD Command + components: + - type: StorageFill + contents: +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled + - id: ClothingOuterHardsuitNfsdCommand # Frontier + - id: ClothingMaskGasNfsd + - id: JetpackNfsdFilled - id: HandheldGPSBasic - id: ClothingShoesBootsMagNfsd # Frontier - type: AccessReader diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml index 0f04798afbe..66f836e5061 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml @@ -5,11 +5,6 @@ parent: [SuitStorageWallmount, SuitStorageParamedic] #HARDSUITS -#Brigmedic's hardsuit -- type: entity - id: SuitStorageWallmountBrigmedic - parent: [SuitStorageWallmount, SuitStorageBrigmedic] - #Quartermaster hardsuit - type: entity id: SuitStorageWallmountQuartermaster @@ -149,8 +144,8 @@ #NFSDBrigmed - type: entity - id: SuitStorageWallmountBrigmed - parent: [SuitStorageWallmount, SuitStorageBrigmed] + id: SuitStorageWallmountBrigmedic + parent: [SuitStorageWallmount, SuitStorageBrigmedic] #NFSDSergeant - type: entity @@ -165,4 +160,14 @@ #NFSDSheriff - type: entity id: SuitStorageWallmountSheriff - parent: [SuitStorageWallmount, SuitStorageSheriff] \ No newline at end of file + parent: [SuitStorageWallmount, SuitStorageSheriff] + +#NFSDCombat +- type: entity + id: SuitStorageWallmountNfsdCombat + parent: [SuitStorageWallmount, SuitStorageNfsdCombat] + +#NFSDCommand +- type: entity + id: SuitStorageWallmountNfsdCommand + parent: [SuitStorageWallmount, SuitStorageNfsdCommand] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/nfsddrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/nfsddrobe.yml index b69f8adbe15..4ee56eb0e66 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/nfsddrobe.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/nfsddrobe.yml @@ -1,10 +1,8 @@ - type: advertisementsPack - id: NFSDDrobeAds + id: NfsdDrobeAds advertisements: - advertisement-nfsddrobe-1 - advertisement-nfsddrobe-2 - advertisement-nfsddrobe-3 - advertisement-nfsddrobe-4 - advertisement-nfsddrobe-5 - thankyous: - - vending-machine-thanks diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml new file mode 100644 index 00000000000..0b66fec837f --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml @@ -0,0 +1,22 @@ +- type: vendingMachineInventory + id: PTechNfsdInventory + startingInventory: + CadetPDA: 3 + DeputyPDA: 3 + BrigmedicNFPDA: 3 + DetectiveNFPDA: 3 + SergeantPDA: 3 + BailiffPDA: 3 + ClothingOuterCoatNfsdFormal: 4 + ClothingOuterCoatNfsdFormalSheriff: 4 + ClothingOuterCoatNfsdLongCoat: 3 + ClothingNeckCloakSheriff: 3 + ClothingNeckMantleSheriff: 3 + ClothingNeckNfsdBadgeSecurityCadet: 3 + ClothingNeckNfsdBadgeSecurityBrigmedic: 3 + ClothingNeckNfsdBadgeDetective: 3 + ClothingNeckNfsdBadgeSeniorOfficer: 3 + ClothingNeckNfsdBadgeWarden: 3 + ClothingNeckNfsdBadgeSheriff: 10 + ClothingMaskGasSheriff: 2 + EncryptionKeyNfsd: 10 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml index 99bf414c2b3..b710236b0d0 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml @@ -1,16 +1,20 @@ - type: vendingMachineInventory - id: NFSDDrobeInventory + id: NfsdDrobeInventory startingInventory: - ClothingBackpacknfsd: 6 - ClothingBackpackSatchelnfsd: 6 - ClothingBackpackDuffelnfsd: 6 - ClothingBackpackMessengerSecurity: 6 # Frontier + ClothingBackpackNfsdBrown: 6 + ClothingBackpackSatchelNfsdBrown: 6 + ClothingBackpackDuffelNfsdBrown: 6 + ClothingBackpackMessengerNfsdBrown: 6 + ClothingBackpackNfsdCream: 2 + ClothingBackpackSatchelNfsdCream: 2 + ClothingBackpackDuffelNfsdCream: 2 + ClothingBackpackMessengerNfsdCream: 2 ClothingHeadHatNfsdBeretGreen: 6 ClothingHeadHatNfsdBeretBrown: 6 ClothingHeadHatNfsdBeretCream: 6 ClothingHeadHatNfsdCampaign: 6 ClothingHandsGlovesCombatNfsdBrown: 6 - ClothingHandsGlovesCombatNfsdCream: 6 + ClothingHandsGlovesCombatNfsdCream: 6 ClothingUniformJumpskirtNfsd: 6 ClothingUniformJumpskirtNfsdShort: 6 ClothingUniformJumpsuitNfsd: 6 @@ -19,19 +23,19 @@ ClothingUniformJumpsuitNfsdTacGray: 6 ClothingUniformJumpsuitNfsdTacCamo: 6 ClothingUniformJumpsuitNfsdTacCream: 6 - ClothingHeadsetNFSDgreenSafe: 6 # Frontier - Ask SR or Sheriff for keys - ClothingHeadsetNFSDbrownSafe: 6 # Frontier - Ask SR or Sheriff for keys - ClothingHeadsetNFSDcbSafe: 6 # Frontier - Ask SR or Sheriff for keys - ClothingHeadHelmetNFSD: 6 # Frontier - ClothingOuterArmorNfsdArmor: 6 + ClothingHeadsetNfsdGreenSafe: 6 # Frontier - Ask SR or Sheriff for keys + ClothingHeadsetNfsdBrownSafe: 6 # Frontier - Ask SR or Sheriff for keys + ClothingHeadsetNfsdCreamSafe: 6 # Frontier - Ask SR or Sheriff for keys + ClothingHeadHelmetNfsd: 6 # Frontier + ClothingOuterArmorNfsd: 6 ClothingOuterCoatNfsdBomber: 6 ClothingOuterCoatNfsdLongCoat: 6 ClothingOuterCoatNfsdFormal: 6 - ClothingMaskGasNFSD: 8 - nfsdWhistle: 3 + ClothingMaskGasNfsd: 8 + NfsdWhistle: 3 ClothingEyesBlindfold: 3 - ClothingShoesBootsNFSDBrown: 6 - ClothingShoesBootsNFSDCream: 6 + ClothingShoesBootsNfsdBrown: 6 + ClothingShoesBootsNfsdCream: 6 ClothingShoesBootsMagNfsd: 3 contrabandInventory: ClothingUniformJumpskirtOfLife: 3 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml index f0906ed72f8..69c03e03803 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml @@ -1,19 +1,19 @@ - type: vendingMachineInventory - id: NFSDTecInventory + id: NfsdTechInventory startingInventory: Handcuffs: 10 Zipties: 10 GrenadeFlashBang: 10 - SecurityWhistle: 5 + NfsdWhistle: 5 TearGasGrenade: 4 ClusterBangFull: 2 GrenadeStinger: 4 Flash: 10 - FlashlightNFSDLite: 10 - HoloprojectorNFSD: 4 + FlashlightNfsdLite: 10 + HoloprojectorNfsd: 4 Tourniquet: 5 ClothingEyesGlassesSunglasses: 5 - ClothingEyesGlassesNFSD: 5 # Frontier + ClothingEyesGlassesNfsd: 5 # Frontier ClothingEyesHudNfsd: 10 ClothingEyesHudNfsdPatch: 5 ClothingBeltNfsdWebbing: 10 @@ -30,7 +30,7 @@ TrackingImplanter: 5 # Frontier # MindShieldImplanter: 5 # Frontier # security officers need to follow a diet regimen! - contrabandInventory: - FoodDonutHomer: 3 # Frontier - No more then 3 - FoodBoxDonut: 3 # Frontier - No more then 3 +# contrabandInventory: +# FoodDonutHomer: 3 # Frontier - No more then 3 +# FoodBoxDonut: 3 # Frontier - No more then 3 #box evidence diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml index 8f04e43cb69..9cf89cb5863 100644 --- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml @@ -50,7 +50,7 @@ id: UplinkSecurityHardsuitBrigmedic name: uplink-security-hardsuit-brigmedic-name description: uplink-security-hardsuit-brigmedic-desc - productEntity: ClothingOuterHardsuitNfsdBrigMed + productEntity: ClothingOuterHardsuitNfsdBrigmedic icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi, state: icon } cost: FrontierUplinkCoin: 2 @@ -405,7 +405,7 @@ id: UplinkSecurityHolo name: uplink-security-holo-name description: uplink-security-holo-desc - productEntity: HoloprojectorSecurity + productEntity: HoloprojectorNfsd icon: { sprite: Objects/Devices/Holoprojectors/security.rsi, state: icon } cost: FrontierUplinkCoin: 1 @@ -421,7 +421,7 @@ id: UplinkSecurityJetpack name: uplink-security-jetpack-name description: uplink-security-jetpack-desc - productEntity: JetpackNFSDFilled + productEntity: JetpackNfsdFilled icon: { sprite: _NF/Objects/Tanks/Jetpacks/nfsd.rsi, state: icon } cost: FrontierUplinkCoin: 1 @@ -453,7 +453,7 @@ id: UplinkSecurityTechfab name: uplink-security-techfab-name description: uplink-security-techfab-desc - productEntity: SecurityTechFabCircuitboard + productEntity: NfsdTechFabCircuitboard icon: { sprite: Objects/Misc/module.rsi, state: security } cost: FrontierUplinkCoin: 5 @@ -472,7 +472,7 @@ id: UplinkSecurityKey name: uplink-security-key-name description: uplink-security-key-desc - productEntity: BoxEncryptionKeyNFSD + productEntity: BoxEncryptionKeyNfsd icon: { sprite: Objects/Storage/boxes.rsi, state: box } cost: FrontierUplinkCoin: 1 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml index b970eca09b8..148a88ecc37 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml @@ -38,52 +38,16 @@ collection: CatMeows - type: entity - parent: ClothingBackpackSecurityFilled - id: ClothingBackpacknfsdFilled - noSpawn: true + parent: ClothingBackpackSecurity + id: ClothingBackpackNfsdBrown name: nfsd backpack - description: A backpack for Deputy Sheriff. - suffix: Filled components: - type: Sprite - sprite: _NF/Clothing/Back/Backpacks/nfsd_backpack.rsi + sprite: _NF/Clothing/Back/Backpacks/nfsd_brown.rsi - type: entity - parent: ClothingBackpack - id: ClothingBackpacknfsd - name: nfsd backpack - description: A backpack for a Deputy Sheriff. - components: - - type: Sprite - sprite: _NF/Clothing/Back/Backpacks/nfsd_backpack.rsi - -- type: entity - parent: ClothingBackpackHOSFilled - id: ClothingBackpacknfsdsheriffFilled - noSpawn: true - name: nfsd backpack - description: A backpack for the Sheriff. - suffix: Filled - Sheriff - components: - - type: Sprite - sprite: _NF/Clothing/Back/Backpacks/nfsd_backpack.rsi - -- type: entity - parent: ClothingBackpackBrigmedicFilled - id: ClothingBackpacknfsdBrigmedFilled - noSpawn: true - name: nfsd brigmedic backpack - description: A backpack for Deputized Physician. - suffix: Filled - components: - - type: Sprite - sprite: _NF/Clothing/Back/Backpacks/nfsd_brigmed_backpack.rsi - -- type: entity - parent: ClothingBackpack - id: ClothingBackpacknfsdBrigmed - name: nfsd brigmedic backpack - description: A backpack for Deputized Physician. + parent: ClothingBackpackNfsdBrown + id: ClothingBackpackNfsdCream components: - type: Sprite - sprite: _NF/Clothing/Back/Backpacks/nfsd_brigmed_backpack.rsi + sprite: _NF/Clothing/Back/Backpacks/nfsd_cream.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml index 9d9ac527638..c0be1f1c192 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml @@ -26,52 +26,16 @@ sprite: _NF/Clothing/Back/Duffels/pilot.rsi - type: entity - parent: ClothingBackpackDuffelSecurityFilled - id: ClothingBackpackDuffelnfsdFilled - noSpawn: true + parent: ClothingBackpackDuffelSecurity + id: ClothingBackpackDuffelNfsdBrown name: nfsd duffel - description: A duffelbag produced for a Deputy Sheriff. - suffix: Filled components: - type: Sprite - sprite: _NF/Clothing/Back/Duffels/nfsd_duffle.rsi + sprite: _NF/Clothing/Back/Duffels/nfsd_brown.rsi - type: entity - parent: ClothingBackpackDuffel - id: ClothingBackpackDuffelnfsd - name: nfsd duffel - description: A duffelbag produced for a Deputy Sheriff. - components: - - type: Sprite - sprite: _NF/Clothing/Back/Duffels/nfsd_duffle.rsi - -- type: entity - parent: ClothingBackpackHOSFilled - id: ClothingBackpackDuffelnfsdsheriffFilled - noSpawn: true - name: nfsd duffel - description: A duffelbag produced for a Deputy Sheriff. - suffix: Filled - Sheriff - components: - - type: Sprite - sprite: _NF/Clothing/Back/Duffels/nfsd_duffle.rsi - -- type: entity - parent: ClothingBackpackDuffel - id: ClothingBackpackDuffelnfsdBrigmed - name: nfsd brigmedic duffel - description: A duffelbag produced for a Deputized Physician. - components: - - type: Sprite - sprite: _NF/Clothing/Back/Duffels/nfsd_brigmed_duffle.rsi - -- type: entity - parent: ClothingBackpackDuffelBrigmedicFilled - id: ClothingBackpackDuffelnfsdBrigmedFilled - noSpawn: true - name: nfsd brigmedic duffel - description: A duffelbag produced for a Deputized Physician. - suffix: Filled + parent: ClothingBackpackDuffelNfsdBrown + id: ClothingBackpackDuffelNfsdCream components: - type: Sprite - sprite: _NF/Clothing/Back/Duffels/nfsd_brigmed_duffle.rsi \ No newline at end of file + sprite: _NF/Clothing/Back/Duffels/nfsd_cream.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml index cc23e11194f..dbc9663b13d 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml @@ -82,24 +82,6 @@ - type: Sprite sprite: _NF/Clothing/Back/Messenger/science.rsi -- type: entity - parent: ClothingBackpackMessenger - id: ClothingBackpackMessengerSecurity - name: security messenger bag - description: A robust messenger bag for security related needs. - components: - - type: Sprite - sprite: _NF/Clothing/Back/Messenger/security.rsi - -- type: entity - parent: ClothingBackpackMessenger - id: ClothingBackpackMessengerBrigmedic - name: brigmedic messenger bag - description: A sterile messenger bag for medical related needs. - components: - - type: Sprite - sprite: _NF/Clothing/Back/Messenger/brigmedic.rsi - - type: entity parent: ClothingBackpackMessenger id: ClothingBackpackMessengerCaptain @@ -205,3 +187,18 @@ components: - type: Sprite sprite: _NF/Clothing/Back/Messenger/mime.rsi + +- type: entity + parent: ClothingBackpackMessenger + id: ClothingBackpackMessengerNfsdBrown + name: nfsd messenger bag + components: + - type: Sprite + sprite: _NF/Clothing/Back/Messenger/nfsd_brown.rsi + +- type: entity + parent: ClothingBackpackMessenger + id: ClothingBackpackMessengerNfsdCream + components: + - type: Sprite + sprite: _NF/Clothing/Back/Messenger/nfsd_cream.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml index adce3003e52..8579b75a5e4 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml @@ -26,52 +26,16 @@ sprite: _NF/Clothing/Back/Satchels/pilot.rsi - type: entity - parent: ClothingBackpackSatchelSecurityFilled - id: ClothingBackpackSatchelnfsdFilled - noSpawn: true + parent: ClothingBackpackSatchelSecurity + id: ClothingBackpackSatchelNfsdBrown name: nfsd satchel - description: A satchel produced for a Deputy Sheriff. - suffix: Filled components: - type: Sprite - sprite: _NF/Clothing/Back/Satchels/nfsd_satchel.rsi + sprite: _NF/Clothing/Back/Satchels/nfsd_brown.rsi - type: entity - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelnfsd - name: nfsd satchel - description: A satchel produced for a Deputy Sheriff. - components: - - type: Sprite - sprite: _NF/Clothing/Back/Satchels/nfsd_satchel.rsi - -- type: entity - parent: ClothingBackpackSatchelHOSFilled - id: ClothingBackpackSatchelnfsdsheriffFilled - noSpawn: true - name: nfsd satchel - description: A satchel produced for the Sheriff. - suffix: Filled - Sheriff - components: - - type: Sprite - sprite: _NF/Clothing/Back/Satchels/nfsd_satchel.rsi - -- type: entity - parent: ClothingBackpackSatchelBrigmedicFilled - id: ClothingBackpackSatchelnfsdBrigmedFilled - noSpawn: true - name: nfsd brigmedic satchel - description: A satchel produced for a Deputized Physician. - suffix: Filled - components: - - type: Sprite - sprite: _NF/Clothing/Back/Satchels/nfsd_brigmed_satchel.rsi - -- type: entity - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelnfsdBrigmed - name: nfsd brigmedic satchel - description: A satchel produced for a Deputized Physician. + parent: ClothingBackpackSatchelNfsdBrown + id: ClothingBackpackSatchelNfsdCream components: - type: Sprite - sprite: _NF/Clothing/Back/Satchels/nfsd_brigmed_satchel.rsi \ No newline at end of file + sprite: _NF/Clothing/Back/Satchels/nfsd_cream.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml index 97cba4b9b38..be124ee5dd7 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml @@ -8,9 +8,14 @@ key_slots: - EncryptionKeyCommon +- type: entity + parent: ClothingHeadsetSecuritySafe + id: ClothingHeadsetNfsdSafe # Ask SR or Sheriff for keys + abstract: true + - type: entity parent: ClothingHeadset - id: ClothingHeadsetNFSD + id: ClothingHeadsetNfsd name: nfsd headset description: This is used by your elite sheriff's department force. abstract: true @@ -18,18 +23,12 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyNFSD + - EncryptionKeyNfsd - EncryptionKeyCommon - - type: Sprite - sprite: _NF/Clothing/Ears/Headsets/nfsd_e_green.rsi - - type: Clothing - sprite: _NF/Clothing/Ears/Headsets/nfsd_e_green.rsi - type: entity - parent: ClothingHeadsetNFSD - id: ClothingHeadsetNFSDgreen # Ask SR or Sheriff for keys - name: nfsd headset - description: A headset for deputy sheriff's. + parent: ClothingHeadsetNfsd + id: ClothingHeadsetNfsdGreen # Ask SR or Sheriff for keys components: - type: Sprite sprite: _NF/Clothing/Ears/Headsets/nfsd_e_green.rsi @@ -37,10 +36,8 @@ sprite: _NF/Clothing/Ears/Headsets/nfsd_e_green.rsi - type: entity - parent: ClothingHeadsetNFSD - id: ClothingHeadsetNFSDbrown # Ask SR or Sheriff for keys - name: nfsd headset - description: A headset for deputy sheriff's. + parent: ClothingHeadsetNfsd + id: ClothingHeadsetNfsdBrown # Ask SR or Sheriff for keys components: - type: Sprite sprite: _NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi @@ -48,21 +45,17 @@ sprite: _NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi - type: entity - parent: ClothingHeadsetNFSD - id: ClothingHeadsetNFSDcb # Ask SR or Sheriff for keys - name: nfsd headset - description: A headset for deputy sheriff's. + parent: ClothingHeadsetNfsd + id: ClothingHeadsetNfsdCream # Ask SR or Sheriff for keys components: - type: Sprite sprite: _NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi - type: Clothing sprite: _NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi - + - type: entity - parent: ClothingHeadsetSecuritySafe - id: ClothingHeadsetNFSDgreenSafe # Ask SR or Sheriff for keys - name: nfsd headset - description: A headset for deputy sheriff's. + parent: ClothingHeadsetNfsdSafe + id: ClothingHeadsetNfsdGreenSafe # Ask SR or Sheriff for keys components: - type: Sprite sprite: _NF/Clothing/Ears/Headsets/nfsd_e_green.rsi @@ -70,10 +63,8 @@ sprite: _NF/Clothing/Ears/Headsets/nfsd_e_green.rsi - type: entity - parent: ClothingHeadsetSecuritySafe - id: ClothingHeadsetNFSDbrownSafe # Ask SR or Sheriff for keys - name: nfsd headset - description: A headset for deputy sheriff's. + parent: ClothingHeadsetNfsdSafe + id: ClothingHeadsetNfsdBrownSafe # Ask SR or Sheriff for keys components: - type: Sprite sprite: _NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi @@ -81,12 +72,21 @@ sprite: _NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi - type: entity - parent: ClothingHeadsetSecuritySafe - id: ClothingHeadsetNFSDcbSafe # Ask SR or Sheriff for keys - name: nfsd headset - description: A headset for deputy sheriff's. + parent: ClothingHeadsetNfsdSafe + id: ClothingHeadsetNfsdCreamSafe # Ask SR or Sheriff for keys components: - type: Sprite sprite: _NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi - type: Clothing - sprite: _NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi \ No newline at end of file + sprite: _NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi + +- type: entity + parent: ClothingHeadsetNfsdCream + id: ClothingHeadsetNfsdCreamMed # Ask SR or Sheriff for keys + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyNfsd + - EncryptionKeyCommon + - EncryptionKeyMedical diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml index 381358d54e8..f9e04210314 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml @@ -8,7 +8,7 @@ key_slots: # - EncryptionKeySecurity - EncryptionKeyCommand - - EncryptionKeyNFSD + - EncryptionKeyNfsd - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/security.rsi @@ -47,7 +47,7 @@ - type: entity parent: ClothingHeadsetAltSecurityWarden - id: ClothingHeadsetAltNFSDgreen + id: ClothingHeadsetAltNfsdgreen name: nfsd over-ear headset components: - type: Sprite @@ -57,7 +57,7 @@ - type: entity parent: ClothingHeadsetAltSecurityWarden - id: ClothingHeadsetAltNFSDbrown + id: ClothingHeadsetAltNfsdbrown name: nfsd over-ear headset components: - type: Sprite @@ -67,7 +67,7 @@ - type: entity parent: ClothingHeadsetAltSecurity - id: ClothingHeadsetAltNFSDCreamandBrown + id: ClothingHeadsetAltNfsdCreamandBrown name: sheriff's over-ear headset components: - type: Sprite diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml index f45cb6c7c60..ff0f55ee59f 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml @@ -28,7 +28,7 @@ - type: entity parent: ClothingEyesGlassesSecurity - id: ClothingEyesGlassesNFSD + id: ClothingEyesGlassesNfsd name: nfsd glasses description: Upgraded sunglasses that provide flash immunity and a security HUD. components: diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml index b8e3ebbaa8f..2271293b6c1 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml @@ -23,7 +23,7 @@ - type: entity parent: ClothingEyesBase - id: ClothingEyesHudNFSDMed + id: ClothingEyesHudNfsdMed name: brigmedic hud description: An eye display that looks like a mixture of medical and nfsd huds. components: diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/base_clothinghead.yml new file mode 100644 index 00000000000..3c4385bad72 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/base_clothinghead.yml @@ -0,0 +1,14 @@ +- type: entity + abstract: true + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHardsuitWithLightBaseNF + +- type: entity + abstract: true + parent: ClothingHeadHardsuitWithLightBaseNF + id: ClothingHeadHardsuitWithLightBaseNfsd + components: + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: BreathMask \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml index 4d72617e0ac..6b597f864ea 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml @@ -3,31 +3,6 @@ #For now, since locational damage is not a thing, all "combat" hardsuits (with the exception of the deathsquad hardsuit) have the equvilent of a helmet in terms of armor. This is so people don't need to wear both regular, on-station helmets and hardsuits to get full protection. #Generally, unless you're adding something like caustic damage, you should probably avoid messing with armor outside of the above scenario. -#Security Patrol Hardsuit -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ClothingHeadHelmetHardsuitSecuritypatrol - noSpawn: true - name: security patrol hardsuit helmet - description: Lightly armored hardsuit helmet for security beat-cop needs. - components: - - type: Sprite - sprite: Clothing/Head/Hardsuits/security-patrol.rsi - - type: Clothing - sprite: Clothing/Head/Hardsuits/security-patrol.rsi - - type: PointLight - color: "#ffeead" - - type: PressureProtection - highPressureMultiplier: 0.525 - lowPressureMultiplier: 10000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 - #Mercenary Hardsuit - type: entity parent: ClothingHeadHardsuitWithLightBase @@ -102,91 +77,72 @@ radius: 7 energy: 3 -# Funny meme jokes ha-ha so funny: off-brand blood-red hardsuit helmet +#Security Patrol Hardsuit - type: entity - parent: ClothingHeadHelmetHardsuitSyndie - id: ClothingHeadHelmetHardsuitSundie + parent: ClothingHeadHardsuitWithLightBaseNfsd + id: ClothingHeadHelmetHardsuitNfsdBronze noSpawn: true - name: sundicate crimson-red hardsuit helmet - description: A heavily armored helmet designed for work in special operations. Manufactored in Twinwine Colony by Goreblox Looters LLC. + name: nfsd patrol hardsuit helmet + description: Lightly armored hardsuit helmet for beat-cop needs. components: - type: Sprite - sprite: Clothing/Head/Hardsuits/syndicate.rsi - color: orange + sprite: _NF/Clothing/Head/Hardsuits/nfsd.rsi - type: Clothing - sprite: Clothing/Head/Hardsuits/syndicate.rsi + sprite: _NF/Clothing/Head/Hardsuits/nfsd.rsi - type: PointLight - color: darkgreen + color: "#ffeead" - type: Armor modifiers: coefficients: - Blunt: 0.95 - Slash: 0.95 - Piercing: 1.05 - Heat: 1.1 - -- type: entity - parent: ClothingHeadHelmetHardsuitSecuritypatrol - id: ClothingHeadHelmetHardsuitNfsdBronze - noSpawn: true - name: nfsd patrol hardsuit helmet - description: Lightly armored hardsuit helmet for beat-cop needs. - components: - - type: Sprite - sprite: _NF/Clothing/Head/Hardsuits/nfsd_helm.rsi - - type: Clothing - sprite: _NF/Clothing/Head/Hardsuits/nfsd_helm.rsi + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 - type: entity - parent: ClothingHeadHelmetHardsuitSecurity + parent: ClothingHeadHelmetHardsuitNfsdBronze id: ClothingHeadHelmetHardsuitNfsdSilver noSpawn: true - name: nfsd patrol hardsuit helmet - description: Lightly armored hardsuit helmet for beat-cop needs. components: - type: Sprite - sprite: _NF/Clothing/Head/Hardsuits/nfsd_helm.rsi + sprite: _NF/Clothing/Head/Hardsuits/nfsd.rsi - type: Clothing - sprite: _NF/Clothing/Head/Hardsuits/nfsd_helm.rsi + sprite: _NF/Clothing/Head/Hardsuits/nfsd.rsi - type: entity - parent: ClothingHeadHelmetHardsuitWarden + parent: ClothingHeadHelmetHardsuitNfsdBronze id: ClothingHeadHelmetHardsuitNfsdGold noSpawn: true name: nfsd patrol hardsuit helmet description: Lightly armored hardsuit helmet for beat-cop needs. components: - type: Sprite - sprite: _NF/Clothing/Head/Hardsuits/nfsd_helm.rsi + sprite: _NF/Clothing/Head/Hardsuits/nfsd.rsi - type: Clothing - sprite: _NF/Clothing/Head/Hardsuits/nfsd_helm.rsi + sprite: _NF/Clothing/Head/Hardsuits/nfsd.rsi - type: entity - parent: ClothingHeadHelmetHardsuitBrigmedic - id: ClothingHeadHelmetHardsuitNfsdBrigmed + parent: ClothingHeadHelmetHardsuitNfsdBronze + id: ClothingHeadHelmetHardsuitNfsdBrigmedic noSpawn: true - name: nfsd patrol hardsuit helmet - description: Lightly armored hardsuit helmet for beat-cop needs. components: - type: Sprite - sprite: _NF/Clothing/Head/Hardsuits/nfsd_helm.rsi + sprite: _NF/Clothing/Head/Hardsuits/nfsd.rsi - type: Clothing - sprite: _NF/Clothing/Head/Hardsuits/nfsd_helm.rsi + sprite: _NF/Clothing/Head/Hardsuits/nfsd.rsi - type: entity - parent: ClothingHeadHelmetHardsuitSecurityRed + parent: ClothingHeadHelmetHardsuitNfsdBronze id: ClothingHeadHelmetHardsuitNfsdSheriff noSpawn: true - name: nfsd sheriff hardsuit helmet - description: Lightly armored hardsuit helmet for beat-cop-cop needs. components: - type: Sprite - sprite: _NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi + sprite: _NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi - type: Clothing - sprite: _NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi + sprite: _NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi - type: entity - parent: ClothingHeadHelmetHardsuitSyndieReverseEngineered + parent: ClothingHeadHardsuitWithLightBaseNfsd id: ClothingHeadHelmetHardsuitNfsdExperimental noSpawn: true name: experimental nfsd hardsuit helmet @@ -196,3 +152,63 @@ sprite: _NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi - type: Clothing sprite: _NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + +#Security Combat Hardsuit +- type: entity + parent: ClothingHeadHardsuitWithLightBaseNfsd + id: ClothingHeadHelmetHardsuitNfsdCombat + noSpawn: true + name: nfsd combat hardsuit helmet + description: Medium armored hardsuit helmet for NFSD raids. + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hardsuits/nfsd_combat.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hardsuits/nfsd_combat.rsi + - type: PointLight + color: "#79bb66" + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + +#Security Command Hardsuit +- type: entity + parent: ClothingHeadHardsuitWithLightBaseNfsd + id: ClothingHeadHelmetHardsuitNfsdCommand + noSpawn: true + name: nfsd command hardsuit helmet + description: Medium armored hardsuit helmet for NFSD raids. + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hardsuits/nfsd_command.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hardsuits/nfsd_command.rsi + - type: PointLight + color: "#ffed7f" + - type: PressureProtection + highPressureMultiplier: 0.45 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml index 43a9f2f2b5d..be27d3f4cf6 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml @@ -50,7 +50,7 @@ - type: entity parent: ClothingHeadHelmetBasic - id: ClothingHeadHelmetNFSD + id: ClothingHeadHelmetNfsd name: nfsd helmet description: an nfsd issued helmet to protect your head components: diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml index 2beb3fbdcdf..93bd1b35324 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingMaskBase + parent: ClothingMaskGasExplorer id: ClothingMaskArcadia name: arcadia battle mask description: A close-fitting high tech mask designed by Arcadia Industries for space faring battlers. @@ -8,15 +8,6 @@ sprite: _NF/Clothing/Masks/arcadia.rsi - type: Clothing sprite: _NF/Clothing/Masks/arcadia.rsi - - type: BreathMask - - type: IdentityBlocker - - type: Armor - modifiers: - coefficients: - Blunt: 0.80 - Slash: 0.80 - Piercing: 0.90 - Heat: 0.90 - type: entity parent: ClothingMaskBase @@ -47,41 +38,23 @@ - type: BreathMask - type: entity - parent: ClothingMaskGas - id: ClothingMaskGasNFSD + parent: ClothingMaskGasSecurity + id: ClothingMaskGasNfsd name: nfsd gas mask description: A standard issue nfsd gas mask. components: - - type: Item - size: Tiny - type: Sprite sprite: _NF/Clothing/Masks/nfsd.rsi - type: Clothing sprite: _NF/Clothing/Masks/nfsd.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.95 - Slash: 0.95 - Piercing: 0.95 - Heat: 0.95 - type: entity - parent: ClothingMaskGas + parent: ClothingMaskGasSecurity id: ClothingMaskGasSheriff name: nfsd sheriff gas mask description: A gas mask worthy of a sheriff. components: - - type: Item - size: Tiny - type: Sprite sprite: _NF/Clothing/Masks/nfsd_sheriff.rsi - type: Clothing sprite: _NF/Clothing/Masks/nfsd_sheriff.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.95 - Slash: 0.95 - Piercing: 0.95 - Heat: 0.95 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml index 37127bc7627..d5e59251a5f 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml @@ -53,7 +53,7 @@ - type: entity parent: ClothingNeckNfsdBadge - id: ClothingNeckNfsdBadgeSecurityBrigmed + id: ClothingNeckNfsdBadgeSecurityBrigmedic suffix: Silver - Brigmedic components: - type: Sprite @@ -93,7 +93,7 @@ - type: entity parent: ClothingNeckNfsdBadge - id: ClothingNeckNfsdBadgeHoS + id: ClothingNeckNfsdBadgeSheriff suffix: Star - Sheriff components: - type: Sprite diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor.yml index 0f3217e9657..53bc79357da 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor.yml @@ -51,7 +51,7 @@ - type: entity parent: ClothingOuterBaseLarge - id: ClothingOuterArmorNfsdArmor + id: ClothingOuterArmorNfsd name: nfsd armor description: get shot, maybe survive? components: @@ -62,11 +62,11 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.5 - Heat: 0.6 - Caustic: 0.6 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.65 + Heat: 0.7 + Caustic: 0.65 - type: ClothingSpeedModifier walkModifier: 1.0 sprintModifier: 1.0 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/base_clothingouter.yml new file mode 100644 index 00000000000..22152222789 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -0,0 +1,14 @@ +- type: entity + abstract: true + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitBaseNF + +- type: entity + abstract: true + parent: ClothingOuterHardsuitBaseNF + id: ClothingOuterHardsuitBaseNFNfsd + components: + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: HeldSpeedModifier \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml index c62f44654b9..31606c29b4c 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml @@ -1,38 +1,6 @@ -#Security Patrol Hardsuit -- type: entity - parent: ClothingOuterHardsuitBase - id: ClothingOuterHardsuitSecuritypatrol - name: security patrol hardsuit - description: A special suit that protects from the danger of space, employed by security patrol officers. Not certified to be blunderbuss proof. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi - - type: PressureProtection - highPressureMultiplier: 0.525 - lowPressureMultiplier: 10000 - - type: ExplosionResistance - damageCoefficient: 0.5 - - type: Armor - modifiers: - coefficients: - Blunt: 0.65 - Slash: 0.65 - Piercing: 0.65 - Heat: 0.7 - Radiation: 0.55 - Caustic: 0.75 - - type: ClothingSpeedModifier - walkModifier: 0.9 - sprintModifier: 0.8 - - type: HeldSpeedModifier - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitSecuritypatrol - #Mercenary Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: ClothingOuterHardsuitBaseNF id: ClothingOuterHardsuitMercenary # stats are of luxury mining hardsuit name: mercenary hardsuit description: A special suit that protects from the danger of space, employed by mercenary forces. Not certified to be blunderbuss proof. @@ -64,7 +32,7 @@ # Pilot Hardsuit - Spationaut stats - type: entity - parent: ClothingOuterHardsuitBase + parent: ClothingOuterHardsuitBaseNF id: ClothingOuterHardsuitPilot name: pilot hardsuit description: A hardsuit tailored for someone who spends the majority of their time buckled to a chair. @@ -136,30 +104,6 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitMaximPrototype -# Funny meme joke ha-ha: off-brand blood-red hardsuit -- type: entity - parent: ClothingOuterHardsuitSyndie - id: ClothingOuterHardsuitSundie - name: sundicate crimson-red hardsuit - description: A heavily armored hardsuit designed for work in special operations. Manufactored in Twinwine Colony by Goreblox Looters LLC. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi - color: orange - - type: Clothing - sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.90 - Slash: 0.90 - Piercing: 1.1 - Heat: 1.5 - Radiation: 1.5 - Caustic: 1.5 - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitSundie - # Syndicate NPC hard suit, unremoveable - type: entity parent: ClothingOuterHardsuitSyndie @@ -187,8 +131,9 @@ sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi - type: Contraband +# Security - type: entity - parent: ClothingOuterHardsuitSecuritypatrol + parent: ClothingOuterHardsuitBaseNFNfsd id: ClothingOuterHardsuitNfsdBronze name: nfsd bronze patrol hardsuit description: A special suit that protects from the danger of space, employed by nfsd patrol officers. Not certified to be blunderbuss proof. @@ -199,9 +144,23 @@ sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitNfsdBronze + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: Armor + modifiers: + coefficients: + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.65 + Heat: 0.7 + Radiation: 0.55 + Caustic: 0.75 + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.85 - type: entity - parent: ClothingOuterHardsuitSecurity + parent: ClothingOuterHardsuitNfsdBronze id: ClothingOuterHardsuitNfsdSilver name: nfsd silver patrol hardsuit description: A special suit that protects from the danger of space, employed by nfsd patrol officers. Not certified to be blunderbuss proof. @@ -214,7 +173,7 @@ clothingPrototype: ClothingHeadHelmetHardsuitNfsdSilver - type: entity - parent: ClothingOuterHardsuitWarden + parent: ClothingOuterHardsuitNfsdBronze id: ClothingOuterHardsuitNfsdGold name: nfsd gold patrol hardsuit description: A special suit that protects from the danger of space, employed by nfsd patrol officers. Not certified to be blunderbuss proof. @@ -227,7 +186,7 @@ clothingPrototype: ClothingHeadHelmetHardsuitNfsdGold - type: entity - parent: ClothingOuterHardsuitSecurityRed + parent: ClothingOuterHardsuitNfsdBronze id: ClothingOuterHardsuitNfsdSheriff name: nfsd sheriff patrol hardsuit description: A special suit that protects from the danger of space, employed by nfsd patrol officers. Not certified to be blunderbuss proof. @@ -240,8 +199,8 @@ clothingPrototype: ClothingHeadHelmetHardsuitNfsdSheriff - type: entity - parent: ClothingOuterHardsuitBrigmedic - id: ClothingOuterHardsuitNfsdBrigMed + parent: ClothingOuterHardsuitNfsdBronze + id: ClothingOuterHardsuitNfsdBrigmedic name: nfsd brigmedic patrol hardsuit description: A special suit that protects from the danger of space, employed by nfsd patrol officers. Not certified to be blunderbuss proof. components: @@ -250,10 +209,10 @@ - type: Clothing sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitNfsdBrigmed + clothingPrototype: ClothingHeadHelmetHardsuitNfsdBrigmedic - type: entity - parent: ClothingOuterHardsuitSyndieReverseEngineered + parent: ClothingOuterHardsuitJuggernaut # Jugger Suit id: ClothingOuterHardsuitNfsdExperimental name: experimental nfsd hardsuit description: An experimental nfsd hardsuit, never before seen! @@ -264,3 +223,76 @@ sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitNfsdExperimental + - type: PressureProtection + highPressureMultiplier: 0.2 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: Armor + modifiers: + coefficients: + Blunt: 0.2 + Slash: 0.2 + Piercing: 0.2 + Heat: 0.2 + Radiation: 0.2 + Caustic: 0.2 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.65 + +#Security Combat Hardsuit +- type: entity + parent: ClothingOuterHardsuitBaseNFNfsd + id: ClothingOuterHardsuitNfsdCombat + name: nfsd combat hardsuit + description: Medium armored hardsuit helmet for NFSD raids. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitNfsdCombat + - type: ExplosionResistance + damageCoefficient: 0.4 + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.60 + Radiation: 0.50 + Caustic: 0.7 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.75 + +#Security Command Hardsuit +- type: entity + parent: ClothingOuterHardsuitBaseNFNfsd + id: ClothingOuterHardsuitNfsdCommand + name: nfsd command hardsuit + description: Medium armored hardsuit helmet for NFSD raids. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitNfsdCommand + - type: ExplosionResistance + damageCoefficient: 0.4 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.5 + Piercing: 0.5 + Heat: 0.50 + Radiation: 0.4 + Caustic: 0.6 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.75 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wintercoats.yml index 142aa98686d..e6433bce5ec 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wintercoats.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: ClothingOuterWinterSci id: ClothingOuterWinterArcadia name: arcadia winter coat description: A coat produced by Arcadia Industries, seems soft. @@ -10,8 +10,3 @@ sprite: _NF/Clothing/OuterClothing/WinterCoats/arcadia.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodArcadia - - type: Armor - modifiers: - coefficients: - Heat: 0.75 - Caustic: 0.9 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml index ce8f004b7d2..7d67242c132 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml @@ -12,7 +12,7 @@ - type: entity parent: ClothingShoesBootsCombat - id: ClothingShoesBootsNFSDBrown + id: ClothingShoesBootsNfsdBrown name: nfsd brown boots description: Stylish boots for running in circles on a deck during emergencies. components: @@ -23,7 +23,7 @@ - type: entity parent: ClothingShoesBootsCombat - id: ClothingShoesBootsNFSDCream + id: ClothingShoesBootsNfsdCream name: nfsd cream boots description: Stylish boots for running in circles on a deck during emergencies. components: 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 9960bf51171..d03a5e9d923 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml @@ -47,11 +47,11 @@ - type: entity parent: IDCardStandard - id: nfsdcadetID + id: CadetIDCard name: nfsd cadet ID card components: - type: PresetIdCard - job: SecurityCadet + job: Cadet - type: Sprite sprite: _NF/Objects/Misc/id_cards.rsi layers: @@ -66,11 +66,11 @@ - type: entity parent: IDCardStandard - id: nfsddeputyID + id: DeputyIDCard name: nfsd deputy ID card components: - type: PresetIdCard - job: SecurityOfficer + job: Deputy - type: Sprite sprite: _NF/Objects/Misc/id_cards.rsi layers: @@ -85,7 +85,7 @@ - type: entity parent: IDCardStandard - id: nfsdbrigmedicID + id: BrigmedicNFIDCard name: nfsd brigmedic ID card components: - type: PresetIdCard @@ -104,7 +104,7 @@ - type: entity parent: IDCardStandard - id: nfsdsergeantID + id: SergeantIDCard name: nfsd sergeant ID card components: - type: PresetIdCard @@ -123,11 +123,11 @@ - type: entity parent: IDCardStandard - id: nfsdbailiffID + id: BailiffIDCard name: nfsd bailiff ID card components: - type: PresetIdCard - job: Warden + job: Bailiff - type: Sprite sprite: _NF/Objects/Misc/id_cards.rsi layers: @@ -142,11 +142,11 @@ - type: entity parent: IDCardStandard - id: nfsdsheriffID + id: ShriffIDCard name: nfsd sheriff ID card components: - type: PresetIdCard - job: HeadOfSecurity + job: Sheriff - type: Sprite sprite: _NF/Objects/Misc/id_cards.rsi layers: @@ -159,6 +159,18 @@ - type: Item heldPrefix: silver +- type: entity + parent: IDCardStandard + id: DetectiveNFIDCard + name: detective ID card + components: + - type: Sprite + layers: + - state: default + - state: iddetective + - type: PresetIdCard + job: DetectiveNF + - type: entity parent: SecurityIDCard id: SecurityGuardIDCard diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml index 944bc5c51a2..332c67e058d 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml @@ -18,15 +18,15 @@ - type: entity parent: EncryptionKey - id: EncryptionKeyNFSD + id: EncryptionKeyNfsd name: nfsd encryption key suffix: DO NOT MAP description: An encryption key for the new frontier security department channel. components: - type: EncryptionKey channels: - - NFSD - defaultChannel: NFSD + - Nfsd + defaultChannel: Nfsd - type: Item sprite: _NF/Objects/Devices/encryption_keys.rsi - type: Sprite diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml index 130ca791544..fc544e21dd8 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml @@ -607,3 +607,14 @@ entity: DawInstrument - type: StaticPrice price: 2000 + +- type: entity + parent: UniformPrinterFlatpack + id: NfsdTechFabFlatpack + name: nfsd tech fab flatpack + description: A flatpack used for constructing a nfsd tech fab. + components: + - type: Flatpack + entity: NfsdTechFab + - type: StaticPrice + price: 250 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml index 55b6de7c39b..cad767c1e5b 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml @@ -1,27 +1,26 @@ - type: entity - parent: Holoprojector - id: HoloprojectorNFSD + parent: HoloprojectorSecurity + id: HoloprojectorNfsd name: nfsd holobarrier projector description: Creates a solid but fragile holographic barrier. components: - - type: HolosignProjector - signProto: HolosignNFSD - chargeUse: 120 - - type: Sprite - sprite: _NF/Objects/Devices/Holoprojectors/nfsd.rsi - state: icon - - type: Tag - tags: - - HolofanProjector - - type: StaticPrice - price: 50 + - type: Sprite + sprite: _NF/Objects/Devices/Holoprojectors/nfsd.rsi + state: icon + - type: HolosignProjector + signProto: HolosignNfsd - type: entity - parent: HoloprojectorNFSD - id: HoloprojectorNFSDEmpty + parent: HoloprojectorSecurityEmpty + id: HoloprojectorNfsdEmpty suffix: Empty components: + - type: Sprite + sprite: _NF/Objects/Devices/Holoprojectors/nfsd.rsi + state: icon + - type: HolosignProjector + signProto: HolosignNfsd - type: ItemSlots slots: cell_slot: - name: power-cell-slot-component-slot-name-default \ No newline at end of file + name: power-cell-slot-component-slot-name-default diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml index 74aab913af7..854dcff40ef 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml @@ -103,12 +103,12 @@ - type: entity parent: BasePDA - id: NfsdSheriff + id: SheriffPDA name: sheriff PDA description: Whosoever bears this PDA is the law. components: - type: Pda - id: nfsdsheriffID + id: ShriffIDCard state: pda-sheriff - type: PdaBorderColor borderColor: "#FFFDD0" @@ -131,12 +131,12 @@ - type: entity parent: BasePDA - id: NfsdCadet + id: CadetPDA name: cadet PDA description: Whosoever bears this PDA could be the law. components: - type: Pda - id: nfsdcadetID + id: CadetIDCard state: pda-cadet - type: PdaBorderColor borderColor: "#FFFDD0" @@ -159,12 +159,12 @@ - type: entity parent: BasePDA - id: NfsdDeputy + id: DeputyPDA name: deputy PDA description: Whosoever bears this PDA is close to being the law. components: - type: Pda - id: nfsddeputyID + id: DeputyIDCard state: pda-deputy - type: PdaBorderColor borderColor: "#FFFDD0" @@ -187,12 +187,12 @@ - type: entity parent: BasePDA - id: NfsdBrigmedic + id: BrigmedicNFPDA name: brigmedic PDA description: Whosoever bears this PDA heals the law. components: - type: Pda - id: nfsdbrigmedicID + id: BrigmedicNFIDCard state: pda-brigmed - type: PdaBorderColor borderColor: "#FFFDD0" @@ -215,12 +215,12 @@ - type: entity parent: BasePDA - id: NfsdSergeant + id: SergeantPDA name: sergeant PDA description: Whosoever bears this PDA puts the law on their back. components: - type: Pda - id: nfsdsergeantID + id: SergeantIDCard state: pda-sergeant - type: PdaBorderColor borderColor: "#FFFDD0" @@ -243,12 +243,12 @@ - type: entity parent: BasePDA - id: NfsdBailiff + id: BailiffPDA name: bailiff PDA description: Whosoever bears this PDA puts the law on their back. components: - type: Pda - id: nfsdbailiffID + id: BailiffIDCard state: pda-bailiff - type: PdaBorderColor borderColor: "#FFFDD0" @@ -269,6 +269,20 @@ sprite: _NF/Objects/Devices/pda.rsi state: pda-bailiff +- type: entity + parent: BasePDA + id: DetectiveNFPDA + name: detective PDA + description: Smells like rain... pouring down the rooftops... + components: + - type: Pda + id: DetectiveNFIDCard + state: pda-detective + - type: PdaBorderColor + borderColor: "#774705" + - type: Icon + state: pda-detective + - type: entity parent: HoPPDA id: SrPDA diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index 7b0764880cf..1c0f20e7884 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -55,7 +55,7 @@ Steel: 5 - type: entity - id: ThrusterNFSDMachineCircuitboard + id: ThrusterNfsdMachineCircuitboard parent: BaseMachineCircuitboard name: nfsd thruster machine board components: @@ -100,3 +100,14 @@ ExamineName: Glass Beaker - type: StaticPrice price: 200 + +- type: entity + id: NfsdTechFabCircuitboard + parent: SecurityTechFabCircuitboard + name: nfsd techfab machine board + description: A machine printed circuit board for an nfsd techfab. + components: + - type: Sprite + state: nfsd + - type: MachineBoard + prototype: NfsdTechFab diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/whistles.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/whistles.yml index f9fcfe44b40..5ef012917d4 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Fun/whistles.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/whistles.yml @@ -1,6 +1,6 @@ - type: entity parent: BaseWhistle - id: nfsdWhistle + id: NfsdWhistle name: nfsd whistle description: Sound of it make you feel fear. components: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/bedsheets.yml index be035660d65..f3458b2cd30 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/bedsheets.yml @@ -1,5 +1,5 @@ - type: entity - id: BedsheetNFSD + id: BedsheetNfsd parent: BedsheetBase name: nfsd bedsheet components: @@ -9,7 +9,7 @@ sprite: _NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi - type: entity - id: BedsheetNFSDBrigmed + id: BedsheetNfsdBrigmedic parent: BedsheetBase name: brigmedic bedsheet components: @@ -19,7 +19,7 @@ sprite: _NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi - type: entity - id: BedsheetNFSDSheriff + id: BedsheetNfsdSheriff parent: BedsheetBase name: sheriff bedsheet components: @@ -27,4 +27,3 @@ state: sheetnfsdsheriff - type: Clothing sprite: _NF/Clothing/Neck/Bedsheets/NFSD/nfsd_sheriff.rsi - diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml index 347e95baeaa..ea1594b4336 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -160,37 +160,3 @@ - state: green_bit shader: unshaded - state: refill_pottedplant - -- type: entity - parent: SecuredVendingMachineRestock - id: VendingMachineRestockNFSDDrobe - name: NFSDDrobe restock box - description: "nfsddrobe restock box - may explode on contact with appendages." - components: - - type: VendingMachineRestock - canRestock: - - NFSDDrobeInventory - - type: Sprite - sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi - layers: - - state: base - - state: green_bit - shader: unshaded - - state: refill_nfsddrobe - -- type: entity - parent: SecuredVendingMachineRestock - id: VendingMachineRestockNFSDTec - name: NFSDTec restock box - description: "nfsdtec restock box - may unleash a singulo on contact with appendages" - components: - - type: VendingMachineRestock - canRestock: - - NFSDTecInventory - - type: Sprite - sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi - layers: - - state: base - - state: green_bit - shader: unshaded - - state: refill_nfsdtec \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml index 3252171c22c..e513d219481 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml @@ -108,77 +108,13 @@ - type: entity name: nfsd deployable barrier - id: NFSDDeployableBarrier + id: NfsdDeployableBarrier description: A deployable barrier. Swipe your ID card to lock/unlock it. - parent: BaseStructure + parent: DeployableBarrier components: - - type: Transform - anchored: false - noRot: true - type: Sprite sprite: _NF/Objects/Specific/Security/nfsdbarrier.rsi layers: - state: idle - state: locked map: ["enum.LockVisualLayers.Lock"] - - type: Appearance - - type: LockVisuals - - type: InteractionOutline - - type: Physics - bodyType: Dynamic - canCollide: false - - type: Fixtures - fixtures: - base: - shape: - !type:PhysShapeCircle - radius: 0.45 - density: 75 - mask: - - MachineMask - barrier: - shape: - !type:PhysShapeCircle - radius: 0.45 - layer: - - WallLayer - - type: DeployableBarrier - fixture: barrier - - type: AccessReader - access: [["Security"]] - - type: Lock - locked: false - lockOnClick: true # toggle lock just by clicking on barrier - lockTime: 5 - unlockTime: 5 - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 600 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 300 - behaviors: - - !type:SpawnEntitiesBehavior - spawn: - SheetSteel: - min: 5 - max: 5 - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: PointLight - enabled: false - radius: 3 - color: red - - type: StaticPrice - price: 200 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/flashlights.yml index 7a3187c06b8..81da789f7a8 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/flashlights.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/flashlights.yml @@ -1,7 +1,7 @@ - type: entity name: nfsdlite parent: FlashlightLantern - id: FlashlightNFSDLite + id: FlashlightNfsdLite description: A robust flashlight used by the nfsd. components: - type: Tag diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml index 19f9e82b797..b84cd49c647 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml @@ -1,7 +1,7 @@ #Empty security - type: entity - id: Jetpacknfsd - parent: BaseJetpack + id: JetpackNfsd + parent: JetpackSecurity name: nfsd jetpack suffix: Empty components: @@ -16,8 +16,8 @@ #Filled security - type: entity - id: JetpackNFSDFilled - parent: Jetpacknfsd + id: JetpackNfsdFilled + parent: [JetpackNfsd, JetpackSecurityFilled] name: nfsd jetpack suffix: Filled components: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml index 4ce4ee7df02..46a5c2a1c8f 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml @@ -2,7 +2,7 @@ name: Argenti parent: BaseWeaponRevolver id: WeaponRevolverArgenti - description: Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo. + description: The civilian grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo. components: - type: Sprite sprite: _NF/Objects/Weapons/Argenti-Revolver.rsi diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index ce6dd0f24f7..2850feca162 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -34,7 +34,7 @@ suffix: EMP parent: BaseWeaponLauncher id: WeaponLauncherRocketEmp - description: A modified ancient rocket-propelled grenade launcher. + description: A modified ancient rocket-propelled grenade launcher. On the handle is a label that says 'for authorized use only.' components: - type: Sprite sprite: Objects/Weapons/Guns/Launchers/rocket.rsi diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Snipers/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Snipers/snipers.yml new file mode 100644 index 00000000000..12cbbc255f4 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Snipers/snipers.yml @@ -0,0 +1,18 @@ +- type: entity + name: N2524 Pattern Repeater + parent: BaseWeaponSniper + id: WeaponSniperRepeater + description: A civilian grade lever action firearm, favored by space cowboys across the Frontier for its reliability and stopping power. Uses .45 magnum ammo. + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Snipers/repeater.rsi + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Snipers/repeater.rsi + - type: StaticPrice + price: 500 + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeMagnum + capacity: 7 + proto: CartridgeMagnum diff --git a/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml index b2ddd0e305e..d9d4627a942 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml @@ -1,5 +1,5 @@ - type: entity - id: BannerNFSD + id: BannerNfsd parent: BannerBase name: nfsd banner description: A banner displaying the colors of the new frontier sheriff's department. # Frontier - description change @@ -12,7 +12,7 @@ node: BannerSecurityNode # Frontier - type: entity - id: FlagNFSD + id: FlagNfsd parent: BannerBase name: nfsd flag description: A flag displaying the colors of the new frontier sheriff's department. # Frontier - description change diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml index 84ced86b664..87fe83458ab 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml @@ -83,8 +83,8 @@ tag: DockTransit - type: entity - parent: AirlockNFSDGlass - id: AirlockNFSDGlassLocked + parent: AirlockNfsdGlass + id: AirlockNfsdGlassLocked suffix: NFSD, Locked components: - type: AccessReader @@ -93,8 +93,8 @@ layoutId: AirlockSecurity - type: entity - parent: AirlockNFSD - id: AirlockNFSDLocked + parent: AirlockNfsd + id: AirlockNfsdLocked suffix: NFSD, Locked components: - type: AccessReader diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml index d27121cba66..60bce78584c 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -8,7 +8,7 @@ - type: entity parent: Airlock - id: AirlockNFSD + id: AirlockNfsd suffix: NFSD components: - type: Sprite @@ -28,7 +28,7 @@ #Glass - type: entity parent: AirlockGlass - id: AirlockNFSDGlass + id: AirlockNfsdGlass suffix: NFSD components: - type: Sprite diff --git a/Resources/Prototypes/_NF/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/_NF/Entities/Structures/Holographic/projections.yml index 77bffbf7cda..30027362feb 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Holographic/projections.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Holographic/projections.yml @@ -1,5 +1,5 @@ - type: entity - id: HolosignNFSD + id: HolosignNfsd parent: HolosignWetFloor name: nfsd holographic barrier description: A barrier of hard light that blocks movement, but pretty weak. diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index 48f25830ff1..b235734141b 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -356,8 +356,8 @@ - MagazineBoxLightRifle - GrenadeBlast - ClothingHeadHelmetCosmonaut - - ClothingHeadHelmetSyndicate - - ClothingOuterHardsuitSyndicate +# - ClothingHeadHelmetSyndicate # Frontier +# - ClothingOuterHardsuitSyndicate # Frontier - type: MaterialStorage whitelist: tags: @@ -366,13 +366,13 @@ - Ingot - type: entity - id: NFSDTechFab - parent: BaseLathe + id: NfsdTechFab + parent: SecurityTechFab name: nfsd techfab description: Prints equipment for use by nfsd. components: - type: Sprite - sprite: Structures/Machines/techfab.rsi + sprite: _NF/Structures/Machines/techfab.rsi layers: - state: icon map: ["enum.LatheVisualLayers.IsRunning"] @@ -385,111 +385,4 @@ - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Machine - board: SecurityTechFabCircuitboard - - type: Lathe - idleState: icon - runningState: icon - staticRecipes: - - Flash - - Handcuffs - - Zipties - - Stunbaton - - ForensicPad - - RiotShield - - ShellShotgun - - ShellShotgunSlug - - ShellShotgunFlare - - ShellTranquilizer - - MagazinePistol - - MagazinePistolSubMachineGun - - MagazinePistolSubMachineGunTopMounted - - MagazineRifle - - MagazineLightRifle - - MagazineBoxPistol - - MagazineBoxMagnum - - MagazineBoxRifle - - MagazineBoxLightRifle - - SpeedLoaderMagnum - - TargetHuman - - TargetSyndicate - - TargetClown - - MagazineBoxLightRiflePractice - - MagazineBoxMagnumPractice - - MagazineBoxPistolPractice - - MagazineBoxRiflePractice - - ShellShotgunPractice - - WeaponLaserCarbinePractice - - WeaponDisablerPractice - # Frontier Start - - ThrusterSecurityMachineCircuitboard - - ClothingOuterSuitEmergency - - ClothingHeadHelmetEVA - - ClothingHeadHelmetEVALarge - - ClothingOuterHardsuitEVAPrisoner - # Frontier End - dynamicRecipes: - - CartridgeLightRifleIncendiary - - CartridgeMagnumIncendiary - - CartridgePistolIncendiary - - CartridgeRifleIncendiary - - CartridgeLightRifleUranium - - CartridgeMagnumUranium - - CartridgePistolUranium - - CartridgeRifleUranium - - CartridgeLightRifleRubber - - CartridgeMagnumRubber - - CartridgePistolRubber - - CartridgeRifleRubber - - ClothingEyesGlassesSecurity - - ExplosivePayload - - FlashPayload - - HoloprojectorSecurity - - MagazineBoxLightRifleIncendiary - - MagazineBoxMagnumIncendiary - - MagazineBoxPistolIncendiary - - MagazineBoxRifleIncendiary - - MagazineBoxLightRifleUranium - - MagazineBoxMagnumUranium - - MagazineBoxPistolUranium - - MagazineBoxRifleUranium - - MagazineBoxLightRifleRubber - - MagazineBoxMagnumRubber - - MagazineBoxPistolRubber - - MagazineBoxRifleRubber - - MagazineGrenadeEmpty - - GrenadeEMP - - GrenadeFlash - - ShellShotgunBeanbag - - ShellShotgunIncendiary - - ShellShotgunUranium - - Signaller - - SignalTrigger - - TelescopicShield - - TimerTrigger - - Truncheon - - VoiceTrigger - - WeaponDisablerPractice - - WeaponAdvancedLaser -# - WeaponDisablerSMG - - WeaponLaserCannon - - WeaponLaserCarbine - - WeaponXrayCannon - - PowerCageSmall - - PowerCageMedium - - PowerCageHigh - - ShuttleGunSvalinnMachineGunCircuitboard - - ShuttleGunPerforatorCircuitboard - - ShuttleGunFriendshipCircuitboard - - ShuttleGunDusterCircuitboard - # Frontier Start - - ClothingOuterHardsuitSecurity - - ClothingOuterHardsuitSecuritypatrol - - ClothingOuterHardsuitWarden - - ClothingOuterHardsuitBrigmedic - # Frontier End - - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot + board: NfsdTechFabCircuitboard \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/m_emp.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/m_emp.yml index b240e8a29f7..65e91613f09 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/m_emp.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/m_emp.yml @@ -56,7 +56,7 @@ - type: IntrinsicRadioReceiver - type: ActiveRadio channels: - - NFSD + - Nfsd - type: M_EmpGenerator - type: ActivatableUI key: enum.M_EmpUiKey.Key diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/telecomms.yml index 27764b6b06f..0dddfd2c863 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/telecomms.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/telecomms.yml @@ -27,7 +27,7 @@ - EncryptionKeyEngineering - EncryptionKeyMedical - EncryptionKeyScience - - EncryptionKeyNFSD + - EncryptionKeyNfsd - EncryptionKeySecurity - EncryptionKeyService - EncryptionKeyTraffic diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index ece28c431bf..95f97bdd58d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -322,17 +322,17 @@ - type: entity parent: [BaseStructureUnanchorable, VendingMachine] - id: VendingMachineNFSDDrobe + id: VendingMachineNfsdDrobe name: NFSDDrobe description: A vending machine for NFSD and NFSD clothing! components: - type: VendingMachine - pack: NFSDDrobeInventory + pack: NfsdDrobeInventory offState: off brokenState: broken normalState: normal-unshaded - type: Advertise - pack: NFSDDrobeAds + pack: NfsdDrobeAds - type: Sprite sprite: _NF/Structures/Machines/VendingMachines/nfsddrobe.rsi layers: @@ -348,19 +348,19 @@ - type: entity parent: [BaseStructureUnanchorable, VendingMachine] - id: VendingMachineNFSDTec - name: NFSDTec + id: VendingMachineNfsdTech + name: NFSDTech description: A vending machine for NFSD and NFSD tech! components: - type: VendingMachine - pack: NFSDTecInventory + pack: NfsdTechInventory offState: off brokenState: broken normalState: normal-unshaded - type: Advertise - pack: NFSDDrobeAds + pack: NfsdDrobeAds - type: Sprite - sprite: _NF/Structures/Machines/VendingMachines/nfsdtec.rsi + sprite: _NF/Structures/Machines/VendingMachines/nfsdtech.rsi layers: - state: "off" map: ["enum.VendingMachineVisualLayers.Base"] @@ -370,4 +370,29 @@ - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: AccessReader - access: [["Security"]] \ No newline at end of file + access: [["Security"]] + +- type: entity + parent: [BaseStructureIndestructible, BaseStructureAccessReaderImmuneToEmag, VendingMachineCart] # Frontier + id: VendingMachineCartNfsd + suffix: NFSD + components: + - type: VendingMachine + pack: PTechNfsdInventory + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + - type: Sprite + sprite: Structures/Machines/VendingMachines/cart.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: AccessReader + access: [["HeadOfSecurity"]] diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml index c057d56a5b1..c785e99f763 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml @@ -92,92 +92,34 @@ acts: ["Destruction"] - type: entity - id: ThrusterNFSD - parent: [ BaseStructureUnanchorable, BaseThrusterSecurity, ConstructibleMachine ] - name: thruster + id: ThrusterNfsd + parent: ThrusterSecurity suffix: NFSD components: - type: Machine - board: ThrusterNFSDMachineCircuitboard + board: ThrusterNfsdMachineCircuitboard - type: Sprite sprite: _NF/Structures/Shuttles/thrusternfsd.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: ThrusterNFSDUnanchored - parent: ThrusterUnanchored + id: ThrusterNfsdUnanchored + parent: ThrusterSecurityUnanchored suffix: Unanchored, NFSD components: + - type: Machine + board: ThrusterNfsdMachineCircuitboard - type: Sprite sprite: _NF/Structures/Shuttles/thrusternfsd.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: DebugThrusterNFSD - parent: [BaseStructureDisableToolUse, DebugThruster] - name: thruster + id: DebugThrusterNfsd + parent: DebugThrusterSecurity suffix: DEBUG, NFSD components: + - type: Machine + board: ThrusterNfsdMachineCircuitboard - type: Sprite sprite: _NF/Structures/Shuttles/thrusternfsd.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 @@ -320,91 +262,46 @@ bodyType: Dynamic - type: entity - id: GyroscopeNFSD - parent: [BaseStructureDisableToolUse, Gyroscope] + id: GyroscopeNfsd + parent: GyroscopeSecurity suffix: NFSD components: - type: Sprite sprite: _NF/Structures/Shuttles/nfsdgyroscope.rsi snapCardinals: true - layers: - - state: base - map: ["enum.ThrusterVisualLayers.Base"] - - state: thrust - map: ["enum.ThrusterVisualLayers.ThrustOn"] - shader: unshaded - visible: false - - state: thrust_burn - map: [ "enum.ThrusterVisualLayers.Thrusting" ] - visible: false - - state: thrust_burn_unshaded - map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] - shader: unshaded - visible: false - type: entity - id: DebugGyroscopeNFSD - parent: [BaseStructureDisableToolUse, DebugGyroscope] - name: gyroscope + id: DebugGyroscopeNfsd + parent: DebugGyroscopeSecurity suffix: DEBUG, NFSD components: - type: Sprite sprite: _NF/Structures/Shuttles/nfsdgyroscope.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: SmallGyroscopeNFSD - parent: GyroscopeNFSD - name: small gyroscope + id: SmallGyroscopeNfsd + parent: GyroscopeSecurity suffix: NFSD 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/nfsdgyroscope.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: StaticPrice - price: 250 - type: Machine board: SmallGyroscopeMachineCircuitboard - type: entity - id: SmallGyroscopeNFSDUnanchored - parent: SmallGyroscopeNFSD + id: SmallGyroscopeNfsdUnanchored + parent: SmallGyroscopeSecurityUnanchored suffix: Unanchored, NFSD components: - - type: Transform - anchored: false - - type: Physics - bodyType: Dynamic + - type: Sprite + scale: 0.8, 0.8 + sprite: _NF/Structures/Shuttles/nfsdgyroscope.rsi + snapCardinals: true + - type: Machine + board: SmallGyroscopeMachineCircuitboard - type: entity id: SmallGyroscope diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 303f69fced9..5b15ce884d9 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -122,7 +122,7 @@ # NFSD - Evidence - type: entity - id: LockernfsdEvidence + id: LockerNfsdEvidence parent: LockerBaseSecure name: nfsd evidence locker components: @@ -150,7 +150,7 @@ # NFSD Copper - type: entity - id: LockernfsdCopper + id: LockerNfsdCopper parent: LockerBaseSecure name: nfsd cadet locker components: @@ -178,7 +178,7 @@ # NFSD Silver - type: entity - id: LockernfsdSilver + id: LockerNfsdSilver parent: LockerBaseSecure name: nfsd deputy locker components: @@ -206,7 +206,7 @@ # NFSD Brigmedic - type: entity - id: LockernfsdBrigmedic + id: LockerNfsdBrigmedic parent: LockerBaseSecure name: nfsd brigmedic locker components: @@ -234,7 +234,7 @@ # NFSD Gold - Sergeant - type: entity - id: LockernfsdSergeant + id: LockerNfsdSergeant parent: LockerBaseSecure name: nfsd sergeant locker components: @@ -262,7 +262,7 @@ # NFSD Gold - Bailiff - type: entity - id: LockernfsdBailiff + id: LockerNfsdBailiff parent: LockerBaseSecure name: nfsd bailiff locker components: @@ -290,7 +290,7 @@ # NFSD Sheriff - type: entity - id: LockernfsdSheriff + id: LockerNfsdSheriff parent: LockerBaseSecure name: nfsd sheriff's locker components: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml index 6e9ed784fed..5679150b0ff 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml @@ -163,7 +163,7 @@ - type: entity parent: CrateSecgear - id: CratenfsdBrigmedic + id: CrateNfsdBrigmedic name: brigmedic crate components: - type: Icon @@ -175,7 +175,7 @@ - type: entity parent: CrateSecgear - id: CratenfsdSecure1 + id: CrateNfsdSecure1 name: nfsd crate components: - type: Icon @@ -187,7 +187,7 @@ - type: entity parent: CrateSecgear - id: CratenfsdSecure2 + id: CrateNfsdSecure2 name: nfsd crate components: - type: Icon diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/intercom.yml index c53532742cb..9661d6fc53e 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/intercom.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/intercom.yml @@ -1,10 +1,10 @@ - type: entity - id: IntercomNFSD - parent: Intercom + id: IntercomNfsd + parent: IntercomSecurity suffix: NFSD # Frontier - Not adding DO NOT MAP. (Prototype is already matched by "Security" for sec shipyard.) components: - type: Intercom supportedChannels: - Common - - NFSD + - Nfsd - Traffic # Frontier - Add Traffic channel diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml index 91d3cb9bc19..a4dbf0a927e 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml @@ -287,18 +287,6 @@ Silver: 2000 Gold: 1000 -- type: latheRecipe - id: ClothingOuterHardsuitSecuritypatrol - result: ClothingOuterHardsuitSecuritypatrol - category: EVASuits - completetime: 4 - materials: - Glass: 500 - Plasteel: 2000 - Durathread: 2000 - Silver: 2000 - Gold: 1000 - - type: latheRecipe id: ClothingOuterHardsuitBrigmedic result: ClothingOuterHardsuitBrigmedic @@ -414,15 +402,3 @@ Durathread: 2000 Silver: 1000 Gold: 2000 - -- type: latheRecipe # EMAG, meme - id: ClothingOuterHardsuitSundie - result: ClothingOuterHardsuitSundie - category: EVASuits - completetime: 8 - materials: - Glass: 500 - Plasteel: 2000 - Durathread: 2000 - Silver: 1000 - Gold: 2000 diff --git a/Resources/Prototypes/_NF/Research/arsenal.yml b/Resources/Prototypes/_NF/Research/arsenal.yml index 36e140cd61d..ed84f674bdb 100644 --- a/Resources/Prototypes/_NF/Research/arsenal.yml +++ b/Resources/Prototypes/_NF/Research/arsenal.yml @@ -10,9 +10,7 @@ tier: 2 cost: 15000 recipeUnlocks: - - ClothingOuterHardsuitSecuritypatrol - ClothingOuterHardsuitMercenary - - ClothingOuterHardsuitSundie - ClothingOuterHardsuitPirateEVA technologyPrerequisites: - AdvancedRiotControl diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml index 6d4cca52fcc..3227769569f 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml @@ -13,7 +13,7 @@ time: 10800 # 3 hrs as sec canBeAntag: false icon: "JobIconStc" - supervisors: job-supervisors-hop + supervisors: job-supervisors-sr setPreference: true access: - Maintenance diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/bailiff.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/bailiff.yml index 6796e46fe81..5443ecd9909 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/bailiff.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/bailiff.yml @@ -14,7 +14,7 @@ time: 32400 # 9 hrs startingGear: BailiffGear icon: "JobIconWarden" # Frontier - supervisors: job-supervisors-hos + supervisors: job-supervisors-sheriff canBeAntag: false access: - Security @@ -35,18 +35,18 @@ equipment: head: ClothingHeadHatNfsdBeretBrown # Frontier jumpsuit: ClothingUniformJumpsuitNfsdTacCream # Frontier - back: ClothingBackpackOfficerFilled # Frontier - shoes: ClothingShoesBootsNFSDCreamFilled # Frontier - eyes: ClothingEyesGlassesNFSD # Frontier + back: ClothingBackpackNfsdBrownRadioFilled + shoes: ClothingShoesBootsNfsdCreamFilled # Frontier + eyes: ClothingEyesGlassesNfsd # Frontier outerClothing: ClothingOuterCoatNfsdFormal # Frontier - id: NfsdBailiff # Frontier - ears: ClothingHeadsetAltNFSDgreen # Frontier + id: BailiffPDA # Frontier + ears: ClothingHeadsetAltNfsdgreen # Frontier belt: ClothingBeltNfsdWebbingFilled # Frontier pocket1: WeaponPistolMk58Nonlethal - pocket2: HoloprojectorSecurity # Frontier + pocket2: HoloprojectorNfsd # Frontier gloves: ClothingHandsGlovesCombatNfsdCream # Frontier neck: ClothingNeckNfsdBadgeWarden # Frontier innerClothingSkirt: ClothingUniformJumpskirtNfsd # Frontier - satchel: ClothingBackpackSatchelOfficerFilled # Frontier - duffelbag: ClothingBackpackDuffelOfficerFilled # Frontier - messenger: ClothingBackpackMessengerOfficerFilled # Frontier + satchel: ClothingBackpackSatchelNfsdBrownRadioFilled # Frontier + duffelbag: ClothingBackpackDuffelNfsdBrownRadioFilled # Frontier + messenger: ClothingBackpackMessengerNfsdBrownRadioFilled # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml index c57df8157d5..ea48381bc97 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml @@ -11,7 +11,7 @@ time: 36000 # Frontier - 10 hrs startingGear: BrigmedicGear icon: "JobIconBrigmedic" # Frontier - supervisors: job-supervisors-hos + supervisors: job-supervisors-bailiff canBeAntag: false access: - Medical @@ -30,17 +30,17 @@ equipment: jumpsuit: ClothingUniformJumpsuitNfsd # Frontier outerClothing: ClothingOuterCoatNfsdBomberBrigmed # Frontier - back: ClothingBackpacknfsdBrigmedFilled # Frontier - shoes: ClothingShoesBootsNFSDCreamFilled # Frontier + back: ClothingBackpackNfsdCreamFilled # Frontier + shoes: ClothingShoesBootsNfsdCreamFilled # Frontier gloves: ClothingHandsGlovesNitrile - eyes: ClothingEyesHudNFSDMed # Frontier + eyes: ClothingEyesHudNfsdMed # Frontier head: ClothingHeadHatNfsdBeretCream # Frontier - id: NfsdBrigmedic # Frontier - ears: ClothingHeadsetNFSDbrown # Frontier + id: BrigmedicNFPDA # Frontier + ears: ClothingHeadsetNfsdCreamMed # Frontier belt: ClothingBeltNfsdWebbingFilledBrigmedic # Frontier - neck: ClothingNeckNfsdBadgeSecurityBrigmed # Frontier + neck: ClothingNeckNfsdBadgeSecurityBrigmedic # Frontier pocket1: WeaponPistolMk58Nonlethal # Frontier innerClothingSkirt: ClothingUniformJumpskirtNfsd # Frontier - satchel: ClothingBackpackSatchelnfsdBrigmedFilled # Frontier - duffelbag: ClothingBackpackDuffelnfsdBrigmedFilled # Frontier - messenger: ClothingBackpackMessengerBrigmedicFilled # Frontier + satchel: ClothingBackpackSatchelNfsdCreamFilled # Frontier + duffelbag: ClothingBackpackDuffelNfsdCreamFilled # Frontier + messenger: ClothingBackpackMessengerNfsdCreamFilled diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/cadet.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/cadet.yml index c86753cdf83..1326881342e 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/cadet.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/cadet.yml @@ -12,7 +12,7 @@ inverted: true # stop playing intern if you're good at security! startingGear: CadetGear icon: "JobIconSecurityCadet" # Frontier - supervisors: job-supervisors-security + supervisors: job-supervisors-cadet canBeAntag: false access: - Security @@ -30,19 +30,19 @@ id: CadetGear equipment: jumpsuit: ClothingUniformJumpsuitNfsdShort # Frontier - back: ClothingBackpacknfsdFilled # Frontier - shoes: ClothingShoesBootsNFSDBrownFilled # Frontier - outerClothing: ClothingOuterArmorNfsdArmor # Frontier - id: NfsdCadet # Frontier - ears: ClothingHeadsetNFSDbrown # Frontier + back: ClothingBackpackNfsdBrownFilled # Frontier + shoes: ClothingShoesBootsNfsdBrownFilled # Frontier + outerClothing: ClothingOuterArmorNfsd # Frontier + id: CadetPDA # Frontier + ears: ClothingHeadsetNfsdBrown # Frontier pocket1: WeaponPistolMk58Nonlethal pocket2: BookSecurity gloves: ClothingHandsGlovesCombatNfsdBrown # Frontier belt: ClothingBeltNfsd # Frontier head: ClothingHeadHatNfsdSmallCampaign # Frontier - eyes: ClothingEyesGlassesNFSD # Frontier + eyes: ClothingEyesGlassesNfsd # Frontier neck: ClothingNeckNfsdBadgeSecurityCadet # Frontier innerClothingSkirt: ClothingUniformJumpskirtNfsdShort # Frontier - satchel: ClothingBackpackSatchelnfsdFilled # Frontier - duffelbag: ClothingBackpackDuffelnfsdFilled # Frontier - messenger: ClothingBackpackMessengerSecurityFilled # Frontier + satchel: ClothingBackpackSatchelNfsdBrownFilled # Frontier + duffelbag: ClothingBackpackDuffelNfsdBrownFilled # Frontier + messenger: ClothingBackpackMessengerNfsdBrownFilled # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/deputy.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/deputy.yml index 7ac5530e09b..c6e2aa3714d 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/deputy.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/deputy.yml @@ -11,7 +11,7 @@ time: 21600 # Frontier - 6 hrs startingGear: DeputyGear icon: "JobIconSecurityOfficer" # Frontier - supervisors: job-supervisors-hos + supervisors: job-supervisors-sergeant canBeAntag: false access: - Security @@ -29,18 +29,18 @@ id: DeputyGear equipment: jumpsuit: ClothingUniformJumpsuitNfsd # Frontier - back: ClothingBackpacknfsdFilled # Frontier - shoes: ClothingShoesBootsNFSDBrownFilled # Frontier - eyes: ClothingEyesGlassesNFSD # Frontier + back: ClothingBackpackNfsdBrownFilled # Frontier + shoes: ClothingShoesBootsNfsdBrownFilled # Frontier + eyes: ClothingEyesGlassesNfsd # Frontier head: ClothingHeadHatNfsdSmallCampaign # Frontier - outerClothing: ClothingOuterArmorNfsdArmor # Frontier - id: NfsdDeputy # Frontier - ears: ClothingHeadsetNFSDbrown # Frontier + outerClothing: ClothingOuterArmorNfsd # Frontier + id: DeputyPDA # Frontier + ears: ClothingHeadsetNfsdBrown # Frontier belt: ClothingBeltNfsdWebbingFilled # Frontier pocket1: WeaponPistolMk58Nonlethal gloves: ClothingHandsGlovesCombatNfsdBrown # Frontier neck: ClothingNeckNfsdBadgeSecurity # Frontier innerClothingSkirt: ClothingUniformJumpskirtNfsd # Frontier - satchel: ClothingBackpackSatchelnfsdFilled # Frontier - duffelbag: ClothingBackpackDuffelnfsdFilled # Frontier - messenger: ClothingBackpackMessengerSecurityFilled # Frontier + satchel: ClothingBackpackSatchelNfsdBrownFilled # Frontier + duffelbag: ClothingBackpackDuffelNfsdBrownFilled # Frontier + messenger: ClothingBackpackMessengerNfsdBrownFilled # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/detectivenf.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/detectivenf.yml index 8ba8a4c957d..971dd02db77 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/detectivenf.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/detectivenf.yml @@ -11,7 +11,7 @@ time: 36000 # Frontier - 10 hrs startingGear: DetectiveNFGear icon: "JobIconDetective" - supervisors: job-supervisors-hos + supervisors: job-supervisors-bailiff canBeAntag: false access: - Security @@ -19,9 +19,9 @@ - Maintenance - Service - Detective - - External # Frontier - - Mercenary # Frontier - - Captain # Frontier + - External + - Mercenary + - Captain special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] @@ -30,16 +30,16 @@ id: DetectiveNFGear equipment: jumpsuit: ClothingUniformJumpsuitDetective - back: ClothingBackpackFilledDetective + back: ClothingBackpackNfsdBrownDetectiveFilled shoes: ClothingShoesBootsCombatFilled - eyes: ClothingEyesGlassesSunglasses + eyes: ClothingEyesGlassesNfsd head: ClothingHeadHatFedoraBrown outerClothing: ClothingOuterVestDetective - id: DetectivePDA - ears: ClothingHeadsetSecurity + id: DetectiveNFPDA + ears: ClothingHeadsetNfsdCream belt: ClothingBeltHolsterFilled - gloves: ClothingHandsGlovesCombat # Frontier + gloves: ClothingHandsGlovesCombatNfsdBrown # Frontier innerClothingSkirt: ClothingUniformJumpskirtDetective - satchel: ClothingBackpackSatchelFilledDetective - duffelbag: ClothingBackpackDuffelFilledDetective - messenger: ClothingBackpackMessengerSecurityFilledDetective # Frontier + satchel: ClothingBackpackSatchelNfsdBrownDetectiveFilled + duffelbag: ClothingBackpackDuffelNfsdBrownDetectiveFilled + messenger: ClothingBackpackMessengerNfsdBrownDetectiveFilled diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml index 5491d6a9446..db729e662f2 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml @@ -14,16 +14,10 @@ time: 32400 # 9 hrs startingGear: SeniorOfficerGear icon: "JobIconSeniorOfficer" # Frontier - supervisors: job-supervisors-hos + supervisors: job-supervisors-bailiff canBeAntag: false - access: - - Security - - Brig - - Maintenance - - Service - - External - - Mercenary # Frontier - - Captain # Frontier + accessGroups: # Frontier + - GeneralNfsdAccess # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] @@ -32,18 +26,18 @@ id: SeniorOfficerGear equipment: jumpsuit: ClothingUniformJumpsuitNfsdTacBlack # Frontier - back: ClothingBackpackOfficerFilled # Frontier - shoes: ClothingShoesBootsNFSDBrownFilled # Frontier - eyes: ClothingEyesGlassesNFSD # Frontier + back: ClothingBackpackNfsdBrownRadioFilled + shoes: ClothingShoesBootsNfsdBrownFilled # Frontier + eyes: ClothingEyesGlassesNfsd # Frontier head: ClothingHeadHatNfsdBeretGreen # Frontier outerClothing: ClothingOuterCoatNfsdLongCoat # Frontier - id: NfsdSergeant # Frontier - ears: ClothingHeadsetAltNFSDbrown # Frontier + id: SergeantPDA # Frontier + ears: ClothingHeadsetAltNfsdbrown # Frontier belt: ClothingBeltNfsdFilled # Frontier pocket1: WeaponPistolMk58Nonlethal gloves: ClothingHandsGlovesCombatNfsdCream # Frontier neck: ClothingNeckNfsdBadgeSeniorOfficer # Frontier innerClothingSkirt: ClothingUniformJumpskirtNfsd # Frontier - satchel: ClothingBackpackSatchelOfficerFilled # Frontier - duffelbag: ClothingBackpackDuffelOfficerFilled # Frontier - messenger: ClothingBackpackMessengerOfficerFilled # Frontier + satchel: ClothingBackpackSatchelNfsdBrownRadioFilled # Frontier + duffelbag: ClothingBackpackDuffelNfsdBrownRadioFilled # Frontier + messenger: ClothingBackpackMessengerNfsdBrownRadioFilled # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/sheriff.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/sheriff.yml index b62e2cebfb2..487ee04c614 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/sheriff.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/sheriff.yml @@ -21,45 +21,11 @@ alwaysUseSpawner: true icon: "JobIconHeadOfSecurity" # Frontier requireAdminNotify: true - supervisors: job-supervisors-centcom # Frontier + supervisors: job-supervisors-centcom whitelistRequired: true canBeAntag: false - access: - - HeadOfSecurity - - HeadOfPersonnel # Frontier - This should probably be removed after we confirm they can get into SR office + Bank - - Command - - Brig - - Frontier - - Security - - Armory - - Maintenance - - Service - - External - - Detective - - Mercenary # Frontier - - Bar # Frontier - - Janitor # Frontier - - Theatre # Frontier - - Kitchen # Frontier - - Chapel # Frontier - - Hydroponics # Frontier - - Chemistry # Frontier - - Engineering # Frontier - - Quartermaster # Frontier - - Research # Frontier - - Salvage # Frontier - - Cargo # Frontier - - Atmospherics # Frontier - - Medical # Frontier - - EmergencyShuttleRepealAll # Frontier - - Captain # Frontier - - ChiefEngineer # Frontier - - ChiefMedicalOfficer # Frontier - - ResearchDirector # Frontier - - Pilot # Frontier - - Lawyer # Frontier - - Cryogenics # Frontier - - Mail # Frontier + accessGroups: + - AllAccess special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] @@ -71,21 +37,21 @@ id: SheriffGear equipment: jumpsuit: ClothingUniformJumpsuitNfsdTacGray # Frontier - back: ClothingBackpacknfsdsheriffFilled # Frontier - shoes: ClothingShoesBootsNFSDBrownFilled # Frontier + back: ClothingBackpackNfsdBrownSheriffFilled # Frontier + shoes: ClothingShoesBootsNfsdBrownFilled # Frontier outerClothing: ClothingOuterCoatNfsdFormalSheriff # Frontier - eyes: ClothingEyesGlassesNFSD # Frontier + eyes: ClothingEyesGlassesNfsd # Frontier head: ClothingHeadHatNfsdCampaignFilled # Frontier - id: NfsdSheriff # Frontier + id: SheriffPDA # Frontier mask: ClothingMaskGasSheriff # Frontier gloves: ClothingHandsGlovesCombatNfsdCream # Frontier - ears: ClothingHeadsetAltNFSDCreamandBrown # Frontier + ears: ClothingHeadsetAltNfsdCreamandBrown # Frontier belt: ClothingBeltNfsdWebbingFilled # Frontier pocket1: WeaponPistolMk58Nonlethal - pocket2: HoloprojectorNFSD # Frontier + pocket2: HoloprojectorNfsd # Frontier neck: ClothingNeckMantleSheriffFilled # Frontier suitstorage: WeaponEnergyGunMultiphase # Frontier - DeltaV gun innerClothingSkirt: ClothingUniformJumpskirtNfsd # Frontier - satchel: ClothingBackpackSatchelnfsdsheriffFilled # Frontier - duffelbag: ClothingBackpackDuffelnfsdsheriffFilled # Frontier - messenger: ClothingBackpackMessengerHOSFilled # Frontier + satchel: ClothingBackpackSatchelNfsdBrownSheriffFilled + duffelbag: ClothingBackpackDuffelNfsdBrownSheriffFilled + messenger: ClothingBackpackMessengerNfsdBrownSheriffFilled diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml index a800202e4ab..8612ddf09a7 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml @@ -9,7 +9,7 @@ startingGear: MercenaryGear canBeAntag: true icon: "JobIconMercenary" - supervisors: job-supervisors-captain + supervisors: job-supervisors-hire setPreference: true access: - Maintenance diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml index 2db4ea183b2..cacd50730c8 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml @@ -9,7 +9,7 @@ startingGear: SecurityGuardGear alwaysUseSpawner: true icon: "JobIconSecurityGuard" - supervisors: job-supervisors-hop # not hos + supervisors: job-supervisors-sr canBeAntag: false access: - Security @@ -17,9 +17,9 @@ - Maintenance - Service - External - - Mercenary # Frontier - - Captain # Frontier - - Frontier # Frontier + - Mercenary + - Captain + - Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] @@ -37,8 +37,8 @@ ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled pocket1: WeaponPistolMk58Nonlethal - gloves: ClothingHandsGlovesCombat # Frontier + gloves: ClothingHandsGlovesCombat innerClothingSkirt: ClothingUniformJumpskirtSecGuard satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled - messenger: ClothingBackpackMessengerSecurityFilled # Frontier + messenger: ClothingBackpackSecurityFilled diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Wildcards/pilot.yml b/Resources/Prototypes/_NF/Roles/Jobs/Wildcards/pilot.yml index 52c410ad80f..7848a0d89a0 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Wildcards/pilot.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Wildcards/pilot.yml @@ -5,11 +5,11 @@ playTimeTracker: JobPilot requirements: - !type:OverallPlaytimeRequirement - time: 120 + time: 10800 startingGear: PilotGear canBeAntag: true icon: "JobIconPilot" - supervisors: job-supervisors-captain + supervisors: job-supervisors-hire setPreference: true access: - Maintenance diff --git a/Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml b/Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml index 17ff035fdeb..b87cc78fdb2 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml +++ b/Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml @@ -2,15 +2,15 @@ id: Hospitaller name: NSF Лазарет description: Малогабаритный медицинский шаттл. Рекомендованный состав команды 1-3 человека. - price: 23220 + price: 28220 category: Small group: Security - shuttlePath: /Maps/_NF/Shuttles/hospitaller.yml + shuttlePath: /Maps/_NF/Shuttles/Security/hospitaller.yml - type: gameMap id: Hospitaller mapName: 'NSF Hospitaller' - mapPath: /Maps/_NF/Shuttles/hospitaller.yml + mapPath: /Maps/_NF/Shuttles/Security/hospitaller.yml minPlayers: 0 stations: Hospitaller: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml b/Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml index 72f99c180aa..83d9b57abc1 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml @@ -1,26 +1,26 @@ -- type: vessel - id: Interceptor - name: NSF Перехватчик - description: Малогабаритный патрульный шаттл. Рекомендованный состав команды 1-2 человека. - price: 21350 - category: Small - group: Security - shuttlePath: /Maps/Shuttles/interceptor.yml +# - type: vessel + # id: Interceptor + # name: NSF Перехватчик + # description: Малогабаритный патрульный шаттл. Рекомендованный состав команды 1-2 человека. + # price: 21350 + # category: Small + # group: Security + # shuttlePath: /Maps/Shuttles/interceptor.yml -- type: gameMap - id: Interceptor - mapName: 'NSF Interceptor' - mapPath: /Maps/Shuttles/interceptor.yml - minPlayers: 0 - stations: - Interceptor: - stationProto: StandardFrontierSecurityVessel - components: - - type: StationNameSetup - mapNameTemplate: 'Перехватчик {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - overflowJobs: [] - availableJobs: {} \ No newline at end of file +# - type: gameMap + # id: Interceptor + # mapName: 'NSF Interceptor' + # mapPath: /Maps/Shuttles/interceptor.yml + # minPlayers: 0 + # stations: + # Interceptor: + # stationProto: StandardFrontierSecurityVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Перехватчик {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # overflowJobs: [] + # availableJobs: {} \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Security/templar.yml b/Resources/Prototypes/_NF/Shipyard/Security/templar.yml index c8115f29489..859b9fac251 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/templar.yml +++ b/Resources/Prototypes/_NF/Shipyard/Security/templar.yml @@ -2,15 +2,15 @@ id: Templar name: NSF Тамплиер description: Малогабаритный штурмовой шаттл ДСБФ. Рекомендованный состав команды 1-3 человека. - price: 21220 + price: 24220 category: Small group: Security - shuttlePath: /Maps/Shuttles/templar.yml + shuttlePath: /Maps/_NF/Shuttles/Security/templar.yml - type: gameMap id: Templar mapName: 'NSF Templar' - mapPath: /Maps/Shuttles/templar.yml + mapPath: /Maps/_NF/Shuttles/Security/templar.yml minPlayers: 0 stations: Templar: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml b/Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml index 9c1f256cfc2..20af1173258 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml +++ b/Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml @@ -1,26 +1,26 @@ -- type: vessel - id: Whiskey - name: NSF Виски - description: Среднегабаритный медицинский шаттл ДСБФ. Рекомендованный состав команды 2-4 человека. - price: 55000 - category: Medium - group: Security - shuttlePath: /Maps/_NF/Shuttles/Security/whiskey.yml +# - type: vessel + # id: Whiskey + # name: NSF Виски + # description: Среднегабаритный медицинский шаттл ДСБФ. Рекомендованный состав команды 2-4 человека. + # price: 55000 + # category: Medium + # group: Security + # shuttlePath: /Maps/_NF/Shuttles/Security/whiskey.yml -- type: gameMap - id: Whiskey - mapName: 'NSF Whiskey' - mapPath: /Maps/_NF/Shuttles/Security/whiskey.yml - minPlayers: 0 - stations: - Whiskey: - stationProto: StandardFrontierVessel - components: - - type: StationNameSetup - mapNameTemplate: 'Виски {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - overflowJobs: [] - availableJobs: {} +# - type: gameMap + # id: Whiskey + # mapName: 'NSF Whiskey' + # mapPath: /Maps/_NF/Shuttles/Security/whiskey.yml + # minPlayers: 0 + # stations: + # Whiskey: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Виски {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # overflowJobs: [] + # availableJobs: {} \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/vagabond.yml b/Resources/Prototypes/_NF/Shipyard/vagabond.yml new file mode 100644 index 00000000000..4bb745c8a76 --- /dev/null +++ b/Resources/Prototypes/_NF/Shipyard/vagabond.yml @@ -0,0 +1,41 @@ +# Author Info +# GitHub: https://github.com/DustScoundrel +# Discord: 691415110282903552 + +# Maintainer Info +# GitHub: https://github.com/MoistBiscuits +# Discord: 159375107855351808 + +# Shuttle Notes: +# + +- type: vessel + id: Vagabond + name: NT Vagabond + description: A adaptable long-haul industrial freighter that pilots have adapted to many different purposes. + price: 60000 + category: Medium + group: Civilian + shuttlePath: /Maps/_NF/Shuttles/vagabond.yml + +- type: gameMap + id: Vagabond + mapName: 'NT Vagabond' + mapPath: /Maps/_NF/Shuttles/vagabond.yml + minPlayers: 0 + stations: + Vagabond: + stationProto: StandardFrontierVessel + components: + - type: StationNameSetup + mapNameTemplate: 'Vagabond {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + overflowJobs: [] + availableJobs: + CargoTechnician: [ 0, 0 ] + StationEngineer: [ 0, 0 ] + SalvageSpecialist: [ 0, 0 ] + Quartermaster: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/radio_channels.yml b/Resources/Prototypes/_NF/radio_channels.yml index 65a6a29524e..1146120409b 100644 --- a/Resources/Prototypes/_NF/radio_channels.yml +++ b/Resources/Prototypes/_NF/radio_channels.yml @@ -6,7 +6,7 @@ color: "#CC6633" - type: radioChannel - id: NFSD + id: Nfsd name: chat-radio-nfsd keycode: 'ф' # Corvax-Localization frequency: 1023 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/icon-flash.png deleted file mode 100644 index 8dbb969c283..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/icon-flash.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/icon.png deleted file mode 100644 index a550c75bb4b..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-equipped-HELMET-vulpkanin.png deleted file mode 100644 index 86d26a13a64..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-equipped-HELMET.png deleted file mode 100644 index 721fd32464a..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-equipped-HELMET-vulpkanin.png deleted file mode 100644 index 839da10f1bd..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-equipped-HELMET.png deleted file mode 100644 index 78d2a2f41d1..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index e30e6f7fb7c..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/icon.png deleted file mode 100644 index 02179f93ec9..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/inhand-left.png deleted file mode 100644 index c42574591fa..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/inhand-right.png deleted file mode 100644 index 15241564094..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_backpack.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_backpack.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_backpack.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_backpack.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_backpack.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_backpack.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_backpack.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_backpack.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_backpack.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brown.rsi/meta.json diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brigmed_backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brigmed_backpack.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brigmed_backpack.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brigmed_backpack.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brigmed_backpack.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brigmed_backpack.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brigmed_backpack.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brigmed_backpack.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brigmed_backpack.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brigmed_backpack.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_cream.rsi/meta.json diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_duffle.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_duffle.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_duffle.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_duffle.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_duffle.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_duffle.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_duffle.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_duffle.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brigmed_duffle.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brigmed_duffle.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brown.rsi/meta.json diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brigmed_duffle.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brigmed_duffle.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brigmed_duffle.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brigmed_duffle.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brigmed_duffle.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brigmed_duffle.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brigmed_duffle.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brigmed_duffle.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_duffle.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_duffle.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_cream.rsi/meta.json diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/security.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Messenger/security.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/security.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Messenger/security.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/security.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Messenger/security.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/security.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Messenger/security.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/security.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Messenger/security.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/meta.json diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/brigmedic.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Messenger/brigmedic.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/brigmedic.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Messenger/brigmedic.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/brigmedic.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Messenger/brigmedic.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/brigmedic.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Messenger/brigmedic.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/brigmedic.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Messenger/brigmedic.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/meta.json diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_satchel.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_satchel.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_satchel.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_satchel.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_satchel.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_satchel.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_satchel.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brigmed_satchel.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brigmed_satchel.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brown.rsi/meta.json diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brigmed_satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brigmed_satchel.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brigmed_satchel.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brigmed_satchel.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brigmed_satchel.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brigmed_satchel.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brigmed_satchel.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brigmed_satchel.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_satchel.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_satchel.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_cream.rsi/meta.json diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/icon-flash.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/icon-flash.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/icon-flash.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/icon-flash.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/meta.json diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/off-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET-lizard.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/off-equipped-HELMET-lizard.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET-lizard.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/off-equipped-HELMET-vulpkanin.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/off-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/off-equipped-HELMET.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/off-inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/off-inhand-left.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/off-inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/off-inhand-right.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/off-inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/on-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET-lizard.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/on-equipped-HELMET-lizard.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET-lizard.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/on-equipped-HELMET-vulpkanin.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/on-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/on-equipped-HELMET.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/on-inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/on-inhand-left.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/on-inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi/on-inhand-right.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd.rsi/on-inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/icon-flash.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/icon-flash.png new file mode 100644 index 00000000000..d81a8d2d5c7 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/icon-flash.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/icon.png new file mode 100644 index 00000000000..49e45c268df Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/meta.json similarity index 84% rename from Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/meta.json index f43ab362dd8..7ff43c2de33 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/meta.json @@ -21,6 +21,10 @@ "name": "off-equipped-HELMET-vulpkanin", "directions": 4 }, + { + "name": "off-equipped-HELMET-lizard", + "directions": 4 + }, { "name": "off-inhand-left", "directions": 4 @@ -37,6 +41,10 @@ "name": "on-equipped-HELMET-vulpkanin", "directions": 4 }, + { + "name": "on-equipped-HELMET-lizard", + "directions": 4 + }, { "name": "on-inhand-left", "directions": 4 diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET-lizard.png new file mode 100644 index 00000000000..7be262f1ec4 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET-lizard.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..2a9c65d0300 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..7de9521ab79 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-inhand-left.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-inhand-right.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/off-inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET-lizard.png new file mode 100644 index 00000000000..fec2019f87a Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET-lizard.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..8cc687cbfa3 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..6c1c3f32e89 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-inhand-left.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-inhand-right.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_combat.rsi/on-inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/icon-flash.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/icon-flash.png new file mode 100644 index 00000000000..0f24fad835f Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/icon-flash.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/icon.png new file mode 100644 index 00000000000..9cb5ce425a0 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/meta.json new file mode 100644 index 00000000000..7ff43c2de33 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/meta.json @@ -0,0 +1,57 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DadNotTheBelt (https://github.com/No-Dad-Not-The-Belt) for SS14/Frontier Station 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-lizard", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-lizard", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET-lizard.png new file mode 100644 index 00000000000..38af6472ec5 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET-lizard.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..16298e2a9ca Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..9018b93907e Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-inhand-left.png new file mode 100644 index 00000000000..90299377c08 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-inhand-right.png new file mode 100644 index 00000000000..c606e45bda1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET-lizard.png new file mode 100644 index 00000000000..dcbd8b7c5c0 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET-lizard.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..64ca4c2c99f Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..6f19d1c50de Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-inhand-left.png new file mode 100644 index 00000000000..c0b0feaa6ef Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-inhand-right.png new file mode 100644 index 00000000000..efd69347c96 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_command.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/icon-flash.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/icon-flash.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/icon-flash.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/icon-flash.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/meta.json diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/off-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET-lizard.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/off-equipped-HELMET-lizard.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET-lizard.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/off-equipped-HELMET-vulpkanin.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/off-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/off-equipped-HELMET.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/off-inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/off-inhand-left.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/off-inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/off-inhand-right.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/off-inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/on-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET-lizard.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/on-equipped-HELMET-lizard.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET-lizard.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/on-equipped-HELMET-vulpkanin.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/on-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/on-equipped-HELMET.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/on-inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/on-inhand-left.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-inhand-left.png diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/on-inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi/on-inhand-right.png rename to Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff.rsi/on-inhand-right.png diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..b5a3f6295f4 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/icon.png new file mode 100644 index 00000000000..236027ad54a Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/inhand-left.png new file mode 100644 index 00000000000..9f26408d9ea Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/inhand-right.png new file mode 100644 index 00000000000..dd19c6f92d4 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/meta.json rename to Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi/meta.json diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..b5a3f6295f4 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/icon.png new file mode 100644 index 00000000000..236027ad54a Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/inhand-left.png new file mode 100644 index 00000000000..9f26408d9ea Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/inhand-right.png new file mode 100644 index 00000000000..dd19c6f92d4 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/meta.json new file mode 100644 index 00000000000..e541c9afe9d --- /dev/null +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DadNotTheBelt (https://github.com/No-Dad-Not-The-Belt) for SS14/Frontier Station 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdsergeant.png b/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdsergeant.png index e59aa53b3c9..21505e6619a 100644 Binary files a/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdsergeant.png and b/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdsergeant.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/base.png new file mode 100644 index 00000000000..421fb601521 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/bolt-open.png new file mode 100644 index 00000000000..5194385cf00 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/bolt-open.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..ff8892bdaf3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-left.png new file mode 100644 index 00000000000..417daab4009 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-right.png new file mode 100644 index 00000000000..1aec54fe893 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json new file mode 100644 index 00000000000..c223e6b194f --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/broken.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/broken.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/broken.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/meta.json rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/meta.json diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/normal-unshaded.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/normal-unshaded.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/off.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/off.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/off.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/panel.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/panel.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/panel.png diff --git a/Resources/Textures/_NF/Structures/Machines/techfab.rsi/icon.png b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/icon.png new file mode 100644 index 00000000000..186fd30082b Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/techfab.rsi/inserting.png b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/inserting.png new file mode 100644 index 00000000000..647eb27246f Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/inserting.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/techfab.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/meta.json new file mode 100644 index 00000000000..f46fa24636d --- /dev/null +++ b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by EmoGarbage, modified by ghostprince", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "nfsd" + }, + { + "name": "panel" + }, + { + "name": "unlit" + }, + { + "name": "inserting", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Machines/techfab.rsi/nfsd.png b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/nfsd.png new file mode 100644 index 00000000000..ae2e88fc7b6 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/nfsd.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/techfab.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/panel.png new file mode 100644 index 00000000000..ec700ac14e1 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/panel.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/techfab.rsi/unlit.png b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/unlit.png new file mode 100644 index 00000000000..6635772d336 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/unlit.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 3157936a7e7..d2e9a960812 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -181,9 +181,9 @@ ClothingHeadHelmetVoidParamed: null DefaultStationBeaconTeslaEngine: null #2024-01-27 -ClothingBackpackSecurityFilledDetective: ClothingBackpackFilledDetective -ClothingBackpackDuffelSecurityFilledDetective: ClothingBackpackDuffelFilledDetective -ClothingBackpackSatchelSecurityFilledDetective: ClothingBackpackSatchelFilledDetective +#ClothingBackpackSecurityFilledDetective: ClothingBackpackFilledDetective +#ClothingBackpackDuffelSecurityFilledDetective: ClothingBackpackDuffelFilledDetective +#ClothingBackpackSatchelSecurityFilledDetective: ClothingBackpackSatchelFilledDetective # 2024-01-28 FoodBoxDonkpocketGondola: FoodBoxDonkpocketPizza