Skip to content

Commit

Permalink
moresizes
Browse files Browse the repository at this point in the history
  • Loading branch information
generalthrax committed Dec 10, 2024
1 parent cc266d7 commit dad112c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion code/modules/projectiles/guns/energy/energy_gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
dual_wield_spread = 60
wield_slowdown = LASER_RIFLE_SLOWDOWN
manufacturer = MANUFACTURER_SHARPLITE_NEW
w_class = WEIGHT_CLASS_BULKY
w_class = WEIGHT_CLASS_NORMAL

/obj/item/gun/energy/e_gun/empty_cell
spawn_no_ammo = TRUE
Expand Down Expand Up @@ -50,6 +50,7 @@
default_ammo_type = /obj/item/stock_parts/cell/gun/upgraded

weapon_weight = WEAPON_MEDIUM
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK

gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
Expand Down Expand Up @@ -241,6 +242,7 @@
item_state = "shotgun_combat"
shaded_charge = TRUE
ammo_type = list(/obj/item/ammo_casing/energy/disabler/scatter/ultima, /obj/item/ammo_casing/energy/laser/ultima)
w_class = WEIGHT_CLASS_BULKY
var/obj/item/modular_computer/integratedNTOS
var/NTOS_type = /obj/item/modular_computer/internal

Expand Down
4 changes: 3 additions & 1 deletion code/modules/projectiles/guns/energy/laser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@
item_state = null
ammo_type = list(/obj/item/ammo_casing/energy/xray)
ammo_x_offset = 3
w_class = WEIGHT_CLASS_BULKY

////////Laser Tag////////////////////

Expand Down Expand Up @@ -171,6 +172,7 @@
icon_state = "iotshotgun"
item_state = "shotgun_combat"
ammo_type = list(/obj/item/ammo_casing/energy/disabler/scatter/ultima)
w_class = WEIGHT_CLASS_BULKY
var/obj/item/modular_computer/integratedNTOS
var/NTOS_type = /obj/item/modular_computer/internal
manufacturer = MANUFACTURER_SHARPLITE_NEW
Expand Down Expand Up @@ -202,7 +204,6 @@
item_state = "gun"
ammo_x_offset = 2
charge_sections = 4
w_class = WEIGHT_CLASS_NORMAL
default_ammo_type = /obj/item/stock_parts/cell/gun/mini
allowed_ammo_types = list(
/obj/item/stock_parts/cell/gun/mini,
Expand Down Expand Up @@ -253,6 +254,7 @@
)
ammo_type = list(/obj/item/ammo_casing/energy/laser/eoehoma/e50)
weapon_weight = WEAPON_HEAVY
w_class = WEIGHT_CLASS_BULKY
manufacturer = MANUFACTURER_EOEHOMA

wield_delay = 0.7 SECONDS
Expand Down

0 comments on commit dad112c

Please sign in to comment.