From 056fd6718b14e2e2bf82a41e7ca78835f22c7f89 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sat, 21 Sep 2024 12:56:09 -0400 Subject: [PATCH 1/5] New bus and dock signs --- Resources/Maps/_NF/Outpost/frontier.yml | 24 ++-- Resources/Maps/_NF/POI/anomalousgeode.yml | 2 +- Resources/Maps/_NF/POI/arena.yml | 2 +- Resources/Maps/_NF/POI/lodge.yml | 2 +- Resources/Maps/_NF/POI/trade.yml | 20 +-- .../_NF/Shuttles/BlackMarket/schooner.yml | 2 +- Resources/Maps/_NF/Shuttles/Bus/publicts.yml | 2 +- .../Maps/_NF/Shuttles/Expedition/ambition.yml | 2 +- .../Maps/_NF/Shuttles/Expedition/anchor.yml | 2 +- .../Maps/_NF/Shuttles/Expedition/brigand.yml | 2 +- .../Maps/_NF/Shuttles/Expedition/gourd.yml | 2 +- .../_NF/Shuttles/Expedition/rosebudmkii.yml | 2 +- Resources/Maps/_NF/Shuttles/Scrap/bison.yml | 2 +- Resources/Maps/_NF/Shuttles/Scrap/point.yml | 2 +- Resources/Maps/_NF/Shuttles/apothecary.yml | 2 +- Resources/Maps/_NF/Shuttles/bazaar.yml | 2 +- Resources/Maps/_NF/Shuttles/caduceus.yml | 2 +- Resources/Maps/_NF/Shuttles/investigator.yml | 2 +- Resources/Maps/_NF/Shuttles/metastable.yml | 2 +- Resources/Maps/_NF/Shuttles/phoenix.yml | 2 +- Resources/Maps/_NF/Shuttles/stasis.yml | 2 +- Resources/Maps/_NF/Shuttles/stratos.yml | 2 +- .../Structures/Wallmounts/Signs/signs.yml | 20 ++- .../Structures/Wallmounts/signs.rsi/bus.png | Bin 0 -> 254 bytes .../Structures/Wallmounts/signs.rsi/dock.png | Bin 0 -> 257 bytes .../Structures/Wallmounts/signs.rsi/meta.json | 134 ++---------------- 26 files changed, 77 insertions(+), 161 deletions(-) create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/bus.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/dock.png diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index 1db3b814461..b13874cf797 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: SignBusNF + 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: SignDockNF 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..cbacdc71b3f 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: SignDockNF entities: - uid: 771 components: diff --git a/Resources/Maps/_NF/POI/arena.yml b/Resources/Maps/_NF/POI/arena.yml index 08248ed32e2..a038d80e42f 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: SignDockNF entities: - uid: 2976 components: diff --git a/Resources/Maps/_NF/POI/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml index e3c4e2418f6..1cacbdbd93d 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: SignDockNF entities: - uid: 360 components: diff --git a/Resources/Maps/_NF/POI/trade.yml b/Resources/Maps/_NF/POI/trade.yml index 3255b630b3d..d180e6eac51 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: SignBusNF 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: SignDockNF + 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..54d49d51f89 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: SignDockNF entities: - uid: 363 components: diff --git a/Resources/Maps/_NF/Shuttles/Bus/publicts.yml b/Resources/Maps/_NF/Shuttles/Bus/publicts.yml index f8d29d883fa..762f1a065cc 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: SignBusNF entities: - uid: 1 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml b/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml index 80a3221bf19..401f894cf8f 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: SignDockNF entities: - uid: 2517 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml index 66619e85c2d..5c07dd66783 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: SignDockNF entities: - uid: 74 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml index d2b25a7b616..087c745b797 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: SignDockNF entities: - uid: 655 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml b/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml index f5a551a6211..1408c77a35a 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: SignDockNF entities: - uid: 1526 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/rosebudmkii.yml b/Resources/Maps/_NF/Shuttles/Expedition/rosebudmkii.yml index a8ed5f2dc1a..6ec7c933c5f 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: SignDockNF entities: - uid: 1343 components: diff --git a/Resources/Maps/_NF/Shuttles/Scrap/bison.yml b/Resources/Maps/_NF/Shuttles/Scrap/bison.yml index c41ad575eae..d1a2511815b 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: SignDockNF entities: - uid: 1976 components: diff --git a/Resources/Maps/_NF/Shuttles/Scrap/point.yml b/Resources/Maps/_NF/Shuttles/Scrap/point.yml index a753a8d3e7c..597052a50a3 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: SignDockNF entities: - uid: 101 components: diff --git a/Resources/Maps/_NF/Shuttles/apothecary.yml b/Resources/Maps/_NF/Shuttles/apothecary.yml index 9d98180f35f..e51a3f0e2be 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: SignDockNF entities: - uid: 289 components: diff --git a/Resources/Maps/_NF/Shuttles/bazaar.yml b/Resources/Maps/_NF/Shuttles/bazaar.yml index ed40ab60c9a..bf5bef36636 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: SignDockNF entities: - uid: 604 components: diff --git a/Resources/Maps/_NF/Shuttles/caduceus.yml b/Resources/Maps/_NF/Shuttles/caduceus.yml index 8a86f40662c..770d52c9ffb 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: SignDockNF entities: - uid: 1362 components: diff --git a/Resources/Maps/_NF/Shuttles/investigator.yml b/Resources/Maps/_NF/Shuttles/investigator.yml index 77fba5ef10d..a7cb3f69009 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: SignDockNF entities: - uid: 481 components: diff --git a/Resources/Maps/_NF/Shuttles/metastable.yml b/Resources/Maps/_NF/Shuttles/metastable.yml index 30432d6c414..bc68aee101c 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: SignDockNF entities: - uid: 1334 components: diff --git a/Resources/Maps/_NF/Shuttles/phoenix.yml b/Resources/Maps/_NF/Shuttles/phoenix.yml index 201ecc6b92c..b7a63be105c 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: SignDockNF entities: - uid: 665 components: diff --git a/Resources/Maps/_NF/Shuttles/stasis.yml b/Resources/Maps/_NF/Shuttles/stasis.yml index 68f523c28ce..31bce21e0c6 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: SignDockNF entities: - uid: 486 components: diff --git a/Resources/Maps/_NF/Shuttles/stratos.yml b/Resources/Maps/_NF/Shuttles/stratos.yml index 7e27a770c86..05a6648dba2 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: SignDockNF 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..df615460143 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml @@ -167,4 +167,22 @@ 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: BaseSignNF + id: SignDockNF + name: dock sign + description: A sign that indicates shuttle docking nearby. + components: + - type: Sprite + state: dock + +- type: entity + parent: BaseSignNF + id: SignBusNF + 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 0000000000000000000000000000000000000000..f338771b36f28e2a75146fec7e59f4e5840e8397 GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyq5(c3u0Yz-Jw76DYIf_^im9jn z|Np;g|AYC8*++pA>?J{d!3;nlAXr+z>^D$oqNj^vh(+(($&q{q6gXV&w*8jhsg)Jt z;(I&Oe%1$xX>7^=CQX%keC~WvSqJ;dc^m2&D>wxrmN2wTI^DvMRrgiE;mq?J{d!3;nlAXr+z>^D$oil>WXh(+(($&7rh3OvrN*Y5s5VKtGp zfOYbJ??o!Llh*Ed{A2p1=*9C-ubIOZfA3Xih!wM%s3wcS`>G&@e_V`5n*| Date: Sat, 21 Sep 2024 13:15:05 -0400 Subject: [PATCH 2/5] Attribution --- .../_NF/Structures/Wallmounts/signs.rsi/meta.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json index a32d14e10bc..3551fb249b8 100644 --- a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json @@ -1,11 +1,11 @@ { - "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", From 84aedb8fd4d164150093f241a35f3c40065c578e Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sat, 21 Sep 2024 13:22:14 -0400 Subject: [PATCH 3/5] Stratos indentation fix --- Resources/Maps/_NF/Shuttles/stratos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Maps/_NF/Shuttles/stratos.yml b/Resources/Maps/_NF/Shuttles/stratos.yml index 05a6648dba2..94e6a69e7e2 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: SignDockNF + - proto: SignDockNF entities: - uid: 306 components: From 9f16442c38b7e9acb7bc017e04d4503d28e25e41 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 22 Sep 2024 00:23:33 +0300 Subject: [PATCH 4/5] Small edit --- Resources/Maps/_NF/Outpost/frontier.yml | 4 +-- Resources/Maps/_NF/POI/anomalousgeode.yml | 2 +- Resources/Maps/_NF/POI/arena.yml | 2 +- Resources/Maps/_NF/POI/lodge.yml | 2 +- Resources/Maps/_NF/POI/trade.yml | 4 +-- .../_NF/Shuttles/BlackMarket/schooner.yml | 2 +- Resources/Maps/_NF/Shuttles/Bus/publicts.yml | 2 +- .../Maps/_NF/Shuttles/Expedition/ambition.yml | 2 +- .../Maps/_NF/Shuttles/Expedition/anchor.yml | 2 +- .../Maps/_NF/Shuttles/Expedition/brigand.yml | 2 +- .../Maps/_NF/Shuttles/Expedition/gourd.yml | 2 +- .../_NF/Shuttles/Expedition/rosebudmkii.yml | 2 +- Resources/Maps/_NF/Shuttles/Scrap/bison.yml | 2 +- Resources/Maps/_NF/Shuttles/Scrap/point.yml | 2 +- Resources/Maps/_NF/Shuttles/apothecary.yml | 2 +- Resources/Maps/_NF/Shuttles/bazaar.yml | 2 +- Resources/Maps/_NF/Shuttles/caduceus.yml | 2 +- Resources/Maps/_NF/Shuttles/investigator.yml | 2 +- Resources/Maps/_NF/Shuttles/metastable.yml | 2 +- Resources/Maps/_NF/Shuttles/phoenix.yml | 2 +- Resources/Maps/_NF/Shuttles/stasis.yml | 2 +- Resources/Maps/_NF/Shuttles/stratos.yml | 2 +- .../Structures/Wallmounts/Signs/signs.yml | 28 +++++++++---------- 23 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index af9df13e16d..7f834eea491 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -31815,7 +31815,7 @@ entities: - type: Transform pos: 38.5,21.5 parent: 2173 -- proto: SignBusNF +- proto: NFSignBus entities: - uid: 2096 components: @@ -31827,7 +31827,7 @@ entities: - type: Transform pos: -8.5,17.5 parent: 2173 -- proto: SignDockNF +- proto: NFSignDock entities: - uid: 472 components: diff --git a/Resources/Maps/_NF/POI/anomalousgeode.yml b/Resources/Maps/_NF/POI/anomalousgeode.yml index cbacdc71b3f..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: SignDockNF +- proto: NFSignDock entities: - uid: 771 components: diff --git a/Resources/Maps/_NF/POI/arena.yml b/Resources/Maps/_NF/POI/arena.yml index a038d80e42f..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: SignDockNF +- proto: NFSignDock entities: - uid: 2976 components: diff --git a/Resources/Maps/_NF/POI/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml index dbfe3e66c22..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: SignDockNF +- proto: NFSignDock entities: - uid: 360 components: diff --git a/Resources/Maps/_NF/POI/trade.yml b/Resources/Maps/_NF/POI/trade.yml index d180e6eac51..7fe0393b538 100644 --- a/Resources/Maps/_NF/POI/trade.yml +++ b/Resources/Maps/_NF/POI/trade.yml @@ -26973,7 +26973,7 @@ entities: - type: Transform pos: 50.5,-1.5 parent: 1 -- proto: SignBusNF +- proto: NFSignBus entities: - uid: 6379 components: @@ -26985,7 +26985,7 @@ entities: - type: Transform pos: -1.5,-15.5 parent: 1 -- proto: SignDockNF +- proto: NFSignDock entities: - uid: 6377 components: diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml index 54d49d51f89..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: SignDockNF +- 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 762f1a065cc..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: SignBusNF +- 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 401f894cf8f..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: SignDockNF +- 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 5c07dd66783..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: SignDockNF +- 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 087c745b797..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: SignDockNF +- 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 1408c77a35a..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: SignDockNF +- 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 6ec7c933c5f..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: SignDockNF +- 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 d1a2511815b..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: SignDockNF +- 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 597052a50a3..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: SignDockNF +- proto: NFSignDock entities: - uid: 101 components: diff --git a/Resources/Maps/_NF/Shuttles/apothecary.yml b/Resources/Maps/_NF/Shuttles/apothecary.yml index e51a3f0e2be..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: SignDockNF +- proto: NFSignDock entities: - uid: 289 components: diff --git a/Resources/Maps/_NF/Shuttles/bazaar.yml b/Resources/Maps/_NF/Shuttles/bazaar.yml index bf5bef36636..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: SignDockNF +- proto: NFSignDock entities: - uid: 604 components: diff --git a/Resources/Maps/_NF/Shuttles/caduceus.yml b/Resources/Maps/_NF/Shuttles/caduceus.yml index 770d52c9ffb..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: SignDockNF +- proto: NFSignDock entities: - uid: 1362 components: diff --git a/Resources/Maps/_NF/Shuttles/investigator.yml b/Resources/Maps/_NF/Shuttles/investigator.yml index a7cb3f69009..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: SignDockNF +- proto: NFSignDock entities: - uid: 481 components: diff --git a/Resources/Maps/_NF/Shuttles/metastable.yml b/Resources/Maps/_NF/Shuttles/metastable.yml index bc68aee101c..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: SignDockNF +- proto: NFSignDock entities: - uid: 1334 components: diff --git a/Resources/Maps/_NF/Shuttles/phoenix.yml b/Resources/Maps/_NF/Shuttles/phoenix.yml index b7a63be105c..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: SignDockNF +- proto: NFSignDock entities: - uid: 665 components: diff --git a/Resources/Maps/_NF/Shuttles/stasis.yml b/Resources/Maps/_NF/Shuttles/stasis.yml index 31bce21e0c6..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: SignDockNF +- proto: NFSignDock entities: - uid: 486 components: diff --git a/Resources/Maps/_NF/Shuttles/stratos.yml b/Resources/Maps/_NF/Shuttles/stratos.yml index 94e6a69e7e2..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: SignDockNF + - 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 df615460143..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,7 +161,7 @@ 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. @@ -170,8 +170,8 @@ state: evidence - type: entity - parent: BaseSignNF - id: SignDockNF + parent: NFBaseSign + id: NFSignDock name: dock sign description: A sign that indicates shuttle docking nearby. components: @@ -179,8 +179,8 @@ state: dock - type: entity - parent: BaseSignNF - id: SignBusNF + parent: NFBaseSign + id: NFSignBus name: bus sign description: A sign that indicates that the transit shuttle docks nearby. components: From 194d763cc7f666f707a1613d88f8d15e2442691a Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 22 Sep 2024 00:24:35 +0300 Subject: [PATCH 5/5] Update migration.yml --- Resources/migration.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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