Fixes syndicate borg L6 icon (#42751)

This commit is contained in:
ShizCalev
2019-02-13 13:35:28 -05:00
committed by yogstation13-bot
parent 05a759891e
commit a00ce39998
8 changed files with 16 additions and 16 deletions

View File

@@ -50,7 +50,7 @@
w_class = WEIGHT_CLASS_NORMAL w_class = WEIGHT_CLASS_NORMAL
item_flags = DROPDEL item_flags = DROPDEL
ammo_type = list(/obj/item/ammo_casing/energy/chrono_beam) ammo_type = list(/obj/item/ammo_casing/energy/chrono_beam)
can_charge = 0 can_charge = FALSE
fire_delay = 50 fire_delay = 50
var/obj/item/chrono_eraser/TED = null var/obj/item/chrono_eraser/TED = null
var/obj/structure/chrono_field/field = null var/obj/structure/chrono_field/field = null

View File

@@ -9,7 +9,7 @@
var/modifystate = 0 var/modifystate = 0
var/list/ammo_type = list(/obj/item/ammo_casing/energy) var/list/ammo_type = list(/obj/item/ammo_casing/energy)
var/select = 1 //The state of the select fire switch. Determines from the ammo_type list what kind of shot is fired next. var/select = 1 //The state of the select fire switch. Determines from the ammo_type list what kind of shot is fired next.
var/can_charge = 1 //Can it be charged in a recharger? var/can_charge = TRUE //Can it be charged in a recharger?
var/automatic_charge_overlays = TRUE //Do we handle overlays with base update_icon()? var/automatic_charge_overlays = TRUE //Do we handle overlays with base update_icon()?
var/charge_sections = 4 var/charge_sections = 4
ammo_x_offset = 2 ammo_x_offset = 2
@@ -18,7 +18,7 @@
var/selfcharge = 0 var/selfcharge = 0
var/charge_tick = 0 var/charge_tick = 0
var/charge_delay = 4 var/charge_delay = 4
var/use_cyborg_cell = 0 //whether the gun's cell drains the cyborg user's cell to recharge var/use_cyborg_cell = FALSE //whether the gun's cell drains the cyborg user's cell to recharge
var/dead_cell = FALSE //set to true so the gun is given an empty cell var/dead_cell = FALSE //set to true so the gun is given an empty cell
/obj/item/gun/energy/emp_act(severity) /obj/item/gun/energy/emp_act(severity)

View File

@@ -95,7 +95,7 @@
item_state = "nucgun" item_state = "nucgun"
charge_delay = 5 charge_delay = 5
pin = null pin = null
can_charge = 0 can_charge = FALSE
ammo_x_offset = 1 ammo_x_offset = 1
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler) ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler)
selfcharge = 1 selfcharge = 1

View File

@@ -47,9 +47,9 @@
ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser) ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
/obj/item/gun/energy/laser/cyborg /obj/item/gun/energy/laser/cyborg
can_charge = 0 can_charge = FALSE
desc = "An energy-based laser gun that draws power from the cyborg's internal energy cell directly. So this is what freedom looks like?" desc = "An energy-based laser gun that draws power from the cyborg's internal energy cell directly. So this is what freedom looks like?"
use_cyborg_cell = 1 use_cyborg_cell = TRUE
/obj/item/gun/energy/laser/cyborg/emp_act() /obj/item/gun/energy/laser/cyborg/emp_act()
return return

View File

@@ -124,7 +124,7 @@
attack_verb = list("attacked", "slashed", "cut", "sliced") attack_verb = list("attacked", "slashed", "cut", "sliced")
force = 12 force = 12
sharpness = IS_SHARP sharpness = IS_SHARP
can_charge = 0 can_charge = FALSE
heat = 3800 heat = 3800
usesound = list('sound/items/welder.ogg', 'sound/items/welder2.ogg') usesound = list('sound/items/welder.ogg', 'sound/items/welder2.ogg')
@@ -283,12 +283,12 @@
/obj/item/gun/energy/printer /obj/item/gun/energy/printer
name = "cyborg lmg" name = "cyborg lmg"
desc = "An LMG that fires 3D-printed flechettes. They are slowly resupplied using the cyborg's internal power source." desc = "An LMG that fires 3D-printed flechettes. They are slowly resupplied using the cyborg's internal power source."
icon_state = "l6closed0" icon_state = "l6_cyborg"
icon = 'icons/obj/guns/projectile.dmi' icon = 'icons/obj/guns/projectile.dmi'
cell_type = "/obj/item/stock_parts/cell/secborg" cell_type = "/obj/item/stock_parts/cell/secborg"
ammo_type = list(/obj/item/ammo_casing/energy/c3dbullet) ammo_type = list(/obj/item/ammo_casing/energy/c3dbullet)
can_charge = 0 can_charge = FALSE
use_cyborg_cell = 1 use_cyborg_cell = TRUE
/obj/item/gun/energy/printer/update_icon() /obj/item/gun/energy/printer/update_icon()
return return

View File

@@ -27,8 +27,8 @@
name = "cyborg taser" name = "cyborg taser"
desc = "An integrated hybrid taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating." desc = "An integrated hybrid taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating."
can_flashlight = FALSE can_flashlight = FALSE
can_charge = 0 can_charge = FALSE
use_cyborg_cell = 1 use_cyborg_cell = TRUE
/obj/item/gun/energy/disabler /obj/item/gun/energy/disabler
name = "disabler" name = "disabler"
@@ -41,5 +41,5 @@
/obj/item/gun/energy/disabler/cyborg /obj/item/gun/energy/disabler/cyborg
name = "cyborg disabler" name = "cyborg disabler"
desc = "An integrated disabler that draws from a cyborg's power cell. This weapon contains a limiter to prevent the cyborg's power cell from overheating." desc = "An integrated disabler that draws from a cyborg's power cell. This weapon contains a limiter to prevent the cyborg's power cell from overheating."
can_charge = 0 can_charge = FALSE
use_cyborg_cell = 1 use_cyborg_cell = TRUE

View File

@@ -14,7 +14,7 @@
var/charges = 0 var/charges = 0
var/recharge_rate = 4 var/recharge_rate = 4
var/charge_tick = 0 var/charge_tick = 0
var/can_charge = 1 var/can_charge = TRUE
var/ammo_type var/ammo_type
var/no_den_usage var/no_den_usage
clumsy_check = 0 clumsy_check = 0

View File

@@ -5,7 +5,7 @@
icon_state = "nothingwand" icon_state = "nothingwand"
item_state = "wand" item_state = "wand"
w_class = WEIGHT_CLASS_SMALL w_class = WEIGHT_CLASS_SMALL
can_charge = 0 can_charge = FALSE
max_charges = 100 //100, 50, 50, 34 (max charge distribution by 25%ths) max_charges = 100 //100, 50, 50, 34 (max charge distribution by 25%ths)
var/variable_charges = TRUE var/variable_charges = TRUE