cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix miniature egun overlays

Browse Source
This commit is contained in:
Elizabeth Lavenza
2024-04-13 19:41:43 -04:00
parent 54f584fa80
commit e37fbc72e0
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,9 @@
var/obj/item/stock_parts/cell/cell //What type of power cell this uses var/obj/item/stock_parts/cell/cell //What type of power cell this uses
var/cell_type = /obj/item/stock_parts/cell var/cell_type = /obj/item/stock_parts/cell
var/modifystate = 0 var/modifystate = FALSE
/// If TRUE, when modifystate is TRUE this energy gun gets an overlay based on its selected shot type, like "[icon_state]_disable".
var/shot_type_overlay = TRUE
/// = TRUE/FALSE decides if the user can switch to it of their own accord /// = TRUE/FALSE decides if the user can switch to it of their own accord
var/list/ammo_type = list(/obj/item/ammo_casing/energy = TRUE) var/list/ammo_type = list(/obj/item/ammo_casing/energy = TRUE)
/// The index of the ammo_types/firemodes which we're using right now /// The index of the ammo_types/firemodes which we're using right now
@@ -259,6 +261,10 @@
var/ratio = get_charge_ratio() var/ratio = get_charge_ratio()
if (modifystate) if (modifystate)
var/obj/item/ammo_casing/energy/shot = ammo_type[current_firemode_index] var/obj/item/ammo_casing/energy/shot = ammo_type[current_firemode_index]
// Some guns, like the mini egun, don't have non-charge mode states. Remove or rework this check when that's fixed.
// Currently, it's entirely too hyperspecific; there's no way to have the non-charge overlay without the charge overlay, for example.
// Oh, well.
if (shot_type_overlay)
. += "[icon_state]_[shot.select_name]" . += "[icon_state]_[shot.select_name]"
overlay_icon_state += "_[shot.select_name]" overlay_icon_state += "_[shot.select_name]"
if(ratio == 0) if(ratio == 0)

1
code/modules/projectiles/guns/energy/energy_gun.dm
View File

@@ -21,6 +21,7 @@
charge_sections = 3 charge_sections = 3
gunlight_state = "mini-light" gunlight_state = "mini-light"
can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
shot_type_overlay = FALSE
/obj/item/gun/energy/e_gun/mini/Initialize(mapload) /obj/item/gun/energy/e_gun/mini/Initialize(mapload)
gun_light = new /obj/item/flashlight/seclite(src) gun_light = new /obj/item/flashlight/seclite(src)