-
Notifications
You must be signed in to change notification settings - Fork 423
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
Secborg Module Overhaul, Small Borg Buff #2059
base: master
Are you sure you want to change the base?
Changes from 35 commits
7d4952f
ec7bdc6
c71eb69
4ac00c6
c454f34
6f7e994
c374d14
290bd65
d46dba5
d885ea1
9344d99
d66bf49
5203496
3863ece
60756e1
e7170f5
54dc8b9
adddaa6
7f2bd06
1521fb7
839bcf8
6839780
b1d7217
40ccdca
b3121c6
df3feb0
6153885
e9b3c94
5fff1b6
55a8412
3e2e645
3a1f115
4120a2e
d4db002
caf2b2b
ff74664
5590d24
ccbd4e3
ad37aa6
35ea035
6cab4b5
1f365af
0f0236c
93da364
6f8ffc3
487dd5a
2203df7
d0ea477
d08558b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
deltanedas marked this conversation as resolved.
Show resolved
Hide resolved
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,78 @@ | ||
- type: entity | ||
name: china lake | ||
- type: entity | ||
parent: [BaseWeaponLauncher, BaseGunWieldable] | ||
suffix: Robot, energy based | ||
id: WeaponLauncherChinaLakeBorg | ||
name: china lake | ||
suffix: Robot, energy based | ||
description: PLOOP! Contains a built in replicator to slowly make more ammo. | ||
components: | ||
- type: Sprite | ||
sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi | ||
layers: | ||
- state: icon | ||
map: ["enum.GunVisualLayers.Base"] | ||
- type: Clothing | ||
sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi | ||
- type: Gun | ||
fireRate: 1 | ||
selectedMode: SemiAuto | ||
availableModes: | ||
- SemiAuto | ||
soundGunshot: | ||
path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg | ||
- type: Battery | ||
maxCharge: 600 | ||
startingCharge: 300 | ||
- type: ProjectileBatteryAmmoProvider | ||
proto: GrenadeFrag | ||
fireCost: 300 | ||
- type: BatterySelfRecharger | ||
autoRecharge: true | ||
autoRechargeRate: 2 | ||
- type: Sprite | ||
sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi | ||
layers: | ||
- state: icon | ||
map: ["enum.GunVisualLayers.Base"] | ||
- type: Clothing | ||
sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi | ||
- type: Gun | ||
fireRate: 1 | ||
selectedMode: SemiAuto | ||
availableModes: | ||
- SemiAuto | ||
soundGunshot: | ||
path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg | ||
- type: Battery | ||
maxCharge: 600 | ||
startingCharge: 300 | ||
- type: ProjectileBatteryAmmoProvider | ||
proto: GrenadeFrag | ||
fireCost: 300 | ||
- type: BatterySelfRecharger | ||
autoRecharge: true | ||
autoRechargeRate: 2 | ||
|
||
- type: entity | ||
parent: BaseWeaponLauncher | ||
id: WeaponLauncherNonLethal | ||
name: Nonlethal Launcher | ||
suffix: Robot, energy based | ||
Avalon-Proto marked this conversation as resolved.
Show resolved
Hide resolved
|
||
description: A Cyborg Mounted Grenade Launcher, designed to fire flashbangs, or expend all of its energy to fire an EMP. Refills its own ammo | ||
components: | ||
- type: Sprite | ||
sprite: _DV\Objects\Weapons\Guns\Launchers\nonlethal_launcher.rsi | ||
layers: | ||
Avalon-Proto marked this conversation as resolved.
Show resolved
Hide resolved
|
||
- state: icon | ||
map: ["enum.GunVisualLayers.Base"] | ||
- type: Item | ||
sprite: _DV\Objects\Weapons\Guns\Launchers\nonlethal_launcher.rsi | ||
size: Huge | ||
Avalon-Proto marked this conversation as resolved.
Show resolved
Hide resolved
|
||
- type: Gun | ||
minAngle: 1 | ||
maxAngle: 2 | ||
fireRate: 1 | ||
selectedMode: SemiAuto | ||
availableModes: | ||
- SemiAuto | ||
soundGunshot: | ||
path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg | ||
- type: Battery | ||
maxCharge: 600 | ||
startingCharge: 200 | ||
- type: ProjectileBatteryAmmoProvider | ||
proto: GrenadeFlash | ||
fireCost: 200 | ||
- type: BatterySelfRecharger | ||
autoRecharge: true | ||
autoRechargeRate: 6 | ||
- type: GunWieldBonus | ||
wieldBonusExamineMessage: null | ||
minAngle: 0 | ||
maxAngle: 0 | ||
- type: UseDelay | ||
delay: 0 # You can't dual wield this as a borg so no need for a delay | ||
- type: AmmoCounter | ||
- type: BatteryWeaponFireModes | ||
fireModes: | ||
- proto: GrenadeFlash | ||
fireCost: 200 | ||
- proto: GrenadeEMP | ||
fireCost: 600 | ||
|
Avalon-Proto marked this conversation as resolved.
Show resolved
Hide resolved
|
Avalon-Proto marked this conversation as resolved.
Show resolved
Hide resolved
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
# Generic borg | ||
# Generic borg | ||
- type: borgType | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. revert changes to this file There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. How do I checkout again, been a bit There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. git checkout origin/master Resources/Prototypes/borg_types.yml |
||
id: generic | ||
|
||
|
@@ -86,6 +86,7 @@ | |
- BorgModuleCargo | ||
|
||
defaultModules: | ||
- BorgModuleTool # DeltaV - Added Tool Module to default | ||
- BorgModuleGrapplingGun | ||
- BorgModuleMining | ||
- BorgModuleAppraisal | ||
|
@@ -127,6 +128,7 @@ | |
- BorgModuleJanitor | ||
|
||
defaultModules: | ||
- BorgModuleTool # DeltaV - Added Tool Module to default | ||
- BorgModuleLightReplacer | ||
- BorgModuleCleaning | ||
|
||
|
@@ -168,6 +170,7 @@ | |
- BorgModuleMedical | ||
|
||
defaultModules: | ||
- BorgModuleTool # DeltaV - Added Tool Module to default | ||
- BorgModuleTreatment | ||
- BorgModuleSurgery # DeltaV | ||
|
||
|
@@ -227,6 +230,7 @@ | |
- BorgModuleService | ||
|
||
defaultModules: | ||
- BorgModuleTool # DeltaV - Added Tool Module to default | ||
- BorgModuleMusique | ||
- BorgModuleService | ||
- BorgModuleClowning | ||
|
Avalon-Proto marked this conversation as resolved.
Show resolved
Hide resolved
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-4.0", | ||
"copyright": "Made by JustAnOrange from discord", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon", | ||
"delays": [ | ||
[ | ||
0.1, | ||
0.1 | ||
] | ||
] | ||
} | ||
] | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
direction doesnt want lethal module at all, remove escalation from research and recipes (maybe it can be used in the future so keep the module itself)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Kat said the escalation module was fine though?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#3060 says borgs shouldnt be killing or lethally fighting anyone
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ThataKat the lethal melee should be fine right? It's almost entirely to deal with critters
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also @deltanedas the issue says that if they are to have any weapons, including lethal, they should have to follow ROE and be able to cuff people. You are giving them the ability to cuff, so it should be fine
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok real then if direction doesnt mind im happy