Skip to content

Commit

Permalink
All the things
Browse files Browse the repository at this point in the history
  • Loading branch information
Stop-Signs committed Nov 11, 2024
1 parent c849d7e commit 4ec1918
Show file tree
Hide file tree
Showing 29 changed files with 146 additions and 2 deletions.
7 changes: 7 additions & 0 deletions Content.Server/Weapons/Ranged/Systems/GunSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Content.Server.Interaction;
using Content.Server.Power.EntitySystems;
using Content.Server.Stunnable;
using Content.Server.Temperature.Systems;
using Content.Server.Weapons.Ranged.Components;
using Content.Shared.Damage;
using Content.Shared.Damage.Systems;
Expand Down Expand Up @@ -40,6 +41,7 @@ public sealed partial class GunSystem : SharedGunSystem
[Dependency] private readonly StaminaSystem _stamina = default!;
[Dependency] private readonly StunSystem _stun = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;
[Dependency] private readonly TemperatureSystem _temperature = default!;

private const float DamagePitchVariation = 0.05f;
public const float GunClumsyChance = 0.5f;
Expand Down Expand Up @@ -225,6 +227,11 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
var hitEntity = lastHit.Value;
if (hitscan.StaminaDamage > 0f)
_stamina.TakeStaminaDamage(hitEntity, hitscan.StaminaDamage, source: user);
/// <summary>
/// DeltaV: Changes the target's temperature by this amount when hit.
/// </summary>
if (hitscan.HeatChange != 0f)
_temperature.ChangeHeat(hitEntity, hitscan.HeatChange, true);

var dmg = hitscan.Damage;

Expand Down
5 changes: 5 additions & 0 deletions Content.Shared/Weapons/Ranged/HitscanPrototype.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ public sealed partial class HitscanPrototype : IPrototype, IShootable

[ViewVariables(VVAccess.ReadWrite), DataField("staminaDamage")]
public float StaminaDamage;
/// <summary>
/// DeltaV: Changes the target's temperature by this amount when hit.
/// </summary>
[ViewVariables(VVAccess.ReadWrite), DataField("heatChange")]
public float HeatChange;

[ViewVariables(VVAccess.ReadWrite), DataField("damage")]
public DamageSpecifier? Damage;
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/deltav/research/technologies.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ research-technology-energy-gun = Energy Guns
research-technology-energy-gun-advance = Advanced Energy Manipulation
research-technology-advance-laser = Advanced Laser Manipulation
research-technology-robust-melee = Robust Melee
research-technology-ionized-cryogenic-emission-equipment = Ionized Cryogenic Emission Equipment
Original file line number Diff line number Diff line change
Expand Up @@ -261,3 +261,28 @@
steps: 5
zeroVisible: true
- type: Appearance


- type: entity
name: I.C.E.E.
parent: [BaseWeaponBattery, BaseGunWieldable, BaseRestrictedContraband]
id: WeaponColdCannon
description: It's cooler than a normal gun.
components:
- type: Sprite
sprite: DeltaV\Objects\Weapons\Guns\Battery\cold_cannon.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-4
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Clothing
sprite: DeltaV\Objects\Weapons\Guns\Battery\cold_cannon.rsi
- type: Gun
fireRate: 1.5
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
- type: HitscanBatteryAmmoProvider
proto: ColdLaser
fireCost: 100
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
damage:
types:
Cold: 20
- type: ChangeTemperatureOnCollide
heat: -50000
muzzleFlash:
sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
state: muzzle_omni
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,3 +224,12 @@
Steel: 1000
Plastic: 800

- type: latheRecipe
parent: BaseWeaponRecipeLong
id: WeaponColdCannon
result: WeaponColdCannon
materials:
Steel: 1500
Glass: 600
Plastic: 400
Silver: 300
12 changes: 12 additions & 0 deletions Resources/Prototypes/DeltaV/Research/arsenal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,15 @@
cost: 12500
recipeUnlocks:
- AdvancedTruncheon

- type: technology
id: IonizedCryogenicEmissionEquiplment
name: research-technology-ionized-cryogenic-emission-equipment
icon:
sprite: DeltaV\Objects\Weapons\Guns\Battery\cold_cannon.rsi
state: icon
discipline: Arsenal
tier: 3
cost: 10000
recipeUnlocks:
- WeaponColdCannon
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@
- MagazineBoxSpecialHoly
- MagazineBoxSpecialMindbreaker
- AdvancedTruncheon
- WeaponColdCannon
# End DeltaV additions

- type: entity
Expand Down Expand Up @@ -941,6 +942,7 @@
- ClothingOuterHardsuitSyndieReverseEngineered
- ClothingShoesBootsSecurityMagboots
- AdvancedTruncheon
- WeaponColdCannon
# End DeltaV additions
- type: MaterialStorage
whitelist:
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,85 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},
{
"name": "mag-unshaded-1"
},
{
"name": "mag-unshaded-2"
},
{
"name": "mag-unshaded-3"
},
{
"name": "mag-unshaded-4"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
},
{
"name": "0-inhand-left",
"directions": 4
},
{
"name": "0-inhand-right",
"directions": 4
},
{
"name": "25-inhand-left",
"directions": 4
},
{
"name": "25-inhand-right",
"directions": 4
},
{
"name": "50-inhand-left",
"directions": 4
},
{
"name": "50-inhand-right",
"directions": 4
},
{
"name": "75-inhand-left",
"directions": 4
},
{
"name": "75-inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 4ec1918

Please sign in to comment.