diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index d7aaf247ce1..7f834eea491 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -31815,7 +31815,19 @@ entities: - type: Transform pos: 38.5,21.5 parent: 2173 -- proto: SignShipDock +- proto: NFSignBus + entities: + - uid: 2096 + components: + - type: Transform + pos: -16.5,17.5 + parent: 2173 + - uid: 2100 + components: + - type: Transform + pos: -8.5,17.5 + parent: 2173 +- proto: NFSignDock entities: - uid: 472 components: @@ -31859,16 +31871,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,30.5 parent: 2173 - - uid: 2096 - components: - - type: Transform - pos: -16.5,17.5 - parent: 2173 - - uid: 2100 - components: - - type: Transform - pos: -8.5,17.5 - parent: 2173 - uid: 2579 components: - type: Transform diff --git a/Resources/Maps/_NF/POI/anomalousgeode.yml b/Resources/Maps/_NF/POI/anomalousgeode.yml index 7adecfaece8..076d81ea9d5 100644 --- a/Resources/Maps/_NF/POI/anomalousgeode.yml +++ b/Resources/Maps/_NF/POI/anomalousgeode.yml @@ -4163,7 +4163,7 @@ entities: - type: Transform pos: -2.5,-7.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 771 components: diff --git a/Resources/Maps/_NF/POI/arena.yml b/Resources/Maps/_NF/POI/arena.yml index 08248ed32e2..34e6e1bfe91 100644 --- a/Resources/Maps/_NF/POI/arena.yml +++ b/Resources/Maps/_NF/POI/arena.yml @@ -18013,7 +18013,7 @@ entities: - type: Transform pos: -12.5,-1.5 parent: 2 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 2976 components: diff --git a/Resources/Maps/_NF/POI/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml index cd3a3f3a219..ae0fe891118 100644 --- a/Resources/Maps/_NF/POI/lodge.yml +++ b/Resources/Maps/_NF/POI/lodge.yml @@ -15718,7 +15718,7 @@ entities: - type: Transform pos: -1.5,24.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 360 components: diff --git a/Resources/Maps/_NF/POI/trade.yml b/Resources/Maps/_NF/POI/trade.yml index 3255b630b3d..7fe0393b538 100644 --- a/Resources/Maps/_NF/POI/trade.yml +++ b/Resources/Maps/_NF/POI/trade.yml @@ -26973,27 +26973,29 @@ entities: - type: Transform pos: 50.5,-1.5 parent: 1 -- proto: SignShipDock +- proto: NFSignBus entities: - - uid: 6377 + - uid: 6379 components: - type: Transform - pos: -16.5,25.5 + pos: -4.5,-15.5 parent: 1 - - uid: 6378 + - uid: 6380 components: - type: Transform - pos: -12.5,25.5 + pos: -1.5,-15.5 parent: 1 - - uid: 6379 +- proto: NFSignDock + entities: + - uid: 6377 components: - type: Transform - pos: -4.5,-15.5 + pos: -16.5,25.5 parent: 1 - - uid: 6380 + - uid: 6378 components: - type: Transform - pos: -1.5,-15.5 + pos: -12.5,25.5 parent: 1 - uid: 6383 components: diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml index 4c30ba159f5..eed6dc98d7d 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml @@ -2955,7 +2955,7 @@ entities: - type: Transform pos: 5.5,-5.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 363 components: diff --git a/Resources/Maps/_NF/Shuttles/Bus/publicts.yml b/Resources/Maps/_NF/Shuttles/Bus/publicts.yml index f8d29d883fa..25499d35b42 100644 --- a/Resources/Maps/_NF/Shuttles/Bus/publicts.yml +++ b/Resources/Maps/_NF/Shuttles/Bus/publicts.yml @@ -832,7 +832,7 @@ entities: - type: Transform pos: -1.5,3.5 parent: 8756 -- proto: SignShipDock +- proto: NFSignBus entities: - uid: 1 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml b/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml index 80a3221bf19..2ae9c55c22e 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml @@ -14394,7 +14394,7 @@ entities: - type: Transform pos: 7.5,24.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 2517 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml index 66619e85c2d..2b5846f04a9 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml @@ -10581,7 +10581,7 @@ entities: - type: Transform pos: -2.5,-3.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 74 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml index d2b25a7b616..fd6daca0282 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml @@ -4133,7 +4133,7 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,7.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 655 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml b/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml index f5a551a6211..9c4d5d323b4 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml @@ -12269,7 +12269,7 @@ entities: - type: Transform pos: -8.5,-2.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 1526 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/rosebudmkii.yml b/Resources/Maps/_NF/Shuttles/Expedition/rosebudmkii.yml index a8ed5f2dc1a..8cc9f69e145 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/rosebudmkii.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/rosebudmkii.yml @@ -9214,7 +9214,7 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,9.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 1343 components: diff --git a/Resources/Maps/_NF/Shuttles/Scrap/bison.yml b/Resources/Maps/_NF/Shuttles/Scrap/bison.yml index c41ad575eae..149f3f3d933 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/bison.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/bison.yml @@ -15436,7 +15436,7 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-28.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 1976 components: diff --git a/Resources/Maps/_NF/Shuttles/Scrap/point.yml b/Resources/Maps/_NF/Shuttles/Scrap/point.yml index a753a8d3e7c..b959c95af94 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/point.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/point.yml @@ -2022,7 +2022,7 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,9.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 101 components: diff --git a/Resources/Maps/_NF/Shuttles/apothecary.yml b/Resources/Maps/_NF/Shuttles/apothecary.yml index 9d98180f35f..930200051fd 100644 --- a/Resources/Maps/_NF/Shuttles/apothecary.yml +++ b/Resources/Maps/_NF/Shuttles/apothecary.yml @@ -2763,7 +2763,7 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-4.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 289 components: diff --git a/Resources/Maps/_NF/Shuttles/bazaar.yml b/Resources/Maps/_NF/Shuttles/bazaar.yml index ed40ab60c9a..1da3198e105 100644 --- a/Resources/Maps/_NF/Shuttles/bazaar.yml +++ b/Resources/Maps/_NF/Shuttles/bazaar.yml @@ -5912,7 +5912,7 @@ entities: - type: Transform pos: -4.5,5.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 604 components: diff --git a/Resources/Maps/_NF/Shuttles/caduceus.yml b/Resources/Maps/_NF/Shuttles/caduceus.yml index 8a86f40662c..fd6518168c4 100644 --- a/Resources/Maps/_NF/Shuttles/caduceus.yml +++ b/Resources/Maps/_NF/Shuttles/caduceus.yml @@ -8190,7 +8190,7 @@ entities: - type: Transform pos: -6.5,3.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 1362 components: diff --git a/Resources/Maps/_NF/Shuttles/investigator.yml b/Resources/Maps/_NF/Shuttles/investigator.yml index 77fba5ef10d..bf003be1913 100644 --- a/Resources/Maps/_NF/Shuttles/investigator.yml +++ b/Resources/Maps/_NF/Shuttles/investigator.yml @@ -4436,7 +4436,7 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-2.5 parent: 2 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 481 components: diff --git a/Resources/Maps/_NF/Shuttles/metastable.yml b/Resources/Maps/_NF/Shuttles/metastable.yml index 30432d6c414..24ebc93f100 100644 --- a/Resources/Maps/_NF/Shuttles/metastable.yml +++ b/Resources/Maps/_NF/Shuttles/metastable.yml @@ -7836,7 +7836,7 @@ entities: - type: Transform pos: -7.5,1.5 parent: 2 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 1334 components: diff --git a/Resources/Maps/_NF/Shuttles/phoenix.yml b/Resources/Maps/_NF/Shuttles/phoenix.yml index 201ecc6b92c..62aa569159c 100644 --- a/Resources/Maps/_NF/Shuttles/phoenix.yml +++ b/Resources/Maps/_NF/Shuttles/phoenix.yml @@ -5420,7 +5420,7 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,8.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 665 components: diff --git a/Resources/Maps/_NF/Shuttles/stasis.yml b/Resources/Maps/_NF/Shuttles/stasis.yml index 68f523c28ce..10b4343d888 100644 --- a/Resources/Maps/_NF/Shuttles/stasis.yml +++ b/Resources/Maps/_NF/Shuttles/stasis.yml @@ -4023,7 +4023,7 @@ entities: - type: Transform pos: 10.5,-5.5 parent: 1 -- proto: SignShipDock +- proto: NFSignDock entities: - uid: 486 components: diff --git a/Resources/Maps/_NF/Shuttles/stratos.yml b/Resources/Maps/_NF/Shuttles/stratos.yml index 7e27a770c86..4a4e5e31fef 100644 --- a/Resources/Maps/_NF/Shuttles/stratos.yml +++ b/Resources/Maps/_NF/Shuttles/stratos.yml @@ -5717,7 +5717,7 @@ entities: - type: Transform pos: -7.5,9.5 parent: 1 - - proto: SignShipDock + - proto: NFSignDock entities: - uid: 306 components: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml index 343bb85ce09..031683c11cb 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml @@ -82,14 +82,14 @@ # Directional Station Guide Signs - type: entity parent: BaseSign - id: BaseSignNF + id: NFBaseSign abstract: true components: - type: Sprite sprite: _NF/Structures/Wallmounts/signs.rsi - type: entity - parent: BaseSignNF + parent: NFBaseSign id: SignNfsd name: nfsd sign description: A sign that marks the area beyond as an NFSD area. @@ -98,7 +98,7 @@ state: nfsd - type: entity - parent: BaseSignNF + parent: NFBaseSign id: SignNfsdArmoury name: armoury sign description: A sign that marks the area beyond as an NFSD armoury. @@ -107,7 +107,7 @@ state: armoury - type: entity - parent: BaseSignNF + parent: NFBaseSign id: SignNfsdBrief name: briefing sign description: A sign that marks the area beyond as an NFSD briefing room. @@ -116,7 +116,7 @@ state: brief - type: entity - parent: BaseSignNF + parent: NFBaseSign id: SignNfsdBrig name: brig sign description: A sign that marks the area beyond as an NFSD brig. @@ -125,7 +125,7 @@ state: brig - type: entity - parent: BaseSignNF + parent: NFBaseSign id: SignNfsdBrigmed name: medbay sign description: A sign that marks the area beyond as an NFSD medbay. @@ -134,7 +134,7 @@ state: brigmed - type: entity - parent: BaseSignNF + parent: NFBaseSign id: SignNfsdDetective name: detective sign description: A sign that marks the area beyond as an NFSD detective's office. @@ -143,7 +143,7 @@ state: detective - type: entity - parent: BaseSignNF + parent: NFBaseSign id: SignNfsdLaw name: lawyer sign description: A sign that marks the area beyond as an NFSD lawyer's office. @@ -152,7 +152,7 @@ state: law - type: entity - parent: BaseSignNF + parent: NFBaseSign id: SignNfsdRange name: shooting range sign description: A sign that marks the area beyond as an NFSD shooting range. @@ -161,10 +161,28 @@ state: range - type: entity - parent: BaseSignNF + parent: NFBaseSign id: SignNfsdEvidence name: evidence sign description: A sign that marks the area beyond as an NFSD evidence room. components: - type: Sprite - state: evidence \ No newline at end of file + state: evidence + +- type: entity + parent: NFBaseSign + id: NFSignDock + name: dock sign + description: A sign that indicates shuttle docking nearby. + components: + - type: Sprite + state: dock + +- type: entity + parent: NFBaseSign + id: NFSignBus + name: bus sign + description: A sign that indicates that the transit shuttle docks nearby. + components: + - type: Sprite + state: bus diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/bus.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/bus.png new file mode 100644 index 00000000000..f338771b36f Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/bus.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/dock.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/dock.png new file mode 100644 index 00000000000..afb63e64a02 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/dock.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json index cb4eea8f0c0..3551fb249b8 100644 --- a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json @@ -1,155 +1,43 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "direction_sr - Created by MagnusCrowe for Frontier Station, cb1/cb2/cb3/cb4/nfsd/shop/vend - Created by GentleButter for Frontier Station, nfsd/range/law/brig/brigmed/detective/brief/armoury/evidence - Created by GhostPrinceLost for Frontier Station", + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "direction_sr - Created by MagnusCrowe for Frontier Station, cb1/cb2/cb3/cb4/nfsd/shop/vend - Created by GentleButter for Frontier Station, nfsd/range/law/brig/brigmed/detective/brief/armoury/evidence - Created by GhostPrinceLost for Frontier Station, bus/dock (edited from base signs.rsi/dock) made by Whatstone (Discord)", "states": [ { "name": "direction_sr", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_cb1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_cb2", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_cb3", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_cb4", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_nfsd", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_shop", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "direction_vend", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "nfsd" @@ -177,6 +65,12 @@ }, { "name": "evidence" + }, + { + "name": "bus" + }, + { + "name": "dock" } ] } diff --git a/Resources/migration.yml b/Resources/migration.yml index 40f2f627d45..dded2c59d50 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -457,4 +457,8 @@ MobRandomSecurityCorpse: DungeonHumanCorpseRandomSecurity RadioHandheld: RadioHandheldNF # 2024-09-06 -TilePrinterNF: CutterMachine \ No newline at end of file +TilePrinterNF: CutterMachine + +# 2024-09-22 +SignBusNF: NFSignBus +SignDockNF: NFSignDock \ No newline at end of file