-
Notifications
You must be signed in to change notification settings - Fork 17
Hristov cobra rework #61
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
Merged
Mnemotechnician
merged 20 commits into
Floof-Station:master
from
JFerrix:Hristov-Cobra-Rework
Feb 11, 2026
+175
−15
Merged
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
bf29be5
Cobra-Hristov-Rework
JFerrix deb9181
Fixed Linter errors
JFerrix 3a6c131
Merge branch 'master' into Hristov-Cobra-Rework
JFerrix 7de97f1
Fixed forgotten backup files
JFerrix 9b271ce
Merge branch 'Hristov-Cobra-Rework' of https://github.com/JFerrix/Pan…
JFerrix fefc6bd
Fixed minor copypaste artifact error
JFerrix a3dcd5e
Fixed upstream merge duplicate error
JFerrix 9f1c94f
Requested changes
JFerrix 96cabc9
Merge branch 'master' into Hristov-Cobra-Rework
JFerrix 6c40b13
No idea if that was broken on delivery or github merging shit badly
JFerrix dfca0f1
I hate upstream merges that break my shit despite it not being my shit
JFerrix c329858
It work snow oddly enough
JFerrix d932b41
Update Resources/Prototypes/tags.yml
JFerrix 0c5ad67
Fuck merge conflicts, blindfire fix
JFerrix fe68817
Update tags.yml
JFerrix db44972
Delete Resources/Prototypes/_Floof/tags.yml
JFerrix 175d226
Readd Tags
JFerrix d57483e
Delete tags.yml
JFerrix 69e47af
Merge branch 'Floof-Station:master' into Hristov-Cobra-Rework
JFerrix 9d4b02c
Update assorted.yml
JFerrix File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| uplink-pistol-magazine-caseless-name-subsonic = Pistol Magazine (.25 caseless subsonic) | ||
| uplink-pistol-magazine-caseless-desc-subsonic = Pistol magazine with 10 subsonic cartridges. Copatible with the Cobra. This one is designed for stealth. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| - type: listing | ||
| id: UplinkMagazinePistolCaselessRifleSubsonic | ||
| name: uplink-pistol-magazine-caseless-name-subsonic | ||
| description: uplink-pistol-magazine-caseless-desc-subsonic | ||
| icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi, state: red-icon } | ||
| productEntity: MagazinePistolCaselessRifleSubsonic | ||
| cost: | ||
| Telecrystal: 1 | ||
| categories: | ||
| - UplinkAmmo |
14 changes: 14 additions & 0 deletions
14
...totypes/_Floof/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle_subsonic.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| - type: entity | ||
| parent: BaseMagazineBoxCaselessRifle | ||
| id: MagazineBoxCaselessRifleSubsonic | ||
| name: ammunition box (.25 caseless subsonic) | ||
| description: A cardboard box of .25 caseless subsonic rounds. Intended to hold general-purpose kinetic ammunition. | ||
| components: | ||
| - type: BallisticAmmoProvider | ||
| proto: CartridgeCaselessRifleSubsonic | ||
| - type: Sprite | ||
| layers: | ||
| - state: base | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] |
9 changes: 9 additions & 0 deletions
9
...es/_Floof/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle_subsonic.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| - type: entity | ||
| id: CartridgeCaselessRifleSubsonic | ||
| name: cartridge (.25 caseless Subsonic) | ||
| parent: BaseCartridgeCaselessRifle | ||
| description: A small caliber utilizing caseless technology, omitting conventional brass casing in favor of hardened propellant. Specifically built for stealth purposes | ||
| components: | ||
| - type: CartridgeAmmo | ||
| muzzleFlash: MuzzleFlashEffectSuppressed | ||
| proto: BulletCaselessRifleSubsonic |
26 changes: 26 additions & 0 deletions
26
...pes/_Floof/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle_subsonic.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| - type: entity | ||
| id: MagazinePistolCaselessRifleSubsonic | ||
| name: "pistol magazine (.25 caseless Subsonic)" | ||
| parent: BaseMagazinePistolCaselessRifle | ||
| description: 10-round magazine for the Cobra pistol. Intended to hold general-purpose kinetic ammunition. | ||
| components: | ||
| - type: BallisticAmmoProvider | ||
| proto: CartridgeCaselessRifleSubsonic | ||
| capacity: 10 | ||
| - type: Sprite | ||
| layers: | ||
| - state: red | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: MagazineVisuals | ||
| magState: mag | ||
| steps: 6 | ||
| zeroVisible: false | ||
| - type: Appearance | ||
| - type: Item | ||
| inhandVisuals: | ||
| left: | ||
| - state: inhand-left-mag | ||
| right: | ||
| - state: inhand-right-mag |
14 changes: 14 additions & 0 deletions
14
...s/_Floof/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle_subsonic.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| - type: entity | ||
| id: BulletCaselessRifleSubsonic | ||
| name: bullet (.25 caseless subsonic) | ||
| parent: BaseBullet | ||
| categories: [ HideSpawnMenu ] | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Floof/Objects/Weapons/Guns/Projectiles/projectileSubsonic.rsi | ||
| layers: | ||
| - shader: shaded | ||
| - type: Projectile | ||
| damage: | ||
| types: | ||
| Piercing: 19 |
12 changes: 12 additions & 0 deletions
12
Resources/Prototypes/_Floof/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| - type: entity | ||
| parent: MuzzleFlashEffect | ||
| id: MuzzleFlashEffectSuppressed | ||
| categories: [ HideSpawnMenu ] | ||
| components: | ||
| - type: Sprite | ||
| drawdepth: BelowMobs | ||
| layers: | ||
| - shader: unshaded | ||
| map: ["enum.EffectLayers.Unshaded"] | ||
| sprite: _Floof/Objects/Weapons/Guns/Projectiles/muzzleflashes.rsi # floof | ||
| state: kineticSuppressed # floof |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| ## Static | ||
|
|
||
| # Floof (Why the fuck is this not a thing?) | ||
| # Adds .60cal and .25 ammo and pistol magazines for the Cobra | ||
| - type: latheRecipePack | ||
| id: SyndieGunAmmoFloof | ||
| recipes: | ||
| - MagazineBoxAntiMateriel | ||
| - MagazineBoxCaselessRifleSubsonic | ||
| - MagazinePistolCaselessRifleSubsonic |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| #.25 Caseless | ||
| - type: latheRecipe | ||
| id: MagazineBoxCaselessRifleSubsonic | ||
| result: MagazineBoxCaselessRifleSubsonic | ||
| materials: | ||
| Steel: 800 | ||
|
|
||
| - type: latheRecipe | ||
| id: MagazinePistolCaselessRifleSubsonic | ||
| result: MagazinePistolCaselessRifleSubsonic | ||
| materials: | ||
| Steel: 500 | ||
|
|
||
| #.60 Ammo | ||
| - type: latheRecipe | ||
| id: MagazineBoxAntiMateriel | ||
| result: MagazineBoxAntiMateriel | ||
| completetime: 5 | ||
| materials: | ||
| Steel: 1000 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,3 +27,6 @@ | |
|
|
||
| - type: Tag | ||
| id: HighHeelBoots | ||
|
|
||
| - type: Tag | ||
| id: CartridgeCaselessRifleSubsonic #Tag for new Cobra ammo | ||
Binary file added
BIN
+811 Bytes
..._Floof/Objects/Weapons/Guns/Projectiles/muzzleflashes.rsi/kineticSuppressed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions
22
Resources/Textures/_Floof/Objects/Weapons/Guns/Projectiles/muzzleflashes.rsi/meta.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "version": 1, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "Created by DVDPlayerOfDiscordFame (github) for Impstation.", | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
| }, | ||
| "states": [ | ||
| { | ||
| "name": "kineticSuppressed", | ||
| "delays": [ | ||
| [ | ||
| 0.05, | ||
| 0.05, | ||
| 0.05, | ||
| 1.00 | ||
| ] | ||
| ] | ||
| } | ||
| ] | ||
| } |
Binary file added
BIN
+200 Bytes
...tures/_Floof/Objects/Weapons/Guns/Projectiles/projectileSubsonic.rsi/bullet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions
15
Resources/Textures/_Floof/Objects/Weapons/Guns/Projectiles/projectileSubsonic.rsi/meta.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "version": 1, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "Custom edited sprite of the 'bullet' RSI from the default bullet2.rsi folder", | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
| }, | ||
| "states": [ | ||
| { | ||
| "name": "bullet", | ||
| "directions": 1 | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
The entire point of this is to force you to stand still while aiming. This isn't cs:go or tf2 where you can snipe people on the fly, is it?
Uh oh!
There was an error while loading. Please reload this page.
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.
Multiple reasons, a) Current one has 0 movespeed slow and that already hasnt exactly done it any good. b) fairness. I actually considered removing the slowdown entirely to begin with but the sight advantage requires a tradeoff. Mainly because: No other weapon has this. If we port our loadout weapons sec will be armed as hell with weapons that have no slowdown, literally higher dps (the hristov has a 16.666 dps rating btw, one shot every ~3s) and same range. To kill a hristov user you can literally blindfire into the general direction and because they effectively cant move they WILL die from this. There are no long range engagements where the hristov will have an advantage, not in this game, the hristov already has no niche and needs to compete with weapons that are made to excel at this. The only way the hristov will work is if you employ hit and run tactics. It will literally be the only way to not have a joke of a weapon again. Adding an 80% movespeed slow is killing this entire strategy and the only other way to make the hristov viable would be to increase its damage. That wouldnt work either however as due to the low firerate and armorpen all we could do would be to make it a 100 damage per shot weapon which would move it into the op, unfun to play category because it could literally oneshot anything.
You see how the movespeed is the only variable we can tweak to give both the player a fair chance without making the weapon op?
Also quickdrawing it will never be viable because you have an equip delay with the value of the fire speed, aka between equipping it and firing you will have over 3s of 80% slow without any form of pressure other than looking menacing.
Trust me this is already a statistically speaking bad weapon without the slowdown at all, we dont want to move it from shit weapon on EE to also shit weapon on DV, the entire purpose is to add a high risk, high skill, high reward weapon into the pool of available weapons.
Ill be happy to discuss this but trust me, the hristov has ironically enough already received most of the changes I would have wanted on EE here on DV and it still isnt a weapon you see often because a buff thats two steps forward but three steps back is not a buff
Uh oh!
There was an error while loading. Please reload this page.
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.
I see your point. I don't fully agree with what's being said here, but I suppose we can give it a try given the unpopularity of this weapon.