For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155)
* HoS modular revolver, ported from vore * Bugfixing, sanity checks etc. * Update hos.dm * Sprite fixed * Automatic changelog compile [ci skip] * HoS Weapon Selection * Icons * Clamp fix, removing rogue items from ye olde list * Update ammo.dmi * Requested Changes Part 1 * Beacon fixed (kind of) * Subtypes fix * User * Giving process_chamber a user so that the proc can use to_chat without requiring loc, fixes switching so the gun only switches to the same type when empty * redundant item * Adds an examine notice on how to remove the magazine * Requested Changes * Icons Co-authored-by: Changelogs <action@github.com>
This commit is contained in:
co-authored by
Changelogs
parent
bb4c92ca66
commit
f95222fee0
Executable → Regular
+25
@@ -17,6 +17,8 @@
|
||||
/obj/item/melee/baton,
|
||||
/obj/item/ammo_box/magazine/recharge,
|
||||
/obj/item/modular_computer,
|
||||
/obj/item/ammo_casing/mws_batt,
|
||||
/obj/item/ammo_box/magazine/mws_mag,
|
||||
/obj/item/twohanded/electrostaff,
|
||||
/obj/item/gun/ballistic/automatic/magrifle))
|
||||
|
||||
@@ -143,6 +145,29 @@
|
||||
using_power = TRUE
|
||||
update_icon()
|
||||
return
|
||||
|
||||
if(istype(charging, /obj/item/ammo_casing/mws_batt))
|
||||
var/obj/item/ammo_casing/mws_batt/R = charging
|
||||
if(R.cell.charge < R.cell.maxcharge)
|
||||
R.cell.give(R.cell.chargerate * recharge_coeff)
|
||||
use_power(250 * recharge_coeff)
|
||||
using_power = 1
|
||||
if(R.BB == null)
|
||||
R.chargeshot()
|
||||
update_icon(using_power)
|
||||
|
||||
if(istype(charging, /obj/item/ammo_box/magazine/mws_mag))
|
||||
var/obj/item/ammo_box/magazine/mws_mag/R = charging
|
||||
for(var/B in R.stored_ammo)
|
||||
var/obj/item/ammo_casing/mws_batt/batt = B
|
||||
if(batt.cell.charge < batt.cell.maxcharge)
|
||||
batt.cell.give(batt.cell.chargerate * recharge_coeff)
|
||||
use_power(250 * recharge_coeff)
|
||||
using_power = 1
|
||||
if(batt.BB == null)
|
||||
batt.chargeshot()
|
||||
update_icon(using_power)
|
||||
|
||||
else
|
||||
return PROCESS_KILL
|
||||
|
||||
|
||||
Reference in New Issue
Block a user