Misc fixes

code/game/objects/items.dm

@@ -32,7 +32,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	///Icon file for mob worn overlays.
 	var/icon/mob_overlay_icon
 	///icon state for mob worn overlays, if null the normal icon_state will be used.
-	var/mob_overlay_state //WS EDIT - Mob Overlay State
+	var/mob_overlay_state
 	///Forced mob worn layer instead of the standard preferred ssize.
 	var/alternate_worn_layer
 

code/modules/clothing/factions/gezena.dm

@@ -76,7 +76,7 @@
 	item_state = "captaincoat"
 
 /obj/item/clothing/suit/armor/gezena/marine
-	name = "\improper raksha-plating vest"
+	name = "\improper Raksha-plating vest"
 	desc = "Raksha - a Kalixcian word for 'protection of the heart'. Sturdy and reliable."
 	icon_state = "marinevest"
 	item_state = "marinevest"
@@ -90,7 +90,7 @@
 //Spacesuits
 
 /obj/item/clothing/suit/space/gezena
-	name = "rakalla-suit"
+	name = "\improper Rakalla-suit"
 	desc = "Rakalla - a Kalixcian word for 'protection among the stars'. Sturdy, flexible, and reliable."
 	icon = 'icons/obj/clothing/faction/gezena/suits.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/suits.dmi'
@@ -101,7 +101,7 @@
 	supports_variations = DIGITIGRADE_VARIATION
 
 /obj/item/clothing/head/helmet/space/gezena
-	name = "rakalla-helm"
+	name = "\improper Rakalla-helm"
 	desc = "Featuring rubberized grommets fitting for any length of horn, and an internal monitor for life support."
 	icon = 'icons/obj/clothing/faction/gezena/head.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/head.dmi'
@@ -158,8 +158,10 @@
 	item_state = "captainhat"
 
 /obj/item/clothing/head/helmet/gezena
-	name = "raksha-helm"
+	name = "\improper Raksha-helm"
 	desc = "PH"
+	icon = 'icons/obj/clothing/faction/gezena/head.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/head.dmi'
 	icon_state = "marinehelmet"
 	item_state = "marinehelmet"
 
@@ -199,9 +201,11 @@
 
 //Boots
 
-/obj/item/clothing/shoes/combat/gezena
+/obj/item/clothing/shoes/combat/gezena 
 	name = "gezenan steel-boots"
 	desc = "PH"
+	icon = 'icons/obj/clothing/faction/gezena/feet.dmi'
+	//mob_overlay_icon = 'icons/mob/clothing/faction/gezena/belt.dmi' todo: find out why digi breaks here
 	icon_state = "pgfboots"
 	item_state = "pgfboots"
 

code/modules/projectiles/gun.dm

@@ -25,28 +25,28 @@
 	var/vary_fire_sound = TRUE
 	var/fire_sound_volume = 50
 	var/dry_fire_sound = 'sound/weapons/gun/general/dry_fire.ogg'
-	var/dry_fire_text = "click"				//change this on non-gun things		WS Edit - Dry firing
+	var/dry_fire_text = "click"				//change this on non-gun things
 	var/suppressed = null					//whether or not a message is displayed when fired
 	var/can_suppress = FALSE
 	var/suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
 	var/suppressed_volume = 60
 	var/can_unsuppress = TRUE
-	var/recoil = 0						//boom boom shake the room
+	var/recoil = 0							//boom boom shake the room
 	var/clumsy_check = TRUE
 	var/obj/item/ammo_casing/chambered = null
 	trigger_guard = TRIGGER_GUARD_NORMAL	//trigger guard on the weapon, hulks can't fire them with their big meaty fingers
-	var/sawn_desc = null				//description change if weapon is sawn-off
+	var/sawn_desc = null					//description change if weapon is sawn-off
 	var/sawn_off = FALSE
-	var/burst_size = 1					//how large a burst is
-	var/fire_delay = 0					//rate of fire for burst firing and semi auto
-	var/firing_burst = 0				//Prevent the weapon from firing again while already firing
-	var/semicd = 0						//cooldown handler
+	var/burst_size = 1						//how large a burst is
+	var/fire_delay = 0						//rate of fire for burst firing and semi auto
+	var/firing_burst = 0					//Prevent the weapon from firing again while already firing
+	var/semicd = 0							//cooldown handler
 	var/weapon_weight = WEAPON_LIGHT
-	var/dual_wield_spread = 24			//additional spread when dual wielding
-	var/spread = 0						//Spread induced by the gun itself.
-	var/randomspread = 1				//Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.
+	var/dual_wield_spread = 24				//additional spread when dual wielding
+	var/spread = 0							//Spread induced by the gun itself.
+	var/randomspread = 1					//Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.
 
-	var/projectile_damage_multiplier = 1 //Alters projectile damage multiplicatively based on this value. Use it for "better" or "worse" weapons that use the same ammo.
+	var/projectile_damage_multiplier = 1	//Alters projectile damage multiplicatively based on this value. Use it for "better" or "worse" weapons that use the same ammo.
 
 	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'

code/modules/projectiles/guns/energy.dm

@@ -29,7 +29,6 @@
 	var/eject_sound = 'sound/weapons/gun/general/magazine_remove_full.ogg' //Sound of ejecting a cell. UPDATE PLEASE
 	var/sound_volume = 40 //Volume of loading/unloading sounds
 	var/load_sound_vary = TRUE //Should the load/unload sounds vary?
-	//WS End
 
 /obj/item/gun/energy/emp_act(severity)
 	. = ..()
@@ -217,16 +216,15 @@
 	. = ..()
 	if(!automatic_charge_overlays)
 		return
-	// Every time I see code this "flexible", a kitten fucking dies
+	// Every time I see code this "flexible", a kitten fucking dies //it got worse
+	//todo: refactor this a bit to allow showing of charge on a gun's cell
 	var/overlay_icon_state = "[icon_state]_charge"
 	var/obj/item/ammo_casing/energy/shot = ammo_type[modifystate ? select : 1]
 	var/ratio = get_charge_ratio()
-
 	if(cell)
 		. += "[icon_state]_cell"
 		if(ratio == 0)
 			. += "[icon_state]_cellempty"
-
 	if(ratio == 0)
 		if(modifystate)
 			. += "[icon_state]_[shot.select_name]"

code/modules/projectiles/guns/faction/gezena/energy_gunsword.dm

@@ -1,12 +1,12 @@
-/obj/item/gun/energy/kalix //blue
+/obj/item/gun/energy/kalix //blue //todo: fix up belt_mirror.dmi, it's incomprehensible
 	name = "\improper Kalixcian light beamgun"
 	desc = "PH PGF DESC"
 	icon_state = "kalixgun"
 	item_state = "kalixgun"
 	icon = 'icons/obj/guns/faction/gezena/energy.dmi'
 	lefthand_file = 'icons/obj/guns/faction/gezena/lefthand.dmi'
 	righthand_file = 'icons/obj/guns/faction/gezena/righthand.dmi'
-	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/belt.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/gezena/belt.dmi' 
 	w_class = WEIGHT_CLASS_BULKY
 
 	cell_type = /obj/item/stock_parts/cell/gun/pgf
@@ -26,6 +26,7 @@
 
 /obj/item/ammo_casing/energy/kalix
 	projectile_type = /obj/projectile/beam/hitscan/kalix
+	fire_sound = 'sound/weapons/gun/energy/laserpistol.ogg'
 	e_cost = 850
 
 /obj/item/gun/energy/kalix/pgf
@@ -46,10 +47,12 @@
 	muzzle_flash_color_override = LIGHT_COLOR_ELECTRIC_GREEN
 	impact_light_color_override = LIGHT_COLOR_ELECTRIC_GREEN
 	damage_constant = 0.9
-	range = 7
+	damage = 25
+	range = 6
 
 /obj/item/ammo_casing/energy/pgf
 	projectile_type = /obj/projectile/beam/hitscan/pgf
+	fire_sound = 'sound/weapons/gun/energy/laserpistol.ogg'
 	e_cost = 1000
 
 /obj/item/gun/energy/kalix/pgf/heavy //todo: make it actually use wielded component, or some other solution for twohanding, as it really sucks right now
@@ -62,10 +65,13 @@
 	w_class = WEIGHT_CLASS_HUGE
 	slot_flags = ITEM_SLOT_BACK
 
+	ammo_type = list(/obj/item/ammo_casing/energy/pgf/heavy)
+
 /obj/projectile/beam/hitscan/pgf/heavy
-	damage = 30
+	damage = 35
 	range = 12
 
 /obj/item/ammo_casing/energy/pgf/heavy
 	projectile_type = /obj/projectile/beam/hitscan/pgf/heavy
+	fire_sound = 'sound/weapons/gun/energy/lasersniper.ogg'
 	e_cost = 2000