diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml index c9c74e6c0a8..3f4eedbf778 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml @@ -21,3 +21,4 @@ ClothingBackpackDuffelSyndicateEVABundle: 12 BoxHoloparasite: 2 VestineChemistryVial: 2 + HoverbikeSyndicateFlatpack: 3 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml index 464a1404327..c863edaf1eb 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml @@ -631,3 +631,14 @@ entity: VehicleHoverbikeNfsdKey - type: StaticPrice price: 750 + +- type: entity + parent: HoverbikeFlatpack + id: HoverbikeSyndicateFlatpack + name: syndicate hoverbike flatpack + description: A flatpack used for constructing a hoverbike. Keys already slotted in the ignition. + components: + - type: Flatpack + entity: VehicleHoverbikeSyndicateKey + - type: StaticPrice + price: 750 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml b/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml index be0f216aede..fdda560c9e7 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml @@ -355,4 +355,166 @@ whitelist: components: - Stunbaton - priority: 2 \ No newline at end of file + priority: 2 + +# Pirate +- type: entity + parent: VehicleHoverbikeMailcarrier + id: VehicleHoverbikePirate + name: pirate hoverbike + description: Yarr! Dis be me sovereign space shuttle. Now, whaur me rum? + components: + - type: Storage + grid: + - 0,0,5,3 + maxItemSize: Huge + - type: Sprite + sprite: _NF/Objects/Vehicles/hoverbike.rsi + layers: + - state: hull + color: "#3d2712" + - state: engine + map: ["enum.VehicleVisualLayers.AutoAnimate"] + - state: pirate + - state: lights + shader: unshaded + noRot: true + - type: ItemSlots + slots: + key_slot: + name: vehicle-slot-component-slot-name-keys + whitelist: + requireAll: true + tags: + - VehicleKey + - HoverbikeKeys + priority: 1 + insertSound: + path: /Audio/Effects/Vehicle/vehiclestartup.ogg + params: + volume: -5 + piratemusket: + name: gun + whitelist: + components: + - Gun + priority: 2 + - type: ItemMapper + mapLayers: + piratemusket: + whitelist: + components: + - Gun + sprite: _NF/Objects/Vehicles/hoverbike.rsi + - type: Appearance + - type: Contraband + +- type: entity + parent: VehicleHoverbikePirate + id: VehicleHoverbikePirateKey + suffix: With key + components: + - type: ItemSlots + slots: + key_slot: + name: vehicle-slot-component-slot-name-keys + whitelist: + requireAll: true + tags: + - VehicleKey + - HoverbikeKeys + startingItem: VehicleKeyHoverbikeNF + priority: 1 + insertSound: + path: /Audio/Effects/Vehicle/vehiclestartup.ogg + params: + volume: -5 + piratemusket: + name: gun + whitelist: + components: + - Gun + priority: 2 + +# Syndicate +- type: entity + parent: VehicleHoverbikeMailcarrier + id: VehicleHoverbikeSyndicate + name: syndicate hoverbike + description: This thing screams style. And war crimes. + components: + - type: Storage + grid: + - 0,0,8,4 + - type: Sprite + sprite: _NF/Objects/Vehicles/hoverbike.rsi + layers: + - state: hull + color: "#b51e0e" + - state: engine + map: ["enum.VehicleVisualLayers.AutoAnimate"] + - state: syndicatebags + - state: syndicatelights + shader: unshaded + noRot: true + - type: ItemSlots + slots: + key_slot: + name: vehicle-slot-component-slot-name-keys + whitelist: + requireAll: true + tags: + - VehicleKey + - HoverbikeKeys + priority: 1 + insertSound: + path: /Audio/Effects/Vehicle/vehiclestartup.ogg + params: + volume: -5 + syndicategun: + name: gun + whitelist: + components: + - Gun + priority: 2 + - type: ItemMapper + mapLayers: + syndicategun: + whitelist: + components: + - Gun + sprite: _NF/Objects/Vehicles/hoverbike.rsi + - type: Appearance + - type: PointLight + enabled: false + color: green + radius: 6 + energy: 3 + - type: Contraband + +- type: entity + parent: VehicleHoverbikeSyndicate + id: VehicleHoverbikeSyndicateKey + suffix: With key + components: + - type: ItemSlots + slots: + key_slot: + name: vehicle-slot-component-slot-name-keys + whitelist: + requireAll: true + tags: + - VehicleKey + - HoverbikeKeys + startingItem: VehicleKeyHoverbikeNF + priority: 1 + insertSound: + path: /Audio/Effects/Vehicle/vehiclestartup.ogg + params: + volume: -5 + syndicategun: + name: gun + whitelist: + components: + - Gun + priority: 2 diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/meta.json b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/meta.json index 93c306e5887..57a68c7d20c 100644 --- a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/meta.json @@ -81,6 +81,56 @@ [ 0.2, 0.2, 0.2, 0.2 ] ] }, + { + "name": "pirate", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ] + ] + }, + { + "name": "piratemusket", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ] + ] + }, + { + "name": "syndicatebags", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ] + ] + }, + { + "name": "syndicatelights", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ] + ] + }, + { + "name": "syndicategun", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ] + ] + }, { "name": "lights", "directions": 4, diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/pirate.png b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/pirate.png new file mode 100644 index 00000000000..d3d5554b331 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/pirate.png differ diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/piratemusket.png b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/piratemusket.png new file mode 100644 index 00000000000..84d6821ec8f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/piratemusket.png differ diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatebags.png b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatebags.png new file mode 100644 index 00000000000..df6927f0b45 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatebags.png differ diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicategun.png b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicategun.png new file mode 100644 index 00000000000..d8148cbc0b9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicategun.png differ diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatelights.png b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatelights.png new file mode 100644 index 00000000000..89a0aa013f8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatelights.png differ