Merge pull request #14817 from zeroisthebiggay/endit

[READY] tempgun rebalance (it's not a nerf don't worry)
This commit is contained in:
silicons
2021-08-02 17:11:20 -07:00
committed by GitHub
7 changed files with 17 additions and 2 deletions

View File

@@ -32,12 +32,13 @@
/obj/item/ammo_casing/energy/temp
projectile_type = /obj/item/projectile/temp
select_name = "freeze"
e_cost = 250
e_cost = 50 // twenty shots before emptying
fire_sound = 'sound/weapons/pulse3.ogg'
/obj/item/ammo_casing/energy/temp/hot
projectile_type = /obj/item/projectile/temp/hot
select_name = "bake"
fire_sound = 'sound/weapons/pulse2.ogg'
/obj/item/ammo_casing/energy/meteor
projectile_type = /obj/item/projectile/meteor

View File

@@ -310,9 +310,10 @@
/obj/item/gun/energy/temperature
name = "temperature gun"
icon_state = "freezegun"
item_state = null
desc = "A gun that changes temperatures."
ammo_type = list(/obj/item/ammo_casing/energy/temp, /obj/item/ammo_casing/energy/temp/hot)
cell_type = "/obj/item/stock_parts/cell/high"
shaded_charge = TRUE
pin = null
/obj/item/gun/energy/temperature/security

View File

@@ -1,9 +1,17 @@
/obj/item/projectile/temp
name = "freeze beam"
icon_state = "ice_2"
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
damage = 0
light_range = 2
damage_type = BURN
nodamage = FALSE
hitsound = 'sound/weapons/frost.ogg'
hitsound_wall = 'sound/weapons/frost.ogg'
ricochets_max = 50 //Honk!
ricochet_chance = 80
is_reflectable = TRUE
light_color = LIGHT_COLOR_BLUE
flag = "energy"
var/temperature = 100
@@ -15,7 +23,12 @@
/obj/item/projectile/temp/hot
name = "heat beam"
icon_state = "lava"
damage = 10
hitsound = 'sound/weapons/sear.ogg'
hitsound_wall = 'sound/weapons/effects/searwall.ogg'
temperature = 400
light_color = LIGHT_COLOR_RED
/obj/item/projectile/temp/cryo
name = "cryo beam"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 46 KiB

BIN
sound/weapons/frost.ogg Normal file

Binary file not shown.