-
Notifications
You must be signed in to change notification settings - Fork 148
BSO nonlethals set (Bounty) #638
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
base: master
Are you sure you want to change the base?
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,7 @@ | |
| - BSOChesterSet | ||
| - BSOSyringeSet | ||
| - BSOBRDISet # Omu | ||
| - BSONonLethalSet # | ||
| maxSelectedSets: 2 | ||
|
|
||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -244,3 +244,17 @@ | |
| state: icon | ||
| content: | ||
| - ClothingOuterHardsuitCorpsman | ||
|
|
||
| #bso | ||
| - type: selectableSet | ||
| id: BSONonLethalSet | ||
| name: bso-non-lethal-kit-name | ||
| description: bso-non-lethal-kit-desc | ||
| sprite: | ||
| sprite: _Goobstation/Objects/Weapons/Melee/telebaton.rsi | ||
| state: icon | ||
| content: | ||
| - WeaponAdvancedDisablerSMG | ||
| - TelescopicBatonAdvanced | ||
| - WeaponDisablerAdvanced | ||
| - HyperFlash | ||
|
Comment on lines
+257
to
+260
Contributor
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. Hyperflash is a 20+ second flash that is tagged as do not map for a reason. self recharge disabler would be fine by itself, not if given alongside a disabler SMG, and not if given alongside a self recharging SMG either. I don't believe the self recharge SMG fits in anywhere without a significant rework in points cost of BSO. |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,3 +49,27 @@ | |
| tags: | ||
| - EnergyMagAmmo | ||
| - AdvancedEnergyMagAmmo | ||
|
|
||
| - type: entity | ||
| name: CentComm Disabler SMG | ||
|
Contributor
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. kind of a nitpick but i think u should change it to advanced disabler SMG
Contributor
Author
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. truthloose |
||
| parent: [ WeaponDisablerSMG, BaseCentcommContraband ] | ||
| id: WeaponAdvancedDisablerSMG | ||
| description: An advanced disabler SMG meant for nonlethally disposing of threats to priority personnel. | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Omu/Objects/Weapons/Guns/Battery/centcomm_disabler_smg.rsi | ||
| layers: | ||
| - state: base | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-unshaded-0 | ||
| map: ["enum.GunVisualLayers.MagUnshaded"] | ||
| shader: unshaded | ||
| - type: ProjectileBatteryAmmoProvider | ||
| proto: BulletDisablerSmg | ||
| fireCost: 25 | ||
| - type: PacifismAllowedGun | ||
| - type: BatterySelfRecharger | ||
| autoRecharge: true | ||
| autoRechargeRate: 18 | ||
| autoRechargePause: true | ||
| autoRechargePauseTime: 4 | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| { | ||
| "version": 1, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/26818af618762ff52319b3417be8cdc1279e99b7/icons/obj/weapons/guns/energy.dmi", | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
| }, | ||
| "states": [ | ||
| { | ||
| "name": "base" | ||
| }, | ||
| { | ||
| "name": "mag-unshaded-4" | ||
| }, | ||
| { | ||
| "name": "mag-unshaded-3" | ||
| }, | ||
| { | ||
| "name": "mag-unshaded-2" | ||
| }, | ||
| { | ||
| "name": "mag-unshaded-1" | ||
| }, | ||
| { | ||
| "name": "mag-unshaded-0", | ||
| "delays": [ | ||
| [ | ||
| 0.4, | ||
| 0.4 | ||
| ] | ||
| ] | ||
| }, | ||
| { | ||
| "name": "inhand-left", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-left-0" | ||
| }, | ||
| { | ||
| "name": "inhand-left-1" | ||
| }, | ||
| { | ||
| "name": "inhand-left-2" | ||
| }, | ||
| { | ||
| "name": "inhand-left-3" | ||
| }, | ||
| { | ||
| "name": "inhand-left-4" | ||
| }, | ||
| { | ||
| "name": "inhand-right", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-right-0" | ||
| }, | ||
| { | ||
| "name": "inhand-right-1" | ||
| }, | ||
| { | ||
| "name": "inhand-right-2" | ||
| }, | ||
| { | ||
| "name": "inhand-right-3" | ||
| }, | ||
| { | ||
| "name": "inhand-right-4" | ||
| } | ||
| ] | ||
| } |
Uh oh!
There was an error while loading. Please reload this page.