From 7c16cd14b3d682222ac96902cc56d44ffe17a57c Mon Sep 17 00:00:00 2001 From: Cabbage Date: Wed, 14 Jun 2023 10:18:19 -0400 Subject: [PATCH 01/13] exploding plushie --- .../Entities/Objects/Fun/toys.yml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/SimpleStation14/Entities/Objects/Fun/toys.yml index 4ab976c918..5d761d2a30 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: 4 + examinable: false + beepSound: + path: "/Audio/Effects/beep1.ogg" + params: + volume: 5 + initialBeepDelay: 0 + beepInterval: 1 + - type: Explosive + explosionType: Default + maxIntensity: 8 + intensitySlope: 3 + totalIntensity: 60 + canCreateVacuum: false + - type: ExplodeOnTrigger From 7d338c8c464a5ec204a10a6583e563adf2428819 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Wed, 14 Jun 2023 17:33:49 -0400 Subject: [PATCH 02/13] syndicate gorilla spawner --- .../Entities/Clothing/Ears/headsets_alt.yml | 4 +- .../Catalog/Fills/Items/briefcases.yml | 11 +++ .../Catalog/uplink_catalog.yml | 73 ++++++++++++++++++ .../Entities/Mobs/NPCs/primates.yml | 12 +++ .../sentient_gorilla_cube.yml | 22 ++++++ .../Entities/Objects/Fun/toys.yml | 8 +- .../Entities/Objects/Misc/space_cash.yml | 12 +++ .../Objects/Weapons/Guns/SMGs/smgs.yml | 53 ++++++++++++- .../syndimonkey_inventory_template.yml | 34 ++++++++ .../alt-equipped-EARS-syndimonkey.png | Bin 0 -> 109 bytes .../Ears/Headsets/syndicate.rsi/meta.json | 22 +++--- 11 files changed, 236 insertions(+), 15 deletions(-) create mode 100644 Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/briefcases.yml create mode 100644 Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml create mode 100644 Resources/Prototypes/SimpleStation14/Entities/Objects/Devices/Syndicate_Gadgets/sentient_gorilla_cube.yml create mode 100644 Resources/Prototypes/SimpleStation14/Entities/Objects/Misc/space_cash.yml create mode 100644 Resources/Prototypes/SimpleStation14/InventoryTemplates/syndimonkey_inventory_template.yml create mode 100644 Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS-syndimonkey.png diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index b834388114..f384a5e0c7 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,5 @@ sprite: Clothing/Ears/Headsets/syndicate.rsi - type: Clothing sprite: Clothing/Ears/Headsets/syndicate.rsi + - tags: + - Syndimonkey 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..d949a4cfc1 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/briefcases.yml @@ -0,0 +1,11 @@ +# let me know when money actually becomes useful to normal people +# - type: entity +# id: BriefcaseBrownCash +# name: brown briefcase +# parent: BriefcaseBrown +# suffix: Cash +# components: +# - type: StorageFill +# contents: +# - id: SpaceCash10000 +# amount: 2 diff --git a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml index 6a1cc718d9..55c7d2dc85 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,74 @@ Bluespace: 1 categories: - WizardPointless + +# Syndicate Uplink + +# let me know when money actually becomes useful to normal people +# - type: listing +# id: Uplink +# name: Briefcase of cash +# description: contains 2 bundles of 10000 zorkmids. Good for bribery or purchasing goods for nefarious purposes. +# productEntity: BriefcaseBrownCash +# cost: +# Telecrystal: 7 +# categories: +# - UplinkJob +# conditions: +# - !type:BuyerJobCondition +# whitelist: +# - Quartermaster + +- type: listing + id: UplinkBriefcaseMG + name: Briefcase machine gun + description: It's a .25 caseless machine gun fitted into a standard brown briefcase. Reduced storage capacity. Comes preloaded with rubber rounds. + productEntity: BriefcaseBrownSMG + cost: + Telecrystal: 10 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Lawyer + +- 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: 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..bec03cdd31 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml @@ -0,0 +1,12 @@ +- type: entity + name: gorilla + parent: MobGorilla + suffix: syndicate + id: MobGorillaSyndicate + description: Smashes, roars, looks cool. Don't stand near one. + components: + - type: Inventory + speciesId: syndimonkey + templateId: syndimonkey + loadout: + prototype: [] 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..24d1dcbac3 --- /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: It's actually 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. + components: + - type: Sprite + sprite: Objects/Devices/communication.rsi + layers: + - state: old-radio + netsync: false + - type: GhostRole + name: Syndicate Agent + 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: MobHumanSyndicateAgent + - 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 5d761d2a30..fcfcf309b1 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Objects/Fun/toys.yml @@ -39,18 +39,18 @@ - type: EmitSoundOnUse handle: false - type: OnUseTimerTrigger - delay: 4 + delay: 3.5 examinable: false beepSound: path: "/Audio/Effects/beep1.ogg" params: - volume: 5 - initialBeepDelay: 0 + volume: 2 + initialBeepDelay: 1 beepInterval: 1 - type: Explosive explosionType: Default maxIntensity: 8 intensitySlope: 3 - totalIntensity: 60 + totalIntensity: 65 canCreateVacuum: false - type: ExplodeOnTrigger diff --git a/Resources/Prototypes/SimpleStation14/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/SimpleStation14/Entities/Objects/Misc/space_cash.yml new file mode 100644 index 0000000000..d64b899e40 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Entities/Objects/Misc/space_cash.yml @@ -0,0 +1,12 @@ +# let me know when money actually becomes useful to normal people +- type: entity + parent: SpaceCash + id: SpaceCash10000 + name: zorkmids + suffix: 10000 + components: + - type: Icon + sprite: Objects/Economy/cash.rsi + state: cash_1000 + - type: Stack + count: 10000 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..51f563fc13 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: 8 + maxAngle: 8 + 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: MagazineCaselessRifleShortRubber + 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: CartridgeCaselessRifleRubber + priority: 1 + whitelist: + tags: + - CartridgeCaselessRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: DynamicPrice + price: 500 diff --git a/Resources/Prototypes/SimpleStation14/InventoryTemplates/syndimonkey_inventory_template.yml b/Resources/Prototypes/SimpleStation14/InventoryTemplates/syndimonkey_inventory_template.yml new file mode 100644 index 0000000000..0cb0e0f112 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/InventoryTemplates/syndimonkey_inventory_template.yml @@ -0,0 +1,34 @@ +- type: inventoryTemplate + id: syndimonkey + slots: + - name: head + slotTexture: head + slotFlags: HEAD + slotGroup: MainHotbar + uiWindowPos: 0,0 + strippingWindowPos: 0,0 + displayName: Head + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,1 + strippingWindowPos: 1,1 + displayName: Mask + - name: id + slotTexture: id + slotFlags: IDCARD + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 2,1 + strippingWindowPos: 2,4 + displayName: ID + - name: ears + slotTexture: ears + slotFlags: EARS + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,0 + displayName: Ears + whitelist: + tags: + - Syndimonkey diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS-syndimonkey.png b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS-syndimonkey.png new file mode 100644 index 0000000000000000000000000000000000000000..2975c479be7566a6c59a7aca4e20778aa850feb7 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)ID7sLn`LH rJ;=xlwOr9UK@K`#+rw1POb(`njxgN@xNA?@buF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json index a36cd58203..062eacde48 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json @@ -6,13 +6,17 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon_alt" - }, - { - "name": "alt-equipped-EARS", - "directions": 4 - } - ] + "states": [ + { + "name": "icon_alt" + }, + { + "name": "alt-equipped-EARS", + "directions": 4 + }, + { + "name": "alt-equipped-EARS-syndimonkey", + "directions": 4 + } + ] } From 6be37110f38f0f64ad0b3aaec533e0edeaf873e4 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Wed, 14 Jun 2023 17:36:49 -0400 Subject: [PATCH 03/13] proper tags --- Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml | 5 +++-- .../Devices/Syndicate_Gadgets/sentient_gorilla_cube.yml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index f384a5e0c7..7fb4d1a55c 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -137,5 +137,6 @@ sprite: Clothing/Ears/Headsets/syndicate.rsi - type: Clothing sprite: Clothing/Ears/Headsets/syndicate.rsi - - tags: - - Syndimonkey + - type: Tag + tags: + - Syndimonkey 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 index 24d1dcbac3..06adf9b8cd 100644 --- 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 @@ -10,11 +10,11 @@ - state: old-radio netsync: false - type: GhostRole - name: Syndicate Agent + 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: MobHumanSyndicateAgent + prototype: MobGorillaSyndicate - type: EmitSoundOnUse sound: /Audio/Misc/emergency_meeting.ogg - type: ItemCooldown From 83647476aaf2fb3ee7b1c2d4618d9881a37dec63 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Wed, 14 Jun 2023 19:44:11 -0400 Subject: [PATCH 04/13] gorilla cube more better --- .../Catalog/uplink_catalog.yml | 16 +++++++++++- .../Entities/Mobs/NPCs/primates.yml | 23 +++++++++++++----- .../sentient_gorilla_cube.yml | 6 ++--- .../Objects/Weapons/Guns/SMGs/smgs.yml | 8 +++--- Resources/Prototypes/SimpleStation14/tags.yml | 3 +++ .../Devices/gorillacube.rsi/gorillacube.png | Bin 0 -> 247 bytes .../Objects/Devices/gorillacube.rsi/meta.json | 14 +++++++++++ 7 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 Resources/Textures/SimpleStation14/Objects/Devices/gorillacube.rsi/gorillacube.png create mode 100644 Resources/Textures/SimpleStation14/Objects/Devices/gorillacube.rsi/meta.json diff --git a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml index 55c7d2dc85..0354478103 100644 --- a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml @@ -161,7 +161,7 @@ - type: listing id: UplinkBriefcaseMG name: Briefcase machine gun - description: It's a .25 caseless machine gun fitted into a standard brown briefcase. Reduced storage capacity. Comes preloaded with rubber rounds. + description: It's a .25 caseless machine gun fitted into a standard brown briefcase. Reduced storage capacity. productEntity: BriefcaseBrownSMG cost: Telecrystal: 10 @@ -211,3 +211,17 @@ Telecrystal: 3 categories: - UplinkExplosives + +- type: listing + id: UplinkNukiePlushBomb + 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 diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml index bec03cdd31..d5f8975462 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml @@ -1,12 +1,23 @@ - type: entity name: gorilla parent: MobGorilla - suffix: syndicate + suffix: Syndicate id: MobGorillaSyndicate description: Smashes, roars, looks cool. Don't stand near one. components: - - type: Inventory - speciesId: syndimonkey - templateId: syndimonkey - loadout: - prototype: [] + - type: Inventory + speciesId: syndimonkey + templateId: syndimonkey + - type: Loadout + prototypes: [ SyndimonkeyGear ] + - type: DraconicBloodstream + reagent: + solutionName: chemicals + reagent: Stimulants + unitsPerUpdate: 1.0 + accumulatorTime: 5 + +- type: startingGear + id: SyndimonkeyGear + equipment: + ears: ClothingHeadsetAltSyndicate 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 index 06adf9b8cd..29f66459f4 100644 --- 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 @@ -2,12 +2,12 @@ parent: BaseItem id: SentientGorillaCube name: Sentient Gorilla Cube - description: It's actually 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. + 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: Objects/Devices/communication.rsi + sprite: SimpleStation14/Objects/Devices/gorillacube.rsi layers: - - state: old-radio + - state: gorillacube netsync: false - type: GhostRole name: Syndicate Gorilla 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 51f563fc13..4766d468cb 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -38,8 +38,8 @@ capacity: 30 - type: AmmoCounter - type: Gun - minAngle: 8 - maxAngle: 8 + minAngle: 16 + maxAngle: 20 fireRate: 5 selectedMode: FullAuto availableModes: @@ -52,7 +52,7 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineCaselessRifleShortRubber + startingItem: MagazineCaselessRifleShort insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg priority: 2 @@ -61,7 +61,7 @@ - MagazineCaselessRifle gun_chamber: name: Chamber - startingItem: CartridgeCaselessRifleRubber + startingItem: CartridgeCaselessRifle priority: 1 whitelist: tags: diff --git a/Resources/Prototypes/SimpleStation14/tags.yml b/Resources/Prototypes/SimpleStation14/tags.yml index ffe8954d1d..ce67272f55 100644 --- a/Resources/Prototypes/SimpleStation14/tags.yml +++ b/Resources/Prototypes/SimpleStation14/tags.yml @@ -6,3 +6,6 @@ - type: Tag id: WizardBook + +- type: Tag + id: Syndimonkey 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 0000000000000000000000000000000000000000..e21c0fbab3ccfeeff4637767a2213fd818b52cf8 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}8$DedLn2z= zPEiy(tRUbT|GKDE^rY&xqUs+?O0%?&xVRKBs)QzHMY=3E{w-th=l@Ms1&*c%_g4ng zOC`*EzL4Sj#ItE;HNS3mZ0y*uPW$vGh6zEhuDxE@Ff&xp(dE`1({CY5tT(Q@mN{#d z;embc8J^6s>|5-8xs*Llld)i4x^aE}Z1+>*4>GSg#XRE=4QB}FW>{x7CFs_y<*e(% vKgcec;&e`O!R;D}(6x)@0|i(d1!@>98XTAX<(stz=y(QCS3j3^P6 Date: Wed, 14 Jun 2023 20:43:53 -0400 Subject: [PATCH 05/13] add th mk45c to the uplink catalog --- .../Catalog/uplink_catalog.yml | 22 ++++++++++++++++++- .../Objects/Weapons/Guns/Pistols/pistols.yml | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml index 0354478103..547688f1ea 100644 --- a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml @@ -164,7 +164,7 @@ description: It's a .25 caseless machine gun fitted into a standard brown briefcase. Reduced storage capacity. productEntity: BriefcaseBrownSMG cost: - Telecrystal: 10 + Telecrystal: 12 categories: - UplinkJob conditions: @@ -225,3 +225,23 @@ - !type:BuyerJobCondition whitelist: - Chef + +- type: listing + id: UplinkMk45C + name: Mk.45C + description: A powerful and not-so-subtle handgun. A certified anti-clown weapon. + productEntity: WeaponPistolMk45C + cost: + Telecrystal: 9 + categories: + - UplinkWeapons + +- 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 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 From 22919680e6beb657a17652e90c4bece2a0784bb2 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Wed, 14 Jun 2023 20:59:15 -0400 Subject: [PATCH 06/13] fixed an error for the uplink ID --- Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml index 547688f1ea..193f31e953 100644 --- a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml @@ -213,7 +213,7 @@ - UplinkExplosives - type: listing - id: UplinkNukiePlushBomb + 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 From fc12d8e1bf757d40b9b83744ed71894378fbf936 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Wed, 14 Jun 2023 21:41:41 -0400 Subject: [PATCH 07/13] tc change --- Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml index 193f31e953..1bca2e0229 100644 --- a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml @@ -232,7 +232,7 @@ description: A powerful and not-so-subtle handgun. A certified anti-clown weapon. productEntity: WeaponPistolMk45C cost: - Telecrystal: 9 + Telecrystal: 8 categories: - UplinkWeapons From 1498641e101490c43eba08f9eff21d86ddad46db Mon Sep 17 00:00:00 2001 From: Cabbage Date: Thu, 15 Jun 2023 00:30:06 -0400 Subject: [PATCH 08/13] inventory slots component --- .../Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml index d5f8975462..cbd0fc1139 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml @@ -8,6 +8,7 @@ - type: Inventory speciesId: syndimonkey templateId: syndimonkey + - type: InventorySlots - type: Loadout prototypes: [ SyndimonkeyGear ] - type: DraconicBloodstream From 886d5262ca2fa9d7c38188bcf937b3b2771fa915 Mon Sep 17 00:00:00 2001 From: Cabbage <130223709+SomeCabbage@users.noreply.github.com> Date: Fri, 16 Jun 2023 00:49:41 -0400 Subject: [PATCH 09/13] Apply suggestions from code review Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> --- .../InventoryTemplates/syndimonkey_inventory_template.yml | 4 ++-- Resources/Prototypes/SimpleStation14/tags.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/SimpleStation14/InventoryTemplates/syndimonkey_inventory_template.yml b/Resources/Prototypes/SimpleStation14/InventoryTemplates/syndimonkey_inventory_template.yml index 0cb0e0f112..92baac20db 100644 --- a/Resources/Prototypes/SimpleStation14/InventoryTemplates/syndimonkey_inventory_template.yml +++ b/Resources/Prototypes/SimpleStation14/InventoryTemplates/syndimonkey_inventory_template.yml @@ -1,5 +1,5 @@ - type: inventoryTemplate - id: syndimonkey + id: SyndicateMonkey slots: - name: head slotTexture: head @@ -31,4 +31,4 @@ displayName: Ears whitelist: tags: - - Syndimonkey + - SyndicateMonkey diff --git a/Resources/Prototypes/SimpleStation14/tags.yml b/Resources/Prototypes/SimpleStation14/tags.yml index ce67272f55..e31223da3b 100644 --- a/Resources/Prototypes/SimpleStation14/tags.yml +++ b/Resources/Prototypes/SimpleStation14/tags.yml @@ -8,4 +8,4 @@ id: WizardBook - type: Tag - id: Syndimonkey + id: SyndicateMonkey From b374f62506dd5907d727b633fe85db8369b7d6f4 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Fri, 16 Jun 2023 00:59:06 -0400 Subject: [PATCH 10/13] syndicatemonkey --- .../Entities/Clothing/Ears/headsets_alt.yml | 2 +- .../Entities/Mobs/NPCs/primates.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index 7fb4d1a55c..4c270d5b3c 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -139,4 +139,4 @@ sprite: Clothing/Ears/Headsets/syndicate.rsi - type: Tag tags: - - Syndimonkey + - SyndicateMonkey diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml index cbd0fc1139..02acd6fbe2 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml @@ -7,16 +7,16 @@ components: - type: Inventory speciesId: syndimonkey - templateId: syndimonkey + templateId: SyndicateMonkey - type: InventorySlots - type: Loadout prototypes: [ SyndimonkeyGear ] - - type: DraconicBloodstream - reagent: - solutionName: chemicals - reagent: Stimulants - unitsPerUpdate: 1.0 - accumulatorTime: 5 + - type: SolutionRegeneration + solution: chemstream + generated: + reagents: + - ReagentId: Stimulants + Quantity: 0.20 - type: startingGear id: SyndimonkeyGear From 2fc6bad40a60c25a5bd5bff5e20175ddfc7bf04a Mon Sep 17 00:00:00 2001 From: Cabbage Date: Fri, 16 Jun 2023 02:12:06 -0400 Subject: [PATCH 11/13] removed the headset complications from the syndicate monkey and reorganized the catalog file --- .../Catalog/Fills/Items/briefcases.yml | 6 +- .../Catalog/uplink_catalog.yml | 78 ++++++++++-------- .../Entities/Mobs/NPCs/primates.yml | 19 ++--- .../syndimonkey_inventory_template.yml | 34 -------- Resources/Prototypes/SimpleStation14/tags.yml | 3 - .../alt-equipped-EARS-syndimonkey.png | Bin 109 -> 0 bytes .../Ears/Headsets/syndicate.rsi/meta.json | 4 - 7 files changed, 56 insertions(+), 88 deletions(-) delete mode 100644 Resources/Prototypes/SimpleStation14/InventoryTemplates/syndimonkey_inventory_template.yml delete mode 100644 Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS-syndimonkey.png diff --git a/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/briefcases.yml index d949a4cfc1..df14788262 100644 --- a/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/briefcases.yml @@ -7,5 +7,7 @@ # components: # - type: StorageFill # contents: -# - id: SpaceCash10000 -# amount: 2 +# - 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 1bca2e0229..4be0a23f4c 100644 --- a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml @@ -143,11 +143,13 @@ # Syndicate Uplink +# Job items + # let me know when money actually becomes useful to normal people # - type: listing # id: Uplink # name: Briefcase of cash -# description: contains 2 bundles of 10000 zorkmids. Good for bribery or purchasing goods for nefarious purposes. +# description: contains 20 bundles of 1000 zorkmids. Good for bribery or purchasing goods for nefarious purposes. # productEntity: BriefcaseBrownCash # cost: # Telecrystal: 7 @@ -159,7 +161,7 @@ # - Quartermaster - type: listing - id: UplinkBriefcaseMG + 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 @@ -172,6 +174,34 @@ 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) @@ -203,45 +233,23 @@ - Lawyer - 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 + id: UplinkMk45CMagazine + name: Magnum magazine (.45 magnum) + description: Magnum magazine with 10 rounds. Compatible with the Mk.45C. + productEntity: MagazineMagnum12 cost: Telecrystal: 3 categories: - - UplinkExplosives - -- 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 + - UplinkAmmo -- type: listing - id: UplinkMk45C - name: Mk.45C - description: A powerful and not-so-subtle handgun. A certified anti-clown weapon. - productEntity: WeaponPistolMk45C - cost: - Telecrystal: 8 - categories: - - UplinkWeapons +# explosives - type: listing - id: UplinkMk45CMagazine - name: Magnum magazine (.45 magnum) - description: Magnum magazine with 10 rounds. Compatible with the Mk.45C. - productEntity: MagazineMagnum12 + 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: - - UplinkAmmo + - UplinkExplosives diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml index 02acd6fbe2..dd55796c77 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/primates.yml @@ -5,20 +5,19 @@ id: MobGorillaSyndicate description: Smashes, roars, looks cool. Don't stand near one. components: - - type: Inventory - speciesId: syndimonkey - templateId: SyndicateMonkey - type: InventorySlots - - type: Loadout - prototypes: [ SyndimonkeyGear ] - type: SolutionRegeneration solution: chemstream generated: reagents: - ReagentId: Stimulants Quantity: 0.20 - -- type: startingGear - id: SyndimonkeyGear - equipment: - ears: ClothingHeadsetAltSyndicate + - type: IntrinsicRadioReceiver + channels: + - Syndicate + - type: IntrinsicRadioTransmitter + channels: + - Syndicate + - type: ActiveRadio + channels: + - Syndicate diff --git a/Resources/Prototypes/SimpleStation14/InventoryTemplates/syndimonkey_inventory_template.yml b/Resources/Prototypes/SimpleStation14/InventoryTemplates/syndimonkey_inventory_template.yml deleted file mode 100644 index 92baac20db..0000000000 --- a/Resources/Prototypes/SimpleStation14/InventoryTemplates/syndimonkey_inventory_template.yml +++ /dev/null @@ -1,34 +0,0 @@ -- type: inventoryTemplate - id: SyndicateMonkey - slots: - - name: head - slotTexture: head - slotFlags: HEAD - slotGroup: MainHotbar - uiWindowPos: 0,0 - strippingWindowPos: 0,0 - displayName: Head - - name: mask - slotTexture: mask - slotFlags: MASK - uiWindowPos: 1,1 - strippingWindowPos: 1,1 - displayName: Mask - - name: id - slotTexture: id - slotFlags: IDCARD - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 2,1 - strippingWindowPos: 2,4 - displayName: ID - - name: ears - slotTexture: ears - slotFlags: EARS - stripTime: 3 - uiWindowPos: 2,0 - strippingWindowPos: 2,0 - displayName: Ears - whitelist: - tags: - - SyndicateMonkey diff --git a/Resources/Prototypes/SimpleStation14/tags.yml b/Resources/Prototypes/SimpleStation14/tags.yml index e31223da3b..ffe8954d1d 100644 --- a/Resources/Prototypes/SimpleStation14/tags.yml +++ b/Resources/Prototypes/SimpleStation14/tags.yml @@ -6,6 +6,3 @@ - type: Tag id: WizardBook - -- type: Tag - id: SyndicateMonkey diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS-syndimonkey.png b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS-syndimonkey.png deleted file mode 100644 index 2975c479be7566a6c59a7aca4e20778aa850feb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)ID7sLn`LH rJ;=xlwOr9UK@K`#+rw1POb(`njxgN@xNA?@buF diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json index 062eacde48..afbc0afa37 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json @@ -13,10 +13,6 @@ { "name": "alt-equipped-EARS", "directions": 4 - }, - { - "name": "alt-equipped-EARS-syndimonkey", - "directions": 4 } ] } From e703007ebb0b0533cc33fa13b1777447eb0cfd64 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Fri, 16 Jun 2023 02:19:00 -0400 Subject: [PATCH 12/13] cash briefcase --- .../Catalog/Fills/Items/briefcases.yml | 25 +++++++++--------- .../Catalog/uplink_catalog.yml | 26 +++++++++---------- .../Entities/Objects/Misc/space_cash.yml | 12 --------- 3 files changed, 25 insertions(+), 38 deletions(-) delete mode 100644 Resources/Prototypes/SimpleStation14/Entities/Objects/Misc/space_cash.yml diff --git a/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/briefcases.yml index df14788262..dffec63351 100644 --- a/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Items/briefcases.yml @@ -1,13 +1,12 @@ -# let me know when money actually becomes useful to normal people -# - type: entity -# id: BriefcaseBrownCash -# name: brown briefcase -# parent: BriefcaseBrown -# suffix: Cash -# components: -# - type: StorageFill -# contents: -# - id: SpaceCash1000 -# amount: 20 -# - type: Storage -# capacity: 100 +- 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 4be0a23f4c..351bb9804c 100644 --- a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml @@ -146,19 +146,19 @@ # Job items # let me know when money actually becomes useful to normal people -# - type: listing -# id: Uplink -# name: Briefcase of cash -# description: contains 20 bundles of 1000 zorkmids. Good for bribery or purchasing goods for nefarious purposes. -# productEntity: BriefcaseBrownCash -# cost: -# Telecrystal: 7 -# categories: -# - UplinkJob -# conditions: -# - !type:BuyerJobCondition -# whitelist: -# - Quartermaster +- type: listing + id: Uplink + name: Briefcase of cash + description: contains 20 bundles of 1000 zorkmids. Good for bribery or purchasing goods for nefarious purposes. + productEntity: BriefcaseBrownCash + cost: + Telecrystal: 7 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Quartermaster - type: listing id: UplinkBriefcaseSMG diff --git a/Resources/Prototypes/SimpleStation14/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/SimpleStation14/Entities/Objects/Misc/space_cash.yml deleted file mode 100644 index d64b899e40..0000000000 --- a/Resources/Prototypes/SimpleStation14/Entities/Objects/Misc/space_cash.yml +++ /dev/null @@ -1,12 +0,0 @@ -# let me know when money actually becomes useful to normal people -- type: entity - parent: SpaceCash - id: SpaceCash10000 - name: zorkmids - suffix: 10000 - components: - - type: Icon - sprite: Objects/Economy/cash.rsi - state: cash_1000 - - type: Stack - count: 10000 From d2a444c28d1647108613b42219127aa1e620ae1e Mon Sep 17 00:00:00 2001 From: Cabbage Date: Fri, 16 Jun 2023 11:04:20 -0400 Subject: [PATCH 13/13] tc change --- .../Prototypes/SimpleStation14/Catalog/uplink_catalog.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml index 351bb9804c..086d99369a 100644 --- a/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml @@ -147,12 +147,12 @@ # let me know when money actually becomes useful to normal people - type: listing - id: Uplink + 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: 7 + Telecrystal: 5 categories: - UplinkJob conditions: