cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ballistic weapons will now correctly say that the firing mode was changed.

Browse Source
This commit is contained in:
Neerti
2015-12-02 08:04:34 -05:00
parent d50e2afae9
commit e0986cb7ab
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/projectiles/gun.dm
View File

@@ -375,7 +375,7 @@
var/datum/firemode/current_mode = firemodes[sel_mode] var/datum/firemode/current_mode = firemodes[sel_mode]
user << "The fire selector is set to [current_mode.name]." user << "The fire selector is set to [current_mode.name]."
/obj/item/weapon/gun/proc/switch_firemodes() /obj/item/weapon/gun/proc/switch_firemodes(mob/user)
if(firemodes.len <= 1) if(firemodes.len <= 1)
return null return null
@@ -384,11 +384,10 @@
sel_mode = 1 sel_mode = 1
var/datum/firemode/new_mode = firemodes[sel_mode] var/datum/firemode/new_mode = firemodes[sel_mode]
new_mode.apply_to(src) new_mode.apply_to(src)
user << "<span class='notice'>\The [src] is now set to [mode_name].</span>"
return new_mode return new_mode
/obj/item/weapon/gun/attack_self(mob/user) /obj/item/weapon/gun/attack_self(mob/user)
switch_firemodes(user) switch_firemodes(user)
if(firemodes.len > 1)
user << "<span class='notice'>\The [src] is now set to [mode_name].</span>"

2
code/modules/projectiles/guns/energy.dm
View File

@@ -19,7 +19,7 @@
var/recharge_time = 4 var/recharge_time = 4
var/charge_tick = 0 var/charge_tick = 0
/obj/item/weapon/gun/energy/switch_firemodes() /obj/item/weapon/gun/energy/switch_firemodes(mob/user)
if(..()) if(..())
update_icon() update_icon()

2
code/modules/projectiles/guns/projectile/automatic.dm
View File

@@ -145,7 +145,7 @@
if(use_launcher) if(use_launcher)
launcher.Fire(target, user, params, pointblank, reflex) launcher.Fire(target, user, params, pointblank, reflex)
if(!launcher.chambered) if(!launcher.chambered)
switch_firemodes() //switch back automatically switch_firemodes(user) //switch back automatically
else else
..() ..()