diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index b834388114..4c270d5b3c 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity abstract: true parent: ClothingHeadset id: ClothingHeadsetAlt @@ -137,3 +137,6 @@ sprite: Clothing/Ears/Headsets/syndicate.rsi - type: Clothing sprite: Clothing/Ears/Headsets/syndicate.rsi + - type: Tag + tags: + - SyndicateMonkey diff --git a/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/briefcases.yml new file mode 100644 index 0000000000..dffec63351 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/briefcases.yml @@ -0,0 +1,12 @@ +- type: entity + id: BriefcaseBrownCash + name: brown briefcase + parent: BriefcaseBrown + suffix: Cash + components: + - type: StorageFill + contents: + - id: SpaceCash1000 + amount: 20 + - type: Storage + capacity: 100 diff --git a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml index 6a1cc718d9..086d99369a 100644 --- a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml @@ -1,3 +1,5 @@ +# Wizard uplink + # Template # - type: listing # id: Wizard___ @@ -138,3 +140,116 @@ Bluespace: 1 categories: - WizardPointless + +# Syndicate Uplink + +# Job items + +# let me know when money actually becomes useful to normal people +- type: listing + id: UplinkBriefcaseCash + name: Briefcase of cash + description: contains 20 bundles of 1000 zorkmids. Good for bribery or purchasing goods for nefarious purposes. + productEntity: BriefcaseBrownCash + cost: + Telecrystal: 5 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Quartermaster + +- type: listing + id: UplinkBriefcaseSMG + name: Briefcase machine gun + description: It's a .25 caseless machine gun fitted into a standard brown briefcase. Reduced storage capacity. + productEntity: BriefcaseBrownSMG + cost: + Telecrystal: 12 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Lawyer + +- type: listing + id: UplinkGorillaCube + name: Sentient Gorilla Cube + description: A small teleportation device that lets the user request the assistance of a syndicate-enhanced gorilla. + productEntity: SentientGorillaCube + cost: + Telecrystal: 8 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Chef + +# Weapons + +- type: listing + id: UplinkMk45C + name: Mk.45C + description: A powerful and not-so-subtle handgun. A certified killing weapon. + productEntity: WeaponPistolMk45C + cost: + Telecrystal: 8 + categories: + - UplinkWeapons + +# Ammo + +- type: listing + id: UplinkCaselessRifleShortRubber + name: Short magazine (.25 caseless rubber) + description: Short magazine with 20 rubber rounds. Compatible with the briefcase machine gun. + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi, state: rubber } + productEntity: MagazineCaselessRifleShortRubber + cost: + Telecrystal: 1 + categories: + - UplinkAmmo + conditions: + - !type:BuyerJobCondition + whitelist: + - Lawyer + +- type: listing + id: UplinkCaselessRifleShortLethal + name: Short magazine (.25 caseless) + description: Short magazine with 20 rounds. Compatible with the briefcase machine gun. + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi, state: red } + productEntity: MagazineCaselessRifleShort + cost: + Telecrystal: 2 + categories: + - UplinkAmmo + conditions: + - !type:BuyerJobCondition + whitelist: + - Lawyer + +- type: listing + id: UplinkMk45CMagazine + name: Magnum magazine (.45 magnum) + description: Magnum magazine with 10 rounds. Compatible with the Mk.45C. + productEntity: MagazineMagnum12 + cost: + Telecrystal: 3 + categories: + - UplinkAmmo + +# explosives + +- type: listing + id: UplinkNukiePlushBomb + name: Explosive Syndicate Plushie + description: An adorable explosive plushie resembling a syndicate nuclear operative. Squeeze in your hands to trigger the very obvious 3 second fuse. + productEntity: PlushieNukeBomb + cost: + Telecrystal: 3 + categories: + - UplinkExplosives diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml new file mode 100644 index 0000000000..dd55796c77 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml @@ -0,0 +1,23 @@ +- type: entity + name: gorilla + parent: MobGorilla + suffix: Syndicate + id: MobGorillaSyndicate + description: Smashes, roars, looks cool. Don't stand near one. + components: + - type: InventorySlots + - type: SolutionRegeneration + solution: chemstream + generated: + reagents: + - ReagentId: Stimulants + Quantity: 0.20 + - type: IntrinsicRadioReceiver + channels: + - Syndicate + - type: IntrinsicRadioTransmitter + channels: + - Syndicate + - type: ActiveRadio + channels: + - Syndicate diff --git a/Resources/Prototypes/SimpleStation14/Entities/Objects/Devices/Syndicate_Gadgets/sentient_gorilla_cube.yml b/Resources/Prototypes/SimpleStation14/Entities/Objects/Devices/Syndicate_Gadgets/sentient_gorilla_cube.yml new file mode 100644 index 0000000000..29f66459f4 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Entities/Objects/Devices/Syndicate_Gadgets/sentient_gorilla_cube.yml @@ -0,0 +1,22 @@ +- type: entity + parent: BaseItem + id: SentientGorillaCube + name: Sentient Gorilla Cube + description: A tiny teleportation device. After activation, once a syndicate-brand sentient gorilla is ready to take on the mission of assisting you, they will be teleported in to the device's location. + components: + - type: Sprite + sprite: SimpleStation14/Objects/Devices/gorillacube.rsi + layers: + - state: gorillacube + netsync: false + - type: GhostRole + name: Syndicate Gorilla + description: Someone needs reinforcements. You, the first gorilla the syndicate could find and upgrade, will help them. + rules: Normal syndicate antagonist rules apply. Work with whoever called you in, and don't harm them. + - type: GhostRoleMobSpawner + prototype: MobGorillaSyndicate + - type: EmitSoundOnUse + sound: /Audio/Misc/emergency_meeting.ogg + - type: ItemCooldown + - type: UseDelay + delay: 300 diff --git a/Resources/Prototypes/SimpleStation14/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/SimpleStation14/Entities/Objects/Fun/toys.yml index 4ab976c918..fcfcf309b1 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Objects/Fun/toys.yml @@ -28,3 +28,29 @@ energy: 2 - type: RgbLightController layers: [0] + +- type: entity + parent: PlushieNuke + id: PlushieNukeBomb + name: nukie plushie + suffix: Exploding + description: A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. + components: + - type: EmitSoundOnUse + handle: false + - type: OnUseTimerTrigger + delay: 3.5 + examinable: false + beepSound: + path: "/Audio/Effects/beep1.ogg" + params: + volume: 2 + initialBeepDelay: 1 + beepInterval: 1 + - type: Explosive + explosionType: Default + maxIntensity: 8 + intensitySlope: 3 + totalIntensity: 65 + canCreateVacuum: false + - type: ExplodeOnTrigger diff --git a/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 36ed6da988..dbf0c75513 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -27,7 +27,7 @@ name: Mk.45C parent: BaseWeaponPistol id: WeaponPistolMk45C - description: "Incredibly Robust 'Sidearm'. Good against most anything. Certified Anti-Clown Device" + description: "Incredibly robust 'sidearm'. Good against most anything, and a certified anti-clown device." components: - type: Sprite sprite: SimpleStation14/Objects/Weapons/Guns/Pistols/mk45c.rsi diff --git a/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 310ff7b23d..4766d468cb 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -20,4 +20,55 @@ steps: 2 zeroVisible: true - type: Appearance - \ No newline at end of file + +- type: entity + parent: BaseStorageItem + id: BriefcaseBrownSMG + name: brown briefcase + suffix: Rifle + description: A handy briefcase. + components: + - type: Sprite + sprite: Objects/Storage/Briefcases/briefcase_brown.rsi + state: icon + - type: Item + sprite: Objects/Storage/Briefcases/briefcase_brown.rsi + size: 30 + - type: Storage + capacity: 30 + - type: AmmoCounter + - type: Gun + minAngle: 16 + maxAngle: 20 + fireRate: 5 + selectedMode: FullAuto + availableModes: + - SemiAuto + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/smg.ogg + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineCaselessRifleShort + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineCaselessRifle + gun_chamber: + name: Chamber + startingItem: CartridgeCaselessRifle + priority: 1 + whitelist: + tags: + - CartridgeCaselessRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: DynamicPrice + price: 500 diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json index a36cd58203..afbc0afa37 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json @@ -6,13 +6,13 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon_alt" - }, - { - "name": "alt-equipped-EARS", - "directions": 4 - } - ] + "states": [ + { + "name": "icon_alt" + }, + { + "name": "alt-equipped-EARS", + "directions": 4 + } + ] } diff --git a/Resources/Textures/SimpleStation14/Objects/Devices/gorillacube.rsi/gorillacube.png b/Resources/Textures/SimpleStation14/Objects/Devices/gorillacube.rsi/gorillacube.png new file mode 100644 index 0000000000..e21c0fbab3 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Objects/Devices/gorillacube.rsi/gorillacube.png differ diff --git a/Resources/Textures/SimpleStation14/Objects/Devices/gorillacube.rsi/meta.json b/Resources/Textures/SimpleStation14/Objects/Devices/gorillacube.rsi/meta.json new file mode 100644 index 0000000000..48676baa97 --- /dev/null +++ b/Resources/Textures/SimpleStation14/Objects/Devices/gorillacube.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "gorillacube" + } + ] +}