Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Civillian and Medical ship Holopad update #2800

Merged
merged 4 commits into from
Jan 31, 2025
+611 −964
Merged

Civillian and Medical ship Holopad update #2800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
761af9e
update civillian and medical ships with holopads
Cheackraze Jan 28, 2025
2b31f22
Merge branch 'master' into civvie-ship-holopads
arimah Jan 30, 2025
646eff0
Merge branch 'master' into civvie-ship-holopads
dvir001 Jan 31, 2025
1f306f0
Merge branch 'master' into civvie-ship-holopads
arimah Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 14 additions & 81 deletions Resources/Maps/_NF/Shuttles/apothecary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,8 +791,6 @@ entities:
rot: -1.5707963267948966 rad
pos: -1.5,-0.5
parent: 1
- type: Apc
hasAccess: True
- proto: AtmosDeviceFanDirectional
entities:
- uid: 63
Expand Down Expand Up @@ -1473,11 +1471,11 @@ entities:
parent: 1
- proto: ComputerTabletopStationRecords
entities:
- uid: 228
- uid: 191
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -2.5,8.5
rot: 3.141592653589793 rad
pos: -0.5,1.5
parent: 1
- proto: ComputerWallmountWithdrawBankATM
entities:
Expand All @@ -1487,17 +1485,6 @@ entities:
rot: -1.5707963267948966 rad
pos: 2.5,-0.5
parent: 1
- type: ContainerContainer
containers:
board: !type:Container
showEnts: False
occludes: True
ents: []
bank-ATM-cashSlot: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- type: ItemSlots
- proto: CrateChemistryD
entities:
- uid: 163
Expand Down Expand Up @@ -2303,16 +2290,6 @@ entities:
- type: Transform
pos: -2.5,7.5
parent: 1
- type: ContainerContainer
containers:
entity_storage: !type:Container
showEnts: False
occludes: True
ents: []
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- proto: LockerWallColorMedicalDoctorFilled
entities:
- uid: 245
Expand All @@ -2321,16 +2298,6 @@ entities:
rot: 3.141592653589793 rad
pos: -2.5,2.5
parent: 1
- type: ContainerContainer
containers:
entity_storage: !type:Container
showEnts: False
occludes: True
ents: []
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- proto: LockerWallEVAColorParamedicFilled
entities:
- uid: 141
Expand Down Expand Up @@ -2364,7 +2331,7 @@ entities:
- uid: 251
components:
- type: Transform
pos: -2.3657346,9.161771
pos: -2.1803885,9.500854
parent: 1
- proto: MachineCentrifuge
entities:
Expand All @@ -2387,20 +2354,6 @@ entities:
- type: Transform
pos: 3.5,3.5
parent: 1
- type: ContainerContainer
containers:
machine_board: !type:Container
showEnts: False
occludes: True
ents: []
machine_parts: !type:Container
showEnts: False
occludes: True
ents: []
microwave_entity_container: !type:Container
showEnts: False
occludes: True
ents: []
- proto: MedicalBed
entities:
- uid: 178
Expand All @@ -2420,20 +2373,13 @@ entities:
- type: Transform
pos: 2.5,2.5
parent: 1
- type: ContainerContainer
containers:
machine_board: !type:Container
showEnts: False
occludes: True
ents: []
machine_parts: !type:Container
showEnts: False
occludes: True
ents: []
blueprint: !type:Container
showEnts: False
occludes: True
ents: []
- proto: NFHolopadShip
entities:
- uid: 228
components:
- type: Transform
pos: -2.5,8.5
parent: 1
- proto: NFPosterContrabandFsbApothecary
entities:
- uid: 289
Expand Down Expand Up @@ -2494,14 +2440,6 @@ entities:
parent: 1
- type: Physics
bodyType: Static
- proto: PaperBin10
entities:
- uid: 191
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -2.7045135,9.029007
parent: 1
- proto: PaperBin20
entities:
- uid: 218
Expand Down Expand Up @@ -3086,11 +3024,6 @@ entities:
rot: -1.5707963267948966 rad
pos: -0.5,9.5
parent: 1
- uid: 302
components:
- type: Transform
pos: -2.5,8.5
parent: 1
- uid: 320
components:
- type: Transform
Expand Down Expand Up @@ -3144,10 +3077,10 @@ entities:
parent: 1
- proto: ToyFigurineLawyer
entities:
- uid: 318
- uid: 302
components:
- type: Transform
pos: -2.324068,9.276354
pos: -2.0553885,9.797729
parent: 1
- proto: VendingMachineMedical
entities:
Expand Down Expand Up @@ -3506,7 +3439,7 @@ entities:
rot: 1.5707963267948966 rad
pos: -6.5,-4.5
parent: 1
- proto: WarpPointShip
- proto: WarpPoint
entities:
- uid: 304
components:
Expand Down
50 changes: 8 additions & 42 deletions Resources/Maps/_NF/Shuttles/bazaar.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,6 @@ entities:
parent: 1
- type: Physics
canCollide: False
bodyType: Static
- type: Fixtures
fixtures: {}
- proto: BenchSofaCorpLeft
Expand All @@ -1377,17 +1376,13 @@ entities:
- type: Transform
pos: 9.5,9.5
parent: 1
- type: Physics
bodyType: Static
- proto: BenchSofaCorpMiddle
entities:
- uid: 597
components:
- type: Transform
pos: 8.5,9.5
parent: 1
- type: Physics
bodyType: Static
- proto: BenchSofaCorpRight
entities:
- uid: 596
Expand All @@ -1396,8 +1391,6 @@ entities:
rot: 1.5707963267948966 rad
pos: 7.5,8.5
parent: 1
- type: Physics
bodyType: Static
- proto: BlastDoor
entities:
- uid: 82
Expand Down Expand Up @@ -2872,37 +2865,11 @@ entities:
- type: Transform
pos: 4.5,-3.5
parent: 1
- type: ContainerContainer
containers:
board: !type:Container
showEnts: False
occludes: True
ents: []
bank-ATM-cashSlot: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- type: Physics
canCollide: False
- type: ItemSlots
- uid: 387
components:
- type: Transform
pos: -3.5,-3.5
parent: 1
- type: ContainerContainer
containers:
board: !type:Container
showEnts: False
occludes: True
ents: []
bank-ATM-cashSlot: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- type: Physics
canCollide: False
- type: ItemSlots
- proto: ConveyorBelt
entities:
- uid: 348
Expand Down Expand Up @@ -5115,6 +5082,13 @@ entities:
- type: Transform
pos: 3.280076,1.401608
parent: 1
- proto: NFHolopadShip
entities:
- uid: 531
components:
- type: Transform
pos: 1.5,10.5
parent: 1
- proto: NFSignDock
entities:
- uid: 604
Expand Down Expand Up @@ -5189,23 +5163,15 @@ entities:
- type: Transform
pos: -10.5,9.5
parent: 1
- type: FuelGenerator
on: False
- type: MaterialStorageMagnetPickup
magnetEnabled: True
- type: Physics
bodyType: Static
- uid: 961
components:
- type: Transform
pos: -10.5,7.5
parent: 1
- type: FuelGenerator
on: False
- type: MaterialStorageMagnetPickup
magnetEnabled: True
- type: Physics
bodyType: Static
- proto: PosterLegitCarpMount
entities:
- uid: 522
Expand Down Expand Up @@ -7064,7 +7030,7 @@ entities:
- type: Transform
pos: -6.5,10.5
parent: 1
- proto: WarpPointShip
- proto: WarpPoint
entities:
- uid: 475
components:
Expand Down
19 changes: 10 additions & 9 deletions Resources/Maps/_NF/Shuttles/beaker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,6 @@ entities:
- type: Transform
pos: 3.5,-2.5
parent: 1
- type: Apc
hasAccess: True
- uid: 350
components:
- type: Transform
Expand Down Expand Up @@ -1312,8 +1310,8 @@ entities:
pos: -4.5,0.5
parent: 1
- type: GasMixer
inletOneConcentration: 0.79
inletTwoConcentration: 0.21
inletOneConcentration: 0.79
- type: AtmosPipeColor
color: '#0055CCFF'
- proto: GasPassiveVent
Expand Down Expand Up @@ -1904,6 +1902,13 @@ entities:
- type: Transform
pos: -5.5501204,-3.5460114
parent: 1
- proto: NFHolopadShip
entities:
- uid: 253
components:
- type: Transform
pos: 0.5,-1.5
parent: 1
- proto: NitrogenCanister
entities:
- uid: 371
Expand Down Expand Up @@ -1939,10 +1944,6 @@ entities:
- type: Transform
pos: 2.5,-10.5
parent: 1
- type: FuelGenerator
on: False
- type: Physics
bodyType: Static
- proto: PosterLegitSafetyMothEpi
entities:
- uid: 219
Expand All @@ -1965,7 +1966,7 @@ entities:
- type: Transform
pos: -6.5,-3.5
parent: 1
- proto: PoweredlightColoredFrostyBlue
- proto: PoweredlightCyan
entities:
- uid: 210
components:
Expand Down Expand Up @@ -2961,7 +2962,7 @@ entities:
- type: Transform
pos: 4.5,-1.5
parent: 1
- proto: WarpPointShip
- proto: WarpPoint
entities:
- uid: 378
components:
Expand Down
Loading
Loading