Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Syndicate Uplink Items #175

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: entity
- type: entity
abstract: true
parent: ClothingHeadset
id: ClothingHeadsetAlt
Expand Down Expand Up @@ -137,3 +137,6 @@
sprite: Clothing/Ears/Headsets/syndicate.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/syndicate.rsi
- type: Tag
tags:
- Syndimonkey
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:(

Copy link
Contributor Author

@SomeCabbage SomeCabbage Jun 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I wanna keep it but until money actually has a practical use for other people besides cargo it's probably gonna stay commented out

Original file line number Diff line number Diff line change
@@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It being filled with two things is lame >:P
Needs to be like 50 500s. But also fills need a way to do more than one of an entity without doing it by fuckin adding it 50 times

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I suppose I could change it

107 changes: 107 additions & 0 deletions Resources/Prototypes/SimpleStation14/Catalog/uplink_catalog.yml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't even need to look at how Upstreams do it- these need to be sorted much better. Please organize the ones the are for specific jobs.

Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Wizard uplink

# Template
# - type: listing
# id: Wizard___
Expand Down Expand Up @@ -138,3 +140,108 @@
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
SomeCabbage marked this conversation as resolved.
Show resolved Hide resolved
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: 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

- 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

- type: listing
id: UplinkMk45C
name: Mk.45C
description: A powerful and not-so-subtle handgun. A certified anti-clown weapon.
SomeCabbage marked this conversation as resolved.
Show resolved Hide resolved
productEntity: WeaponPistolMk45C
cost:
Telecrystal: 8
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
- 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
- type: InventorySlots
- type: Loadout
prototypes: [ SyndimonkeyGear ]
- type: DraconicBloodstream
reagent:
solutionName: chemicals
reagent: Stimulants
unitsPerUpdate: 1.0
accumulatorTime: 5
SomeCabbage marked this conversation as resolved.
Show resolved Hide resolved

- type: startingGear
id: SyndimonkeyGear
equipment:
ears: ClothingHeadsetAltSyndicate
SomeCabbage marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's only a teleportation device? 🥺

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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
description: Someone needs reinforcements. You, the first gorilla the syndicate could find and upgrade, will help them.
description: Someone needs reinforcements. You, the first gorilla the syndicate could find, upgrade, and dehydrate will help them.

🥺?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah whatever I'll just make it that and have the gorilla be a ghost role

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but see like the thing is is that I dont want the gorrila to spawn unless it can be useful

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont want the agent to just have an indefinitely AI controlled gorilla

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's fine to leave as is. Maybe it just takes a while to hydrate. You could give it an active sprite for when it's awaiting a mind, like it sweating

Copy link
Contributor Author

@SomeCabbage SomeCabbage Jun 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh yea! A sprite change for when after it's activated

rules: Normal syndicate antagonist rules apply. Work with whoever called you in, and don't harm them.
- type: GhostRoleMobSpawner
Pspritechologist marked this conversation as resolved.
Show resolved Hide resolved
prototype: MobGorillaSyndicate
- type: EmitSoundOnUse
sound: /Audio/Misc/emergency_meeting.ogg
- type: ItemCooldown
- type: UseDelay
delay: 300
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +31 to +56
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably be in a Syndie folder? Organization gets a bit shaky there, but I'd likely lean towards separating it. @DEATHB4DEFEAT

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's a fun toy, put it with the other Fun/toys.ymls :)

Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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."

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
description: "Incredibly robust 'sidearm'. Good against most anything, and a certified anti-clown device."
description: "Incredibly robust 'sidearm'. Good against most anything; a certified anti-clown device."

components:
- type: Sprite
sprite: SimpleStation14/Objects/Weapons/Guns/Pistols/mk45c.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,55 @@
steps: 2
zeroVisible: true
- type: Appearance


- 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
Comment on lines +23 to +74
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto for this as the plushie?

Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
- type: inventoryTemplate
id: syndimonkey
SomeCabbage marked this conversation as resolved.
Show resolved Hide resolved
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
SomeCabbage marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions Resources/Prototypes/SimpleStation14/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@

- type: Tag
id: WizardBook

- type: Tag
id: Syndimonkey
SomeCabbage marked this conversation as resolved.
Show resolved Hide resolved
SomeCabbage marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
SomeCabbage marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"
}
]
}