From 17739f4fdf2a8be08c3950b3752ef07025c0156f Mon Sep 17 00:00:00 2001 From: BulletGrade <66234359+BulletGrade@users.noreply.github.com> Date: Thu, 15 Apr 2021 15:24:55 -0300 Subject: [PATCH] Add BarDrobe and Bar Backroom into Saltern (#3843) * Add BarDrobe * Add Tophat and beer goggles into BarDrobe * Add bar backroom * Fix license * Fix roundstart atmos * Refactoring and using specific commit for meta.json * Add black shoes into BarDrobe * Update meta.json to standard Co-authored-by: Swept --- Resources/Maps/saltern.yml | 719 +++++++++--------- .../Catalog/VendingMachines/bardrobe.yml | 14 + .../Constructible/Power/vending_machines.yml | 26 + .../VendingMachines/bardrobe.rsi/broken.png | Bin 0 -> 792 bytes .../VendingMachines/bardrobe.rsi/meta.json | 35 + .../bardrobe.rsi/normal-unshaded.png | Bin 0 -> 581 bytes .../VendingMachines/bardrobe.rsi/off.png | Bin 0 -> 465 bytes .../VendingMachines/bardrobe.rsi/panel.png | Bin 0 -> 190 bytes 8 files changed, 443 insertions(+), 351 deletions(-) create mode 100644 Resources/Prototypes/Catalog/VendingMachines/bardrobe.yml create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/broken.png create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/meta.json create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/off.png create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/panel.png diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 0269e82894..b295156b7e 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -45,7 +45,7 @@ grids: snapsize: 1 chunks: - ind: "-1,-1" - tiles: GAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAIQAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAYAAAAGAAAACEAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAhAAAAIQAAABgAAAAhAAAAIQAAACEAAAAgAAAAGAAAABgAAAAhAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGAAAABgAAAAYAAAAGAAAABgAAAAhAAAAIAAAABgAAAAYAAAAIQAAABsAAAAbAAAAGwAAACEAAAAhAAAAIQAAABgAAAAYAAAAGAAAABgAAAAYAAAAIQAAACAAAAAYAAAAGAAAACEAAAAhAAAAGwAAACEAAAAhAAAAIAAAACAAAAAYAAAAGAAAABgAAAAYAAAAGAAAACEAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAGAAAABgAAAAYAAAAGAAAABgAAAAhAAAAIAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAACEAAAAhAAAAIQAAABgAAAAhAAAAIQAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAgAAAAGAAAAA8AAAAPAAAADwAAAA8AAAAPAAAAIQAAABgAAAAYAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAPAAAADwAAAA8AAAAPAAAADwAAACEAAAAYAAAAGAAAACAAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAADwAAAA8AAAAPAAAADwAAAA8AAAAhAAAAIQAAACEAAAAgAAAAFgAAAAoAAAAKAAAACgAAAAoAAAAKAAAAIQAAAA8AAAAPAAAADwAAAA8AAAAPAAAAHgAAAB4AAAAeAAAAIQAAACEAAAAKAAAACgAAAAoAAAAKAAAACgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAhAAAAIQAAABYAAAAhAAAAIQAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAhAAAAGwAAABsAAAAbAAAAGwAAABsAAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAIQAAABsAAAAbAAAAGwAAABsAAAAWAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAA== + tiles: GAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAIQAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAYAAAAGAAAACEAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAhAAAAIQAAABgAAAAhAAAAIQAAACEAAAAgAAAAGAAAABgAAAAhAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGAAAABgAAAAYAAAAGAAAABgAAAAhAAAAIAAAABgAAAAYAAAAIQAAABsAAAAbAAAAGwAAACEAAAAhAAAAIQAAABgAAAAYAAAAGAAAABgAAAAYAAAAIQAAACAAAAAYAAAAGAAAACEAAAAhAAAAGwAAACEAAAAhAAAAIAAAACAAAAAYAAAAGAAAABgAAAAYAAAAGAAAACEAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAGAAAABgAAAAYAAAAGAAAABgAAAAhAAAAIAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAIQAAABgAAAAhAAAAIQAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAGAAAABgAAAAYAAAAGAAAABgAAAAeAAAAHgAAAB4AAAAeAAAAGAAAAA8AAAAPAAAADwAAAA8AAAAPAAAAIQAAABgAAAAYAAAAIAAAABgAAAAgAAAAHgAAAB4AAAAeAAAAHgAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAACEAAAAYAAAAGAAAACAAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAADwAAAA8AAAAPAAAADwAAAA8AAAAhAAAAIQAAACEAAAAgAAAAFgAAAAoAAAAKAAAACgAAAAoAAAAKAAAAIQAAAA8AAAAPAAAADwAAAA8AAAAPAAAAHgAAAB4AAAAeAAAAIQAAACEAAAAKAAAACgAAAAoAAAAKAAAACgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAhAAAAIQAAABYAAAAhAAAAIQAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAhAAAAGwAAABsAAAAbAAAAGwAAABsAAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAIQAAABsAAAAbAAAAGwAAABsAAAAWAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAA== - ind: "-1,0" tiles: FgAAABsAAAAbAAAAGwAAABsAAAAWAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAbAAAAGwAAABsAAAAbAAAAFgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAhAAAAFgAAABYAAAAhAAAAIQAAACEAAAAhAAAAIQAAACAAAAAhAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAIQAAABYAAAAgAAAAIQAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAACEAAAAWAAAAIAAAACEAAAAWAAAAFgAAABYAAAAhAAAAFgAAACEAAAAhAAAAFgAAABYAAAAhAAAAIQAAABYAAAAhAAAAIQAAACAAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAgAAAAGAAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIQAAACEAAAAhAAAAIQAAAA== - ind: "0,-1" @@ -5381,7 +5381,7 @@ entities: - uid: 585 type: LockerBoozeFilled components: - - pos: -6.5,-6.5 + - pos: -11.5,-6.5 parent: 853 type: Transform - IsPlaceable: False @@ -5592,16 +5592,13 @@ entities: ents: [] type: ContainerContainer - uid: 603 - type: AirlockMaintIntLocked + type: Crowbar components: - - rot: 4.371139006309477E-08 rad - pos: -12.5,-8.5 + - pos: -15.521677,-10.494378 parent: 853 type: Transform - - containers: - board: !type:Container - ents: [] - type: ContainerContainer + - canCollide: False + type: Physics - uid: 604 type: AirlockMaintRnDLocked components: @@ -9111,7 +9108,6 @@ entities: 19,12: 0 19,13: 0 19,14: 0 - 19,15: 0 20,0: 0 20,1: 0 20,2: 0 @@ -9127,7 +9123,6 @@ entities: 20,12: 0 20,13: 0 20,14: 0 - 20,15: 0 21,0: 0 21,1: 0 21,2: 0 @@ -9143,7 +9138,6 @@ entities: 21,12: 0 21,13: 0 21,14: 0 - 21,15: 0 22,0: 0 22,1: 0 22,2: 0 @@ -9159,7 +9153,6 @@ entities: 22,12: 0 22,13: 0 22,14: 0 - 22,15: 0 23,0: 0 23,1: 0 23,2: 0 @@ -9175,7 +9168,6 @@ entities: 23,12: 0 23,13: 0 23,14: 0 - 23,15: 0 24,0: 0 24,1: 0 24,2: 0 @@ -9481,6 +9473,9 @@ entities: 11,20: 0 11,21: 0 11,22: 0 + 11,23: 0 + 11,24: 0 + 11,25: 0 12,16: 0 12,17: 0 12,18: 0 @@ -9488,6 +9483,9 @@ entities: 12,20: 0 12,21: 0 12,22: 0 + 12,23: 0 + 12,24: 0 + 12,25: 0 13,16: 0 13,17: 0 13,18: 0 @@ -9495,6 +9493,9 @@ entities: 13,20: 0 13,21: 0 13,22: 0 + 13,23: 0 + 13,24: 0 + 13,25: 0 14,16: 0 14,17: 0 14,18: 0 @@ -9502,6 +9503,9 @@ entities: 14,20: 0 14,21: 0 14,22: 0 + 14,23: 0 + 14,24: 0 + 14,25: 0 15,16: 0 -32,0: 0 -32,1: 0 @@ -10007,6 +10011,13 @@ entities: 0,-19: 0 0,-18: 0 0,-17: 0 + 1,-32: 0 + 1,-31: 0 + 1,-30: 0 + 1,-29: 0 + 1,-28: 0 + 1,-27: 0 + 1,-26: 0 1,-25: 0 1,-24: 0 1,-23: 0 @@ -10016,6 +10027,13 @@ entities: 1,-19: 0 1,-18: 0 1,-17: 0 + 2,-32: 0 + 2,-31: 0 + 2,-30: 0 + 2,-29: 0 + 2,-28: 0 + 2,-27: 0 + 2,-26: 0 2,-25: 0 2,-24: 0 2,-23: 0 @@ -10025,6 +10043,13 @@ entities: 2,-19: 0 2,-18: 0 2,-17: 0 + 3,-32: 0 + 3,-31: 0 + 3,-30: 0 + 3,-29: 0 + 3,-28: 0 + 3,-27: 0 + 3,-26: 0 3,-25: 0 3,-24: 0 3,-23: 0 @@ -10034,6 +10059,13 @@ entities: 3,-19: 0 3,-18: 0 3,-17: 0 + 4,-32: 0 + 4,-31: 0 + 4,-30: 0 + 4,-29: 0 + 4,-28: 0 + 4,-27: 0 + 4,-26: 0 4,-25: 0 4,-24: 0 4,-23: 0 @@ -10043,6 +10075,13 @@ entities: 4,-19: 0 4,-18: 0 4,-17: 0 + 5,-32: 0 + 5,-31: 0 + 5,-30: 0 + 5,-29: 0 + 5,-28: 0 + 5,-27: 0 + 5,-26: 0 5,-25: 0 5,-24: 0 5,-23: 0 @@ -10052,6 +10091,15 @@ entities: 5,-19: 0 5,-18: 0 5,-17: 0 + 6,-32: 0 + 6,-31: 0 + 6,-30: 0 + 6,-29: 0 + 6,-28: 0 + 6,-27: 0 + 6,-26: 0 + 6,-25: 0 + 6,-24: 0 6,-23: 0 6,-22: 0 6,-21: 0 @@ -10059,42 +10107,107 @@ entities: 6,-19: 0 6,-18: 0 6,-17: 0 + 7,-32: 0 + 7,-31: 0 + 7,-30: 0 + 7,-29: 0 + 7,-28: 0 + 7,-27: 0 + 7,-26: 0 + 7,-25: 0 + 7,-24: 0 + 7,-23: 0 7,-22: 0 7,-21: 0 7,-20: 0 7,-19: 0 7,-18: 0 7,-17: 0 + 8,-32: 0 + 8,-31: 0 + 8,-30: 0 + 8,-29: 0 + 8,-28: 0 + 8,-27: 0 + 8,-26: 0 + 8,-25: 0 + 8,-24: 0 + 8,-23: 0 8,-22: 0 8,-21: 0 8,-20: 0 8,-19: 0 8,-18: 0 8,-17: 0 + 9,-32: 0 + 9,-31: 0 + 9,-30: 0 + 9,-29: 0 + 9,-28: 0 + 9,-27: 0 + 9,-26: 0 + 9,-25: 0 + 9,-24: 0 + 9,-23: 0 9,-22: 0 9,-21: 0 9,-20: 0 9,-19: 0 9,-18: 0 9,-17: 0 + 10,-32: 0 + 10,-31: 0 + 10,-30: 0 + 10,-29: 0 + 10,-28: 0 + 10,-27: 0 + 10,-26: 0 + 10,-25: 0 + 10,-24: 0 + 10,-23: 0 10,-22: 0 10,-21: 0 10,-20: 0 10,-19: 0 10,-18: 0 10,-17: 0 + 11,-32: 0 + 11,-31: 0 + 11,-30: 0 + 11,-29: 0 + 11,-28: 0 + 11,-27: 0 + 11,-26: 0 + 11,-25: 0 + 11,-24: 0 + 11,-23: 0 11,-22: 0 11,-21: 0 11,-20: 0 11,-19: 0 11,-18: 0 11,-17: 0 + 12,-32: 0 + 12,-31: 0 + 12,-30: 0 + 12,-29: 0 + 12,-28: 0 + 12,-27: 0 + 12,-26: 0 + 12,-25: 0 + 12,-24: 0 + 12,-23: 0 12,-22: 0 12,-21: 0 12,-20: 0 12,-19: 0 12,-18: 0 12,-17: 0 + 13,-32: 0 + 13,-31: 0 + 13,-30: 0 + 13,-29: 0 + 13,-28: 0 13,-27: 0 13,-26: 0 13,-25: 0 @@ -10481,46 +10594,6 @@ entities: -1,33: 0 16,16: 0 17,16: 0 - 18,17: 0 - 18,18: 0 - 18,19: 0 - 18,20: 0 - 18,21: 0 - 19,16: 0 - 19,17: 0 - 19,18: 0 - 19,19: 0 - 19,20: 0 - 19,21: 0 - 20,16: 0 - 20,17: 0 - 20,18: 0 - 20,19: 0 - 20,20: 0 - 20,21: 0 - 21,16: 0 - 21,17: 0 - 21,18: 0 - 21,19: 0 - 21,20: 0 - 21,21: 0 - 22,16: 0 - 22,17: 0 - 22,18: 0 - 22,19: 0 - 22,20: 0 - 22,21: 0 - 23,16: 0 - 23,17: 0 - 23,18: 0 - 23,19: 0 - 23,20: 0 - 23,21: 0 - 24,17: 0 - 24,18: 0 - 24,19: 0 - 24,20: 0 - 24,21: 0 0,32: 0 0,33: 0 1,32: 0 @@ -10751,42 +10824,100 @@ entities: 45,8: 0 45,9: 0 45,10: 0 + 45,11: 0 + 45,12: 0 + 45,13: 0 + 45,14: 0 46,0: 0 46,1: 0 46,2: 0 46,3: 0 46,4: 0 46,5: 0 + 46,6: 0 + 46,7: 0 + 46,8: 0 + 46,9: 0 + 46,10: 0 + 46,11: 0 + 46,12: 0 + 46,13: 0 + 46,14: 0 47,0: 0 47,1: 0 47,2: 0 47,3: 0 47,4: 0 47,5: 0 + 47,6: 0 + 47,7: 0 + 47,8: 0 + 47,9: 0 + 47,10: 0 + 47,11: 0 + 47,12: 0 + 47,13: 0 + 47,14: 0 48,0: 0 48,1: 0 48,2: 0 48,3: 0 48,4: 0 48,5: 0 + 48,6: 0 + 48,7: 0 + 48,8: 0 + 48,9: 0 + 48,10: 0 + 48,11: 0 + 48,12: 0 + 48,13: 0 + 48,14: 0 49,0: 0 49,1: 0 49,2: 0 49,3: 0 49,4: 0 49,5: 0 + 49,6: 0 + 49,7: 0 + 49,8: 0 + 49,9: 0 + 49,10: 0 + 49,11: 0 + 49,12: 0 + 49,13: 0 + 49,14: 0 50,0: 0 50,1: 0 50,2: 0 50,3: 0 50,4: 0 50,5: 0 + 50,6: 0 + 50,7: 0 + 50,8: 0 + 50,9: 0 + 50,10: 0 + 50,11: 0 + 50,12: 0 + 50,13: 0 + 50,14: 0 51,0: 0 51,1: 0 51,2: 0 51,3: 0 51,4: 0 51,5: 0 + 51,6: 0 + 51,7: 0 + 51,8: 0 + 51,9: 0 + 51,10: 0 + 51,11: 0 + 51,12: 0 + 51,13: 0 + 51,14: 0 32,-9: 0 32,-8: 0 32,-7: 0 @@ -10877,18 +11008,48 @@ entities: 42,-3: 0 42,-2: 0 42,-1: 0 + 43,-16: 0 + 43,-15: 0 + 43,-14: 0 + 43,-13: 0 + 43,-12: 0 + 43,-11: 0 + 43,-10: 0 + 43,-9: 0 43,-6: 0 43,-5: 0 43,-4: 0 43,-3: 0 43,-2: 0 43,-1: 0 + 44,-15: 0 + 44,-14: 0 + 44,-13: 0 + 44,-12: 0 + 44,-11: 0 + 44,-10: 0 + 44,-9: 0 44,-6: 0 44,-5: 0 44,-4: 0 44,-3: 0 44,-2: 0 44,-1: 0 + 45,-15: 0 + 45,-14: 0 + 45,-13: 0 + 45,-12: 0 + 45,-11: 0 + 45,-10: 0 + 45,-9: 0 + 46,-16: 0 + 46,-15: 0 + 46,-14: 0 + 46,-13: 0 + 46,-12: 0 + 46,-11: 0 + 46,-10: 0 + 46,-9: 0 46,-8: 0 46,-7: 0 46,-6: 0 @@ -10896,6 +11057,13 @@ entities: 46,-4: 0 46,-3: 0 46,-2: 0 + 47,-15: 0 + 47,-14: 0 + 47,-13: 0 + 47,-12: 0 + 47,-11: 0 + 47,-10: 0 + 47,-9: 0 47,-8: 0 47,-7: 0 47,-6: 0 @@ -11119,6 +11287,12 @@ entities: -1,-19: 0 -1,-18: 0 -1,-17: 0 + -26,-17: 0 + -25,-17: 0 + -24,-17: 0 + -23,-17: 0 + -22,-17: 0 + -21,-17: 0 -20,-17: 0 -19,-28: 0 -19,-27: 0 @@ -11234,6 +11408,9 @@ entities: -27,-3: 0 -27,-2: 0 -27,-1: 0 + -26,-16: 0 + -26,-15: 0 + -26,-14: 0 -26,-13: 0 -26,-12: 0 -26,-11: 0 @@ -11589,6 +11766,13 @@ entities: -33,-3: 0 -33,-2: 0 -33,-1: 0 + 48,-15: 0 + 48,-14: 0 + 48,-13: 0 + 48,-12: 0 + 48,-11: 0 + 48,-10: 0 + 48,-9: 0 48,-8: 0 48,-7: 0 48,-6: 0 @@ -11597,160 +11781,6 @@ entities: 48,-3: 0 48,-2: 0 48,-1: 0 - 49,-8: 0 - 49,-7: 0 - 49,-6: 0 - 49,-5: 0 - 49,-4: 0 - 49,-3: 0 - 49,-2: 0 - 49,-1: 0 - 50,-8: 0 - 50,-7: 0 - 50,-6: 0 - 50,-5: 0 - 50,-4: 0 - 50,-3: 0 - 50,-2: 0 - 50,-1: 0 - 51,-8: 0 - 51,-7: 0 - 51,-6: 0 - 51,-5: 0 - 51,-4: 0 - 51,-3: 0 - 51,-2: 0 - 51,-1: 0 - 52,-8: 0 - 52,-7: 0 - 52,-6: 0 - 52,-5: 0 - 52,-4: 0 - 52,-3: 0 - 52,-2: 0 - -26,-17: 0 - -25,-17: 0 - -24,-17: 0 - -23,-17: 0 - -22,-17: 0 - -21,-17: 0 - -26,-16: 0 - -26,-15: 0 - -26,-14: 0 - 11,23: 0 - 11,24: 0 - 11,25: 0 - 12,23: 0 - 12,24: 0 - 12,25: 0 - 13,23: 0 - 13,24: 0 - 13,25: 0 - 14,23: 0 - 14,24: 0 - 14,25: 0 - 45,11: 0 - 45,12: 0 - 45,13: 0 - 45,14: 0 - 46,6: 0 - 46,7: 0 - 46,8: 0 - 46,9: 0 - 46,10: 0 - 46,11: 0 - 46,12: 0 - 46,13: 0 - 46,14: 0 - 47,6: 0 - 47,7: 0 - 47,8: 0 - 47,9: 0 - 47,10: 0 - 47,11: 0 - 47,12: 0 - 47,13: 0 - 47,14: 0 - 48,6: 0 - 48,7: 0 - 48,8: 0 - 48,9: 0 - 48,10: 0 - 48,11: 0 - 48,12: 0 - 48,13: 0 - 48,14: 0 - 49,6: 0 - 49,7: 0 - 49,8: 0 - 49,9: 0 - 49,10: 0 - 49,11: 0 - 49,12: 0 - 49,13: 0 - 49,14: 0 - 50,6: 0 - 50,7: 0 - 50,8: 0 - 50,9: 0 - 50,10: 0 - 50,11: 0 - 50,12: 0 - 50,13: 0 - 50,14: 0 - 51,6: 0 - 51,7: 0 - 51,8: 0 - 51,9: 0 - 51,10: 0 - 51,11: 0 - 51,12: 0 - 51,13: 0 - 51,14: 0 - 43,-16: 0 - 43,-15: 0 - 43,-14: 0 - 43,-13: 0 - 43,-12: 0 - 43,-11: 0 - 43,-10: 0 - 43,-9: 0 - 44,-15: 0 - 44,-14: 0 - 44,-13: 0 - 44,-12: 0 - 44,-11: 0 - 44,-10: 0 - 44,-9: 0 - 45,-15: 0 - 45,-14: 0 - 45,-13: 0 - 45,-12: 0 - 45,-11: 0 - 45,-10: 0 - 45,-9: 0 - 46,-16: 0 - 46,-15: 0 - 46,-14: 0 - 46,-13: 0 - 46,-12: 0 - 46,-11: 0 - 46,-10: 0 - 46,-9: 0 - 47,-15: 0 - 47,-14: 0 - 47,-13: 0 - 47,-12: 0 - 47,-11: 0 - 47,-10: 0 - 47,-9: 0 - 48,-15: 0 - 48,-14: 0 - 48,-13: 0 - 48,-12: 0 - 48,-11: 0 - 48,-10: 0 - 48,-9: 0 49,-16: 0 49,-15: 0 49,-14: 0 @@ -11759,6 +11789,14 @@ entities: 49,-11: 0 49,-10: 0 49,-9: 0 + 49,-8: 0 + 49,-7: 0 + 49,-6: 0 + 49,-5: 0 + 49,-4: 0 + 49,-3: 0 + 49,-2: 0 + 49,-1: 0 50,-15: 0 50,-14: 0 50,-13: 0 @@ -11766,6 +11804,14 @@ entities: 50,-11: 0 50,-10: 0 50,-9: 0 + 50,-8: 0 + 50,-7: 0 + 50,-6: 0 + 50,-5: 0 + 50,-4: 0 + 50,-3: 0 + 50,-2: 0 + 50,-1: 0 51,-15: 0 51,-14: 0 51,-13: 0 @@ -11773,6 +11819,14 @@ entities: 51,-11: 0 51,-10: 0 51,-9: 0 + 51,-8: 0 + 51,-7: 0 + 51,-6: 0 + 51,-5: 0 + 51,-4: 0 + 51,-3: 0 + 51,-2: 0 + 51,-1: 0 52,-16: 0 52,-15: 0 52,-14: 0 @@ -11781,6 +11835,13 @@ entities: 52,-11: 0 52,-10: 0 52,-9: 0 + 52,-8: 0 + 52,-7: 0 + 52,-6: 0 + 52,-5: 0 + 52,-4: 0 + 52,-3: 0 + 52,-2: 0 53,-15: 0 53,-14: 0 53,-13: 0 @@ -11995,115 +12056,6 @@ entities: 45,-33: 0 46,-34: 0 47,-34: 0 - 1,-32: 0 - 1,-31: 0 - 1,-30: 0 - 1,-29: 0 - 1,-28: 0 - 1,-27: 0 - 1,-26: 0 - 2,-32: 0 - 2,-31: 0 - 2,-30: 0 - 2,-29: 0 - 2,-28: 0 - 2,-27: 0 - 2,-26: 0 - 3,-32: 0 - 3,-31: 0 - 3,-30: 0 - 3,-29: 0 - 3,-28: 0 - 3,-27: 0 - 3,-26: 0 - 4,-32: 0 - 4,-31: 0 - 4,-30: 0 - 4,-29: 0 - 4,-28: 0 - 4,-27: 0 - 4,-26: 0 - 5,-32: 0 - 5,-31: 0 - 5,-30: 0 - 5,-29: 0 - 5,-28: 0 - 5,-27: 0 - 5,-26: 0 - 6,-32: 0 - 6,-31: 0 - 6,-30: 0 - 6,-29: 0 - 6,-28: 0 - 6,-27: 0 - 6,-26: 0 - 6,-25: 0 - 6,-24: 0 - 7,-32: 0 - 7,-31: 0 - 7,-30: 0 - 7,-29: 0 - 7,-28: 0 - 7,-27: 0 - 7,-26: 0 - 7,-25: 0 - 7,-24: 0 - 7,-23: 0 - 8,-32: 0 - 8,-31: 0 - 8,-30: 0 - 8,-29: 0 - 8,-28: 0 - 8,-27: 0 - 8,-26: 0 - 8,-25: 0 - 8,-24: 0 - 8,-23: 0 - 9,-32: 0 - 9,-31: 0 - 9,-30: 0 - 9,-29: 0 - 9,-28: 0 - 9,-27: 0 - 9,-26: 0 - 9,-25: 0 - 9,-24: 0 - 9,-23: 0 - 10,-32: 0 - 10,-31: 0 - 10,-30: 0 - 10,-29: 0 - 10,-28: 0 - 10,-27: 0 - 10,-26: 0 - 10,-25: 0 - 10,-24: 0 - 10,-23: 0 - 11,-32: 0 - 11,-31: 0 - 11,-30: 0 - 11,-29: 0 - 11,-28: 0 - 11,-27: 0 - 11,-26: 0 - 11,-25: 0 - 11,-24: 0 - 11,-23: 0 - 12,-32: 0 - 12,-31: 0 - 12,-30: 0 - 12,-29: 0 - 12,-28: 0 - 12,-27: 0 - 12,-26: 0 - 12,-25: 0 - 12,-24: 0 - 12,-23: 0 - 13,-32: 0 - 13,-31: 0 - 13,-30: 0 - 13,-29: 0 - 13,-28: 0 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -12536,10 +12488,9 @@ entities: parent: 853 type: Transform - uid: 904 - type: Catwalk + type: solid_wall components: - - rot: 4.371139006309477E-08 rad - pos: -9.5,-7.5 + - pos: -13.5,-6.5 parent: 853 type: Transform - uid: 905 @@ -24074,12 +24025,13 @@ entities: parent: 853 type: Transform - uid: 2395 - type: solid_wall + type: Crowbar components: - - rot: 4.371139006309477E-08 rad - pos: -10.5,-8.5 + - pos: -15.459177,-11.244378 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 2396 type: solid_wall components: @@ -24097,15 +24049,13 @@ entities: - uid: 2398 type: solid_wall components: - - rot: 4.371139006309477E-08 rad - pos: -14.5,-8.5 + - pos: -15.5,-9.5 parent: 853 type: Transform - uid: 2399 type: solid_wall components: - - rot: 4.371139006309477E-08 rad - pos: -15.5,-8.5 + - pos: -10.5,-8.5 parent: 853 type: Transform - uid: 2400 @@ -24284,12 +24234,15 @@ entities: parent: 853 type: Transform - uid: 2423 - type: Table + type: ApcExtensionCable components: - - rot: 4.371139006309477E-08 rad - pos: -15.5,-12.5 + - pos: -13.5,-9.5 parent: 853 type: Transform + - visible: False + type: Sprite + - canCollide: False + type: Physics - uid: 2424 type: Table components: @@ -24417,10 +24370,9 @@ entities: parent: 853 type: Transform - uid: 2441 - type: WeldingFuelTankFull + type: VendingBarDrobe components: - - rot: 4.371139006309477E-08 rad - pos: -15.5,-9.5 + - pos: -12.5,-6.5 parent: 853 type: Transform - uid: 2442 @@ -27394,6 +27346,8 @@ entities: pos: -14.5,-8.5 parent: 853 type: Transform + - visible: False + type: Sprite - canCollide: False type: Physics - uid: 2740 @@ -27924,7 +27878,7 @@ entities: type: SalternApc components: - rot: 4.371139006309477E-08 rad - pos: -14.5,-8.5 + pos: -15.5,-9.5 parent: 853 type: Transform - startingCharge: 11999.45 @@ -38232,6 +38186,8 @@ entities: pos: -9.5,-7.5 parent: 853 type: Transform + - visible: False + type: Sprite - canCollide: False type: Physics - uid: 3792 @@ -38241,6 +38197,8 @@ entities: pos: -9.5,-6.5 parent: 853 type: Transform + - visible: False + type: Sprite - canCollide: False type: Physics - uid: 3793 @@ -38250,6 +38208,8 @@ entities: pos: -10.5,-6.5 parent: 853 type: Transform + - visible: False + type: Sprite - canCollide: False type: Physics - uid: 3794 @@ -38259,6 +38219,8 @@ entities: pos: -11.5,-6.5 parent: 853 type: Transform + - visible: False + type: Sprite - canCollide: False type: Physics - uid: 3795 @@ -38268,6 +38230,8 @@ entities: pos: -12.5,-6.5 parent: 853 type: Transform + - visible: False + type: Sprite - canCollide: False type: Physics - uid: 3796 @@ -38498,6 +38462,8 @@ entities: pos: -14.5,-8.5 parent: 853 type: Transform + - visible: False + type: Sprite - canCollide: False type: Physics - uid: 3818 @@ -39398,7 +39364,7 @@ entities: type: EmergencyLight components: - rot: 4.371139006309477E-08 rad - pos: -13.885857,-9 + pos: -13.5,-10 parent: 853 type: Transform - powerLoad: 1 @@ -39746,15 +39712,15 @@ entities: - canCollide: False type: Physics - uid: 3941 - type: Crowbar + type: solid_wall components: - - pos: -15.314676,-12.357978 + - pos: -9.5,-8.5 parent: 853 type: Transform - uid: 3942 - type: Crowbar + type: solid_wall components: - - pos: -15.502176,-11.748603 + - pos: -13.5,-7.5 parent: 853 type: Transform - uid: 3943 @@ -40548,14 +40514,11 @@ entities: - airBlocked: False type: Airtight - uid: 4030 - type: Firelock + type: solid_wall components: - - rot: 4.371139006309477E-08 rad - pos: -10.5,-7.5 + - pos: -8.5,-7.5 parent: 853 type: Transform - - airBlocked: False - type: Airtight - uid: 4031 type: ComfyChair components: @@ -40686,14 +40649,11 @@ entities: - airBlocked: False type: Airtight - uid: 4047 - type: Firelock + type: solid_wall components: - - rot: 4.371139006309477E-08 rad - pos: -10.5,-6.5 + - pos: -8.5,-7.5 parent: 853 type: Transform - - airBlocked: False - type: Airtight - uid: 4048 type: ApcExtensionCable components: @@ -40952,8 +40912,7 @@ entities: - uid: 4079 type: solid_wall components: - - rot: 4.371139006309477E-08 rad - pos: -8.5,-7.5 + - pos: -8.5,-8.5 parent: 853 type: Transform - uid: 4080 @@ -47709,4 +47668,62 @@ entities: pos: 4.5,-30.5 parent: 853 type: Transform +- uid: 4881 + type: AirlockMaintBarLocked + components: + - pos: -12.5,-8.5 + parent: 853 + type: Transform + - containers: + board: !type:Container + ents: [] + type: ContainerContainer +- uid: 4882 + type: WeldingFuelTankFull + components: + - pos: -15.5,-12.5 + parent: 853 + type: Transform +- uid: 4883 + type: solid_wall + components: + - pos: -13.5,-9.5 + parent: 853 + type: Transform +- uid: 4884 + type: AirlockMaint + components: + - pos: -14.5,-9.5 + parent: 853 + type: Transform + - containers: + board: !type:Container + ents: [] + type: ContainerContainer +- uid: 4885 + type: ApcExtensionCable + components: + - pos: -15.5,-10.5 + parent: 853 + type: Transform + - visible: False + type: Sprite + - canCollide: False + type: Physics +- uid: 4886 + type: Table + components: + - pos: -10.5,-6.5 + parent: 853 + type: Transform +- uid: 4887 + type: ApcExtensionCable + components: + - pos: -13.5,-10.5 + parent: 853 + type: Transform + - visible: False + type: Sprite + - canCollide: False + type: Physics ... diff --git a/Resources/Prototypes/Catalog/VendingMachines/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/bardrobe.yml new file mode 100644 index 0000000000..51262f8190 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/bardrobe.yml @@ -0,0 +1,14 @@ +- type: vendingMachineInventory + id: BarDrobe + name: BarDrobe + description: A stylish vendor to dispense the most stylish bar clothing! + spriteName: bardrobe + startingInventory: + ClothingHeadHatTophat : 2 + ClothingEyesGlassesBeer : 2 + ClothingHeadsetService: 2 + ClothingUniformJumpsuitBartender: 2 + ClothingUniformJumpskirtBartender: 2 + ClothingUniformJumpsuitBartenderPurple: 2 + ClothingShoesColorBlack : 2 + ClothingOuterVestKevlar : 1 diff --git a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml index 6ebff58054..bd27c56ba1 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml @@ -98,6 +98,32 @@ - type: AccessReader access: [["Service"]] +- type: entity + parent: VendingMachine + id: VendingBarDrobe + name: BarDrobe + components: + - type: VendingMachine + pack: BarDrobe + - type: Sprite + sprite: Constructible/Power/VendingMachines/bardrobe.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Unlit"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Appearance + visuals: + - type: VendingMachineVisualizer + normalUnshaded: true + broken: true + - type: WiresVisualizer + - type: AccessReader + access: [["Service"]] + - type: entity parent: VendingMachine id: VendingMachineCart diff --git a/Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..6a9d53a95d6f051961e2101b8caf8d85fe39332e GIT binary patch literal 792 zcmV+z1LypSP)X|Y&UQw&^l=+C3cFQ9vD6Cv9k7^!-o!RiMzq%w8krI z-}@)5KihcZzD~7TB@9F2I7Ui|Qi_LHzw$`^n()MtV>Z@W0}zHG^?Du8 z^H53=hM`@LAuLCguU>}#q zes!(2ErC`@DXj{ou@C|w{_bFwWdQiT50n+?1t$VZDS{wCYrUm0KoA6^X=-z!tUxa~ zy#=s2S(>JJ-sT;U=edp3G(`wuNeCerzqSDkNP#Gd$g-?7sn(h_O|9gxxm9MnTovg1 zEifdcln5cL5nl(IB=>rsUPp8~BlQcAKcBhPcY6~+SwK@i~kK1!*Ez_({{H@{Q>W_a=qO1`nVFdt6&0;owd&-_lU7z%3JMBNjxK4b ziTZkmA;AHYCr>_h?AYbYmv`>mxqkinHEY&v-@YAa$oWed*MO8nNswRgf9!zatgzlI zpc>8skH}&M2EM}}%y>M1MGDZNNuDl_AsNnZuV2h-HsEo%XxVVvh=X_OU6T6hCw zm@^nf=by`DZb-Fh)C-szaE!a7@$%0iJ6T4v@A8aamF3jKFEZEd`d`7y&V1z4-1E~# z7;nux`*$_d?YA?7SoWQVSYYgM2E?e7Y>?P*^N;xzZaukN7Y6>%e=?(*O8n_Zb)J7#dlkSW}pHZCfh3C3iaKish;g zwlvI%b~&$bTg;cKM%LzDIFrF&Vc(A#>6!<;B^A;dW-unPb$}Q*_A{^R^S{!?C|;GD z$ZIicK1*y8tHmtaJ8gC=xVR0@*Z-IJHE;cjEewr|e!kx>@T1Gi&>+C^yW*N{F9iFi kM%g~Gff`pYD{R+ z9s_G^xl1i6db{V|_vDp8?lWD^eee7HcsTDl*98M9it=T&-mCKYyi30}EGpjJ*#>`m zx5b!^kK*v?*znzuEe<`%0r+asz@Xf;Ma>d zJ^#R2#?$U41u*NMMkbeSo4eg^OMn*STwwlZ#nbM^IXC=9I0c>56!Xryhw44jCnMO5 ze*WsEm+2n(tMmz&sW0b%J^?d12{;Kj2@GZev2X;jaD-G#NUQ0ca^6kCW<>NqSl& zfI8>!GKRZCfz;H?7&$Q#Kx-fLL#6=HW!fzF1wixTD@E@bvU_NvA($#wnr(!Xc+! zxY-SW0LU@E^H5*bg578Khv|+_lg$sW*?jCvdBeJOdWZj3DYB`nt4B%rOPnz=`)6-p h#&6~hvQUMA!DX(Lkd@zrT|fshc)I$ztaD0e0svz&KxzO0 literal 0 HcmV?d00001