Skip to content

Commit

Permalink
More church gun balance and small fixes. (#4975)
Browse files Browse the repository at this point in the history
* nerfs ur laser spamies

* maybe to much there

* buh

* Update guns.dm

* Update plasma.dm

slightly bumps the cost of the Dominion from 2 to 2.5 (in bioprinters). Apparantly? It was just cheap enough if you took a loadout wrist PDA for a extra atom cell you could print one of these nearly round start.
  • Loading branch information
benj8560 authored Jan 29, 2024
1 parent 516fa83 commit bfd86ec
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 19 deletions.
14 changes: 7 additions & 7 deletions code/datums/autolathe/guns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
build_path = /obj/item/gun/projectile/mk58/wood

/datum/design/autolathe/gun/lemant
name = "NT 10/20mm \"Pilgrim\""
name = "OT 10/20mm \"Pilgrim\""
build_path = /obj/item/gun/projectile/revolver/lemant

/datum/design/autolathe/gun/ten
Expand Down Expand Up @@ -457,27 +457,27 @@
build_path = /obj/item/gun/energy/firestorm

/datum/design/autolathe/gun/energy_crossbow
name = "OT EC \"Nemesis\""
name = "NT EC \"Nemesis\""
build_path = /obj/item/gun/energy/crossbow

/datum/design/autolathe/gun/large_energy_crossbow
name = "OT EC \"Themis\""
name = "NT EC \"Themis\""
build_path = /obj/item/gun/energy/crossbow/largecrossbow

/datum/design/autolathe/gun/laser
name = "OT LG \"Lightfall\""
name = "NT LG \"Lightfall\""
build_path = /obj/item/gun/energy/laser

/datum/design/autolathe/gun/ionrifle
name = "OT IR \"Halicon\""
name = "NT IR \"Halicon\""
build_path = /obj/item/gun/energy/ionrifle

/datum/design/autolathe/gun/pulse
name = "OT PR \"Dominion\""
name = "NT PR \"Dominion\""
build_path = /obj/item/gun/energy/plasma

/datum/design/autolathe/gun/pulse_destroyer
name = "OT PR \"Purger\""
name = "NT PR \"Purger\""
build_path = /obj/item/gun/energy/plasma/destroyer

/datum/design/autolathe/gun/pulse_cassad
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@
/datum/design/autolathe/gun/regulator = 3,
/datum/design/autolathe/gun/lemant = 3,
/datum/design/autolathe/gun/taser,
/datum/design/autolathe/gun/laser = 2,
/datum/design/autolathe/gun/sniperrifle = 6,
/datum/design/autolathe/ammo/pistol_ammobox_biomatter,
/datum/design/autolathe/ammo/magnum_ammobox_biomatter = 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ GLOBAL_LIST_INIT(nt_constructs, init_nt_constructs())
/obj/item/stack/material/plasteel = 40,
/obj/item/stack/material/wood = 25,
/obj/item/stack/material/glass = 15,
/obj/item/stack/material/gold = 3,
/obj/item/stack/material/gold = 5,
/obj/item/stack/material/silver = 5
)
build_time = 8 SECONDS
Expand Down
9 changes: 5 additions & 4 deletions code/modules/projectiles/guns/energy/laser/concilium.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
fire_sound = 'sound/weapons/energy/laser_rifle.ogg' // Big unwieldy gun, despite the shit lasers
slot_flags = null
w_class = ITEM_SIZE_HUGE
matter = list(MATERIAL_PLASTEEL = 40, MATERIAL_WOOD = 25, MATERIAL_GLASS = 15, MATERIAL_SILVER = 5, MATERIAL_GOLD = 3)
matter = list(MATERIAL_PLASTEEL = 40, MATERIAL_WOOD = 25, MATERIAL_GLASS = 15, MATERIAL_SILVER = 5, MATERIAL_GOLD = 5)
projectile_type = /obj/item/projectile/beam/drone
init_recoil = CARBINE_RECOIL(1)
init_recoil = CARBINE_RECOIL(2)
fire_delay = 2
charge_cost = 100 //130 shots on a large spark
wield_delay = 1.5 SECOND
wield_delay_factor = 0.5 // 50 vig to instant wield heavy chonker gun
Expand All @@ -24,8 +25,8 @@
price_tag = 2000
gun_tags = list(GUN_LASER, GUN_ENERGY)
init_firemodes = list(
FULL_AUTO_600,
list(mode_name="short bursts", mode_desc="Fire 5 shots in quick succession", burst=5, burst_delay=2, move_delay=6, icon="burst"),
FULL_AUTO_300,
list(mode_name="short bursts", mode_desc="Fire 5 shots in succession", burst=5, burst_delay=4, move_delay=6, icon="burst"),
list(mode_name="long bursts", mode_desc="Fire 8 shots in succession", burst=8, burst_delay=4, move_delay=8, icon="burst"),
list(mode_name="suppressing fire", mode_desc="Fire 16 shots back to back to keep targets inside cover", burst=16, burst_delay=4, move_delay=11, icon="burst")
)
Expand Down
7 changes: 4 additions & 3 deletions code/modules/projectiles/guns/energy/laser/laser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
item_charge_meter = TRUE
fire_sound = 'sound/weapons/energy/laser_rifle.ogg'
slot_flags = SLOT_BACK
w_class = ITEM_SIZE_NORMAL
w_class = ITEM_SIZE_BULKY
force = WEAPON_FORCE_NORMAL
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
matter = list(MATERIAL_PLASTEEL = 20, MATERIAL_WOOD = 8, MATERIAL_SILVER = 5)
price_tag = 550
matter = list(MATERIAL_PLASTEEL = 20, MATERIAL_WOOD = 8, MATERIAL_SILVER = 10)
price_tag = 900
projectile_type = /obj/item/projectile/beam/midlaser
fire_delay = 5
charge_cost = 50
gun_tags = list(GUN_LASER, GUN_ENERGY, GUN_SCOPE)
init_firemodes = list(
WEAPON_NORMAL,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/energy/plasma/plasma.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
w_class = ITEM_SIZE_HUGE
slot_flags = SLOT_BACK
force = WEAPON_FORCE_PAINFUL
matter = list(MATERIAL_PLASTEEL = 17, MATERIAL_WOOD = 8, MATERIAL_SILVER = 6, MATERIAL_URANIUM = 4)
matter = list(MATERIAL_PLASTEEL = 17, MATERIAL_WOOD = 8, MATERIAL_SILVER = 6, MATERIAL_URANIUM = 5)
price_tag = 2000
origin_tech = list(TECH_COMBAT = 3, TECH_PLASMA = 2)
fire_sound = 'sound/weapons/energy/pulse.ogg'
Expand Down
1 change: 1 addition & 0 deletions code/modules/projectiles/guns/energy/projectile/railgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@
list(mode_name="powered-rod", mode_desc="fires a metal rod at incredible speeds", projectile_type=/obj/item/projectile/bullet/gauss, icon="kill"),
list(mode_name="fragmented scrap", mode_desc="fires a brittle, sharp piece of scrap-metal", projectile_type=/obj/item/projectile/bullet/grenade/frag, charge_cost=30000, icon="grenade"),
)
serial_type = "AG"
consume_cell = FALSE
price_tag = 6000

Expand Down
4 changes: 2 additions & 2 deletions code/modules/psionics/psionic_items/psi_weptools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@
psigun = 1
origin_tech = list()
matter = list()
damage_multiplier = 0.9
penetration_multiplier = 0.9
damage_multiplier = 0.8
penetration_multiplier = 0.8
price_tag = 0
serial_shown = FALSE

Expand Down

0 comments on commit bfd86ec

Please sign in to comment.