diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 3128bfbbb8..e679a39682 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -123,3 +123,15 @@ amount: 1 - id: VehicleKeyATV amount: 1 + +- type: entity + id: CrateFunSyndicateSegway + name: syndicate segway crate + parent: CrateLivestock + components: + - type: StorageFill + contents: + - id: VehicleSyndicateSegway + amount: 1 + - id: VehicleKeySyndicateSegway + amount: 1 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 60b4465eb5..6f883d118c 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -361,4 +361,12 @@ id: UplinkSyndicateStamp category: Misc itemId: RubberStampSyndicate - price: 2 \ No newline at end of file + price: 2 + +- type: uplinkListing + id: UplinkSyndicateSegwayCrate + category: Misc + itemId: CrateFunSyndicateSegway + listingName: syndicate segway + description: Be an enemy of the corporation, in style! + price: 5 diff --git a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml index 52195984cc..7e6512a0f8 100644 --- a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml +++ b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml @@ -255,3 +255,58 @@ - VehicleKey - ATVKeys insertSound: /Audio/Effects/Vehicle/vehiclestartup.ogg + +- type: entity + id: VehicleSyndicateSegway + parent: VehicleBase + name: syndicate segway + description: Be an enemy of the corporation, in style. + components: + - type: Vehicle + northOnly: true + northOverride: -0.1 + southOverride: 0.1 + hornSound: + path: /Audio/Effects/Vehicle/policesiren.ogg + hornAction: + name: action-name-siren + description: action-desc-siren + icon: Objects/Fun/bikehorn.rsi/icon.png + iconOn: Objects/Fun/bikehorn.rsi/icon.png + event: !type:ToggleActionEvent + hornIsSiren: true + - type: Sprite + sprite: Objects/Vehicles/syndicatesegway.rsi + layers: + - state: vehicle + map: ["enum.VehicleVisualLayers.AutoAnimate"] + netsync: false + noRot: true + - type: Access + tags: + - Security + - Brig + - Maintenance + - Service + - type: Strap + buckleOffset: "0.15, -0.05" + maxBuckleDistance: 1 + - type: MovementSpeedModifier + baseWalkSpeed : 8 + baseSprintSpeed : 8 + - type: Armor + modifiers: + coeffecients: + Blunt: 0.8 + Slash: 0.6 + Piercing: 0.85 + - type: ItemSlots + slots: + key_slot: + name: Keys + whitelist: + requireAll: true + tags: + - VehicleKey + - SyndicateSegwayKeys + insertSound: /Audio/Effects/Vehicle/vehiclestartup.ogg diff --git a/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml b/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml index 518bb142e8..7d3f6dd307 100644 --- a/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml +++ b/Resources/Prototypes/Entities/Objects/Vehicles/keys.yml @@ -57,3 +57,19 @@ - PussyWagonKeys - SecwayKeys - ATVKeys + - SyndicateSegwayKeys + +- type: entity + parent: VehicleKeyPussyWagon + id: VehicleKeySyndicateSegway + name: syndicate segway keys + description: Patterned after the iconic EMAG design. + components: + - type: Tag + tags: + - VehicleKey + - SyndicateSegwayKeys + - type: Sprite + sprite: Objects/Vehicles/syndicatesegway.rsi + state: keys + netsync: false diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 7945042b58..c8d98d14ee 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -310,6 +310,9 @@ - type: Tag id: StringInstrument +- type: Tag + id: SyndicateSegwayKeys + - type: Tag id: Taser diff --git a/Resources/Textures/Objects/Vehicles/syndicatesegway.rsi/keys.png b/Resources/Textures/Objects/Vehicles/syndicatesegway.rsi/keys.png new file mode 100644 index 0000000000..8babcf1a65 Binary files /dev/null and b/Resources/Textures/Objects/Vehicles/syndicatesegway.rsi/keys.png differ diff --git a/Resources/Textures/Objects/Vehicles/syndicatesegway.rsi/meta.json b/Resources/Textures/Objects/Vehicles/syndicatesegway.rsi/meta.json new file mode 100644 index 0000000000..437f3e5d85 --- /dev/null +++ b/Resources/Textures/Objects/Vehicles/syndicatesegway.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, modified by Veritius", + "states": [ + { + "name": "vehicle", + "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 + ] + ] + }, + { + "name": "keys" + } + ] +} diff --git a/Resources/Textures/Objects/Vehicles/syndicatesegway.rsi/vehicle.png b/Resources/Textures/Objects/Vehicles/syndicatesegway.rsi/vehicle.png new file mode 100644 index 0000000000..5029f7044e Binary files /dev/null and b/Resources/Textures/Objects/Vehicles/syndicatesegway.rsi/vehicle.png differ